Skip to content

Replace replaceable functions with inspectable models #362

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.

Sign up for GitHub

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

Open
tobiasreischl wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace replaceable functions with inspectable models #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions TILMediaWrapper/Tests.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ package Tests
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
r(displayUnit="mm") = 0.01,
l=10,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.linearQuadraticPressureLoss ( k=100, k2=100))
annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
Modelica.Blocks.Sources.Ramp ramp(
Expand Down Expand Up @@ -68,7 +68,7 @@ package Tests
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
r(displayUnit="mm") = 0.01,
l=10,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.linearQuadraticPressureLoss ( k=1000, k2=1000))
annotation (Placement(transformation(extent={{-12,30},{8,50}})));
ThermofluidStream.Boundaries.PhaseSeparator phaseSeparator(
Expand Down
12 changes: 6 additions & 6 deletions ThermofluidStream/Boundaries/Tests/DynamicBoundaries.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ model DynamicBoundaries "Test for DynamicInflow and Outflow"
r(displayUnit="mm") = 0.005,
l=10,
computeL=false,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarPressureLoss)
redeclare model pLoss = Processes.Internal.FlowResistance.laminarPressureLoss)
annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
Source source1(redeclare package Medium=Medium, p0_par=100000)
annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
Expand All @@ -44,7 +44,7 @@ model DynamicBoundaries "Test for DynamicInflow and Outflow"
l=10,
L_value=1000,
computeL=false,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarPressureLoss)
redeclare model pLoss = Processes.Internal.FlowResistance.laminarPressureLoss)
annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));

Modelica.Blocks.Sources.Ramp ramp(
Expand Down Expand Up @@ -80,7 +80,7 @@ model DynamicBoundaries "Test for DynamicInflow and Outflow"
r(displayUnit="mm") = 0.005,
l=10,
computeL=false,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarPressureLoss)
redeclare model pLoss = Processes.Internal.FlowResistance.laminarPressureLoss)
annotation (Placement(transformation(extent={{-10,50},{10,70}})));
Modelica.Blocks.Sources.Ramp ramp2(
height=1,
Expand Down Expand Up @@ -114,7 +114,7 @@ model DynamicBoundaries "Test for DynamicInflow and Outflow"
l=10,
L_value=1000,
computeL=false,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarPressureLoss)
redeclare model pLoss = Processes.Internal.FlowResistance.laminarPressureLoss)
annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
Source source4(redeclare package Medium = Medium, p0_par=100000)
annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
Expand All @@ -139,7 +139,7 @@ model DynamicBoundaries "Test for DynamicInflow and Outflow"
l=10,
L_value=1000,
computeL=false,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarPressureLoss)
redeclare model pLoss = Processes.Internal.FlowResistance.laminarPressureLoss)
annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
Source source5(redeclare package Medium = Medium, p0_par=100000)
annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
Expand All @@ -164,7 +164,7 @@ model DynamicBoundaries "Test for DynamicInflow and Outflow"
l=10,
L_value=1000,
computeL=false,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarPressureLoss)
redeclare model pLoss = Processes.Internal.FlowResistance.laminarPressureLoss)
annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
equation
connect(source.outlet, dynamicPressureInflow.inlet) annotation (Line(
Expand Down
8 changes: 4 additions & 4 deletions ThermofluidStream/Boundaries/Tests/PhaseSeperator.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,31 +56,31 @@ model PhaseSeperator
r(displayUnit="cm") = 0.05,
l=1,
computeL=false,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss(k=5000))
redeclare model pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss(k=5000))
annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
Processes.FlowResistance flowResistance2(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
r(displayUnit="cm") = 0.05,
l=1,
computeL=false,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss(k=5000))
redeclare model pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss(k=5000))
annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));
Processes.FlowResistance flowResistance(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
r(displayUnit="cm") = 0.05,
l=1,
computeL=false,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss(k=5000))
redeclare model pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss(k=5000))
annotation (Placement(transformation(extent={{30,10},{50,30}})));
Processes.FlowResistance flowResistance3(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
r(displayUnit="cm") = 0.05,
l=1,
computeL=false,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss(k=5000))
redeclare model pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss(k=5000))
annotation (Placement(transformation(extent={{30,-30},{50,-10}})));
Sensors.TwoPhaseSensorSelect twoPhaseSensorSelect4(
redeclare package Medium = Medium,
Expand Down
8 changes: 4 additions & 4 deletions ThermofluidStream/Boundaries/Tests/Reservoir.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ model Reservoir "Test for Reservoir"
Processes.Pump pump(redeclare package Medium=Medium,
initM_flow= ThermofluidStream.Utilities.Types.InitializationMethods.state,
omega_from_input=true,
redeclare function dp_tau_pump =
redeclare model dp_tau_pump =
Processes.Internal.TurboComponent.dp_tau_nominal_flow (
V_r_input(displayUnit="m3") = 0.1,
k_p_input=500,
Expand All @@ -35,7 +35,7 @@ model Reservoir "Test for Reservoir"
redeclare package Medium=Medium,
r=0.03,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarTurbulentPressureLoss)
redeclare model pLoss = Processes.Internal.FlowResistance.laminarTurbulentPressureLoss)
annotation (Placement(transformation(extent={{10,50},{-10,70}})));
Source source(redeclare package Medium=Medium, p0_par=101200)
annotation (Placement(transformation(extent={{-74,-66},{-54,-46}})));
Expand Down Expand Up @@ -65,15 +65,15 @@ model Reservoir "Test for Reservoir"
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
r=0.1,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
redeclare model pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
k=100))
annotation (Placement(transformation(extent={{-46,-66},{-26,-46}})));
Processes.FlowResistance flowResistance2(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
r=0.1,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
redeclare model pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
k=100))
annotation (Placement(transformation(extent={{16,-66},{36,-46}})));
equation
Expand Down
6 changes: 3 additions & 3 deletions ThermofluidStream/Boundaries/Tests/TankFillingClosedTank.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ model TankFillingClosedTank
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand All @@ -50,7 +50,7 @@ model TankFillingClosedTank
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand Down Expand Up @@ -86,7 +86,7 @@ model TankFillingClosedTank
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand Down
8 changes: 4 additions & 4 deletions ThermofluidStream/Boundaries/Tests/TankHeating.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ model TankHeating
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand All @@ -57,7 +57,7 @@ model TankHeating
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand All @@ -69,7 +69,7 @@ model TankHeating
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand Down Expand Up @@ -103,7 +103,7 @@ model TankHeating
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand Down
6 changes: 3 additions & 3 deletions ThermofluidStream/Boundaries/Tests/TankOverfilling.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ extends Modelica.Icons.Example;
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=true,
Expand All @@ -34,7 +34,7 @@ extends Modelica.Icons.Example;
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=true,
Expand Down Expand Up @@ -68,7 +68,7 @@ extends Modelica.Icons.Example;
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=true,
Expand Down
6 changes: 3 additions & 3 deletions ThermofluidStream/Boundaries/Tests/TankSelfDraining.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ model TankSelfDraining
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand All @@ -60,7 +60,7 @@ model TankSelfDraining
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand All @@ -72,7 +72,7 @@ model TankSelfDraining
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03/10,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1))
annotation (Placement(transformation(extent={{30,-10},{50,10}})));
Expand Down
8 changes: 4 additions & 4 deletions ThermofluidStream/Boundaries/Tests/TankSelfDraining2.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ model TankSelfDraining2
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand Down Expand Up @@ -53,7 +53,7 @@ model TankSelfDraining2
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand All @@ -65,7 +65,7 @@ model TankSelfDraining2
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
ThermofluidStream.Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand All @@ -88,7 +88,7 @@ model TankSelfDraining2
l=1,
shape=ThermofluidStream.Processes.Internal.ShapeOfResistance.circular,
r=0.03,
redeclare function pLoss =
redeclare model pLoss =
Processes.Internal.FlowResistance.zetaPressureLoss (
zeta=1,
fromGeometry=false,
Expand Down
Loading
Loading