Commit 2b63c5a1 authored by Aaron Bray's avatar Aaron Bray
Browse files

Update environment scenarios with new action/condtion names

parent 41d73c90
......@@ -32,4 +32,3 @@ Macro EngineUnitTestFull=EngineUnitTestDriver FullPlot Baseline=unit_tests/pulse
Macro ScenarioTest=ScenarioTestDriver FastPlot Baseline=scenarios/ Computed=./test_results/scenarios
patient/BasicStandard.json = ScenarioTest
......@@ -6,8 +6,8 @@
"PatientFile": "StandardMale.json",
"Conditions": { "AnyCondition": [{
"EnvironmentCondition": {
"InitialEnvironmentConditions": {
"ConditionsFile": "./environments/CarbonMonoxideAtmospheric.json"
"InitialEnvironmentalConditions": {
"EnvironmentalConditionsFile": "./environments/CarbonMonoxideAtmospheric.json"
}
}
}]}
......@@ -566,8 +566,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"Conditions": {
"ChangeEnvironmentalConditions": {
"EnvironmentalConditions": {
"AmbientGas": [{
"Name": "Nitrogen",
"Amount": {
......
......@@ -559,8 +559,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"Conditions": {
"ChangeEnvironmentalConditions": {
"EnvironmentalConditions": {
"AmbientGas": [{
"Name": "Nitrogen",
"Amount": {
......
......@@ -447,8 +447,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"Conditions": {
"ChangeEnvironmentalConditions": {
"EnvironmentalConditions": {
"SurroundingType": "Water",
"AirVelocity": {
"ScalarLengthPerTime": {
......@@ -530,8 +530,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"Conditions": {
"ChangeEnvironmentalConditions": {
"EnvironmentalConditions": {
"SurroundingType": "Air",
"AirVelocity": {
"ScalarLengthPerTime": {
......
......@@ -6,8 +6,8 @@
"PatientFile": "StandardMale.json",
"Conditions": { "AnyCondition": [{
"EnvironmentCondition": {
"InitialEnvironmentConditions": {
"ConditionsFile": "./environments/CheyenneMountainAprilWarm.json"
"InitialEnvironmentalConditions": {
"EnvironmentalConditionsFile": "./environments/CheyenneMountainAprilWarm.json"
}
}
}]}
......@@ -551,8 +551,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"ConditionsFile": "./environments/CheyenneMountainFireFighter.json"
"ChangeEnvironmentalConditions": {
"EnvironmentalConditionsFile": "./environments/CheyenneMountainFireFighter.json"
}
}
}, {
......
......@@ -528,8 +528,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"Conditions": {
"ChangeEnvironmentalConditions": {
"EnvironmentalConditions": {
"SurroundingType": "Air",
"AirVelocity": {
"ScalarLengthPerTime": {
......
......@@ -528,8 +528,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"ConditionsFile": "./environments/Hypobaric3000m.json"
"ChangeEnvironmentalConditions": {
"EnvironmentalConditionsFile": "./environments/Hypobaric3000m.json"
}
}
}, {
......
......@@ -6,8 +6,8 @@
"PatientFile": "StandardMale.json",
"Conditions": { "AnyCondition": [{
"EnvironmentCondition": {
"InitialEnvironmentConditions": {
"ConditionsFile": "./environments/Hypobaric3000m.json"
"InitialEnvironmentalConditions": {
"EnvironmentalConditionsFile": "./environments/Hypobaric3000m.json"
}
}
}]}
......
......@@ -6,8 +6,8 @@
"PatientFile": "StandardMale.json",
"Conditions": { "AnyCondition": [{
"EnvironmentCondition": {
"InitialEnvironmentConditions": {
"Conditions": {
"InitialEnvironmentalConditions": {
"EnvironmentalConditions": {
"SurroundingType": "Air",
"AirVelocity": {
"ScalarLengthPerTime": {
......
......@@ -686,8 +686,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"Conditions": {
"ChangeEnvironmentalConditions": {
"EnvironmentalConditions": {
"SurroundingType": "Air",
"AirVelocity": {
"ScalarLengthPerTime": {
......@@ -1090,8 +1090,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"ConditionsFile": "./environments/CheyenneMountainFireFighter.json"
"ChangeEnvironmentalConditions": {
"EnvironmentalConditionsFile": "./environments/CheyenneMountainFireFighter.json"
}
}
}, {
......
......@@ -538,8 +538,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"Conditions": {
"ChangeEnvironmentalConditions": {
"EnvironmentalConditions": {
"AmbientGas": [{
"Name": "Nitrogen",
"Amount": {
......
......@@ -786,8 +786,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"ConditionsFile": "./environments/CheyenneMountainFireFighter.json"
"ChangeEnvironmentalConditions": {
"EnvironmentalConditionsFile": "./environments/CheyenneMountainFireFighter.json"
}
}
}, {
......@@ -848,13 +848,13 @@
"Unit": "s"
}
},
"HoldPeriod": {
"HoldPeriod": {
"ScalarTime": {
"Value": 3.0,
"Unit": "s"
}
},
"ReleasePeriod": {
"ReleasePeriod": {
"ScalarTime": {
"Value": 5.0,
"Unit": "s"
......
......@@ -88,8 +88,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"ConditionsFile": "./environments/AnchorageDecember.json"
"ChangeEnvironmentalConditions": {
"EnvironmentalConditionsFile": "./environments/AnchorageDecember.json"
}
}
}, {
......@@ -103,8 +103,8 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"ConditionsFile": "./environments/AnchorageInside.json"
"ChangeEnvironmentalConditions": {
"EnvironmentalConditionsFile": "./environments/AnchorageInside.json"
}
}
}, {
......
......@@ -139,13 +139,13 @@
},
"AnyAction": [{
"EnvironmentAction": {
"Conditions": {
"ChangeEnvironmentalConditions": {
"EnvironmentAction": {
"Action": {
"Comment": "Insult: High altitude"
}
},
"ConditionsFile": "./environments/CheyenneMountainAprilCool.json"
"EnvironmentalConditionsFile": "./environments/CheyenneMountainAprilCool.json"
}
}
}, {
......@@ -183,13 +183,13 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"ChangeEnvironmentalConditions": {
"EnvironmentAction": {
"Action": {
"Comment": "Insult: Increased temperature"
}
},
"Conditions": {
"EnvironmentalConditions": {
"AmbientTemperature": {
"ScalarTemperature": {
"Value": 20.0,
......@@ -222,13 +222,13 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"ChangeEnvironmentalConditions": {
"EnvironmentAction": {
"Action": {
"Comment": "Insult: Increased ambient temperature"
}
},
"ConditionsFile": "./environments/CheyenneMountainAprilWarm.json"
"EnvironmentalConditionsFile": "./environments/CheyenneMountainAprilWarm.json"
}
}
}, {
......@@ -303,13 +303,13 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"ChangeEnvironmentalConditions": {
"EnvironmentAction": {
"Action": {
"Comment": "Intervention: Remove clothing"
}
},
"Conditions": {
"EnvironmentalConditions": {
"ClothingResistance": {
"ScalarHeatResistanceArea": {
"Value": 0.5,
......@@ -395,13 +395,13 @@
}
}, {
"EnvironmentAction": {
"Conditions": {
"ChangeEnvironmentalConditions": {
"EnvironmentAction": {
"Action": {
"Comment": "Intervention: Environment change, inside an ambulance"
}
},
"ConditionsFile": "./environments/CheyenneMountainAmbulance.json"
"EnvironmentalConditionsFile": "./environments/CheyenneMountainAmbulance.json"
}
}
}, {
......
Supports Markdown
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