Update test cases to Modelica 4.0 and compilation toolchain

.gitignore

@@ -1,7 +1,8 @@
 *.pyc
 *.txt
 !version.txt
-!testcases/singlezone_commercial_hydronic/models/OU44Emulator/occ.txt
+!testcases/singlezone_commercial_hydronic/models/OU44Emulator/Resources/occ.txt
+!.travis.yml
 *.mat
 *.log
 *.err

.travis.yml

@@ -26,67 +26,67 @@ jobs:
     script: cd testing && make test_autogen_client ARG=--overwrite
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_parser
+    script: cd testing && make build_compiler_image && make test_parser
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_data
+    script: cd testing && make build_compiler_image && make test_data
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_forecast
+    script: cd testing && make test_forecast
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_kpis
+    script: cd testing && make test_kpis
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1 rdflib==6.3.2 bacpypes==0.18.7
-    script: cd testing && make build_jm_image && make test_bacnet
+    script: cd testing && make test_bacnet
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_testcase
+    script: cd testing && make test_testcase
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_testcase1
+    script: cd testing && make build_compiler_image && make test_testcase1
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_testcase2
+    script: cd testing && make test_testcase2
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_testcase3
+    script: cd testing && make test_testcase3_no_compile
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_bestest_air
+    script: cd testing && make test_bestest_air_no_compile
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_bestest_hydronic
+    script: cd testing && make test_bestest_hydronic_no_compile
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_bestest_hydronic_heat_pump
+    script: cd testing && make test_bestest_hydronic_heat_pump_no_compile
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_singlezone_commercial_hydronic
+    script: cd testing && make test_singlezone_commercial_hydronic_no_compile
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && make test_twozone_apartment_hydronic
+    script: cd testing && make test_twozone_apartment_hydronic_no_compile
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
     script: cd testing && travis_wait 90 make test_multizone_office_simple_hydronic_no_compile
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_office_simple_air ARG="-s test_peak_heat_day,test_typical_heat_day"
+    script: cd testing && travis_wait 90 make test_multizone_office_simple_air_no_compile ARG="-s test_peak_heat_day,test_typical_heat_day"
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_office_simple_air ARG="-s test_peak_cool_day,test_typical_cool_day,test_mix_day"
+    script: cd testing && travis_wait 90 make test_multizone_office_simple_air_no_compile ARG="-s test_peak_cool_day,test_typical_cool_day,test_mix_day"
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_office_simple_air ARG="-s API"
+    script: cd testing && travis_wait 90 make test_multizone_office_simple_air_no_compile ARG="-s API"
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_residential_hydronic ARG="-s test_peak_heat_day,test_shoulder"
+    script: cd testing && travis_wait 90 make test_multizone_residential_hydronic_no_compile ARG="-s test_peak_heat_day,test_shoulder"
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_residential_hydronic ARG="-s test_typical_heat_day,test_summer"
+    script: cd testing && travis_wait 90 make test_multizone_residential_hydronic_no_compile ARG="-s test_typical_heat_day,test_summer"
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
-    script: cd testing && make build_jm_image && travis_wait 90 make test_multizone_residential_hydronic ARG="-s API"
+    script: cd testing && travis_wait 90 make test_multizone_residential_hydronic_no_compile ARG="-s API"
   - python: 3.9
     install: pip install --upgrade pip && pip install pandas==1.2.5 numpy==1.20.2 requests==2.25.1
     script: cd testing && travis_wait 90 make test_multizone_office_complex_air_no_compile ARG="-s test_peak_heat_day,test_typical_heat_day"

data/data_generator.py

@@ -10,14 +10,39 @@
 
 '''
 
-from pymodelica import compile_fmu
-from pyfmi import load_fmu
+from OMPython import OMCSessionZMQ
 from scipy import interpolate
 import pandas as pd
 import numpy as np
 import os
 import platform
 import json
+import glob
+
+def clean_simulation_files(model_name):
+    """Remove all files generated by OpenModelica simulation"""
+
+    # Common file patterns generated by OpenModelica
+    patterns = [
+        f"{model_name}*",  # All model-related files
+        "*.c", "*.o", "*.h",  # C files
+        "*.makefile", "*.libs",  # Build files
+        "*.log", "*.xml", "*.json",  # Log and config files
+        "*_res.mat", "*_res.csv",  # Result files
+        "*_init.xml", "*_info.json",  # Initialization files
+        "*.fmu", "*.fmutmp"  # FMU files
+    ]
+
+    removed_files = []
+    for pattern in patterns:
+        for filepath in glob.glob(pattern):
+            try:
+                os.remove(filepath)
+                removed_files.append(filepath)
+            except Exception as e:
+                print(f"Could not remove {filepath}: {e}")
+
+    return removed_files
 
 class Data_Generator(object):
     '''
@@ -156,59 +181,57 @@ def generate_weather(self,
             model_file = os.path.join(model_file,f)
         model_file = model_file+'.mo'
 
-        # Edit the class to load the weather_file_name before compilation
-        str_old = 'filNam=""'
-        str_new = 'filNam=Modelica.Utilities.Files.loadResource("{0}")'\
-                  .format(self.weather_file_name)
-        with open(model_file) as f:
-            newText=f.read().replace(str_old, str_new)
-
-        with open(model_file, "w") as f:
-            f.write(newText)
-
         # Change to Resources directory
-        currdir = os.curdir
         os.chdir(self.weather_dir)
-        # Compile the ReaderTMY3 from IBPSA using JModelica
-        fmu_path = compile_fmu(model_class, model_library)
-
-        # Revert changes in directory and model file
-        os.chdir(currdir)
-
-        with open(model_file) as f:
-            newText=f.read().replace(str_new, str_old)
-
-        with open(model_file, "w") as f:
-            f.write(newText)
-
-        # Load FMU
-        model = load_fmu(fmu_path)
-
-        # Set number of communication points
-        options = model.simulate_options()
-        options['ncp']=len(self.time)-1
-
-        # Simulate
-        res = model.simulate(start_time=self.time[0],
-                             final_time=self.time[-1],
-                             options=options)
-
+        # Create example model to run
+        model_code = """model WeatherData
+                        IBPSA.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=filNam,pAtmSou=IBPSA.BoundaryConditions.Types.DataSource.File);
+                        parameter String filNam=Modelica.Utilities.Files.loadResource("{0}") "Name of weather data file";
+                        end WeatherData;
+                    """.format(self.weather_file_name)
+
+        omc = OMCSessionZMQ()
+        omc.sendExpression('loadFile("{0}")'.format(os.path.join(model_library,'package.mo')))
+        omc.sendExpression(model_code)
+        omc.sendExpression('setCommandLineOptions("-d=evaluateAllParameters")')
+        # Simulate the ReaderTMY3 from IBPSA using OMPython and OpenModelica
+        res_mat = omc.sendExpression('simulate(WeatherData, method="dassl", tolerance=1e-06, \
+                                 startTime = {0}, stopTime = {1}, numberOfIntervals={2})'\
+            .format(self.time[0],self.time[-1],len(self.time)-1))
+        res = omc.sendExpression('simulate(WeatherData, method="dassl", tolerance=1e-06, \
+                                 startTime = {0}, stopTime = {1}, numberOfIntervals={2}, \
+                                 outputFormat="csv")'.format(self.time[0],self.time[-1],len(self.time)-1))
+
         # Get model outputs
+        df_weather = pd.read_csv(res['resultFile'])
+        # Add Constant variablesParameters
+        missing_vars = ['weaDat.weaBus.lat','weaDat.weaBus.lon']
+
+        for var in missing_vars:
+            # Read variable values
+            values = omc.sendExpression('val({}, 0:0, "{}")'.format(var,res_mat['resultFile']))
+            df_weather[var] = values[0] if values else None
+
+
         output_names = []
-        for key in res.keys():
+        for key in df_weather.keys():
             if 'weaBus.' in key:
                 output_names.append(key)
 
         # Write every output in the data
         for out in output_names:
             # Interpolate to avoid problems with events from Modelica
-            g = interpolate.interp1d(res['time'],res[out],kind='linear')
-            df.loc[:,out.replace('weaBus.', '')] = g(self.time)
+            g = interpolate.interp1d(df_weather['time'],df_weather[out],kind='linear')
+            df.loc[:,out.replace('weaDat.weaBus.', '')] = g(self.time)
 
         # Store in csv
         self.store_df(df,'weather')
-
-        return df
+
+        # Exit session and clean folder
+        clean_simulation_files('WeatherData')
+        omc.sendExpression('quit()')
+        # Revert directory
+        os.chdir('..')
 
     def generate_prices(self,
                       start_day_time = '08:00:00',

data/find_days.py

@@ -113,6 +113,9 @@ def find_days(heat, cool, data='simulate', plot=False, cooling_negative=False,
         subprocess.call(cmd_docker_container)
         cmd_docker_cp = 'docker cp wrapped.fmu find_days:/boptest/wrapped.fmu'.split()
         subprocess.call(cmd_docker_cp)
+        print('Copying forecast into container...')
+        cmd_docker_cp = 'docker cp ../../../forecast find_days:/boptest/forecast'.split()
+        subprocess.call(cmd_docker_cp)
         print('Running simulation ...')
         # Run simulation for target 'length'
         cmd_docker ='docker exec -t find_days /bin/bash -c '.split()

parsing/SimpleRC.mo

@@ -10,7 +10,7 @@ model SimpleRC
   Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature preTOut
     annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
   Modelica.Blocks.Sources.Sine souTOut(
-    freqHz=1/(3600*24),
+    f=1/(3600*24),
     offset=273.15 + 20,
     amplitude=10)
     annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
@@ -68,7 +68,7 @@ equation
                                                color={0,0,127}));
   connect(preHeat.port, cap.port)
     annotation (Line(points={{40,-20},{40,20}},          color={191,0,0}));
-  connect(senTZone.T, con.u_m) annotation (Line(points={{70,20},{80,20},{80,-40},
+  connect(senTZone.T, con.u_m) annotation (Line(points={{71,20},{80,20},{80,-40},
           {-30,-40},{-30,-32}}, color={0,0,127}));
   connect(set.y, oveSet.u)
     annotation (Line(points={{-79,-20},{-72,-20}}, color={0,0,127}));
@@ -81,8 +81,18 @@ equation
   connect(oveAct.y, eff.u) annotation (Line(points={{11,-20},{14,-20},{14,-80},
           {18,-80}}, color={0,0,127}));
   connect(senTZone.T, TZone.u)
-    annotation (Line(points={{70,20},{98,20}}, color={0,0,127}));
+    annotation (Line(points={{71,20},{98,20}}, color={0,0,127}));
   connect(eff.y, PHeat.u) annotation (Line(points={{41,-80},{98,-80}},
                     color={0,0,127}));
-  annotation (uses(Modelica(version="3.2.2"), IBPSA(version="3.0.0")));
+  annotation (uses(Modelica(version="4.0.0"), IBPSA(version="4.0.0")),
+      Documentation(revisions="<html>
+<ul>
+<li>
+October 24, 2025, by Ettore Zanetti:<br/>
+Updated model to use Modelica 4.0 and Buildings 12.1.0.
+This is for <a href=https://github.com/ibpsa/project1-boptest/issues/422>
+BOPTEST issue #422</a>.
+</li>
+</ul>
+</html>"));
 end SimpleRC;

parsing/SimpleRC_NoSignalExchangeBlocks.mo

@@ -10,7 +10,7 @@ model SimpleRC_NoSignalExchangeBlocks
   Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature preTOut
     annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
   Modelica.Blocks.Sources.Sine souTOut(
-    freqHz=1/(3600*24),
+    f=1/(3600*24),
     offset=273.15 + 20,
     amplitude=10)
     annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
@@ -43,13 +43,23 @@ equation
                                                color={0,0,127}));
   connect(preHeat.port, cap.port)
     annotation (Line(points={{40,-20},{40,20}},          color={191,0,0}));
-  connect(senTZone.T, con.u_m) annotation (Line(points={{70,20},{80,20},{80,-40},
+  connect(senTZone.T, con.u_m) annotation (Line(points={{71,20},{80,20},{80,-40},
           {-30,-40},{-30,-32}}, color={0,0,127}));
   connect(set.y, con.u_s)
     annotation (Line(points={{-79,-20},{-42,-20}}, color={0,0,127}));
   connect(con.y, preHeat.Q_flow)
     annotation (Line(points={{-19,-20},{20,-20}}, color={0,0,127}));
   connect(con.y, eff.u) annotation (Line(points={{-19,-20},{14,-20},{14,-80},{
           18,-80}}, color={0,0,127}));
-  annotation (uses(Modelica(version="3.2.2"), IBPSA(version="3.0.0")));
+  annotation (uses(Modelica(version="4.0.0"), IBPSA(version="4.0.0")),
+      Documentation(revisions="<html>
+<ul>
+<li>
+October 24, 2025, by Ettore Zanetti:<br/>
+Updated model to use Modelica 4.0 and Buildings 12.1.0.
+This is for <a href=https://github.com/ibpsa/project1-boptest/issues/422>
+BOPTEST issue #422</a>.
+</li>
+</ul>
+</html>"));
 end SimpleRC_NoSignalExchangeBlocks;

parsing/SimpleRC_OnlyReadSignalExchangeBlocks.mo

@@ -10,7 +10,7 @@ model SimpleRC_OnlyReadSignalExchangeBlocks
   Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature preTOut
     annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
   Modelica.Blocks.Sources.Sine souTOut(
-    freqHz=1/(3600*24),
+    f=1/(3600*24),
     offset=273.15 + 20,
     amplitude=10)
     annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
@@ -57,7 +57,7 @@ equation
                                                color={0,0,127}));
   connect(preHeat.port, cap.port)
     annotation (Line(points={{40,-20},{40,20}},          color={191,0,0}));
-  connect(senTZone.T, con.u_m) annotation (Line(points={{70,20},{80,20},{80,-40},
+  connect(senTZone.T, con.u_m) annotation (Line(points={{71,20},{80,20},{80,-40},
           {-30,-40},{-30,-32}}, color={0,0,127}));
   connect(set.y, con.u_s)
     annotation (Line(points={{-79,-20},{-42,-20}}, color={0,0,127}));
@@ -66,8 +66,18 @@ equation
   connect(con.y, eff.u) annotation (Line(points={{-19,-20},{14,-20},{14,-80},{
           18,-80}}, color={0,0,127}));
   connect(senTZone.T,TZone. u)
-    annotation (Line(points={{70,20},{98,20}}, color={0,0,127}));
+    annotation (Line(points={{71,20},{98,20}}, color={0,0,127}));
   connect(eff.y,PHeat. u) annotation (Line(points={{41,-80},{98,-80}},
                     color={0,0,127}));
-  annotation (uses(Modelica(version="3.2.2"), IBPSA(version="3.0.0")));
+  annotation (uses(Modelica(version="4.0.0"), IBPSA(version="4.0.0")),
+      Documentation(revisions="<html>
+<ul>
+<li>
+October 24, 2025, by Ettore Zanetti:<br/>
+Updated model to use Modelica 4.0 and Buildings 12.1.0.
+This is for <a href=https://github.com/ibpsa/project1-boptest/issues/422>
+BOPTEST issue #422</a>.
+</li>
+</ul>
+</html>"));
 end SimpleRC_OnlyReadSignalExchangeBlocks;