Merge pull request #2063 from ibpsa/issue2062_groundTemperature

mwetter · web-flow · commit 8d924d280e8e · 2025-10-17T06:44:19.000-07:00
Reformulated when block in GroundTemperatureResponse
diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/GroundTemperatureResponse.mo
@@ -61,6 +61,8 @@ protected
     "Weight factor for each aggregation cell";
   final parameter Real[i] rCel(each fixed=false) "Cell widths";
 
+  discrete Boolean sampleLoad "Boolean variable used to trigger sampled load calculation";
+
   discrete Modelica.Units.SI.HeatFlowRate[i] QAgg_flow
     "Vector of aggregated loads";
   discrete Modelica.Units.SI.HeatFlowRate[i] QAggShi_flow
@@ -127,21 +129,25 @@ equation
   der(delTBor) = dTStepdt*QBor_flow + derDelTBor0;
   der(U) = QBor_flow;
 
-  when sample(t_start, tLoaAgg) then
+  sampleLoad = sample(t_start, tLoaAgg);
+  when sampleLoad then
     // Assign average load since last aggregation step to the first cell of the
     // aggregation vector
     U_old = U;
 
     // Store (U - pre(U_old))/tLoaAgg in QAgg_flow[1], and pre(QAggShi_flow) in the other elements
     QAgg_flow = cat(1, {(U - pre(U_old))/tLoaAgg}, pre(QAggShi_flow[2:end]));
+  end when;
+  when sampleLoad then
     // Shift loads in aggregation cells
     (curCel,QAggShi_flow) = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.shiftAggregationCells(
       i=i,
       QAgg_flow=QAgg_flow,
       rCel=rCel,
       nu=nu,
       curTim=(time - t_start));
-
+  end when;
+  when sampleLoad then
     // Determine the temperature change at the next aggregation step (assuming
     // no loads until then)
     delTBor0 = IBPSA.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.LoadAggregation.temporalSuperposition(
@@ -343,6 +349,12 @@ doi:10.1080/19401493.2021.1968953</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+October 6, 2025, by Michael Wetter:<br/>
+Reformulated <code>when</code> block to avoid continuous and discrete variable assignment in the same block.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4321\">Buildings, #4321</a>.
+</li>
+<li>
 June 9, 2022 by Massimo Cimmino:<br/>
 Updated the function to use the more efficient method of Prieto and Cimmino
 (2021).
