diff --git a/code/steps/STEPS.cbp b/code/steps/STEPS.cbp index 31130a5e..966ca4cf 100644 --- a/code/steps/STEPS.cbp +++ b/code/steps/STEPS.cbp @@ -183,18 +183,18 @@ + + + + + + - - - - - - @@ -655,18 +655,18 @@ + + + + + + - - - - - - diff --git a/code/steps/STEPS.depend b/code/steps/STEPS.depend index 5158445d..c85701cb 100644 --- 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 @@ -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,7 +3814,7 @@ -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" @@ -3822,7 +3822,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" @@ -3890,7 +3890,7 @@ -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" @@ -3939,7 +3939,7 @@ -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" @@ -3947,7 +3947,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" @@ -7127,3 +7127,97 @@ +1710227843 d:\steps\code\steps\header\device\ac_line_test.h + + + + + "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" + + + +1710227843 source:d:\steps\code\steps\source\device\ac_line_test.cpp + + "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" + + + + + + +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" + + +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" + + +1710323857 d:\steps\code\steps\header\model\converter_common_models\converter_model\vs_converter_model\vsg_model\vsg0_test.h + + + + + "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 + + + + + "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" + + diff --git a/code/steps/header/model/converter_common_models/source_converter_model/source_converter_model.h b/code/steps/header/model/converter_common_models/converter_model/converter_model.h similarity index 81% rename from code/steps/header/model/converter_common_models/source_converter_model/source_converter_model.h rename to code/steps/header/model/converter_common_models/converter_model/converter_model.h index d51fb246..edd8a403 100644 --- a/code/steps/header/model/converter_common_models/source_converter_model/source_converter_model.h +++ b/code/steps/header/model/converter_common_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/code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/gfrmc_model.h b/code/steps/header/model/converter_common_models/converter_model/vs_converter_model/vs_converter_model.h similarity index 85% rename from code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/gfrmc_model.h rename to code/steps/header/model/converter_common_models/converter_model/vs_converter_model/vs_converter_model.h index a64b9c75..8d52576f 100644 --- a/code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/gfrmc_model.h +++ b/code/steps/header/model/converter_common_models/converter_model/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/code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0.h b/code/steps/header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0.h similarity index 92% rename from code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0.h rename to code/steps/header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0.h index 820f3594..52b1f573 100644 --- a/code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0.h +++ b/code/steps/header/model/converter_common_models/converter_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/code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0_test.h b/code/steps/header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0_test.h similarity index 73% rename from code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0_test.h rename to code/steps/header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg0_test.h index 3895af1e..d796f48f 100644 --- a/code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg0_test.h +++ b/code/steps/header/model/converter_common_models/converter_model/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/code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg_model.h b/code/steps/header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model.h similarity index 80% rename from code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg_model.h rename to code/steps/header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model.h index d32fd6ce..e63d34fa 100644 --- a/code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg_model.h +++ b/code/steps/header/model/converter_common_models/converter_model/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/code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg_model_test.h b/code/steps/header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model_test.h similarity index 92% rename from code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg_model_test.h rename to code/steps/header/model/converter_common_models/converter_model/vs_converter_model/vsg_model/vsg_model_test.h index cca3423f..c38cebcd 100644 --- a/code/steps/header/model/converter_common_models/source_converter_model/gfrmc_model/vsg_model/vsg_model_test.h +++ b/code/steps/header/model/converter_common_models/converter_model/vs_converter_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 index f27e0deb..36f91fe5 100644 --- 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 index 7b41f361..2998ac6d 100644 --- 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" diff --git a/code/steps/source/model/converter_common_model/converter_model/converter_model.cpp b/code/steps/source/model/converter_common_model/converter_model/converter_model.cpp new file mode 100644 index 00000000..e55c3f52 --- /dev/null +++ b/code/steps/source/model/converter_common_model/converter_model/converter_model.cpp @@ -0,0 +1,55 @@ +#include "header/model/converter_common_models/converter_model/converter_model.h" +#include "header/basic/utility.h" +#include "header/power_system_database.h" +#include "header/STEPS.h" +#include +using namespace std; +CONVERTER_MODEL::CONVERTER_MODEL(STEPS& toolkit) +{ + set_toolkit(toolkit); +} + +CONVERTER_MODEL::~CONVERTER_MODEL() +{ + ; +} + +void CONVERTER_MODEL::set_toolkit(STEPS& toolkit) +{ + this->toolkit = &toolkit; +} + +STEPS& CONVERTER_MODEL::get_toolkit() const +{ + return *toolkit; +} + +void CONVERTER_MODEL::set_bus_pointer(BUS* busptr) +{ + this->busptr = busptr; +} + +void CONVERTER_MODEL::set_device_pointer(NONBUS_DEVICE* device) +{ + this->device = device; +} + +BUS* CONVERTER_MODEL::get_bus_pointer() const +{ + return busptr; +} + +NONBUS_DEVICE* CONVERTER_MODEL::get_device_pointer() const +{ + return device; +} + +DEVICE_ID CONVERTER_MODEL::get_device_id() const +{ + return device->get_device_id(); +} + +string CONVERTER_MODEL::get_compound_device_name() const +{ + return get_device_id().get_compound_device_name(); +} diff --git a/code/steps/source/model/converter_common_model/converter_model/vs_converter_model/vs_converter_model.cpp b/code/steps/source/model/converter_common_model/converter_model/vs_converter_model/vs_converter_model.cpp new file mode 100644 index 00000000..111ac30d --- /dev/null +++ b/code/steps/source/model/converter_common_model/converter_model/vs_converter_model/vs_converter_model.cpp @@ -0,0 +1,132 @@ +#include "header/model/converter_common_models/converter_model/vs_converter_model/vs_converter_model.h" +#include "header/basic/utility.h" +#include "header/power_system_database.h" +#include "header/STEPS.h" +#include +using namespace std; +VS_CONVERTER_MODEL::VS_CONVERTER_MODEL(STEPS& toolkit) : CONVERTER_MODEL(toolkit) +{ + set_toolkit(toolkit); +} + +VS_CONVERTER_MODEL::~VS_CONVERTER_MODEL() +{ + ; +} + +void VS_CONVERTER_MODEL::set_Pref_in_pu_based_on_mbase(double P) +{ + Pref = P; +} + +void VS_CONVERTER_MODEL::set_Qref_in_pu_based_on_mbase(double Q) +{ + Qref = Q; +} + +void VS_CONVERTER_MODEL::set_Vref_in_pu(double V) +{ + Vref = V; +} + +void VS_CONVERTER_MODEL::set_P_in_pu_based_on_mbase(double P) +{ + this->P = P; +} + +void VS_CONVERTER_MODEL::set_Q_in_pu_based_on_mbase(double Q) +{ + this->Q = Q; +} + +void VS_CONVERTER_MODEL::set_V_in_pu(double V) +{ + this->V = V; +} + +double VS_CONVERTER_MODEL::get_Pref_in_pu_based_on_mbase() const +{ + return Pref; +} + +double VS_CONVERTER_MODEL::get_Qref_in_pu_based_on_mbase() const +{ + return Qref; +} + +double VS_CONVERTER_MODEL::get_Vref_in_pu() const +{ + return Vref; +} + +double VS_CONVERTER_MODEL::get_P_in_pu_based_on_mbase() const +{ + return P; +} + +double VS_CONVERTER_MODEL::get_Q_in_pu_based_on_mbase() const +{ + return Q; +} + +double VS_CONVERTER_MODEL::get_V_in_pu() const +{ + return V; +} + +void VS_CONVERTER_MODEL::set_initial_virtual_voltage_in_pu(double V) +{ + V0 = V; +} + +void VS_CONVERTER_MODEL::set_initial_virtual_angle_in_rad(double angle) +{ + angle0 = angle; +} +double VS_CONVERTER_MODEL::get_initial_virtual_voltage_in_pu() const +{ + return V0; +} + +double VS_CONVERTER_MODEL::get_initial_virtual_angle_in_rad() const +{ + return angle0; +} + +double VS_CONVERTER_MODEL::get_virtual_frequency_deviation_in_pu() const +{ + return get_virtual_frequency_deviation_in_Hz()/get_base_frequency_in_Hz(); +} + +double VS_CONVERTER_MODEL::get_virtual_frequency_in_pu() const +{ + return get_virtual_frequency_deviation_in_pu()+1.0; +} + +double VS_CONVERTER_MODEL::get_virtual_frequency_in_Hz() const +{ + return get_virtual_frequency_deviation_in_Hz()+get_base_frequency_in_Hz(); +} + +double VS_CONVERTER_MODEL::get_virtual_angle_in_deg() const +{ + return rad2deg(get_virtual_angle_in_rad()); +} + +void VS_CONVERTER_MODEL::initialize_base_frequency_and_base_angle_speed() +{ + double fbase = get_bus_pointer()->get_base_frequency_in_Hz(); + this->fbase_Hz = fbase; + wbase_radps = DOUBLE_PI*fbase; +} + +double VS_CONVERTER_MODEL::get_base_frequency_in_Hz() const +{ + return fbase_Hz; +} + +double VS_CONVERTER_MODEL::get_base_angle_speed_in_radps() const +{ + return wbase_radps; +} + diff --git a/code/steps/source/model/converter_common_model/source_converter_model/gfrmc_model/vsg_model/vsg0.cpp b/code/steps/source/model/converter_common_model/converter_model/vs_converter_model/vsg_model/vsg0.cpp similarity index 97% rename from code/steps/source/model/converter_common_model/source_converter_model/gfrmc_model/vsg_model/vsg0.cpp rename to code/steps/source/model/converter_common_model/converter_model/vs_converter_model/vsg_model/vsg0.cpp index bb983496..9f45048d 100644 --- a/code/steps/source/model/converter_common_model/source_converter_model/gfrmc_model/vsg_model/vsg0.cpp +++ b/code/steps/source/model/converter_common_model/converter_model/vs_converter_model/vsg_model/vsg0.cpp @@ -1,4 +1,4 @@ -#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/basic/utility.h" #include "header/power_system_database.h" #include "header/STEPS.h" diff --git a/code/steps/source/model/converter_common_model/source_converter_model/gfrmc_model/vsg_model/vsg_model.cpp b/code/steps/source/model/converter_common_model/converter_model/vs_converter_model/vsg_model/vsg_model.cpp similarity index 54% rename from code/steps/source/model/converter_common_model/source_converter_model/gfrmc_model/vsg_model/vsg_model.cpp rename to code/steps/source/model/converter_common_model/converter_model/vs_converter_model/vsg_model/vsg_model.cpp index abf1e26e..b6d78aff 100644 --- a/code/steps/source/model/converter_common_model/source_converter_model/gfrmc_model/vsg_model/vsg_model.cpp +++ b/code/steps/source/model/converter_common_model/converter_model/vs_converter_model/vsg_model/vsg_model.cpp @@ -1,10 +1,10 @@ -#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/basic/utility.h" #include "header/power_system_database.h" #include "header/STEPS.h" #include using namespace std; -VSG_MODEL::VSG_MODEL(STEPS& toolkit) : GFRMC_MODEL(toolkit) +VSG_MODEL::VSG_MODEL(STEPS& toolkit) : VS_CONVERTER_MODEL(toolkit) { set_toolkit(toolkit); } diff --git a/code/steps/source/model/converter_common_model/source_converter_model/gfrmc_model/vsg_model/vsg_model_test.cpp b/code/steps/source/model/converter_common_model/converter_model/vs_converter_model/vsg_model/vsg_model_test.cpp similarity index 98% rename from code/steps/source/model/converter_common_model/source_converter_model/gfrmc_model/vsg_model/vsg_model_test.cpp rename to code/steps/source/model/converter_common_model/converter_model/vs_converter_model/vsg_model/vsg_model_test.cpp index a89ee9a6..b78fb734 100644 --- a/code/steps/source/model/converter_common_model/source_converter_model/gfrmc_model/vsg_model/vsg_model_test.cpp +++ b/code/steps/source/model/converter_common_model/converter_model/vs_converter_model/vsg_model/vsg_model_test.cpp @@ -1,5 +1,5 @@ #include "header/basic/test_macro.h" -#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/basic/utility.h" #include "header/steps_namespace.h" #include diff --git a/code/steps/source/model/converter_common_model/source_converter_model/gfrmc_model/frmc_model.cpp b/code/steps/source/model/converter_common_model/source_converter_model/gfrmc_model/frmc_model.cpp deleted file mode 100644 index d75cb6ac..00000000 --- a/code/steps/source/model/converter_common_model/source_converter_model/gfrmc_model/frmc_model.cpp +++ /dev/null @@ -1,132 +0,0 @@ -#include "header/model/converter_common_models/source_converter_model/gfrmc_model/gfrmc_model.h" -#include "header/basic/utility.h" -#include "header/power_system_database.h" -#include "header/STEPS.h" -#include -using namespace std; -GFRMC_MODEL::GFRMC_MODEL(STEPS& toolkit) : SOURCE_CONVERTER_MODEL(toolkit) -{ - set_toolkit(toolkit); -} - -GFRMC_MODEL::~GFRMC_MODEL() -{ - ; -} - -void GFRMC_MODEL::set_Pref_in_pu_based_on_mbase(double P) -{ - Pref = P; -} - -void GFRMC_MODEL::set_Qref_in_pu_based_on_mbase(double Q) -{ - Qref = Q; -} - -void GFRMC_MODEL::set_Vref_in_pu(double V) -{ - Vref = V; -} - -void GFRMC_MODEL::set_P_in_pu_based_on_mbase(double P) -{ - this->P = P; -} - -void GFRMC_MODEL::set_Q_in_pu_based_on_mbase(double Q) -{ - this->Q = Q; -} - -void GFRMC_MODEL::set_V_in_pu(double V) -{ - this->V = V; -} - -double GFRMC_MODEL::get_Pref_in_pu_based_on_mbase() const -{ - return Pref; -} - -double GFRMC_MODEL::get_Qref_in_pu_based_on_mbase() const -{ - return Qref; -} - -double GFRMC_MODEL::get_Vref_in_pu() const -{ - return Vref; -} - -double GFRMC_MODEL::get_P_in_pu_based_on_mbase() const -{ - return P; -} - -double GFRMC_MODEL::get_Q_in_pu_based_on_mbase() const -{ - return Q; -} - -double GFRMC_MODEL::get_V_in_pu() const -{ - return V; -} - -void GFRMC_MODEL::set_initial_virtual_voltage_in_pu(double V) -{ - V0 = V; -} - -void GFRMC_MODEL::set_initial_virtual_angle_in_rad(double angle) -{ - angle0 = angle; -} -double GFRMC_MODEL::get_initial_virtual_voltage_in_pu() const -{ - return V0; -} - -double GFRMC_MODEL::get_initial_virtual_angle_in_rad() const -{ - return angle0; -} - -double GFRMC_MODEL::get_virtual_frequency_deviation_in_pu() const -{ - return get_virtual_frequency_deviation_in_Hz()/get_base_frequency_in_Hz(); -} - -double GFRMC_MODEL::get_virtual_frequency_in_pu() const -{ - return get_virtual_frequency_deviation_in_pu()+1.0; -} - -double GFRMC_MODEL::get_virtual_frequency_in_Hz() const -{ - return get_virtual_frequency_deviation_in_Hz()+get_base_frequency_in_Hz(); -} - -double GFRMC_MODEL::get_virtual_angle_in_deg() const -{ - return rad2deg(get_virtual_angle_in_rad()); -} - -void GFRMC_MODEL::initialize_base_frequency_and_base_angle_speed() -{ - double fbase = get_bus_pointer()->get_base_frequency_in_Hz(); - this->fbase_Hz = fbase; - wbase_radps = DOUBLE_PI*fbase; -} - -double GFRMC_MODEL::get_base_frequency_in_Hz() const -{ - return fbase_Hz; -} - -double GFRMC_MODEL::get_base_angle_speed_in_radps() const -{ - return wbase_radps; -} - diff --git a/code/steps/source/model/converter_common_model/source_converter_model/source_converter_model.cpp b/code/steps/source/model/converter_common_model/source_converter_model/source_converter_model.cpp deleted file mode 100644 index a121d62d..00000000 --- a/code/steps/source/model/converter_common_model/source_converter_model/source_converter_model.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#include "header/model/converter_common_models/source_converter_model/source_converter_model.h" -#include "header/basic/utility.h" -#include "header/power_system_database.h" -#include "header/STEPS.h" -#include -using namespace std; -SOURCE_CONVERTER_MODEL::SOURCE_CONVERTER_MODEL(STEPS& toolkit) -{ - set_toolkit(toolkit); -} - -SOURCE_CONVERTER_MODEL::~SOURCE_CONVERTER_MODEL() -{ - ; -} - -void SOURCE_CONVERTER_MODEL::set_toolkit(STEPS& toolkit) -{ - this->toolkit = &toolkit; -} - -STEPS& SOURCE_CONVERTER_MODEL::get_toolkit() const -{ - return *toolkit; -} - -void SOURCE_CONVERTER_MODEL::set_bus_pointer(BUS* busptr) -{ - this->busptr = busptr; -} - -void SOURCE_CONVERTER_MODEL::set_device_pointer(NONBUS_DEVICE* device) -{ - this->device = device; -} - -BUS* SOURCE_CONVERTER_MODEL::get_bus_pointer() const -{ - return busptr; -} - -NONBUS_DEVICE* SOURCE_CONVERTER_MODEL::get_device_pointer() const -{ - return device; -} - -DEVICE_ID SOURCE_CONVERTER_MODEL::get_device_id() const -{ - return device->get_device_id(); -} - -string SOURCE_CONVERTER_MODEL::get_compound_device_name() const -{ - return get_device_id().get_compound_device_name(); -}