Skip to content

Commit 5783775

Browse files
FWuellhorstFWuellhorst
authored
Merge pull request #1378 from RWTH-EBC/openModelicaProject
Open Modelica PR
2 parents 4280d7c + fae8e8d commit 5783775

65 files changed

Lines changed: 536 additions & 638 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AixLib/Fluid/DistrictHeatingCooling/Demands/OpenLoop/HeatPumpCarnot.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public
7878
extent={{10,10},{-10,-10}},
7979
rotation=180,
8080
origin={-90,50})));
81-
Modelica.Blocks.Math.Gain gain(k=cp_default)
81+
Modelica.Blocks.Math.Gain gain(k(unit="J/(kg.K)")=cp_default, y(unit="J/(kg.K)"))
8282
annotation (Placement(transformation(extent={{-32,40},{-12,60}})));
8383
Modelica.Blocks.Math.Division hea2MasFlo annotation (Placement(transformation(
8484
extent={{-10,-10},{10,10}},

‎AixLib/Fluid/DistrictHeatingCooling/Demands/OpenLoop/VarTSupplyDp.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public
6161
extent={{10,10},{-10,-10}},
6262
rotation=180,
6363
origin={-90,46})));
64-
Modelica.Blocks.Math.Gain gain(k=cp_default)
64+
Modelica.Blocks.Math.Gain gain(k(unit="J/(kg.K)")=cp_default, y(unit="J/(kg.K)"))
6565
annotation (Placement(transformation(extent={{-26,54},{-6,74}})));
6666
Modelica.Blocks.Math.Division hea2MasFlo annotation (Placement(transformation(
6767
extent={{-10,-10},{10,10}},

‎AixLib/Fluid/DistrictHeatingCooling/Demands/OpenLoop/VarTSupplyDpBypass.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public
6464
extent={{10,10},{-10,-10}},
6565
rotation=180,
6666
origin={-90,46})));
67-
Modelica.Blocks.Math.Gain gain(k=cp_default)
67+
Modelica.Blocks.Math.Gain gain(k(unit="J/(kg.K)")=cp_default, y(unit="J/(kg.K)"))
6868
annotation (Placement(transformation(extent={{-26,54},{-6,74}})));
6969
Modelica.Blocks.Math.Division hea2MasFlo annotation (Placement(transformation(
7070
extent={{-10,-10},{10,10}},

‎AixLib/Fluid/DistrictHeatingCooling/Demands/OpenLoop/VarTSupplyDpFixedTempDifferenceBypass.mo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public
5454
annotation (Placement(transformation(extent={{-10,-10},{10,10}},
5555
rotation=0,
5656
origin={80,0})));
57-
Modelica.Blocks.Math.Gain gain(k=cp_default)
57+
Modelica.Blocks.Math.Gain gain(k(unit="J/(kg.K)")=cp_default, y(unit="J/(kg.K)"))
5858
annotation (Placement(transformation(extent={{-40,104},{-20,124}})));
5959
Modelica.Blocks.Math.Division hea2MasFlo annotation (Placement(transformation(
6060
extent={{-10,-10},{10,10}},

‎AixLib/Fluid/DistrictHeatingCooling/Pipes/DHCPipe.mo‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
within AixLib.Fluid.DistrictHeatingCooling.Pipes;
22
model DHCPipe "Generic pipe model for DHC applications"
3-
extends AixLib.Fluid.Interfaces.PartialTwoPortVector(show_T=true);
3+
extends AixLib.Fluid.Interfaces.PartialTwoPortInterface(show_T=true);
44

55
parameter Boolean use_zeta=false
66
"= true HydraulicResistance is implemented, zeta value has to be given next"
@@ -177,11 +177,11 @@ model DHCPipe "Generic pipe model for DHC applications"
177177
// See also AixLib.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir
178178
// for why mSenFac is 10 and not 1000, as this gives more reasonable
179179
// temperature step response
180-
Fluid.MixingVolumes.MixingVolume vol(
180+
AixLib.Fluid.MixingVolumes.MixingVolume vol(
181181
redeclare final package Medium = Medium,
182182
final m_flow_nominal=m_flow_nominal,
183183
final V=if rho_default > 500 then VEqu else VEqu/1000,
184-
final nPorts=nPorts + 1,
184+
final nPorts=2,
185185
final T_start=T_start_out,
186186
final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
187187
final mSenFac = if rho_default > 500 then 1 else 10)
@@ -284,11 +284,9 @@ equation
284284
der(Q_los) = min(0, pipCor.heatPort.Q_flow);
285285
der(Q_gai) = max(0, pipCor.heatPort.Q_flow);
286286

287-
for i in 1:nPorts loop
288-
connect(vol.ports[i + 1], ports_b[i])
289-
annotation (Line(points={{70,20},{72,20},{72,6},{72,0},{100,0}},
287+
connect(vol.ports[2], port_b)
288+
annotation (Line(points={{71,20},{72,20},{72,6},{72,0},{100,0}},
290289
color={0,127,255}));
291-
end for;
292290

293291
connect(pipCor.port_b, vol.ports[1])
294292
annotation (Line(points={{10,0},{70,0},{70,20}}, color={0,127,255}));

‎AixLib/Fluid/DistrictHeatingCooling/Pipes/Examples/DHCPipe.mo‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ model DHCPipe "Simple example of DHCPipe and its four different modes"
1515
nPorts=1,
1616
p(displayUnit="Pa") = 101325) "Pressure boundary condition"
1717
annotation (Placement(transformation(extent={{72,40},{52,60}})));
18-
AixLib.Fluid.DistrictHeatingCooling.Pipes.DHCPipe pip(
18+
AixLib.Fluid.DistrictHeatingCooling.Pipes.DHCPipe pip(
1919
redeclare package Medium = Medium,
2020
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
2121
redeclare BaseClassesStatic.StaticCore pipCor "Static core",
22-
nPorts=1,
2322
dh=0.1,
2423
length=100,
2524
dIns=0.05,
@@ -66,11 +65,10 @@ model DHCPipe "Simple example of DHCPipe and its four different modes"
6665
nPorts=1,
6766
p(displayUnit="Pa") = 101325) "Pressure boundary condition"
6867
annotation (Placement(transformation(extent={{72,0},{52,20}})));
69-
AixLib.Fluid.DistrictHeatingCooling.Pipes.DHCPipe pip1(
68+
AixLib.Fluid.DistrictHeatingCooling.Pipes.DHCPipe pip1(
7069
redeclare package Medium = Medium,
7170
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
7271
redeclare FixedResistances.BaseClasses.PlugFlowCore pipCor "PlugFlow core",
73-
nPorts=1,
7472
dh=0.1,
7573
length=100,
7674
dIns=0.05,
@@ -113,12 +111,11 @@ model DHCPipe "Simple example of DHCPipe and its four different modes"
113111
nPorts=1,
114112
p(displayUnit="Pa") = 101325) "Pressure boundary condition"
115113
annotation (Placement(transformation(extent={{72,-42},{52,-22}})));
116-
AixLib.Fluid.DistrictHeatingCooling.Pipes.DHCPipe pip2(
114+
AixLib.Fluid.DistrictHeatingCooling.Pipes.DHCPipe pip2(
117115
redeclare package Medium = Medium,
118116
use_soil=true,
119117
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
120118
redeclare FixedResistances.BaseClasses.PlugFlowCore pipCor "PlugFlow core",
121-
nPorts=1,
122119
dh=0.1,
123120
length=100,
124121
dIns=0.05,
@@ -161,12 +158,11 @@ model DHCPipe "Simple example of DHCPipe and its four different modes"
161158
nPorts=1,
162159
p(displayUnit="Pa") = 101325) "Pressure boundary condition"
163160
annotation (Placement(transformation(extent={{72,-80},{52,-60}})));
164-
AixLib.Fluid.DistrictHeatingCooling.Pipes.DHCPipe pip3(
161+
AixLib.Fluid.DistrictHeatingCooling.Pipes.DHCPipe pip3(
165162
redeclare package Medium = Medium,
166163
sum_zetas=2.5,
167164
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
168165
redeclare FixedResistances.BaseClasses.PlugFlowCore pipCor "PlugFlow core",
169-
nPorts=1,
170166
dh=0.1,
171167
length=100,
172168
dIns=0.05,
@@ -203,7 +199,7 @@ equation
203199
connect(Tin.y, sou.T_in)
204200
annotation (Line(points={{-79,54},{-72,54}},
205201
color={0,0,127}));
206-
connect(pip.ports_b[1], senTemOut.port_a)
202+
connect(pip.port_b, senTemOut.port_a)
207203
annotation (Line(points={{10,50},{20,50}},
208204
color={0,127,255}));
209205
connect(senTemOut.port_b, sin.ports[1])
@@ -219,7 +215,7 @@ equation
219215
annotation (Line(points={{-80,90},{0,90},{0,20}}, color={191,0,0}));
220216
connect(Tin1.y, sou1.T_in)
221217
annotation (Line(points={{-79,14},{-72,14}}, color={0,0,127}));
222-
connect(pip1.ports_b[1], senTemOut1.port_a)
218+
connect(pip1.port_b, senTemOut1.port_a)
223219
annotation (Line(points={{10,10},{20,10}}, color={0,127,255}));
224220
connect(senTemOut1.port_b, sin1.ports[1])
225221
annotation (Line(points={{40,10},{52,10}}, color={0,127,255}));
@@ -231,7 +227,7 @@ equation
231227
annotation (Line(points={{-80,90},{0,90},{0,-22}}, color={191,0,0}));
232228
connect(Tin2.y, sou2.T_in)
233229
annotation (Line(points={{-79,-28},{-72,-28}}, color={0,0,127}));
234-
connect(pip2.ports_b[1], senTemOut2.port_a)
230+
connect(pip2.port_b, senTemOut2.port_a)
235231
annotation (Line(points={{10,-32},{20,-32}}, color={0,127,255}));
236232
connect(senTemOut2.port_b, sin2.ports[1])
237233
annotation (Line(points={{40,-32},{52,-32}}, color={0,127,255}));
@@ -243,7 +239,7 @@ equation
243239
annotation (Line(points={{-80,90},{0,90},{0,-60}}, color={191,0,0}));
244240
connect(Tin3.y, sou3.T_in)
245241
annotation (Line(points={{-79,-66},{-72,-66}}, color={0,0,127}));
246-
connect(pip3.ports_b[1], senTemOut3.port_a)
242+
connect(pip3.port_b, senTemOut3.port_a)
247243
annotation (Line(points={{10,-70},{20,-70}}, color={0,127,255}));
248244
connect(senTemOut3.port_b, sin3.ports[1])
249245
annotation (Line(points={{40,-70},{52,-70}}, color={0,127,255}));

‎AixLib/Fluid/DistrictHeatingCooling/Pipes/Examples/PlugFlowPipeEmbedded.mo‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ model PlugFlowPipeEmbedded "Simple example of PlugFlowPipeEmbedded"
1919
pip(
2020
redeclare package Medium = Medium,
2121
energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
22-
nPorts=1,
2322
dh=0.1,
2423
length=100,
2524
dIns=0.05,
@@ -60,7 +59,7 @@ equation
6059
color={191,0,0}));
6160
connect(Tin.y, sou.T_in)
6261
annotation (Line(points={{-71,4},{-62,4}}, color={0,0,127}));
63-
connect(pip.ports_b[1], senTemOut.port_a)
62+
connect(pip.port_b, senTemOut.port_a)
6463
annotation (Line(points={{20,0},{30,0}}, color={0,127,255}));
6564
connect(senTemOut.port_b, sin.ports[1])
6665
annotation (Line(points={{50,0},{62,0}}, color={0,127,255}));

‎AixLib/Fluid/DistrictHeatingCooling/Pipes/Examples/PlugFlowPipeZeta.mo‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ model PlugFlowPipeZeta "Simple example of PlugFlowPipe"
1717
annotation (Placement(transformation(extent={{82,-10},{62,10}})));
1818
AixLib.Fluid.DistrictHeatingCooling.Pipes.PlugFlowPipeZeta pip(
1919
redeclare package Medium = Medium,
20-
nPorts=1,
2120
dh=0.1,
2221
length=100,
2322
dIns=0.05,
@@ -57,7 +56,7 @@ equation
5756
annotation (Line(points={{-20,70},{10,70},{10,10}}, color={191,0,0}));
5857
connect(Tin.y, sou.T_in)
5958
annotation (Line(points={{-71,4},{-62,4}}, color={0,0,127}));
60-
connect(pip.ports_b[1], senTemOut.port_a)
59+
connect(pip.port_b, senTemOut.port_a)
6160
annotation (Line(points={{20,0},{30,0}}, color={0,127,255}));
6261
connect(senTemOut.port_b, sin.ports[1])
6362
annotation (Line(points={{50,0},{62,0}}, color={0,127,255}));

‎AixLib/Fluid/DistrictHeatingCooling/Pipes/Examples/StaticPipe.mo‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ model StaticPipe "Simple example of StaticPipe"
1717
annotation (Placement(transformation(extent={{82,-10},{62,10}})));
1818
AixLib.Fluid.DistrictHeatingCooling.Pipes.StaticPipe pip(
1919
redeclare package Medium = Medium,
20-
nPorts=1,
2120
dh=0.1,
2221
length=100,
2322
dIns=0.05,
@@ -57,7 +56,7 @@ equation
5756
annotation (Line(points={{-20,70},{10,70},{10,10}}, color={191,0,0}));
5857
connect(Tin.y, sou.T_in)
5958
annotation (Line(points={{-71,4},{-62,4}}, color={0,0,127}));
60-
connect(pip.ports_b[1], senTemOut.port_a)
59+
connect(pip.port_b, senTemOut.port_a)
6160
annotation (Line(points={{20,0},{30,0}}, color={0,127,255}));
6261
connect(senTemOut.port_b, sin.ports[1])
6362
annotation (Line(points={{50,0},{62,0}}, color={0,127,255}));

‎AixLib/Fluid/DistrictHeatingCooling/Pipes/PlugFlowPipeEmbedded.mo‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
model PlugFlowPipeEmbedded
33
"Embedded pipe model using spatialDistribution for temperature delay"
44

5-
extends AixLib.Fluid.Interfaces.PartialTwoPortVector(show_T=true);
5+
extends AixLib.Fluid.Interfaces.PartialTwoPortInterface(show_T=true);
66

77
parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.DynamicFreeInitial
88
"Type of energy balance: dynamic (3 initialization options) or steady state"
@@ -61,11 +61,11 @@ model PlugFlowPipeEmbedded
6161
parameter Modelica.Units.SI.Length thickness=0.0035 "Pipe wall thickness"
6262
annotation (Dialog(group="Material"));
6363

64-
parameter Modelica.Units.SI.Temperature T_start_in(start=Medium.T_default) =
64+
parameter Modelica.Units.SI.Temperature T_start_in(start=Medium.T_default)=
6565
Medium.T_default "Initialization temperature at pipe inlet"
6666
annotation (Dialog(tab="Initialization"));
67-
parameter Modelica.Units.SI.Temperature T_start_out(start=Medium.T_default)
68-
= T_start_in "Initialization temperature at pipe outlet"
67+
parameter Modelica.Units.SI.Temperature T_start_out(start=Medium.T_default)=
68+
T_start_in "Initialization temperature at pipe outlet"
6969
annotation (Dialog(tab="Initialization"));
7070
parameter Boolean initDelay(start=false) = false
7171
"Initialize delay for a constant mass flow rate if true, otherwise start from 0"
@@ -135,7 +135,6 @@ model PlugFlowPipeEmbedded
135135
final R=R,
136136
final fac=fac,
137137
final sum_zetas=sum_zetas,
138-
nPorts=nPorts,
139138
final use_zeta=true)
140139
annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
141140

@@ -215,7 +214,7 @@ equation
215214
annotation (Line(points={{0,90.8},{0,104}}, color={191,0,0}));
216215
connect(port_a, plugFlowPipeZeta.port_a)
217216
annotation (Line(points={{-100,0},{-10,0}}, color={0,127,255}));
218-
connect(plugFlowPipeZeta.ports_b, ports_b) annotation (Line(points={{10,0},{56,
217+
connect(plugFlowPipeZeta.port_b, port_b) annotation (Line(points={{10,0},{56,
219218
0},{56,0},{100,0}}, color={0,127,255}));
220219
annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
221220
Rectangle(

0 commit comments

Comments
 (0)