@@ -102,11 +102,11 @@ protected
102102 parameter Boolean fflag = (if PFunctionality == 1 then true else false );
103103equation
104104 connect (RenewableController.Ipcmd, RenewableGenerator.Ipcmd)
105- annotation (Line(points={{20.6667,-11.4667 },{24,-11.4667 },{24,-11.4286},{27.1429,-11.4286}},
106- color={0,0,127}));
105+ annotation (Line(points={{20.6667,-11.3333 },{24,-11.3333 },{24,-11.4286},{
106+ 27.1429,-11.4286}}, color={0,0,127}));
107107 connect (RenewableController.Iqcmd, RenewableGenerator.Iqcmd)
108- annotation (Line(points={{20.6667,11.4667 },{24,11.4667 },{24,11.4286},{27.1429,11.4286}},
109- color={0,0,127}));
108+ annotation (Line(points={{20.6667,11.3333 },{24,11.3333 },{24,11.4286},{
109+ 27.1429,11.4286}}, color={0,0,127}));
110110 connect (RenewableGenerator.IQ0, RenewableController.iq0) annotation (Line(
111111 points={{32.8571,-21.4286},{32.8571,-28},{16,-28},{16,-21.3333}},
112112 color={0,0,127}));
@@ -129,43 +129,46 @@ equation
129129 points={{50,21.4286},{50,30},{-28,30},{-28,10.6667},{-21.3333,10.6667}},
130130 color={0,0,127}));
131131 connect (RenewableGenerator.Qgen, RenewableController.Qgen) annotation (Line(
132- points={{61.4286,21.4286},{61.4286,34},{-30,34},{-30,5.33333},{-21.3333,5.33333}},
132+ points={{61.4286,21.4286},{61.4286,34},{-30,34},{-30,5.33333},{-21.3333,
133+ 5.33333}},
133134 color={0,0,127}));
134135 connect (PlantController.Qext, RenewableController.Qext) annotation (Line(
135136 points={{-37,10},{-32,10},{-32,0},{-21.3333,0}}, color={0,
136137 0,127}));
137138 connect (PlantController.Pref, RenewableController.Pref) annotation (Line(
138- points={{-37,-10},{-34,-10},{-34,-6},{-24,-6},{-24,-5.33333},{-21.3333,-5.33333}},
139- color={
139+ points={{-37,-10},{-34,-10},{-34,-6},{-24,-6},{-24,-5.33333},{-21.3333,
140+ -5.33333}}, color={
140141 0,0,127}));
141- connect (PlantController.p0, RenewableController.p0) annotation (Line(points={{-70,-22},{-70,-44},{-16,-44},{-16,-21.3333}},
142- color={0,0,127}));
143- connect (PlantController.v0, RenewableController.v0) annotation (Line(points={{-58,-22},{-58,-36},{0,-36},{0,-21.3333}},
144- color={0,0,127}));
145- connect (PlantController.q0, RenewableController.q0) annotation (Line(points={{-46,-22},{-46,-40},{-8,-40},{-8,-21.3333}},
146- color={0,0,127}));
147- connect (gain.u, RenewableGenerator.p_0) annotation (Line(points={{1.2,-60},{67.1429,-60},{67.1429,-21.4286}},
142+ connect (PlantController.p0, RenewableController.p0) annotation (Line(points={{-70,-22},
143+ {-70,-44},{-16,-44},{-16,-21.3333}}, color={0,0,127}));
144+ connect (PlantController.v0, RenewableController.v0) annotation (Line(points={{-58,-22},
145+ {-58,-36},{0,-36},{0,-21.3333}}, color={0,0,127}));
146+ connect (PlantController.q0, RenewableController.q0) annotation (Line(points={{-46,-22},
147+ {-46,-40},{-8,-40},{-8,-21.3333}}, color={0,0,127}));
148+ connect (gain.u, RenewableGenerator.p_0) annotation (Line(points={{1.2,-60},{
149+ 67.1429,-60},{67.1429,-21.4286}},
148150 color={0,0,127}));
149- connect (gain1.y, RenewableController.Qext) annotation (Line(points={{-12.6,-80},{-32,-80},{-32,0},{-21.3333,0}},
150- color={0,0,127}));
151- connect (gain.y, RenewableController.Pref) annotation (Line(points={{-12.6,-60},{-30,-60},{-30,-5.33333},{-21.3333,-5.33333}},
152- color={0,0,127}));
153- connect (gain1.u, RenewableGenerator.q_0) annotation (Line(points={{1.2,-80},{58.5714,-80},{58.5714,-21.4286}},
151+ connect (gain1.y, RenewableController.Qext) annotation (Line(points={{-12.6,
152+ -80},{-32,-80},{-32,0},{-21.3333,0}}, color={0,0,127}));
153+ connect (gain.y, RenewableController.Pref) annotation (Line(points={{-12.6,-60},
154+ {-30,-60},{-30,-5.33333},{-21.3333,-5.33333}}, color={0,0,127}));
155+ connect (gain1.u, RenewableGenerator.q_0) annotation (Line(points={{1.2,-80},{
156+ 58.5714,-80},{58.5714,-21.4286}},
154157 color={0,0,127}));
155158 connect (freq_ref.y, PlantController.Freq_ref) annotation (Line(points={{-80.5,
156159 -55},{-88,-55},{-88,-12},{-80,-12}}, color={0,0,127}));
157160 connect (PlantController.Plant_pref, RenewableGenerator.p_0) annotation (Line(
158161 points={{-80,4},{-96,4},{-96,-92},{67.1429,-92},{67.1429,-21.4286}},
159162 color={0,0,127}));
160- connect (PlantController.Qref, RenewableGenerator.q_0) annotation (Line(points={{-80,12},{-98,12},{-98,-98},{58.5714,-98},{58.5714,-21.4286}},
161- color={
163+ connect (PlantController.Qref, RenewableGenerator.q_0) annotation (Line(points={{-80,12},
164+ {-98,12},{-98,-98},{58.5714,-98},{58.5714,-21.4286}}, color={
162165 0,0,127}));
163166 connect (RenewableGenerator.p, pwPin)
164167 annotation (Line(points={{70,0},{100,0}}, color={0,0,255}));
165168 connect (PlantController.Freq, FREQ) annotation (Line(points={{-80,-4},{-92,-4},{-92,0},{-120,0}},
166169 color={0,0,127}));
167- connect (PAUX.y, RenewableController.Paux) annotation (Line(points={{-69.5,-75},{-26,-75},{-26,-10.6667},{-21.3333,-10.6667}},
168- color={0,0,127}));
170+ connect (PAUX.y, RenewableController.Paux) annotation (Line(points={{-69.5,-75},
171+ {-26,-75},{-26,-10.6667},{-21.3333,-10.6667}}, color={0,0,127}));
169172 connect (PlantController.branch_ii, branch_ii) annotation (Line(points={{-62,22},{-62,96},{-40,96},{-40,120}},
170173 color={0,0,127}));
171174 connect (PlantController.branch_ir, branch_ir) annotation (Line(points={{-72,22},{-72,96},{-80,96},{-80,120}},
0 commit comments