Skip to content

Commit

Permalink
add vrt_control_model, lvrt_control, hvrt_control, wtvrt3, and corres…
Browse files Browse the repository at this point in the history
…ponding codes for adding wtvrt3 model. hvrt_model ad wtvrt3 models need further coding. parameter names in lvrt_control need further checking.
  • Loading branch information
changgang committed Feb 21, 2024
1 parent 6f9107e commit 4b3da40
Show file tree
Hide file tree
Showing 44 changed files with 5,801 additions and 204 deletions.
41 changes: 41 additions & 0 deletions bench/full_ieee39y.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
internal,,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38
,physical,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39
0,1,3.6545-63.3675i,-2.05706+24.1557i,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,-1.59744+39.9361i
1,2,-2.05706+24.1557i,64.6457-211.871i,-5.65956+65.7379i,,,,,,,,,,,,,,,,,,,,,,-56.9291+69.9414i,,,,,53.9011i,,,,,,,,,
2,3,,-5.65956+65.7379i,14.6906-186.843i,-2.85476+46.7741i,,,,,,,,,,,,,,-6.17631+74.6771i,,,,,,,,,,,,,,,,,,,,,
3,4,,,-2.85476+46.7741i,12.5076-201.571i,-4.86381+77.821i,,,,,,,,,-4.78899+77.2224i,,,,,,,,,,,,,,,,,,,,,,,,,
4,5,,,,-4.86381+77.821i,40.6208-548.844i,-29.4118+382.353i,,-6.34518+88.8325i,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
5,6,,,,,-29.4118+382.353i,46.8057-646.447i,-7.05882+108.235i,,,,-10.3352+121.069i,,,,,,,,,,,,,,,,,,,,37.3832i,,,,,,,,
6,7,,,,,,-7.05882+108.235i,25.8205-323.9i,-18.7617+215.76i,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
7,8,,,,,-6.34518+88.8325i,,-18.7617+215.76i,26.8454-331.727i,-1.7385+27.4381i,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
8,9,,,,,,,,-1.7385+27.4381i,3.33594-66.584i,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,-1.59744+39.9361i
9,10,,,,,,,,,,42.8954-504.725i,-21.4477+230.563i,,-21.4477+230.563i,,,,,,,,,,,,,,,,,,,46.729i,,,,,,,
10,11,,,,,,-10.3352+121.069i,,,,-21.4477+230.563i,32.6273-374.483i,-0.839376+22.8205i,,,,,,,,,,,,,,,,,,,,,,,,,,,
11,12,,,,,,,,,,,-0.839376+22.8205i,1.66874-45.3688i,-0.839376+22.8205i,,,,,,,,,,,,,,,,,,,,,,,,,,
12,13,,,,,,,,,,-21.4477+230.563i,,-0.839376+22.8205i,31.0453-351.628i,-8.75316+98.2299i,,,,,,,,,,,,,,,,,,,,,,,,,
13,14,,,,-4.78899+77.2224i,,,,,,,,,-8.75316+98.2299i,17.3386-220.882i,-3.79643+45.768i,,,,,,,,,,,,,,,,,,,,,,,,
14,15,,,,,,,,,,,,,,-3.79643+45.768i,13.8895-150.916i,-10.0931+105.417i,,,,,,,,,,,,,,,,,,,,,,,
15,16,,,,,,,,,,,,,,,-10.0931+105.417i,36.0258-510.428i,-8.78294+111.669i,,-4.17962+50.9391i,,-4.37421+73.8149i,,,-8.59599+169.054i,,,,,,,,,,,,,,,
16,17,,,,,,,,,,,,,,,,-8.78294+111.669i,23.4373-289.923i,-10.3352+121.069i,,,,,,,,,-4.31922+57.4789i,,,,,,,,,,,,
17,18,,,-6.17631+74.6771i,,,,,,,,,,,,,,-10.3352+121.069i,16.5115-195.573i,,,,,,,,,,,,,,,,,,,,,
18,19,,,,,,,,,,,,,,,,-4.17962+50.9391i,,,10.4674-176.475i,-3.45874+68.1866i,,,,,,,,,,,,,-3.23656+65.6559i,,,,,,
19,20,,,,,,,,,,,,,,,,,,,-3.45874+68.1866i,6.38791-126.711i,,,,,,,,,,,,,,-2.74614+54.9227i,,,,,
20,21,,,,,,,,,,,,,,,,-4.37421+73.8149i,,,,,8.44256-144.755i,-4.06835+71.1961i,,,,,,,,,,,,,,,,,
21,22,,,,,,,,,,,,,,,,,,,,,-4.06835+71.1961i,10.5534-241.297i,-6.48508+103.761i,,,,,,,,,,,,68.2245i,,,,
22,23,,,,,,,,,,,,,,,,,,,,,,-6.48508+103.761i,8.94953-168.7i,-1.78885+28.459i,,,,,,,,,,,,-0.675594+36.7523i,,,
23,24,,,,,,,,,,,,,,,,-8.59599+169.054i,,,,,,,-1.78885+28.459i,10.3848-197.299i,,,,,,,,,,,,,,,
24,25,,-56.9291+69.9414i,,,,,,,,,,,,,,,,,,,,,,,61.0268-141.27i,-3.03741+30.6588i,,,,,,,,,,,-1.08683+42.024i,,
25,26,,,,,,,,,,,,,,,,,,,,,,,,,-3.03741+30.6588i,12.8034-133.587i,-6.42055+67.4157i,-1.89825+20.9248i,-1.44716+15.868i,,,,,,,,,,
26,27,,,,,,,,,,,,,,,,,-4.31922+57.4789i,,,,,,,,,-6.42055+67.4157i,10.7398-124.614i,,,,,,,,,,,,
27,28,,,,,,,,,,,,,,,,,,,,,,,,,,-1.89825+20.9248i,,7.986-86.071i,-6.08775+65.6607i,,,,,,,,,,
28,29,,,,,,,,,,,,,,,,,,,,,,,,,,-1.44716+15.868i,,-6.08775+65.6607i,10.6556-141.743i,,,,,,,,,-3.19872+62.375i,
29,30,,53.9011i,,,,,,,,,,,,,,,,,,,,,,,,,,,,-55.2486i,,,,,,,,,
30,31,,,,,,37.3832i,,,,,,,,,,,,,,,,,,,,,,,,,-40i,,,,,,,,
31,32,,,,,,,,,,46.729i,,,,,,,,,,,,,,,,,,,,,,-50i,,,,,,,
32,33,,,,,,,,,,,,,,,,,,,-3.23656+65.6559i,,,,,,,,,,,,,,3.46312-70.2518i,,,,,,
33,34,,,,,,,,,,,,,,,,,,,,-2.74614+54.9227i,,,,,,,,,,,,,,2.77085-55.417i,,,,,
34,35,,,,,,,,,,,,,,,,,,,,,,68.2245i,,,,,,,,,,,,,-69.9301i,,,,
35,36,,,,,,,,,,,,,,,,,,,,,,,-0.675594+36.7523i,,,,,,,,,,,,,0.675594-36.7523i,,,
36,37,,,,,,,,,,,,,,,,,,,,,,,,,-1.08683+42.024i,,,,,,,,,,,,1.114-43.0746i,,
37,38,,,,,,,,,,,,,,,,,,,,,,,,,,,,,-3.19872+62.375i,,,,,,,,,3.27869-63.9344i,
38,39,-1.59744+39.9361i,,,,,,,,-1.59744+39.9361i,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3.19489-78.8972i
1,522 changes: 1,522 additions & 0 deletions bench/ieee39z.csv

Large diffs are not rendered by default.

132 changes: 132 additions & 0 deletions bench/short_ieee39y.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
ROW,ROW_BUS,COLUMN,COLUMN_BUS,REAL,IMAGINARY
0,1,0,1,3.65450097001827,-63.36747731958560
1,2,0,1,-2.05705688056140,24.15572508316387
38,39,0,1,-1.59744408945687,39.93610223642172
0,1,1,2,-2.05705688056140,24.15572508316387
1,2,1,2,64.64569545159222,-211.87056920901321
2,3,1,2,-5.65955594253374,65.73791902481497
24,25,1,2,-56.92908262849707,69.94144437215355
29,30,1,2,-0.00000000000000,53.90109149710281
1,2,2,3,-5.65955594253374,65.73791902481497
2,3,2,3,14.69062005200674,-186.84298940536652
3,4,2,3,-2.85475866309456,46.77412271070315
17,18,2,3,-6.17630544637844,74.67714766984841
2,3,3,4,-2.85475866309456,46.77412271070315
3,4,3,4,12.50755722639896,-201.57062289029008
4,5,3,4,-4.86381322957198,77.82101167315174
13,14,3,4,-4.78898533373242,77.22238850643519
3,4,4,5,-4.86381322957198,77.82101167315174
4,5,4,5,40.62075560042896,-548.84384015926696
5,6,4,5,-29.41176470588236,382.35294117647061
7,8,4,5,-6.34517766497462,88.83248730964468
4,5,5,6,-29.41176470588236,382.35294117647061
5,6,5,6,46.80574252438314,-646.44708466866041
6,7,5,6,-7.05882352941176,108.23529411764706
10,11,5,6,-10.33515428908903,121.06895024361434
30,31,5,6,-0.00000000000000,37.38317757009346
5,6,6,7,-7.05882352941176,108.23529411764706
6,7,6,7,25.82054960821101,-323.89964402383845
7,8,6,7,-18.76172607879925,215.75984990619136
4,5,7,8,-6.34517766497462,88.83248730964468
6,7,7,8,-18.76172607879925,215.75984990619136
7,8,7,8,26.84540319198926,-331.72739372462684
8,9,7,8,-1.73849944821539,27.43805650879076
7,8,8,9,-1.73849944821539,27.43805650879076
8,9,8,9,3.33594353767226,-66.58395874521248
38,39,8,9,-1.59744408945687,39.93610223642172
9,10,9,10,42.89544235924933,-504.72504177559085
10,11,9,10,-21.44772117962466,230.56300268096516
12,13,9,10,-21.44772117962466,230.56300268096516
31,32,9,10,-0.00000000000000,46.72897196261682
5,6,10,11,-10.33515428908903,121.06895024361434
9,10,10,11,-21.44772117962466,230.56300268096516
10,11,10,11,32.62728730947873,-374.48349984537896
11,12,10,11,-0.83937558724159,22.82052377813066
10,11,11,12,-0.83937558724159,22.82052377813066
11,12,11,12,1.66873874203099,-45.36883454896752
12,13,11,12,-0.83937558724159,22.82052377813066
9,10,12,13,-21.44772117962466,230.56300268096516
11,12,12,13,-0.83937558724159,22.82052377813066
12,13,12,13,31.04529388403491,-351.62776596044966
13,14,12,13,-8.75316086364521,98.22991635868509
3,4,13,14,-4.78898533373242,77.22238850643519
12,13,13,14,-8.75316086364521,98.22991635868509
13,14,13,14,17.33857333761342,-220.88209316685189
14,15,13,14,-3.79642714023580,45.76803830173159
13,14,14,15,-3.79642714023580,45.76803830173159
14,15,14,15,13.88950777273552,-150.91615824117309
15,16,14,15,-10.09308063249972,105.41661993944150
14,15,15,16,-10.09308063249972,105.41661993944150
15,16,15,16,36.02583832184625,-510.42778860795488
16,17,15,16,-8.78293601003764,111.66875784190715
18,19,15,16,-4.17961913220658,50.93910817376766
20,21,15,16,-4.37421400842036,73.81486139209360
23,24,15,16,-8.59598853868195,169.05444126074499
15,16,16,17,-8.78293601003764,111.66875784190715
16,17,16,17,23.43731416782227,-289.92276033816285
17,18,16,17,-10.33515428908903,121.06895024361434
26,27,16,17,-4.31922386869560,57.47890225264138
2,3,17,18,-6.17630544637844,74.67714766984841
16,17,17,18,-10.33515428908903,121.06895024361434
17,18,17,18,16.51145973546747,-195.57324791346275
15,16,18,19,-4.17961913220658,50.93910817376766
18,19,18,19,10.46740324327355,-176.47474990802669
19,20,18,19,-3.45874068239965,68.18660202445032
32,33,18,19,-3.23655868736276,65.65590480078750
18,19,19,20,-3.45874068239965,68.18660202445035
19,20,19,20,6.38790578960683,-126.71061147118132
33,34,19,20,-2.74613543225957,54.92270864519135
15,16,20,21,-4.37421400842036,73.81486139209360
20,21,20,21,8.44256225903061,-144.75530577777303
21,22,20,21,-4.06834825061025,71.19609438567942
20,21,21,22,-4.06834825061025,71.19609438567942
21,22,21,22,10.55343255670623,-241.29734056942090
22,23,21,22,-6.48508430609598,103.76134889753568
34,35,21,22,-0.00000000000000,68.22445846836091
21,22,22,23,-6.48508430609598,103.76134889753568
22,23,22,23,8.94952839718310,-168.69982231639710
23,24,22,23,-1.78885058218955,28.45898653483379
35,36,22,23,-0.67559350889757,36.75228688402762
15,16,23,24,-8.59598853868195,169.05444126074499
22,23,23,24,-1.78885058218955,28.45898653483379
23,24,23,24,10.38483912087150,-197.29892779557881
1,2,24,25,-56.92908262849707,69.94144437215355
24,25,24,25,61.02681073161219,-141.26983757028580
25,26,24,25,-3.03740757263675,30.65883268630224
36,37,24,25,-1.08682854374032,42.02403702462572
24,25,25,26,-3.03740757263675,30.65883268630224
25,26,25,26,12.80336185185324,-133.58652446246100
26,27,25,26,-6.42054574638844,67.41573033707866
27,28,25,26,-1.89824522679616,20.92484273259022
28,29,25,26,-1.44716330603188,15.86801870648989
16,17,26,27,-4.31922386869560,57.47890225264138
25,26,26,27,-6.42054574638844,67.41573033707866
26,27,26,27,10.73976961508404,-124.61403258972004
25,26,27,28,-1.89824522679616,20.92484273259022
27,28,27,28,7.98599580295827,-86.07098108976724
28,29,27,28,-6.08775057616211,65.66073835717702
25,26,28,29,-1.44716330603188,15.86801870648989
27,28,28,29,-6.08775057616211,65.66073835717702
28,29,28,29,10.65561682053085,-141.74346436123574
37,38,28,29,-3.19872051179528,62.37504998000801
1,2,29,30,-0.00000000000000,53.90109149710281
29,30,29,30,0.00000000000000,-55.24861878453038
5,6,30,31,-0.00000000000000,37.38317757009346
30,31,30,31,0.00000000000000,-40.00000000000000
9,10,31,32,-0.00000000000000,46.72897196261682
31,32,31,32,0.00000000000000,-50.00000000000000
18,19,32,33,-3.23655868736276,65.65590480078748
32,33,32,33,3.46311779547816,-70.25181813684262
19,20,33,34,-2.74613543225957,54.92270864519135
33,34,33,34,2.77085065114990,-55.41701302299806
21,22,34,35,-0.00000000000000,68.22445846836091
34,35,34,35,0.00000000000000,-69.93006993006993
22,23,35,36,-0.67559350889757,36.75228688402762
35,36,35,36,0.67559350889757,-36.75228688402762
24,25,36,37,-1.08682854374032,42.02403702462573
36,37,36,37,1.11399925733383,-43.07463795024137
28,29,37,38,-3.19872051179528,62.37504998000801
37,38,37,38,3.27868852459017,-63.93442622950821
0,1,38,39,-1.59744408945687,39.93610223642172
8,9,38,39,-1.59744408945687,39.93610223642172
38,39,38,39,3.19488817891374,-78.89720447284344
47 changes: 38 additions & 9 deletions code/steps/STEPS.cbp
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,14 @@
<Unit filename="header/model/auxiliary_signal_model/auxiliary_signal_models.h" />
<Unit filename="header/model/bus_model/bus_frequency_model/bus_frequency_model.h" />
<Unit filename="header/model/converter_common_models/current_order_limiter_model/convcol.h" />
<Unit filename="header/model/converter_common_models/lvpl_model/lvpl.h" />
<Unit filename="header/model/converter_common_models/pll_model/pll0.h" />
<Unit filename="header/model/converter_common_models/pll_model/pll_model.h" />
<Unit filename="header/model/converter_common_models/vrt_model/hvrt.h" />
<Unit filename="header/model/converter_common_models/vrt_model/lvrt.h" />
<Unit filename="header/model/converter_common_models/vrt_model/hvrt_control.h" />
<Unit filename="header/model/converter_common_models/vrt_model/hvrt_relay.h" />
<Unit filename="header/model/converter_common_models/vrt_model/lvrt_control.h" />
<Unit filename="header/model/converter_common_models/vrt_model/lvrt_control_test.h" />
<Unit filename="header/model/converter_common_models/vrt_model/lvrt_relay.h" />
<Unit filename="header/model/converter_common_models/vrt_model/vrt_control_model.h" />
<Unit filename="header/model/converter_common_models/vrt_model/vrt_relay_model.h" />
<Unit filename="header/model/converter_common_models/vsg_model/vsg0.h" />
Expand Down Expand Up @@ -374,7 +378,6 @@
<Unit filename="header/model/wtg_models/wt_electrical_model/wt_electrical_model.h" />
<Unit filename="header/model/wtg_models/wt_electrical_model/wt_electrical_model_test.h" />
<Unit filename="header/model/wtg_models/wt_electrical_model/wt_electrical_models.h" />
<Unit filename="header/model/wtg_models/wt_generator_model/lvpl.h" />
<Unit filename="header/model/wtg_models/wt_generator_model/wt3g0.h" />
<Unit filename="header/model/wtg_models/wt_generator_model/wt3g0_test.h" />
<Unit filename="header/model/wtg_models/wt_generator_model/wt3g1.h" />
Expand Down Expand Up @@ -406,6 +409,9 @@
<Unit filename="header/model/wtg_models/wt_turbine_model/wt_turbine_model.h" />
<Unit filename="header/model/wtg_models/wt_turbine_model/wt_turbine_model_test.h" />
<Unit filename="header/model/wtg_models/wt_turbine_model/wt_turbine_models.h" />
<Unit filename="header/model/wtg_models/wt_voltage_ride_through_model/wt_voltage_ride_through_model.h" />
<Unit filename="header/model/wtg_models/wt_voltage_ride_through_model/wt_voltage_ride_through_models.h" />
<Unit filename="header/model/wtg_models/wt_voltage_ride_through_model/wtvrt3.h" />
<Unit filename="header/model/wtg_models/wtg_model.h" />
<Unit filename="header/model/wtg_models/wtg_model_test.h" />
<Unit filename="header/network/jacobian_builder.h" />
Expand Down Expand Up @@ -617,12 +623,25 @@
<Unit filename="source/meter/meter_test.cpp" />
<Unit filename="source/model/bus_model/bus_frequency_model/bus_frequency_model.cpp" />
<Unit filename="source/model/converter_common_model/current_order_limiter_model/convcol.cpp" />
<Unit filename="source/model/converter_common_model/lvpl_model/lvpl.cpp" />
<Unit filename="source/model/converter_common_model/pll_model/pll0.cpp" />
<Unit filename="source/model/converter_common_model/pll_model/pll_model.cpp" />
<Unit filename="source/model/converter_common_model/vrt_model/hvrt.cpp" />
<Unit filename="source/model/converter_common_model/vrt_model/lvrt.cpp" />
<Unit filename="source/model/converter_common_model/vrt_model/hvrt_control.cpp" />
<Unit filename="source/model/converter_common_model/vrt_model/hvrt_relay.cpp">
<Option compile="0" />
<Option link="0" />
</Unit>
<Unit filename="source/model/converter_common_model/vrt_model/lvrt_control.cpp" />
<Unit filename="source/model/converter_common_model/vrt_model/lvrt_control_test.cpp" />
<Unit filename="source/model/converter_common_model/vrt_model/lvrt_relay.cpp">
<Option compile="0" />
<Option link="0" />
</Unit>
<Unit filename="source/model/converter_common_model/vrt_model/vrt_control_model.cpp" />
<Unit filename="source/model/converter_common_model/vrt_model/vrt_relay_model.cpp" />
<Unit filename="source/model/converter_common_model/vrt_model/vrt_relay_model.cpp">
<Option compile="0" />
<Option link="0" />
</Unit>
<Unit filename="source/model/converter_common_model/vsg_model/vsg0.cpp" />
<Unit filename="source/model/converter_common_model/vsg_model/vsg_model2.cpp" />
<Unit filename="source/model/energy_storage_model/energy_storage_model.cpp" />
Expand Down Expand Up @@ -790,7 +809,6 @@
<Unit filename="source/model/wtg_models/wt_electrical_model/wt3evrt.cpp" />
<Unit filename="source/model/wtg_models/wt_electrical_model/wt_electrical_model.cpp" />
<Unit filename="source/model/wtg_models/wt_electrical_model/wt_electrical_model_test.cpp" />
<Unit filename="source/model/wtg_models/wt_generator_model/lvpl.cpp" />
<Unit filename="source/model/wtg_models/wt_generator_model/wt3g0.cpp" />
<Unit filename="source/model/wtg_models/wt_generator_model/wt3g0_test.cpp" />
<Unit filename="source/model/wtg_models/wt_generator_model/wt3g1.cpp" />
Expand All @@ -804,8 +822,14 @@
<Unit filename="source/model/wtg_models/wt_pitch_model/wt3p0_test.cpp" />
<Unit filename="source/model/wtg_models/wt_pitch_model/wt_pitch_model.cpp" />
<Unit filename="source/model/wtg_models/wt_pitch_model/wt_pitch_model_test.cpp" />
<Unit filename="source/model/wtg_models/wt_relay_model/vrtrly0.cpp" />
<Unit filename="source/model/wtg_models/wt_relay_model/vrtrly1.cpp" />
<Unit filename="source/model/wtg_models/wt_relay_model/vrtrly0.cpp">
<Option compile="0" />
<Option link="0" />
</Unit>
<Unit filename="source/model/wtg_models/wt_relay_model/vrtrly1.cpp">
<Option compile="0" />
<Option link="0" />
</Unit>
<Unit filename="source/model/wtg_models/wt_relay_model/wt_relay_model.cpp" />
<Unit filename="source/model/wtg_models/wt_relay_model/wt_relay_model_test.cpp">
<Option compile="0" />
Expand All @@ -820,6 +844,11 @@
<Unit filename="source/model/wtg_models/wt_turbine_model/wt3t0_test.cpp" />
<Unit filename="source/model/wtg_models/wt_turbine_model/wt_turbine_model.cpp" />
<Unit filename="source/model/wtg_models/wt_turbine_model/wt_turbine_model_test.cpp" />
<Unit filename="source/model/wtg_models/wt_voltage_ride_through_model/wt_voltage_ride_through_model.cpp" />
<Unit filename="source/model/wtg_models/wt_voltage_ride_through_model/wtvrt3.cpp">
<Option compile="0" />
<Option link="0" />
</Unit>
<Unit filename="source/model/wtg_models/wtg_model.cpp" />
<Unit filename="source/model/wtg_models/wtg_model_test.cpp" />
<Unit filename="source/network/jacobian_builder.cpp" />
Expand Down
Loading

0 comments on commit 4b3da40

Please sign in to comment.