Commit 914ea512 authored by Aaron Bray's avatar Aaron Bray
Browse files

Merge branch 'feature/custom_timesteps' into 'master'

Custom timesteps

See merge request !78
parents 432ffafc a0d93f9c
......@@ -33,7 +33,7 @@ set(CMAKE_DEBUG_POSTFIX "d")
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
project(Pulse VERSION 3.0.0 LANGUAGES C CXX)
project(Pulse VERSION 3.1.0 LANGUAGES C CXX)
#-----------------------------------------------------------------------------
# Project install directories
......@@ -126,7 +126,7 @@ if(MSVC)
# Using MD as that seems to be what I run into alot, you could change these to /MT and /MTd if you want...
set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Zi /Ob2 /Oi /Od /RTC1 /MP /EHsc" CACHE STRING INTERNAL FORCE)
set(CMAKE_CXX_FLAGS_RELEASE "/MD /MP /EHsc" CACHE STRING INTERNAL FORCE)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MDd /Zi /MP /EHsc" CACHE STRING INTERNAL FORCE)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /Zi /MP /EHsc" CACHE STRING INTERNAL FORCE)
endif()
if ( CMAKE_COMPILER_IS_GNUCC )
# Protobuf is not using the same variable name in its swap specificiation definitions
......
{
"Configuration": {
"TimeStep" : { "ScalarTime": { "Value": 0.02, "Unit": "s" } }
},{"Scenario": {
"Name":"BasicStandard",
"Description":"Basic scenario measuring patient vitals with no insults or interventions",
"EngineStateFile":"./states/StandardMale@0s.pbb",
......@@ -93,4 +96,21 @@
{"DecimalFormat":{"Precision":2}, "Category":"LiquidCompartment","CompartmentName":"Pericardium","PropertyName":"Pressure","Unit":"mmHg"}
]},
"AnyAction":[{"AdvanceTime":{"Time":{"ScalarTime":{"Value":2.0,"Unit":"min"}}}}]}
\ No newline at end of file
"AnyAction":[{"AdvanceTime":{"Time":{"ScalarTime":{"Value":2.0,"Unit":"min"}}}}]},
"Configuration": {
"AutoSerialization": {
"Directory": "./states/testing/",
"Filename": "patient/HemorrhageVaryingSeverity",
"AfterActions": "On",
"Period": {
"ScalarTime": {
"Value": 5.0,
"Unit": "s"
}
},
"PeriodTimeStamps": "On",
"ReloadState": "On"
}
}
}}
......@@ -7,6 +7,7 @@ add_external_project_ex( Dirent
URL "https://github.com/tronkko/dirent/archive/1.23.2.zip"
URL_HASH MD5=43514791ab73ef5ac7c490afc7c3bab2
CMAKE_CACHE_ARGS
-DBUILD_TESTING:BOOL=OFF
-DDIRENT_BUILD_TESTS:BOOL=OFF
RELATIVE_INCLUDE_PATH ""
DEPENDENCIES ""
......
......@@ -4,8 +4,8 @@
include(AddExternalProject)
define_external_dirs_ex( Eigen3 )
add_external_project_ex( Eigen3
URL "https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.gz"
URL_HASH MD5=9e30f67e8531477de4117506fe44669b
URL "https://gitlab.com/libeigen/eigen/-/archive/3.3.9/eigen-3.3.9.tar.gz"
URL_HASH MD5=609286804b0f79be622ccf7f9ff2b660
CMAKE_CACHE_ARGS
-DBUILD_TESTING:BOOL=OFF
RELATIVE_INCLUDE_PATH ""
......
......@@ -14,8 +14,8 @@ endif()
include(AddExternalProject)
define_external_dirs_ex(protobuf)
add_external_project_ex( protobuf
URL https://github.com/protocolbuffers/protobuf/releases/download/v3.12.2/protobuf-all-3.12.2.zip
URL_MD5 ec63c1566640a5873566e76ec8eb1398
URL https://github.com/protocolbuffers/protobuf/releases/download/v3.14.0/protobuf-all-3.14.0.zip
URL_MD5 82cba836a6085599fae030d6c071d4a3
SOURCE_SUBDIR ./cmake
CMAKE_CACHE_ARGS
-DBUILD_SHARED_LIBS:BOOL=OFF
......
......@@ -20,7 +20,7 @@ Threads=-1
#UseStates=true
# AutoSerialize = Directory,Period(in seconds, 0 turns off constant saving),TimeStampPeriods,AfterActions,Reload
# Time stamp periods is creating a file per save and using the time stamp as naming convention
#AutoSerialization=./states/testing/,5,On,On,On
#AutoSerialization=./states/testing/,0,On,On,On
Executor=com.kitware.pulse.cdm.testing.CDMUnitTestDriver
Executor=com.kitware.pulse.engine.testing.EngineUnitTestDriver
......@@ -32,3 +32,4 @@ Macro EngineUnitTestFull=EngineUnitTestDriver FullPlot Baseline=unit_tests/pulse
Macro ScenarioTest=ScenarioTestDriver FastPlot Baseline=scenarios/ Computed=./test_results/scenarios
patient/BasicStandard.json = ScenarioTest
......@@ -134,9 +134,19 @@ equipment/InhalerOneActuationWithSpacerIncorrectUse.json = ScenarioTest
equipment/InhalerTwoActuations.json = ScenarioTest
equipment/MainstemIntubation.json = ScenarioTest
equipment/MechanicalVentilation.json = ScenarioTest
equipment/MechanicalVentilatorPressureControlledARDS.json = ScenarioTest
equipment/MechanicalVentilatorPressureControlledVaried.json = ScenarioTest
equipment/MechanicalVentilatorVolumeControlledARDS.json = ScenarioTest
equipment/MechanicalVentilator_PC-CMV_ARDS_Varied.json = ScenarioTest
equipment/MechanicalVentilator_PC-CMV_COPD_Varied.json = ScenarioTest
equipment/MechanicalVentilator_PC-CMV_Healthy.json = ScenarioTest
equipment/MechanicalVentilator_PC-CMV_Mild_ARDS.json = ScenarioTest
equipment/MechanicalVentilator_PC-CMV_Mild_COPD.json = ScenarioTest
equipment/MechanicalVentilator_PC-CMV_Moderate_ARDS.json = ScenarioTest
equipment/MechanicalVentilator_PC-CMV_Moderate_COPD.json = ScenarioTest
equipment/MechanicalVentilator_PC-CMV_Severe_ARDS.json = ScenarioTest
equipment/MechanicalVentilator_PC-CMV_Severe_COPD.json = ScenarioTest
equipment/MechanicalVentilator_PC-CMV_Varied.json = ScenarioTest
equipment/MechanicalVentilator_VC-AC_ARDS.json = ScenarioTest
equipment/MechanicalVentilator_VC-AC_Healthy.json = ScenarioTest
equipment/MechanicalVentilator_VC-CMV_Healthy.json = ScenarioTest
equipment/NasalCannula.json = ScenarioTest
equipment/NonRebreatherMask.json = ScenarioTest
equipment/SimpleMask.json = ScenarioTest
......
a94475d457ebd784e93c80c2537854b05a798bc31359ccbffdfadbbb14f717f80f2043df52735c0c896e00c34cb5dfe833ccfdad65f3dd5ab43d312589c7125f
\ No newline at end of file
a4d046ca9f0db97cd0aa986b4f42dc92f33177c2a00b0d62028d383e8a4fcd4f7f9ad4eef3424b24860670e1bd8daea994e71b889bdaf4b7c7b1c92b1bdbcc5c
\ No newline at end of file
aa5c58d9e461d48ac53f26ec010fc0e54cc2938215e97c305d85c1be5c61f26172d0d07a3c513185379317fc4ea0b939094b737f31bb51326e0b16269e36db4d
\ No newline at end of file
e74d47f67b5dc545a6c8561a8ac7995af97eddda5b26c8ae7d5c07f69093a5f2c05779d1cd3e4384dcaed3646dae1080d9639c31cd53f0e6685634d2e47778ff
\ No newline at end of file
1f03a5e697c054474caa454cf5f94baba5d5df431885ac08415ab3ba10dd2c630ae1db73c2d2621fc4082380cce672b0d4731cd04eea019f25fce86b4a30b1b9
\ No newline at end of file
c5b0b20c6228080089f28d71afbb107bf94e851ea6d0f0c0d0805e8271764d07831a2ce6874e37cdd82a847e0b429fab4528a1b8d466e69f96ee3e266198f92a
\ No newline at end of file
17e6c49a7640b21a795f3a23e291e4ef68abf462bcffd355db10909a194ef60e7b71534571a017dc8a1f0b6a55e9ab3010f8c898a109e8a3b66e38e83ff37aa1
\ No newline at end of file
815cc104aee197328c246f7fb830eac7aae38f0a9cd4e3a0e83f0aed981f8201ce2081e495e0ceab2159d9a85bf083be4f1da6a90f79394b47a0a8ac8256c549
\ No newline at end of file
59baa74120c2e40bc84cdc043e0370d8bc1c07bfaff8b5a91c43aa944e485b908069dec708f3a09bd27bff85443cb8411d0ef288cbdc958f4e058d77628f4717
\ No newline at end of file
f0aed8d67af1607e1f527ea82106a388303bbb7f791d9a5d07d7521e7ba4f5fad7e13bc2baedb5f1982183f86df04657c33eeb8915c2dc6303b84284e34cb35a
\ No newline at end of file
977722162892f4463667b38178b99a854db4c790e92b97b7bfb0a3e2f1ae35d76cf74b9373de6fbdc77d9295774edf111e348494e3315c3ba9df5647a5c05d53
\ No newline at end of file
49ddacd4a885a33c84d638a8eb6ad19fb608291421a1b971ab9b1be55bb3f1c01cfdd86ad30e79ca329a21d98acee3774b87ad7b11aab60c79299dcce244edf4
\ No newline at end of file
a3709e5ac2c67e6d5e685305591dc7fa343a8bfea00e48aab659b804ff66dc6108ee669d2bc17db6bb5e595c04a48cf53493df1857e03288ec839039b9e80925
\ No newline at end of file
4ba2f9ee2ac8439b2ff574dfaccb14dfc56b7d426c1791dd393ffc90461970450c6d4bb285e61220076968a30aca3a931890a06e04e8d9a6dd2c32477a2a4d4f
\ No newline at end of file
b465cda97e86a6aee8802f581b81c8457fd43109556c10b729b694ec5f3f25efed17e2760e7fff56bfd5dab62ea03f99a2599d6f2e318f4807587fa5b35ca7e4
\ No newline at end of file
925a4293f275aa5c16e58e3dc937a2f3e134f644618032b18fc10eb8589a629b132f2a4444f8e3a8e6736a583f1cbe2be2c6ffcd6e53932a3284cd6342c6ed00
\ No newline at end of file
7e0bb2eb94ffd6d04fb2a07add0eb9d9e2289275e73445a5a9ff268488e566ad3e01b80d55f1103362b13cec7ba8013e771196811c6cd1101f1f3128495f1b3f
\ No newline at end of file
60487543abe7fb17157ebffead8203d2d92ff47a1c6fdad41e1a72d4866462ce8ba29cd0b0c86aee4d64668fa377585ec3466bfbc2d4da2dbe66b50f7daa265d
\ No newline at end of file
38de3a4a241541a505aa92dafbaa70c2750a6e58176c55fa61cb424a59ba454c35f55606640da39183327ba1bf5fb7fd7231e6293f773ec01dfc9fdbd475c3c3
\ No newline at end of file
54c068d50b68a909659f6280361b35f957ecf01fcaa3360b45e3c8397a55804d3e094819bb42416893de385c2f09884e0c915d89c12dde75848736813d662509
\ No newline at end of file
c1cd81570e12cdc188fb72410d2827910a0b584fa6a9a0307d2a74bd5382d52ec04ed1efe2d8b79a747f1b4df1d0c09fa33baab986588411363a9f9f547bdc8a
\ No newline at end of file
a2c5524f982b524851e7cbf141e84c2cf0e72ea555c2e84c9a4174b98e7a6d778ed8097e63decd022b0c2a15abfd1581ca8730883b8444326fc8f94046a101e2
\ No newline at end of file
42e7fa239dea02aec790d47e751e1d9aafe5ebf2b2c321faba7b0b3cdc9976deb1e621624cc6129800b735a79b22e7646b8016dd2e143160569840650ec85dc4
\ No newline at end of file
86b0ef23ea75b5401d1dc442a6686adec510136faf06128bf808884d6ea2c6cebb1c6446a9a7cc05020a24d48e0e8105e8f562f5889de7302df3c118d36fd580
\ No newline at end of file
3a182c3db83978e6276851790cfa85c88ba431ac994ddeaca3637dbd608d48b0173db09569ab33f532760ad842e28196c5fb7479c55cd2cb516fea8f030b304b
\ No newline at end of file
53d6332282acfadff6d069e985eecad14c556f84c8b789592af8feb1fab8dba83d37d8c94b89bb9203c38d0b7ea8f62a24400b1f6fea9c9c9aaeb6828ddc39f8
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment