diff --git a/environment_setup/Dockerfile b/environment_setup/Dockerfile index b4ac9276cc6aa0d5c89fd79a19efceeab19a3eee..702a85f440b02dc7058bce354e27ce6ac6967e14 100755 --- a/environment_setup/Dockerfile +++ b/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 @@ -85,7 +85,6 @@ ENV PATH=$PATH:/opt/openCARP/_build/bin RUN python3 ./bin/cusettings $HOME/.config/carputils/settings.yaml ADD settings.yaml /root/.config/carputils/ - # Set entrypoint WORKDIR /code diff --git a/simulations/input/config_official.toml b/simulations/input/config_official.toml index 65cf5688f8b9bce09852be684d03be2ccc3d0210..72267e022f0e37e29812dcc31a9fe51a951a5054 100644 --- a/simulations/input/config_official.toml +++ b/simulations/input/config_official.toml @@ -8,10 +8,12 @@ tolerance = 1000 s1_min = 28167114.0 s1_max = 28167700.0 +s1_skip_strength = 28167700.0 + # s2 parameters s2_args = ['openCARP', '+F', '/code/openCARP-Actors/simulations/input/s2.par'] -s2_min = 1.0e7 -s2_max = 1.0e8 +s2_min = 28167700.0 +s2_max = 32503400.0 s2_interval_min = 185 s2_interval_max = 205 s2_interval_increment = 1