Closes #719

Author: dhblum

releasenotes.md

@@ -8,6 +8,7 @@ Released on xx/xx/xxxx.
 
 - Update heat pump documentation to BESTEST Hydronic Heat Pump testcase. This is for [#704](https://github.com/ibpsa/project1-boptest/issues/704).
 - Enable BACnet interface to work with test case ``multizone_hydronic_simple_hydronic`` by creating the ``bacnet.ttl``. This is for [#735](https://github.com/ibpsa/project1-boptest/issues/735).
+- Remove the ``scenario`` field from the test case ``config.json``. This is for [#719](https://github.com/ibpsa/project1-boptest/issues/719).
 
 **The following changes are not backwards-compatible and significantly change benchmark results:**
 

testcase.py

@@ -90,7 +90,9 @@ def __init__(self, fmupath='models/wrapped.fmu'):
         # Initialize test case
         self.initialize(self.config_json['start_time'], self.config_json['warmup_period'])
         # Set default scenario
-        self.set_scenario(self.config_json['scenario'])
+        scenario_default = {'electricity_price':'constant',
+                            'time_period': None}
+        self.set_scenario(scenario_default)
 
     def __initilize_data(self):
         '''Initializes objects for simulation data storage.

testcases/bestest_air/models/config.json

@@ -3,7 +3,5 @@
 "area"          : 48.0,
 "start_time"    : 0.0,
 "warmup_period" : 0.0,
-"step"          : 3600.0,
-"scenario"      : {"electricity_price":"constant",
-                   "time_period":null}
+"step"          : 3600.0
 }

testcases/bestest_hydronic/models/config.json

@@ -3,7 +3,5 @@
 "area"          : 48.0,
 "start_time"    : 0.0,
 "warmup_period" : 0.0,
-"step"          : 3600.0,
-"scenario"      : {"electricity_price":"constant",
-                   "time_period":null}
+"step"          : 3600.0
 }

testcases/bestest_hydronic_heat_pump/models/config.json

@@ -3,7 +3,5 @@
 "area"          : 192.0,
 "start_time"    : 0.0,
 "warmup_period" : 0.0,
-"step"          : 3600.0,
-"scenario"      : {"electricity_price":"constant",
-                   "time_period":null}
+"step"          : 3600.0
 }

testcases/multizone_office_simple_air/models/config.json

@@ -3,7 +3,5 @@
 "area"          : 1662.66,
 "start_time"    : 0.0,
 "warmup_period" : 0.0,
-"step"          : 3600.0,
-"scenario"      : {"electricity_price":"constant",
-                   "time_period":null}
+"step"          : 3600.0
 }

testcases/multizone_office_simple_hydronic/models/config.json

@@ -3,9 +3,5 @@
 "area"          : 5000,
 "start_time"    : 0.0,
 "warmup_period" : 0.0,
-"step"          : 3600.0,
-"horizon"       : 86400.0,
-"interval"      : 3600.0,
-"scenario"      : {"electricity_price":"constant",
-                   "time_period":null}
+"step"          : 3600.0
 }

testcases/multizone_residential_hydronic/models/config.json

@@ -3,7 +3,5 @@
 "area"          : 81.08,
 "start_time"    : 0.0,
 "warmup_period" : 0.0,
-"step"          : 3600.0,
-"scenario"      : {"electricity_price":"constant",
-                   "time_period":null}
+"step"          : 3600.0
 }

testcases/singlezone_commercial_hydronic/models/config.json

@@ -3,7 +3,5 @@
 "area"          : 8500.0,
 "start_time"    : 0.0,
 "warmup_period" : 0.0,
-"step"          : 3600.0,
-"scenario"      : {"electricity_price":"constant",
-                   "time_period":null}
+"step"          : 3600.0
 }

testcases/testcase1/models/config.json

@@ -2,6 +2,5 @@
 "area"          : 10.0,
 "start_time"    : 0.0,
 "warmup_period" : 0.0,
-"step"          : 60.0,
-"scenario"      : {"electricity_price":"constant",
-                   "time_period":null}}
+"step"          : 60.0
+}