@@ -60,7 +60,7 @@ partial model GeothermalHeatPumpControlledBase
60
60
rotation=90,
61
61
origin={-60.5,-109})));
62
62
inner Modelica.Fluid.System system
63
- annotation (Placement(transformation(extent={{120 ,60},{140 ,80}})));
63
+ annotation (Placement(transformation(extent={{180 ,60},{200 ,80}})));
64
64
Modelica.Blocks.Interfaces.RealOutput returnTemperature(
65
65
final quantity= "ThermodynamicTemperature" ,
66
66
final unit= "K" ,
@@ -150,7 +150,7 @@ partial model GeothermalHeatPumpControlledBase
150
150
computeWetBulbTemperature= false ,
151
151
filNam= Modelica.Utilities.Files.loadResource("modelica://ModelicaModels/Subsystems/Geo/BaseClasses/TEASER_BuildingSets/DEU_BW_Mannheim_107290_TRY2010_12_Jahr_BBSR.mos" ))
152
152
"Weather data reader"
153
- annotation (Placement(transformation(extent={{188,32 },{168,52 }})));
153
+ annotation (Placement(transformation(extent={{200,30 },{180,50 }})));
154
154
Modelica.Blocks.Sources.CombiTimeTable tableAHU(
155
155
tableOnFile= true ,
156
156
extrapolation= Modelica.Blocks.Types.Extrapolation.Periodic,
@@ -159,7 +159,7 @@ partial model GeothermalHeatPumpControlledBase
159
159
fileName= Modelica.Utilities.Files.loadResource(
160
160
"modelica://ModelicaModels/Subsystems/Geo/BaseClasses/TEASER_BuildingSets/AHU_TEASER.mat" ))
161
161
"Boundary conditions for air handling unit"
162
- annotation (Placement(transformation(extent={{188,2 },{172,18 }})));
162
+ annotation (Placement(transformation(extent={{200,0 },{180,20 }})));
163
163
Modelica.Blocks.Sources.CombiTimeTable tableTSet(
164
164
tableOnFile= true ,
165
165
tableName= "Tset" ,
@@ -168,7 +168,7 @@ partial model GeothermalHeatPumpControlledBase
168
168
"modelica://ModelicaModels/Subsystems/Geo/BaseClasses/TEASER_BuildingSets/Tset_TEASER.mat" ),
169
169
columns= 2 :7 )
170
170
"Set points for heater"
171
- annotation (Placement(transformation(extent={{188,-46 },{172,-30 }})));
171
+ annotation (Placement(transformation(extent={{200,-60 },{180,-40 }})));
172
172
Modelica.Blocks.Sources.CombiTimeTable tableInternalGains(
173
173
tableOnFile= true ,
174
174
extrapolation= Modelica.Blocks.Types.Extrapolation.Periodic,
@@ -177,10 +177,10 @@ partial model GeothermalHeatPumpControlledBase
177
177
"modelica://ModelicaModels/Subsystems/Geo/BaseClasses/TEASER_BuildingSets/InternalGains_TEASER.mat" ),
178
178
columns= 2 :19 )
179
179
"Profiles for internal gains"
180
- annotation (Placement(transformation(extent={{188,-68 },{172,-52 }})));
180
+ annotation (Placement(transformation(extent={{200,-90 },{180,-70 }})));
181
181
Modelica.Blocks.Sources.Constant const[6 ](each k= 0 )
182
182
"Set point for cooler"
183
- annotation (Placement(transformation(extent={{188,-22 },{172,-6 }})));
183
+ annotation (Placement(transformation(extent={{200,-30 },{180,-10 }})));
184
184
Modelica.Blocks.Math.Gain negate(k= - 1 )
185
185
annotation (Placement(transformation(extent={{110,-2},{102,6}})));
186
186
Modelica.Blocks.Math.Gain negate1(k= - 1 ) annotation (Placement(transformation(
@@ -218,19 +218,17 @@ equation
218
218
connect (supplyTemSensor.T, supplyTemperature) annotation (Line(points={{-115,-62.8},
219
219
{-115,-67.4},{-116,-67.4},{-116,-120}}, color={0,0,127}));
220
220
connect (weaDat.weaBus,multizone. weaBus) annotation (Line(
221
- points={{168,42 },{166,42 },{166,14},{162,14}},
221
+ points={{180,40 },{166,40 },{166,14},{162,14}},
222
222
color={255,204,51},
223
223
thickness=0.5));
224
224
connect (tableInternalGains.y,multizone. intGains)
225
- annotation (Line(points={{171.2,-60},{148,-60},{148,-1}},
226
- color={0,0,127}));
225
+ annotation (Line(points={{179,-80},{148,-80},{148,-1}},color={0,0,127}));
227
226
connect (tableAHU.y,multizone. AHU)
228
- annotation (Line(points={{171.2,10},{163,10}}, color={0,0,127}));
229
- connect (tableTSet.y,multizone. TSetHeat) annotation (Line(points={{171.2,-38},
230
- {159.2,-38},{159.2,-1}},
231
- color={0,0,127}));
232
- connect (const.y,multizone. TSetCool) annotation (Line(points={{171.2,-14},{
233
- 162,-14},{162,-2},{161.4,-2},{161.4,-1}}, color={0,0,127}));
227
+ annotation (Line(points={{179,10},{163,10}}, color={0,0,127}));
228
+ connect (tableTSet.y,multizone. TSetHeat) annotation (Line(points={{179,-50},{
229
+ 159.2,-50},{159.2,-1}},color={0,0,127}));
230
+ connect (const.y,multizone. TSetCool) annotation (Line(points={{179,-20},{162,
231
+ -20},{162,-2},{161.4,-2},{161.4,-1}}, color={0,0,127}));
234
232
connect (negate1.u,sum1. y) annotation (Line(points={{116,-13.2},{124,-13.2},{124,
235
233
-16.4},{132,-16.4}}, color={0,0,127}));
236
234
connect (negate.u,sum2. y)
@@ -257,6 +255,6 @@ First implementation.
257
255
</li>
258
256
</ul>
259
257
</html>" ),
260
- Diagram(coordinateSystem(extent={{-160,-120},{140 ,80}})),
261
- Icon(coordinateSystem(extent={{-160,-120},{140 ,80}})));
258
+ Diagram(coordinateSystem(extent={{-160,-120},{200 ,80}})),
259
+ Icon(coordinateSystem(extent={{-160,-120},{200 ,80}})));
262
260
end GeothermalHeatPumpControlledBase;
0 commit comments