Fix references after update of interfaces.

Author: dietmarw

OpenHPL/ElectroMech/Turbines/Francis.mo

@@ -79,7 +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.TurbineContacts;
+    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},
       {20,20}})));

OpenHPL/ElectroMech/Turbines/Pelton.mo

@@ -21,7 +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.TurbineContacts;
+    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},
             {20,20}})));

OpenHPL/Examples/SimpleGenFrancis.mo

@@ -20,7 +20,7 @@ model SimpleGenFrancis "Model of a hydropower system with Francis turbine model"
     L=600,
     H=428.5,
     D_i=3,
-    D_o=3) constrainedby Interfaces.TwoContact
+    D_o=3) constrainedby Interfaces.TwoContacts
            annotation (Placement(transformation(
         origin={-30,0},
         extent={{-10,-10},{10,10}})));

OpenHPL/Examples/SimpleTurbine.mo

@@ -21,7 +21,7 @@ model SimpleTurbine "Model of a hydropower system with a simple turbine turbine"
     D_o=3,
     H=80,
     L=200,
-    vertical=true) constrainedby Interfaces.TwoContact annotation (Placement(transformation(origin={0,30}, extent={{-10,-10},{10,10}})));
+    vertical=true) constrainedby Interfaces.TwoContacts annotation (Placement(transformation(origin={0,30}, extent={{-10,-10},{10,10}})));
   OpenHPL.Waterway.SurgeTank surgeTank(h_0=20)   annotation (Placement(transformation(
         origin={-30,30},
         extent={{-10,-10},{10,10}})));

OpenHPL/Examples/SimpleValve.mo

@@ -21,7 +21,7 @@ model SimpleValve "Model of a hydropower system with a simple turbine turbine"
     D_o=3,
     H=80,
     L=200,
-    vertical=true) constrainedby Interfaces.TwoContact annotation (Placement(transformation(origin={0,30}, extent={{-10,-10},{10,10}})));
+    vertical=true) constrainedby Interfaces.TwoContacts annotation (Placement(transformation(origin={0,30}, extent={{-10,-10},{10,10}})));
   OpenHPL.Waterway.SurgeTank surgeTank(
     H=30,
     L=30,

OpenHPL/Examples/WithOpenIPSL/SimpleGenFrancis.mo

@@ -16,7 +16,7 @@ model SimpleGenFrancis "Synergy with OpenIPSL library(generator)"
     vertical=true,
     L=600,
     H=428.5,
-    D_i=3) constrainedby Interfaces.TwoContact
+    D_i=3) constrainedby Interfaces.TwoContacts
            annotation (Placement(transformation(
         origin={0,-50},
         extent={{-10,-10},{10,10}})));
@@ -84,13 +84,13 @@ equation
   connect(fpu_to_fSI.y, governor.f) annotation (
     Line(points={{-53.4,-90},{-10,-90},{-10,-84},{0,-84}}, color = {0, 0, 127}));
   connect(governor.Y_gv, turbine.u_t) annotation (
-    Line(points={{23,-80},{32,-80},{32,-62}}, color = {0, 0, 127}));
+    Line(points={{23,-80},{24,-80},{24,-62}}, color = {0, 0, 127}));
   connect(governor.P_ref, power.y) annotation (
     Line(points={{0,-76},{-10,-76},{-10,-72},{-21.2,-72}}, color = {0, 0, 127}));
   connect(fpu_to_fSI.u, wpu_to_wSI.u) annotation (Line(points={{-67.2,-90},{-94,-90},{-94,30},{-48,30},{-48,20},{-52.8,20}}, color={0,0,127}));
   connect(generator.w, wpu_to_wSI.u) annotation (Line(points={{-19,9},{-16,9},{-16,20},{-52.8,20}}, color={0,0,127}));
   connect(PSI_to_Ppu.u, turbine.P_out) annotation (
-    Line(points={{-65,-5},{-70,-5},{-70,-24},{32,-24},{32,-39}}, color = {0, 0, 127}));
+    Line(points={{-65,-5},{-70,-5},{-70,-24},{36,-24},{36,-61}}, color = {0, 0, 127}));
   connect(PSI_to_Ppu.y, generator.pm) annotation (Line(points={{-53.5,-5},{-42,-5}}, color={0,0,127}));
   connect(generator.vf, generator.vf0) annotation (Line(points={{-42,5},{-46,5},{-46,14},{-38,14},{-38,11}}, color={0,0,127}));
   connect(wpu_to_wSI.y, turbine.w_in) annotation (Line(points={{-66.6,20},{-80,20},{-80,-32},{16,-32},{16,-42},{20,-42}}, color={0,0,127}));

OpenHPL/Examples/WithOpenIPSL/SimpleGenFrancisTG.mo

@@ -16,7 +16,7 @@ model SimpleGenFrancisTG "Synergy with OpenIPSL library(generator)"
     vertical=true,
     L=600,
     H=428.5,
-    D_i=3) constrainedby Interfaces.TwoContact
+    D_i=3) constrainedby Interfaces.TwoContacts
            annotation (Placement(transformation(
         origin={0,-50},
         extent={{-10,-10},{10,10}})));
@@ -86,7 +86,7 @@ model SimpleGenFrancisTG "Synergy with OpenIPSL library(generator)"
 equation
   connect(generator.w, wpu_to_wSI.u) annotation (Line(points={{-19,9},{-16,9},{-16,20},{-52.8,20}}, color={0,0,127}));
   connect(PSI_to_Ppu.u, turbine.P_out) annotation (
-    Line(points={{-65,-5},{-70,-5},{-70,-24},{32,-24},{32,-39}}, color = {0, 0, 127}));
+    Line(points={{-65,-5},{-70,-5},{-70,-24},{36,-24},{36,-61}}, color = {0, 0, 127}));
   connect(PSI_to_Ppu.y, generator.pm) annotation (Line(points={{-53.5,-5},{-42,-5}}, color={0,0,127}));
   connect(generator.vf, generator.vf0) annotation (Line(points={{-42,5},{-46,5},{-46,14},{-38,14},{-38,11}}, color={0,0,127}));
   connect(wpu_to_wSI.y, turbine.w_in) annotation (Line(points={{-66.6,20},{-80,20},{-80,-32},{16,-32},{16,-42},{20,-42}}, color={0,0,127}));
@@ -97,7 +97,8 @@ equation
   connect(penstock.i, surgeTank.o) annotation (Line(points={{-10,-50},{-20,-50}},color={28,108,200}));
   connect(surgeTank.i, intake.o) annotation (Line(points={{-40,-50},{-46,-50}}, color={28,108,200}));
   connect(intake.i, reservoir.o) annotation (Line(points={{-66,-50},{-70,-50}}, color={28,108,200}));
-  connect(tGTypeI.pm, turbine.u_t) annotation (Line(points={{13.2,-80},{32,-80},{32,-62}}, color={0,0,127}));
+  connect(tGTypeI.pm, turbine.u_t) annotation (Line(points={{13.2,-80},{24,-80},
+          {24,-62}},                                                                       color={0,0,127}));
   connect(tGTypeI.w, wpu_to_wSI.u) annotation (Line(points={{-14.4,-80},{-92,-80},{-92,32},{-16,32},{-16,20},{-52.8,20}}, color={0,0,127}));
   annotation (experiment(StopTime = 2000));
 end SimpleGenFrancisTG;