Skip to content

Rename initialization enum literals to PascalCase #358

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

Rename initialization enum literals to PascalCase #358

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 @@ -33,7 +33,7 @@ package Tests
h0_par=1000) annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
ThermofluidStream.Processes.FlowResistance flowResistance(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="mm") = 0.01,
l=10,
redeclare function pLoss =
Expand Down Expand Up @@ -65,7 +65,7 @@ package Tests
annotation (Placement(transformation(extent={{-28,60},{-8,80}})));
ThermofluidStream.Processes.FlowResistance flowResistance1(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="mm") = 0.01,
l=10,
redeclare function pLoss =
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 @@ -18,7 +18,7 @@ model DynamicBoundaries "Test for DynamicInflow and Outflow"
Sink sink(redeclare package Medium=Medium, p0_par=100000)
annotation (Placement(transformation(extent={{60,-10},{80,10}})));
Processes.FlowResistance flowResistance(redeclare package Medium=Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="mm") = 0.005,
l=10,
computeL=false,
Expand All @@ -38,7 +38,7 @@ model DynamicBoundaries "Test for DynamicInflow and Outflow"
Sink sink1(redeclare package Medium=Medium, p0_par=100000)
annotation (Placement(transformation(extent={{60,-50},{80,-30}})));
Processes.FlowResistance flowResistance1(redeclare package Medium=Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
m_flow_0=-1,
r(displayUnit="mm") = 0.005,
l=10,
Expand Down Expand Up @@ -76,7 +76,7 @@ model DynamicBoundaries "Test for DynamicInflow and Outflow"
annotation (Placement(transformation(extent={{60,50},{80,70}})));
Processes.FlowResistance flowResistance2(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="mm") = 0.005,
l=10,
computeL=false,
Expand Down Expand Up @@ -108,7 +108,7 @@ model DynamicBoundaries "Test for DynamicInflow and Outflow"
annotation (Placement(transformation(extent={{60,-70},{80,-50}})));
Processes.FlowResistance flowResistance3(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
m_flow_0=-1,
r(displayUnit="mm") = 0.005,
l=10,
Expand All @@ -133,7 +133,7 @@ model DynamicBoundaries "Test for DynamicInflow and Outflow"
annotation (Placement(transformation(extent={{60,-90},{80,-70}})));
Processes.FlowResistance flowResistance4(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
m_flow_0=1,
r(displayUnit="mm") = 0.005,
l=10,
Expand All @@ -158,7 +158,7 @@ model DynamicBoundaries "Test for DynamicInflow and Outflow"
annotation (Placement(transformation(extent={{60,-30},{80,-10}})));
Processes.FlowResistance flowResistance5(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
m_flow_0=-1,
r(displayUnit="mm") = 0.005,
l=10,
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 @@ -52,31 +52,31 @@ model PhaseSeperator
startTime=0) annotation (Placement(transformation(extent={{-120,-16},{-100,4}})));
Processes.FlowResistance flowResistance1(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="cm") = 0.05,
l=1,
computeL=false,
redeclare function 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,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="cm") = 0.05,
l=1,
computeL=false,
redeclare function 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,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="cm") = 0.05,
l=1,
computeL=false,
redeclare function 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,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="cm") = 0.05,
l=1,
computeL=false,
Expand Down
6 changes: 3 additions & 3 deletions ThermofluidStream/Boundaries/Tests/Reservoir.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ model Reservoir "Test for Reservoir"
height_0(displayUnit="m") = 0.05)
annotation (Placement(transformation(extent={{-10,10},{10,30}})));
Processes.Pump pump(redeclare package Medium=Medium,
initM_flow= ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow= ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
omega_from_input=true,
redeclare function dp_tau_pump =
Processes.Internal.TurboComponent.dp_tau_nominal_flow (
Expand Down Expand Up @@ -62,15 +62,15 @@ model Reservoir "Test for Reservoir"
annotation (Placement(transformation(extent={{-78,32},{-58,52}})));
Processes.FlowResistance flowResistance1(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.1,
l=10,
redeclare function 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,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.1,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
Expand Down
30 changes: 15 additions & 15 deletions ThermofluidStream/Boundaries/Tests/Volumes.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ Medium package used in the Test of the MixVolumes.
annotation (Placement(transformation(extent={{-48,-120},{-28,-100}})));
Processes.FlowResistance flowResistance(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.01,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarTurbulentPressureLoss (
material=ThermofluidStream.Processes.Internal.Material.wood))
annotation (Placement(transformation(extent={{20,-90},{40,-70}})));
Processes.FlowResistance flowResistance1(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.01,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarTurbulentPressureLoss (
Expand All @@ -85,23 +85,23 @@ Medium package used in the Test of the MixVolumes.
annotation (Placement(transformation(extent={{50,-10},{70,10}})));
Processes.FlowResistance flowResistance2(
redeclare package Medium = MediumMix,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.01,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarTurbulentPressureLoss (
material=ThermofluidStream.Processes.Internal.Material.wood))
annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
Processes.FlowResistance flowResistance3(
redeclare package Medium = MediumMix,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.01,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarTurbulentPressureLoss (
material=ThermofluidStream.Processes.Internal.Material.wood))
annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));
Processes.FlowResistance flowResistance4(
redeclare package Medium = MediumMix,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.01,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarTurbulentPressureLoss (
Expand All @@ -127,23 +127,23 @@ Medium package used in the Test of the MixVolumes.
annotation (Placement(transformation(extent={{50,60},{70,80}})));
Processes.FlowResistance flowResistance5(
redeclare package Medium = MediumMix,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.1,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
k=1e5))
annotation (Placement(transformation(extent={{-40,80},{-20,100}})));
Processes.FlowResistance flowResistance6(
redeclare package Medium = MediumMix,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.1,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
k=2e5))
annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
Processes.FlowResistance flowResistance8(
redeclare package Medium = MediumMix,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.1,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
Expand Down Expand Up @@ -175,15 +175,15 @@ Medium package used in the Test of the MixVolumes.
annotation (Placement(transformation(extent={{50,-200},{70,-180}})));
Processes.FlowResistance flowResistance7(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.1,
l=1,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarTurbulentPressureLoss (
material=ThermofluidStream.Processes.Internal.Material.wood))
annotation (Placement(transformation(extent={{-40,-160},{-20,-140}})));
Processes.FlowResistance flowResistance9(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.1,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.laminarTurbulentPressureLoss (
Expand Down Expand Up @@ -222,15 +222,15 @@ Medium package used in the Test of the MixVolumes.
annotation (Placement(transformation(extent={{-12,110},{8,130}})));
Processes.FlowResistance flowResistance10(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="mm") = 0.01,
l=1,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
k=1e5))
annotation (Placement(transformation(extent={{20,110},{40,130}})));
Processes.FlowResistance flowResistance11(
redeclare package Medium = Medium,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="mm") = 0.01,
l=1,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
Expand All @@ -256,23 +256,23 @@ Medium package used in the Test of the MixVolumes.
annotation (Placement(transformation(extent={{50,160},{70,180}})));
Processes.FlowResistance flowResistance12(
redeclare package Medium = MediumMix,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.1,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
k=1e5))
annotation (Placement(transformation(extent={{-40,180},{-20,200}})));
Processes.FlowResistance flowResistance13(
redeclare package Medium = MediumMix,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.1,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
k=2e5))
annotation (Placement(transformation(extent={{-40,140},{-20,160}})));
Processes.FlowResistance flowResistance14(
redeclare package Medium = MediumMix,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r=0.1,
l=10,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
Expand Down
16 changes: 8 additions & 8 deletions ThermofluidStream/Examples/EspressoMachine.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Medium model for water.
annotation (Placement(transformation(extent={{-80,-10},{-40,30}})));
Processes.FlowResistance flowResistance(
redeclare package Medium = Water,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="mm") = 0.003,
l=0.3,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
Expand Down Expand Up @@ -52,7 +52,7 @@ Medium model for water.
origin={-30,70})));
Processes.FlowResistance flowResistance1(
redeclare package Medium = Water,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="mm") = 0.003,
l=0.3,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
Expand Down Expand Up @@ -94,7 +94,7 @@ Medium model for water.
origin={-140,-120})));
Processes.FlowResistance flowResistance2(
redeclare package Medium = Water,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="mm") = 0.003,
l=0.3,
computeL=true,
Expand Down Expand Up @@ -124,7 +124,7 @@ Medium model for water.
origin={110,-50})));
FlowControl.TanValve tanValve2(
redeclare package Medium = Water,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
relativeLeakiness=1e-7)
annotation (Placement(transformation(extent={{10,-10},{-10,10}},
rotation=90,
Expand Down Expand Up @@ -172,7 +172,7 @@ Medium model for water.
origin={-20,-20})));
Processes.Pump pump(
redeclare package Medium = Water,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
omega_from_input=true,
omegaStateSelect=StateSelect.never,
redeclare function dp_tau_pump = Processes.Internal.TurboComponent.dp_tau_nominal_flow (
Expand Down Expand Up @@ -214,7 +214,7 @@ Medium model for water.
k_p_input=1e6,
k_fric_input=0),
enableOutput=false,
initOmega=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initOmega=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
initPhi=false,
omegaStateSelect=StateSelect.default,
omega_from_input=true) annotation (Placement(transformation(
Expand Down Expand Up @@ -305,7 +305,7 @@ Medium model for water.
origin={-88,70})));
Processes.FlowResistance flowResistance5(
redeclare package Medium = Water,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
r(displayUnit="mm") = 0.003,
l=0.3,
redeclare function pLoss = Processes.Internal.FlowResistance.linearQuadraticPressureLoss (
Expand Down Expand Up @@ -376,7 +376,7 @@ Medium model for water.
origin={110,-140})));
Utilities.CupSink Tasse1(
redeclare package Medium = Water, flowResistance(
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state))
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState))
annotation (Placement(transformation(
extent={{20,-20},{-20,20}},
rotation=0,
Expand Down
10 changes: 5 additions & 5 deletions ThermofluidStream/Examples/HeatPump.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ model HeatPump
Processes.Compressor compressor(
redeclare package Medium = Medium,
L=1e6,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
m_flow_0=0,
omega_from_input=false,
enableOutput=true,
outputQuantity=ThermofluidStream.Sensors.Internal.Types.MassFlowQuantities.m_flow_kgps,
initOmega=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initOmega=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
initPhi=true,
redeclare function dp_tau_compressor =
Processes.Internal.TurboComponent.dp_tau_const_isentrop (
Expand All @@ -60,7 +60,7 @@ model HeatPump
FlowControl.BasicControlValve controlValve(
redeclare package Medium = Medium,
L=5000,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
invertInput=true,
flowCoefficient=ThermofluidStream.FlowControl.Internal.Types.FlowCoefficientTypesBasic.Kvs,
Kvs(displayUnit="m3/s") = 0.18,
Expand Down Expand Up @@ -108,14 +108,14 @@ model HeatPump
origin={-40,-120})));
Processes.Fan fan(
redeclare package Medium = Air,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
omega_from_input=true,
redeclare function dp_tau_fan =
Processes.Internal.TurboComponent.dp_tau_const_isentrop (omega_ref=100))
annotation (Placement(transformation(extent={{-60,98},{-40,78}})));
Processes.Fan fan1(
redeclare package Medium = Air,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.state,
initM_flow=ThermofluidStream.Utilities.Types.InitializationMethods.InitialState,
omega_from_input=true,
redeclare function dp_tau_fan =
Processes.Internal.TurboComponent.dp_tau_const_isentrop (omega_ref=100)) annotation (
Expand Down
Loading
Loading