Skip to content

Commit 81c505d

Browse files
fachiffachif
committed
Updated Microgrid Generation Models
Multiple generation sources in Microgrid A had a voltage compensator IEEEVC model that was later added officially to OpenIPSL through a different PR. Thus, I had to go source by source, deleting the non existent model and adding the new one. Also fixed some parameters record data that was missing.
1 parent 945838b commit 81c505d

File tree

6 files changed

+41
-40
lines changed

6 files changed

+41
-40
lines changed

‎OpenIPSL/Examples/Microgrids/UniversityCampus/CampusA/GenerationGroups/CTG1/CTG1MachineComplete.mo‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ model CTG1MachineComplete
7676
DynParamRecords.GUDynamics guData(redeclare record GUnitDynamics =
7777
DynParamRecords.CTG1)
7878
annotation (Placement(transformation(extent={{-80,-60},{-60,-40}})));
79-
Electrical.Controls.PSSE.VC.IEEEVC iEEEVC(RC=0, XC=0.05)
80-
annotation (Placement(transformation(extent={{44,-60},{18,-38}})));
79+
Electrical.Controls.PSSE.COMP.IEEEVC iEEEVC(RC=0, XC=0.05)
80+
annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
8181
equation
8282
connect(pss.V_S2, governor.PMECH0) annotation (
8383
Line(points={{-90,-0.6},{-94,-0.6},{-94,30},{-40,30},{-40,44},{-28,44}}, color = {0, 0, 127}));
@@ -105,10 +105,11 @@ equation
105105

106106
connect(exciter.Bus, pwPin) annotation (Line(points={{8.1,6.6},{20,6.6},{20,34},
107107
{86,34},{86,0},{110,0}}, color={0,0,255}));
108-
connect(machine.p, iEEEVC.Gen_terminal) annotation (Line(points={{60,0},{74,0},
109-
{74,-41.1429},{41.1111,-41.1429}}, color={0,0,255}));
110-
connect(iEEEVC.Bus, exciter.Gen_terminal) annotation (Line(points={{20.8889,
111-
-41.1429},{-38,-41.1429},{-38,6.6},{-26.1,6.6}}, color={0,0,255}));
112-
connect(iEEEVC.VCT, exciter.ECOMP) annotation (Line(points={{15.6889,-50.5714},
113-
{-42,-50.5714},{-42,-7},{-29.9,-7}}, color={0,0,127}));
108+
connect(iEEEVC.VCT, exciter.ECOMP) annotation (Line(points={{41.6,-50},{50,
109+
-50},{50,-90},{-44,-90},{-44,-7},{-29.9,-7}}, color={0,0,127}));
110+
connect(iEEEVC.Gen_terminal, exciter.Gen_terminal) annotation (Line(points={{
111+
23,-43},{-38,-43},{-38,6},{-32,6},{-32,6.6},{-26.1,6.6}}, color={0,0,
112+
255}));
113+
connect(iEEEVC.Bus, machine.p) annotation (Line(points={{37,-43},{80,-43},{80,
114+
0},{60,0}}, color={0,0,255}));
114115
end CTG1MachineComplete;

‎OpenIPSL/Examples/Microgrids/UniversityCampus/CampusA/GenerationGroups/CTG1/CTG1MachineESVC.mo‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ model CTG1MachineESVC
6767
DynParamRecords.GUDynamics guData(redeclare record GUnitDynamics =
6868
DynParamRecords.CTG1)
6969
annotation (Placement(transformation(extent={{-80,-60},{-60,-40}})));
70-
Electrical.Controls.PSSE.VC.IEEEVC iEEEVC(RC=0, XC=0.05)
71-
annotation (Placement(transformation(extent={{44,-60},{18,-38}})));
70+
Electrical.Controls.PSSE.COMP.IEEEVC iEEEVC(RC=0, XC=0.05)
71+
annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
7272
equation
7373
connect(pss.V_S2, governor.PMECH0) annotation (
7474
Line(points={{-90,-0.6},{-94,-0.6},{-94,30},{-40,30},{-40,44},{-28,44}}, color = {0, 0, 127}));
@@ -96,10 +96,10 @@ equation
9696

9797
connect(exciter.Bus, pwPin) annotation (Line(points={{8.1,6.6},{20,6.6},{20,34},
9898
{86,34},{86,0},{110,0}}, color={0,0,255}));
99-
connect(machine.p, iEEEVC.Gen_terminal) annotation (Line(points={{60,0},{74,0},
100-
{74,-41.1429},{41.1111,-41.1429}}, color={0,0,255}));
101-
connect(iEEEVC.Bus, exciter.Gen_terminal) annotation (Line(points={{20.8889,
102-
-41.1429},{-38,-41.1429},{-38,6.6},{-26.1,6.6}}, color={0,0,255}));
103-
connect(iEEEVC.VCT, exciter.ECOMP) annotation (Line(points={{15.6889,-50.5714},
104-
{-42,-50.5714},{-42,-7},{-29.9,-7}}, color={0,0,127}));
99+
connect(iEEEVC.Gen_terminal, exciter.Gen_terminal) annotation (Line(points={{
100+
23,-43},{-36,-43},{-36,6.6},{-26.1,6.6}}, color={0,0,255}));
101+
connect(iEEEVC.Bus, machine.p) annotation (Line(points={{37,-43},{80,-43},{80,
102+
0},{60,0}}, color={0,0,255}));
103+
connect(iEEEVC.VCT, exciter.ECOMP) annotation (Line(points={{41.6,-50},{50,
104+
-50},{50,-90},{-42,-90},{-42,-7},{-29.9,-7}}, color={0,0,127}));
105105
end CTG1MachineESVC;

‎OpenIPSL/Examples/Microgrids/UniversityCampus/CampusA/GenerationGroups/CTG2/CTG2MachineComplete.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ model CTG2MachineComplete
4141
V_RMIN=guData.guDynamics.excSystem.V_RMIN,
4242
K_PA=guData.guDynamics.excSystem.K_PA,
4343
K_IA=guData.guDynamics.excSystem.K_IA,
44-
V_AMIN=guData.guDynamics.excSystem.V_AMIN,
45-
V_AMAX=guData.guDynamics.excSystem.V_AMAX,
44+
VA_MIN=guData.guDynamics.excSystem.V_AMIN,
45+
VA_MAX=guData.guDynamics.excSystem.V_AMAX,
46+
VE_MIN=guData.guDynamics.excSystem.V_EMIN,
47+
VFE_MAX=guData.guDynamics.excSystem.V_FEMAX,
4648
K_P=guData.guDynamics.excSystem.K_P,
4749
K_L=guData.guDynamics.excSystem.K_L,
4850
T_E=guData.guDynamics.excSystem.T_E,
@@ -53,8 +55,6 @@ model CTG2MachineComplete
5355
K_F2=guData.guDynamics.excSystem.K_F2,
5456
K_F3=guData.guDynamics.excSystem.K_F3,
5557
T_F3=guData.guDynamics.excSystem.T_F3,
56-
V_EMIN=guData.guDynamics.excSystem.V_EMIN,
57-
V_FEMAX=guData.guDynamics.excSystem.V_FEMAX,
5858
E_1=guData.guDynamics.excSystem.E_1,
5959
S_EE_1=guData.guDynamics.excSystem.S_EE_1,
6060
E_2=guData.guDynamics.excSystem.E_2,

‎OpenIPSL/Examples/Microgrids/UniversityCampus/CampusA/GenerationGroups/STG1/STG1MachineComplete.mo‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ model STG1MachineComplete
6767
constrainedby OpenIPSL.Electrical.Controls.PSSE.PSS.BaseClasses.BasePSS
6868
annotation (choicesAllMatching=true,
6969
Placement(transformation(extent = {{-88, -6}, {-48, 12}})));
70-
Electrical.Controls.PSSE.VC.IEEEVC iEEEVC(RC=0, XC=0.05)
71-
annotation (Placement(transformation(extent={{44,-60},{18,-38}})));
7270
DynParamRecords.GUDynamics guData(redeclare record GUnitDynamics =
7371
OpenIPSL.Examples.Microgrids.UniversityCampus.CampusA.GenerationGroups.DynParamRecords.STG1)
7472
annotation (Placement(transformation(extent={{-80,-60},{-60,-40}})));
73+
Electrical.Controls.PSSE.COMP.IEEEVC iEEEVC(RC=0, XC=0.05)
74+
annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
7575
equation
7676
connect(pss.V_S2, governor.PMECH0) annotation (
7777
Line(points={{-90,-0.6},{-94,-0.6},{-94,30},{-40,30},{-40,44},{-28,44}}, color = {0, 0, 127}));
@@ -98,10 +98,10 @@ equation
9898

9999
connect(exciter.Bus, pwPin) annotation (Line(points={{8.1,6.6},{20,6.6},{20,34},
100100
{86,34},{86,0},{110,0}}, color={0,0,255}));
101-
connect(machine.p, iEEEVC.Gen_terminal) annotation (Line(points={{60,0},{72,0},
102-
{72,-41.1429},{41.1111,-41.1429}}, color={0,0,255}));
103-
connect(iEEEVC.Bus, exciter.Gen_terminal) annotation (Line(points={{20.8889,
104-
-41.1429},{-38,-41.1429},{-38,6.6},{-26.1,6.6}}, color={0,0,255}));
105-
connect(iEEEVC.VCT, exciter.ECOMP) annotation (Line(points={{15.6889,-50.5714},
106-
{-42,-50.5714},{-42,-7},{-29.9,-7}}, color={0,0,127}));
101+
connect(iEEEVC.Gen_terminal, exciter.Gen_terminal) annotation (Line(points={{
102+
23,-43},{-38,-43},{-38,6.6},{-26.1,6.6}}, color={0,0,255}));
103+
connect(iEEEVC.Bus, machine.p) annotation (Line(points={{37,-43},{70,-43},{70,
104+
0},{60,0}}, color={0,0,255}));
105+
connect(iEEEVC.VCT, exciter.ECOMP) annotation (Line(points={{41.6,-50},{50,
106+
-50},{50,-90},{-44,-90},{-44,-7},{-29.9,-7}}, color={0,0,127}));
107107
end STG1MachineComplete;

‎OpenIPSL/Examples/Microgrids/UniversityCampus/CampusA/GenerationGroups/STG1/STG1MachineESVC.mo‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ model STG1MachineESVC
6060
constrainedby OpenIPSL.Electrical.Controls.PSSE.PSS.BaseClasses.BasePSS
6161
annotation (choicesAllMatching=true,
6262
Placement(transformation(extent = {{-88, -6}, {-48, 12}})));
63-
Electrical.Controls.PSSE.VC.IEEEVC iEEEVC(RC=0, XC=0.05)
64-
annotation (Placement(transformation(extent={{44,-60},{18,-38}})));
6563
DynParamRecords.GUDynamics guData(redeclare record GUnitDynamics =
6664
OpenIPSL.Examples.Microgrids.UniversityCampus.CampusA.GenerationGroups.DynParamRecords.STG1)
6765
annotation (Placement(transformation(extent={{-80,-60},{-60,-40}})));
66+
Electrical.Controls.PSSE.COMP.IEEEVC iEEEVC(RC=0, XC=0.05)
67+
annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
6868
equation
6969
connect(pss.V_S2, governor.PMECH0) annotation (
7070
Line(points={{-90,-0.6},{-94,-0.6},{-94,30},{-40,30},{-40,44},{-28,44}}, color = {0, 0, 127}));
@@ -91,10 +91,10 @@ equation
9191

9292
connect(exciter.Bus, pwPin) annotation (Line(points={{8.1,6.6},{20,6.6},{20,34},
9393
{86,34},{86,0},{110,0}}, color={0,0,255}));
94-
connect(machine.p, iEEEVC.Gen_terminal) annotation (Line(points={{60,0},{72,0},
95-
{72,-41.1429},{41.1111,-41.1429}}, color={0,0,255}));
96-
connect(iEEEVC.Bus, exciter.Gen_terminal) annotation (Line(points={{20.8889,
97-
-41.1429},{-38,-41.1429},{-38,6.6},{-26.1,6.6}}, color={0,0,255}));
98-
connect(iEEEVC.VCT, exciter.ECOMP) annotation (Line(points={{15.6889,-50.5714},
99-
{-42,-50.5714},{-42,-7},{-29.9,-7}}, color={0,0,127}));
94+
connect(iEEEVC.Gen_terminal, exciter.Gen_terminal) annotation (Line(points={{
95+
23,-43},{-40,-43},{-40,6.6},{-26.1,6.6}}, color={0,0,255}));
96+
connect(iEEEVC.Bus, machine.p) annotation (Line(points={{37,-43},{70,-43},{70,
97+
0},{60,0}}, color={0,0,255}));
98+
connect(iEEEVC.VCT, exciter.ECOMP) annotation (Line(points={{41.6,-50},{50,
99+
-50},{50,-90},{-44,-90},{-44,-7},{-29.9,-7}}, color={0,0,127}));
100100
end STG1MachineESVC;

‎OpenIPSL/Examples/Microgrids/UniversityCampus/CampusA/GenerationGroups/STG2/STG2MachineComplete.mo‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ model STG2MachineComplete
4141
V_RMIN=guData.guDynamics.excSystem.V_RMIN,
4242
K_PA=guData.guDynamics.excSystem.K_PA,
4343
K_IA=guData.guDynamics.excSystem.K_IA,
44-
V_AMIN=guData.guDynamics.excSystem.V_AMIN,
45-
V_AMAX=guData.guDynamics.excSystem.V_AMAX,
44+
VA_MIN=guData.guDynamics.excSystem.V_AMIN,
45+
VA_MAX=guData.guDynamics.excSystem.V_AMAX,
4646
K_P=guData.guDynamics.excSystem.K_P,
4747
K_L=guData.guDynamics.excSystem.K_L,
4848
T_E=guData.guDynamics.excSystem.T_E,
@@ -53,8 +53,8 @@ model STG2MachineComplete
5353
K_F2=guData.guDynamics.excSystem.K_F2,
5454
K_F3=guData.guDynamics.excSystem.K_F3,
5555
T_F3=guData.guDynamics.excSystem.T_F3,
56-
V_EMIN=guData.guDynamics.excSystem.V_EMIN,
57-
V_FEMAX=guData.guDynamics.excSystem.V_FEMAX,
56+
VE_MIN=guData.guDynamics.excSystem.V_EMIN,
57+
VFE_MAX=guData.guDynamics.excSystem.V_FEMAX,
5858
E_1=guData.guDynamics.excSystem.E_1,
5959
S_EE_1=guData.guDynamics.excSystem.S_EE_1,
6060
E_2=guData.guDynamics.excSystem.E_2,

0 commit comments

Comments
 (0)