OpenSimHub · boerrebj · Feb 11, 2026 · Feb 17, 2026 · Feb 11, 2026 · Feb 26, 2026
diff --git a/OpenHPL/ElectroMech/Turbines/EmpiricalTurbine.mo b/OpenHPL/ElectroMech/Turbines/EmpiricalTurbine.mo
@@ -0,0 +1,49 @@
+within OpenHPL.ElectroMech.Turbines;
+model EmpiricalTurbine
+  parameter SI.Height H_n = 100 "Nominal net head" annotation (Dialog(group = "Nominal values"));
+  parameter SI.Power P_n (displayUnit = "MW")= 1.e+06 "Nominal power"  annotation (Dialog(group = "Nominal values"));
+  extends OpenHPL.ElectroMech.BaseClasses.TorqueEquation;
+  extends OpenHPL.Interfaces.TurbineContacts;
+  extends OpenHPL.Icons.Turbine;
+
+  SI.VolumeFlowRate Vdot "Turbine flow rate";
+  SI.Pressure dp "Pressure drop"; 
+  SI.Torque Tt "Turbine torque";
+  Modelica.Blocks.Sources.RealExpression realExpression(y=Tt) annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
+
+  protected
+  constant Real eps=1.0e-08;
+  parameter SI.Density rho=data.rho;
+  parameter SI.Acceleration g=data.g;
+  constant Real eta0=0.90 "Full load efficiency. Hard coded at the moment. Can be parametrized in the future";
+  parameter SI.VolumeFlowRate Vdot_n=P_n/(eta0*rho*g*H_n) "Nominal discharge";
+  parameter SI.Torque Tt_n=P_n/(2*C.pi*nrps_n) "Noninal turbine torque";
+
+  parameter Real NQE=4.0*H_n^(-2./3.) "Specific speed based on empirical relartion";
+  parameter Real kappa=1.351-0.857*NQE;
+  parameter Real nRA=1.5+NQE*5 "Normalized runaway speed us function of specific speed";
+  parameter Real dQdn=0.4222+0.3179*Modelica.Math.log(NQE);
+  parameter SI.Frequency nrps_n=2*data.f_grid/p "Nominal turbine speed [rps]";
+  SI.Frequency nrps=speedSensor.w/(2*C.pi) "Rotational speed (in revolutions per seconds)";
+  parameter Real Ct =Vdot_n/sqrt(H_n*g*rho) "Nominal turbine coefficient";
+  constant Real alpha=1.5;
+  constant Real beta=3.5;
+  constant Real epsilon = 5.0e-5 "Constant to ensure robust expression for dp vs flow. Trial and error to find suitable value.";
+equation
+  i.mdot + o.mdot = 0;
+  i.mdot = Vdot*rho;
+  dp = i.p - o.p;
+
+  Vdot*abs(Vdot)= dp*(Ct*max(epsilon, abs(u_t)^alpha)*(1+dQdn*(max(nrps/(nrps_n*nRA),epsilon)^beta)))^2;
+  Tt=Tt_n*(dp/(H_n*(rho*g)))*(Vdot/Vdot_n)*(1-(nrps/(nrps_n*nRA*1.2))^5);
+  connect(realExpression.y, torque.tau) annotation (Line(points={{-49,0},{-37.2,0}}, color={0,0,127}));
+annotation (
+    Documentation(info = "<html><head></head><body><p>Simplified empirical turbine model for single-regulated reaction turbine (Francis and propeller turbine). The turbine is specified by giving the nominal head H_n and nominale power P_n. All remaining values are determined from empirical relations. The throtling effect of high head Francis turbines is included in the model. However, the exact characteristics should be treated with caution and will need more empirical tuning in future releases.
+
+</p><p align=\"center\">
+<img src=\"modelica://OpenHPL/Resources/Images/EmpiricalTurbine.svg\">
+</p>
+<p><em>Figure: Example of throtling effect for a high head Francis unit. Discharge as function of speed (pu).</em></p>
+
+<p></p></body></html>"));
+end EmpiricalTurbine;
diff --git a/OpenHPL/ElectroMech/Turbines/package.order b/OpenHPL/ElectroMech/Turbines/package.order
@@ -1,3 +1,4 @@
 Turbine
 Francis
 Pelton
+EmpiricalTurbine
diff --git a/OpenHPL/Resources/Images/EmpiricalTurbine.svg b/OpenHPL/Resources/Images/EmpiricalTurbine.svg
diff --git a/OpenHPLTest/CaseStudingValentynasCase.mo → ...Test/Archive/CaseStudingValentynasCase.mo b/OpenHPLTest/CaseStudingValentynasCase.mo → ...Test/Archive/CaseStudingValentynasCase.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model CaseStudingValentynasCase "HP system model for Valentyna's Master case"
   extends Modelica.Icons.Example;
   Real coef2, coef3;

diff --git a/OpenHPLTest/HPAllTypeFittingsTest.mo → OpenHPLTest/Archive/HPAllTypeFittingsTest.mo b/OpenHPLTest/HPAllTypeFittingsTest.mo → OpenHPLTest/Archive/HPAllTypeFittingsTest.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPAllTypeFittingsTest "Test for comparing fitting behaviour"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir headWater(h_0=10) annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));

diff --git a/OpenHPLTest/HPBjarneBorresen.mo → OpenHPLTest/Archive/HPBjarneBorresen.mo b/OpenHPLTest/HPBjarneBorresen.mo → OpenHPLTest/Archive/HPBjarneBorresen.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPBjarneBorresen "Model of HP system with simplified models for penstock, turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=503 - 499.5) annotation (Placement(transformation(

diff --git a/OpenHPLTest/HPDraftTube.mo → OpenHPLTest/Archive/HPDraftTube.mo b/OpenHPLTest/HPDraftTube.mo → OpenHPLTest/Archive/HPDraftTube.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPDraftTube "Testing the draft tube models."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=48) annotation (Placement(transformation(

diff --git a/OpenHPLTest/HPElasticKPPenstock.mo → OpenHPLTest/Archive/HPElasticKPPenstock.mo b/OpenHPLTest/HPElasticKPPenstock.mo → OpenHPLTest/Archive/HPElasticKPPenstock.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPElasticKPPenstock "Model of HP system with elastic penctock (KP), but simplified models for turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=48) annotation (Placement(transformation(origin={-92,66}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPElasticKPPenstockANDIntake.mo → ...t/Archive/HPElasticKPPenstockANDIntake.mo b/OpenHPLTest/HPElasticKPPenstockANDIntake.mo → ...t/Archive/HPElasticKPPenstockANDIntake.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPElasticKPPenstockANDIntake "Model of HP system with elastic penctock and intake (KP), but simplified models for turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=48) annotation (Placement(transformation(origin={-92,66}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPElasticKPPenstockCompres.mo → ...est/Archive/HPElasticKPPenstockCompres.mo b/OpenHPLTest/HPElasticKPPenstockCompres.mo → ...est/Archive/HPElasticKPPenstockCompres.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPElasticKPPenstockCompres "Model of HP system with elastic penctock (KP), but simplified models for turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=48) annotation (Placement(transformation(origin={-92,66}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPElasticKPPenstockFrancis.mo → ...est/Archive/HPElasticKPPenstockFrancis.mo b/OpenHPLTest/HPElasticKPPenstockFrancis.mo → ...est/Archive/HPElasticKPPenstockFrancis.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPElasticKPPenstockFrancis "HP system model with Francis turbine and elastic penstock"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=48) annotation (Placement(transformation(origin={-92,66}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPElasticKPPenstockFrancisGov.mo → .../Archive/HPElasticKPPenstockFrancisGov.mo b/OpenHPLTest/HPElasticKPPenstockFrancisGov.mo → .../Archive/HPElasticKPPenstockFrancisGov.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPElasticKPPenstockFrancisGov "HP system model with Francis turbine and elastic penstock and governor"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=48) annotation (Placement(transformation(origin={-92,66}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPElasticKPPenstockHalfSurgeD.mo → .../Archive/HPElasticKPPenstockHalfSurgeD.mo b/OpenHPLTest/HPElasticKPPenstockHalfSurgeD.mo → .../Archive/HPElasticKPPenstockHalfSurgeD.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPElasticKPPenstockHalfSurgeD "Similar to previous HP system, but with twice reduced surge tank diameter"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir annotation (Placement(transformation(origin={-92,66}, extent={{-10,-10},{10,10}})));

diff --git a/...PLTest/HPElasticKPPenstockWithoutSurge.mo → ...rchive/HPElasticKPPenstockWithoutSurge.mo b/...PLTest/HPElasticKPPenstockWithoutSurge.mo → ...rchive/HPElasticKPPenstockWithoutSurge.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPElasticKPPenstockWithoutSurge "Model of HP system without surge tank and with elastic penctock (KP), but simplified models for turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=48) annotation (Placement(transformation(origin={-90,62}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPLinTest.mo → OpenHPLTest/Archive/HPLinTest.mo b/OpenHPLTest/HPLinTest.mo → OpenHPLTest/Archive/HPLinTest.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPLinTest
   extends Modelica.Icons.Example;
   OpenHPLTest.HPLiniarizationKPFran hpl;

diff --git a/OpenHPLTest/HPLiniarization.mo → OpenHPLTest/Archive/HPLiniarization.mo b/OpenHPLTest/HPLiniarization.mo → OpenHPLTest/Archive/HPLiniarization.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPLiniarization "Simple HP system model for liniarization"
   extends Modelica.Icons.Example;
   input Real u(start = 0.7493);

diff --git a/OpenHPLTest/HPLiniarization2.mo → OpenHPLTest/Archive/HPLiniarization2.mo b/OpenHPLTest/HPLiniarization2.mo → OpenHPLTest/Archive/HPLiniarization2.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPLiniarization2 "Simple HP system model for liniarization"
   extends Modelica.Icons.Example;
   input Real u(start = 0.7493);

diff --git a/OpenHPLTest/HPLiniarization3.mo → OpenHPLTest/Archive/HPLiniarization3.mo b/OpenHPLTest/HPLiniarization3.mo → OpenHPLTest/Archive/HPLiniarization3.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPLiniarization3 "Simple HP system model for liniarization"
   extends Modelica.Icons.Example;
   input Real u(start = 0.7493);

diff --git a/OpenHPLTest/HPLiniarization4.mo → OpenHPLTest/Archive/HPLiniarization4.mo b/OpenHPLTest/HPLiniarization4.mo → OpenHPLTest/Archive/HPLiniarization4.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPLiniarization4 "Simple HP system model for liniarization"
   extends Modelica.Icons.Example;
   input Real u(start = 0.7493);

diff --git a/OpenHPLTest/HPLiniarizationFranGen.mo → ...HPLTest/Archive/HPLiniarizationFranGen.mo b/OpenHPLTest/HPLiniarizationFranGen.mo → ...HPLTest/Archive/HPLiniarizationFranGen.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPLiniarizationFranGen "HP system model for liniarization with Francis turbine + generator"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Pipe intake(H=23, Vdot_0=18.5952) annotation (Placement(transformation(extent={{-72,50},{-52,70}})));

diff --git a/OpenHPLTest/HPLiniarizationGenIPSL.mo → ...HPLTest/Archive/HPLiniarizationGenIPSL.mo b/OpenHPLTest/HPLiniarizationGenIPSL.mo → ...HPLTest/Archive/HPLiniarizationGenIPSL.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPLiniarizationGenIPSL "Synergy with OpenIPSL library(generator + governor)"
   extends Modelica.Icons.Example;
   input Real u = 0.574;

diff --git a/OpenHPLTest/HPLiniarizationGenIPSLKP.mo → ...LTest/Archive/HPLiniarizationGenIPSLKP.mo b/OpenHPLTest/HPLiniarizationGenIPSLKP.mo → ...LTest/Archive/HPLiniarizationGenIPSLKP.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPLiniarizationGenIPSLKP "Synergy with OpenIPSL library(generator + governor)"
   extends Modelica.Icons.Example;
   input Real u = 0.574;

diff --git a/OpenHPLTest/HPLiniarizationKP.mo → OpenHPLTest/Archive/HPLiniarizationKP.mo b/OpenHPLTest/HPLiniarizationKP.mo → OpenHPLTest/Archive/HPLiniarizationKP.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPLiniarizationKP "HP system model for liniarization with elastic penstock (KP)"
   extends Modelica.Icons.Example;
   input Real u(start = 0.7493);

diff --git a/OpenHPLTest/HPLiniarizationKPFran.mo → OpenHPLTest/Archive/HPLiniarizationKPFran.mo b/OpenHPLTest/HPLiniarizationKPFran.mo → OpenHPLTest/Archive/HPLiniarizationKPFran.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPLiniarizationKPFran "HP system model for liniarization with elastic penstock (KP) + Francis turbine + generator"
   extends Modelica.Icons.Example;
   input Real u;

diff --git a/OpenHPLTest/HPModel.mo → OpenHPLTest/Archive/HPModel.mo b/OpenHPLTest/HPModel.mo → OpenHPLTest/Archive/HPModel.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPModel
   inner OpenHPL.Data data;
   import Modelica.Constants.pi;

diff --git a/OpenHPLTest/HPModelDEA.mo → OpenHPLTest/Archive/HPModelDEA.mo b/OpenHPLTest/HPModelDEA.mo → OpenHPLTest/Archive/HPModelDEA.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPModelDEA
   inner OpenHPL.Data data;
   import Modelica.Constants.pi;

diff --git a/OpenHPLTest/HPModelKPLin.mo → OpenHPLTest/Archive/HPModelKPLin.mo b/OpenHPLTest/HPModelKPLin.mo → OpenHPLTest/Archive/HPModelKPLin.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPModelKPLin
   parameter Integer n = 24;
   // states

diff --git a/OpenHPLTest/HPModelKPLinPI.mo → OpenHPLTest/Archive/HPModelKPLinPI.mo b/OpenHPLTest/HPModelKPLinPI.mo → OpenHPLTest/Archive/HPModelKPLinPI.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPModelKPLinPI
   HPLiniarizationKP hpKP;
   parameter Real Kp = 0.1;

diff --git a/OpenHPLTest/HPModelLin.mo → OpenHPLTest/Archive/HPModelLin.mo b/OpenHPLTest/HPModelLin.mo → OpenHPLTest/Archive/HPModelLin.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPModelLin
   parameter Integer n = 5;
   // states

diff --git a/OpenHPLTest/HPModelLinPI.mo → OpenHPLTest/Archive/HPModelLinPI.mo b/OpenHPLTest/HPModelLinPI.mo → OpenHPLTest/Archive/HPModelLinPI.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPModelLinPI
   HPModelLin hplin;
   HPLiniarization hp;

diff --git a/OpenHPLTest/HPModelManLin.mo → OpenHPLTest/Archive/HPModelManLin.mo b/OpenHPLTest/HPModelManLin.mo → OpenHPLTest/Archive/HPModelManLin.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPModelManLin
   inner OpenHPL.Data data;
   import Modelica.Constants.pi;

diff --git a/OpenHPLTest/HPModelObserv.mo → OpenHPLTest/Archive/HPModelObserv.mo b/OpenHPLTest/HPModelObserv.mo → OpenHPLTest/Archive/HPModelObserv.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPModelObserv
   inner OpenHPL.Data data;
   import Modelica.Constants.pi;

diff --git a/OpenHPLTest/HPModelObservSim.mo → OpenHPLTest/Archive/HPModelObservSim.mo b/OpenHPLTest/HPModelObservSim.mo → OpenHPLTest/Archive/HPModelObservSim.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPModelObservSim
   inner OpenHPL.Data data;
   //HPModel hpmod;

diff --git a/OpenHPLTest/HPSTAirCushion.mo → OpenHPLTest/Archive/HPSTAirCushion.mo b/OpenHPLTest/HPSTAirCushion.mo → OpenHPLTest/Archive/HPSTAirCushion.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSTAirCushion
   "Model of waterway of the HP system with simplified models for conduits, turbine, etc."
   extends Modelica.Icons.Example;

diff --git a/OpenHPLTest/HPSTSharpOrifice.mo → OpenHPLTest/Archive/HPSTSharpOrifice.mo b/OpenHPLTest/HPSTSharpOrifice.mo → OpenHPLTest/Archive/HPSTSharpOrifice.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSTSharpOrifice
   "Model of waterway of the HP system with simplified models for conduits, turbine, etc."
   extends Modelica.Icons.Example;

diff --git a/OpenHPLTest/HPSTSimple.mo → OpenHPLTest/Archive/HPSTSimple.mo b/OpenHPLTest/HPSTSimple.mo → OpenHPLTest/Archive/HPSTSimple.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSTSimple
   "Model of waterway of the HP system with simplified models for conduits, turbine, etc."
   extends Modelica.Icons.Example;

diff --git a/OpenHPLTest/HPSTThrottleValve.mo → OpenHPLTest/Archive/HPSTThrottleValve.mo b/OpenHPLTest/HPSTThrottleValve.mo → OpenHPLTest/Archive/HPSTThrottleValve.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSTThrottleValve
   "Model of waterway of the HP system with simplified models for conduits, turbine, etc."
   extends Modelica.Icons.Example;

diff --git a/OpenHPLTest/HPSimpleElasticPenstock.mo → ...PLTest/Archive/HPSimpleElasticPenstock.mo b/OpenHPLTest/HPSimpleElasticPenstock.mo → ...PLTest/Archive/HPSimpleElasticPenstock.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimpleElasticPenstock "Model of HP system with elastic penctock (StagardGrid), but simplified models for turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=48) annotation (Placement(transformation(origin={-90,62}, extent={{-10,-10},{10,10}})));

diff --git a/...st/HPSimpleElasticPenstockWithoutSurge.mo → ...ve/HPSimpleElasticPenstockWithoutSurge.mo b/...st/HPSimpleElasticPenstockWithoutSurge.mo → ...ve/HPSimpleElasticPenstockWithoutSurge.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimpleElasticPenstockWithoutSurge "Model of HP system without surge tank and with elastic penctock (StagardGrid), but simplified models for turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir annotation (Placement(transformation(origin={-90,62}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPSimplePenstockAutoRefGate.mo → ...st/Archive/HPSimplePenstockAutoRefGate.mo b/OpenHPLTest/HPSimplePenstockAutoRefGate.mo → ...st/Archive/HPSimplePenstockAutoRefGate.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimplePenstockAutoRefGate
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir annotation (Placement(transformation(origin={-92,62}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPSimplePenstockControl.mo → ...PLTest/Archive/HPSimplePenstockControl.mo b/OpenHPLTest/HPSimplePenstockControl.mo → ...PLTest/Archive/HPSimplePenstockControl.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimplePenstockControl "Model of HP system with governor"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir annotation (Placement(transformation(origin={-92,62}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPSimplePenstockFrancis.mo → ...PLTest/Archive/HPSimplePenstockFrancis.mo b/OpenHPLTest/HPSimplePenstockFrancis.mo → ...PLTest/Archive/HPSimplePenstockFrancis.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimplePenstockFrancis "HP system model with Francis turbine"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir annotation (Placement(transformation(origin={-92,62}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPSimplePenstockFrancis2.mo → ...LTest/Archive/HPSimplePenstockFrancis2.mo b/OpenHPLTest/HPSimplePenstockFrancis2.mo → ...LTest/Archive/HPSimplePenstockFrancis2.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimplePenstockFrancis2 "HP system model with Francis turbine and generator"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=48) annotation (Placement(transformation(origin={-92,62}, extent={{-10,-10},{10,10}})));

diff --git a/...HPLTest/HPSimplePenstockFrancisGenIPSL.mo → ...Archive/HPSimplePenstockFrancisGenIPSL.mo b/...HPLTest/HPSimplePenstockFrancisGenIPSL.mo → ...Archive/HPSimplePenstockFrancisGenIPSL.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimplePenstockFrancisGenIPSL "Synergy with OpenIPSL library(generator)"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=48) annotation (Placement(transformation(

diff --git a/...Test/HPSimplePenstockFrancisGenIPSLGov.mo → ...hive/HPSimplePenstockFrancisGenIPSLGov.mo b/...Test/HPSimplePenstockFrancisGenIPSLGov.mo → ...hive/HPSimplePenstockFrancisGenIPSLGov.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimplePenstockFrancisGenIPSLGov "Synergy with OpenIPSL library(generator + governor)"
   //input Real u;
   extends Modelica.Icons.Example;

diff --git a/...t/HPSimplePenstockFrancisGenIPSLInfBus.mo → ...e/HPSimplePenstockFrancisGenIPSLInfBus.mo b/...t/HPSimplePenstockFrancisGenIPSLInfBus.mo → ...e/HPSimplePenstockFrancisGenIPSLInfBus.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimplePenstockFrancisGenIPSLInfBus "Synergy with OpenIPSL library(generator + infinitBus)"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=48) annotation (Placement(transformation(origin={-92,62}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPSimplePenstockFrancisGener.mo → ...t/Archive/HPSimplePenstockFrancisGener.mo b/OpenHPLTest/HPSimplePenstockFrancisGener.mo → ...t/Archive/HPSimplePenstockFrancisGener.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimplePenstockFrancisGener "HP system model with Francis turbine and generator"
   extends Modelica.Icons.Example;
   Real coef;

diff --git a/OpenHPLTest/HPSimplePenstockGeneratorTest.mo → .../Archive/HPSimplePenstockGeneratorTest.mo b/OpenHPLTest/HPSimplePenstockGeneratorTest.mo → .../Archive/HPSimplePenstockGeneratorTest.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimplePenstockGeneratorTest "Generator testing for HP"
   extends Modelica.Icons.Example;
   import Modelica.Constants.pi;

diff --git a/OpenHPLTest/HPSimplePenstockOpenChannel.mo → ...st/Archive/HPSimplePenstockOpenChannel.mo b/OpenHPLTest/HPSimplePenstockOpenChannel.mo → ...st/Archive/HPSimplePenstockOpenChannel.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimplePenstockOpenChannel "testing open channel"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir annotation (Placement(transformation(origin={-90,44}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPSimplePenstockPelton.mo → ...HPLTest/Archive/HPSimplePenstockPelton.mo b/OpenHPLTest/HPSimplePenstockPelton.mo → ...HPLTest/Archive/HPSimplePenstockPelton.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimplePenstockPelton "HP system model with Pelton turbine"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=48) annotation (Placement(transformation(origin={-92,62}, extent={{-10,-10},{10,10}})));

diff --git a/OpenHPLTest/HPSimplePenstockResKP.mo → OpenHPLTest/Archive/HPSimplePenstockResKP.mo b/OpenHPLTest/HPSimplePenstockResKP.mo → OpenHPLTest/Archive/HPSimplePenstockResKP.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSimplePenstockResKP "Model of HP system with using reservoir model based on open channel"
   extends Modelica.Icons.Example;
   Modelica.Blocks.Sources.Ramp control(duration = 1, height = -0.04615, offset = 0.7493, startTime = 600) annotation (

diff --git a/OpenHPLTest/HPSquareFittingsTest.mo → OpenHPLTest/Archive/HPSquareFittingsTest.mo b/OpenHPLTest/HPSquareFittingsTest.mo → OpenHPLTest/Archive/HPSquareFittingsTest.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPSquareFittingsTest "Test for comparing fitting behaviour"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir headWater(h_0=10) annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));

diff --git a/OpenHPLTest/HPTaperedFittingsTest.mo → OpenHPLTest/Archive/HPTaperedFittingsTest.mo b/OpenHPLTest/HPTaperedFittingsTest.mo → OpenHPLTest/Archive/HPTaperedFittingsTest.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HPTaperedFittingsTest "Test for comparing fitting behaviour"
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir headWater(h_0=10) annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));

diff --git a/...LTest/HydroCordModeKPlFrancisDraftTube.mo → ...chive/HydroCordModeKPlFrancisDraftTube.mo b/...LTest/HydroCordModeKPlFrancisDraftTube.mo → ...chive/HydroCordModeKPlFrancisDraftTube.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HydroCordModeKPlFrancisDraftTube "Model of HP system with simplified models for penstock, turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=46.5, UseInFlow=false) annotation (Placement(transformation(

diff --git a/OpenHPLTest/HydroCordModel.mo → OpenHPLTest/Archive/HydroCordModel.mo b/OpenHPLTest/HydroCordModel.mo → OpenHPLTest/Archive/HydroCordModel.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HydroCordModel "Model of HP system with simplified models for penstock, turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=418.5 - 372, UseInFlow=false) annotation (Placement(transformation(

diff --git a/OpenHPLTest/HydroCordModel2.mo → OpenHPLTest/Archive/HydroCordModel2.mo b/OpenHPLTest/HydroCordModel2.mo → OpenHPLTest/Archive/HydroCordModel2.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HydroCordModel2 "Model of HP system with simplified models for penstock, turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=418.5 - 372, UseInFlow=false) annotation (Placement(transformation(

diff --git a/OpenHPLTest/HydroCordModelDraftTube.mo → ...PLTest/Archive/HydroCordModelDraftTube.mo b/OpenHPLTest/HydroCordModelDraftTube.mo → ...PLTest/Archive/HydroCordModelDraftTube.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HydroCordModelDraftTube "Model of HP system with simplified models for penstock, turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=418.5 - 372, UseInFlow=false) annotation (Placement(transformation(

diff --git a/OpenHPLTest/HydroCordModelDraftTube2.mo → ...LTest/Archive/HydroCordModelDraftTube2.mo b/OpenHPLTest/HydroCordModelDraftTube2.mo → ...LTest/Archive/HydroCordModelDraftTube2.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HydroCordModelDraftTube2 "Model of HP system with simplified models for penstock, turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=418.5 - 372, UseInFlow=false) annotation (Placement(transformation(

diff --git a/OpenHPLTest/HydroCordModelDraftTube3.mo → ...LTest/Archive/HydroCordModelDraftTube3.mo b/OpenHPLTest/HydroCordModelDraftTube3.mo → ...LTest/Archive/HydroCordModelDraftTube3.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HydroCordModelDraftTube3 "Model of HP system with simplified models for penstock, turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=418.5 - 372, UseInFlow=false) annotation (Placement(transformation(

diff --git a/OpenHPLTest/HydroCordModelFrancis.mo → OpenHPLTest/Archive/HydroCordModelFrancis.mo b/OpenHPLTest/HydroCordModelFrancis.mo → OpenHPLTest/Archive/HydroCordModelFrancis.mo
@@ -1,4 +1,4 @@
-within OpenHPLTest;
+within OpenHPLTest.Archive;
 model HydroCordModelFrancis "Model of HP system with simplified models for penstock, turbine, etc."
   extends Modelica.Icons.Example;
   OpenHPL.Waterway.Reservoir reservoir(h_0=46.5, UseInFlow=false) annotation (Placement(transformation(