Add a new elevation z to contact

dietmarw · dietmarw · commit 3ff1273a8e2b · 2026-04-10T16:55:43.000+02:00
The elevation gets automatically propagated via the connects
diff --git a/OpenHPL/ElectroMech/BaseClasses/BaseValve.mo b/OpenHPL/ElectroMech/BaseClasses/BaseValve.mo
@@ -34,6 +34,7 @@ equation
   Vdot = mdot/data.rho;
   dp*(C_v_*max(epsilon, u^alpha))^2 = Vdot*abs(Vdot) "Valve equation for pressure drop";
   dp = i.p - o.p "Link the pressure drop to the ports";
+  o.z = i.z "Elevation propagation: no height change across valve";
   annotation (preferredView="info", Documentation(info="<html>
 <p>
 This is a partial, simple model of hydraulic valve. &nbsp;</p><p>This model is based on the energy balance of a valve.
diff --git a/OpenHPL/ElectroMech/Turbines/Francis.mo b/OpenHPL/ElectroMech/Turbines/Francis.mo
@@ -210,6 +210,7 @@ equation
     p_tr2 = o.p;
     i.mdot+o.mdot=0;
     mdot=i.mdot;
+    o.z = i.z "Elevation propagation: no height change across turbine";
 
   connect(p_out, P_out) annotation (Line(points={{40,90},{40,110}}, color={0,0,127}));
     annotation (preferredView="info",
diff --git a/OpenHPL/ElectroMech/Turbines/Pelton.mo b/OpenHPL/ElectroMech/Turbines/Pelton.mo
@@ -54,6 +54,7 @@ equation
   // Flow rate connectors
     i.mdot+o.mdot=0;
     mdot=i.mdot;
+    o.z = i.z "Elevation propagation: no height change across turbine";
 
   connect(p_out, P_out) annotation (Line(points={{40,90},{40,110}}, color={0,0,127}));
     annotation (preferredView="info",
diff --git a/OpenHPL/Interfaces/Contact.mo b/OpenHPL/Interfaces/Contact.mo
@@ -3,8 +3,20 @@ connector Contact "Water flow connector"
   SI.Pressure p "Contact pressure";
   //SI.Temperature T "Contact temperature";
   flow SI.MassFlowRate mdot "Mass flow rate through the contact";
+  SI.Height z "Elevation at connection point";
   annotation (
     Documentation(info = "<html>
-<p>Contact is a basic water flow connector, which consists of water pressure and mass flow rate through the connector (positive if water is flowing into connector and negative if flowing out).</p>
+<p>Contact is a basic water flow connector, which consists of water pressure, mass flow rate,
+and elevation at the connector (positive if water is flowing into connector and negative if flowing out).</p>
+
+<h5>Variables</h5>
+<ul>
+<li><code>p</code> &ndash; Pressure (potential variable, equated across connections)</li>
+<li><code>mdot</code> &ndash; Mass flow rate (flow variable, summed to zero across connections)</li>
+<li><code>z</code> &ndash; Elevation (potential variable, equated across connections).
+Each component provides an equation relating its connector elevations,
+enabling automatic propagation of absolute elevation through the system.
+Source components (e.g., Reservoir) set the absolute reference elevation.</li>
+</ul>
 </html>"));
 end Contact;
diff --git a/OpenHPL/Waterway/BendPipe.mo b/OpenHPL/Waterway/BendPipe.mo
@@ -23,6 +23,7 @@ equation
   o.p = i.p - dp "Pressure of the output connector";
   i.mdot + o.mdot = 0 "Mass balance";
   mdot = i.mdot "Flow direction";
+  o.z = i.z "Elevation propagation: no height change across bend";
   annotation (preferredView="info",
     Documentation(info="<html>
 <p>Usually minor head losses in pipes are considered 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.</p>
diff --git a/OpenHPL/Waterway/DraftTube.mo b/OpenHPL/Waterway/DraftTube.mo
@@ -153,6 +153,7 @@ equation
   p_o = o.p;
   i.mdot+o.mdot=0;
   mdot = i.mdot;
+  o.z = i.z - H "Elevation propagation: outlet is H below inlet";
   annotation (preferredView="info", Documentation(info="<html>
     <p>Two of the draft tubes are modeled using <em>Momentum balance</em>.
     They are:</p>
diff --git a/OpenHPL/Waterway/Fitting.mo b/OpenHPL/Waterway/Fitting.mo
@@ -53,6 +53,7 @@ equation
   o.p = i.p - dp "Pressure of the output connector";
   i.mdot+o.mdot = 0 "Mass balance";
   mdot = i.mdot "Flow direction";
+  o.z = i.z "Elevation propagation: no height change across fitting";
   annotation (preferredView="info",
     Documentation(info="<html>
     <p>Various possibilities of the fittings for the pipes with different diameters
diff --git a/OpenHPL/Waterway/Gate.mo b/OpenHPL/Waterway/Gate.mo
@@ -51,6 +51,7 @@ equation
   mdot = Vdot * data.rho "Mass flow rate through the gate";
   i.p = h_0 * data.g * data.rho + data.p_a "Inlet water pressure";
   o.p = h_2 * data.g * data.rho + data.p_a "Outlet water pressure";
+  o.z = i.z "Elevation propagation: gate at same elevation";
   annotation (
     preferredView="info",
     Documentation(info="<html>
diff --git a/OpenHPL/Waterway/Gate_HR.mo b/OpenHPL/Waterway/Gate_HR.mo
@@ -50,6 +50,7 @@ equation
   mdot = Vdot * data.rho "Mass flow rate through the gate";
   i.p = h_i * data.g * data.rho + data.p_a "Inlet water pressure";
   o.p = h_o * data.g * data.rho + data.p_a "Outlet water pressure";
+  o.z = i.z "Elevation propagation: gate at same elevation";
   annotation (
     preferredView="info",
     Documentation(info="<html>
diff --git a/OpenHPL/Waterway/OpenChannel.mo b/OpenHPL/Waterway/OpenChannel.mo
@@ -39,6 +39,7 @@ equation
 // presurre boundaries
   i.p = h[1] * data.g * data.rho + data.p_a;
   o.p = h[N] * data.g * data.rho + data.p_a;
+  o.z = i.z - (H[1] - H[2]) "Elevation propagation: channel bed drops from H[1] to H[2]";
   annotation (preferredView="info",
     Documentation(info="<html>
 <p style=\"color: #ff0000;\"><em>Note: Currently under investigation for plausibility.</em></p>
diff --git a/OpenHPL/Waterway/Penstock.mo b/OpenHPL/Waterway/Penstock.mo
@@ -83,6 +83,7 @@ equation
   // volumetric flow rates for all cells
   V_p_out = mdot ./ rho_m;
   V_p_out_end = mdot_V / (data.rho * (1 + data.beta * (p_o - data.p_a)));
+  o.z = i.z - H "Outlet elevation is H below inlet";
   annotation (preferredView="info",
     Documentation(info="<html><head></head><body><p>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.)</p><p>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:</p>
 <p><img src=\"modelica://OpenHPL/Resources/Images/pipe.svg\"></p>
diff --git a/OpenHPL/Waterway/PenstockKP.mo b/OpenHPL/Waterway/PenstockKP.mo
@@ -115,6 +115,7 @@ equation
   S_[N + 1:2 * N] = F_ap * data.g * H / L - F_f / dx;
   // diff. equation
   der(U) = KP.diff_eq;
+  o.z = i.z - H "Outlet elevation is H below inlet";
   annotation (preferredView="info",
     Documentation(info="<html>
 <h4>Elastic Penstock with KP Method</h4>
diff --git a/OpenHPL/Waterway/Pipe.mo b/OpenHPL/Waterway/Pipe.mo
@@ -73,6 +73,7 @@ equation
   p_o = o.p "Outlet pressure";
   i.mdot+o.mdot = 0 "Mass balance";
   mdot = i.mdot "Inlet direction for mdot";
+  o.z = i.z - H "Elevation propagation: outlet is H below inlet";
 
   annotation (preferredView="info",
     Documentation(info="<html>
diff --git a/OpenHPL/Waterway/Reservoir.mo b/OpenHPL/Waterway/Reservoir.mo
@@ -4,6 +4,8 @@ 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 constantLevel=false "If checked, the reservoir keeps the constant water level h_0"
     annotation (
     Dialog(group="Setup", enable=not (useInflow or useLevel)),
@@ -77,6 +79,7 @@ equation
   end if;
 
    o.mdot = -data.rho * Vdot_o "Output flow connector";
+  o.z = z_0 "Set absolute elevation at outlet";
   //o.T = T_0 "TBD: Output temperature connector";
   annotation (preferredView="info", Documentation(info="<html>
 <h4>Reservoir Model</h4>
diff --git a/OpenHPL/Waterway/ReservoirChannel.mo b/OpenHPL/Waterway/ReservoirChannel.mo
@@ -11,6 +11,8 @@ model ReservoirChannel "Reservoir model based on open channel model"
   parameter SI.Height H[2] = {2, 2} "Reservoir bed height from left and right side";
   // initialization
   parameter SI.Height h_0=50 "Initial water level of the reservoir";
+  parameter SI.Height z_0=0 "Elevation of the reservoir outlet"
+    annotation (Dialog(group="Geometry"));
   // condition of steady state
   parameter Boolean SteadyState=data.SteadyState "If true, starts in steady state";
   // variables
@@ -30,6 +32,7 @@ equation
   // boundaries
   o.mdot =-q*W*data.rho;
   o.p = data.p_a + data.rho * data.g * openChannel.h[N];
+  o.z = z_0 "Set absolute elevation at outlet";
   annotation (
     Documentation(preferredView="info", info="<html>
 <h4>Reservoir Channel Model</h4>
diff --git a/OpenHPL/Waterway/SurgeTank.mo b/OpenHPL/Waterway/SurgeTank.mo
@@ -148,7 +148,14 @@ equation
     end if;
     p_t = data.p_a;
   end if;
-
+  mdot = data.rho * Vdot;
+  Mdot = mdot * v;
+  F = F_p - F_f - F_g;
+  p_b = i.p "Linking bottom node pressure to connector";
+  i.p = o.p "Inlet and outlet pressure equality";
+  mdot = i.mdot+o.mdot "Mass balance";
+  F_g = m * data.g * cos_theta;
+  o.z = i.z "Elevation at surge tank inlet and outlet are equal";
  annotation (preferredView="info",
     Documentation(info="<html>
 <h4>Surge Tank Model</h4>
diff --git a/OpenHPL/Waterway/VolumeFlowSource.mo b/OpenHPL/Waterway/VolumeFlowSource.mo
@@ -11,6 +11,8 @@ 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"));
 
   Interfaces.Contact_o o "Outlet flow connector"
     annotation (Placement(transformation(extent={{90,-10},{110,10}})));
@@ -36,6 +38,7 @@ equation
       color={0,0,127},
       pattern=LinePattern.Dot));
   o.mdot = -data.rho*Vdot;
+  o.z = z_0 "Set absolute elevation at outlet";
   connect(constantVolumeFlow.y, Vdot) annotation (Line(points={{-39,40},{40,40},{40,0},{80,0}}, color={0,0,127}));
   connect(firstOrder.u, outFlow) annotation (Line(
       points={{-62,-20},{-80,-20},{-80,0},{-120,0}},
