SimVascular · mrp089 · Jun 9, 2025 · Apr 2, 2025 · Apr 2, 2025 · Apr 2, 2025
diff --git a/src/model/ClosedLoopHeartPulmonary.h b/src/model/ClosedLoopHeartPulmonary.h
@@ -225,9 +225,9 @@ class ClosedLoopHeartPulmonary : public Block {
  private:
   // Below variables change every timestep and are then combined with
   // expressions that are updated with solution
-  double AA;   // Atrial activation function
-  double Elv;  // LV elastance
-  double Erv;  // RV elastance
+  double AA = 0.0;   // Atrial activation function
+  double Elv = 0.0;  // LV elastance
+  double Erv = 0.0;  // RV elastance
   double psi_ra, psi_la, psi_ra_derivative,
       psi_la_derivative;  // Expressions for atrial activation
   double valves[16];

diff --git a/tests/README.md b/tests/README.md
@@ -0,0 +1,25 @@
+# Testing Guide
+
+[Integration testing](https://en.wikipedia.org/wiki/Integration_testing) is an essential part of software development. It is performed when integrating code changes into the main development branch to verify that the code works as expected. The following sections describe how to run and add integration tests used to the svMultiPhysics program.
+
+
+# Build svZeroDSolver
+
+Running a test case requires you to [build svZeroDSolver](https://simvascular.github.io/documentation/rom_simulation.html#0d-solver-install) and install with pip in order to run test cases using `pytest`
+
+# Running tests using pytest
+
+to run the full set of svZeroDSolver test cases, navigate to the `tests/` directory and run `pytest` from the terminal
+
+## Create a new solver test
+
+In order to create a new test for the solver, complete the following steps:
+
+1. Create a svZeroDSolver json file for the test (e.g. `pulsatileFlow_R_RCR.json`) in the `tests/cases` directory
+2. Verify the results. If possible, verify against an analystical solution. If this is not feasible, find some way to verify that the test results are correct. For example, you might use reference solutions from other codes, manufactured solutions, convergence analysis, or something of that variety.
+3. Compute a reference solution for the test by navigating to the `tests` directory and running `python compute_ref_sol.py <your_test_case_name..json>` from the terminal. This should create a resultant `result_your_test_case_name.json` file in the `tests/cases/results` directory. Verify the result is there.
+4. Add your test case to the `pytest` parametrization in `test_solver.py`. simply add the name of your test `json` to the list of strings after the `@pytest.mark.parametrize` decorator.
+5. Verify that the test runs properly by running `pytest` from the terminal while in the `tests` directory.
+
+
+
diff --git a/tests/cases/chamber_elastance_inductor.json b/tests/cases/chamber_elastance_inductor.json
@@ -1,19 +1,20 @@
 {
     "description": {
-            "description of test case" : "pulsatile pressure -> valve -> chamber -> valve -> RC -> R",
-            "analytical results" : [
-                                        "Boundary conditions:",
-                                            "inlet:",
-                                                "pressure = sinusoid from 0 to 10 over 0.17s, then 0 for the rest of cycle",
-                                            "outlet:",
-                                                "Resistance: Rd = 1000, Pd = 64"
-                                   ]
+        "description of test case": "pulsatile pressure -> valve -> chamber -> valve -> RC -> R",
+        "analytical results": [
+            "Boundary conditions:",
+            "inlet:",
+            "pressure = sinusoid from 0 to 10 over 0.17s, then 0 for the rest of cycle",
+            "outlet:",
+            "Resistance: Rd = 1000, Pd = 64"
+        ]
     },
     "simulation_parameters": {
         "number_of_cardiac_cycles": 30,
         "number_of_time_pts_per_cardiac_cycle": 101,
+        "absolute_tolerance": 1e-09,
         "output_all_cycles": false,
-        "output_variable_based":true
+        "output_variable_based": true
     },
     "boundary_conditions": [
         {
@@ -295,4 +296,4 @@
     "initial_condition": {
         "Vc:ventricle": 96.07
     }
-}
+}
diff --git a/tests/cases/closedLoopHeart_singleVessel.json b/tests/cases/closedLoopHeart_singleVessel.json
@@ -1,23 +1,21 @@
 {
     "description": {
-            "description of test case" : "Closed-loop circulation with one vessel (aorta) connected on either side to the heart model."
+        "description of test case": "Closed-loop circulation with one vessel (aorta) connected on either side to the heart model."
     },
     "simulation_parameters": {
-        "number_of_cardiac_cycles": 1,
-        "number_of_time_pts_per_cardiac_cycle": 10000,
+        "number_of_cardiac_cycles": 10,
+        "number_of_time_pts_per_cardiac_cycle": 100,
+        "absolute_tolerance": 1e-8,
         "steady_initial": false
     },
     "boundary_conditions": [
         {
             "bc_name": "RCR_aorta",
             "bc_type": "ClosedLoopRCR",
             "bc_values": {
-                "_comment_": "R_total = 1.570879*0.948914 = 1.490629075",
-                "_comment_": "Rp = 0.09*R_total",
-                "_comment_": "Rd = 0.91*R_total",
+                "_comment_": "C = 0.228215*1.044637, R_total = 1.570879*0.948914 = 1.490629075, Rp = 0.09*R_total, Rd = 0.91*R_total",
                 "Rp": 0.134156617,
                 "Rd": 1.356472458,
-                "_comment_": "C = 0.228215*1.044637",
                 "C": 0.238401833,
                 "closed_loop_outlet": true
             }
@@ -34,9 +32,8 @@
             "vessel_length": 10.0,
             "zero_d_element_type": "BloodVessel",
             "zero_d_element_values": {
-                "_comment_": "R = 4.464119/1333.34",
+                "_comment_": "L = 5.25/1333.34, R = 4.464119/1333.34",
                 "R_poiseuille": 0.003348073,
-                "_comment_": "L = 5.25/1333.34",
                 "L": 0.004
             }
         }
@@ -47,37 +44,29 @@
                 "branch0_seg0"
             ],
             "closed_loop_type": "ClosedLoopHeartAndPulmonary",
-            "cardiac_cycle_period": 1.0169, 
+            "cardiac_cycle_period": 1.0169,
             "parameters": {
-                "Tsa": 0.407420,
+                "_comment_": "Lrv_a = 0.249155/pConv, Rrv_a = 0.993637 * this->Rrv_base /pConv, Lra_v = 0.289378/pConv, Rra_v = 10.516664/pConv, Lla_v = 0.469052/pConv, Rla_v = 7.081136/pConv, Rlv_ao = 0.972624 * this->Rlv_base /pConv, Llv_a = 0.147702/pConv, Rpd = 1.120725 * this->Rpd_base /pConv",
+                "Tsa": 0.40742,
                 "tpwave": 8.976868,
                 "Erv_s": 2.125279,
                 "Elv_s": 3.125202,
                 "iml": 0.509365,
                 "imr": 0.806369,
-                "_comment_": "Lrv_a = 0.249155/pConv",
                 "Lrv_a": 0.000186865,
-                "_comment_": "Rrv_a = 0.993637 * this->Rrv_base /pConv",
                 "Rrv_a": 0.035061704,
-                "_comment_": "Lra_v = 0.289378/pConv",
                 "Lra_v": 0.000217032,
-                "_comment_": "Rra_v = 10.516664/pConv",
                 "Rra_v": 0.007887459,
-                "_comment_": "Lla_v = 0.469052/pConv",
                 "Lla_v": 0.000351787,
-                "_comment_": "Rla_v = 7.081136/pConv",
                 "Rla_v": 0.005310825,
-                "_comment_": "Rlv_ao = 0.972624 * this->Rlv_base /pConv",
                 "Rlv_ao": 0.034320234,
-                "_comment_": "Llv_a = 0.147702/pConv",
                 "Llv_a": 0.000110776,
                 "Vrv_u": 9.424629,
                 "Vlv_u": 5.606007,
-                "_comment_": "Rpd = 1.120725 * this->Rpd_base /pConv",
                 "Rpd": 0.098865401,
                 "Cp": 1.090989,
                 "Cpa": 0.556854,
-                "Kxp_ra": 9.222440,
+                "Kxp_ra": 9.22244,
                 "Kxv_ra": 0.004837,
                 "Emax_ra": 0.208858,
                 "Vaso_ra": 4.848742,
@@ -95,4 +84,4 @@
         "V_LV:CLH": 96.07,
         "P_pul:CLH": 8.0
     }
-}
+}
diff --git a/tests/cases/closedLoopHeart_withCoronaries.json b/tests/cases/closedLoopHeart_withCoronaries.json
@@ -1,57 +1,45 @@
 {
     "description": {
-            "description of test case" : "Closed-loop circulation with two RCR outlets and two coronary outlets"
+        "description of test case": "Closed-loop circulation with two RCR outlets and two coronary outlets"
     },
     "simulation_parameters": {
-        "number_of_cardiac_cycles": 1,
-        "number_of_time_pts_per_cardiac_cycle": 10000,
+        "number_of_cardiac_cycles": 10,
+        "number_of_time_pts_per_cardiac_cycle": 100,
+        "absolute_tolerance": 1e-09,
         "steady_initial": false
     },
     "boundary_conditions": [
         {
             "bc_name": "LCA",
             "bc_type": "ClosedLoopCoronaryLeft",
             "bc_values": {
-                "_comment_": "Ra_total = 67.540250*0.361748 = 24.432550357",
-                "_comment_": "Ra = (0.32/0.84)*Ra_total",
-                "_comment_": "Ram = (0.52/0.84)*Ra_total",
+                "_comment_": "Ra_total = 67.540250*0.361748 = 24.432550357, Ra = (0.32/0.84)*Ra_total, Ram = (0.52/0.84)*Ra_total, Ca = 0.000110*5.022065, Rv = 12.864810*2.586199, Cim = 0.000890*4.198904",
                 "Ra": 9.307638231,
                 "Ram": 15.124912126,
-                "_comment_": "Rv = 12.864810*2.586199",
                 "Rv": 33.270958757,
-                "_comment_": "Cim = 0.000890*4.198904",
                 "Cim": 0.003737025,
-                "_comment_": "Ca = 0.000110*5.022065",
                 "Ca": 0.000552427
             }
         },
         {
             "bc_name": "RCA",
             "bc_type": "ClosedLoopCoronaryRight",
             "bc_values": {
-                "_comment_": "Ra_total = 41.778304*0.361748 = 15.113217915",
-                "_comment_": "Ra = (0.32/0.84)*Ra_total",
-                "_comment_": "Ram = (0.52/0.84)*Ra_total",
+                "_comment_": "Ra_total = 41.778304*0.361748 = 15.113217915, Ra = (0.32/0.84)*Ra_total, Ram = (0.52/0.84)*Ra_total, Ca = 0.000110*9.599613, Rv = 7.957772*2.586199, Cim = 0.000890*3.891162",
                 "Ra": 5.757416349,
                 "Ram": 9.355801566,
-                "_comment_": "Rv = 7.957772*2.586199",
                 "Rv": 20.580381989,
-                "_comment_": "Cim = 0.000890*3.891162",
                 "Cim": 0.003463134,
-                "_comment_": "Ca = 0.000110*9.599613",
                 "Ca": 0.001055957
             }
         },
         {
             "bc_name": "RCR_aorta",
             "bc_type": "ClosedLoopRCR",
             "bc_values": {
-                "_comment_": "R_total = 1.570879*0.948914 = 1.490629075",
-                "_comment_": "Rp = 0.09*R_total",
-                "_comment_": "Rd = 0.91*R_total",
+                "_comment_": "R_total = 1.570879*0.948914 = 1.490629075, Rp = 0.09*R_total, Rd = 0.91*R_total, C = 0.228215*1.044637",
                 "Rp": 0.134156617,
                 "Rd": 1.356472458,
-                "_comment_": "C = 0.228215*1.044637",
                 "C": 0.238401833,
                 "closed_loop_outlet": true
             }
@@ -60,12 +48,9 @@
             "bc_name": "RCR_aorta_br",
             "bc_type": "ClosedLoopRCR",
             "bc_values": {
-                "_comment_": "R_total = 6.922824*0.948914 = 6.569164613",
-                "_comment_": "Rp = 0.09*R_total",
-                "_comment_": "Rd = 0.91*R_total",
+                "_comment_": "R_total = 6.922824*0.948914 = 6.569164613, Rp = 0.09*R_total, Rd = 0.91*R_total, C = 0.051785*1.044637",
                 "Rp": 0.591224815,
                 "Rd": 5.977939798,
-                "_comment_": "C = 0.051785*1.044637",
                 "C": 0.054096527,
                 "closed_loop_outlet": true
             }
@@ -82,9 +67,8 @@
             "vessel_name": "branch0_seg0",
             "zero_d_element_type": "BloodVessel",
             "zero_d_element_values": {
-                "_comment_": "R = 4.464119/1333.34",
+                "_comment_": "R = 4.464119/1333.34, L = 5.25/1333.34",
                 "R_poiseuille": 0.003348073,
-                "_comment_": "L = 5.25/1333.34",
                 "L": 0.00393748
             }
         },
@@ -98,9 +82,8 @@
             "vessel_name": "branch1_seg0",
             "zero_d_element_type": "BloodVessel",
             "zero_d_element_values": {
-                "_comment_": "R = 111.152028/1333.34",
+                "_comment_": "R = 111.152028/1333.34, L = 5.25/1333.34",
                 "R_poiseuille": 0.083363604,
-                "_comment_": "L = 5.25/1333.34",
                 "L": 0.00393748
             }
         },
@@ -114,9 +97,8 @@
             "vessel_name": "branch2_seg0",
             "zero_d_element_type": "BloodVessel",
             "zero_d_element_values": {
-                "_comment_": "R = 5855.832840/1333.34",
+                "_comment_": "R = 5855.832840/1333.34, L = 10.0/1333.34",
                 "R_poiseuille": 4.391852671,
-                "_comment_": "L = 10.0/1333.34",
                 "L": 0.007499963
             }
         },
@@ -130,9 +112,8 @@
             "vessel_name": "branch3_seg0",
             "zero_d_element_type": "BloodVessel",
             "zero_d_element_values": {
-                "_comment_": "R = 3013.987966/1333.34",
+                "_comment_": "R = 3013.987966/1333.34, L = 10.0/1333.34",
                 "R_poiseuille": 2.260479672,
-                "_comment_": "L = 10.0/1333.34",
                 "L": 0.007499963
             }
         }
@@ -146,37 +127,29 @@
                 "branch3_seg0"
             ],
             "closed_loop_type": "ClosedLoopHeartAndPulmonary",
-            "cardiac_cycle_period": 1.0169, 
+            "cardiac_cycle_period": 1.0169,
             "parameters": {
-                "Tsa": 0.407420,
+                "_comment_": "Lrv_a = 0.249155/pConv, Rrv_a = 0.993637 * this->Rrv_base /pConv, Lra_v = 0.289378/pConv, Rra_v = 10.516664/pConv, Lla_v = 0.469052/pConv, Rla_v = 7.081136/pConv, Rlv_ao = 0.972624 * this->Rlv_base /pConv, Llv_a = 0.147702/pConv, Rpd = 1.120725 * this->Rpd_base /pConv",
+                "Tsa": 0.40742,
                 "tpwave": 8.976868,
                 "Erv_s": 2.125279,
                 "Elv_s": 3.125202,
                 "iml": 0.509365,
                 "imr": 0.806369,
-                "_comment_": "Lrv_a = 0.249155/pConv",
                 "Lrv_a": 0.000186865,
-                "_comment_": "Rrv_a = 0.993637 * this->Rrv_base /pConv",
                 "Rrv_a": 0.035061704,
-                "_comment_": "Lra_v = 0.289378/pConv",
                 "Lra_v": 0.000217032,
-                "_comment_": "Rra_v = 10.516664/pConv",
                 "Rra_v": 0.007887459,
-                "_comment_": "Lla_v = 0.469052/pConv",
                 "Lla_v": 0.000351787,
-                "_comment_": "Rla_v = 7.081136/pConv",
                 "Rla_v": 0.005310825,
-                "_comment_": "Rlv_ao = 0.972624 * this->Rlv_base /pConv",
                 "Rlv_ao": 0.034320234,
-                "_comment_": "Llv_a = 0.147702/pConv",
                 "Llv_a": 0.000110776,
                 "Vrv_u": 9.424629,
                 "Vlv_u": 5.606007,
-                "_comment_": "Rpd = 1.120725 * this->Rpd_base /pConv",
                 "Rpd": 0.098865401,
                 "Cp": 1.090989,
                 "Cpa": 0.556854,
-                "Kxp_ra": 9.222440,
+                "Kxp_ra": 9.22244,
                 "Kxv_ra": 0.004837,
                 "Emax_ra": 0.208858,
                 "Vaso_ra": 4.848742,
@@ -194,4 +167,4 @@
         "V_LV:CLH": 96.07,
         "P_pul:CLH": 8.0
     }
-}
+}