Fix issue #6, #24, #28, #27, and #25

Co-authored-by: Larissa Kühn <[email protected]> Co-authored-by: fabian.wuellhorst <[email protected]> Co-authored-by: David Jansen <[email protected]>
RWTH-EBC · Nov 9, 2022 · c264147 · c264147
1 parent c3c8b15
commit c264147
Show file tree

Hide file tree

Showing 219 changed files with 3,462 additions and 3,094 deletions.
diff --git a/BESMod/Examples/BAUSimStudy/PartialCase.mo b/BESMod/Examples/BAUSimStudy/PartialCase.mo
@@ -9,14 +9,11 @@ partial model PartialCase
     redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
       redeclare Systems.Hydraulical.Generation.HeatPumpAndHeatingRod generation(
         redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover pumpData,
-
         redeclare package Medium_eva = AixLib.Media.Air,
-        use_pressure=true,
         redeclare
           BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP
           heatPumpParameters(
           genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel,
-
           TBiv=TBiv,
           scalingFactor=hydraulic.generation.heatPumpParameters.QPri_flow_nominal
               /5000,
@@ -31,7 +28,6 @@ partial model PartialCase
         redeclare model PerDataMainHP =
             AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (
             QCon_flow_nominal=hydraulic.generation.heatPumpParameters.QPri_flow_nominal,
-
             refrigerant="Propane",
             flowsheet="VIPhaseSeparatorFlowsheet")),
       redeclare Systems.Hydraulical.Control.ConstHys_PI_ConOut_HPSController
@@ -56,8 +52,6 @@ partial model PartialCase
         distribution(
         QHRAftBuf_flow_nominal=0,
         use_heatingRodAfterBuffer=false,
-        discretizationStepsDWHStoHR=0,
-        discretizationStepsBufStoHR=0,
         redeclare
           BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
           temperatureSensorData,
@@ -89,10 +83,8 @@ partial model PartialCase
           BESMod.Systems.Hydraulical.Transfer.RecordsCollection.SteelRadiatorStandardPressureLossData
           transferDataBaseDefinition,
         redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover pumpData)),
-
     redeclare Systems.Demand.DHW.DHW DHW(
       redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
-
       redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover pumpData,
       redeclare BESMod.Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic
         calcmFlow),

diff --git a/BESMod/Examples/BAUSimStudy/package.order b/BESMod/Examples/BAUSimStudy/package.order
@@ -1,4 +1,4 @@
+Case1Standard
 PartialCase
 BESParameters
 Buildings
-Case1Standard
diff --git a/BESMod/Examples/GasBoilerBuildingOnly.mo b/BESMod/Examples/GasBoilerBuildingOnly.mo
@@ -45,8 +45,7 @@ model GasBoilerBuildingOnly
       redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
       redeclare BESMod.Systems.Demand.DHW.TappingProfiles.PassThrough calcmFlow),
     redeclare BESMod.Systems.UserProfiles.TEASERProfiles userProfiles,
-    redeclare
-      BESMod.Examples.MyOwnHeatingRodEfficiencyStudy.SimpleStudyOfHeatingRodEfficiency
+    redeclare BESMod.Systems.RecordsCollection.ParameterStudy.NoStudy
       parameterStudy,
     redeclare BESMod.Systems.RecordsCollection.ExampleSystemParameters
       systemParameters(

diff --git a/BESMod/Examples/MyOwnHeatingRodEfficiencyStudy/BES.mo b/BESMod/Examples/MyOwnHeatingRodEfficiencyStudy/BES.mo
diff --git a/BESMod/Examples/MyOwnHeatingRodEfficiencyStudy/SimpleStudyOfHeatingRodEfficiency.mo b/BESMod/Examples/MyOwnHeatingRodEfficiencyStudy/SimpleStudyOfHeatingRodEfficiency.mo
diff --git a/BESMod/Examples/MyOwnHeatingRodEfficiencyStudy/package.mo b/BESMod/Examples/MyOwnHeatingRodEfficiencyStudy/package.mo
diff --git a/BESMod/Examples/MyOwnHeatingRodEfficiencyStudy/package.order b/BESMod/Examples/MyOwnHeatingRodEfficiencyStudy/package.order
diff --git a/...rmalSystem/SolarThermalHPSBuildingsLib.mo → ...arThermalSystem/PartialSolarThermalHPS.mo b/...rmalSystem/SolarThermalHPSBuildingsLib.mo → ...arThermalSystem/PartialSolarThermalHPS.mo
@@ -1,5 +1,5 @@
 within BESMod.Examples.SolarThermalSystem;
-model SolarThermalHPSBuildingsLib
+partial model PartialSolarThermalHPS
   "HPS which is supported by a solar thermal collector"
   extends BESMod.Systems.BaseClasses.PartialBuildingEnergySystem(
     redeclare BESMod.Systems.Electrical.DirectGridConnectionSystem electrical,
@@ -8,30 +8,7 @@ model SolarThermalHPSBuildingsLib
           heaLoadFacGrd=0, heaLoadFacOut=0)),
     redeclare BESMod.Systems.Control.NoControl control,
     redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
-      redeclare BESMod.Systems.Hydraulical.Generation.SolarThermalBivHPBuiLib
-        generation(
-        use_pressure=true,
-        redeclare model PerDataMainHP =
-            AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (refrigerant=
-                "Propane", flowsheet="VIPhaseSeparatorFlowsheet"),
-        redeclare
-          BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP
-          heatPumpParameters(genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentParallel),
-
-        redeclare
-          BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHR
-          heatingRodParameters,
-        redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover pumpData,
-
-        redeclare package Medium_eva = AixLib.Media.Air,
-        redeclare BESMod.Examples.SolarThermalSystem.SolarCollector
-          solarThermalParas(
-          final A=parameterStudy.A,
-          final eta_zero=parameterStudy.eta_zero,
-          final c1=parameterStudy.c1,
-          final c2=parameterStudy.c2),
-        redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover
-          pumpSTData),
+      redeclare hydGeneration generation,
       redeclare BESMod.Systems.Hydraulical.Control.Biv_PI_ConFlow_HPSController
         control(
         redeclare
@@ -63,13 +40,10 @@ model SolarThermalHPSBuildingsLib
           BESMod.Systems.Hydraulical.Transfer.RecordsCollection.SteelRadiatorStandardPressureLossData
           transferDataBaseDefinition,
         redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover pumpData)),
-
     redeclare Systems.Demand.DHW.DHW DHW(
       redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
-
       redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover pumpData,
       redeclare Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic calcmFlow),
-
     redeclare SolarThermalSystemParameters systemParameters,
     redeclare SolarThermalDesignOptimization parameterStudy(
       A=11,
@@ -80,11 +54,15 @@ model SolarThermalHPSBuildingsLib
     redeclare Systems.UserProfiles.TEASERProfiles userProfiles,
     redeclare BESMod.Systems.Ventilation.NoVentilation ventilation);
 
+  replaceable model hydGeneration =
+      BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialGeneration(nParallelDem=2)
+     constrainedby BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialGeneration
+     annotation (choicesAllMatching=true);
   annotation (Icon(graphics,
                    coordinateSystem(preserveAspectRatio=false)), Diagram(graphics,
         coordinateSystem(preserveAspectRatio=false)),
     experiment(
-      StopTime=31536000,
+      StopTime=864000,
       Interval=600,
       __Dymola_Algorithm="Dassl"));
-end SolarThermalHPSBuildingsLib;
+end PartialSolarThermalHPS;
diff --git a/BESMod/Examples/SolarThermalSystem/SolarThermalAixLib.mo b/BESMod/Examples/SolarThermalSystem/SolarThermalAixLib.mo
@@ -0,0 +1,30 @@
+within BESMod.Examples.SolarThermalSystem;
+model SolarThermalAixLib "Solar thermal collector from AixLib"
+  extends BESMod.Examples.SolarThermalSystem.PartialSolarThermalHPS(redeclare
+      model hydGeneration =
+        BESMod.Systems.Hydraulical.Generation.SolarThermalBivHPAixLib (
+        redeclare model PerDataMainHP =
+            AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (refrigerant=
+                "Propane", flowsheet="VIPhaseSeparatorFlowsheet"),
+        redeclare
+          BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP
+          heatPumpParameters(genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentParallel),
+
+        redeclare
+          BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHR
+          heatingRodParameters,
+        redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover pumpData,
+
+        redeclare package Medium_eva = AixLib.Media.Air,
+        redeclare BESMod.Examples.SolarThermalSystem.SolarCollector
+          solarThermalParas(
+          final A=parameterStudy.A,
+          final eta_zero=parameterStudy.eta_zero,
+          final c1=parameterStudy.c1,
+          final c2=parameterStudy.c2),
+        redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover
+          pumpSTData));
+
+  extends Modelica.Icons.Example;
+
+end SolarThermalAixLib;
diff --git a/BESMod/Examples/SolarThermalSystem/SolarThermalBuildings.mo b/BESMod/Examples/SolarThermalSystem/SolarThermalBuildings.mo
@@ -0,0 +1,29 @@
+within BESMod.Examples.SolarThermalSystem;
+model SolarThermalBuildings
+  "HPS which is supported by a solar thermal collector"
+  extends BESMod.Examples.SolarThermalSystem.PartialSolarThermalHPS(
+    redeclare model hydGeneration =
+        BESMod.Systems.Hydraulical.Generation.SolarThermalBivHPBuiLib (
+        redeclare model PerDataMainHP =
+            AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (refrigerant="Propane",
+              flowsheet="VIPhaseSeparatorFlowsheet"),
+        redeclare
+          BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP
+          heatPumpParameters(genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentParallel),
+        redeclare
+          BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHR
+          heatingRodParameters,
+        redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover pumpData,
+        redeclare package Medium_eva = AixLib.Media.Air,
+        redeclare BESMod.Examples.SolarThermalSystem.SolarCollector
+          solarThermalParas(
+          final A=parameterStudy.A,
+          final eta_zero=parameterStudy.eta_zero,
+          final c1=parameterStudy.c1,
+          final c2=parameterStudy.c2),
+        redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover
+          pumpSTData));
+
+  extends Modelica.Icons.Example;
+
+end SolarThermalBuildings;
diff --git a/BESMod/Examples/SolarThermalSystem/SolarThermalHPS.mo b/BESMod/Examples/SolarThermalSystem/SolarThermalHPS.mo
diff --git a/BESMod/Examples/SolarThermalSystem/SolarThermalSystemParameters.mo b/BESMod/Examples/SolarThermalSystem/SolarThermalSystemParameters.mo
@@ -1,5 +1,5 @@
 within BESMod.Examples.SolarThermalSystem;
 record SolarThermalSystemParameters
-  extends BESMod.Examples.UseCaseAachen.AachenSystem;
+  extends BESMod.Examples.UseCaseDesignOptimization.AachenSystem;
 
 end SolarThermalSystemParameters;
diff --git a/BESMod/Examples/SolarThermalSystem/package.order b/BESMod/Examples/SolarThermalSystem/package.order
@@ -1,6 +1,7 @@
-SolarThermalHPS
+PartialSolarThermalHPS
+SolarThermalAixLib
+SolarThermalBuildings
 SolarThermalSystemParameters
 SolarThermalDesignOptimization
 CombiStorage
 SolarCollector
-SolarThermalHPSBuildingsLib
diff --git a/BESMod/Examples/UseCaseAachen/package.mo b/BESMod/Examples/UseCaseAachen/package.mo