Merge pull request #1969 from ibpsa/issue1968_solarCollectorExample

Removed assignment of parameter that no longer exits in SolarCollector example
ibpsa · Feb 12, 2025 · 725c9be · 725c9be
2 parents 6608f4d + 83f737a
commit 725c9be
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,8 +33,8 @@ env:
     - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.{Examples,Experimental}\""
     - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.Fluid.{Actuators,BaseClasses,Chillers,Delays,Geothermal,Examples,FMI,FixedResistances}\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.Fluid.{Actuators,BaseClasses,Chillers,Delays,Geothermal,Examples,FMI,FixedResistances}\""
-    - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.Fluid.{HeatExchangers,HeatPumps,Humidifiers,Interfaces,MassExchangers,MixingVolumes,Movers,Sensors,Sources,Storage}\""
-    - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.Fluid.{HeatExchangers,HeatPumps,Humidifiers,Interfaces,MassExchangers,MixingVolumes,Movers,Sensors,Sources,Storage}\""
+    - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.Fluid.{HeatExchangers,HeatPumps,Humidifiers,Interfaces,MassExchangers,MixingVolumes,Movers,SolarCollectors,Sensors,Sources,Storage}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.Fluid.{HeatExchangers,HeatPumps,Humidifiers,Interfaces,MassExchangers,MixingVolumes,Movers,SolarCollectors,Sensors,Sources,Storage}\""
     - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.ThermalZones\""
     - TEST_ARG="make test-openmodelica PACKAGE=\"IBPSA.ThermalZones\""
     - TEST_ARG="make test-dymola       PACKAGE=\"IBPSA.{Airflow,BoundaryConditions,Controls,Electrical}\""

diff --git a/IBPSA/Fluid/SolarCollectors/Validation/EN12975_Array.mo b/IBPSA/Fluid/SolarCollectors/Validation/EN12975_Array.mo
@@ -28,16 +28,19 @@ model EN12975_Array
     nPanels=4,
     nSeg=3,
     sysConfig=IBPSA.Fluid.SolarCollectors.Types.SystemConfiguration.Array,
-    nPanelsSer=2,
     nPanelsPar=2)
     "Flat plate solar collector model, has been modified for validation purposes"
     annotation (Placement(transformation(extent={{-20,20},{0,40}})));
 
-  Collector solCol1(nSeg=3, nPanels=2)
+  Collector solCol1(
+    nSeg=3,
+    nPanels=2)
     "Flat plate solar collector model, has been modified for validation purposes"
     annotation (Placement(transformation(extent={{-50,-40},{-30,-20}})));
 
-  Collector solCol2(nSeg=3, nPanels=2)
+  Collector solCol2(
+    nSeg=3,
+    nPanels=2)
     "Flat plate solar collector model, has been modified for validation purposes"
     annotation (Placement(transformation(extent={{-50,-80},{-30,-60}})));
 
@@ -147,6 +150,12 @@ Furthermore, the pressure drops over all models should be the same.
 </html>", revisions="<html>
 <ul>
 <li>
+February 11, 2025, by Michael Wetter:<br/>
+Removed parameter assignment for parameter that no longer exists.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1968\">IBPSA, #1968</a>.
+</li>
+<li>
 February 27, 2024, by Jelger Jansen:<br/>
 First implementation.<br/>
 This is for