From 4b9be9738866b00cbf5de669dedbd9cb8cd5b4f2 Mon Sep 17 00:00:00 2001
From: Martin Stiller <martin.stiller@eonerc.rwth-aachen.de>
Date: Tue, 3 Sep 2019 18:56:46 +0200
Subject: [PATCH] * changes in Field Model controlled system, #55

---
 .../BaseClasses/GeothermalHeatPumpBase.mo     | 72 ++++++++-----------
 .../GeothermalHeatPumpSystem.mo               |  1 -
 2 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/pyDMPC/ModelicaModels/ModelicaModels/BaseClasses/GeothermalHeatPumpBase.mo b/pyDMPC/ModelicaModels/ModelicaModels/BaseClasses/GeothermalHeatPumpBase.mo
index 24a4f47..f408a2f 100644
--- a/pyDMPC/ModelicaModels/ModelicaModels/BaseClasses/GeothermalHeatPumpBase.mo
+++ b/pyDMPC/ModelicaModels/ModelicaModels/BaseClasses/GeothermalHeatPumpBase.mo
@@ -242,48 +242,33 @@ partial model GeothermalHeatPumpBase
         extent={{10,10},{-10,-10}},
         rotation=90,
         origin={116,-54})));
-  AixLib.Fluid.Geothermal.Borefields.TwoUTubes
-            borFie(redeclare package Medium = Water,
-    tLoaAgg=21600,
-    borFieDat(
-      filDat(
-        kFil=2,
-        cFil=800,
-        dFil=1600),
-      conDat(
-        borCon=AixLib.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.DoubleUTubeParallel,
-        mBor_flow_nominal=0.4,
-        mBorFie_flow_nominal=16,
-        dp_nominal=50000,
-        hBor=100,
-        rBor=0.076,
-        dBor=100,
-        cooBor=[6.02,49.93; 15.08,51.43; 24.14,49.93; 33.2,49.93; 42.26,
-            49.93; 51.25,49.93; 60.32,49.93; 22.98,41.07; 10.65,35.27;
-            22.91,32; 6.08,27.5; 15.15,27.5; 22.98,14; 35.58,6.77; 44.65,
-            6.77; 53.64,6.77; 62.63,6.77; 71.69,6.77; 80.75,6.77; 89.75,
-            6.77; 98.81,6.77; 107.8,6.77; 115.5,11.48; 106.58,16.32; 91.04,
-            16.32; 98.81,20.82; 114.41,20.82; 106.64,25.32; 91.04,25.39;
-            98.81,29.96; 114.41,29.82; 106.64,34.45; 98.81,38.95; 114.41,
-            38.89; 91.04,43.52; 106.58,43.52; 98.81,48.02; 114.41,47.95;
-            78.3,49.93; 69.31,49.93],
-        rTub=0.016,
-        kTub=0.38,
-        eTub=0.0029,
-        xC=0.048),
-      soiDat(
-        dSoi=2700,
-        kSoi=3.85,
-        cSoi=18)),
-    TExt0_start=285.65)
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={-150,-6})));
   AixLib.Fluid.Sensors.TemperatureTwoPort supplyTemSensor(redeclare package
       Medium = Water, m_flow_nominal=16) annotation (Placement(transformation(
         extent={{-7,8},{7,-8}},
         rotation=0,
         origin={-115,-54})));
+  AixLib.Fluid.MixingVolumes.MixingVolume vol(
+    redeclare package Medium = Water,
+    m_flow_small=50,
+    nPorts=2,
+    m_flow_nominal=16,
+    p_start=150000,
+    T_start=285.15,
+    V=6000)                         annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-136,-6})));
+  Modelica.Thermal.HeatTransfer.Components.ThermalConductor thermalConductor(G=2000)
+    annotation (Placement(transformation(
+        extent={{-6,-6},{6,6}},
+        rotation=90,
+        origin={-152,-38})));
+  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T=285.65)
+    annotation (Placement(transformation(
+        extent={{-6,-6},{6,6}},
+        rotation=90,
+        origin={-152,-66})));
 equation
 
   connect(resistanceGeothermalSource.port_b, valveHeatSink.port_a) annotation (
@@ -371,12 +356,17 @@ equation
           -50},{106,-50},{106,-52}}, color={0,127,255}));
   connect(resistanceHeatConsumerReturn.port_a, vol2.ports[2]) annotation (Line(
         points={{100,-106},{106,-106},{106,-56}}, color={0,127,255}));
-  connect(geothField_sink1.ports[3], borFie.port_a) annotation (Line(points={{-151.6,
-          24},{-150,24},{-150,4}}, color={0,127,255}));
   connect(supplyTemSensor.port_b, pumpGeothermalSource.port_a)
     annotation (Line(points={{-108,-54},{-96,-54}}, color={0,127,255}));
-  connect(borFie.port_b, supplyTemSensor.port_a) annotation (Line(points={{-150,
-          -16},{-150,-54},{-122,-54}}, color={0,127,255}));
+  connect(geothField_sink1.ports[3], vol.ports[1]) annotation (Line(points={{
+          -151.6,24},{-148,24},{-148,-30},{-138,-30},{-138,-16}}, color={0,127,
+          255}));
+  connect(vol.ports[2], supplyTemSensor.port_a) annotation (Line(points={{-134,
+          -16},{-130,-16},{-130,-54},{-122,-54}}, color={0,127,255}));
+  connect(thermalConductor.port_b, vol.heatPort) annotation (Line(points={{-152,
+          -32},{-150,-32},{-150,-6},{-146,-6}}, color={191,0,0}));
+  connect(fixedTemperature.port, thermalConductor.port_a)
+    annotation (Line(points={{-152,-60},{-152,-44}}, color={191,0,0}));
   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
index 6c0322d..a5d31f9 100644
--- a/pyDMPC/ModelicaModels/ModelicaModels/ControlledSystems/GeothermalHeatPumpSystem.mo
+++ b/pyDMPC/ModelicaModels/ModelicaModels/ControlledSystems/GeothermalHeatPumpSystem.mo
@@ -12,7 +12,6 @@ model GeothermalHeatPumpSystem
     pumpGeothermalSource(T_start=285.15),
     pumpHeatConsumer(T_start=285.15),
     pumpCondenser(T_start=285.15),
-    borFie(TExt0_start=285.15),
     pumpEvaporator(T_start=285.15),
     pumpColdConsumer(T_start=285.15),
     geothField_sink1(T=285.15),