Move the TwoContacts out of the TurbineContacts

Author: dietmarw

OpenHPL/ElectroMech/Turbines/Francis.mo

@@ -79,6 +79,7 @@ model Francis "Model of the Francis turbine"
     Real W_t2_n "Euler second term, nominal", W_t1_n "Euler first term, nominal", Wdot_t_n "Total power, nominal", cot_a1_n "Cotant nominal alpha", Vdot_n_ = Vdot_n / 0.99 "Flow rate for fully open guide vane", d_n(start = 0.67) "Nominal servo term", theta_n "Servo angle for fully open guide vane";
     SI.Angle alpha1_n "Nominal inlet guide vane angle";
     // connectors
+    extends OpenHPL.Interfaces.TwoContacts;
     extends OpenHPL.Interfaces.TurbineContacts(enable_P_out=true);
     Modelica.Blocks.Interfaces.RealInput w_in "Input angular velocity from the generator" annotation (
                                 Placement(transformation(origin={-120,-80}, extent={{-20,-20},

OpenHPL/ElectroMech/Turbines/Pelton.mo

@@ -21,6 +21,7 @@ model Pelton "Model of the Pelton turbine"
     SI.AngularVelocity w=w_in "Angular velocity";
     Real cos_b = Modelica.Math.cos(Modelica.Units.Conversions.from_deg(beta));
     // connectors
+    extends OpenHPL.Interfaces.TwoContacts;
     extends OpenHPL.Interfaces.TurbineContacts(enable_P_out=true);
     Modelica.Blocks.Interfaces.RealInput w_in "Input angular velocity from the generator" annotation (
                                 Placement(transformation(origin={-120,-80}, extent={{-20,-20},

OpenHPL/Interfaces/TurbineContacts.mo

@@ -1,6 +1,5 @@
 within OpenHPL.Interfaces;
 partial model TurbineContacts "Model of turbine connectors"
-  extends Interfaces.TwoContacts;
   parameter Boolean enable_P_out = false "If checked, get a connector for the output power"
     annotation (choices(checkBox = true), Dialog(group="Outputs",tab="I/O"));
   input Modelica.Blocks.Interfaces.RealInput u_t "[Guide vane|nozzle] opening of the turbine(=1: completely open, =0: completely closed)"