Removing unneeded variables and dummy annotation changes.

dietmarw · dietmarw · commit 3fe98423a201 · 2025-12-21T19:44:55.000+01:00
diff --git a/OpenHPL/Examples/Simple.mo b/OpenHPL/Examples/Simple.mo
@@ -33,7 +33,7 @@ model Simple "Model of a hydropower system with a simple turbine turbine"
         extent={{-10,-10},{10,10}})));
 equation
   connect(turbine.o, discharge.i) annotation (Line(points={{40,10},{44,10},{44,0},{50,0}}, color={28,108,200}));
-  connect(control.y, turbine.u_t) annotation (Line(points={{1,70},{16,70},{16,40},{22,40}, {22, 22}},
+  connect(control.y, turbine.u_t) annotation (Line(points={{1,70},{16,70},{16,40},{22,40},{22,22}},
                                                                                     color={0,0,127}));
   connect(penstock.o, turbine.i) annotation (Line(points={{10,30},{14.95,30},{14.95,10},{20,10}}, color={28,108,200}));
   connect(reservoir.o, intake.i) annotation (
diff --git a/OpenHPL/Waterway/SurgeTank.mo b/OpenHPL/Waterway/SurgeTank.mo
@@ -39,7 +39,7 @@ model SurgeTank "Model of the surge tank/shaft"
   //parameter SI.Temperature T_i = data.T_i "Initial water temperature in the pipe" annotation (Dialog(group = "Initialization", enable = TempUse));
   // variables
   SI.Mass m "Water mass";
-  SI.Mass mdot "Mass flow rate";
+  SI.MassFlowRate mdot "Mass flow rate";
   SI.Mass m_a = p_ac*A*(L-h_0/cos_theta)*data.M_a/(Modelica.Constants.R*T_ac) "Air mass inside surge tank";
   SI.Momentum M "Water momentum";
   SI.Force Mdot "Difference in influent and effulent momentum";
@@ -54,7 +54,6 @@ model SurgeTank "Model of the surge tank/shaft"
   SI.Force F_g "Gravity force";
   SI.Pressure p_t "Pressure at top of the surge tank";
   SI.Pressure p_b "Pressure at bottom of the surge tank";
-  SI.Pressure p_n "Pressure at node or manifold of the surge tank";
   Real phiSO "Dimensionless factor based on the type of fitting ";
   // initial values for differential variables
   SI.Height h(start = h_0) "Water height in the surge tank";
@@ -131,10 +130,9 @@ equation
   mdot = data.rho * Vdot;
   Mdot = mdot * v;
   F = F_p - F_f - F_g;
-  p_b = p_n "Linking bottom node pressure to connector";
-  p_n = i.p "Surgetank manifold pressure";
+  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"; 
+  mdot = i.mdot+o.mdot "Mass balance";
   F_g = m * data.g * cos_theta;
  annotation (
     Documentation(info="<html>
