Skip to content

Svg images created #21 #23

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 12 commits into from
Nov 6, 2020
Merged

Svg images created #21 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7450b0a
Svg images created.
pandeysudan27 Feb 11, 2020
816d643
Improve the reference and add it to the user's guide
dietmarw Sep 9, 2020
e95eb51
Updating links and fixing sizes of equations
dietmarw Sep 9, 2020
ab7ee5b
Adapting size of equations
dietmarw Sep 9, 2020
2f5f6aa
Replaced pipe image by svg version
dietmarw Sep 11, 2020
ff42b9f
Penstock image replaced by svg version
dietmarw Sep 11, 2020
8311bc5
Replaced turbine image with svg version
dietmarw Sep 11, 2020
7b19ebd
Replaced simple generator image with svg version
dietmarw Sep 11, 2020
175701b
Create TeXified version of impulseTurbine.svg
dietmarw Nov 6, 2020
33023c3
Removing all converted source files.
dietmarw Nov 6, 2020
8463ed0
FIxed the colours and boundaries in the images
dietmarw Nov 6, 2020
b309a51
Update to newest OpenIPSL version.
dietmarw Nov 6, 2020
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/ElectroMech/Generators/SimpleGen.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.</p>
<p align=\"center\">
<img src=\"modelica://OpenHPL/Resources/Images/simplegen.png\">
<img src=\"modelica://OpenHPL/Resources/Images/simplegen.svg\">
</p>
</html>"));
end SimpleGen;
2 changes: 1 addition & 1 deletion OpenHPL/ElectroMech/Generators/SimpleGen2.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.</p>
<p align=\"center\">
<img src=\"modelica://OpenHPL/Resources/Images/simplegen.png\">
<img src=\"modelica://OpenHPL/Resources/Images/simplegen.svg\">
</p>
</html>"));
end SimpleGen2;
3 changes: 3 additions & 0 deletions OpenHPL/ElectroMech/Turbines/Pelton.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ This model is based on the Euler turbine equation.
</p>
<p>
<em>The model has not been tested.</em></p>
<p align=\"center\">
<img src=\"modelica://OpenHPL/Resources/Images/turbinepelton.svg\">
</p>
<p>More info about the model can be found in:
<a href=\"modelica://OpenHPL/Resources/Documents/Turbines_model.pdf\">Resources/Documents/Turbines_model.pdf</a>
</p>
Expand Down
4 changes: 2 additions & 2 deletions OpenHPL/ElectroMech/Turbines/Turbine.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ equation
//i.T = o.T;
////
annotation (
Documentation(info= "<html><p>
Documentation(info="<html><p>
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.
Expand All @@ -89,7 +89,7 @@ there are inputs as the control signal for the valve opening and also output as
</p>

<p align=\"center\">
<img src=\"modelica://OpenHPL/Resources/Images/turbinepic.png\">
<img src=\"modelica://OpenHPL/Resources/Images/turbinepic.svg\">
</p><h5>References</h5><p>More info about the model can be found in:&nbsp;<a href=\"Resources/Report/Report.docx\">Resources/Report/Report.docx</a></p>
</html>"),
Icon( coordinateSystem(initialScale = 0.1)));
Expand Down
4 changes: 2 additions & 2 deletions OpenHPL/Examples/HPSimple_Francis_IPSLGen.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions OpenHPL/Examples/HPSimple_Francis_IPSLGenGov.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions OpenHPL/Examples/HPSimple_Francis_IPSLGenInfBus.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 2 additions & 4 deletions OpenHPL/Functions/DarcyFriction/fDarcy.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ algorithm
fD := 1 / (2 * log10(arg)) ^ 2;
end if;
annotation (
Documentation(info = "<html>
Documentation(info="<html>
<p>Function for defining the Darcy friction factor using the <code>Reynolds&nbsp;number</code>. Has different equations for laminar (Reynolds number &LT; 2100) and turbulent (Reynolds number &GT; 2300) flows and also for transitional zone (2100 &LT; Reynolds number &LT; 2300).</p>
<p><img src=\"modelica://OpenHPL/Resources/Images/darcyf.png\"/></p>
<p>Transitional zone is define with a cubic polynomial fitting and looks as follows:</p>
<p><img src=\"modelica://OpenHPL/Resources/Images/darcyf_zoomed.png\"/></p>
<p><img src=\"modelica://OpenHPL/Resources/Images/darcyf.svg\"/></p>
</html>"));
end fDarcy;
2 changes: 1 addition & 1 deletion OpenHPL/Functions/KP07/KPfunctions/GhostCells.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ equation
annotation (
Documentation(info="<html>
<p>The model for defining the ghost cells. It can be observed that for a given <code>j<sup>th</code></sup> cell, information from the neighbouring cells <i>j-1</i> and <i>j-2</i> (to the left) and <i>j+1</i> and<i> j+2</i> (to the right) are required for calculating the flux integrals.</p>
<p><img src=\"modelica://OpenHPL/Resources/Images/ghosts.png\"/></p>
<p><img src=\"modelica://OpenHPL/Resources/Images/ghosts.svg\"/></p>
<p>Here is the equations that are used in this function:</p>
<p><img src=\"modelica://OpenHPL/Resources/Images/equations/KP_ghost.svg\"/></p>
</html>"));
Expand Down
Binary file modified OpenHPL/Resources/Images/MinorLoss.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading