* Correct model parameters, #30.

RWTH-EBC · Dec 10, 2018 · 34d0302 · 34d0302
1 parent 0ba1714
commit 34d0302
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 32 deletions.
diff --git a/pyDMPC/ModelicaModels/ModelicaModels/SubsystemModels/DetailedModels/PreHeater.mo b/pyDMPC/ModelicaModels/ModelicaModels/SubsystemModels/DetailedModels/PreHeater.mo
@@ -8,8 +8,7 @@ model PreHeater "Detailed model of the pre heater"
  IntakeAirSink(nPorts=1),
  volumeFlow(tableOnFile=false, table=[0,0.31,0.29]));
 
- extends
- ModelicaModels.Subsystems.BaseClasses.PreHeaterBaseClass;
+ extends ModelicaModels.Subsystems.BaseClasses.PreHeaterBaseClass;
 
  Modelica.Blocks.Sources.Constant Temperature(k=273 + 50) annotation (
  Placement(transformation(
@@ -23,8 +22,6 @@ equation
  connect(hex.port_b2, IntakeAirSink.ports[1])
  annotation (Line(points={{8,70},{90,70},{90,12},{170,12}},
  color={0,127,255}));
- connect(senTemp1.port, hex.port_a1) annotation (Line(points={{10,-64},{10,
- -128},{130,-128},{130,58},{8,58}},color={0,127,255}));
  connect(supplyAirHumidity.port, hex.port_b2) annotation (Line(points={{66,38},
  {66,28},{8,28},{8,70}}, color={0,127,255}));
  connect(supplyAirTemperature.port, hex.port_b2) annotation (Line(points={{104,38},

diff --git a/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/BaseClasses/CoolerBaseClass.mo b/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/BaseClasses/CoolerBaseClass.mo
@@ -2,17 +2,14 @@ within ModelicaModels.Subsystems.BaseClasses;
 model CoolerBaseClass "Base class of the cooler"
  extends
  ModelicaModels.Subsystems.BaseClasses.HeatExchangerBaseClass(
- hex(UA_nominal=1250),
- Pressure1(k=80000),
  warmWaterSource(p=waterSink.p + Pressure1.k, nPorts=1),
  ValveCharacteristicCurve(tableOnFile=false, table=[0,0; 1.0,1.0]),
  waterSink(nPorts=1),
  Temperature(k=273.15 + 12));
  AixLib.Fluid.Actuators.Valves.TwoWayLinear CoolerValve(
  redeclare package Medium = MediumWater,
- m_flow_nominal=0.5,
- dpValve_nominal=2000)
- annotation (Placement(transformation(
+ dpValve_nominal=2000,
+ m_flow_nominal=0.1) annotation (Placement(transformation(
  extent={{-10,-10},{10,10}},
  rotation=90,
  origin={12,0})));

diff --git a/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/BaseClasses/HRCBaseClass.mo b/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/BaseClasses/HRCBaseClass.mo
@@ -23,22 +23,23 @@ parameter Modelica.SIunits.Pressure defaultPressure = 101300 "Default pressure";
  redeclare package Medium1 = MediumWater,
  m2_flow_nominal=0.5,
  show_T=true,
- m1_flow_nominal=0.5,
- dp1_nominal=50,
- dp2_nominal=20,
- UA_nominal=27062.0)
+ dp1_nominal=8000,
+ dp2_nominal=200,
+ UA_nominal=1000,
+ m1_flow_nominal=0.1)
  annotation (Placement(transformation(extent={{8,-94},{-12,-74}})));
  AixLib.Fluid.Movers.FlowControlled_dp CurculationPump(redeclare package
- Medium = MediumWater, m_flow_nominal=0.5) annotation (Placement(
+ Medium = MediumWater,
+ m_flow_nominal=0.1,
+ dp_nominal=18000) annotation (Placement(
  transformation(
  extent={{-10,-10},{10,10}},
  rotation=270,
  origin={8,-24})));
  AixLib.Fluid.Actuators.Valves.ThreeWayLinear val(
  redeclare package Medium = MediumWater,
- m_flow_nominal=0.5,
- l={0.01,0.01},
- dpValve_nominal=10)
+ m_flow_nominal=0.1,
+ dpValve_nominal=2000)
  annotation (Placement(transformation(
  extent={{10,-10},{-10,10}},
  rotation=90,
@@ -75,7 +76,8 @@ equation
  connect(ValveCharacteristicCurve.y[1], val.y) annotation (Line(points={{-59,
  -50},{-34,-50},{-34,6},{-24,6}}, color={0,0,127}));
  connect(Pressure1.y, CurculationPump.dp_in) annotation (Line(points={{-59,-10},
- {32,-10},{32,-24},{20,-24}}, color={0,0,127}));
+ {32,-10},{32,-23.8},{20,-23.8}},
+ color={0,0,127}));
  connect(senTemp1.port, CurculationPump.port_b)
  annotation (Line(points={{10,-64},{8,-64},{8,-34}}, color={0,127,255}));
  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-660,-500},

diff --git a/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/BaseClasses/HeatExchangerBaseClass.mo b/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/BaseClasses/HeatExchangerBaseClass.mo
@@ -28,11 +28,11 @@ model HeatExchangerBaseClass
  Buildings.Fluid.HeatExchangers.WetCoilCounterFlow hex(
  redeclare package Medium2 = MediumAir,
  redeclare package Medium1 = MediumWater,
- m1_flow_nominal=0.5,
  m2_flow_nominal=0.5,
  dp2_nominal=200,
  UA_nominal=1000,
- dp1_nominal=8000)
+ dp1_nominal=8000,
+ m1_flow_nominal=0.1)
  annotation (Placement(transformation(extent={{8,74},{-12,54}})));
  AixLib.Fluid.Sources.Boundary_pT warmWaterSource(
  use_X_in=false,

diff --git a/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/BaseClasses/HeaterBaseClass.mo b/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/BaseClasses/HeaterBaseClass.mo
@@ -2,8 +2,6 @@ within ModelicaModels.Subsystems.BaseClasses;
 model HeaterBaseClass "Base class of the heater"
  extends
  ModelicaModels.Subsystems.BaseClasses.HeatExchangerBaseClass(
- hex(UA_nominal=1521),
- Pressure1(k=300),
  ValveCharacteristicCurve(
  tableOnFile=false,
  table=[0,0; 0.1,0.1; 0.9,0.9; 1,1]),
@@ -13,15 +11,17 @@ model HeaterBaseClass "Base class of the heater"
 
  AixLib.Fluid.Actuators.Valves.ThreeWayLinear val(
  redeclare package Medium = MediumWater,
- m_flow_nominal=0.5,
  l={0.01,0.01},
- dpValve_nominal=2000)
+ dpValve_nominal=2000,
+ m_flow_nominal=0.1)
  annotation (Placement(transformation(
  extent={{-10,-10},{10,10}},
  rotation=90,
  origin={14,-30})));
  AixLib.Fluid.Movers.FlowControlled_dp CurculationPump(redeclare package
- Medium = MediumWater, m_flow_nominal=0.5) annotation (Placement(
+ Medium = MediumWater,
+ dp_nominal=10000,
+ m_flow_nominal=0.1) annotation (Placement(
  transformation(
  extent={{10,10},{-10,-10}},
  rotation=270,
@@ -43,5 +43,6 @@ equation
  connect(hex.port_b1, senTemp1.port) annotation (Line(points={{-12,58},{-20,58},
  {-20,20},{40,20},{40,-68},{10,-68},{10,-64}}, color={0,127,255}));
  connect(Pressure1.y, CurculationPump.dp_in) annotation (Line(points={{-59,-10},
- {-44,-10},{-44,2},{2,2}}, color={0,0,127}));
+ {-44,-10},{-44,1.8},{2,1.8}},
+ color={0,0,127}));
 end HeaterBaseClass;
diff --git a/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/BaseClasses/PreHeaterBaseClass.mo b/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/BaseClasses/PreHeaterBaseClass.mo
@@ -1,22 +1,22 @@
 within ModelicaModels.Subsystems.BaseClasses;
 model PreHeaterBaseClass "Base class of the pre-heater"
  extends ModelicaModels.Subsystems.BaseClasses.HeatExchangerBaseClass(
- hex(
- UA_nominal=756), Pressure1(k=375),
  warmWaterSource(nPorts=1),
  ValveCharacteristicCurve(tableOnFile=false, table=[0,0; 1.0,1.0]),
  waterSink(nPorts=1));
  AixLib.Fluid.Actuators.Valves.ThreeWayLinear val(
  redeclare package Medium = MediumWater,
- m_flow_nominal=0.5,
  l={0.01,0.01},
- dpValve_nominal=2000)
+ dpValve_nominal=2000,
+ m_flow_nominal=0.1)
  annotation (Placement(transformation(
  extent={{-10,-10},{10,10}},
  rotation=90,
  origin={20,-14})));
  AixLib.Fluid.Movers.FlowControlled_dp CurculationPump(redeclare package
- Medium = MediumWater, m_flow_nominal=0.5) annotation (Placement(
+ Medium = MediumWater,
+ m_flow_nominal=0.1,
+ dp_nominal=10000) annotation (Placement(
  transformation(
  extent={{10,10},{-10,-10}},
  rotation=270,
@@ -35,7 +35,8 @@ equation
  connect(ValveCharacteristicCurve.y[1], val.y) annotation (Line(points={{-59,
  -50},{-42,-50},{-42,-14},{8,-14}}, color={0,0,127}));
  connect(Pressure1.y, CurculationPump.dp_in) annotation (Line(points={{-59,-10},
- {-38,-10},{-38,32},{8,32}}, color={0,0,127}));
+ {-38,-10},{-38,31.8},{8,31.8}},
+ color={0,0,127}));
  connect(CurculationPump.port_b, hex.port_a1)
  annotation (Line(points={{20,42},{20,58},{8,58}}, color={0,127,255}));
 end PreHeaterBaseClass;