diff --git a/OpenHPL/ElectroMech/Generators/SimpleGen.mo b/OpenHPL/ElectroMech/Generators/SimpleGen.mo index 4961224d..4b7bf7db 100644 --- a/OpenHPL/ElectroMech/Generators/SimpleGen.mo +++ b/OpenHPL/ElectroMech/Generators/SimpleGen.mo @@ -53,7 +53,7 @@ equation This model based on the angular momentum balance, which depends on the turbine shaft power, the friction loss in the aggregate rotation and the power taken up by the generator.

- +

")); end SimpleGen; diff --git a/OpenHPL/ElectroMech/Generators/SimpleGen2.mo b/OpenHPL/ElectroMech/Generators/SimpleGen2.mo index 3bf5318a..09a3aba7 100644 --- a/OpenHPL/ElectroMech/Generators/SimpleGen2.mo +++ b/OpenHPL/ElectroMech/Generators/SimpleGen2.mo @@ -62,7 +62,7 @@ equation This model based on the angular momentum balance, which depends on the turbine shaft power, the friction loss in the aggregate rotation and the power taken up by the generator.

- +

")); end SimpleGen2; diff --git a/OpenHPL/ElectroMech/Turbines/Pelton.mo b/OpenHPL/ElectroMech/Turbines/Pelton.mo index cff6cc61..748494cb 100644 --- a/OpenHPL/ElectroMech/Turbines/Pelton.mo +++ b/OpenHPL/ElectroMech/Turbines/Pelton.mo @@ -54,6 +54,9 @@ This model is based on the Euler turbine equation.

The model has not been tested.

+

+ +

More info about the model can be found in: Resources/Documents/Turbines_model.pdf

diff --git a/OpenHPL/ElectroMech/Turbines/Turbine.mo b/OpenHPL/ElectroMech/Turbines/Turbine.mo index 6e8ee358..f1c80d98 100644 --- a/OpenHPL/ElectroMech/Turbines/Turbine.mo +++ b/OpenHPL/ElectroMech/Turbines/Turbine.mo @@ -64,7 +64,7 @@ equation //i.T = o.T; //// annotation ( - Documentation(info= "

+ Documentation(info="

This is a simple model of the turbine that give possibilities for simplified modelling of the turbine unit. The model can use a constant efficiency or varying efficiency from a lookup-table. @@ -89,7 +89,7 @@ there are inputs as the control signal for the valve opening and also output as

- +

References

More info about the model can be found in: Resources/Report/Report.docx

"), Icon( coordinateSystem(initialScale = 0.1))); diff --git a/OpenHPL/Examples/HPSimple_Francis_IPSLGen.mo b/OpenHPL/Examples/HPSimple_Francis_IPSLGen.mo index f1f4b8b4..bd257be3 100644 --- a/OpenHPL/Examples/HPSimple_Francis_IPSLGen.mo +++ b/OpenHPL/Examples/HPSimple_Francis_IPSLGen.mo @@ -82,9 +82,9 @@ model HPSimple_Francis_IPSLGen "Synergy with OpenIPSL library(generator)" Placement(visible = true, transformation(origin = {58, -60}, extent = {{-6, -6}, {6, 6}}, rotation = 0))); OpenIPSL.Electrical.Branches.PwLine pwLine4(G = 0, R = 0.01, X = 0.1, B = 0.0005) annotation ( Placement(visible = true, transformation(origin = {56, -10}, extent = {{-5.99999, -5.99998}, {5.99999, 6}}, rotation = 0))); - OpenIPSL.Electrical.Loads.PSAT.LOADPQ pwLoadPQ1(P_0=8000000, Q_0=6000000) annotation ( + OpenIPSL.Electrical.Loads.PSAT.PQ pwLoadPQ1(P_0=8000000, Q_0=6000000) annotation ( Placement(visible = true, transformation(origin = {90, -22}, extent = {{-6, -6}, {6, 6}}, rotation = 90))); - OpenIPSL.Electrical.Loads.PSAT.LOADPQ_variation pwLoadPQ2( + OpenIPSL.Electrical.Loads.PSAT.PQvar pwLoadPQ2( P_0=8000000, Q_0=6000000, dQ1 = 0, t_start_2=1e10, diff --git a/OpenHPL/Examples/HPSimple_Francis_IPSLGenGov.mo b/OpenHPL/Examples/HPSimple_Francis_IPSLGenGov.mo index 71eb3884..a7dfaacd 100644 --- a/OpenHPL/Examples/HPSimple_Francis_IPSLGenGov.mo +++ b/OpenHPL/Examples/HPSimple_Francis_IPSLGenGov.mo @@ -80,9 +80,9 @@ model HPSimple_Francis_IPSLGenGov "Synergy with OpenIPSL library(generator + gov Placement(visible = true, transformation(origin = {58, -90}, extent = {{-6, -6}, {6, 6}}, rotation = 0))); OpenIPSL.Electrical.Branches.PwLine pwLine4(G = 0, R = 0.01, X = 0.1, B = 0.0005) annotation ( Placement(visible = true, transformation(origin = {56, -40}, extent = {{-5.99999, -5.99998}, {5.99999, 6}}, rotation = 0))); - OpenIPSL.Electrical.Loads.PSAT.LOADPQ pwLoadPQ1(P_0=8000000, Q_0=6000000) annotation ( + OpenIPSL.Electrical.Loads.PSAT.PQ pwLoadPQ1(P_0=8000000, Q_0=6000000) annotation ( Placement(visible = true, transformation(origin = {90, -52}, extent = {{-6, -6}, {6, 6}}, rotation = 90))); - OpenIPSL.Electrical.Loads.PSAT.LOADPQ_variation pwLoadPQ2( + OpenIPSL.Electrical.Loads.PSAT.PQvar pwLoadPQ2( P_0=8000000, Q_0=6000000, dP1(displayUnit="MW") = 1000000, t_end_1 = 1100, t_end_2 = 1e10, t_start_1 = 1000, t_start_2 = 1e10) annotation ( diff --git a/OpenHPL/Examples/HPSimple_Francis_IPSLGenInfBus.mo b/OpenHPL/Examples/HPSimple_Francis_IPSLGenInfBus.mo index c75b92f7..76199139 100644 --- a/OpenHPL/Examples/HPSimple_Francis_IPSLGenInfBus.mo +++ b/OpenHPL/Examples/HPSimple_Francis_IPSLGenInfBus.mo @@ -82,9 +82,9 @@ model HPSimple_Francis_IPSLGenInfBus "Synergy with OpenIPSL library(generator + Placement(visible = true, transformation(origin = {58, -90}, extent = {{-6, -6}, {6, 6}}, rotation = 0))); OpenIPSL.Electrical.Branches.PwLine pwLine4(G = 0, R = 0.01, X = 0.1, B = 0.0005) annotation ( Placement(visible = true, transformation(origin = {56, -40}, extent = {{-5.99999, -5.99998}, {5.99999, 6}}, rotation = 0))); - OpenIPSL.Electrical.Loads.PSAT.LOADPQ pwLoadPQ1(P_0=8000000, Q_0=6000000) annotation ( + OpenIPSL.Electrical.Loads.PSAT.PQ pwLoadPQ1(P_0=8000000, Q_0=6000000) annotation ( Placement(visible = true, transformation(origin = {90, -52}, extent = {{-6, -6}, {6, 6}}, rotation = 90))); - OpenIPSL.Electrical.Loads.PSAT.LOADPQ_variation pwLoadPQ2( + OpenIPSL.Electrical.Loads.PSAT.PQvar pwLoadPQ2( P_0=8000000, Q_0=6000000, dP1=1000000, t_end_1 = 1.1e3, t_end_2 = 1e10, t_start_1 = 1e3, t_start_2 = 1e10) annotation ( diff --git a/OpenHPL/Functions/DarcyFriction/fDarcy.mo b/OpenHPL/Functions/DarcyFriction/fDarcy.mo index 1d133690..3d753b7d 100644 --- a/OpenHPL/Functions/DarcyFriction/fDarcy.mo +++ b/OpenHPL/Functions/DarcyFriction/fDarcy.mo @@ -27,10 +27,8 @@ algorithm fD := 1 / (2 * log10(arg)) ^ 2; end if; annotation ( - Documentation(info = " + Documentation(info="

Function for defining the Darcy friction factor using the Reynolds number. Has different equations for laminar (Reynolds number < 2100) and turbulent (Reynolds number > 2300) flows and also for transitional zone (2100 < Reynolds number < 2300).

-

-

Transitional zone is define with a cubic polynomial fitting and looks as follows:

-

+

")); end fDarcy; diff --git a/OpenHPL/Functions/KP07/KPfunctions/GhostCells.mo b/OpenHPL/Functions/KP07/KPfunctions/GhostCells.mo index 0c1ad3e4..392c7545 100644 --- a/OpenHPL/Functions/KP07/KPfunctions/GhostCells.mo +++ b/OpenHPL/Functions/KP07/KPfunctions/GhostCells.mo @@ -30,7 +30,7 @@ equation annotation ( Documentation(info="

The model for defining the ghost cells. It can be observed that for a given jth cell, information from the neighbouring cells j-1 and j-2 (to the left) and j+1 and j+2 (to the right) are required for calculating the flux integrals.

-

+

Here is the equations that are used in this function:

")); diff --git a/OpenHPL/Resources/Images/MinorLoss.png b/OpenHPL/Resources/Images/MinorLoss.png index a19ebb0d..8c5a82e6 100644 Binary files a/OpenHPL/Resources/Images/MinorLoss.png and b/OpenHPL/Resources/Images/MinorLoss.png differ diff --git a/OpenHPL/Resources/Images/SurgeTankAirCushion.svg b/OpenHPL/Resources/Images/STAirCushion.svg similarity index 76% rename from OpenHPL/Resources/Images/SurgeTankAirCushion.svg rename to OpenHPL/Resources/Images/STAirCushion.svg index 8d966ab7..46ce2ea1 100644 --- a/OpenHPL/Resources/Images/SurgeTankAirCushion.svg +++ b/OpenHPL/Resources/Images/STAirCushion.svg @@ -1,6 +1,4 @@ - - + viewBox="0 0 54.450404 41.647557" + height="92.550125mm" + width="121.00089mm"> @@ -265,7 +263,7 @@ @@ -280,7 +278,7 @@ @@ -645,15 +643,15 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.31478688" - inkscape:cx="2057.968" - inkscape:cy="1574.0808" + inkscape:zoom="2.5231327" + inkscape:cx="293.99542" + inkscape:cy="177.30878" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1920" - inkscape:window-height="1172" - inkscape:window-x="3840" + inkscape:window-height="1173" + inkscape:window-x="1920" inkscape:window-y="0" inkscape:window-maximized="1" showguides="false" @@ -661,12 +659,13 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - scale-x="0.10001"> + scale-x="0.45" + inkscape:document-rotation="0"> + originx="-21.125239" + originy="330.68208" /> @@ -691,12 +690,12 @@ height="17.401791" x="100.32822" y="222.88211" - style="fill:#0080ff;fill-opacity:1;stroke:#000000;stroke-width:0.10059099;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.89054727" + style="fill:#0080ff;fill-opacity:1;stroke:#000000;stroke-width:0.100591;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.890547" transform="matrix(1,0,-0.152626,0.98828402,0,0)" inkscape:export-xdpi="699.71716" inkscape:export-ydpi="699.71716" /> + style="stroke-width:0.638392"> + style="fill:#000000;fill-opacity:1;stroke-width:0.638392"> + style="fill:#000000;fill-opacity:1;stroke-width:0.638392"> + diff --git a/OpenHPL/Resources/Images/STSharpOrifice.svg b/OpenHPL/Resources/Images/STSharpOrifice.svg new file mode 100644 index 00000000..60bc44df --- /dev/null +++ b/OpenHPL/Resources/Images/STSharpOrifice.svg @@ -0,0 +1,2247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenHPL/Resources/Images/STSimple.svg b/OpenHPL/Resources/Images/STSimple.svg new file mode 100644 index 00000000..cbd99138 --- /dev/null +++ b/OpenHPL/Resources/Images/STSimple.svg @@ -0,0 +1,1479 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenHPL/Resources/Images/STThrottleValve.svg b/OpenHPL/Resources/Images/STThrottleValve.svg new file mode 100644 index 00000000..97d7964a --- /dev/null +++ b/OpenHPL/Resources/Images/STThrottleValve.svg @@ -0,0 +1,3145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenHPL/Resources/Images/SharpOrificeSurgeTank.png b/OpenHPL/Resources/Images/SharpOrificeSurgeTank.png deleted file mode 100644 index de71ab22..00000000 Binary files a/OpenHPL/Resources/Images/SharpOrificeSurgeTank.png and /dev/null differ diff --git a/OpenHPL/Resources/Images/ThrottleValveSurgeTank.png b/OpenHPL/Resources/Images/ThrottleValveSurgeTank.png deleted file mode 100644 index 73d3f65c..00000000 Binary files a/OpenHPL/Resources/Images/ThrottleValveSurgeTank.png and /dev/null differ diff --git a/OpenHPL/Resources/Images/darcyf.png b/OpenHPL/Resources/Images/darcyf.png deleted file mode 100644 index 32ab146b..00000000 Binary files a/OpenHPL/Resources/Images/darcyf.png and /dev/null differ diff --git a/OpenHPL/Resources/Images/darcyf.svg b/OpenHPL/Resources/Images/darcyf.svg new file mode 100644 index 00000000..b299b737 --- /dev/null +++ b/OpenHPL/Resources/Images/darcyf.svg @@ -0,0 +1,3 @@ + + +gnuplot_plot_2gnuplot_plot_3gnuplot_plot_4gnuplot_plot_5gnuplot_plot_6gnuplot_plot_7gnuplot_plot_8gnuplot_plot_9gnuplot_plot_10gnuplot_plot_11gnuplot_plot_12gnuplot_plot_13gnuplot_plot_14gnuplot_plot_17gnuplot_plot_18gnuplot_plot_19gnuplot_plot_20gnuplot_plot_21gnuplot_plot_22gnuplot_plot_23gnuplot_plot_24gnuplot_plot_25gnuplot_plot_26gnuplot_plot_27gnuplot_plot_28gnuplot_plot_29gnuplot_plot_30gnuplot_plot_31gnuplot_plot_32gnuplot_plot_33gnuplot_plot_34gnuplot_plot_35gnuplot_plot_36gnuplot_plot_37gnuplot_plot_38gnuplot_plot_39gnuplot_plot_40gnuplot_plot_41gnuplot_plot_42gnuplot_plot_43gnuplot_plot_44gnuplot_plot_45gnuplot_plot_46gnuplot_plot_47gnuplot_plot_48gnuplot_plot_49gnuplot_plot_50gnuplot_plot_51gnuplot_plot_52gnuplot_plot_53gnuplot_plot_54gnuplot_plot_55gnuplot_plot_56gnuplot_plot_57gnuplot_plot_58gnuplot_plot_59gnuplot_plot_60gnuplot_plot_61gnuplot_plot_62gnuplot_plot_63gnuplot_plot_64gnuplot_plot_65gnuplot_plot_1gnuplot_plot_15gnuplot_plot_16gnuplot_plot_66 diff --git a/OpenHPL/Resources/Images/darcyf_zoomed.png b/OpenHPL/Resources/Images/darcyf_zoomed.png deleted file mode 100644 index b3db4295..00000000 Binary files a/OpenHPL/Resources/Images/darcyf_zoomed.png and /dev/null differ diff --git a/OpenHPL/Resources/Images/equations/KPScheme.svg b/OpenHPL/Resources/Images/equations/KPScheme.svg index caefc5c1..6b2f0530 100644 --- a/OpenHPL/Resources/Images/equations/KPScheme.svg +++ b/OpenHPL/Resources/Images/equations/KPScheme.svg @@ -10,12 +10,12 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="61.496437mm" - height="8.1737785mm" - viewBox="0 0 61.496437 8.1737785" + width="445.39487" + height="67.870361" + viewBox="0 0 62.908865 8.978683" version="1.1" id="svg8" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" sodipodi:docname="KPScheme.svg"> + fit-margin-top="5" + fit-margin-left="5" + fit-margin-right="5" + fit-margin-bottom="5" + scale-x="0.5" + units="px" + viewbox-width="62.6" /> + transform="translate(-81.830922,-92.42764)"> + fit-margin-top="5" + fit-margin-left="5" + fit-margin-right="5" + fit-margin-bottom="5" + units="px" + scale-x="0.7" /> diff --git a/OpenHPL/Resources/Images/equations/KP_ghost.svg b/OpenHPL/Resources/Images/equations/KP_ghost.svg index 3b7e3f84..d7907fca 100644 --- a/OpenHPL/Resources/Images/equations/KP_ghost.svg +++ b/OpenHPL/Resources/Images/equations/KP_ghost.svg @@ -10,12 +10,12 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="41.964573mm" - height="19.038591mm" - viewBox="0 0 41.964573 19.038591" + width="317.21252" + height="143.91376" + viewBox="0 0 41.964574 19.038591" version="1.1" id="svg8" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" sodipodi:docname="KP_ghost.svg"> + fit-margin-bottom="0" + units="px" + scale-x="0.5" /> + fit-margin-top="5" + fit-margin-left="5" + fit-margin-right="5" + fit-margin-bottom="5" + units="px" + scale-x="0.6" /> + transform="translate(-85.616007,-53.93332)"> + inkscape:window-width="726" + inkscape:window-height="417" + inkscape:window-x="2429" + inkscape:window-y="709" + inkscape:window-maximized="0" + fit-margin-top="5" + fit-margin-left="5" + fit-margin-right="5" + fit-margin-bottom="5" + units="px" + scale-x="0.4" /> + transform="translate(-107.62053,-67.378968)"> + fit-margin-top="5" + fit-margin-left="5" + fit-margin-right="5" + fit-margin-bottom="5" + units="px" + scale-x="0.7" /> diff --git a/OpenHPL/Resources/Images/equations/KP_speed.svg b/OpenHPL/Resources/Images/equations/KP_speed.svg index 6d9a9c86..05cb5089 100644 --- a/OpenHPL/Resources/Images/equations/KP_speed.svg +++ b/OpenHPL/Resources/Images/equations/KP_speed.svg @@ -10,12 +10,12 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="46.758739mm" - height="14.060143mm" - viewBox="0 0 46.75874 14.060143" + width="363.45187" + height="116.2814" + viewBox="0 0 48.081655 15.38306" version="1.1" id="svg8" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" sodipodi:docname="KP_speed.svg"> + fit-margin-top="5" + fit-margin-left="5" + fit-margin-right="5" + fit-margin-bottom="5" + units="px" + scale-x="0.5" /> diff --git a/OpenHPL/Resources/Images/ghosts.png b/OpenHPL/Resources/Images/ghosts.png deleted file mode 100644 index 179cb0be..00000000 Binary files a/OpenHPL/Resources/Images/ghosts.png and /dev/null differ diff --git a/OpenHPL/Resources/Images/ghosts.svg b/OpenHPL/Resources/Images/ghosts.svg new file mode 100644 index 00000000..3d77aca5 --- /dev/null +++ b/OpenHPL/Resources/Images/ghosts.svg @@ -0,0 +1,1247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ghost cells + Ghost cells + Right boundary + Left boundary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenHPL/Resources/Images/kp.png b/OpenHPL/Resources/Images/kp.png deleted file mode 100644 index d0f5fdab..00000000 Binary files a/OpenHPL/Resources/Images/kp.png and /dev/null differ diff --git a/OpenHPL/Resources/Images/kp.svg b/OpenHPL/Resources/Images/kp.svg new file mode 100644 index 00000000..16c869ca --- /dev/null +++ b/OpenHPL/Resources/Images/kp.svg @@ -0,0 +1,1702 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenHPL/Resources/Images/penstock.png b/OpenHPL/Resources/Images/penstock.png deleted file mode 100644 index 551c65a5..00000000 Binary files a/OpenHPL/Resources/Images/penstock.png and /dev/null differ diff --git a/OpenHPL/Resources/Images/penstock.svg b/OpenHPL/Resources/Images/penstock.svg new file mode 100644 index 00000000..7909ccaa --- /dev/null +++ b/OpenHPL/Resources/Images/penstock.svg @@ -0,0 +1,502 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenHPL/Resources/Images/pipe.png b/OpenHPL/Resources/Images/pipe.png deleted file mode 100644 index 96aec3e5..00000000 Binary files a/OpenHPL/Resources/Images/pipe.png and /dev/null differ diff --git a/OpenHPL/Resources/Images/pipe.svg b/OpenHPL/Resources/Images/pipe.svg new file mode 100644 index 00000000..3f8c5b4a --- /dev/null +++ b/OpenHPL/Resources/Images/pipe.svg @@ -0,0 +1,495 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenHPL/Resources/Images/simplegen.png b/OpenHPL/Resources/Images/simplegen.png deleted file mode 100644 index 971f3ae9..00000000 Binary files a/OpenHPL/Resources/Images/simplegen.png and /dev/null differ diff --git a/OpenHPL/Resources/Images/simplegen.svg b/OpenHPL/Resources/Images/simplegen.svg new file mode 100644 index 00000000..bc9b714e --- /dev/null +++ b/OpenHPL/Resources/Images/simplegen.svg @@ -0,0 +1,1279 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenHPL/Resources/Images/src/chiRoundedExpand.pdf b/OpenHPL/Resources/Images/src/chiRoundedExpand.pdf deleted file mode 100644 index 4958b570..00000000 Binary files a/OpenHPL/Resources/Images/src/chiRoundedExpand.pdf and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/chiRoundedExpand.vsdx b/OpenHPL/Resources/Images/src/chiRoundedExpand.vsdx deleted file mode 100644 index 5f36544d..00000000 Binary files a/OpenHPL/Resources/Images/src/chiRoundedExpand.vsdx and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/chiRoundedReduce.pdf b/OpenHPL/Resources/Images/src/chiRoundedReduce.pdf deleted file mode 100644 index 33789da3..00000000 Binary files a/OpenHPL/Resources/Images/src/chiRoundedReduce.pdf and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/chiRoundedReduce.vsdx b/OpenHPL/Resources/Images/src/chiRoundedReduce.vsdx deleted file mode 100644 index 00e03022..00000000 Binary files a/OpenHPL/Resources/Images/src/chiRoundedReduce.vsdx and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/chiTaperedExpand.pdf b/OpenHPL/Resources/Images/src/chiTaperedExpand.pdf deleted file mode 100644 index 6ec907ad..00000000 Binary files a/OpenHPL/Resources/Images/src/chiTaperedExpand.pdf and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/chiTaperedExpand.vsdx b/OpenHPL/Resources/Images/src/chiTaperedExpand.vsdx deleted file mode 100644 index e61d0a62..00000000 Binary files a/OpenHPL/Resources/Images/src/chiTaperedExpand.vsdx and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/chiTaperedReduce.pdf b/OpenHPL/Resources/Images/src/chiTaperedReduce.pdf deleted file mode 100644 index 892a31fc..00000000 Binary files a/OpenHPL/Resources/Images/src/chiTaperedReduce.pdf and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/chiTaperedReduce.vsdx b/OpenHPL/Resources/Images/src/chiTaperedReduce.vsdx deleted file mode 100644 index b2fd7dbb..00000000 Binary files a/OpenHPL/Resources/Images/src/chiTaperedReduce.vsdx and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/chiThickSharpOrifice.pdf b/OpenHPL/Resources/Images/src/chiThickSharpOrifice.pdf deleted file mode 100644 index f4991c35..00000000 Binary files a/OpenHPL/Resources/Images/src/chiThickSharpOrifice.pdf and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/chiThickSharpOrifice.vsdx b/OpenHPL/Resources/Images/src/chiThickSharpOrifice.vsdx deleted file mode 100644 index f134c244..00000000 Binary files a/OpenHPL/Resources/Images/src/chiThickSharpOrifice.vsdx and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/chiThinSharpOrifice.pdf b/OpenHPL/Resources/Images/src/chiThinSharpOrifice.pdf deleted file mode 100644 index f22e6291..00000000 Binary files a/OpenHPL/Resources/Images/src/chiThinSharpOrifice.pdf and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/chiThinSharpOrifice.vsdx b/OpenHPL/Resources/Images/src/chiThinSharpOrifice.vsdx deleted file mode 100644 index e4b834c0..00000000 Binary files a/OpenHPL/Resources/Images/src/chiThinSharpOrifice.vsdx and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/hydroPowerSystem.pdf b/OpenHPL/Resources/Images/src/hydroPowerSystem.pdf deleted file mode 100644 index b6dfd654..00000000 Binary files a/OpenHPL/Resources/Images/src/hydroPowerSystem.pdf and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/hydroPowerSystem.vsdx b/OpenHPL/Resources/Images/src/hydroPowerSystem.vsdx deleted file mode 100644 index 817e3b1f..00000000 Binary files a/OpenHPL/Resources/Images/src/hydroPowerSystem.vsdx and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/impulseTurbine.pdf b/OpenHPL/Resources/Images/src/impulseTurbine.pdf deleted file mode 100644 index dc5dd358..00000000 Binary files a/OpenHPL/Resources/Images/src/impulseTurbine.pdf and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/impulseTurbine.svg b/OpenHPL/Resources/Images/src/impulseTurbine.svg deleted file mode 100644 index 90bd732e..00000000 --- a/OpenHPL/Resources/Images/src/impulseTurbine.svg +++ /dev/null @@ -1,727 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OpenHPL/Resources/Images/src/impulseTurbine.vsdx b/OpenHPL/Resources/Images/src/impulseTurbine.vsdx deleted file mode 100644 index 7bf5512d..00000000 Binary files a/OpenHPL/Resources/Images/src/impulseTurbine.vsdx and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/phiSquareExpand.pdf b/OpenHPL/Resources/Images/src/phiSquareExpand.pdf deleted file mode 100644 index e1303d47..00000000 Binary files a/OpenHPL/Resources/Images/src/phiSquareExpand.pdf and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/phiSquareExpand.vsdx b/OpenHPL/Resources/Images/src/phiSquareExpand.vsdx deleted file mode 100644 index ceb9ea77..00000000 Binary files a/OpenHPL/Resources/Images/src/phiSquareExpand.vsdx and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/phiSquareReduce.pdf b/OpenHPL/Resources/Images/src/phiSquareReduce.pdf deleted file mode 100644 index d1ab3b2d..00000000 Binary files a/OpenHPL/Resources/Images/src/phiSquareReduce.pdf and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/phiSquareReduce.vsdx b/OpenHPL/Resources/Images/src/phiSquareReduce.vsdx deleted file mode 100644 index 82b980c5..00000000 Binary files a/OpenHPL/Resources/Images/src/phiSquareReduce.vsdx and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/turbineFrancisVelocities.pdf b/OpenHPL/Resources/Images/src/turbineFrancisVelocities.pdf deleted file mode 100644 index 26f74929..00000000 Binary files a/OpenHPL/Resources/Images/src/turbineFrancisVelocities.pdf and /dev/null differ diff --git a/OpenHPL/Resources/Images/src/turbineFrancisVelocities.svg b/OpenHPL/Resources/Images/src/turbineFrancisVelocities.svg deleted file mode 100644 index 10cf6282..00000000 --- a/OpenHPL/Resources/Images/src/turbineFrancisVelocities.svg +++ /dev/null @@ -1,2394 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OpenHPL/Resources/Images/src/turbineFrancisVelocities.vsdx b/OpenHPL/Resources/Images/src/turbineFrancisVelocities.vsdx deleted file mode 100644 index 076d82cc..00000000 Binary files a/OpenHPL/Resources/Images/src/turbineFrancisVelocities.vsdx and /dev/null differ diff --git a/OpenHPL/Resources/Images/surgepic.png b/OpenHPL/Resources/Images/surgepic.png deleted file mode 100644 index f1e7fa40..00000000 Binary files a/OpenHPL/Resources/Images/surgepic.png and /dev/null differ diff --git a/OpenHPL/Resources/Images/turbinepelton.svg b/OpenHPL/Resources/Images/turbinepelton.svg new file mode 100644 index 00000000..35b25b1f --- /dev/null +++ b/OpenHPL/Resources/Images/turbinepelton.svg @@ -0,0 +1,1693 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenHPL/Resources/Images/turbinepic.png b/OpenHPL/Resources/Images/turbinepic.png deleted file mode 100644 index 4739e4c3..00000000 Binary files a/OpenHPL/Resources/Images/turbinepic.png and /dev/null differ diff --git a/OpenHPL/Resources/Images/turbinepic.svg b/OpenHPL/Resources/Images/turbinepic.svg new file mode 100644 index 00000000..699223f6 --- /dev/null +++ b/OpenHPL/Resources/Images/turbinepic.svg @@ -0,0 +1,857 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenHPL/UsersGuide/References.mo b/OpenHPL/UsersGuide/References.mo index 39d95f2c..0e3f97fc 100644 --- a/OpenHPL/UsersGuide/References.mo +++ b/OpenHPL/UsersGuide/References.mo @@ -65,6 +65,13 @@ model References "References" http://hdl.handle.net/11250/2607645.

+ +

[White2009]

+

Frank M. White, "Fluid mechanics", + Book, Mcgraw-Hill series in mechanical engineering, 2009, + 6th Edition, ISBN 978-0-07-352934-9.

+ + ")); end References; diff --git a/OpenHPL/Waterway/BendPipe.mo b/OpenHPL/Waterway/BendPipe.mo index 04c3ae9f..8e77d2c0 100644 --- a/OpenHPL/Waterway/BendPipe.mo +++ b/OpenHPL/Waterway/BendPipe.mo @@ -24,7 +24,17 @@ equation Documentation(info="

Usually minor head losses in pipes are cosidered to be due to fittings, diffusers, nozzles, bend in pipes, etc. We are more interested in head loss due to bend pipes for this model.

A typical loss coefficient values for flanged and threaded elbows, tees, gates, valves, etc., can be taken as,

-

-

Note: This is page excerpt taken from Fluid Mechanics by Frank M. White from page 422, edition-6th.

+ + + + + + +
+ \"MinorLoss.png\" +
Note: This is page excerpt is taken from + [White2009], page 422.
+ ")); end BendPipe; diff --git a/OpenHPL/Waterway/Penstock.mo b/OpenHPL/Waterway/Penstock.mo index e0a00de8..5762f76b 100644 --- a/OpenHPL/Waterway/Penstock.mo +++ b/OpenHPL/Waterway/Penstock.mo @@ -83,8 +83,8 @@ equation V_p_out = mdot ./ rho_m; V_p_out_end = mdot_V / (data.rho * (1 + data.beta * (p_o - data.p_a))); annotation ( - Documentation(info = "

This is a more detaied model of the pipe that can be use for proper modeling of penstock. (This model does not work well. Instead PenstockKP model can be used.)

The model for the penstock with the elastic walls and compressible water with simple discretization method (Staggered grid). The geometry of the penstock is described due to figure:

-

+ Documentation(info="

This is a more detaied model of the pipe that can be use for proper modeling of penstock. (This model does not work well. Instead PenstockKP model can be used.)

The model for the penstock with the elastic walls and compressible water with simple discretization method (Staggered grid). The geometry of the penstock is described due to figure:

+

Conservation laws are usually solved by Finite-volume methods. With the Finite volume method, we divide the grid into small control volumes or control cells and then apply the conservation laws. The discretization method is based on Staggered grid scheme, where the penstock is divided in N segments, with input and output pressure as a boundary conditions. Can be describe as the follow figure:

")); diff --git a/OpenHPL/Waterway/PenstockKP.mo b/OpenHPL/Waterway/PenstockKP.mo index c197cf5e..3735e5a4 100644 --- a/OpenHPL/Waterway/PenstockKP.mo +++ b/OpenHPL/Waterway/PenstockKP.mo @@ -123,7 +123,7 @@ used for proper modelling of the penstock or other conduits.

The model could include the elastic walls and compressible water and use discretization method based on Kurganov-Petrova central upwind scheme (KP). The geometry of the penstock is described due to figure:

-

+

Conservation laws are usually solved by Finite-volume methods. With the Finite volume method, we divide the grid into small control volumes or control cells and then apply the conservation laws. @@ -136,7 +136,7 @@ cell are denoted by j-1/2 and j+1/2 respectively. At each cell interface, the right(+)/left(-) point values are reconstructed. The letter adenotes the right and the left sided local speeds of propagation at the left/right interface of the cell.

-

+

In order to determine the fluxes at the cell interface H and the source term S, the KP scheme is used, which is a second order scheme that is well balanced.

diff --git a/OpenHPL/Waterway/Pipe.mo b/OpenHPL/Waterway/Pipe.mo index 1a101075..99e4eb7c 100644 --- a/OpenHPL/Waterway/Pipe.mo +++ b/OpenHPL/Waterway/Pipe.mo @@ -74,12 +74,12 @@ equation //n.T = T; //// annotation ( - Documentation(info="

The simple model of the pipe gives possibilities + Documentation(info= "

The simple model of the pipe gives possibilities for easy modelling of different conduit: intake race, penstock, tail race, etc.

This model is described by the momentum differential equation, which depends on pressure drop through the pipe together with friction and gravity forces. The main defined variable is volumetric flow rate Vdot.

-

+

In this pipe model, the flow rate changes simultaniusly in the whole pipe (an information about the speed of wave propagation is not included here). Water pressures can be shown just in the boundaries of pipe diff --git a/OpenHPL/Waterway/SurgeTank.mo b/OpenHPL/Waterway/SurgeTank.mo index a0d0b1c4..54cd49db 100644 --- a/OpenHPL/Waterway/SurgeTank.mo +++ b/OpenHPL/Waterway/SurgeTank.mo @@ -142,11 +142,20 @@ equation

  • Sharp orifice surge tank

    • All of the surge tanks are modeled using mass and momemtum balance.

    -

    The air cushion surge tank is shown below:

    -

    -

    The throttle valve surge tank and sharp orifice type surge tank are shown below:

    -

    -

    +

    All of the surge tank can be shown below.

    + +

    This simple surge tank is shown below.

    +

    + +

    The air cushion surge tank is shown below:

    +

    + +

    This sharp orifice surge tank is shown below.

    +

    + +

    The throttle valve surge tank is shown below:

    +

    +

    The simple surge tank model can be found in this link: OpenHPL.UsersGuide.References>[Valen2017]

    ")); end SurgeTank;