lbl-srg · karthikeyad-pnnl · Sep 10, 2025 · Sep 11, 2025 · Sep 15, 2025 · Sep 15, 2025
diff --git a/.travis.yml b/.travis.yml
@@ -33,8 +33,8 @@ env:
     - DOCKER_REPONAME=lbnlblum
     - BUILDINGSPY_VERSION=BuildingsPy@v5.2.0
     - OMC_VERSION=ubuntu-2204-omc:1.24.0-1
-    - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.55.11_rev-1
-    - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2025x-x86_64_rev-2
+    - OPTIMICA_VERSION=travis-ubuntu-2404-optimica:1.66
+    - DYMOLA_VERSION=travis_ubuntu-2404_dymola:2026x-x86_64
     - ENERGYPLUS_9_6_0=EnergyPlus-9.6.0-f420c06a69-Linux-Ubuntu20.04-x86_64
     - ENERGYPLUS_23_1_0=EnergyPlus-23.1.0-87ed9199d4-Linux-Ubuntu20.04-x86_64
     - MODELICA_JSON_VERSION=6d950c3592fa021aa914ba4ff34a67cbb69962c6

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,12 @@ 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\">Buildings #4480</a>
+and <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/2088\">IBPSA #2088</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/Fluid/DXSystems/Cooling/BaseClasses/PartialCapacity.mo b/Buildings/Fluid/DXSystems/Cooling/BaseClasses/PartialCapacity.mo
@@ -117,9 +117,9 @@ equation
     // Hence, the test starts with stage == iSta.
     for iSta in 1:nSta loop
    // Check whether data are outside of bounds
-      when ( stage == iSta and pre(checkBoundsTEva[stage])) then
+      when ( stage == iSta and pre(checkBoundsTEva[iSta])) then
       assert(
-        not (TEvaIn > sta[stage].perCur.TEvaInMax or TEvaIn < sta[stage].perCur.TEvaInMin),
+        not (TEvaIn > sta[iSta].perCur.TEvaInMax or TEvaIn < sta[iSta].perCur.TEvaInMin),
         "*** Warning: Evaporator temperature TEvaIn is out of bounds in DX coil model at time = "
            + String(time) + ".
     stage     = " + String(iSta) + "
@@ -134,9 +134,9 @@ equation
         level=AssertionLevel.warning);
         checkBoundsTEva[iSta] = false;
       end when;
-      when ( stage == iSta and pre(checkBoundsTCon[stage])) then
+      when ( stage == iSta and pre(checkBoundsTCon[iSta])) then
       assert(
-        not (TConIn > sta[stage].perCur.TConInMax or TConIn < sta[stage].perCur.TConInMin),
+        not (TConIn > sta[iSta].perCur.TConInMax or TConIn < sta[iSta].perCur.TConInMin),
         "*** Warning: Condenser temperature TConIn is out of bounds in DX coil model at time = "
            + String(time) + ".
     stage     = " + String(iSta) + "
@@ -153,7 +153,7 @@ equation
       end when;
     end for;
 
-if stage > 0 then
+  if stage > 0 then
     for iSta in 1:nSta loop
 
     // Compute performance
@@ -395,6 +395,12 @@ so that both are zero if <i>ff &lt; ff<sub>min</sub>/4</i>, where
 revisions="<html>
 <ul>
 <li>
+March 30, 2026, by Michael Wetter:<br/>
+Avoided unsafe array access that relied on short-circuiting.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/4516\">issue 4516</a>.
+</li>
+<li>
 April 5, 2023, by Xing Lu:<br/>
 Changed class name from <code>PartialCoolingCapacity</code> to
 <code>PartialCoilCapacity</code>.

diff --git a/...refields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo b/...refields/BaseClasses/HeatTransfer/LoadAggregation/Validation/TemperatureResponseMatrix.mo
@@ -3,7 +3,7 @@ model TemperatureResponseMatrix
   "This validation case test the calculation, writing and reading of the temperature step response"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.Units.SI.Time timSer[26 + 50,2]=
+  parameter Real timSer[26 + 50,2]=
       Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temperatureResponseMatrix(
       nBor=1,
       cooBor={{0,0}},
@@ -20,7 +20,7 @@ model TemperatureResponseMatrix
       ttsMax=exp(5),
       sha="TemperatureResponseMatrix_validation",
       forceGFunCalc=true) "Resulting temperature response matrix";
-  Modelica.Units.SI.ThermalResistance TStep "Temperature step response";
+  Real TStep "Temperature step response";
 
 equation
   TStep = Modelica.Math.Vectors.interpolate(timSer[:,1],timSer[:,2],time);
@@ -38,6 +38,13 @@ the course of the first year.
 </html>", revisions="<html>
 <ul>
 <li>
+March 20, 2026, by Michael Wetter:<br/>
+Corrected type declaration of g-function.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4501\">
+Buildings, #4501</a>.
+</li>
+<li>
 July 18, 2018, by Alex Laferri&egrave;re:<br/>
 First implementation.
 </li>

diff --git a/...hermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo b/...hermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/aggregationWeightingFactors.mo
@@ -5,7 +5,7 @@ function aggregationWeightingFactors
 
   input Integer i "Size of aggregation vector";
   input Integer nTimTot "Size of g-function time table";
-  input Modelica.Units.SI.ThermalResistance TStep[nTimTot,2]
+  input Real TStep[nTimTot,2]
     "Time matrix with TStep";
   input Modelica.Units.SI.Time nu[i] "Aggregation time vector nu";
 
@@ -76,6 +76,13 @@ borefield as an input.
 </html>", revisions="<html>
 <ul>
 <li>
+March 20, 2026, by Michael Wetter:<br/>
+Corrected type declaration of g-function.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4501\">
+Buildings, #4501</a>.
+</li>
+<li>
 March 5, 2018, by Alex Laferri&egrave;re:<br/>
 First implementation.
 </li>

diff --git a/...othermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo b/...othermal/Borefields/BaseClasses/HeatTransfer/LoadAggregation/temperatureResponseMatrix.mo
@@ -21,7 +21,7 @@ impure function temperatureResponseMatrix
   input Boolean forceGFunCalc
     "Set to true to force the thermal response to be calculated at the start";
 
-  output Modelica.Units.SI.ThermalResistance TStep[nTimTot,2]
+  output Real TStep[nTimTot,2]
     "Temperature step-response time series";
 
 protected
@@ -103,6 +103,13 @@ conductivity of the soil.
 </html>", revisions="<html>
 <ul>
 <li>
+March 20, 2026, by Michael Wetter:<br/>
+Corrected type declaration of g-function.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4501\">
+Buildings, #4501</a>.
+</li>
+<li>
 December 11, 2021, by Michael Wetter:<br/>
 Added <code>impure</code> declaration for MSL 4.0.0.
 </li>

diff --git a/...othermal/ZonedBorefields/BaseClasses/HeatTransfer/Validation/TemperatureResponseMatrix.mo b/...othermal/ZonedBorefields/BaseClasses/HeatTransfer/Validation/TemperatureResponseMatrix.mo
@@ -3,7 +3,7 @@ model TemperatureResponseMatrix
   "This validation case tests the calculation of thermal resposne factors"
   extends Modelica.Icons.Example;
 
-  parameter Modelica.Units.SI.Time kappa[8,8,7]=
+  parameter Real kappa[8,8,7]=
       Buildings.Fluid.Geothermal.ZonedBorefields.BaseClasses.HeatTransfer.temperatureResponseMatrix(
       nBor=3,
       cooBor={{0,0}, {0,5}, {5,0}},
@@ -31,6 +31,13 @@ boreholes divided into 2 zones.
 </html>", revisions="<html>
 <ul>
 <li>
+March 20, 2026, by Michael Wetter:<br/>
+Corrected type declaration of g-function.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4501\">
+Buildings, #4501</a>.
+</li>
+<li>
 February 2024, by Massimo Cimmino:<br/>
 First implementation.
 </li>

diff --git a/...gs/Fluid/Geothermal/ZonedBorefields/BaseClasses/HeatTransfer/temperatureResponseMatrix.mo b/...gs/Fluid/Geothermal/ZonedBorefields/BaseClasses/HeatTransfer/temperatureResponseMatrix.mo
@@ -21,7 +21,7 @@ impure function temperatureResponseMatrix
   input Real relTol = 0.02 "Relative tolerance on distance between boreholes";
   input String sha "SHA-1 encryption of the arguments of this function";
 
-  output Modelica.Units.SI.ThermalResistance kappa[nZon*nSeg,nZon*nSeg,nTim] "Thermal response factor matrix";
+  output Real kappa[nZon*nSeg,nZon*nSeg,nTim] "Thermal response factor matrix";
 
 protected
   String fileName[nZon*nSeg] = {
@@ -275,6 +275,13 @@ doi:10.1080/19401493.2021.1968953</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+March 20, 2026, by Michael Wetter:<br/>
+Corrected type declaration of g-function.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4501\">
+Buildings, #4501</a>.
+</li>
+<li>
 February 2024, by Massimo Cimmino:<br/>
 First implementation.
 </li>

diff --git a/Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2DLoadDepSHC/Generic.mo b/Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2DLoadDepSHC/Generic.mo
@@ -21,32 +21,32 @@ record Generic
     "File where performance data are stored - SHC mode (single module)"
     annotation (Dialog(loadSelector(filter="Text files (*.txt)",caption=
       "Open file in which table is present")));
-  parameter String tabNamQHea[nPLRHea]={"q@" + String(p,
+  parameter String tabNamQHea[:]={"q@" + String(p,
     format=".2f") for p in PLRHeaSor}
     "Table names with heat flow rate data - Heating mode"
     annotation (Evaluate=true,
     Dialog(tab="Advanced"));
-  parameter String tabNamPHea[nPLRHea]={"p@" + String(p,
+  parameter String tabNamPHea[:]={"p@" + String(p,
     format=".2f") for p in PLRHeaSor}
     "Table names with power data - Heating mode"
     annotation (Evaluate=true,
     Dialog(tab="Advanced"));
-  parameter String tabNamQCoo[nPLRCoo]={"q@" + String(p,
+  parameter String tabNamQCoo[:]={"q@" + String(p,
     format=".2f") for p in PLRCooSor}
     "Table names with heat flow rate data - Cooling mode"
     annotation (Evaluate=true,
     Dialog(tab="Advanced"));
-  parameter String tabNamPCoo[nPLRCoo]={"p@" + String(p,
+  parameter String tabNamPCoo[:]={"p@" + String(p,
     format=".2f") for p in PLRCooSor}
     "Table names with power data - Cooling mode"
     annotation (Evaluate=true,
     Dialog(tab="Advanced"));
-  parameter String tabNamQShc[nPLRShc]={"q@" + String(p,
+  parameter String tabNamQShc[:]={"q@" + String(p,
     format=".2f") for p in PLRShcSor}
     "Table names with cooling heat flow rate data - SHC mode"
     annotation (Evaluate=true,
     Dialog(tab="Advanced"));
-  parameter String tabNamPShc[nPLRShc]={"p@" + String(p,
+  parameter String tabNamPShc[:]={"p@" + String(p,
     format=".2f") for p in PLRShcSor}
     "Table names with power data - SHC mode"
     annotation (Evaluate=true,
@@ -74,15 +74,15 @@ record Generic
   final parameter Integer nPLRShc=size(PLRShcSup, 1)
     "Number of PLR support points - SHC"
     annotation (Evaluate=true);
-  final parameter Real PLRHeaSor[nPLRHea]=Modelica.Math.Vectors.sort(PLRHeaSup)
+  final parameter Real PLRHeaSor[:]=Modelica.Math.Vectors.sort(PLRHeaSup)
     "PLR values in increasing order - Heating";
   final parameter Real PLRHea_max=PLRHeaSor[nPLRHea]
     "Maximum PLR";
-  final parameter Real PLRCooSor[nPLRCoo]=Modelica.Math.Vectors.sort(PLRCooSup)
+  final parameter Real PLRCooSor[:]=Modelica.Math.Vectors.sort(PLRCooSup)
     "PLR values in increasing order - Cooling";
   final parameter Real PLRCoo_max=PLRCooSor[nPLRCoo]
     "Maximum PLR - Cooling mode";
-  final parameter Real PLRShcSor[nPLRShc]=Modelica.Math.Vectors.sort(PLRShcSup)
+  final parameter Real PLRShcSor[:]=Modelica.Math.Vectors.sort(PLRShcSup)
     "PLR values in increasing order - SHC";
   annotation (
   defaultComponentPrefixes="parameter",

diff --git a/Buildings/Fluid/HeatPumps/ModularReversible/Examples/TableData2DLoadDep.mo b/Buildings/Fluid/HeatPumps/ModularReversible/Examples/TableData2DLoadDep.mo
@@ -45,11 +45,6 @@ model TableData2DLoadDep
     period=5400)
     "Heat pump enable and heating mode command"
     annotation (Placement(transformation(extent={{-180,130},{-160,150}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch TSetAct(
-    y(final unit="K",
-      displayUnit="degC"))
-    "Active supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-40,110},{-20,130}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Sin TChiWatRet(
     amplitude=TChiWatRet_nominal - hp.TConCoo_nominal,
     freqHz=3 / 3000,
@@ -255,10 +250,6 @@ model TableData2DLoadDep
     nPorts=1) "Boundary conditions of ambient-side fluid at HP inlet"
     annotation (Placement(transformation(extent={{10,-150},{30,-130}})));
 equation
-  connect(TChiWatSupSet.y, TSetAct.u3)
-    annotation (Line(points={{-68,120},{-64,120},{-64,112},{-42,112}},color={0,0,127}));
-  connect(THeaWatSupSet.y, TSetAct.u1)
-    annotation (Line(points={{-68,160},{-60,160},{-60,128},{-42,128}},color={0,0,127}));
   connect(THeaWatRet.y, TRetAct.u1)
     annotation (Line(points={{-68,80},{-60,80},{-60,68},{-42,68}},color={0,0,127}));
   connect(TChiWatRet.y, TRetAct.u3)
@@ -283,8 +274,6 @@ equation
     annotation (Line(points={{-18,-80},{0,-80},{0,-36},{8,-36}},color={0,0,127}));
   connect(pInl_rel1.y,inlHpAmb. p_in)
     annotation (Line(points={{-18,-160},{-10,-160},{-10,-32},{8,-32}},color={0,0,127}));
-  connect(TSetAct.y, hp.TSet)
-    annotation (Line(points={{-18,120},{80,120},{80,-2.3},{97.9,-2.3}}, color={0,0,127}));
   connect(TRet.port_b, hp.port_a1)
     annotation (Line(points={{70,0},{86,0},{86,-0.2},{100,-0.2}},color={0,127,255}));
   connect(TSup.port_a, hp.port_b1)
@@ -296,7 +285,7 @@ equation
   connect(retAmb.ports[1], hp.port_b2)
     annotation (Line(points={{170,-61},{90,-61},{90,-12.8},{100,-12.8}},color={0,127,255}));
   connect(y1.y[1], hp.on)
-    annotation (Line(points={{-158,140},{82,140},{82,-6.5},{97.9,-6.5}}, color={255,0,255}));
+    annotation (Line(points={{-158,140},{82,140},{82,-8.6},{97.9,-8.6}}, color={255,0,255}));
   connect(inlHp.ports[1], TRet.port_a)
     annotation (Line(points={{30,0},{50,0}},color={0,127,255}));
   connect(TRet1.port_b, hpNrv.port_a1)
@@ -305,7 +294,7 @@ equation
     annotation (Line(points={{130,-100},{126,-100},{126,-100.2},{121,-100.2}},
       color={0,127,255}));
   connect(y1.y[1], hpNrv.on)
-    annotation (Line(points={{-158,140},{82,140},{82,-106.5},{97.9,-106.5}},
+    annotation (Line(points={{-158,140},{82,140},{82,-108.6},{97.9,-108.6}},
       color={255,0,255}));
   connect(inlHp1.ports[1], TRet1.port_a)
     annotation (Line(points={{30,-100},{50,-100}},color={0,127,255}));
@@ -320,22 +309,24 @@ equation
     annotation (Line(points={{-108,-80},{-60,-80},{-60,-136},{8,-136}},color={0,0,127}));
   connect(THeaWatRet.y, inlHp1.T_in)
     annotation (Line(points={{-68,80},{-4,80},{-4,-96},{8,-96}},color={0,0,127}));
-  connect(THeaWatSupSet.y, hpNrv.TSet)
-    annotation (Line(points={{-68,160},{84,160},{84,-102.3},{97.9,-102.3}},
-      color={0,0,127}));
-  connect(y1.y[2], TSetAct.u2)
-    annotation (Line(points={{-158,140},{-50,140},{-50,120},{-42,120}},color={255,0,255}));
+  connect(THeaWatSupSet.y, hpNrv.THwSet) annotation (Line(points={{-68,160},{84,
+          160},{84,-102.3},{97.9,-102.3}}, color={0,0,127}));
   connect(y1.y[2], TRetAct.u2)
     annotation (Line(points={{-158,140},{-50,140},{-50,60},{-42,60}},color={255,0,255}));
   connect(y1.y[2], pInl_rel.u2)
     annotation (Line(points={{-158,140},{-50,140},{-50,-20},{-42,-20}},color={255,0,255}));
   connect(y1.y[2], pInl_rel1.u2)
     annotation (Line(points={{-158,140},{-50,140},{-50,-160},{-42,-160}},color={255,0,255}));
   connect(y1.y[2], hp.hea)
-    annotation (Line(points={{-158,140},{82,140},{82,-8.6},{97.9,-8.6}}, color={255,0,255}));
+    annotation (Line(points={{-158,140},{82,140},{82,-10.7},{97.9,-10.7}},
+                                                                         color={255,0,255}));
   connect(y1.y[2],TAmbAct. u2)
     annotation (Line(points={{-158,140},{-86,140},{-86,146},{-50,146},{-50,-80},{-42,-80}},
       color={255,0,255}));
+  connect(TChiWatSupSet.y, hp.TChwSet) annotation (Line(points={{-68,120},{80,
+          120},{80,-6.5},{97.9,-6.5}}, color={0,0,127}));
+  connect(THeaWatSupSet.y, hp.THwSet) annotation (Line(points={{-68,160},{84,
+          160},{84,-2.3},{97.9,-2.3}}, color={0,0,127}));
   annotation (
     Diagram(
       coordinateSystem(
@@ -367,6 +358,13 @@ heat pump (component <code>hpNrv</code>) or a reversible heat pump
       revisions="<html>
 <ul>
 <li>
+March 23, 2026, by Antoine Gautier:<br/>
+Refactored with two separate connectors 
+for HW and CHW temperature setpoints.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4507\">#4507</a>.
+</li>
+<li>
 July 1, 2025, by Antoine Gautier:<br/>
 First implementation.
 </li>