v0.3.27.3. Add some channels to dynamic simulator

changgang · Aug 24, 2019 · 76c6258 · 76c6258
1 parent 6957538
commit 76c6258
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/code/STEPS.depend b/code/STEPS.depend
@@ -4178,7 +4178,7 @@
 	"header/model/wtg_models/wt_aerodynamic_model/wt_aerodynamic_model.h"
 	<cstdlib>
 
-1561097473 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_aerodynamic_model\wt_aerodynamic_model.cpp
+1566356933 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_aerodynamic_model\wt_aerodynamic_model.cpp
 	"header/model/wtg_models/wt_aerodynamic_model/wt_aerodynamic_model.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"

diff --git a/code/source/model/wtg_models/wt_aerodynamic_model/wt_aerodynamic_model.cpp b/code/source/model/wtg_models/wt_aerodynamic_model/wt_aerodynamic_model.cpp
@@ -827,7 +827,7 @@ void WT_AERODYNAMIC_MODEL::initialize_pitch_angle()
                     {
                         string iteration_info = osstream.str();
                         osstream.str("");
-                        osstream<<"Warning. Failed to get initial pitch angle in "<<iter_max<<" iterations."<<endl
+                        osstream<<"Error. Failed to get initial pitch angle in "<<iter_max<<" iterations."<<endl
                                 <<"Pitch angle is initialized as "<<pitch_new<<" deg."<<endl
                                 <<"Check "<<get_model_name()<<" model of "<<get_device_name()<<endl
                                 <<"Below are iteration:"<<endl

diff --git a/code/source/toolkit/dynamic_simulator/dynamic_simulator.cpp b/code/source/toolkit/dynamic_simulator/dynamic_simulator.cpp
@@ -692,6 +692,8 @@ void DYNAMICS_SIMULATOR::prepare_generator_related_meter(const DEVICE_ID& did, s
                 meter = setter.prepare_generator_rotor_speed_deviation_in_pu_meter(did);
             if(meter_type=="EXCITATION VOLTAGE IN PU")
                 meter = setter.prepare_generator_excitation_voltage_in_pu_meter(did);
+            if(meter_type=="STABILIZING SIGNAL IN PU")
+                meter = setter.prepare_generator_stabilizing_signal_in_pu_meter(did);
             if(meter_type=="MECHANICAL POWER IN MW")
                 meter = setter.prepare_generator_mechanical_power_in_MW_meter(did);
             if(meter_type=="MECHANICAL POWER REFERENCE IN MW")
@@ -766,6 +768,10 @@ void DYNAMICS_SIMULATOR::prepare_wt_generator_related_meter(const DEVICE_ID& did
                 meter = setter.prepare_wt_generator_turbine_speed_in_pu_meter(did);
             if(meter_type=="ROTOR SPEED IN PU")
                 meter = setter.prepare_wt_generator_rotor_speed_in_pu_meter(did);
+            if(meter_type=="TURBINE SPEED DEVIATION IN PU")
+                meter = setter.prepare_wt_generator_turbine_speed_deviation_in_pu_meter(did);
+            if(meter_type=="ROTOR SPEED DEVIATION IN PU")
+                meter = setter.prepare_wt_generator_rotor_speed_deviation_in_pu_meter(did);
             if(meter_type=="ROTOR ANGLE IN DEG")
                 meter = setter.prepare_wt_generator_rotor_angle_in_deg_meter(did);
             if(meter_type=="ACTIVE CURRENT COMMAND IN PU")