* correct connection in the modelica models, #47

RWTH-EBC · May 1, 2019 · 4c01adb · 4c01adb
1 parent 00401c0
commit 4c01adb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/pyDMPC/ModelicaModels/ModelicaModels/SubsystemModels/DetailedModels/Hall2.mo b/pyDMPC/ModelicaModels/ModelicaModels/SubsystemModels/DetailedModels/Hall2.mo
@@ -74,6 +74,8 @@ equation
  {0,86},{-34,86}}, color={0,0,127}));
  connect(gain.y, IntakeAirSource.m_flow_in) annotation (Line(points={{-57,86},
  {-132,86},{-132,20},{-120,20}}, color={0,0,127}));
+ connect(combiTimeTable.y[6], SolarShare.u) annotation (Line(points={{-19,10},
+ {0,10},{0,-40},{32.8,-40}}, color={0,0,127}));
  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
  coordinateSystem(preserveAspectRatio=false)),
  experiment(StopTime=86400, Interval=10));

diff --git a/pyDMPC/ModelicaModels/ModelicaModels/SubsystemModels/DetailedModels/Hall_long.mo b/pyDMPC/ModelicaModels/ModelicaModels/SubsystemModels/DetailedModels/Hall_long.mo
@@ -5,13 +5,17 @@ model Hall_long
  Modelica.Blocks.Sources.Constant Tnormal(k=273 + 22)
  "Average Temperature of supply air or forecast"
  annotation (Placement(transformation(extent={{-160,10},{-140,30}})));
+ Modelica.Blocks.Sources.Constant solar(k=0)
+ annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
  Modelica.Blocks.Sources.RealExpression realExpression(y=35 -
  decisionVariables.y[1])
- annotation (Placement(transformation(extent={{-110,-110},{-44,-90}})));
+ annotation (Placement(transformation(extent={{-106,-110},{-50,-92}})));
 equation
  connect(Tnormal.y, IntakeAirSource.T_in) annotation (Line(points={{-139,20},{
  -120,20},{-120,24},{-102,24}}, color={0,0,127}));
- connect(realExpression.y, waterTemperature.Celsius)
- annotation (Line(points={{-40.7,-100},{-29.2,-100}}, color={0,0,127}));
+ connect(solar.y, SolarShare.u)
+ annotation (Line(points={{21,-40},{32.8,-40}}, color={0,0,127}));
+ connect(realExpression.y, waterTemperature.Celsius) annotation (Line(points={
+ {-47.2,-101},{-37.6,-101},{-37.6,-100},{-29.2,-100}}, color={0,0,127}));
  annotation (experiment(StopTime=172800, Interval=10));
 end Hall_long;
diff --git a/pyDMPC/ModelicaModels/ModelicaModels/SubsystemModels/DetailedModels/Hall_short.mo b/pyDMPC/ModelicaModels/ModelicaModels/SubsystemModels/DetailedModels/Hall_short.mo
@@ -18,11 +18,15 @@ model Hall_short
  Modelica.Blocks.Sources.Constant currentWaterTemperature(k=22)
  "Can be an iniitial value"
  annotation (Placement(transformation(extent={{-88,-110},{-68,-90}})));
+ Modelica.Blocks.Sources.Constant solar(k=0)
+ annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
 equation
  connect(variation.y[1], hallTemperature1.Celsius)
  annotation (Line(points={{-139,18},{-129.2,18}}, color={0,0,127}));
  connect(IntakeAirSource.T_in, hallTemperature1.Kelvin) annotation (Line(
  points={{-102,24},{-108,24},{-108,18},{-115.4,18}}, color={0,0,127}));
  connect(waterTemperature.Celsius, currentWaterTemperature.y)
  annotation (Line(points={{-29.2,-100},{-67,-100}}, color={0,0,127}));
+ connect(solar.y, SolarShare.u)
+ annotation (Line(points={{21,-40},{32.8,-40}}, color={0,0,127}));
 end Hall_short;
diff --git a/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/BaseClasses/HallBaseClass.mo b/pyDMPC/ModelicaModels/ModelicaModels/Subsystems/BaseClasses/HallBaseClass.mo
@@ -833,8 +833,6 @@ equation
  -148},{120,-148},{120,-132},{92,-132},{92,-96},{78,-96},{78,-80},{90,-80}},
  color=
  {191,0,0}));
- connect(combiTimeTable.y[6], SolarShare.u) annotation (Line(points={{-19,10},{
- -8,10},{-8,-40},{32.8,-40}}, color={0,0,127}));
  connect(waterTemperature.Kelvin, SupplyWater.T) annotation (Line(points={{-15.4,
  -100},{-14,-100},{-14,-150},{-2,-150}}, color={0,0,127}));
  connect(combiTimeTable.y[1], hallTemperature.Celsius)