rename SOURCE_CONVERTER_MODEL to CONVERTER_MODEL. rename GFRMC_MODEL …

…to VS_CONVERTER_MODEL. Add folder for future CS_CONVERTER_MODEL and LC_CONVERTER_MODEL.
changgang · Mar 13, 2024 · b3ed821 · b3ed821
1 parent c647b4b
commit b3ed821
Show file tree

Hide file tree

Showing 17 changed files with 331 additions and 237 deletions.
diff --git a/code/steps/STEPS.cbp b/code/steps/STEPS.cbp
@@ -183,18 +183,18 @@
 		<Unit filename="header/model/auxiliary_signal_model/auxiliary_signal_model_test.h" />
 		<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/converter_model/converter_model.h" />
+		<Unit filename="header/model/converter_common_models/converter_model/vs_converter_model/vs_converter_model.h" />
+		<Unit filename="header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0.h" />
+		<Unit filename="header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0_test.h" />
+		<Unit filename="header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model.h" />
+		<Unit filename="header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model_test.h" />
 		<Unit filename="header/model/converter_common_models/current_order_limiter_model/convcol.h" />
 		<Unit filename="header/model/converter_common_models/elec_model/convelec0.h" />
 		<Unit filename="header/model/converter_common_models/elec_model/converter_elec_model.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/source_converter_model/gfrmc_model/gfrmc_model.h" />
-		<Unit filename="header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0.h" />
-		<Unit filename="header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0_test.h" />
-		<Unit filename="header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg_model.h" />
-		<Unit filename="header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg_model_test.h" />
-		<Unit filename="header/model/converter_common_models/source_converter_model/source_converter_model.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" />
@@ -655,18 +655,18 @@
 		<Unit filename="source/meter/meter_setter_test.cpp" />
 		<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/converter_model/converter_model.cpp" />
+		<Unit filename="source/model/converter_common_model/converter_model/vs_converter_model/vs_converter_model.cpp" />
+		<Unit filename="source/model/converter_common_model/converter_model/vs_converter_model/vsg_model/vsg0.cpp" />
+		<Unit filename="source/model/converter_common_model/converter_model/vs_converter_model/vsg_model/vsg_model.cpp" />
+		<Unit filename="source/model/converter_common_model/converter_model/vs_converter_model/vsg_model/vsg_model_test.cpp">
+			<Option compile="0" />
+			<Option link="0" />
+		</Unit>
 		<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/source_converter_model/gfrmc_model/frmc_model.cpp" />
-		<Unit filename="source/model/converter_common_model/source_converter_model/gfrmc_model/vsg_model/vsg0.cpp" />
-		<Unit filename="source/model/converter_common_model/source_converter_model/gfrmc_model/vsg_model/vsg_model.cpp" />
-		<Unit filename="source/model/converter_common_model/source_converter_model/gfrmc_model/vsg_model/vsg_model_test.cpp">
-			<Option compile="0" />
-			<Option link="0" />
-		</Unit>
-		<Unit filename="source/model/converter_common_model/source_converter_model/source_converter_model.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" />
 		<Unit filename="source/model/converter_common_model/vrt_model/lvrt_control.cpp" />

diff --git a/code/steps/STEPS.depend b/code/steps/STEPS.depend
@@ -713,7 +713,7 @@
 	"header/basic/utility.h"
 	"header/data_imexporter/psse_imexporter.h"
 
-1710221558 source:d:\steps\code\steps\main_tests.cpp
+1710323857 source:d:\steps\code\steps\main_tests.cpp
 	<istream>
 	<cstdlib>
 	<cstring>
@@ -746,7 +746,7 @@
 	"header/device/wt_generator_test.h"
 	"header/device/pv_unit_test.h"
 	"header/device/load_test.h"
-	"header/device/line_test.h"
+	"header/device/ac_line_test.h"
 	"header/device/transformer_test.h"
 	"header/device/fixed_shunt_test.h"
 	"header/device/lcc_hvdc2t_test.h"
@@ -816,7 +816,7 @@
 	"header/model/lcc_hvdc2t_model/vdcol_test.h"
 	"header/model/lcc_hvdc2t_model/CDC4T_test.h"
 	"header/model/lcc_hvdc2t_model/CDC6T_test.h"
-	"header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0_test.h"
+	"header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0_test.h"
 	"header/model/converter_common_models/vrt_model/lvrt_control_test.h"
 	"header/model/wtg_models/wt_generator_model/wt3g1_test.h"
 	"header/model/wtg_models/wt_generator_model/wt3g0_test.h"
@@ -2552,9 +2552,9 @@
 	"header/block/integral_block.h"
 	"header/block/first_order_block.h"
 
-1710161436 d:\steps\code\steps\header\model\wtg_models\wt_generator_model\wt3gx.h
+1710323857 d:\steps\code\steps\header\model\wtg_models\wt_generator_model\wt3gx.h
 	"header/model/wtg_models/wt_generator_model/wt_generator_model.h"
-	"header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0.h"
+	"header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0.h"
 	"header/model/converter_common_models/current_order_limiter_model/convcol.h"
 	"header/block/integral_block.h"
 	"header/block/first_order_block.h"
@@ -3814,15 +3814,15 @@
 	<iostream>
 	<cstdio>
 
-1710225259 source:d:\steps\code\steps\source\data_imexporter\bpa_powerflow_imexporter.cpp
+1710227843 source:d:\steps\code\steps\source\data_imexporter\bpa_powerflow_imexporter.cpp
 	"header/data_imexporter/bpa_imexporter.h"
 	"header/basic/utility.h"
 	"header/device/bus.h"
 	"header/device/load.h"
 	"header/device/fixed_shunt.h"
 	"header/device/generator.h"
 	"header/device/wt_generator.h"
-	"header/device/line.h"
+	"header/device/ac_line.h"
 	"header/device/transformer.h"
 	"header/steps_namespace.h"
 	<cstdio>
@@ -3890,7 +3890,7 @@
 	<iostream>
 	<cstdio>
 
-1710225259 source:d:\steps\code\steps\source\data_imexporter\psse_powerflow_imexporter.cpp
+1710227843 source:d:\steps\code\steps\source\data_imexporter\psse_powerflow_imexporter.cpp
 	"header/data_imexporter/psse_imexporter.h"
 	"header/data_imexporter/steps_imexporter.h"
 	"header/basic/utility.h"
@@ -3899,7 +3899,7 @@
 	"header/device/fixed_shunt.h"
 	"header/device/generator.h"
 	"header/device/wt_generator.h"
-	"header/device/line.h"
+	"header/device/ac_line.h"
 	"header/device/transformer.h"
 	"header/steps_namespace.h"
 	<cstdio>
@@ -3939,15 +3939,15 @@
 	<iostream>
 	<cstdio>
 
-1710225258 source:d:\steps\code\steps\source\data_imexporter\steps_powerflow_imexporter.cpp
+1710227843 source:d:\steps\code\steps\source\data_imexporter\steps_powerflow_imexporter.cpp
 	"header/data_imexporter/steps_imexporter.h"
 	"header/basic/utility.h"
 	"header/device/bus.h"
 	"header/device/load.h"
 	"header/device/fixed_shunt.h"
 	"header/device/generator.h"
 	"header/device/wt_generator.h"
-	"header/device/line.h"
+	"header/device/ac_line.h"
 	"header/device/transformer.h"
 	"header/steps_namespace.h"
 	<cstdio>
@@ -7127,3 +7127,97 @@
 	<complex>
 	<string>
 
+1710227843 d:\steps\code\steps\header\device\ac_line_test.h
+	<istream>
+	<cstdlib>
+	<cstring>
+	<iostream>
+	"cpptest.h"
+	"header/device/ac_line.h"
+	"header/power_system_database.h"
+	"header/STEPS.h"
+
+1710227843 source:d:\steps\code\steps\source\device\ac_line.cpp
+	"header/device/ac_line.h"
+	"header/basic/utility.h"
+	"header/basic/constants.h"
+	"header/steps_namespace.h"
+	<istream>
+	<iostream>
+
+1710227843 source:d:\steps\code\steps\source\device\ac_line_test.cpp
+	<cmath>
+	"cpptest.h"
+	"header/basic/test_macro.h"
+	"header/device/ac_line_test.h"
+	"header/basic/constants.h"
+	"header/basic/utility.h"
+	"header/steps_namespace.h"
+	<cstdlib>
+	<cstring>
+	<istream>
+	<iostream>
+	<cstdio>
+
+1710323857 d:\steps\code\steps\header\model\converter_common_models\converter_model\vs_converter_model\vsg_model\vsg0.h
+	"header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model.h"
+	"header/block/integral_block.h"
+
+1710323621 d:\steps\code\steps\header\model\converter_common_models\converter_model\vs_converter_model\vsg_model\vsg_model.h
+	"header/model/converter_common_models/converter_model/vs_converter_model/vs_converter_model.h"
+	"header/STEPS.h"
+
+1710323621 d:\steps\code\steps\header\model\converter_common_models\converter_model\vs_converter_model\vs_converter_model.h
+	"header/model/converter_common_models/converter_model/converter_model.h"
+	"header/STEPS.h"
+
+1710323503 d:\steps\code\steps\header\model\converter_common_models\converter_model\converter_model.h
+	"header/STEPS.h"
+
+1710323503 source:d:\steps\code\steps\source\model\converter_common_model\converter_model\converter_model.cpp
+	"header/model/converter_common_models/converter_model/converter_model.h"
+	"header/basic/utility.h"
+	"header/power_system_database.h"
+	"header/STEPS.h"
+	<iostream>
+
+1710323621 source:d:\steps\code\steps\source\model\converter_common_model\converter_model\vs_converter_model\vs_converter_model.cpp
+	"header/model/converter_common_models/converter_model/vs_converter_model/vs_converter_model.h"
+	"header/basic/utility.h"
+	"header/power_system_database.h"
+	"header/STEPS.h"
+	<iostream>
+
+1710323857 d:\steps\code\steps\header\model\converter_common_models\converter_model\vs_converter_model\vsg_model\vsg0_test.h
+	<istream>
+	<cstdlib>
+	<cstring>
+	<iostream>
+	"header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model_test.h"
+	"header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0.h"
+	"header/power_system_database.h"
+	"header/STEPS.h"
+
+1710323857 d:\steps\code\steps\header\model\converter_common_models\converter_model\vs_converter_model\vsg_model\vsg_model_test.h
+	<istream>
+	<cstdlib>
+	<cstring>
+	<iostream>
+	"cpptest.h"
+	"header/power_system_database.h"
+	"header/STEPS.h"
+	"header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model.h"
+
+1710323857 source:d:\steps\code\steps\source\model\converter_common_model\converter_model\vs_converter_model\vsg_model\vsg0.cpp
+	"header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0.h"
+	"header/basic/utility.h"
+	"header/power_system_database.h"
+	"header/STEPS.h"
+
+1710323857 source:d:\steps\code\steps\source\model\converter_common_model\converter_model\vs_converter_model\vsg_model\vsg_model.cpp
+	"header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model.h"
+	"header/basic/utility.h"
+	"header/power_system_database.h"
+	"header/STEPS.h"
+	<iostream>
+
diff --git a/..._converter_model/source_converter_model.h → ..._models/converter_model/converter_model.h b/..._converter_model/source_converter_model.h → ..._models/converter_model/converter_model.h
@@ -1,15 +1,15 @@
-#ifndef SOURCE_CONVERTER_MODEL_H
-#define SOURCE_CONVERTER_MODEL_H
+#ifndef CONVERTER_MODEL_H
+#define CONVERTER_MODEL_H
 
 #include "header/STEPS.h"
 
 class BUS;
 
-class SOURCE_CONVERTER_MODEL
+class CONVERTER_MODEL
 {
     public:
-        SOURCE_CONVERTER_MODEL(STEPS& toolkit);
-        ~SOURCE_CONVERTER_MODEL();
+        CONVERTER_MODEL(STEPS& toolkit);
+        ~CONVERTER_MODEL();
         void set_toolkit(STEPS& toolkit);
         STEPS& get_toolkit() const;
 
@@ -35,4 +35,4 @@ class SOURCE_CONVERTER_MODEL
         NONBUS_DEVICE* device;
 };
 
-#endif // SOURCE_CONVERTER_MODEL_H
+#endif // CONVERTER_MODEL_H
diff --git a/...converter_model/gfrmc_model/gfrmc_model.h → ...l/vs_converter_model/vs_converter_model.h b/...converter_model/gfrmc_model/gfrmc_model.h → ...l/vs_converter_model/vs_converter_model.h
@@ -1,16 +1,16 @@
-#ifndef GFRMC_MODEL_H
-#define GFRMC_MODEL_H
+#ifndef VS_CONVERTER_MODEL_H
+#define VS_CONVERTER_MODEL_H
 
-#include "header/model/converter_common_models/source_converter_model/source_converter_model.h"
+#include "header/model/converter_common_models/converter_model/converter_model.h"
 #include "header/STEPS.h"
 
 class BUS;
 
-class GFRMC_MODEL: public SOURCE_CONVERTER_MODEL
+class VS_CONVERTER_MODEL: public CONVERTER_MODEL
 {
     public:
-        GFRMC_MODEL(STEPS& toolkit);
-        ~GFRMC_MODEL();
+        VS_CONVERTER_MODEL(STEPS& toolkit);
+        ~VS_CONVERTER_MODEL();
 
         void set_Pref_in_pu_based_on_mbase(double P);
         void set_Qref_in_pu_based_on_mbase(double Q);
@@ -55,4 +55,4 @@ class GFRMC_MODEL: public SOURCE_CONVERTER_MODEL
         double fbase_Hz, wbase_radps;
 };
 
-#endif // GFRMC_MODEL_H
+#endif // VS_CONVERTER_MODEL_H
diff --git a/...verter_model/gfrmc_model/vsg_model/vsg0.h → ...model/vs_converter_model/vsg_model/vsg0.h b/...verter_model/gfrmc_model/vsg_model/vsg0.h → ...model/vs_converter_model/vsg_model/vsg0.h
@@ -1,7 +1,7 @@
 #ifndef VSG0_H
 #define VSG0_H
 
-#include "header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg_model.h"
+#include "header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model.h"
 #include "header/block/integral_block.h"
 
 class VSG0 : public VSG_MODEL

diff --git a/...r_model/gfrmc_model/vsg_model/vsg0_test.h → .../vs_converter_model/vsg_model/vsg0_test.h b/...r_model/gfrmc_model/vsg_model/vsg0_test.h → .../vs_converter_model/vsg_model/vsg0_test.h
@@ -10,9 +10,9 @@
 	#pragma warning (disable: 4290)
 #endif
 
-#include "header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg_model_test.h"
+#include "header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model_test.h"
 
-#include "header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0.h"
+#include "header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0.h"
 #include "header/power_system_database.h"
 #include "header/STEPS.h"
 

diff --git a/...r_model/gfrmc_model/vsg_model/vsg_model.h → .../vs_converter_model/vsg_model/vsg_model.h b/...r_model/gfrmc_model/vsg_model/vsg_model.h → .../vs_converter_model/vsg_model/vsg_model.h
@@ -1,12 +1,12 @@
 #ifndef VSG_MODEL_H
 #define VSG_MODEL_H
 
-#include "header/model/converter_common_models/source_converter_model/gfrmc_model/gfrmc_model.h"
+#include "header/model/converter_common_models/converter_model/vs_converter_model/vs_converter_model.h"
 #include "header/STEPS.h"
 
 class BUS;
 
-class VSG_MODEL: public GFRMC_MODEL
+class VSG_MODEL: public VS_CONVERTER_MODEL
 {
     public:
         VSG_MODEL(STEPS& toolkit);

diff --git a/...el/gfrmc_model/vsg_model/vsg_model_test.h → ...onverter_model/vsg_model/vsg_model_test.h b/...el/gfrmc_model/vsg_model/vsg_model_test.h → ...onverter_model/vsg_model/vsg_model_test.h
@@ -14,7 +14,7 @@
 
 #include "header/power_system_database.h"
 #include "header/STEPS.h"
-#include "header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg_model.h"
+#include "header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model.h"
 using namespace std;
 
 class VSG_MODEL_TEST : public Test::Suite

diff --git a/code/steps/header/model/wtg_models/wt_generator_model/wt3gx.h b/code/steps/header/model/wtg_models/wt_generator_model/wt3gx.h
@@ -2,7 +2,7 @@
 #define WT3GX_H
 
 #include "header/model/wtg_models/wt_generator_model/wt_generator_model.h"
-#include "header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0.h"
+#include "header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0.h"
 #include "header/model/converter_common_models/current_order_limiter_model/convcol.h"
 #include "header/block/integral_block.h"
 #include "header/block/first_order_block.h"

diff --git a/code/steps/main_tests.cpp b/code/steps/main_tests.cpp
@@ -130,7 +130,7 @@
 #include "header/model/lcc_hvdc2t_model/CDC4T_test.h"
 #include "header/model/lcc_hvdc2t_model/CDC6T_test.h"
 
-#include "header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0_test.h"
+#include "header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0_test.h"
 #include "header/model/converter_common_models/vrt_model/lvrt_control_test.h"
 
 //#include "header/model/vsc_hvdc_model/VSCHVDC1_test.h"