Merge branch 'master' into issue663_UpdatePythonDependancies

Author: dhblum

bacnet/create_ttl.py

@@ -18,7 +18,7 @@
 baseurl = 'http://127.0.0.1:80'
 
 # Instatiate test case
-test_case_name = 'singlezone_commercial_hydronic'
+test_case_name = 'multizone_office_simple_hydronic'
 testid = requests.post("{0}/testcases/{1}/select".format(baseurl, test_case_name)).json()["testid"]
 
 # Write the file prefix

releasenotes.md

@@ -7,10 +7,12 @@ Released on xx/xx/xxxx.
 **The following changes are backwards compatible and do not significantly change benchmark results:**
 
 - Update heat pump documentation to BESTEST Hydronic Heat Pump testcase. This is for [#704](https://github.com/ibpsa/project1-boptest/issues/704).
-- Remove scipy and matplotlib dependencies from worker container. scipy.integrate.trapz was substituted with numpy.trapezoid in ``kpis/kpi_calculator.py``,
-scipy.interp1d linear with numpy.interp, and scipy.inter1d zero with a custom zero hold interpolation in ``data/data_manager.py``.
-Update pyfmi from 2.12 to 2.14, update numpy from 1.26.4 to 2.2.1, and update pandas from 1.5.3 to 2.2.3.
-Update worker Python from 3.10 to 3.11, and miniconda version from py310_24.30-1-Linux-x86_64 to py311_24.7.1-0-Linux-x86_64.
+- 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).
+- Remove scipy and matplotlib dependencies from ``worker`` container. Substitute ``scipy.integrate.trapz`` with ``numpy.trapezoid`` in ``kpis/kpi_calculator.py``, ``scipy.interp1d`` linear with ``numpy.interp``, and ``scipy.inter1d`` zero with a custom zero hold interpolation in ``data/data_manager.py``.
+Update ``pyfmi`` from 2.12 to 2.14, update ``numpy`` from 1.26.4 to 2.2.1, and update ``pandas`` from 1.5.3 to 2.2.3.
+Update ``worker`` Python from 3.10 to 3.11, and ``miniconda`` version from ``py310_24.30-1-Linux-x86_64`` to ``py311_24.7.1-0-Linux-x86_64``.
+Update unit tests such that ``test_kpis.py``, ``test_forecast.py``, and ``test_testcase.py`` are run in the ``worker`` container, instead of the ``jm`` container.
 This is for [#663](https://github.com/ibpsa/project1-boptest/issues/663).
 
 **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
 }