Update OpenModelica to 1.24 (maint 10) (#4029)

* Updated unit test script from master
lbl-srg · Nov 1, 2024 · 2a15895 · 2a15895
1 parent 7993f5c
commit 2a15895
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 87 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -32,7 +32,7 @@ env:
   global:
     - DOCKER_REPONAME=lbnlblum
     - [email protected]
-    - OMC_VERSION=ubuntu-2204-omc:1.22.1-1
+    - OMC_VERSION=ubuntu-2204-omc:1.24.0-1
     - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.43.4_rev-1
     - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2024xRefresh1-x86_64
     - ENERGYPLUS_9_6_0=EnergyPlus-9.6.0-f420c06a69-Linux-Ubuntu20.04-x86_64

diff --git a/Buildings/Resources/Scripts/BuildingsPy/conf.yml b/Buildings/Resources/Scripts/BuildingsPy/conf.yml
@@ -1,27 +1,3 @@
-- model_name: Buildings.Air.Systems.SingleZone.VAV.Examples.OptimalStart.ConventionalSpring
-  openmodelica:
-    comment: 'division by zero at time 6393600, (a=3.874900467232077e-06) / (b=0), where divisor b expression is: max(-zonAHUCon.hvac.out.ports[3].m_flow, 1e-07) - zonAHUCon.sinZonFlo.ports[2].m_flow'
-    simulate: false
-- model_name: Buildings.Air.Systems.SingleZone.VAV.Examples.OptimalStart.ConventionalSummer
-  openmodelica:
-    comment: 'division by zero at time 15984000, (a=2.95791846399214e-05) / (b=0), where divisor b expression is: max(-zonAHUCon.hvac.out.ports[3].m_flow, 1e-07) - zonAHUCon.sinZonFlo.ports[2].m_flow'
-    simulate: false
-- model_name: Buildings.Air.Systems.SingleZone.VAV.Examples.OptimalStart.ConventionalWinter
-  openmodelica:
-    comment: 'division by zero at time 0, (a=2.918588003374964e-06) / (b=0), where divisor b expression is: max(-zonAHUCon.hvac.out.ports[3].m_flow, 1e-07) - zonAHUCon.sinZonFlo.ports[2].m_flow'
-    simulate: false
-- model_name: Buildings.Air.Systems.SingleZone.VAV.Examples.OptimalStart.Guideline36Spring
-  openmodelica:
-    comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
-    simulate: false
-- model_name: Buildings.Air.Systems.SingleZone.VAV.Examples.OptimalStart.Guideline36Summer
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: Buildings.Air.Systems.SingleZone.VAV.Examples.OptimalStart.Guideline36Winter
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
 - model_name: Buildings.Airflow.Multizone.Examples.PressurizationData
   optimica:
     comment: High solver tolerance required to avoid time out.
@@ -93,10 +69,6 @@
   openmodelica:
     comment: Timeout on travis after 900 seconds, https://app.travis-ci.com/github/lbl-srg/modelica-buildings/jobs/615261271
     simulate: false
-- model_name: Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Indirect
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization.
-    simulate: false
 - model_name: Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow
   openmodelica:
     comment: simulation terminated by an assertion at initialization
@@ -114,7 +86,7 @@
     translate: false
 - model_name: Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries
   openmodelica:
-    comment: "simulation terminated by an assertion at initialization, Invalid root: (0)^(-1.5), corrected in OMC 1.23.0~dev-206-g00d3636"
+    comment: 'simulation terminated by an assertion at initialization, Invalid root: (0)^(-1.5), corrected in OMC 1.23.0~dev-206-g00d3636'
     simulate: false
 - model_name: Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop
   openmodelica:
@@ -132,27 +104,19 @@
   openmodelica:
     comment: simulation terminated by an assertion at initialization
     simulate: false
-- model_name: Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant
+- model_name: Buildings.Experimental.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS
   openmodelica:
-    comment: Internal error BackendDAETransform.analyseStrongComponentBlock failed (Purely discrete algebraic loops cannot be solved by iterative processes. Try to break them open using the delay() operator.)
-    translate: false
+    comment: simulation terminated by an assertion at initialization.
+    simulate: false
 - model_name: Buildings.Experimental.DHC.Plants.Combined.Examples.AllElectricCWStorage
   dymola:
     time_out: 600
   openmodelica:
-    comment: Internal error NFCeval.evalBinaryMul failed to evaluate {0.0, 0.03359309597916374, 0.06718619195832748, 0.09151222697772191}[pressure.n] * 0.0
-    translate: false
+    comment: simulation terminated by an assertion at initialization.
+    simulate: false
   optimica:
     comment: pyfmi.fmi.FMUException Failed to update the events at time 3.024307E+06
     simulate: false
-- model_name: Buildings.Experimental.DHC.Plants.Combined.Validation.AllElectricCWStorage
-  openmodelica:
-    comment: Internal error NFCeval.evalBinaryMul failed to evaluate {0.0, 0.03359309597916374, 0.06718619195832748, 0.09151222697772191}[pressure.n] * 0.0
-    translate: false
-- model_name: Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource
-  openmodelica:
-    comment: 'Could not evaluate structural parameter (or constant): mChi_flow_nominal'
-    translate: false
 - model_name: Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation
   openmodelica:
     comment: simulation terminated by an assertion at initialization
@@ -190,8 +154,9 @@
     time_out: 600
 - model_name: Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.PlugFlowAIT
   openmodelica:
-    comment: timed out after 300 seconds
+    comment: 'TimeoutExpired: Command ''[''omc'', ''Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.PlugFlowAIT_simulate.mos'']'' timed out after 600 seconds'
     time_out: 600
+    simulate: false
 - model_name: Buildings.Fluid.Geothermal.Aquifer.Validation.SimulationTest
   openmodelica:
     comment: Timeout after 300 s
@@ -200,14 +165,6 @@
   openmodelica:
     comment: timed out after 300 seconds
     simulate: false
-- model_name: Buildings.Fluid.Geothermal.BuriedPipes.Examples.SingleBuriedPipe
-  openmodelica:
-    comment: Simulation terminated at time 4.59003e+07.
-    simulate: false
-- model_name: Buildings.Fluid.Geothermal.BuriedPipes.Examples.TwoBuriedPipes
-  openmodelica:
-    comment: simulation returned non-zero exit status 255
-    simulate: false
 - model_name: Buildings.Fluid.Geothermal.BuriedPipes.Examples.TwoPipesConduit
   openmodelica:
     comment: 'CalledProcessError: Command ''[''omc'', ''Buildings.Fluid.Geothermal.BuriedPipes.Examples.TwoPipesConduit_simulate.mos'']'' returned non-zero exit status 255.'
@@ -227,6 +184,10 @@
   optimica:
     comment: 'The following equation(s) could not be matched to any variable: isEna.u = loa.ctl.cha.pre_u_start, isEna.u = loa1.ctl.cha.pre_u_start'
     translate: false
+- model_name: Buildings.Fluid.HydronicConfigurations.ActiveNetworks.Examples.InjectionTwoWayCheckValve
+  openmodelica:
+    comment: 'Simulation terminated by an assert at time: 21600.1.'
+    simulate: false
 - model_name: Buildings.Fluid.HydronicConfigurations.ActiveNetworks.Examples.InjectionTwoWayVariableReturn
   optimica:
     comment: 'The following equation(s) could not be matched to any variable: loaOpe.mode = loaOpe.loa.ctl.cha.pre_u_start...'
@@ -239,18 +200,6 @@
   optimica:
     comment: 'The following equation(s) could not be matched to any variable: con.mode = loa.ctl.cha.pre_u_start, con.mode = loa1.ctl.cha.pre_u_start'
     translate: false
-- model_name: Buildings.Obsolete.Air.Systems.SingleZone.VAV.Examples.OptimalStart.Guideline36Spring
-  openmodelica:
-    comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
-    simulate: false
-- model_name: Buildings.Obsolete.Air.Systems.SingleZone.VAV.Examples.OptimalStart.Guideline36Summer
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: Buildings.Obsolete.Air.Systems.SingleZone.VAV.Examples.OptimalStart.Guideline36Winter
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
 - model_name: Buildings.Obsolete.Examples.VAVReheat.Validation.Guideline36SteadyState
   openmodelica:
     comment: simulation terminated by an assertion at initialization
@@ -342,10 +291,6 @@
   openmodelica:
     comment: Translation failed.
     translate: false
-- model_name: Buildings.Templates.Components.Validation.Fans
-  openmodelica:
-    comment: Translation failed.
-    translate: false
 - model_name: Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly
   openmodelica:
     comment: Time out after 300 s.
@@ -431,23 +376,14 @@
   dymola:
     comment: Requires docker update to Ubuntu 22.04 due to libgc.
     simulate: false
-  openmodelica:
-    comment: 'Simulation requires /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34. To be updated in docker image.'
-    simulate: false
 - model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation.FMUZoneAdapterZones2
   dymola:
     comment: Requires docker update to Ubuntu 22.04 due to libgc.
     simulate: false
-  openmodelica:
-    comment: 'Simulation requires /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34. To be updated in docker image.'
-    simulate: false
 - model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.Validation.FMUZoneAdapterZones3
   dymola:
     comment: Requires docker update to Ubuntu 22.04 due to libgc.
     simulate: false
-  openmodelica:
-    comment: 'Simulation requires /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34. To be updated in docker image.'
-    simulate: false
 - model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Spring
   openmodelica:
     comment: timed out after 300 seconds
@@ -479,9 +415,6 @@
     comment: returned non-zero exit status 255.
     simulate: false
 - model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingWinter
-  openmodelica:
-    comment: returned non-zero exit status 255.
-    simulate: false
   optimica:
     rtol: 1.0e-08
 - model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Unconditioned

diff --git a/bin/runUnitTests.py b/bin/runUnitTests.py
@@ -71,10 +71,10 @@ def _setEnvironmentVariables(var, value):
         os.environ[var] = value
 
 
-def _runUnitTests(batch, tool, package, path, n_pro, show_gui, skip_verification, debug, color):
+def _runUnitTests(batch, tool, package, path, n_pro, show_gui, skip_verification, debug, color, rewriteConfigurationFile):
     import buildingspy.development.regressiontest as u
 
-    ut = u.Tester(tool=tool, skip_verification=skip_verification, color=color)
+    ut = u.Tester(tool=tool, skip_verification=skip_verification, color=color, rewriteConfigurationFile=rewriteConfigurationFile)
     ut.batchMode(batch)
     ut.setLibraryRoot(path)
     if package is not None:
@@ -88,10 +88,8 @@ def _runUnitTests(batch, tool, package, path, n_pro, show_gui, skip_verification
     # Below are some option that may occassionally be used.
     # These are currently not exposed as command line arguments.
 #    ut.useExistingResults(['/tmp/tmp-Buildings-0-fagmeZ'])
-
     ut.writeOpenModelicaResultDictionary()
     # Run the regression tests
-
     retVal = ut.run()
 
     # Display HTML report if not run in batch mode.
@@ -144,7 +142,9 @@ def _runUnitTests(batch, tool, package, path, n_pro, show_gui, skip_verification
     unit_test_group.add_argument('-d', "--debug",
                                  action="store_true",
                                  help="Enable debug output.")
-
+    unit_test_group.add_argument("--rewrite-configuration-file",
+                                 help='If specified, rewrite the configuration file conf.yml (implemented for openmodelica only)',
+                                 action="store_true")
 
     html_group = parser.add_argument_group(
         "arguments to check html syntax only")
@@ -202,6 +202,6 @@ def _runUnitTests(batch, tool, package, path, n_pro, show_gui, skip_verification
                            show_gui=args.show_gui,
                            skip_verification=args.skip_verification,
                            debug=args.debug,
-                           color=True
-                           )
+                           color=True,
+                           rewriteConfigurationFile=args.rewrite_configuration_file)
     exit(retVal)