Merge pull request #4486 from lbl-srg/maint_12.x_issue4480_integerRounding

mwetter · web-flow · commit e99e042c0dd0 · 2026-04-03T06:16:02.000-07:00
improved ill-posed integer rounding (maint_12.x)
diff --git a/Buildings/BoundaryConditions/WeatherData/BaseClasses/PartialConvertTime.mo b/Buildings/BoundaryConditions/WeatherData/BaseClasses/PartialConvertTime.mo
@@ -16,17 +16,24 @@ protected
   parameter Boolean canRepeatWeatherFile = abs(mod(lenWea, 365*24*3600)) < 1E-2
     "=true, if the weather file can be repeated, since it has the length of a year or a multiple of it";
 
-  discrete Modelica.Units.SI.Time tNext(start=0, fixed=true)
+  discrete Modelica.Units.SI.Time tNext
     "Start time of next period";
 
+  Integer k "Period index";
+
+initial equation
+  k = integer(modTimAux/lenWea) + 1;
+  tNext = if canRepeatWeatherFile then k * lenWea else time;
+
 equation
-  when {initial(), canRepeatWeatherFile and modTimAux > pre(tNext)} then
-    // simulation time stamp went over the end time of the weather file
-    //(last time stamp of the weather file + average increment)
-    tNext = if canRepeatWeatherFile then integer(modTimAux/lenWea)*lenWea + lenWea else time;
+  // simulation time stamp went over the end time of the weather file
+  // (last time stamp of the weather file + average increment)
+  when (canRepeatWeatherFile and modTimAux > pre(tNext)) then
+    k = pre(k) + 1;
+    tNext = k * lenWea;
   end when;
-  calTimAux = if canRepeatWeatherFile then modTimAux - tNext + lenWea else modTimAux;
 
+  calTimAux = if canRepeatWeatherFile then modTimAux - tNext + lenWea else modTimAux;
 
   annotation (
     defaultComponentName="conTim",
@@ -38,6 +45,11 @@ or a multiple of it, if this is the length of the weather file.
 </html>", revisions="<html>
 <ul>
 <li>
+February 18, 2026, by Jianjun Hu:<br/>
+Improved ill-posed integer rounding.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4480\">#4480</a>.
+</li>
+<li>
 March 27, 2023, by Ettore Zanetti:<br/>
 Added partial class for conversion from simulation time to calendar time, to be
 used by solar models that require calendar time for calculations.<br/>
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_ChillerDXHeatingEconomizer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_ChillerDXHeatingEconomizer.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_Guideline36.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_Guideline36.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_Predictors_Examples_BESTEST.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_Predictors_Examples_BESTEST.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case600.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case600.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case610.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case610.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case620.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case620.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case630.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case630.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case640.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case640.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case650.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case650.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case660.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case660.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case670.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case670.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 12",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case680.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case680.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case685.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case685.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case695.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases6xx_Case695.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case900.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case900.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case910.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case910.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case920.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case920.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 20",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case930.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case930.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 20",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case940.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case940.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case950.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case950.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case960.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case960.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "14, 1, 1, 1, 1, 1, 1",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case980.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case980.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case985.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case985.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case995.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_Detailed_Validation_BESTEST_Cases9xx_Case995.txt
@@ -1,4 +1,4 @@
-last-generated=2024-06-27
+last-generated=2026-03-18
 statistics-initialization=
 {
   "nonlinear": "1, 1, 1, 1, 1, 1, 13",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-last-generated=2024-06-27`
	`1`	`+last-generated=2026-03-18`
`2`	`2`	`statistics-initialization=`
`3`	`3`	`{`
`4`	`4`	`"nonlinear": "1, 1, 1, 1, 1, 1, 13",`