Merge branch 'maint_11.x' into maint_11.x_IBPSASync_issue1966_windTurbineCutOut

mwetter · mwetter · commit b9854fc1fac7 · 2025-05-06T15:55:35.000-07:00
diff --git a/Buildings/HeatTransfer/Conduction/BaseClasses/der_temperature_u.mo b/Buildings/HeatTransfer/Conduction/BaseClasses/der_temperature_u.mo
@@ -20,15 +20,17 @@ function der_temperature_u
     each unit="kg.K2/J")
     "Derivatives dT/du at the support points";
 protected
-  parameter Real scale=0.999 "Used to place points on the phase transition";
-  Modelica.Units.SI.Temperature Tm1=TSol + (1 - scale)*(TLiq - TSol)
+  constant Real scale=0.999 "Used to place points on the phase transition";
+  Modelica.Units.SI.Temperature Tm1
     "Support point";
-  Modelica.Units.SI.Temperature Tm2=TSol + scale*(TLiq - TSol)
+  Modelica.Units.SI.Temperature Tm2
     "Support point";
 algorithm
   assert(Buildings.HeatTransfer.Conduction.nSupPCM == 6,
     "The material must have exactly 6 support points for the u(T) relation.");
   assert(TLiq > TSol, "TLiq has to be larger than TSol.");
+  Tm1:=TSol + (1 - scale)*(TLiq - TSol);
+  Tm2:=TSol + scale*(TLiq - TSol);
   // Get the derivative values at the support points
   ud:={c*scale*TSol,
        c*TSol,
@@ -61,6 +63,12 @@ to compute for a given specific internal energy the temperature.
 revisions="<html>
 <ul>
 <li>
+May 1, 2025, by Michael Wetter:<br/>
+Reformulated model to avoid warning about binding equation not being a parameter expression.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4215\">#4215</a>.
+</li>
+<li>
 August 30, 2024, by Michael Wetter:<br/>
 Removed wrong <code>parameter</code> declaration on a protected variable which causes an error in
 Dymola 2025x beta1.<br/>
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_11_1_1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_11_1_1.mo
@@ -40,10 +40,6 @@ have been <b style=\"color:blue\">improved</b> in a
 <b style=\"color:blue\">backward compatible</b> way:
 </p>
 <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal</b><br/>
-                         Buildings.Utilities.Clustering
-    </td>
-</tr>
 <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
     </td>
 </tr>
@@ -54,13 +50,26 @@ have been <b style=\"color:blue\">improved</b> in a
                        This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1996\">IBPSA, #1996</a>.
     </td>
 </tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal</b><br/>
+                         Buildings.Utilities.Clustering
 <tr><td valign=\"top\">Buildings.Utilities.Clustering.KMeans
     </td>
     <td valign=\"top\">Improved code to avoid an error during initialization of certain borefield geometries.<br/>
                        This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1985\">IBPSA, #1985</a> and
                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1976\">IBPSA, #1976</a>.
     </td>
 </tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.BaseClasses.der_temperature_u
+    </td>
+    <td valign=\"top\">Reformulated model to avoid warning about binding equation not being a parameter expression.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/4215\">#4215</a>.
+    </td>
+</tr>
+
 <tr><td colspan=\"2\"><b>xxx</b>
     </td>
 </tr>
