Skip to content

refactor: Rename pipe vertical parameter to slanted #92

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

Merged
dietmarw merged 1 commit into from
Apr 13, 2026
Merged

refactor: Rename pipe vertical parameter to slanted #92

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
2 changes: 1 addition & 1 deletion OpenHPL/Examples/SimpleGenFrancis.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ model SimpleGenFrancis "Model of a hydropower system with Francis turbine model"
ElectroMech.Generators.SynchGen generator(P_op=100e6, UseFrequencyOutput=false) annotation (Placement(transformation(extent={{40,-40},{20,-20}})));
replaceable
Waterway.Pipe penstock(
vertical=true,
slanted=true,
L=600,
H=428.5,
D_i=3,
Expand Down
2 changes: 1 addition & 1 deletion OpenHPL/Examples/SimpleTurbine.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ model SimpleTurbine "Model of a hydropower system with a simple turbine turbine"
D_o=3,
H=80,
L=200,
vertical=true) constrainedby Interfaces.TwoContacts annotation (Placement(transformation(origin={0,30}, extent={{-10,-10},{10,10}})));
slanted=true) constrainedby Interfaces.TwoContacts annotation (Placement(transformation(origin={0,30}, extent={{-10,-10},{10,10}})));
OpenHPL.Waterway.SurgeTank surgeTank(H=25, L=30, h_0=20)
annotation (Placement(transformation(
origin={-30,30},
Expand Down
2 changes: 1 addition & 1 deletion OpenHPL/Examples/SimpleValve.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ model SimpleValve "Model of a hydropower system with a simple turbine turbine"
D_o=3,
H=80,
L=200,
vertical=true) constrainedby Interfaces.TwoContacts annotation (Placement(transformation(origin={0,30}, extent={{-10,-10},{10,10}})));
slanted=true) constrainedby Interfaces.TwoContacts annotation (Placement(transformation(origin={0,30}, extent={{-10,-10},{10,10}})));
OpenHPL.Waterway.SurgeTank surgeTank(
H=25,
L=30,
Expand Down
2 changes: 1 addition & 1 deletion OpenHPL/Examples/WithOpenIPSL/DetailedGen.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
within OpenHPL.Examples.WithOpenIPSL;
model DetailedGen
extends SimpleGen( redeclare Waterway.PenstockKP penstock(
vertical=true,
slanted=true,
H=428.5,
D_i=3), data(SteadyState=false));
annotation (experiment(StopTime=2000));
Expand Down
2 changes: 1 addition & 1 deletion OpenHPL/Examples/WithOpenIPSL/SimpleGen.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ model SimpleGen "Synergy with OpenIPSL library(generator)"
rotation=180)));
replaceable
Waterway.Pipe penstock(
vertical=true,
slanted=true,
L=600,
H=428.5,
D_i=3) constrainedby Interfaces.TwoContacts
Expand Down
2 changes: 1 addition & 1 deletion OpenHPL/Examples/WithOpenIPSL/SimpleGenTG.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ model SimpleGenTG "Synergy with OpenIPSL library(generator)"
rotation=180)));
replaceable
Waterway.Pipe penstock(
vertical=true,
slanted=true,
L=600,
H=428.5,
D_i=3) constrainedby Interfaces.TwoContacts
Expand Down
14 changes: 7 additions & 7 deletions OpenHPL/Icons/Pipe.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
within OpenHPL.Icons;
partial class Pipe "Pipe icon"
parameter Boolean vertical=false "Display vertical icon instead"
parameter Boolean slanted=false "Display slanted icon instead"
annotation(Dialog(group = "Icon"),
choices(checkBox = true));
annotation (
Expand All @@ -11,37 +11,37 @@ partial class Pipe "Pipe icon"
lineColor={0,0,0},
fillPattern=FillPattern.Solid,
fillColor={175,175,175},
visible=not vertical),
visible=not slanted),
Rectangle(
extent={{-90,30},{90,-30}},
lineColor={28,108,200},
fillColor={0,128,255},
fillPattern=FillPattern.Solid,
visible=not vertical),
visible=not slanted),
Rectangle(
extent={{-85,30},{85,-30}},
lineColor={0,0,0},
fillPattern=FillPattern.Solid,
fillColor={175,175,175},
rotation=-45,
visible=vertical),
visible=slanted),
Rectangle(
extent={{-85,20},{85,-20}},
lineColor={28,108,200},
fillColor={0,128,255},
fillPattern=FillPattern.Solid,
rotation=-45,
visible=vertical),
visible=slanted),
Text(
textColor={28,108,200},
extent={{-150,140},{150,100}},
textString="%name",
textStyle={TextStyle.Bold},
visible=vertical),
visible=slanted),
Text(
textColor={28,108,200},
extent={{-150,90},{150,50}},
textString="%name",
textStyle={TextStyle.Bold},
visible=not vertical)}));
visible=not slanted)}));
end Pipe;
2 changes: 1 addition & 1 deletion OpenHPL/Waterway/Penstock.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ within OpenHPL.Waterway;
model Penstock "Model of the penstock with elastic walls and compressible water. Simple Staggered grid scheme"
extends Modelica.Icons.ObsoleteModel;
outer Data data "Using standard data set";
extends OpenHPL.Icons.Pipe(vertical=true);
extends OpenHPL.Icons.Pipe(slanted=true);
import Modelica.Constants.pi;
// Penstock
parameter SI.Height H = 420 "Height over which water fall in the pipe, m" annotation (
Expand Down
2 changes: 1 addition & 1 deletion OpenHPL/Waterway/PenstockKP.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
within OpenHPL.Waterway;
model PenstockKP "Detailed model of the pipe. Could have elastic walls and compressible water. KP scheme"
outer OpenHPL.Data data "Using standard data set";
extends OpenHPL.Icons.Pipe( vertical=true);
extends OpenHPL.Icons.Pipe( slanted=true);
extends Types.FrictionSpec( final D_h = (D_i + D_o) / 2);
import Modelica.Constants.pi;
// geometrical parameters of the pipe
Expand Down
2 changes: 1 addition & 1 deletion OpenHPLTest/HPAllTypeFittingsTest.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ model HPAllTypeFittingsTest "Test for comparing fitting behaviour"
L=100,
D_i=4) annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
OpenHPL.Waterway.Pipe pipe6(
vertical=false,
slanted=false,
H=5,
L=100,
D_i=4) annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
Expand Down
6 changes: 3 additions & 3 deletions OpenHPLTest/HPDraftTube.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ model HPDraftTube "Testing the draft tube models."
D_o=3,
H=428.5,
L=600,
vertical=true) annotation (Placement(transformation(
slanted=true) annotation (Placement(transformation(
origin={2,50},
extent={{-10,-10},{10,10}})));
OpenHPL.Waterway.SurgeTank surgeTank(h_0=69.9) annotation (Placement(transformation(
Expand All @@ -48,7 +48,7 @@ model HPDraftTube "Testing the draft tube models."
D_o=3,
H=428.5,
L=600,
vertical=true) annotation (Placement(transformation(origin={0,-10}, extent={{-10,-10},{10,10}})));
slanted=true) annotation (Placement(transformation(origin={0,-10}, extent={{-10,-10},{10,10}})));
OpenHPL.Waterway.SurgeTank surgeTank1(h_0=69.9) annotation (Placement(transformation(origin={-30,-10}, extent={{-10,-10},{10,10}})));
OpenHPL.ElectroMech.Turbines.Turbine turbine1(C_v=3.7, ConstEfficiency=false) annotation (Placement(transformation(origin={30,-20}, extent={{-10,-10},{10,10}})));
OpenHPL.Waterway.DraftTube draftTube1(
Expand All @@ -74,7 +74,7 @@ model HPDraftTube "Testing the draft tube models."
D_o=3,
H=428.5,
L=600,
vertical=true) annotation (Placement(transformation(origin={2,-70}, extent={{-10,-10},{10,10}})));
slanted=true) annotation (Placement(transformation(origin={2,-70}, extent={{-10,-10},{10,10}})));
OpenHPL.Waterway.SurgeTank surgeTank2(h_0=69.9) annotation (Placement(transformation(origin={-30,-70}, extent={{-10,-10},{10,10}})));
OpenHPL.ElectroMech.Turbines.Turbine turbine2(C_v=3.7, ConstEfficiency=false) annotation (Placement(transformation(origin={32,-80}, extent={{-10,-10},{10,10}})));
OpenHPL.Waterway.DraftTube draftTube2(
Expand Down
2 changes: 1 addition & 1 deletion OpenHPLTest/HPSTAirCushion.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ model HPSTAirCushion
D_o=4,
H=300,
L=500,
vertical=true) annotation (Placement(transformation(
slanted=true) annotation (Placement(transformation(
origin={0,30},
extent={{-10,-10},{10,10}})));
OpenHPL.ElectroMech.Turbines.Turbine turbine(
Expand Down
2 changes: 1 addition & 1 deletion OpenHPLTest/HPSTSharpOrifice.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ model HPSTSharpOrifice
D_o=4,
H=300,
L=500,
vertical=true) annotation (Placement(transformation(
slanted=true) annotation (Placement(transformation(
origin={0,30},
extent={{-10,-10},{10,10}})));
OpenHPL.ElectroMech.Turbines.Turbine turbine(
Expand Down
2 changes: 1 addition & 1 deletion OpenHPLTest/HPSTSimple.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ model HPSTSimple
D_o=4,
H=300,
L=500,
vertical=true) annotation (Placement(transformation(
slanted=true) annotation (Placement(transformation(
origin={0,30},
extent={{-10,-10},{10,10}})));
OpenHPL.ElectroMech.Turbines.Turbine turbine(
Expand Down
2 changes: 1 addition & 1 deletion OpenHPLTest/HPSTThrottleValve.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ model HPSTThrottleValve
D_o=4,
H=300,
L=500,
vertical=true) annotation (Placement(transformation(
slanted=true) annotation (Placement(transformation(
origin={0,30},
extent={{-10,-10},{10,10}})));
OpenHPL.ElectroMech.Turbines.Turbine turbine(
Expand Down
2 changes: 1 addition & 1 deletion OpenHPLTest/HPTaperedFittingsTest.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ model HPTaperedFittingsTest "Test for comparing fitting behaviour"
D_o=4,
L=4) annotation (Placement(transformation(extent={{-10,50},{10,70}})));
OpenHPL.Waterway.Pipe pipe1(
vertical=false,
slanted=false,
H=5,
L=100,
D_i=2) annotation (Placement(transformation(extent={{-60,50},{-40,70}})));
Expand Down
2 changes: 1 addition & 1 deletion OpenHPLTest/TorpaHPPAirCushionTest.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ model TorpaHPPAirCushionTest "Test case for air cushion surge tank from Torpa hy
D_o=6.56,
H=8.6,
L=250,
vertical=true,
slanted=true,
p_eps=0.005) annotation (Placement(transformation(
origin={0,30},
extent={{-10,-10},{10,10}})));
Expand Down
2 changes: 1 addition & 1 deletion OpenHPLTest/TorpaHPPAirCushionTest2.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ model TorpaHPPAirCushionTest2 "Test case for air cushion surge tank from Torpa h
D_o=3,
H=428.5,
L=600,
vertical=true) annotation (Placement(transformation(
slanted=true) annotation (Placement(transformation(
origin={0,30},
extent={{-10,-10},{10,10}})));
OpenHPL.Waterway.SurgeTank surgeTank(h_0=69.9) annotation (Placement(transformation(
Expand Down
Loading