Merge branch 'master' into issue4149_obsolete

mwetter · mwetter · commit c53dee692d70 · 2025-03-13T06:19:12.000-07:00
diff --git a/Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/WAMAK_WaterToWater_220kW.mo b/Buildings/Fluid/HeatPumps/ModularReversible/Data/TableData2D/EN14511/WAMAK_WaterToWater_220kW.mo
@@ -77,8 +77,8 @@ record WAMAK_WaterToWater_220kW "220 kW water to water with R513A"
 <h4>References</h4>
 <p>
 WAMAK, Produktblatt ver. 2023/24.
-<a href=\"https://products.wamak.eu/combine.php?&amp;ampcoverpg&amp;ampdescriptmrktadv&amp;amplang=de-DE&amp;ampcode_id=WAHDR2XE\">
-https://products.wamak.eu/combine.php?&amp;ampcoverpg&amp;ampdescriptmrktadv&amp;amplang=de-DE&amp;ampcode_id=WAHDR2XE</a>.
+<a href=\"https://products.wamak.eu/\">
+WAMAK Product Sheets Application</a>.
 </p>
 </html>", revisions="<html>
 <ul><li>
diff --git a/Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case680FF.mo b/Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case680FF.mo
@@ -1,10 +1,12 @@
 within Buildings.ThermalZones.ISO13790.Validation.BESTEST.Cases6xx;
 model Case680FF
   extends Buildings.ThermalZones.ISO13790.Validation.BESTEST.Cases6xx.Case600FF(zonHVAC(
-        UWal=0.15, URoo=0.1))
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)));
+    UWal=0.15,
+    URoo=0.1));
+
  annotation (
+  Icon(coordinateSystem(preserveAspectRatio=false)),
+  Diagram(coordinateSystem(preserveAspectRatio=false)),
  experiment(Tolerance=1e-06, Interval=3600, StopTime=3.1536e+07),
 __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases6xx/Case680FF.mos"
         "Simulate and plot"), Documentation(info="<html>
@@ -16,7 +18,12 @@ The room temperature is free floating.
 </html>", revisions="<html>
 <ul>
 <li>
-May 3, 2024, Alessandro Maccarini:<br/>
+March 10, 2025, by Michael Wetter:<br/>
+Added missing semi-colon.</br>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1987\">IBPSA, #1987</a>.
+</li>
+<li>May 3, 2024, Alessandro Maccarini:<br/>
 First implementation.
 </li>
 </ul>
diff --git a/Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case980.mo b/Buildings/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case980.mo
@@ -1,7 +1,8 @@
 within Buildings.ThermalZones.ISO13790.Validation.BESTEST.Cases9xx;
 model Case980 "Case 900, but with increased exterior wall and roof insulation"
   extends Buildings.ThermalZones.ISO13790.Validation.BESTEST.Cases9xx.Case900(zonHVAC(
-        UWal=0.15, URoo=0.1))
+        UWal=0.15, URoo=0.1));
+
  annotation (
   __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/ThermalZones/ISO13790/Validation/BESTEST/Cases9xx/Case980.mos"
         "Simulate and plot"),
@@ -12,6 +13,12 @@ model Case980 "Case 900, but with increased exterior wall and roof insulation"
     Documentation(revisions="<html>
 <ul>
 <li>
+March 10, 2025, by Michael Wetter:<br/>
+Added missing semi-colon.</br>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1987\">IBPSA, #1987</a>.
+</li>
+<li>
 May 3, 2024, by Alessandro Maccarini:<br/>
 First implementation.
 </li>
