Adjust parameters

environment_setup/Dockerfile

@@ -70,7 +70,7 @@ WORKDIR /opt
 RUN git clone https://git.cs.usask.ca/numerical_simulations_lab/cardiac/openCARP.git
 WORKDIR /opt/openCARP
 RUN git checkout develop 
-RUN cmake -S. -B_build -DDLOPEN=ON -DUSE_OPENMP=ON -DCMAKE_BUILD_TYPE=Release
+RUN cmake -S. -B_build -DDLOPEN=ON -DUSE_OPENMP=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_ACTORS=ON
 RUN cmake --build _build
 
 # Install Carputils separately

simulations/input/config_official.toml

@@ -5,6 +5,7 @@ results_file = "results.csv"
 tolerance = 1000
 
 # s1 parameters
+s1_args = ['openCARP', '+F', '/code/openCARP-Actors/simulations/input/s1.par']
 s1_min = 28167114.0
 s1_max = 28167700.0
 
@@ -15,10 +16,5 @@ s2_max = 1.0e8
 s2_interval_min = 185
 s2_interval_max = 205
 s2_interval_increment = 1
-skip_S1 = true # If True we use S1_max as the stimulus strength for S1 in the S2 simulation.
+# skip_S1 = true # If True we use S1_max as the stimulus strength for S1 in the S2 simulation.
 
-
-[petsc]
-
-[openCARP]
-args = ['openCARP', '+F', '/code/openCARP-Actors/simulations/input/s1.par']

tests/input/config_test.toml

@@ -5,8 +5,9 @@ results_file = "/code/openCARP-Actors/tests/output/results.csv"
 tolerance = 1
 
 # s1 parameters
-s1_min = 32.0
-s1_max = 32.0
+s1_args = ['openCARP', '+F', '/code/openCARP-Actors/tests/input/s1.par']
+s1_min = 1.0
+s1_max = 50.0
 
 # s2 parameters
 s2_args = ['openCARP', '+F', '/code/openCARP-Actors/tests/input/s2.par']
@@ -15,10 +16,4 @@ s2_max = 500.0
 s2_interval_min = 245
 s2_interval_max = 250
 s2_interval_increment = 5
-skip_S1 = true # If True we use S1_max as the stimulus strength for S1 in the S2 simulation.
-
-
-[petsc]
-
-[openCARP]
-args = ['openCARP', '+F', '/code/openCARP-Actors/tests/input/s1.par']
+# skip_S1 = true # If True we use S1_max as the stimulus strength for S1 in the S2 simulation.
\ No newline at end of file