Merge branch 'master' into IBPSASync_issue1987_missingSemicolon

mwetter · mwetter · commit 67b17a01fc77 · 2025-03-13T06:16:09.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/Resources/Scripts/BuildingsPy/conf.yml b/Buildings/Resources/Scripts/BuildingsPy/conf.yml
@@ -364,6 +364,9 @@
     comment: 'TimeoutExpired: omc timed out after 300 seconds'
     simulate: false
 - model_name: Buildings.ThermalZones.Detailed.Examples.FFD.WindowWithShade
+  dymola:
+    comment: Timeout on jenkins
+    time_out: 600
   openmodelica:
     comment: 'TimeoutExpired: omc timed out after 300 seconds'
     simulate: false
@@ -392,10 +395,16 @@
     comment: Timeout on travis
     time_out: 600
 - model_name: Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases9xx.Case980
+  dymola:
+    comment: Timeout on jenkins
+    time_out: 600
   openmodelica:
     comment: Timeout on travis, https://app.travis-ci.com/github/lbl-srg/modelica-buildings/jobs/615261256
     time_out: 600
 - model_name: Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases9xx.Case995
+  dymola:
+    comment: Timeout on jenkins
+    time_out: 600
   openmodelica:
     comment: Timeout on travis, https://app.travis-ci.com/github/lbl-srg/modelica-buildings/jobs/615261256
     time_out: 600
