From 28e5fd632699213cf021faf374d23c79ac721b01 Mon Sep 17 00:00:00 2001
From: KyleKlenk <kyle.c.klenk@gmail.com>
Date: Thu, 31 Aug 2023 20:02:05 +0000
Subject: [PATCH] Added additional options to the config files

---
 .gitignore                             |  2 ++
 simulations/input/config_official.toml | 11 ++++++-----
 tests/input/config_test.toml           |  9 +++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7af9cc7..fc6ea63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 results.csv
 tests/output/*
 simulations/output/*
+simulations/input/screenlog.0
+simulations/output*
diff --git a/simulations/input/config_official.toml b/simulations/input/config_official.toml
index 8a26acb..65cf568 100644
--- a/simulations/input/config_official.toml
+++ b/simulations/input/config_official.toml
@@ -5,19 +5,20 @@ results_file = "results.csv"
 tolerance = 1000
 
 # s1 parameters
-s1_min = 1.0e7
-s1_max = 3.0e7
+s1_min = 28167114.0
+s1_max = 28167700.0
 
 # s2 parameters
 s2_args = ['openCARP', '+F', '/code/openCARP-Actors/simulations/input/s2.par']
-s2_min = 1.0e8
-s2_max = 3.0e8
+s2_min = 1.0e7
+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.
 
 
 [petsc]
 
 [openCARP]
-args = ['openCARP', '+F', '/code/openCARP-Actors/simulations/input/s1.par']
\ No newline at end of file
+args = ['openCARP', '+F', '/code/openCARP-Actors/simulations/input/s1.par']
diff --git a/tests/input/config_test.toml b/tests/input/config_test.toml
index 86ded19..077ee7d 100644
--- a/tests/input/config_test.toml
+++ b/tests/input/config_test.toml
@@ -5,19 +5,20 @@ results_file = "/code/openCARP-Actors/tests/output/results.csv"
 tolerance = 1
 
 # s1 parameters
-s1_min = 1.0
-s1_max = 250.0
+s1_min = 32.0
+s1_max = 32.0
 
 # s2 parameters
-s2_args = ['openCARP', '+F', '//code/openCARP-Actors/tests/input/s2.par']
+s2_args = ['openCARP', '+F', '/code/openCARP-Actors/tests/input/s2.par']
 s2_min = 100.0
 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']
\ No newline at end of file
+args = ['openCARP', '+F', '/code/openCARP-Actors/tests/input/s1.par']
\ No newline at end of file
-- 
GitLab