Merge pull request #489 from ibpsa/issue409_twoZoneApartmentHydronic

Closes #409

.travis.yml

@@ -65,6 +65,9 @@ jobs:
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 matplotlib==3.3.4 requests==2.25.1
     script: cd testing && make build_jm_image && make test_multizone_office_simple_air
+  - python: 3.9
+    install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 matplotlib==3.3.4 requests==2.25.1
+    script: cd testing && make build_jm_image && make test_twozone_apartment_hydronic
   - python: 2.7
     install: pip install --upgrade pip && pip install pandas==0.24.2 numpy==1.16.6 matplotlib==2.1.1 requests==2.18.4
     script: cd testing && make test_python2

releasenotes.md

@@ -12,8 +12,14 @@ Released on xx/xx/xxxx.
 - Add error message in case testcase path does not exist in ``testcase.py TestCase __Init__`` method.  This is for [#475](https://github.com/ibpsa/project1-boptest/issues/475).
 
 **The following changes are not backwards-compatible but do not significantly change benchmark results:**
+
 - Change the PUT ``results`` API to accept lists of variable names with the parameter ``point_names`` instead of a single string variable name ``point_name``.  This is for [#398](https://github.com/ibpsa/project1-boptest/issues/398).
 
+**The following new test cases have been added:**
+
+- ``twozone_apartment_hydronic``, a 2-zone apartment based on a real newly built building in Milan, Italy, served by an air-to-water heat pump coupled with a floor heating system. This is for [#409](https://github.com/ibpsa/project1-boptest/issues/409).
+
+
 ## BOPTEST v0.3.0
 
 Released on 07/27/2022.

testcases/README.md

@@ -10,6 +10,7 @@ This directory contains test cases for BOPTEST.  A summary of available test cas
 | ``bestest_air``| BESTEST Case 900 room model with idealized fan coil unit.|**Electricity Prices**: <br />``'constant'``, <br />``'dynamic'``, <br />``'highly_dynamic'``<br />**Time Periods**:<br />``'peak_heat_day'``, <br />``'typical_heat_day'``, <br />``'peak_cool_day'``, <br />``'typical_cool_day'``, <br />``'mix_day'``|
 | ``bestest_hydronic``| BESTEST Case 900 room model with gas boiler and radiator.|**Electricity Prices**: <br />``'constant'``, <br />``'dynamic'``, <br />``'highly_dynamic'``<br />**Time Periods**: <br />``'peak_heat_day'``, <br />``'typical_heat_day'``|
 | ``bestest_hydronic_heat_pump``| BESTEST Case 900 room model, scaled by four in floor area, that uses a heat pump as heating production system and floor heating as heating emission system.|**Electricity Prices**: <br />``'constant'``, <br />``'dynamic'``, <br />``'highly_dynamic'``<br />**Time Periods**: <br />``'peak_heat_day'``, <br />``'typical_heat_day'``|
+| ``twozone_apartment_hydronic``| Low energy consumption two room aparment in Milan. Only heating is considered. The generation system is a heat pump and the emission system is floor heating. |**Electricity Prices**: <br />``'constant'``, <br />``'dynamic'``, <br />``'highly_dynamic'``<br />**Time Periods**: <br />``'peak_heat_day'``, <br />``'typical_heat_day'``|
 | ``multizone_residential_hydronic``| Multi-zone residential hydronic model with gas boiler, radiators, and ideal cooling system. |**Electricity Prices**: <br />``'constant'``, <br />``'dynamic'``, <br />``'highly_dynamic'``<br />**Time Periods**: <br />``'peak_heat_day'``, <br />``'typical_heat_day'``|
 | ``singlezone_commercial_hydronic``| Single-zone commercial building model representing a university building with district heating source, zone radiator, occupancy based on real data, and air handling unit providing fresh air with CO2 control and heat recovery. |**Electricity Prices**: <br />``'constant'``, <br />``'dynamic'``, <br />``'highly_dynamic'``<br />**Time Periods**: <br />``'peak_heat_day'``, <br />``'typical_heat_day'``|
 | ``multizone_office_simple_air`` | Multi-zone commercial building model based on U.S. DOE medium office building with single-duct VAV with terminal reheat, air-cooled chiller, and air-to-water heat pump.|**Electricity Prices**: <br />``'constant'``, <br />``'dynamic'``, <br />``'highly_dynamic'``<br />**Time Periods**:<br />``'peak_heat_day'``, <br />``'typical_heat_day'``, <br />``'peak_cool_day'``, <br />``'typical_cool_day'``, <br />``'mix_day'``|

testcases/twozone_apartment_hydronic/README.md

@@ -0,0 +1,29 @@
+BOPTEST testcase twozone_apartment_hydronic
+===================
+twozone_apartment_hydronic
+
+Structure
+---------
+
+- ``doc/`` contains documentation of the test case.
+- ``models/`` contains the emulation model files for the test case.
+- ``config.py`` defines the configuration of the test case for building the Docker image.
+
+Compile the Model
+-----------------
+
+The Modelica model makes use of the signal overwrite blocks and uses the 
+overwrite block parser (``<repo_root>/parser/parser.py``) to compile the FMU.
+
+1. Add the root of the BOPTEST repository to the PYTHONPATH environment variable.
+
+2. ``$ cd models``
+
+3. ``$ python compile_fmu.py`` to compile the model FMU using the overwrite block parser.
+
+4. The resulting FMU will be named ``wrapped.fmu``.
+-----------
+To generate the boundary conditions refer to:
+models/Resources/...csv for the energy prices and emissions and
+to TwoZoneApartmentHydronic.TestCases.BoundaryConditions
+

testcases/twozone_apartment_hydronic/doc/README.md

@@ -0,0 +1 @@
+This directory contains documentation of the test case.