Merge pull request #1554 from RWTH-EBC/1553_newDymolaVersionCI

Use new dymola version in ci
RWTH-EBC · Nov 30, 2024 · 1a862a6 · 1a862a6
2 parents 6743502 + 67a5fa8
commit 1a862a6
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 24 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 
 include:
     project: 'EBC/EBC_all/gitlab_ci/templates'
-    ref: AixLibCI
+    ref: AixLibCI2024
     file: 'modelica-ci-tests/scripts/.gitlab-ci.yml'
diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Pools_Examples_IndoorSwimmingPool.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Fluid_Pools_Examples_IndoorSwimmingPool.txt
@@ -1,7 +1,7 @@
 last-generated=2024-07-23
 statistics-initialization=
 {
-  "nonlinear": "0, 16, 1",
+  "nonlinear": "1, 16, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/...nceResults/Dymola/AixLib_Fluid_Pools_Examples_IndoorSwimmingPoolExternalHeatingSystem.txt b/...nceResults/Dymola/AixLib_Fluid_Pools_Examples_IndoorSwimmingPoolExternalHeatingSystem.txt
@@ -1,7 +1,7 @@
 last-generated=2024-07-23
 statistics-initialization=
 {
-  "nonlinear": "0, 17, 1",
+  "nonlinear": "1, 17, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_HydraulicModules_Examples_Admix.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_HydraulicModules_Examples_Admix.txt
@@ -1,7 +1,7 @@
 last-generated=2024-07-24
 statistics-initialization=
 {
-  "nonlinear": "3, 0",
+  "nonlinear": "4, 0",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/...ources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_DemandControlledAHU.txt b/...ources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_DemandControlledAHU.txt
diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_GenericAHU.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_GenericAHU.txt
@@ -1,7 +1,7 @@
 last-generated=2024-07-25
 statistics-initialization=
 {
-  "nonlinear": "0, 0, 0, 1, 0, 1, 0, 0, 3, 0, 3, 0, 3, 0",
+  "nonlinear": "0, 0, 0, 1, 0, 1, 0, 0, 4, 0, 4, 0, 4, 0",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_Heater.txt b/AixLib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Examples_Heater.txt
@@ -2,7 +2,7 @@ last-generated=2024-07-24
 statistics-initialization=
 {
   "linear": "2, 59, 2",
-  "nonlinear": "0, 3, 0",
+  "nonlinear": "0, 4, 0",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/...ib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Cooler.txt b/...ib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Cooler.txt
@@ -1,7 +1,7 @@
 last-generated=2024-07-24
 statistics-initialization=
 {
-  "nonlinear": "3, 0",
+  "nonlinear": "4, 0",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/...ib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Heater.txt b/...ib/Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Heater.txt
@@ -1,7 +1,7 @@
 last-generated=2024-07-24
 statistics-initialization=
 {
-  "nonlinear": "3, 0",
+  "nonlinear": "4, 0",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/...Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Preheater.txt b/...Resources/ReferenceResults/Dymola/AixLib_Systems_ModularAHU_Validation_AHU2_Preheater.txt
@@ -1,7 +1,7 @@
 last-generated=2024-07-24
 statistics-initialization=
 {
-  "nonlinear": "3, 0",
+  "nonlinear": "4, 0",
   "numerical Jacobians": "0"
 }
 statistics-simulation=

diff --git a/AixLib/Utilities/Examples/TimeUtilities_test.mo b/AixLib/Utilities/Examples/TimeUtilities_test.mo
@@ -1,17 +1,15 @@
 within AixLib.Utilities.Examples;
 model TimeUtilities_test "Simulation to test the utilities concerning the time"
-  import Utilities;
   extends Modelica.Icons.Example;
-  Sources.NightMode nightMode(dayStart = 8, dayEnd = 20) annotation(Placement(transformation(extent = {{-12, -32}, {8, -12}})));
-  Sources.HourOfDay hourOfDay annotation(Placement(transformation(extent = {{-12, 10}, {8, 30}})));
+  AixLib.Utilities.Sources.NightMode nightMode(dayStart = 8, dayEnd = 20) annotation(Placement(transformation(extent = {{-12, -32}, {8, -12}})));
+  AixLib.Utilities.Sources.HourOfDay hourOfDay annotation(Placement(transformation(extent = {{-12, 10}, {8, 30}})));
   Modelica.Blocks.Interfaces.BooleanOutput boolNightMode annotation(Placement(transformation(extent = {{56, -30}, {76, -10}})));
   Modelica.Blocks.Interfaces.RealOutput realSamples[1] annotation(Placement(transformation(extent = {{56, 30}, {76, 50}})));
 equation
   //Connections for real outputs
   realSamples[1] = hourOfDay.HOD;
   //Connection for night mode output
   boolNightMode = nightMode.IsNight.y;
-  connect(boolNightMode, boolNightMode) annotation(Line(points = {{66, -20}, {66, -20}}, color = {255, 0, 255}));
   annotation(experiment(StopTime = 604800, Interval = 600), Documentation(revisions = "<html><ul>
   <li>
     <i>April 25, 2013&#160;</i> by Ole Odendahl:<br/>

diff --git a/AixLib/Utilities/HeatTransfer/SolarRadInRoom.mo b/AixLib/Utilities/HeatTransfer/SolarRadInRoom.mo
@@ -160,8 +160,6 @@ protected
 initial equation
   // Asssert energy balance matches
   assert(abs(sum(cat(1, solar_frac_cei, solar_frac_flo, solar_frac_wall, solar_frac_win_lost, solar_frac_win_abs)) - 1) < Modelica.Constants.eps, "Sum of solar fractions is not equal to 1", AssertionLevel.error);
-  // Assert all walls have the same height:
-  assert(((sum(walls.height) / size(walls, 1)) - walls[1].height) <  Modelica.Constants.eps, "Not all walls have the same height", AssertionLevel.error);
   assert(sum(A_ceil) - A_floor < Modelica.Constants.eps, "Ceiling and floor have mismatching areas", AssertionLevel.error);
   // Check correct user input if multiple floors are selected
   assert(A_floor - floor_height_int*floor_length_int < Modelica.Constants.eps, "Total floor area mismatches area specified by user", AssertionLevel.error);
@@ -174,6 +172,8 @@ equation
   for n in 1:nWalls loop
     connect(walls[n].Q_flow_ShoRadOnSur, QRadWalls_out[n].y);
   end for;
+  // Assert all walls have the same height during equation, as connect is required:
+  assert(((sum(walls.height) / size(walls, 1)) - walls[1].height) <  Modelica.Constants.eps, "Not all walls have the same height", AssertionLevel.error);
 
   for n in 1:nWin loop
     connect(win_out[n].Q_flow_ShoRadOnSur, QRadWin_out[n].y);