* runable version of HeatPump Controlled System and Subsystem, #55

- added valves
RWTH-EBC · Sep 29, 2019 · 3b7d713 · 3b7d713
1 parent f23c798
commit 3b7d713
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 26 deletions.
diff --git a/pyDMPC/ModelicaModels/ModelicaModels/BaseClasses/GeothermalHeatPumpBase.mo b/pyDMPC/ModelicaModels/ModelicaModels/BaseClasses/GeothermalHeatPumpBase.mo
@@ -23,8 +23,8 @@ partial model GeothermalHeatPumpBase
     redeclare package Medium = Water,
     tablePower=[0,266.15,275.15,280.15,283.15,293.15; 308.15,3300,3400,3500,
         3700,3800; 323.15,4500,4400,4600,5000,5100],
-    tableHeatFlowCondenser=[0,266.16,275.15,280.15,283.15,293.15; 308.15,
-        9700,11600,13000,14800,16300; 323.15,10000,11200,12900,16700,17500])
+    tableHeatFlowCondenser=[0,266.16,275.15,280.15,283.15,293.15; 308.15,9700,
+        11600,13000,14800,16300; 323.15,10000,11200,12900,16700,17500])
     "Base load energy conversion unit"
     annotation (Placement(transformation(extent={{-40,-14},{-4,20}})));
 
@@ -265,11 +265,29 @@ partial model GeothermalHeatPumpBase
         extent={{-6,-6},{6,6}},
         rotation=90,
         origin={-146,-40})));
+  AixLib.Fluid.Actuators.Valves.TwoWayQuickOpening valve(
+    redeclare package Medium = Water,
+    m_flow_nominal=0.5,
+    dpValve_nominal=5000)
+    "Valve connecting cold storage to the evaporator of the heat pump"
+    annotation (Placement(transformation(
+        extent={{6,7},{-6,-7}},
+        rotation=180,
+        origin={-86,-12})));
   Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T=285.65)
     annotation (Placement(transformation(
         extent={{-6,-6},{6,6}},
         rotation=90,
         origin={-146,-58})));
+  AixLib.Fluid.Actuators.Valves.TwoWayQuickOpening valve1(
+    redeclare package Medium = Water,
+    m_flow_nominal=0.5,
+    dpValve_nominal=5000)
+    "Valve connecting cold storage to the evaporator of the heat pump"
+    annotation (Placement(transformation(
+        extent={{-6,7},{6,-7}},
+        rotation=180,
+        origin={-72,22})));
 equation
 
   connect(resistanceGeothermalSource.port_b, valveHeatSink.port_a) annotation (
@@ -340,9 +358,6 @@ equation
       extent={{6,3},{6,3}}));
   connect(resistanceHeatConsumerFlow.port_b, PeakLoadDevice.port_a) annotation (
      Line(points={{80,-50},{86,-50}},            color={0,127,255}));
-  connect(returnTemSensor.port_a, heatPumpTab.port_b_source) annotation (
-      Line(points={{-100,18},{-76,18},{-76,-8.9},{-38.2,-8.9}}, color={0,
-          127,255}));
   connect(resistanceColdConsumerFlow.port_b, vol1.ports[1])
     annotation (Line(points={{80,-20},{86,-20},{86,28}}, color={0,127,255}));
   connect(vol1.ports[2], resistanceColdConsumerReturn.port_a)
@@ -364,9 +379,14 @@ equation
   connect(vol.ports[3], returnTemSensor.port_b) annotation (Line(points={{
           -133.333,-16},{-150,-16},{-150,14},{-114,14},{-114,18}},
                                                           color={0,127,255}));
-  connect(heatPumpTab.port_b_sink, returnTemSensor.port_a) annotation (Line(
-        points={{-5.8,14.9},{8,14.9},{8,22},{-100,22},{-100,18}}, color={0,127,
-          255}));
+  connect(returnTemSensor.port_a, valve.port_a) annotation (Line(points={{-100,
+          18},{-100,-12},{-92,-12}}, color={0,127,255}));
+  connect(valve.port_b, heatPumpTab.port_b_source) annotation (Line(points={{
+          -80,-12},{-58,-12},{-58,-8.9},{-38.2,-8.9}}, color={0,127,255}));
+  connect(heatPumpTab.port_b_sink, valve1.port_a) annotation (Line(points={{
+          -5.8,14.9},{-6,14.9},{-6,22},{-66,22}}, color={0,127,255}));
+  connect(valve1.port_b, returnTemSensor.port_a) annotation (Line(points={{-78,
+          22},{-100,22},{-100,18}}, color={0,127,255}));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-160,
           -120},{160,80}})),              Icon(coordinateSystem(
           preserveAspectRatio=false, extent={{-160,-120},{160,80}})),

diff --git a/pyDMPC/ModelicaModels/ModelicaModels/ControlledSystems/GeothermalHeatPumpSystem.mo b/pyDMPC/ModelicaModels/ModelicaModels/ControlledSystems/GeothermalHeatPumpSystem.mo
@@ -19,16 +19,14 @@ model GeothermalHeatPumpSystem
     pumpCondenser(T_start=285.15),
     pumpEvaporator(T_start=285.15),
     pumpColdConsumer(T_start=279.15),
-    heatPumpTab(
-      VolumeEvaporator=1,
-      VolumeCondenser=1,
-      tablePower=[0,266.15,275.15,280.15,283.15,293.15; 308.15,29700,30600,
-          31500,33300,34200; 323.15,40500,39600,41400,45000,45900],
-      tableHeatFlowCondenser=[0,266.15,275.15,280.15,283.15,293.15; 308.15,
-          87300,104400,117000,133200,146700; 323.15,90000,100800,116100,150300,
-          157500]),
     thermalZone(zoneParam=
-          Subsystems.Geo.BaseClasses.TEASER_DataBase.TEASER_Office()));
+          Subsystems.Geo.BaseClasses.TEASER_DataBase.TEASER_Office()),
+    negate1(k=-1),
+    negate(k=-1),
+    heatPumpTab(tablePower=[0,266.15,275.15,280.15,283.15,293.15; 308.15,1650,
+          1700,1750,1850,1900; 323.15,2250,2200,2300,2500,2550],
+        tableHeatFlowCondenser=[0,266.16,275.15,280.15,283.15,293.15; 308.15,
+          4850,5800,6500,7400,8150; 323.15,5000,5600,6450,8350,8750]));
 
   AixLib.Fluid.Sources.Boundary_pT coldConsumerFlow(redeclare package Medium =
         Water,
@@ -121,6 +119,12 @@ equation
           94,-20},{90,-20},{90,30},{86,30}}, color={0,127,255}));
   connect(heatConsumerReturn.ports[1], vol2.ports[3]) annotation (Line(points={
           {112,-106},{110,-106},{110,-54},{106,-54}}, color={0,127,255}));
+  connect(geothermalFieldControllerCold.valveOpening2, valve.y) annotation (
+      Line(points={{-83.04,31.2},{-82,31.2},{-82,2},{-86,2},{-86,-3.6}}, color=
+          {0,0,127}));
+  connect(geothermalFieldControllerCold.valveOpening1, valve1.y) annotation (
+      Line(points={{-83.04,40.8},{-70,40.8},{-70,30.4},{-72,30.4}}, color={0,0,
+          127}));
   annotation (experiment(StopTime=86400, Interval=10), Documentation(revisions="<html>
 <ul>
 <li>

diff --git a/...PC/ModelicaModels/ModelicaModels/SubsystemModels/DetailedModels/Geo/GeothermalHeatPump.mo b/...PC/ModelicaModels/ModelicaModels/SubsystemModels/DetailedModels/Geo/GeothermalHeatPump.mo
@@ -126,6 +126,11 @@ equation
     annotation (Line(points={{96,2},{111.6,2}}, color={0,0,127}));
   connect(negate2.u, const1.y)
     annotation (Line(points={{120.8,2},{127.4,2}}, color={0,0,127}));
+  connect(geothermalFieldControllerCold.valveOpening1, valve1.y) annotation (
+      Line(points={{-83.04,50.8},{-83.04,50},{-74,50},{-74,32.4}}, color={0,0,
+          127}));
+  connect(valve.y, geothermalFieldControllerCold.valveOpening2) annotation (
+      Line(points={{-74,0.4},{-83.04,0.4},{-83.04,41.2}}, color={0,0,127}));
   annotation (experiment(StopTime=86400, Interval=10), Documentation(revisions="<html>
 <ul>
 <li>

diff --git a/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/Geo/BaseClasses/GeothermalHeatPumpBase.mo b/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/Geo/BaseClasses/GeothermalHeatPumpBase.mo
@@ -20,11 +20,13 @@ partial model GeothermalHeatPumpBase
   AixLib.Fluid.HeatPumps.HeatPumpSimple heatPumpTab(
     volumeEvaporator(T_start=T_start_cold[1]),
     volumeCondenser(T_start=T_start_warm[5]),
+    gain(
+    k =    -1000000),
     redeclare package Medium = Water,
-    tablePower=[0,266.15,275.15,280.15,283.15,293.15; 308.15,3300,3400,3500,
-        3700,3800; 323.15,4500,4400,4600,5000,5100],
-    tableHeatFlowCondenser=[0,266.16,275.15,280.15,283.15,293.15; 308.15,
-        9700,11600,13000,14800,16300; 323.15,10000,11200,12900,16700,17500])
+    tableHeatFlowCondenser=[0,266.16,275.15,280.15,283.15,293.15; 308.15,97000,116000,
+        130000,148000,163000; 323.15,100000,112000,129000,167000,175000],
+    tablePower=[0,266.15,275.15,280.15,283.15,293.15; 308.15,330,340,350,370,380;
+        323.15,450,440,460,500,510])
     "Base load energy conversion unit"
     annotation (Placement(transformation(extent={{-40,-14},{-4,20}})));
 
@@ -244,6 +246,24 @@ partial model GeothermalHeatPumpBase
         extent={{10,10},{-10,-10}},
         rotation=90,
         origin={116,-54})));
+  AixLib.Fluid.Actuators.Valves.TwoWayQuickOpening valve(
+    redeclare package Medium = Water,
+    m_flow_nominal=0.5,
+    dpValve_nominal=5000)
+    "Valve connecting cold storage to the evaporator of the heat pump"
+    annotation (Placement(transformation(
+        extent={{-6,7},{6,-7}},
+        rotation=180,
+        origin={-74,-8})));
+  AixLib.Fluid.Actuators.Valves.TwoWayQuickOpening valve1(
+    redeclare package Medium = Water,
+    m_flow_nominal=0.5,
+    dpValve_nominal=5000)
+    "Valve connecting cold storage to the evaporator of the heat pump"
+    annotation (Placement(transformation(
+        extent={{-6,7},{6,-7}},
+        rotation=180,
+        origin={-74,24})));
 equation
 
   connect(resistanceGeothermalSource.port_b, valveHeatSink.port_a) annotation (
@@ -327,11 +347,14 @@ equation
         points={{100,-106},{106,-106},{106,-56}}, color={0,127,255}));
   connect(boundary.ports[1], pumpGeothermalSource.port_a)
     annotation (Line(points={{-136,-54},{-96,-54}}, color={0,127,255}));
-  connect(heatPumpTab.port_b_sink, returnTemSensor.port_a) annotation (Line(
-        points={{-5.8,14.9},{2,14.9},{2,30},{-100,30},{-100,18}}, color={0,127,
-          255}));
-  connect(heatPumpTab.port_b_source, returnTemSensor.port_a) annotation (Line(
-        points={{-38.2,-8.9},{-100,-8.9},{-100,18}}, color={0,127,255}));
+  connect(heatPumpTab.port_b_source, valve.port_a) annotation (Line(points={{
+          -38.2,-8.9},{-58.1,-8.9},{-58.1,-8},{-68,-8}}, color={0,127,255}));
+  connect(valve.port_b, returnTemSensor.port_a) annotation (Line(points={{-80,
+          -8},{-100,-8},{-100,18}}, color={0,127,255}));
+  connect(heatPumpTab.port_b_sink, valve1.port_a) annotation (Line(points={{
+          -5.8,14.9},{-4,14.9},{-4,24},{-68,24}}, color={0,127,255}));
+  connect(valve1.port_b, returnTemSensor.port_a) annotation (Line(points={{-80,
+          24},{-100,24},{-100,18}}, color={0,127,255}));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-160,
           -120},{160,80}})),              Icon(coordinateSystem(
           preserveAspectRatio=false, extent={{-160,-120},{160,80}})),