Clean up of examples

Author: dietmarw

OpenHPL/Examples/Pipes.mo

@@ -5,10 +5,10 @@ model Pipes "Example of contracting, contstant and expanding pipe diameters"
     inner OpenHPL.Data data annotation (
       Placement(transformation(origin={-90,90}, extent={{-10,-10},{10,10}})));
     parameter SI.Diameter Dn=0.3568 "Nominal Diameter";
-    Waterway.Reservoir Upstream(h_0 = 100.0, constantLevel=true, fixElevation = true, z_0 = 50)
+    Waterway.Reservoir Upstream(h_0 = 100.0, constantLevel=true, fixElevation = true, z_0 = 10)
                                                             annotation (
       Placement(transformation(origin={-50,0}, extent={{-10,-10},{10,10}})));
-    Waterway.Reservoir Downstream(h_0 = 0.0, constantLevel=true, z_0 = 30, fixElevation = true)
+    Waterway.Reservoir Downstream(h_0 = 0.0, constantLevel=true, fixElevation = false)
                                                                annotation (
       Placement(transformation(origin={50,0}, extent={{10,-10},{-10,10}}, rotation = -0)));
     OpenHPL.Waterway.Pipe pipeExpanding(
@@ -19,12 +19,12 @@ model Pipes "Example of contracting, contstant and expanding pipe diameters"
     OpenHPL.Waterway.Pipe pipeConstant(
     D_i=Dn,
     D_o=Dn,
-    H= 20,
+    H= 10,
     L=1000) annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
     OpenHPL.Waterway.Pipe pipeContracting(
     D_i=1.2*Dn,
     D_o=0.8*Dn,
-    H= 30,
+    H= 10,
     L=1000) annotation (Placement(transformation(origin={0,-20}, extent={{-10,-10},{10,10}})));
 
 equation

OpenHPL/Examples/VolumeFlowSource.mo

@@ -2,7 +2,7 @@ within OpenHPL.Examples;
 model VolumeFlowSource "Example demonstrating the use of VolumeFlowSource"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir tail1 annotation (Placement(transformation(extent={{60,30},{40,50}})));
-  inner OpenHPL.Data data(SteadyState = false, Vdot_0 = 1, showElevation = false)  annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
+  inner OpenHPL.Data data(SteadyState = false, Vdot_0 = 1, showElevation = true)  annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
   OpenHPL.Waterway.VolumeFlowSource volumeFlowConstant(fixElevation = true)  annotation (Placement(transformation(extent={{-50,30},{-30,50}})));
   Waterway.Pipe pipe1(H=0) annotation (Placement(transformation(extent={{-10,30},{10,50}})));
   Waterway.Pipe pipe2(H=0) annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
@@ -27,5 +27,5 @@ equation
   connect(pipe3.o,tail3. o) annotation (Line(points={{10,-40},{40,-40}},
                                                                      color={0,128,255}));
   connect(volumeFlowFiltered.outFlow, logdata.y[1]) annotation (Line(points={{-50,-40},{-59,-40}}, color={0,0,127}));
-  annotation (experiment(StopTime=120));
+  annotation (experiment(StopTime = 120, StartTime = 0, Tolerance = 1e-06, Interval = 0.24));
 end VolumeFlowSource;

OpenHPL/Examples/package.order

@@ -2,9 +2,9 @@ BranchingPipes
 SimpleValve
 SimpleValveWithCreek
 SimpleTurbine
+DetailedTurbine
 SimpleGen
 SimpleGenFrancis
-DetailedTurbine
 DetailedGen
 DetailedGenFrancis
 PowerSystemSimple