Add a h_abs variable for absolute level information

Author: dietmarw

OpenHPL/Waterway/Reservoir.mo

@@ -4,10 +4,10 @@ model Reservoir "Model of the reservoir"
   extends OpenHPL.Icons.Reservoir;
   parameter SI.Height h_0=50 "Initial water level above intake"
     annotation (Dialog(group="Setup", enable=not useLevel));
-  parameter SI.Height z_0=0 "Elevation of the reservoir outlet (sets absolute reference)"
-    annotation (Dialog(group="Geometry"));
-  parameter Boolean fixElevation=true "If true (fixed), z_0 is enforced as initial value; if false (derived), elevation is determined by connected topology"
+  parameter Boolean fixElevation=false "If true (fixed), z_0 is enforced as initial value; if false (derived), elevation is determined by connected topology"
     annotation (Dialog(group="Geometry"), choices(checkBox=true));
+  parameter SI.Height z_0=0 "Elevation of the reservoir outlet (sets absolute reference)"
+    annotation (Dialog(group="Geometry", enable=fixElevation));
   parameter Boolean constantLevel=false "If checked, the reservoir keeps the constant water level h_0"
     annotation (
     Dialog(group="Setup", enable=not (useInflow or useLevel)),
@@ -42,6 +42,7 @@ model Reservoir "Model of the reservoir"
   SI.Momentum M "Water momentum";
   SI.Force F_f "Friction force";
   SI.Height h "Water level";
+  SI.Height h_abs = h + o.z "Absolute water level";
   SI.Pressure p_o "Outlet pressure";
 
   OpenHPL.Interfaces.Contact_o o(p=p_o) "Outflow from reservoir" annotation (Placement(transformation(extent={{90,-10},{110,10}}), iconTransformation(extent={{90,-10},{110,10}})));

OpenHPL/Waterway/SurgeTank.mo

@@ -30,7 +30,7 @@ model SurgeTank "Model of the surge tank/shaft"
   parameter Boolean SteadyState=data.SteadyState "If true, starts in steady state" annotation (Dialog(group="Initialization"));
   parameter SI.VolumeFlowRate Vdot_0 = 0 "Initial volume flow rate in the surge tank" annotation (
     Dialog(group = "Initialization"));
-  parameter SI.Height h_0 = 50 "Initial water level in the surge tank" annotation (
+  parameter SI.Height h_0 = 50 "Initial water level in the surge tank above inlet" annotation (
     Dialog(group = "Initialization"));
   parameter SI.Pressure p_ac = 4*data.p_a "Initial pressure of air-cushion inside the surge tank" annotation (
     Dialog(group = "Initialization",enable=SurgeTankType == OpenHPL.Types.SurgeTank.STAirCushion));
@@ -55,6 +55,7 @@ model SurgeTank "Model of the surge tank/shaft"
   SI.Pressure p_b "Pressure at bottom of the surge tank";
   Real phiSO "Dimensionless factor based on the type of fitting ";
   SI.Height h(start = h_0) "Water height in the surge tank";
+  SI.Height h_abs = h + o.z "Absolute water level";
   SI.VolumeFlowRate Vdot(start = Vdot_0, fixed=true) "Volume flow rate";
 
   Interfaces.Contact_i creek(

OpenHPL/Waterway/VolumeFlowSource.mo

@@ -11,11 +11,10 @@ model VolumeFlowSource "Volume flow source (either fixed or variable)"
     annotation (choices(checkBox = true),Dialog(enable=useInput));
   parameter SI.Time T_f=0.01 "Time constant of the first order filter."
     annotation (Dialog(enable=useInput and useFilter));
-  parameter SI.Height z_0=0 "Elevation of the outlet connection"
-    annotation (Dialog(group="Geometry"));
-  parameter Boolean fixElevation=true "If true (fixed), z_0 is enforced as initial value; if false (derived), elevation is determined by connected topology"
+  parameter Boolean fixElevation=false "If true (fixed), z_0 is enforced as initial value; if false (derived), elevation is determined by connected topology"
     annotation (Dialog(group="Geometry"), choices(checkBox=true));
-
+  parameter SI.Height z_0=0 "Elevation of the outlet connection"
+    annotation (Dialog(group="Geometry", enable=fixElevation));
   Interfaces.Contact_o o "Outlet flow connector"
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
   Modelica.Blocks.Interfaces.RealInput outFlow if useInput "Conditional input for defining the outlet flow [m3/s]"