circulation 0.2.0__tar.gz → 0.2.1__tar.gz

{circulation-0.2.0/src/circulation.egg-info → circulation-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: circulation
-Version: 0.2.0
+Version: 0.2.1
 Summary: Closed loop blood circulation model in FEniCS
 Author-email: Henrik Finsberg <henriknf@simula.no>
 License-Expression: MIT

{circulation-0.2.0 → circulation-0.2.1}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61.0.0", "wheel"]
 
 [project]
 name = "circulation"
-version = "0.2.0"
+version = "0.2.1"
 description = "Closed loop blood circulation model in FEniCS"
 authors = [{ name = "Henrik Finsberg", email = "henriknf@simula.no" }]
 license = "MIT"
@@ -116,7 +116,7 @@ tag = true
 sign_tags = false
 tag_name = "v{new_version}"
 tag_message = "Bump version: {current_version} → {new_version}"
-current_version = "0.2.0"
+current_version = "0.2.1"
 
 
 [[tool.bumpversion.files]]

{circulation-0.2.0 → circulation-0.2.1}/src/circulation/base.py

@@ -267,10 +267,14 @@ class CirculationModel(ABC):
         unit_R: float = 1.0,
         unit_p: float = 1.0,
     ) -> Callable[[float, float], float]:
-        return lambda w, v: unit_R * 10.0 ** (
-            np.log10(Rmin / unit_R)
-            + (np.log10(Rmax / unit_R) - np.log10(Rmin / unit_R))
-            * smooth_heavyside((v - w) / unit_p)
+        return lambda w, v: (
+            unit_R
+            * 10.0
+            ** (
+                np.log10(Rmin / unit_R)
+                + (np.log10(Rmax / unit_R) - np.log10(Rmin / unit_R))
+                * smooth_heavyside((v - w) / unit_p)
+            )
         )
 
     def times_n_beats(self, dt: float, n: int = 1) -> np.ndarray:

{circulation-0.2.0 → circulation-0.2.1}/src/circulation/bestel.py

@@ -106,8 +106,8 @@ class BestelActivation:
 
         # print(f"Solving active stress model with parameters: {pprint.pformat(params)}")
 
-        f = (
-            lambda t: 0.25
+        f = lambda t: (
+            0.25
             * (1 + math.tanh((t - ps["t_sys"]) / ps["gamma"]))
             * (1 - math.tanh((t - ps["t_dias"]) / ps["gamma"]))
         )
@@ -286,8 +286,8 @@ class BestelPressure:
 
     def __call__(self, t, p):
         ps = self.parameters
-        f = (
-            lambda t: 0.25
+        f = lambda t: (
+            0.25
             * (1 + math.tanh((t - ps["t_sys_pre"]) / ps["gamma"]))
             * (1 - math.tanh((t - ps["t_dias_pre"]) / ps["gamma"]))
         )

{circulation-0.2.0 → circulation-0.2.1}/src/circulation/regazzoni2020.py

@@ -229,18 +229,18 @@ class Regazzoni2020(base.CirculationModel):
     @staticmethod
     def default_initial_conditions() -> dict[str, float]:
         return {
-            "V_LA": 80.0 * mL,
-            "V_LV": 110.0 * mL,
-            "V_RA": 80.0 * mL,
-            "V_RV": 110.0 * mL,
-            "p_AR_SYS": 70.0 * mmHg,
-            "p_VEN_SYS": 28.32334306787334 * mmHg,
-            "p_AR_PUL": 25.0 * mmHg,
-            "p_VEN_PUL": 20.0 * mmHg,
-            "Q_AR_SYS": 0.0 * mL / s,
-            "Q_VEN_SYS": 0.0 * mL / s,
-            "Q_AR_PUL": 0.0 * mL / s,
-            "Q_VEN_PUL": 0.0 * mL / s,
+            "V_LA": 87.183 * mL,
+            "V_LV": 118.520 * mL,
+            "V_RA": 86.833 * mL,
+            "V_RV": 166.177 * mL,
+            "p_AR_SYS": 87.675 * mmHg,
+            "p_VEN_SYS": 35.898 * mmHg,
+            "p_AR_PUL": 19.545 * mmHg,
+            "p_VEN_PUL": 15.004 * mmHg,
+            "Q_AR_SYS": 71.104 * mL / s,
+            "Q_VEN_SYS": 94.039 * mL / s,
+            "Q_AR_PUL": 94.084 * mL / s,
+            "Q_VEN_PUL": 473.279 * mL / s,
         }
 
     @staticmethod

{circulation-0.2.0 → circulation-0.2.1/src/circulation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: circulation
-Version: 0.2.0
+Version: 0.2.1
 Summary: Closed loop blood circulation model in FEniCS
 Author-email: Henrik Finsberg <henriknf@simula.no>
 License-Expression: MIT

{circulation-0.2.0 → circulation-0.2.1}/src/circulation.egg-info/SOURCES.txt

@@ -16,4 +16,5 @@ src/circulation.egg-info/requires.txt
 src/circulation.egg-info/top_level.txt
 tests/test_bestel.py
 tests/test_initialization.py
-tests/test_models.py
+tests/test_models.py
+tests/test_regazzoni_steady_state.py

circulation-0.2.1/tests/test_regazzoni_steady_state.py

@@ -0,0 +1,15 @@
+import numpy as np
+from circulation import regazzoni2020
+
+
+def test_regazzoni_steady_state():
+    """
+    Test that the default initial state is close to the limit cycle.
+    We run the model for ten beats and check that the state hasn't drifted much.
+    """
+    model = regazzoni2020.Regazzoni2020()
+    initial_state = model.state.copy()
+    model.solve(num_beats=10)
+    final_state = model.state
+
+    np.testing.assert_allclose(final_state, initial_state, rtol=1e-2, verbose=True)