Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace PlugFlowPipe outlet from vectorized to single port #1503

Merged
merged 43 commits into from
Oct 12, 2021
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
b7803cd
first commit
bravache Jul 12, 2021
04f29e0
fix package order
bravache Jul 12, 2021
d0bff32
add documentation to obsolete package
bravache Jul 12, 2021
403a976
fix typo
bravache Jul 12, 2021
7c513c7
fix variable references
bravache Jul 13, 2021
c9d7e1d
Minor changes [ci skip]
AntoineGautier Jul 15, 2021
9eccb21
Expand PlugFlowCore in PlugFlowPipe
bravache Jul 19, 2021
333dd4f
fix syntax
bravache Jul 19, 2021
7304835
fix test variable name
bravache Jul 19, 2021
655e53c
Update doc
AntoineGautier Jul 27, 2021
43529e3
Rename parameter
AntoineGautier Jul 27, 2021
b0fbc02
Merge examples
bravache Jul 27, 2021
245cc2c
Merge branch 'master' into issue1494_plugflowpipe_singleoutlet
bravache Jul 29, 2021
2909c70
Merge branch 'master' into issue1494_plugflowpipe_singleoutlet
mwetter Aug 16, 2021
6dce628
Merge branch 'master' into issue1494_plugflowpipe_singleoutlet
mwetter Aug 16, 2021
d40c322
Replaced links with full class name
mwetter Sep 13, 2021
8bbc228
Introduced parameter for complex parameter expression
mwetter Sep 13, 2021
784ce99
Updated documentation
mwetter Sep 13, 2021
670f3ce
Fixed drawing into pane
mwetter Sep 13, 2021
463ff71
Made most components protected and exposed main variables
mwetter Sep 13, 2021
7065294
Added obsolete annotation
mwetter Sep 13, 2021
5a18c03
Removed non-needed start value
mwetter Sep 13, 2021
b83f5d6
Added obsolete annotation
mwetter Sep 13, 2021
a637e26
Removed setup tools
mwetter Sep 14, 2021
5031c9b
Merge branch 'issue1494_plugflowpipe_singleoutlet' of github.com:ibps…
mwetter Sep 14, 2021
7d31f46
Moved conversion to top of file (as has been done with other entries)
mwetter Sep 14, 2021
73e7d11
Removed setup tools
mwetter Sep 14, 2021
bb0338c
Added constant to suppress calculation of flow resistance
mwetter Sep 14, 2021
072086f
Updated variable names in CI tests
mwetter Sep 14, 2021
1fc20a4
Corrected error in newly introduced constant.
mwetter Sep 14, 2021
beef79c
Updated reference result for new output variables
mwetter Sep 14, 2021
c8c7ca7
Removed parameter computeFlowResistance, introduced QEnv_flow
mwetter Sep 14, 2021
b204dc5
simplify unecessary parameters
bravache Sep 23, 2021
146ce65
Merge branch 'master' into issue1494_plugflowpipe_singleoutlet
bravache Sep 23, 2021
3705e42
make m_flow consistent in example
bravache Sep 23, 2021
505bb91
make model symmetrical
bravache Oct 5, 2021
0f0dbb5
update documentation
bravache Oct 5, 2021
5f64335
update documentation 2
bravache Oct 5, 2021
6c0b7f9
Changed m_flow to m_flow_nominal
mwetter Oct 6, 2021
bd7c690
Changed annotation
mwetter Oct 6, 2021
abc385c
Updated revision notes
mwetter Oct 6, 2021
9d1abcf
Removed trailing white space
mwetter Oct 6, 2021
fb7d4ce
Merge branch 'master' into issue1494_plugflowpipe_singleoutlet
bravache Oct 11, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ The component calculates the delay time at both in/outlet ports of the pipe
and therefore has two outlets. During forward flow, only the forward
<a href=\"modelica://IBPSA.Fluid.FixedResistances.BaseClasses.PlugFlowTransportDelay\">
IBPSA.Fluid.FixedResistances.BaseClasses.PlugFlowTransportDelay</a> component in
<a href=\"modelica://IBPSA.Fluid.FixedResistances.BaseClasses.PlugFlowCore\">
IBPSA.Fluid.FixedResistances.BaseClasses.PlugFlowCore</a>
<a href=\"modelica://IBPSA.Fluid.FixedResistances.PlugFlowPipe\">
IBPSA.Fluid.FixedResistances.PlugFlowPipe</a>
will be active and uses the forward output of PlugFlowTransportDelay.
During reverse, the opposite is true and only the reverse output is used.
</p>
Expand Down
128 changes: 0 additions & 128 deletions IBPSA/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo

This file was deleted.

21 changes: 0 additions & 21 deletions IBPSA/Fluid/FixedResistances/BaseClasses/Validation/package.mo

This file was deleted.

2 changes: 0 additions & 2 deletions IBPSA/Fluid/FixedResistances/BaseClasses/package.order
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
PlugFlow
PlugFlowCore
PlugFlowHeatLoss
PlugFlowTransportDelay
Validation
3 changes: 1 addition & 2 deletions IBPSA/Fluid/FixedResistances/Examples/PlugFlowPipe.mo
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ model PlugFlowPipe "Simple example of plug flow pipe"
annotation (Placement(transformation(extent={{82,-10},{62,10}})));
IBPSA.Fluid.FixedResistances.PlugFlowPipe pip(
redeclare package Medium = Medium,
nPorts=1,
dh=0.1,
length=100,
dIns=0.05,
Expand Down Expand Up @@ -56,7 +55,7 @@ equation
annotation (Line(points={{-20,70},{10,70},{10,10}}, color={191,0,0}));
connect(Tin.y, sou.T_in)
annotation (Line(points={{-71,4},{-62,4}}, color={0,0,127}));
connect(pip.ports_b[1], senTemOut.port_a)
connect(pip.port_b, senTemOut.port_a)
annotation (Line(points={{20,0},{30,0}}, color={0,127,255}));
connect(senTemOut.port_b, sin.ports[1])
annotation (Line(points={{50,0},{62,0}}, color={0,127,255}));
Expand Down
26 changes: 26 additions & 0 deletions IBPSA/Fluid/FixedResistances/Examples/PlugFlowPipeNoMix.mo
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
within IBPSA.Fluid.FixedResistances.Examples;
model PlugFlowPipeNoMix
bravache marked this conversation as resolved.
Show resolved Hide resolved
"Simple example of plug flow pipe without mixing volume"
extends IBPSA.Fluid.FixedResistances.Examples.PlugFlowPipe(
pip(have_PipCap=false));
annotation (
__Dymola_Commands(file=
"Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowPipeNoMix.mos"
"Simulate and Plot"),
experiment(StopTime=1000, Tolerance=1e-006),
Documentation(info="<html>
<p>Basic test of model
<a href=\"modelica://IBPSA.Fluid.FixedResistances.PlugFlowPipe\">
IBPSA.Fluid.FixedResistances.PlugFlowPipe</a> when the pipe wall thermal
capacity is not modeled with a mixing volume at the outlet port.
This test includes an inlet temperature step under a constant mass flow rate.
</p>
</html>", revisions="<html>
<ul>
<li>
July 12, 2021 by Baptiste Ravache:<br/>
First implementation.
</li>
</ul>
</html>"));
end PlugFlowPipeNoMix;
1 change: 1 addition & 0 deletions IBPSA/Fluid/FixedResistances/Examples/package.order
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ CheckValve
FlowJunction
HydraulicDiameter
PlugFlowPipe
PlugFlowPipeNoMix
PressureDrop
Loading