From 4dce576d8a32fda3eb36b92e903363fddaf14fb4 Mon Sep 17 00:00:00 2001
From: Changgang Li <lichgang@sdu.edu.cn>
Date: Tue, 4 Jun 2019 01:09:46 +0800
Subject: [PATCH] v0.3.10. Update all codes by moving all true contitions to
 the first of if. Performance is increased by only 2%

---
 README.md                                     |    2 +
 bench/sm.dyr                                  |    0
 bench/smib.dyr                                |    0
 code/STEPS.cbp                                |    5 +-
 code/STEPS.depend                             |  224 +-
 .../dynamic_simulator/dynamic_simulator.h     |    2 +
 code/main_tests.cpp                           |    8 +-
 code/source/STEPS.cpp                         |   32 +-
 code/source/basic/area.cpp                    |   39 +-
 code/source/basic/device_id.cpp               |  208 +-
 code/source/basic/device_index_map.cpp        |  176 +-
 code/source/basic/inphno.cpp                  |   92 +-
 code/source/basic/ownership.cpp               |   27 +-
 code/source/basic/rating.cpp                  |   12 +-
 code/source/basic/sparse_matrix_csparse.cpp   |  352 +-
 code/source/basic/sparse_matrix_klu.cpp       |  182 +-
 code/source/basic/sparse_matrix_umfpack.cpp   |  177 +-
 code/source/basic/terminal.cpp                |    3 +-
 code/source/basic/timer.cpp                   |   22 +-
 code/source/basic/utility.cpp                 |  245 +-
 code/source/basic/utility_test.cpp            |    4 +-
 code/source/block/differential_block.cpp      |    9 +-
 code/source/block/first_order_block.cpp       |  218 +-
 code/source/block/integral_block.cpp          |  225 +-
 code/source/block/lead_lag_block.cpp          |   67 +-
 code/source/block/proportional_block.cpp      |  107 +-
 code/source/block/saturation_block.cpp        |  172 +-
 code/source/device/bus.cpp                    |    4 +-
 code/source/device/bus_test.cpp               |    4 +-
 code/source/device/energy_storage.cpp         |  149 +-
 code/source/device/equivalent_device.cpp      |   88 +-
 code/source/device/fixed_shunt.cpp            |   69 +-
 code/source/device/generator.cpp              |  855 ++--
 code/source/device/hvdc.cpp                   |  377 +-
 code/source/device/line.cpp                   |  343 +-
 code/source/device/load.cpp                   |  471 +--
 code/source/device/pv_unit.cpp                |  226 +-
 code/source/device/source.cpp                 |    8 +-
 code/source/device/transformer.cpp            |  824 ++--
 code/source/device/wt_generator.cpp           |  740 ++--
 code/source/meter/meter.cpp                   | 2978 +++++++-------
 code/source/meter/meter_setter.cpp            |   24 +-
 .../bus_frequency_model.cpp                   |   25 +-
 code/source/model/load_model/IEEL.cpp         |  144 +-
 code/source/model/load_relay_model/PUFLS.cpp  |  335 +-
 code/source/model/load_relay_model/UFLS.cpp   |  145 +-
 code/source/model/load_relay_model/UVLS.cpp   |  148 +-
 .../load_frequency_relay_model.cpp            |   32 +-
 .../load_voltage_relay_model.cpp              |   15 +-
 code/source/model/model_var_table.cpp         |   30 +-
 .../pv_converter_model/pv_converter_model.cpp |   32 +-
 .../pvu_models/pv_converter_model/pvcv0.cpp   |  432 +-
 .../pv_electrical_model.cpp                   |   88 +-
 .../pv_irradiance_model.cpp                   |   15 +-
 .../pv_panel_model/pv_panel_model.cpp         |    6 +-
 .../model/pvu_models/pv_panel_model/pvp0.cpp  |   16 +-
 code/source/model/pvu_models/pvu_model.cpp    |   48 +-
 .../sg_models/compensator_model/COMP.cpp      |   48 +-
 .../compensator_model/compensator_model.cpp   |   25 +-
 .../model/sg_models/exciter_model/CSEET1.cpp  |  674 ++--
 .../model/sg_models/exciter_model/CSEET2.cpp  |  540 +--
 .../model/sg_models/exciter_model/IEEET1.cpp  |  238 +-
 .../model/sg_models/exciter_model/PSASPE1.cpp |  187 +-
 .../sg_models/exciter_model/PSASPE13.cpp      |  236 +-
 .../sg_models/exciter_model/PSASPE14.cpp      |  145 +-
 .../model/sg_models/exciter_model/PSASPE2.cpp |  291 +-
 .../model/sg_models/exciter_model/SEXS.cpp    |  178 +-
 .../sg_models/exciter_model/exciter_model.cpp |   19 +-
 code/source/model/sg_models/sg_model.cpp      |   32 +-
 .../sg_models/stabilizer_model/IEE2ST.cpp     |  292 +-
 .../sg_models/stabilizer_model/PSASPS1.cpp    |  202 +-
 .../sg_models/stabilizer_model/PSASPS2.cpp    |  205 +-
 .../sg_models/stabilizer_model/PSASPS3.cpp    |  245 +-
 .../sg_models/stabilizer_model/PSASPS4.cpp    |  217 +-
 .../sg_models/stabilizer_model/PSASPS5.cpp    |  291 +-
 .../stabilizer_model/stabilizer_model.cpp     |  189 +-
 .../sg_models/sync_generator_model/gencls.cpp |   34 +-
 .../sg_models/sync_generator_model/genrou.cpp |  101 +-
 .../sg_models/sync_generator_model/gensal.cpp |   92 +-
 .../sync_generator_model.cpp                  |   11 +-
 .../sg_models/turbine-governors/IEEEG1.cpp    |  219 +-
 .../sg_models/turbine-governors/IEEEG1SB.cpp  |  249 +-
 .../sg_models/turbine-governors/IEEEG2.cpp    |  196 +-
 .../sg_models/turbine-governors/IEEEG3.cpp    |  189 +-
 .../sg_models/turbine-governors/IEESGO.cpp    |   74 +-
 .../sg_models/turbine-governors/TGOV1.cpp     |   64 +-
 .../turbine_governor_model.cpp                |   31 +-
 .../turbine_load_controller_model/lcfb1.cpp   |  105 +-
 .../wtg_models/wind_speed_model/filewind.cpp  |  127 +-
 .../wind_speed_model/wind_speed_model.cpp     |   15 +-
 .../wtg_models/wt_aerodynamic_model/aerd0.cpp |  136 +-
 .../wtg_models/wt_aerodynamic_model/aerdf.cpp |  114 +-
 .../wt_aerodynamic_model.cpp                  |  977 ++---
 .../wtg_models/wt_electrical_model/wt3e0.cpp  | 1007 ++---
 .../wtg_models/wt_electrical_model/wt3e1.cpp  |  806 ++--
 .../wt_electrical_model.cpp                   |  162 +-
 .../wtg_models/wt_generator_model/lvpl.cpp    |   36 +-
 .../wtg_models/wt_generator_model/wt3g0.cpp   |  452 ++-
 .../wtg_models/wt_generator_model/wt3g1.cpp   |  407 +-
 .../wtg_models/wt_generator_model/wt3g2.cpp   |  469 +--
 .../wt_generator_model/wt_generator_model.cpp |   50 +-
 .../model/wtg_models/wt_pitch_model/wt3p0.cpp |  227 +-
 .../wt_pitch_model/wt_pitch_model.cpp         |   85 +-
 .../wt_relay_model/wt_relay_model.cpp         |   89 +-
 .../wtg_models/wt_relay_model/wtrly0.cpp      |  557 +--
 .../wtg_models/wt_turbine_model/wt3t0.cpp     |  133 +-
 .../wt_turbine_model/wt_turbine_model.cpp     |   74 +-
 code/source/model/wtg_models/wtg_model.cpp    |   48 +-
 code/source/network/jacobian_builder.cpp      | 1417 +++----
 code/source/network/network_matrix.cpp        | 3526 +++++++++--------
 code/source/power_system_database.cpp         | 1843 +++++----
 code/source/power_system_database_test.cpp    |    4 +-
 .../contingency_screener.cpp                  |   14 +-
 .../dynamic_simulator/dynamic_simulator.cpp   | 2920 +++++++-------
 .../powerflow_case_generator.cpp              |   18 +-
 .../powerflow_solver/powerflow_solver.cpp     | 1588 ++++----
 116 files changed, 17436 insertions(+), 16765 deletions(-)
 delete mode 100644 bench/sm.dyr
 delete mode 100644 bench/smib.dyr

diff --git a/README.md b/README.md
index 520bf090..69e05aa9 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
+Simulation Toolkit for Electrical Power Systems
+Maintainer: Changgang Li <lichgang@sdu.edu.cn>
 Please go to http://steps.drli.group:380 for documentation.
 
diff --git a/bench/sm.dyr b/bench/sm.dyr
deleted file mode 100644
index e69de29b..00000000
diff --git a/bench/smib.dyr b/bench/smib.dyr
deleted file mode 100644
index e69de29b..00000000
diff --git a/code/STEPS.cbp b/code/STEPS.cbp
index 00c6d811..7a5d757f 100644
--- a/code/STEPS.cbp
+++ b/code/STEPS.cbp
@@ -8,10 +8,11 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Release">
-				<Option output="../build/bin/Release/libSTEPS" imp_lib="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).a" def_file="$(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).def" prefix_auto="1" extension_auto="1" />
+				<Option output="../build/bin/Release/STEPS" prefix_auto="1" extension_auto="1" />
 				<Option object_output="../build/obj/Release/" />
-				<Option type="3" />
+				<Option type="1" />
 				<Option compiler="gcc" />
+				<Option use_console_runner="0" />
 				<Option parameters="--compiler " />
 				<Compiler>
 					<Add option="-O3" />
diff --git a/code/STEPS.depend b/code/STEPS.depend
index 8d02dffa..92638ef5 100644
--- a/code/STEPS.depend
+++ b/code/STEPS.depend
@@ -449,7 +449,7 @@
 1553928358 c:\users\lichg\steps\code\header\basic\inphno.h
 	<vector>
 
-1557055112 c:\users\lichg\steps\code\header\toolkit\dynamic_simulator\dynamic_simulator.h
+1559455417 c:\users\lichg\steps\code\header\toolkit\dynamic_simulator\dynamic_simulator.h
 	"header/basic/base.h"
 	"header/meter/meter.h"
 	"header/network/network_matrix.h"
@@ -660,7 +660,7 @@
 	"header/data_imexporter/psse_imexporter.h"
 	"header/data_imexporter/bpa_imexporter.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\basic\area.cpp
+1559580026 source:c:\users\lichg\steps\code\source\basic\area.cpp
 	"header/basic/area.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -744,7 +744,7 @@
 	"cpptest-source.h"
 	"cpptest-output.h"
 
-1559112833 source:c:\users\lichg\steps\code\source\basic\base.cpp
+1559113116 source:c:\users\lichg\steps\code\source\basic\base.cpp
 	"header/basic/base.h"
 	"header/basic/utility.h"
 	<cstdlib>
@@ -778,7 +778,7 @@
 	"header/basic/bus_index.h"
 	"header/STEPS.h"
 
-1557039114 source:c:\users\lichg\steps\code\source\basic\device_id.cpp
+1559579897 source:c:\users\lichg\steps\code\source\basic\device_id.cpp
 	"header/basic/device_id.h"
 	"header/basic/exception.h"
 	"header/basic/utility.h"
@@ -805,7 +805,7 @@
 	"header/basic/device_id.h"
 	"header/STEPS.h"
 
-1557039114 source:c:\users\lichg\steps\code\source\basic\device_index_map.cpp
+1559579761 source:c:\users\lichg\steps\code\source\basic\device_index_map.cpp
 	"header/basic/device_index_map.h"
 	"header/basic/utility.h"
 	"header/basic/constants.h"
@@ -857,7 +857,7 @@
 	"header/basic/fault.h"
 	"header/STEPS.h"
 
-1557039114 source:c:\users\lichg\steps\code\source\basic\inphno.cpp
+1559579438 source:c:\users\lichg\steps\code\source\basic\inphno.cpp
 	"header/basic/inphno.h"
 	"header/basic/constants.h"
 	"header/basic/utility.h"
@@ -918,7 +918,7 @@
 	"header/basic/owner.h"
 	"header/STEPS.h"
 
-1553928358 source:c:\users\lichg\steps\code\source\basic\ownership.cpp
+1559579248 source:c:\users\lichg\steps\code\source\basic\ownership.cpp
 	"header/basic/ownership.h"
 	<istream>
 	<iostream>
@@ -943,7 +943,7 @@
 	"header/basic/ownership.h"
 	"header/STEPS.h"
 
-1553928358 source:c:\users\lichg\steps\code\source\basic\rating.cpp
+1559579157 source:c:\users\lichg\steps\code\source\basic\rating.cpp
 	<cstdlib>
 	<cstring>
 	<istream>
@@ -978,7 +978,7 @@
 	<iostream>
 	<fstream>
 
-1557039114 source:c:\users\lichg\steps\code\source\basic\sparse_matrix_csparse.cpp
+1559579086 source:c:\users\lichg\steps\code\source\basic\sparse_matrix_csparse.cpp
 	"header/basic/sparse_matrix_csparse.h"
 	"header/basic/constants.h"
 	"header/basic/utility.h"
@@ -990,7 +990,7 @@
 	<iostream>
 	<fstream>
 
-1557039114 source:c:\users\lichg\steps\code\source\basic\sparse_matrix_klu.cpp
+1559578614 source:c:\users\lichg\steps\code\source\basic\sparse_matrix_klu.cpp
 	"header/basic/sparse_matrix_klu.h"
 	"umfpack.h"
 	"header/basic/constants.h"
@@ -1238,7 +1238,7 @@
 	"header/basic/sparse_matrix_define.h"
 	"header/STEPS.h"
 
-1557039114 source:c:\users\lichg\steps\code\source\basic\sparse_matrix_umfpack.cpp
+1559578432 source:c:\users\lichg\steps\code\source\basic\sparse_matrix_umfpack.cpp
 	"header/basic/sparse_matrix_umfpack.h"
 	"header/basic/constants.h"
 	"header/basic/utility.h"
@@ -1251,7 +1251,7 @@
 	<iostream>
 	<fstream>
 
-1557062049 source:c:\users\lichg\steps\code\source\basic\terminal.cpp
+1559578185 source:c:\users\lichg\steps\code\source\basic\terminal.cpp
 	"header/basic/terminal.h"
 	"header/basic/utility.h"
 	"header/basic/exception.h"
@@ -1278,7 +1278,7 @@
 	"cpptest.h"
 	"header/basic/terminal.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\basic\timer.cpp
+1559578138 source:c:\users\lichg\steps\code\source\basic\timer.cpp
 	"header/basic/timer.h"
 	"header/steps_namespace.h"
 	"header/basic/utility.h"
@@ -1307,7 +1307,7 @@
 	"header/basic/timer.h"
 	"header/STEPS.h"
 
-1557910155 source:c:\users\lichg\steps\code\source\basic\utility.cpp
+1559578031 source:c:\users\lichg\steps\code\source\basic\utility.cpp
 	"header/basic/utility.h"
 	"header/basic/constants.h"
 	"header/steps_namespace.h"
@@ -1321,7 +1321,7 @@
 	<thread>
 	<mutex>
 
-1558066663 source:c:\users\lichg\steps\code\source\basic\utility_test.cpp
+1559581301 source:c:\users\lichg\steps\code\source\basic\utility_test.cpp
 	"header/basic/utility_test.h"
 	"header/steps_namespace.h"
 	"header/prepare_for_tests/prepare_models_for_test.h"
@@ -1368,12 +1368,12 @@
 	"header/basic/zone.h"
 	"header/STEPS.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\block\block.cpp
+1559576754 source:c:\users\lichg\steps\code\source\block\block.cpp
 	"header/block/block.h"
 	"header/steps_namespace.h"
 	"header/basic/utility.h"
 
-1559112961 source:c:\users\lichg\steps\code\source\block\differential_block.cpp
+1559576716 source:c:\users\lichg\steps\code\source\block\differential_block.cpp
 	"header/block/differential_block.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -1398,7 +1398,7 @@
 	"header/block/differential_block.h"
 	"header/STEPS.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\block\first_order_block.cpp
+1559576673 source:c:\users\lichg\steps\code\source\block\first_order_block.cpp
 	"header/block/first_order_block.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -1430,7 +1430,7 @@
 	"header/block/first_order_block.h"
 	"header/STEPS.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\block\integral_block.cpp
+1559576449 source:c:\users\lichg\steps\code\source\block\integral_block.cpp
 	"header/block/integral_block.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -1455,7 +1455,7 @@
 	"header/block/integral_block.h"
 	"header/STEPS.h"
 
-1559113015 source:c:\users\lichg\steps\code\source\block\lead_lag_block.cpp
+1559576116 source:c:\users\lichg\steps\code\source\block\lead_lag_block.cpp
 	"header/block/lead_lag_block.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -1574,7 +1574,7 @@
 	"header/block/pid_block.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\block\proportional_block.cpp
+1559575837 source:c:\users\lichg\steps\code\source\block\proportional_block.cpp
 	"header/block/proportional_block.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -1598,7 +1598,7 @@
 	"header/block/proportional_block.h"
 	"header/STEPS.h"
 
-1557039114 source:c:\users\lichg\steps\code\source\block\saturation_block.cpp
+1559575771 source:c:\users\lichg\steps\code\source\block\saturation_block.cpp
 	"header/block/saturation_block.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -2196,7 +2196,7 @@
 	<istream>
 	<iostream>
 
-1559113052 source:c:\users\lichg\steps\code\source\device\bus.cpp
+1559575620 source:c:\users\lichg\steps\code\source\device\bus.cpp
 	"header/device/bus.h"
 	"header/basic/utility.h"
 	"header/basic/constants.h"
@@ -2234,7 +2234,7 @@
 	<istream>
 	<iostream>
 
-1559113052 source:c:\users\lichg\steps\code\source\device\energy_storage.cpp
+1559575547 source:c:\users\lichg\steps\code\source\device\energy_storage.cpp
 	"header/device/energy_storage.h"
 	"header/basic/utility.h"
 	"header/model/energy_storage_model/energy_storage_models.h"
@@ -2266,7 +2266,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559113052 source:c:\users\lichg\steps\code\source\device\equivalent_device.cpp
+1559575392 source:c:\users\lichg\steps\code\source\device\equivalent_device.cpp
 	"header/device/device.h"
 	"header/basic/utility.h"
 	"header/model/equivalent_model/equivalent_model.h"
@@ -2297,7 +2297,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559113052 source:c:\users\lichg\steps\code\source\device\fixed_shunt.cpp
+1559575240 source:c:\users\lichg\steps\code\source\device\fixed_shunt.cpp
 	"header/device/fixed_shunt.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -2326,7 +2326,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559113052 source:c:\users\lichg\steps\code\source\device\generator.cpp
+1559575119 source:c:\users\lichg\steps\code\source\device\generator.cpp
 	"header/device/generator.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -2367,7 +2367,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559113052 source:c:\users\lichg\steps\code\source\device\hvdc.cpp
+1559574124 source:c:\users\lichg\steps\code\source\device\hvdc.cpp
 	"header/device/hvdc.h"
 	"header/basic/utility.h"
 	"header/basic/constants.h"
@@ -2402,7 +2402,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559113052 source:c:\users\lichg\steps\code\source\device\line.cpp
+1559572581 source:c:\users\lichg\steps\code\source\device\line.cpp
 	"header/device/line.h"
 	"header/basic/utility.h"
 	"header/basic/constants.h"
@@ -2433,7 +2433,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559113052 source:c:\users\lichg\steps\code\source\device\load.cpp
+1559571773 source:c:\users\lichg\steps\code\source\device\load.cpp
 	"header/device/load.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -2466,7 +2466,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559113052 source:c:\users\lichg\steps\code\source\device\pv_unit.cpp
+1559571146 source:c:\users\lichg\steps\code\source\device\pv_unit.cpp
 	"header/device/pv_unit.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -2500,7 +2500,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\device\source.cpp
+1559571773 source:c:\users\lichg\steps\code\source\device\source.cpp
 	"header/device/source.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -2531,7 +2531,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559113052 source:c:\users\lichg\steps\code\source\device\transformer.cpp
+1559570829 source:c:\users\lichg\steps\code\source\device\transformer.cpp
 	"header/device/transformer.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -2560,7 +2560,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559113053 source:c:\users\lichg\steps\code\source\device\wt_generator.cpp
+1559565097 source:c:\users\lichg\steps\code\source\device\wt_generator.cpp
 	"header/device/wt_generator.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -2626,7 +2626,7 @@
 	"header/meter/continuous_buffer.h"
 	"header/STEPS.h"
 
-1559113052 source:c:\users\lichg\steps\code\source\meter\meter.cpp
+1559564600 source:c:\users\lichg\steps\code\source\meter\meter.cpp
 	"header/meter/meter.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -2635,7 +2635,7 @@
 	<istream>
 	<iostream>
 
-1559113052 source:c:\users\lichg\steps\code\source\meter\meter_setter.cpp
+1559564587 source:c:\users\lichg\steps\code\source\meter\meter_setter.cpp
 	"header/meter/meter_setter.h"
 	"header/basic/terminal.h"
 	"header/basic/utility.h"
@@ -2687,7 +2687,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\bus_frequency_model\bus_frequency_model.cpp
+1559562310 source:c:\users\lichg\steps\code\source\model\bus_frequency_model\bus_frequency_model.cpp
 	"header/model/bus_frequency_model/bus_frequency_model.h"
 	"header/power_system_database.h"
 	"header/STEPS.h"
@@ -2856,7 +2856,7 @@
 	"header/model/hvdc_model/vdcol.h"
 	"header/STEPS.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\load_model\ieel.cpp
+1559562177 source:c:\users\lichg\steps\code\source\model\load_model\ieel.cpp
 	"header/model/load_model/IEEL.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -2899,7 +2899,7 @@
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\model\load_relay_model\load_frequency_relay_model.cpp
+1559560897 source:c:\users\lichg\steps\code\source\model\load_relay_model\load_frequency_relay_model.cpp
 	"header/model/load_relay_model/load_frequency_relay_model.h"
 	"header/device/load.h"
 	"header/basic/utility.h"
@@ -2955,7 +2955,7 @@
 	<cstdio>
 	<cmath>
 
-1559112962 source:c:\users\lichg\steps\code\source\model\load_relay_model\load_voltage_relay_model.cpp
+1559560851 source:c:\users\lichg\steps\code\source\model\load_relay_model\load_voltage_relay_model.cpp
 	"header/model/load_relay_model/load_voltage_relay_model.h"
 	"header/device/load.h"
 	"header/basic/utility.h"
@@ -2983,7 +2983,7 @@
 	"header/model/load_relay_model/load_relay_model_test.h"
 	"header/power_system_database.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\load_relay_model\pufls.cpp
+1559561904 source:c:\users\lichg\steps\code\source\model\load_relay_model\pufls.cpp
 	"header/model/load_relay_model/PUFLS.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -3011,7 +3011,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\model\load_relay_model\ufls.cpp
+1559561571 source:c:\users\lichg\steps\code\source\model\load_relay_model\ufls.cpp
 	"header/model/load_relay_model/UFLS.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -3039,7 +3039,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\load_relay_model\uvls.cpp
+1559561295 source:c:\users\lichg\steps\code\source\model\load_relay_model\uvls.cpp
 	"header/model/load_relay_model/UVLS.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -3090,7 +3090,7 @@
 	"header/STEPS.h"
 	"header/model/sg_models/sync_generator_model/gencls.h"
 
-1553928358 source:c:\users\lichg\steps\code\source\model\model_var_table.cpp
+1559560767 source:c:\users\lichg\steps\code\source\model\model_var_table.cpp
 	"header/model/model_var_table.h"
 	"header/basic/utility.h"
 
@@ -3107,7 +3107,7 @@
 	"header/model/model_var_table.h"
 	"header/STEPS.h"
 
-1553928358 source:c:\users\lichg\steps\code\source\model\pvu_models\pv_converter_model\pv_converter_model.cpp
+1559560679 source:c:\users\lichg\steps\code\source\model\pvu_models\pv_converter_model\pv_converter_model.cpp
 	"header/model/pvu_models/pv_converter_model/pv_converter_model.h"
 	"header/basic/utility.h"
 	"header/basic/constants.h"
@@ -3144,7 +3144,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112961 source:c:\users\lichg\steps\code\source\model\pvu_models\pv_converter_model\pvcv0.cpp
+1559560618 source:c:\users\lichg\steps\code\source\model\pvu_models\pv_converter_model\pvcv0.cpp
 	"header/model/pvu_models/pv_converter_model/pvcv0.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -3171,7 +3171,7 @@
 	"header/model/pvu_models/pv_converter_model/pvcv0.h"
 	"header/STEPS.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\pvu_models\pv_electrical_model\pv_electrical_model.cpp
+1559560411 source:c:\users\lichg\steps\code\source\model\pvu_models\pv_electrical_model\pv_electrical_model.cpp
 	"header/model/pvu_models/pv_electrical_model/pv_electrical_model.h"
 	"header/basic/utility.h"
 	"header/device/pv_unit.h"
@@ -3229,7 +3229,7 @@
 	"header/model/pvu_models/pvu_model_test.h"
 	"header/power_system_database.h"
 
-1553928358 source:c:\users\lichg\steps\code\source\model\pvu_models\pv_irradiance_model\pv_irradiance_model.cpp
+1559560263 source:c:\users\lichg\steps\code\source\model\pvu_models\pv_irradiance_model\pv_irradiance_model.cpp
 	"header/model/pvu_models/pv_irradiance_model/pv_irradiance_model.h"
 	"header/basic/utility.h"
 	<fstream>
@@ -3245,7 +3245,7 @@
 	<cstdio>
 	<cmath>
 
-1559112962 source:c:\users\lichg\steps\code\source\model\pvu_models\pv_panel_model\pv_panel_model.cpp
+1559560225 source:c:\users\lichg\steps\code\source\model\pvu_models\pv_panel_model\pv_panel_model.cpp
 	"header/model/pvu_models/pv_panel_model/pv_panel_model.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3270,7 +3270,7 @@
 	"header/model/pvu_models/pvu_model_test.h"
 	"header/power_system_database.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\pvu_models\pv_panel_model\pvp0.cpp
+1559560208 source:c:\users\lichg\steps\code\source\model\pvu_models\pv_panel_model\pvp0.cpp
 	"header/model/pvu_models/pv_panel_model/pvp0.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -3300,7 +3300,7 @@
 	"header/model/pvu_models/pv_panel_model/pvp0.h"
 	"header/STEPS.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\model\pvu_models\pvu_model.cpp
+1559560173 source:c:\users\lichg\steps\code\source\model\pvu_models\pvu_model.cpp
 	"header/model/pvu_models/pvu_model.h"
 	"header/basic/utility.h"
 	"header/power_system_database.h"
@@ -3317,7 +3317,7 @@
 	<cstdio>
 	<cmath>
 
-1559112962 source:c:\users\lichg\steps\code\source\model\sg_models\compensator_model\comp.cpp
+1559560079 source:c:\users\lichg\steps\code\source\model\sg_models\compensator_model\comp.cpp
 	"header/model/sg_models/compensator_model/COMP.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3359,7 +3359,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\sg_models\compensator_model\compensator_model.cpp
+1559560019 source:c:\users\lichg\steps\code\source\model\sg_models\compensator_model\compensator_model.cpp
 	"header/model/sg_models/compensator_model/compensator_model.h"
 	"header/device/generator.h"
 	"header/steps_namespace.h"
@@ -3374,7 +3374,7 @@
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\cseet1.cpp
+1559559925 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\cseet1.cpp
 	"header/model/sg_models/exciter_model/CSEET1.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3405,7 +3405,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\cseet2.cpp
+1559559595 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\cseet2.cpp
 	"header/model/sg_models/exciter_model/CSEET2.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3427,7 +3427,7 @@
 	"header/model/sg_models/exciter_model/exciter_model_test.h"
 	"header/STEPS.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\exciter_model.cpp
+1559558356 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\exciter_model.cpp
 	"header/model/sg_models/exciter_model/exciter_model.h"
 	"header/device/generator.h"
 	"header/steps_namespace.h"
@@ -3446,7 +3446,7 @@
 	"header/model/sg_models/stabilizer_model/IEE2ST.h"
 	"header/model/sg_models/sync_generator_model/gencls.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\ieeet1.cpp
+1559559339 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\ieeet1.cpp
 	"header/model/sg_models/exciter_model/IEEET1.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3468,7 +3468,7 @@
 	"header/model/sg_models/exciter_model/exciter_model_test.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\psaspe1.cpp
+1559559190 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\psaspe1.cpp
 	"header/model/sg_models/exciter_model/PSASPE1.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3476,7 +3476,7 @@
 	<istream>
 	<iostream>
 
-1559112962 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\psaspe13.cpp
+1559559063 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\psaspe13.cpp
 	"header/model/sg_models/exciter_model/PSASPE13.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3498,7 +3498,7 @@
 	"header/model/sg_models/exciter_model/exciter_model_test.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\psaspe14.cpp
+1559558886 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\psaspe14.cpp
 	"header/model/sg_models/exciter_model/PSASPE14.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3534,7 +3534,7 @@
 	"header/model/sg_models/exciter_model/exciter_model_test.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\psaspe2.cpp
+1559558698 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\psaspe2.cpp
 	"header/model/sg_models/exciter_model/PSASPE2.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3556,7 +3556,7 @@
 	"header/model/sg_models/exciter_model/exciter_model_test.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\sexs.cpp
+1559558501 source:c:\users\lichg\steps\code\source\model\sg_models\exciter_model\sexs.cpp
 	"header/model/sg_models/exciter_model/SEXS.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3578,7 +3578,7 @@
 	"header/model/sg_models/exciter_model/exciter_model_test.h"
 	"header/STEPS.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\sg_models\sg_model.cpp
+1559558282 source:c:\users\lichg\steps\code\source\model\sg_models\sg_model.cpp
 	"header/model/sg_models/sg_model.h"
 	"header/basic/utility.h"
 	"header/power_system_database.h"
@@ -3595,7 +3595,7 @@
 	<cstdio>
 	<cmath>
 
-1559112962 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\iee2st.cpp
+1559558220 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\iee2st.cpp
 	"header/model/sg_models/stabilizer_model/IEE2ST.h"
 	"header/basic/constants.h"
 	"header/STEPS.h"
@@ -3627,7 +3627,7 @@
 	"header/model/sg_models/exciter_model/SEXS.h"
 	"header/power_system_database.h"
 
-1559112961 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\psasps1.cpp
+1559558069 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\psasps1.cpp
 	"header/model/sg_models/stabilizer_model/PSASPS1.h"
 	"header/basic/constants.h"
 	"header/STEPS.h"
@@ -3649,7 +3649,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112961 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\psasps2.cpp
+1559557922 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\psasps2.cpp
 	"header/model/sg_models/stabilizer_model/PSASPS2.h"
 	"header/basic/constants.h"
 	"header/STEPS.h"
@@ -3671,7 +3671,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\psasps3.cpp
+1559557779 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\psasps3.cpp
 	"header/model/sg_models/stabilizer_model/PSASPS3.h"
 	"header/basic/constants.h"
 	"header/STEPS.h"
@@ -3693,7 +3693,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112961 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\psasps4.cpp
+1559557530 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\psasps4.cpp
 	"header/model/sg_models/stabilizer_model/PSASPS4.h"
 	"header/basic/constants.h"
 	"header/STEPS.h"
@@ -3715,7 +3715,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\psasps5.cpp
+1559557624 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\psasps5.cpp
 	"header/model/sg_models/stabilizer_model/PSASPS5.h"
 	"header/basic/constants.h"
 	"header/STEPS.h"
@@ -3737,7 +3737,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\stabilizer_model.cpp
+1559557234 source:c:\users\lichg\steps\code\source\model\sg_models\stabilizer_model\stabilizer_model.cpp
 	"header/model/sg_models/stabilizer_model/stabilizer_model.h"
 	<cstdio>
 	"header/basic/utility.h"
@@ -3748,7 +3748,7 @@
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\sg_models\sync_generator_model\gencls.cpp
+1559557003 source:c:\users\lichg\steps\code\source\model\sg_models\sync_generator_model\gencls.cpp
 	"header/model/sg_models/sync_generator_model/gencls.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3785,7 +3785,7 @@
 	"header/model/sg_models/sync_generator_model/gencls.h"
 	"header/power_system_database.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\sg_models\sync_generator_model\genrou.cpp
+1559556950 source:c:\users\lichg\steps\code\source\model\sg_models\sync_generator_model\genrou.cpp
 	"header/model/sg_models/sync_generator_model/genrou.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3813,7 +3813,7 @@
 	"header/model/sg_models/sync_generator_model/genrou.h"
 	"header/STEPS.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\sg_models\sync_generator_model\gensal.cpp
+1559556847 source:c:\users\lichg\steps\code\source\model\sg_models\sync_generator_model\gensal.cpp
 	"header/model/sg_models/sync_generator_model/gensal.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3840,7 +3840,7 @@
 	"header/model/sg_models/sync_generator_model/gensal.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\sg_models\sync_generator_model\sync_generator_model.cpp
+1559551953 source:c:\users\lichg\steps\code\source\model\sg_models\sync_generator_model\sync_generator_model.cpp
 	"header/model/sg_models/sync_generator_model/sync_generator_model.h"
 	"header/basic/utility.h"
 	"header/basic/constants.h"
@@ -3859,7 +3859,7 @@
 	<cstdio>
 	<cmath>
 
-1559112963 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\ieeeg1.cpp
+1559551860 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\ieeeg1.cpp
 	"header/model/sg_models/turbine_governor_model/IEEEG1.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3888,7 +3888,7 @@
 	"header/model/sg_models/sg_model_test.h"
 	"header/power_system_database.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\ieeeg1sb.cpp
+1559494090 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\ieeeg1sb.cpp
 	"header/model/sg_models/turbine_governor_model/IEEEG1SB.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3909,7 +3909,7 @@
 	"header/model/sg_models/turbine_governor_model/turbine_governor_model_test.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\ieeeg2.cpp
+1559493970 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\ieeeg2.cpp
 	"header/model/sg_models/turbine_governor_model/IEEEG2.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3930,7 +3930,7 @@
 	"header/model/sg_models/turbine_governor_model/turbine_governor_model_test.h"
 	"header/STEPS.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\ieeeg3.cpp
+1559493819 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\ieeeg3.cpp
 	"header/model/sg_models/turbine_governor_model/IEEEG3.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3951,7 +3951,7 @@
 	"header/model/sg_models/turbine_governor_model/turbine_governor_model_test.h"
 	"header/STEPS.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\ieesgo.cpp
+1559493702 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\ieesgo.cpp
 	"header/model/sg_models/turbine_governor_model/IEESGO.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3970,7 +3970,7 @@
 	"header/model/sg_models/turbine_governor_model/turbine_governor_model_test.h"
 	"header/STEPS.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\tgov1.cpp
+1559493565 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\tgov1.cpp
 	"header/model/sg_models/turbine_governor_model/TGOV1.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -3989,7 +3989,7 @@
 	"header/model/sg_models/turbine_governor_model/turbine_governor_model_test.h"
 	"header/STEPS.h"
 
-1553928358 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\turbine_governor_model.cpp
+1559493494 source:c:\users\lichg\steps\code\source\model\sg_models\turbine-governors\turbine_governor_model.cpp
 	"header/model/sg_models/turbine_governor_model/turbine_governor_model.h"
 	"header/model/sg_models/sync_generator_model/sync_generator_model.h"
 	"header/device/generator.h"
@@ -4004,7 +4004,7 @@
 	"header/model/sg_models/turbine_governor_model/TGOV1.h"
 	"header/model/sg_models/sync_generator_model/gencls.h"
 
-1559112961 source:c:\users\lichg\steps\code\source\model\sg_models\turbine_load_controller_model\lcfb1.cpp
+1559493596 source:c:\users\lichg\steps\code\source\model\sg_models\turbine_load_controller_model\lcfb1.cpp
 	"header/model/sg_models/turbine_load_controller_model/lcfb1.h"
 	"header/basic/constants.h"
 	"header/STEPS.h"
@@ -4047,7 +4047,7 @@
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\wtg_models\wind_speed_model\filewind.cpp
+1559493275 source:c:\users\lichg\steps\code\source\model\wtg_models\wind_speed_model\filewind.cpp
 	"header/model/wtg_models/wind_speed_model/filewind.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -4093,7 +4093,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1553928358 source:c:\users\lichg\steps\code\source\model\wtg_models\wind_speed_model\wind_speed_model.cpp
+1559493109 source:c:\users\lichg\steps\code\source\model\wtg_models\wind_speed_model\wind_speed_model.cpp
 	"header/model/wtg_models/wind_speed_model/wind_speed_model.h"
 	"header/basic/utility.h"
 	<fstream>
@@ -4112,7 +4112,7 @@
 	<cstdio>
 	<cmath>
 
-1559112964 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_aerodynamic_model\aerd0.cpp
+1559493066 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_aerodynamic_model\aerd0.cpp
 	"header/model/wtg_models/wt_aerodynamic_model/aerd0.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -4147,7 +4147,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_aerodynamic_model\aerdf.cpp
+1559493279 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_aerodynamic_model\aerdf.cpp
 	"header/model/wtg_models/wt_aerodynamic_model/aerdf.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -4158,7 +4158,7 @@
 	"header/model/wtg_models/wt_aerodynamic_model/wt_aerodynamic_model.h"
 	<cstdlib>
 
-1559112964 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_aerodynamic_model\wt_aerodynamic_model.cpp
+1559492895 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"
@@ -4181,7 +4181,7 @@
 	"header/model/wtg_models/wt_electrical_model/wind_turbine_power_speed_lookup_table.h"
 	"header/basic/utility.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_electrical_model\wt3e0.cpp
+1559491794 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_electrical_model\wt3e0.cpp
 	"header/model/wtg_models/wt_electrical_model/wt3e0.h"
 	"header/device/wt_generator.h"
 	"header/power_system_database.h"
@@ -4220,7 +4220,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112964 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_electrical_model\wt3e1.cpp
+1559491451 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_electrical_model\wt3e1.cpp
 	"header/model/wtg_models/wt_electrical_model/wt3e1.h"
 	"header/device/wt_generator.h"
 	"header/power_system_database.h"
@@ -4236,7 +4236,7 @@
 	"header/model/wtg_models/wt_electrical_model/wt3e1.h"
 	"header/model/wtg_models/wt_electrical_model/wt_electrical_model_test.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_electrical_model\wt_electrical_model.cpp
+1559491103 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_electrical_model\wt_electrical_model.cpp
 	"header/model/wtg_models/wt_electrical_model/wt_electrical_model.h"
 	"header/basic/utility.h"
 	"header/device/wt_generator.h"
@@ -4251,12 +4251,12 @@
 	"header/model/wtg_models/wt_aerodynamic_model/aerd0.h"
 	"header/model/wtg_models/wt_turbine_model/wt3t0.h"
 
-1553928358 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_generator_model\lvpl.cpp
+1559491968 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_generator_model\lvpl.cpp
 	"header/model/wtg_models/wt_generator_model/lvpl.h"
 	"header/basic/constants.h"
 	<cmath>
 
-1559112962 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_generator_model\wt3g0.cpp
+1559490615 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_generator_model\wt3g0.cpp
 	"header/model/wtg_models/wt_generator_model/wt3g0.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -4294,7 +4294,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_generator_model\wt3g1.cpp
+1559490353 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_generator_model\wt3g1.cpp
 	"header/model/wtg_models/wt_generator_model/wt3g1.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -4322,7 +4322,7 @@
 	"header/model/wtg_models/wt_generator_model/wt3g1.h"
 	"header/STEPS.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_generator_model\wt3g2.cpp
+1559490120 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_generator_model\wt3g2.cpp
 	"header/model/wtg_models/wt_generator_model/wt3g2.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -4350,7 +4350,7 @@
 	"header/model/wtg_models/wt_generator_model/wt3g2.h"
 	"header/STEPS.h"
 
-1553928358 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_generator_model\wt_generator_model.cpp
+1559489771 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_generator_model\wt_generator_model.cpp
 	"header/model/wtg_models/wt_generator_model/wt_generator_model.h"
 	"header/basic/utility.h"
 	"header/basic/constants.h"
@@ -4370,7 +4370,7 @@
 	<cstdio>
 	<cmath>
 
-1559112963 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_pitch_model\wt3p0.cpp
+1559489683 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_pitch_model\wt3p0.cpp
 	"header/model/wtg_models/wt_pitch_model/wt3p0.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -4407,7 +4407,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1559112962 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_pitch_model\wt_pitch_model.cpp
+1559489369 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_pitch_model\wt_pitch_model.cpp
 	"header/model/wtg_models/wt_turbine_model/wt_turbine_model.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -4427,19 +4427,19 @@
 	<cstdio>
 	<cmath>
 
-1559112961 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_relay_model\wt_relay_model.cpp
+1559489181 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_relay_model\wt_relay_model.cpp
 	"header/model/wtg_models/wt_relay_model/wt_relay_model.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
 	<cstdio>
 
-1559112961 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_relay_model\wtrly0.cpp
+1559488944 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_relay_model\wtrly0.cpp
 	"header/model/wtg_models/wt_relay_model/wtrly0.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
 	<iostream>
 
-1559112962 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_turbine_model\wt3t0.cpp
+1559488195 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_turbine_model\wt3t0.cpp
 	"header/model/wtg_models/wt_turbine_model/wt3t0.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -4473,7 +4473,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1554387008 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_turbine_model\wt_turbine_model.cpp
+1559488004 source:c:\users\lichg\steps\code\source\model\wtg_models\wt_turbine_model\wt_turbine_model.cpp
 	"header/model/wtg_models/wt_turbine_model/wt_turbine_model.h"
 	"header/basic/utility.h"
 	<cstdio>
@@ -4491,7 +4491,7 @@
 	<cstdio>
 	<cmath>
 
-1559112964 source:c:\users\lichg\steps\code\source\model\wtg_models\wtg_model.cpp
+1559487843 source:c:\users\lichg\steps\code\source\model\wtg_models\wtg_model.cpp
 	"header/model/wtg_models/wtg_model.h"
 	"header/basic/utility.h"
 	"header/power_system_database.h"
@@ -4508,7 +4508,7 @@
 	<cstdio>
 	<cmath>
 
-1559112962 source:c:\users\lichg\steps\code\source\network\jacobian_builder.cpp
+1559487625 source:c:\users\lichg\steps\code\source\network\jacobian_builder.cpp
 	"header/network/jacobian_builder.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -4541,7 +4541,7 @@
 	"header/network/jacobian_builder.h"
 	"header/STEPS.h"
 
-1559112963 source:c:\users\lichg\steps\code\source\network\network_matrix.cpp
+1559486226 source:c:\users\lichg\steps\code\source\network\network_matrix.cpp
 	"header/network/network_matrix.h"
 	"header/basic/utility.h"
 	"header/STEPS.h"
@@ -4569,7 +4569,7 @@
 	"header/network/network_matrix.h"
 	"header/STEPS.h"
 
-1559112961 source:c:\users\lichg\steps\code\source\power_system_database.cpp
+1559484863 source:c:\users\lichg\steps\code\source\power_system_database.cpp
 	"header/power_system_database.h"
 	"header/STEPS.h"
 	"header/basic/utility.h"
@@ -4777,7 +4777,7 @@
 	"header/toolkit/cct_searcher/cct_searcher.h"
 	"header/STEPS.h"
 
-1559113052 source:c:\users\lichg\steps\code\source\toolkit\dynamic_simulator\dynamic_simulator.cpp
+1559581175 source:c:\users\lichg\steps\code\source\toolkit\dynamic_simulator\dynamic_simulator.cpp
 	"header/toolkit/dynamic_simulator/dynamic_simulator.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -4820,7 +4820,7 @@
 	"header/toolkit/dynamic_simulator/dynamic_simulator.h"
 	<fstream>
 
-1559112961 source:c:\users\lichg\steps\code\source\toolkit\powerflow_solver\powerflow_solver.cpp
+1559454718 source:c:\users\lichg\steps\code\source\toolkit\powerflow_solver\powerflow_solver.cpp
 	"header/toolkit/powerflow_solver/powerflow_solver.h"
 	"header/basic/utility.h"
 	"header/steps_namespace.h"
@@ -4830,7 +4830,7 @@
 	<iostream>
 	<fstream>
 
-1557072856 source:c:\users\lichg\steps\code\source\power_system_database_test.cpp
+1559481321 source:c:\users\lichg\steps\code\source\power_system_database_test.cpp
 	"header/power_system_database_test.h"
 	"header/basic/utility.h"
 	"header/prepare_for_tests/prepare_models_for_test.h"
@@ -4852,7 +4852,7 @@
 	"header/power_system_database.h"
 	"header/STEPS.h"
 
-1558505235 source:c:\users\lichg\steps\code\source\steps.cpp
+1559580115 source:c:\users\lichg\steps\code\source\steps.cpp
 	"header/steps.h"
 	"header/basic/utility.h"
 	<iostream>
@@ -4871,7 +4871,7 @@
 	<iostream>
 	<ctime>
 
-1557020638 source:c:\users\lichg\steps\code\source\toolkit\contingency_screener\contingency_screener.cpp
+1559472315 source:c:\users\lichg\steps\code\source\toolkit\contingency_screener\contingency_screener.cpp
 	"header/toolkit/contingency_screener/contingency_screener.h"
 	"header/toolkit/powerflow_solver/powerflow_solver.h"
 	"header/data_imexporter/psse_imexporter.h"
@@ -4937,7 +4937,7 @@
 	"header/toolkit/dynamic_simulator/dynamic_simulator.h"
 	"header/STEPS.h"
 
-1557052499 source:c:\users\lichg\steps\code\source\toolkit\powerflow_case_generator\powerflow_case_generator.cpp
+1559480839 source:c:\users\lichg\steps\code\source\toolkit\powerflow_case_generator\powerflow_case_generator.cpp
 	"header/toolkit/powerflow_case_generator/powerflow_case_generator.h"
 	"header/toolkit/powerflow_solver/powerflow_solver.h"
 	"header/data_imexporter/psse_imexporter.h"
@@ -5036,7 +5036,7 @@
 	"header/data_imexporter/psse_imexporter.h"
 	"header/model/all_supported_models.h"
 
-1558066662 source:c:\users\lichg\steps\code\main_tests.cpp
+1559580304 source:c:\users\lichg\steps\code\main_tests.cpp
 	<istream>
 	<cstdlib>
 	<cstring>
diff --git a/code/header/toolkit/dynamic_simulator/dynamic_simulator.h b/code/header/toolkit/dynamic_simulator/dynamic_simulator.h
index 1d933cbf..14e69839 100644
--- a/code/header/toolkit/dynamic_simulator/dynamic_simulator.h
+++ b/code/header/toolkit/dynamic_simulator/dynamic_simulator.h
@@ -221,6 +221,8 @@ class DYNAMICS_SIMULATOR: public BASE
         bool csv_file_export_enabled, json_file_export_enabled, bin_file_export_enabled;
 
         bool relay_action_flag;
+
+        bool check_NAN;
     private:
         virtual bool is_valid() const;
         virtual void check();
diff --git a/code/main_tests.cpp b/code/main_tests.cpp
index e94d79f0..a3455dcb 100644
--- a/code/main_tests.cpp
+++ b/code/main_tests.cpp
@@ -241,14 +241,14 @@ int main(int argc, char* argv[])
 
         //ts.add(unique_ptr<Test::Suite>(new EQUIVALENT_MODEL_IMEXPORTER_TEST));
 
-/*
+
         ts.add(unique_ptr<Test::Suite>(new NETWORK_MATRIX_TEST));
 
 
         ts.add(unique_ptr<Test::Suite>(new JACOBIAN_BUILDER_TEST));
 
 
-        //ts.add(unique_ptr<Test::Suite>(new POWERFLOW_SOLVER_TEST));
+        ts.add(unique_ptr<Test::Suite>(new POWERFLOW_SOLVER_TEST));
 
         ts.add(unique_ptr<Test::Suite>(new PROPORTIONAL_BLOCK_TEST));
         ts.add(unique_ptr<Test::Suite>(new INTEGRAL_BLOCK_TEST));
@@ -318,12 +318,12 @@ int main(int argc, char* argv[])
         ts.add(unique_ptr<Test::Suite>(new DYNAMICS_SIMULATOR_TEST));
         //ts.add(unique_ptr<Test::Suite>(new CCT_SEARCHER_TEST));
         //ts.add(unique_ptr<Test::Suite>(new POWERFLOW_CASE_GENERATOR_TEST));
-*/
+
         // Run the tests
         unique_ptr<Test::Output> output(cmdline(argc, argv));
         ts.run(*output, true);
 
-        default_toolkit.open_log_file("STEPS_test_report.html");
+        default_toolkit.open_log_file("STEPS_test_report2.html");
         Test::HtmlOutput* const html = dynamic_cast<Test::HtmlOutput*>(output.get());
         if (html)
         	html->generate(cout, true, "STEPS");
diff --git a/code/source/STEPS.cpp b/code/source/STEPS.cpp
index e4056871..7d51bc4e 100644
--- a/code/source/STEPS.cpp
+++ b/code/source/STEPS.cpp
@@ -169,23 +169,23 @@ void STEPS::show_information_with_leading_time_stamp(string info)
 {
     vector<string> splitted_info = split_string(info,"\n");
     size_t info_size = splitted_info.size();
-    if(info_size==0)
-        return;
-
-    string sys_time = get_system_time_stamp_string();
-    if(log_file.is_open())
+    if(info_size!=0)
     {
-        log_file<<"["<<get_toolkit_name()<<"]"<<sys_time<<" "<<splitted_info[0]<<"\n";
-
-        for(size_t i=1; i!=info_size; ++i)
-            log_file<<"["<<get_toolkit_name()<<"]"<<sys_time<<" + "<<splitted_info[i]<<"\n";
-    }
-    else
-    {
-        cout<<"["<<get_toolkit_name()<<"]"<<sys_time<<" "<<splitted_info[0]<<"\n";
-
-        for(size_t i=1; i!=info_size; ++i)
-            cout<<"["<<get_toolkit_name()<<"]"<<sys_time<<" + "<<splitted_info[i]<<"\n";
+        string sys_time = get_system_time_stamp_string();
+        if(log_file.is_open())
+        {
+            log_file<<"["<<get_toolkit_name()<<"]"<<sys_time<<" "<<splitted_info[0]<<"\n";
+
+            for(size_t i=1; i!=info_size; ++i)
+                log_file<<"["<<get_toolkit_name()<<"]"<<sys_time<<" + "<<splitted_info[i]<<"\n";
+        }
+        else
+        {
+            cout<<"["<<get_toolkit_name()<<"]"<<sys_time<<" "<<splitted_info[0]<<"\n";
+
+            for(size_t i=1; i!=info_size; ++i)
+                cout<<"["<<get_toolkit_name()<<"]"<<sys_time<<" + "<<splitted_info[i]<<"\n";
+        }
     }
 }
 
diff --git a/code/source/basic/area.cpp b/code/source/basic/area.cpp
index 9fa7d32e..4cd6363a 100644
--- a/code/source/basic/area.cpp
+++ b/code/source/basic/area.cpp
@@ -41,25 +41,26 @@ void AREA::set_area_name(string name)
 void AREA::set_area_swing_bus(size_t bus)
 {
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(bus==0)
+    if(bus!=0)
     {
-        set_area_swing_bus_with_zero_input();
-        return;
+        ostringstream osstream;
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+
+        if(psdb.is_bus_exist(bus))
+            set_area_swing_bus_with_existing_bus(bus);
+        else
+        {
+            char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
+            snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Error. Bus %lu does not exist in power system database %s when setting area swing bus number of area %lu.\n"
+                     "Bus 0 will be set to indicate invalid area.", bus, (psdb.get_system_name()).c_str(), get_area_number());
+            toolkit.show_information_with_leading_time_stamp(buffer);
+
+            area_swing_bus = 0;
+        }
     }
-
-    ostringstream osstream;
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    if(psdb.is_bus_exist(bus))
-        set_area_swing_bus_with_existing_bus(bus);
     else
-    {
-        char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
-        snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Error. Bus %lu does not exist in power system database %s when setting area swing bus number of area %lu.\n"
-                 "Bus 0 will be set to indicate invalid area.", bus, (psdb.get_system_name()).c_str(), get_area_number());
-        toolkit.show_information_with_leading_time_stamp(buffer);
-
-        area_swing_bus = 0;
+    {
+        set_area_swing_bus_with_zero_input();
     }
 }
 
@@ -200,10 +201,10 @@ void AREA::report() const
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
     string busname = "";
     BUS* busptr = psdb.get_bus(bus);
-    if(busptr==NULL)
-        busname = "NO SUCH BUS";
-    else
+    if(busptr!=NULL)
         busname = busptr->get_bus_name();
+    else
+        busname = "NO SUCH BUS";
 
     osstream<<"Area "<<get_area_number()<<" ("<<get_area_name()<<"): Expected leaving power = "
       <<setprecision(2)<<fixed<<get_expected_power_leaving_area_in_MW()<<" MW, tolerance = "
diff --git a/code/source/basic/device_id.cpp b/code/source/basic/device_id.cpp
index 9f1c3778..72a15662 100644
--- a/code/source/basic/device_id.cpp
+++ b/code/source/basic/device_id.cpp
@@ -188,80 +188,80 @@ size_t DEVICE_ID::get_maximum_allowed_terminal_count() const
 string DEVICE_ID::get_device_name() const
 {
     string device_name = "INVALID DEVICE (possible of type "+get_device_type()+")";
-    if(not is_valid())
-        return device_name;
-
-    string name = get_device_type();
-    string ident = get_device_identifier();
-    TERMINAL term = get_device_terminal();
-    vector<size_t> buses = term.get_buses();
-    size_t bus_count = term.get_bus_count();
-    if(name=="BUS")
-    {
-        device_name = name+" "+num2str(buses[0]);
-        return device_name;
-    }
-
-    if(name=="LINE" or name=="HVDC" or name=="VSC HVDC")
+    if(is_valid())
     {
-        if(ident=="")
-            device_name = name + " ";
-        else
-            device_name = name + " "+ident+" ";
-        device_name += "LINKING BUS "+num2str(buses[0])+" AND "+num2str(buses[1]);
-        return device_name;
-    }
+        string name = get_device_type();
+        string ident = get_device_identifier();
+        TERMINAL term = get_device_terminal();
+        vector<size_t> buses = term.get_buses();
+        size_t bus_count = term.get_bus_count();
+        if(name=="BUS")
+        {
+            device_name = name+" "+num2str(buses[0]);
+            return device_name;
+        }
 
-    if(name=="TRANSFORMER")
-    {
-        if(ident=="")
-            device_name = name + " ";
-        else
-            device_name = name + " "+ident+" ";
-        if(bus_count==2)
+        if(name=="LINE" or name=="HVDC" or name=="VSC HVDC")
+        {
+            if(ident=="")
+                device_name = name + " ";
+            else
+                device_name = name + " "+ident+" ";
             device_name += "LINKING BUS "+num2str(buses[0])+" AND "+num2str(buses[1]);
-        else
-            device_name += "LINKING BUS "+num2str(buses[0])+" "+num2str(buses[1])+" AND "+num2str(buses[2]);
-        return device_name;
-    }
+            return device_name;
+        }
 
-    if(name=="GENERATOR" or name=="WT GENERATOR" or name=="PV UNIT" or name=="ENERGY STORAGE" or
-       name=="LOAD" or name=="FIXED SHUNT" or name=="SWITCHED SHUNT" or name=="EQUIVALENT DEVICE")
-    {
-        if(ident=="")
-            device_name = name + " ";
-        else
-            device_name = name + " "+ident+" ";
-        device_name += "AT BUS "+num2str(buses[0]);
-        return device_name;
-    }
+        if(name=="TRANSFORMER")
+        {
+            if(ident=="")
+                device_name = name + " ";
+            else
+                device_name = name + " "+ident+" ";
+            if(bus_count==2)
+                device_name += "LINKING BUS "+num2str(buses[0])+" AND "+num2str(buses[1]);
+            else
+                device_name += "LINKING BUS "+num2str(buses[0])+" "+num2str(buses[1])+" AND "+num2str(buses[2]);
+            return device_name;
+        }
 
-    if(name=="GENERAL DEVICE")
-    {
-        if(ident=="")
-            device_name = name + " ";
-        else
-            device_name = name + " "+ident+" ";
-        switch(bus_count)
-        {
-            case 0:
-                device_name += " AT SUPER CONTROL CENTER";
-                break;
-            case 1:
-                device_name += " AT BUS "+num2str(buses[0]);
-                break;
-            default:
-                device_name += " LINKING BUSES ("+num2str(buses[0]);
-                for(size_t i=1; i<bus_count; ++i)
-                    device_name += ", "+num2str(buses[i]);
-                device_name += ")";
-                break;
+        if(name=="GENERATOR" or name=="WT GENERATOR" or name=="PV UNIT" or name=="ENERGY STORAGE" or
+           name=="LOAD" or name=="FIXED SHUNT" or name=="SWITCHED SHUNT" or name=="EQUIVALENT DEVICE")
+        {
+            if(ident=="")
+                device_name = name + " ";
+            else
+                device_name = name + " "+ident+" ";
+            device_name += "AT BUS "+num2str(buses[0]);
+            return device_name;
         }
-        return device_name;
-    }
-
 
-    return device_name;
+        if(name=="GENERAL DEVICE")
+        {
+            if(ident=="")
+                device_name = name + " ";
+            else
+                device_name = name + " "+ident+" ";
+            switch(bus_count)
+            {
+                case 0:
+                    device_name += " AT SUPER CONTROL CENTER";
+                    break;
+                case 1:
+                    device_name += " AT BUS "+num2str(buses[0]);
+                    break;
+                default:
+                    device_name += " LINKING BUSES ("+num2str(buses[0]);
+                    for(size_t i=1; i<bus_count; ++i)
+                        device_name += ", "+num2str(buses[i]);
+                    device_name += ")";
+                    break;
+            }
+            return device_name;
+        }
+        return device_name;
+    }
+    else
+        return device_name;
 }
 
 bool DEVICE_ID::is_valid() const
@@ -294,58 +294,60 @@ DEVICE_ID& DEVICE_ID::operator= (const DEVICE_ID& device_id)
 
 bool DEVICE_ID::operator< (const DEVICE_ID& device_id) const
 {
-    if(this->get_device_type() != device_id.get_device_type()) // of different types, no comparison
-        return false;
-
-    TERMINAL this_terminal = this->get_device_terminal();
-    TERMINAL to_compare_terminal = device_id.get_device_terminal();
-    string this_identifier = this->get_device_identifier();
-    string to_compare_identifier = device_id.get_device_identifier();
+    if(this->get_device_type() == device_id.get_device_type())
+    {
+        TERMINAL this_terminal = this->get_device_terminal();
+        TERMINAL to_compare_terminal = device_id.get_device_terminal();
+        string this_identifier = this->get_device_identifier();
+        string to_compare_identifier = device_id.get_device_identifier();
 
-    size_t this_size = this_terminal.get_bus_count();
-    size_t to_compare_size = to_compare_terminal.get_bus_count();
+        size_t this_size = this_terminal.get_bus_count();
+        size_t to_compare_size = to_compare_terminal.get_bus_count();
 
-    size_t max_size = max(this_size, to_compare_size);
+        size_t max_size = max(this_size, to_compare_size);
 
-    bool isless = false;
-    bool isgreater = false;
+        bool isless = false;
+        bool isgreater = false;
 
-    for(size_t i=0; i!=max_size; ++i)
-    {
-        if(this_terminal[i]<to_compare_terminal[i])
+        for(size_t i=0; i!=max_size; ++i)
         {
-            isless = true;
-            break;
-        }
-        else
-        {
-            if(this_terminal[i]>to_compare_terminal[i])
+            if(this_terminal[i]<to_compare_terminal[i])
             {
-                isgreater = true;
+                isless = true;
                 break;
             }
             else
-                continue;
+            {
+                if(this_terminal[i]>to_compare_terminal[i])
+                {
+                    isgreater = true;
+                    break;
+                }
+                else
+                    continue;
+            }
         }
-    }
 
-    if((not isless) and (not isgreater))
-    {
-        if(this_identifier<to_compare_identifier)
-        {
-            isless = true;
-        }
-        else
+        if((not isless) and (not isgreater))
         {
-            if(this_identifier>to_compare_identifier)
+            if(this_identifier<to_compare_identifier)
+            {
+                isless = true;
+            }
+            else
             {
-                isgreater = true;
+                if(this_identifier>to_compare_identifier)
+                {
+                    isgreater = true;
+                }
             }
         }
-    }
 
-    if(isless) return true;
-    else       return false;
+        if(isless) return true;
+        else       return false;
+    }
+    else// of different types, no comparison
+        return false;
 }
 
 bool DEVICE_ID::operator==(const DEVICE_ID& device_id) const
diff --git a/code/source/basic/device_index_map.cpp b/code/source/basic/device_index_map.cpp
index d0b7a945..e5a90edd 100644
--- a/code/source/basic/device_index_map.cpp
+++ b/code/source/basic/device_index_map.cpp
@@ -23,7 +23,43 @@ void DEVICE_INDEX_MAP::set_device_index(const DEVICE_ID& device_id, size_t index
 
 void DEVICE_INDEX_MAP::set_device_index_map(const DEVICE_ID& device_id, size_t index)
 {
-    if(index==INDEX_NOT_EXIST)
+    if(index!=INDEX_NOT_EXIST)
+    {
+        if(not empty())
+        {
+            if(is_given_device_of_the_same_type_as_existing_devices(device_id))
+            {
+                size_t current_index = get_index_of_device(device_id);
+                if(current_index==INDEX_NOT_EXIST)
+                    index_map.insert(pair<DEVICE_ID, size_t>(device_id, index));
+                else
+                {
+                    TERMINAL terminal = device_id.get_device_terminal();
+
+                    ostringstream osstream;
+                    osstream<<"Warning. The index of "<<device_id.get_device_type()<<" '"
+                             <<device_id.get_device_identifier()<<"' at bus"
+                             <<(terminal.get_bus_count()>1?"es":"")<<" ";
+                    vector<size_t> buses = terminal.get_buses();
+                    size_t nbus = terminal.get_bus_count();
+                    for(size_t i=0; i!=nbus; ++i)
+                    {
+                        std::cout<<buses[i]<<" ";
+                    }
+                    osstream<<"exists. Duplicate index may cause the previous one lost.";
+                    show_information_with_leading_time_stamp_with_default_toolkit(osstream);
+
+                    map<DEVICE_ID, size_t>::iterator iter = index_map.find(device_id);
+                    iter->second = index;
+                }
+            }
+        }
+        else
+        {
+            index_map.insert(pair<DEVICE_ID, size_t>(device_id, index));
+        }
+    }
+    else
     {
         map<DEVICE_ID,size_t>::iterator iter  = index_map.begin();
         size_t current_index = get_index_of_device(device_id);
@@ -36,45 +72,47 @@ void DEVICE_INDEX_MAP::set_device_index_map(const DEVICE_ID& device_id, size_t i
             return;
         }
     }
+}
 
-    if(empty())
-    {
-        index_map.insert(pair<DEVICE_ID, size_t>(device_id, index));
-    }
-    else
+void DEVICE_INDEX_MAP::set_device_index_umap(const DEVICE_ID& device_id, size_t index)
+{
+    if(index!=INDEX_NOT_EXIST)
     {
-        if(is_given_device_of_the_same_type_as_existing_devices(device_id))
+        if(not empty())
         {
-            size_t current_index = get_index_of_device(device_id);
-            if(current_index==INDEX_NOT_EXIST)
-                index_map.insert(pair<DEVICE_ID, size_t>(device_id, index));
-            else
+            if(is_given_device_of_the_same_type_as_existing_devices(device_id))
             {
-                TERMINAL terminal = device_id.get_device_terminal();
-
-                ostringstream osstream;
-                osstream<<"Warning. The index of "<<device_id.get_device_type()<<" '"
-                         <<device_id.get_device_identifier()<<"' at bus"
-                         <<(terminal.get_bus_count()>1?"es":"")<<" ";
-                vector<size_t> buses = terminal.get_buses();
-                size_t nbus = terminal.get_bus_count();
-                for(size_t i=0; i!=nbus; ++i)
+                size_t current_index = get_index_of_device(device_id);
+                if(current_index==INDEX_NOT_EXIST)
+                    index_umap.insert(pair<DEVICE_ID, size_t>(device_id, index));
+                else
                 {
-                    std::cout<<buses[i]<<" ";
+                    TERMINAL terminal = device_id.get_device_terminal();
+
+                    ostringstream osstream;
+                    osstream<<"Warning. The index of "<<device_id.get_device_type()<<" '"
+                             <<device_id.get_device_identifier()<<"' at bus"
+                             <<(terminal.get_bus_count()>1?"es":"")<<" ";
+                    vector<size_t> buses = terminal.get_buses();
+                    size_t nbus = terminal.get_bus_count();
+                    for(size_t i=0; i!=nbus; ++i)
+                    {
+                        osstream<<buses[i]<<" ";
+                    }
+                    osstream<<"exists. Duplicate index may cause the previous one lost.";
+                    show_information_with_leading_time_stamp_with_default_toolkit(osstream);
+
+                    unordered_map<DEVICE_ID, size_t>::iterator iter = index_umap.find(device_id);
+                    iter->second = index;
                 }
-                osstream<<"exists. Duplicate index may cause the previous one lost.";
-                show_information_with_leading_time_stamp_with_default_toolkit(osstream);
-
-                map<DEVICE_ID, size_t>::iterator iter = index_map.find(device_id);
-                iter->second = index;
             }
         }
+        else
+        {
+            index_umap.insert(pair<DEVICE_ID, size_t>(device_id, index));
+        }
     }
-}
-
-void DEVICE_INDEX_MAP::set_device_index_umap(const DEVICE_ID& device_id, size_t index)
-{
-    if(index==INDEX_NOT_EXIST)
+    else
     {
         unordered_map<DEVICE_ID,size_t>::iterator iter  = index_umap.begin();
         size_t current_index = get_index_of_device(device_id);
@@ -87,40 +125,6 @@ void DEVICE_INDEX_MAP::set_device_index_umap(const DEVICE_ID& device_id, size_t
             return;
         }
     }
-
-    if(empty())
-    {
-        index_umap.insert(pair<DEVICE_ID, size_t>(device_id, index));
-    }
-    else
-    {
-        if(is_given_device_of_the_same_type_as_existing_devices(device_id))
-        {
-            size_t current_index = get_index_of_device(device_id);
-            if(current_index==INDEX_NOT_EXIST)
-                index_umap.insert(pair<DEVICE_ID, size_t>(device_id, index));
-            else
-            {
-                TERMINAL terminal = device_id.get_device_terminal();
-
-                ostringstream osstream;
-                osstream<<"Warning. The index of "<<device_id.get_device_type()<<" '"
-                         <<device_id.get_device_identifier()<<"' at bus"
-                         <<(terminal.get_bus_count()>1?"es":"")<<" ";
-                vector<size_t> buses = terminal.get_buses();
-                size_t nbus = terminal.get_bus_count();
-                for(size_t i=0; i!=nbus; ++i)
-                {
-                    osstream<<buses[i]<<" ";
-                }
-                osstream<<"exists. Duplicate index may cause the previous one lost.";
-                show_information_with_leading_time_stamp_with_default_toolkit(osstream);
-
-                unordered_map<DEVICE_ID, size_t>::iterator iter = index_umap.find(device_id);
-                iter->second = index;
-            }
-        }
-    }
 }
 
 void DEVICE_INDEX_MAP::decrease_index_by_1_for_device_with_index_greater_than(size_t index)
@@ -169,28 +173,38 @@ size_t DEVICE_INDEX_MAP::get_index_of_device(const DEVICE_ID& device_id) const
 
 size_t DEVICE_INDEX_MAP::get_index_of_device_map(const DEVICE_ID& device_id) const
 {
-    if(empty()) return INDEX_NOT_EXIST;
-
-    if(not is_given_device_of_the_same_type_as_existing_devices(device_id))
+    if(not empty())
+    {
+        if(is_given_device_of_the_same_type_as_existing_devices(device_id))
+        {
+            map<DEVICE_ID, size_t>::const_iterator iter = index_map.begin();
+            iter = index_map.find(device_id);
+            if(iter!=index_map.end()) return iter->second;
+            else                      return INDEX_NOT_EXIST;
+        }
+        else
+            return INDEX_NOT_EXIST;
+    }
+    else
         return INDEX_NOT_EXIST;
-
-    map<DEVICE_ID, size_t>::const_iterator iter = index_map.begin();
-    iter = index_map.find(device_id);
-    if(iter==index_map.end()) return INDEX_NOT_EXIST;
-    else                      return iter->second;
 }
 
 size_t DEVICE_INDEX_MAP::get_index_of_device_umap(const DEVICE_ID& device_id) const
 {
-    if(empty()) return INDEX_NOT_EXIST;
-
-    if(not is_given_device_of_the_same_type_as_existing_devices(device_id))
+    if(not empty())
+    {
+        if(is_given_device_of_the_same_type_as_existing_devices(device_id))
+        {
+            unordered_map<DEVICE_ID, size_t>::const_iterator iter = index_umap.begin();
+            iter = index_umap.find(device_id);
+            if(iter!=index_umap.end()) return iter->second;
+            else                       return INDEX_NOT_EXIST;
+        }
+        else
+            return INDEX_NOT_EXIST;
+    }
+    else
         return INDEX_NOT_EXIST;
-
-    unordered_map<DEVICE_ID, size_t>::const_iterator iter = index_umap.begin();
-    iter = index_umap.find(device_id);
-    if(iter==index_umap.end()) return INDEX_NOT_EXIST;
-    else                       return iter->second;
 }
 
 size_t DEVICE_INDEX_MAP::operator[](const DEVICE_ID& device_id) const
diff --git a/code/source/basic/inphno.cpp b/code/source/basic/inphno.cpp
index c376e0d8..24d3ccc6 100644
--- a/code/source/basic/inphno.cpp
+++ b/code/source/basic/inphno.cpp
@@ -21,64 +21,66 @@ INPHNO::~INPHNO()
 
 void INPHNO::set_physical_internal_bus_number_pair(size_t physical_bus, size_t internal_bus)
 {
-    if(physical_bus == 0)
-        return;
-
-    size_t current_internal_bus_of_input_physical_bus = get_internal_bus_number_of_physical_bus_number(physical_bus);
-
-    if(current_internal_bus_of_input_physical_bus==internal_bus)
-        return;
+    if(physical_bus != 0)
+    {
+        size_t current_internal_bus_of_input_physical_bus = get_internal_bus_number_of_physical_bus_number(physical_bus);
 
-    size_t current_physical_bus_of_input_internal_bus = get_physical_bus_number_of_internal_bus_number(internal_bus);
+        if(current_internal_bus_of_input_physical_bus!=internal_bus)
+        {
+            size_t current_physical_bus_of_input_internal_bus = get_physical_bus_number_of_internal_bus_number(internal_bus);
 
-    if(current_internal_bus_of_input_physical_bus!=INDEX_NOT_EXIST)
-    {
-        physical_to_internal_lookup_table[physical_bus] = INDEX_NOT_EXIST;
-        internal_to_physical_lookup_table[current_internal_bus_of_input_physical_bus] = INDEX_NOT_EXIST;
-    }
+            if(current_internal_bus_of_input_physical_bus!=INDEX_NOT_EXIST)
+            {
+                physical_to_internal_lookup_table[physical_bus] = INDEX_NOT_EXIST;
+                internal_to_physical_lookup_table[current_internal_bus_of_input_physical_bus] = INDEX_NOT_EXIST;
+            }
 
-    if(current_physical_bus_of_input_internal_bus!=INDEX_NOT_EXIST)
-    {
-        internal_to_physical_lookup_table[internal_bus] = INDEX_NOT_EXIST;
-        physical_to_internal_lookup_table[current_physical_bus_of_input_internal_bus] = INDEX_NOT_EXIST;
-    }
+            if(current_physical_bus_of_input_internal_bus!=INDEX_NOT_EXIST)
+            {
+                internal_to_physical_lookup_table[internal_bus] = INDEX_NOT_EXIST;
+                physical_to_internal_lookup_table[current_physical_bus_of_input_internal_bus] = INDEX_NOT_EXIST;
+            }
 
-    size_t n_physical = physical_to_internal_lookup_table.size();
-    size_t n_internal = internal_to_physical_lookup_table.size();
+            size_t n_physical = physical_to_internal_lookup_table.size();
+            size_t n_internal = internal_to_physical_lookup_table.size();
 
-    if(n_physical<physical_bus+1)
-        physical_to_internal_lookup_table.resize(physical_bus+1, INDEX_NOT_EXIST);
-    if(n_internal<=internal_bus)
-        internal_to_physical_lookup_table.resize(internal_bus+1, INDEX_NOT_EXIST);
+            if(n_physical<physical_bus+1)
+                physical_to_internal_lookup_table.resize(physical_bus+1, INDEX_NOT_EXIST);
+            if(n_internal<=internal_bus)
+                internal_to_physical_lookup_table.resize(internal_bus+1, INDEX_NOT_EXIST);
 
 
-    physical_to_internal_lookup_table[physical_bus] = internal_bus;
-    internal_to_physical_lookup_table[internal_bus] = physical_bus;
+            physical_to_internal_lookup_table[physical_bus] = internal_bus;
+            internal_to_physical_lookup_table[internal_bus] = physical_bus;
+        }
+    }
 }
 
 void INPHNO::update_with_new_internal_bus_permutation(const vector<size_t>& P)
 {
-    if(not is_new_internal_bus_permutation_correct(P))
+    if(is_new_internal_bus_permutation_correct(P))
+    {
+        size_t n = P.size();
+        size_t new_internal_bus, old_internal_bus, physical_bus;
+
+        vector<size_t> old_internal_to_physical_lookup_table = internal_to_physical_lookup_table;
+        for(size_t i=0; i!=n; ++i)
+        {
+            new_internal_bus = i;
+            old_internal_bus = P[i];
+
+            physical_bus = old_internal_to_physical_lookup_table[old_internal_bus];
+
+            set_physical_internal_bus_number_pair(physical_bus, new_internal_bus);
+        }
+    }
+    else
     {
         ostringstream osstream;
         osstream<<"Warning. Internal bus permutation is incorrect. Physical-internal bus pair will not be updated.";
         show_information_with_leading_time_stamp_with_default_toolkit(osstream);
         return;
     }
-
-    size_t n = P.size();
-    size_t new_internal_bus, old_internal_bus, physical_bus;
-
-    vector<size_t> old_internal_to_physical_lookup_table = internal_to_physical_lookup_table;
-    for(size_t i=0; i!=n; ++i)
-    {
-        new_internal_bus = i;
-        old_internal_bus = P[i];
-
-        physical_bus = old_internal_to_physical_lookup_table[old_internal_bus];
-
-        set_physical_internal_bus_number_pair(physical_bus, new_internal_bus);
-    }
 }
 
 bool INPHNO::is_new_internal_bus_permutation_correct(const vector<size_t>& P)
@@ -94,7 +96,9 @@ bool INPHNO::is_new_internal_bus_permutation_correct(const vector<size_t>& P)
     {
         for(size_t i = 0; i!=nPsort; ++i)
         {
-            if(Psort[i] != i)
+            if(Psort[i] == i)
+                continue;
+            else
             {
                 flag = false;
                 break;
@@ -116,7 +120,9 @@ bool INPHNO::is_table_full() const
     {
         physical_bus = get_physical_bus_number_of_internal_bus_number(internal_bus);
 
-        if(physical_bus == INDEX_NOT_EXIST)
+        if(physical_bus != INDEX_NOT_EXIST)
+            continue;
+        else
         {
             full_logic = false;
             break;
diff --git a/code/source/basic/ownership.cpp b/code/source/basic/ownership.cpp
index 9f1deba1..7917f010 100644
--- a/code/source/basic/ownership.cpp
+++ b/code/source/basic/ownership.cpp
@@ -19,16 +19,16 @@ OWNERSHIP::OWNERSHIP(const OWNERSHIP& ownership)
 
 void OWNERSHIP::append_owner_and_its_fraction(size_t owner, double fraction)
 {
-	if(owner == 0) return;
-    if(fraction<0.0) return;
-
-    if(! has_owner(owner))
-        ownership_pair.insert(map<size_t,double>::value_type(owner, fraction));
-    else
+	if(owner != 0 and fraction>=0.0)
     {
-        map<size_t, double>::iterator iter;
-        iter = ownership_pair.find(owner);
-        iter->second += fraction;
+        if(not has_owner(owner))
+            ownership_pair.insert(map<size_t,double>::value_type(owner, fraction));
+        else
+        {
+            map<size_t, double>::iterator iter;
+            iter = ownership_pair.find(owner);
+            iter->second += fraction;
+        }
     }
 }
 
@@ -49,10 +49,11 @@ void OWNERSHIP::normalize()
     for(iter=ownership_pair.begin(); iter!=ownership_pair.end(); ++iter)
         sum_fraction += iter->second;
 
-    if(sum_fraction==0.0) return;
-
-    for(iter=ownership_pair.begin(); iter!=ownership_pair.end(); ++iter)
-        iter->second /= sum_fraction;
+    if(sum_fraction!=0.0)
+    {
+        for(iter=ownership_pair.begin(); iter!=ownership_pair.end(); ++iter)
+            iter->second /= sum_fraction;
+    }
 }
 
 bool OWNERSHIP::empty() const
diff --git a/code/source/basic/rating.cpp b/code/source/basic/rating.cpp
index ed69b257..da6085f7 100644
--- a/code/source/basic/rating.cpp
+++ b/code/source/basic/rating.cpp
@@ -20,20 +20,20 @@ RATING::~RATING()
 
 void RATING::set_rating_A_MVA(double rate)
 {
-    if(rate<0) return;
-    rating_A_MVA = rate;
+    if(rate>=0)
+        rating_A_MVA = rate;
 }
 
 void RATING::set_rating_B_MVA(double rate)
 {
-    if(rate<0) return;
-    rating_B_MVA = rate;
+    if(rate>=0)
+        rating_B_MVA = rate;
 }
 
 void RATING::set_rating_C_MVA(double rate)
 {
-    if(rate<0) return;
-    rating_C_MVA = rate;
+    if(rate>=0)
+        rating_C_MVA = rate;
 }
 
 double RATING::get_rating_A_MVA() const
diff --git a/code/source/basic/sparse_matrix_csparse.cpp b/code/source/basic/sparse_matrix_csparse.cpp
index 7e02d211..8e03fd00 100644
--- a/code/source/basic/sparse_matrix_csparse.cpp
+++ b/code/source/basic/sparse_matrix_csparse.cpp
@@ -150,97 +150,98 @@ void SPARSE_MATRIX_CSPARSE::add_entry(int row, int col, complex<double> value)
 
 void SPARSE_MATRIX_CSPARSE::convert_to_triplet_form()
 {
-    if(matrix_in_triplet_form())
-        return;
-
-    cs *mat_real; // temp mat
-    cs *mat_imag; // temp mat
-    csi *tempi; // temp index
-    double *tempd; // temp value
-
-    // copy
-    mat_real = cs_spalloc(1,1,1,1,1);
-    mat_imag = cs_spalloc(1,1,1,1,1);
-    int n = get_matrix_entry_count();
-    int row, col;
-    for(int k=0; k!=n; ++k)
+    if(matrix_in_compressed_column_form())
     {
-        row = get_row_number_of_entry_index(k);
-        col = get_column_number_of_entry_index(k);
-        cs_entry(mat_real, row, col, get_real_entry_value(k));
-        cs_entry(mat_imag, row, col, get_imag_entry_value(k));
-    }
-    // swap
-    matrix_real->nzmax = mat_real->nzmax;
-    matrix_real->m = mat_real->m;
-    matrix_real->n = mat_real->n;
-    matrix_real->nz = mat_real->nz;
-    tempi = matrix_real->p; matrix_real->p = mat_real->p; mat_real->p = tempi;
-    tempi = matrix_real->i; matrix_real->i = mat_real->i; mat_real->i = tempi;
-    tempd = matrix_real->x; matrix_real->x = mat_real->x; mat_real->x = tempd;
-    // free temp mat
-    cs_spfree(mat_real);
-
-    // swap
-    matrix_imag->nzmax = mat_imag->nzmax;
-    matrix_imag->m = mat_imag->m;
-    matrix_imag->n = mat_imag->n;
-    matrix_imag->nz = mat_imag->nz;
-    tempi = matrix_imag->p; matrix_imag->p = mat_imag->p; mat_imag->p = tempi;
-    tempi = matrix_imag->i; matrix_imag->i = mat_imag->i; mat_imag->i = tempi;
-    tempd = matrix_imag->x; matrix_imag->x = mat_imag->x; mat_imag->x = tempd;
-    // free temp mat
-    cs_spfree(mat_imag);
+        cs *mat_real; // temp mat
+        cs *mat_imag; // temp mat
+        csi *tempi; // temp index
+        double *tempd; // temp value
+
+        // copy
+        mat_real = cs_spalloc(1,1,1,1,1);
+        mat_imag = cs_spalloc(1,1,1,1,1);
+        int n = get_matrix_entry_count();
+        int row, col;
+        for(int k=0; k!=n; ++k)
+        {
+            row = get_row_number_of_entry_index(k);
+            col = get_column_number_of_entry_index(k);
+            cs_entry(mat_real, row, col, get_real_entry_value(k));
+            cs_entry(mat_imag, row, col, get_imag_entry_value(k));
+        }
+        // swap
+        matrix_real->nzmax = mat_real->nzmax;
+        matrix_real->m = mat_real->m;
+        matrix_real->n = mat_real->n;
+        matrix_real->nz = mat_real->nz;
+        tempi = matrix_real->p; matrix_real->p = mat_real->p; mat_real->p = tempi;
+        tempi = matrix_real->i; matrix_real->i = mat_real->i; mat_real->i = tempi;
+        tempd = matrix_real->x; matrix_real->x = mat_real->x; mat_real->x = tempd;
+        // free temp mat
+        cs_spfree(mat_real);
+
+        // swap
+        matrix_imag->nzmax = mat_imag->nzmax;
+        matrix_imag->m = mat_imag->m;
+        matrix_imag->n = mat_imag->n;
+        matrix_imag->nz = mat_imag->nz;
+        tempi = matrix_imag->p; matrix_imag->p = mat_imag->p; mat_imag->p = tempi;
+        tempi = matrix_imag->i; matrix_imag->i = mat_imag->i; mat_imag->i = tempi;
+        tempd = matrix_imag->x; matrix_imag->x = mat_imag->x; mat_imag->x = tempd;
+        // free temp mat
+        cs_spfree(mat_imag);
 
-    update_clock_when_matrix_is_changed();
+        update_clock_when_matrix_is_changed();
+    }
 }
 
 void SPARSE_MATRIX_CSPARSE::compress_and_merge_duplicate_entries()
 {
     // compress the sparse matrix
-    if(matrix_in_compressed_column_form()) return;
-
-    cs *mat; // temp mat
-    csi *tempi; // temp index
-    double *tempd; // temp value
-
-    // real part
-    // compress the matrix
-    mat = cs_compress(matrix_real);
-    // swap
-    matrix_real->nzmax = mat->nzmax;
-    matrix_real->m = mat->m;
-    matrix_real->n = mat->n;
-    matrix_real->nz = mat->nz;
-    tempi = matrix_real->p; matrix_real->p = mat->p; mat->p = tempi;
-    tempi = matrix_real->i; matrix_real->i = mat->i; mat->i = tempi;
-    tempd = matrix_real->x; matrix_real->x = mat->x; mat->x = tempd;
-    // free temp mat
-    cs_spfree(mat);
-
-    cs_dupl(matrix_real); // merge duplicate entries
-
-    //  imaginary part
-    // compress the matrix
-    mat = cs_compress(matrix_imag);
-    // swap
-    matrix_imag->nzmax = mat->nzmax;
-    matrix_imag->m = mat->m;
-    matrix_imag->n = mat->n;
-    matrix_imag->nz = mat->nz;
-    tempi = matrix_imag->p; matrix_imag->p = mat->p; mat->p = tempi;
-    tempi = matrix_imag->i; matrix_imag->i = mat->i; mat->i = tempi;
-    tempd = matrix_imag->x; matrix_imag->x = mat->x; mat->x = tempd;
-    // free temp mat
-    cs_spfree(mat);
-
-    cs_dupl(matrix_imag); // merge duplicate entries
-
-    // at last, transpose twice
-    transpose();
-    transpose();
+    if(matrix_in_triplet_form())
+    {
+        cs *mat; // temp mat
+        csi *tempi; // temp index
+        double *tempd; // temp value
+
+        // real part
+        // compress the matrix
+        mat = cs_compress(matrix_real);
+        // swap
+        matrix_real->nzmax = mat->nzmax;
+        matrix_real->m = mat->m;
+        matrix_real->n = mat->n;
+        matrix_real->nz = mat->nz;
+        tempi = matrix_real->p; matrix_real->p = mat->p; mat->p = tempi;
+        tempi = matrix_real->i; matrix_real->i = mat->i; mat->i = tempi;
+        tempd = matrix_real->x; matrix_real->x = mat->x; mat->x = tempd;
+        // free temp mat
+        cs_spfree(mat);
+
+        cs_dupl(matrix_real); // merge duplicate entries
+
+        //  imaginary part
+        // compress the matrix
+        mat = cs_compress(matrix_imag);
+        // swap
+        matrix_imag->nzmax = mat->nzmax;
+        matrix_imag->m = mat->m;
+        matrix_imag->n = mat->n;
+        matrix_imag->nz = mat->nz;
+        tempi = matrix_imag->p; matrix_imag->p = mat->p; mat->p = tempi;
+        tempi = matrix_imag->i; matrix_imag->i = mat->i; mat->i = tempi;
+        tempd = matrix_imag->x; matrix_imag->x = mat->x; mat->x = tempd;
+        // free temp mat
+        cs_spfree(mat);
+
+        cs_dupl(matrix_imag); // merge duplicate entries
+
+        // at last, transpose twice
+        transpose();
+        transpose();
 
-    update_clock_when_matrix_is_changed();
+        update_clock_when_matrix_is_changed();
+    }
 }
 
 void SPARSE_MATRIX_CSPARSE::transpose()
@@ -249,7 +250,6 @@ void SPARSE_MATRIX_CSPARSE::transpose()
     if(matrix_in_triplet_form()) // if in triplet format, convert to compressed format
         compress_and_merge_duplicate_entries(); // convert
 
-
     cs *mat; // temp mat
     csi *tempi; // temp index
     double *tempd; // temp value
@@ -413,43 +413,55 @@ void SPARSE_MATRIX_CSPARSE::LU_factorization(int order, double tolerance)
     cs_nfree(LU); // free LU (csn *)
     cs_sfree(LU_symbolic);
     csi n, ok ;
-    if (!CS_CSC (matrix_real))/* check inputs */
-    {
-        snprintf(buffer, 256, "No real matrix is set for LU factorization. Return. (line %d in file %s)\n",__LINE__,__FILE__);
-        show_information_with_leading_time_stamp_with_default_toolkit(buffer);
-        return;
-    }
-    n = matrix_real->n ;
-    LU_symbolic = cs_sqr (order, matrix_real, 0) ;              /* ordering and symbolic analysis */
-    LU = cs_lu (matrix_real, LU_symbolic, tolerance) ;                 /* numeric LU factorization */
-    ok = (LU_symbolic && LU) ; // check
-    if(ok!=1)
+    if (CS_CSC (matrix_real))/* check inputs */
     {
-        snprintf(buffer, 256, "ALERT!  LU factorization for sparse matrix(CSparse) failed! (line %d in file %s)\n",__LINE__,__FILE__);
-        show_information_with_leading_time_stamp_with_default_toolkit(buffer);
-        return;
+        n = matrix_real->n ;
+        LU_symbolic = cs_sqr (order, matrix_real, 0) ;              /* ordering and symbolic analysis */
+        LU = cs_lu (matrix_real, LU_symbolic, tolerance) ;                 /* numeric LU factorization */
+        ok = (LU_symbolic && LU) ; // check
+        if(ok==1)
+        {
+            // reset working space
+            if(LU_workspace!=NULL) free(LU_workspace);
+            LU_workspace = (double *)cs_malloc(n, sizeof (double)) ;  // get workspace
+            if(LU_workspace != NULL)
+                ;
+            else
+            {
+                snprintf(buffer, 256, "Global variable LU_workspace was not successfully set. No workspace for LU solution. (line %d in file %s)\n",__LINE__,__FILE__);
+                show_information_with_leading_time_stamp_with_default_toolkit(buffer);
+            }
+            update_clock_when_LU_factorization_is_performed(); // mark the clock when finish the LU decomposition
+        }
+        else
+        {
+            snprintf(buffer, 256, "ALERT!  LU factorization for sparse matrix(CSparse) failed! (line %d in file %s)\n",__LINE__,__FILE__);
+            show_information_with_leading_time_stamp_with_default_toolkit(buffer);
+        }
     }
-    // reset working space
-    if(LU_workspace!=NULL) free(LU_workspace);
-    LU_workspace = (double *)cs_malloc(n, sizeof (double)) ;  // get workspace
-    if(LU_workspace == NULL)
+    else
     {
-        snprintf(buffer, 256, "Global variable LU_workspace was not successfully set. No workspace for LU solution. (line %d in file %s)\n",__LINE__,__FILE__);
+        snprintf(buffer, 256, "No real matrix is set for LU factorization. Return. (line %d in file %s)\n",__LINE__,__FILE__);
         show_information_with_leading_time_stamp_with_default_toolkit(buffer);
     }
-
-    update_clock_when_LU_factorization_is_performed(); // mark the clock when finish the LU decomposition
-    return;
 }
 
 vector<double> SPARSE_MATRIX_CSPARSE::solve_Ax_eq_b(vector<double>& b)
 {
-    if(not LU_factorization_is_performed())
+    if(LU_factorization_is_performed())
+    {
+        solve_Lx_eq_b(b);
+
+        solve_xU_eq_b(b);
+    }
+    else
+    {
         LU_factorization(1, 1e-6);
 
-    solve_Lx_eq_b(b);
+        solve_Lx_eq_b(b);
 
-    solve_xU_eq_b(b);
+        solve_xU_eq_b(b);
+    }
 
     return b;
 }
@@ -459,30 +471,30 @@ void SPARSE_MATRIX_CSPARSE::solve_Lx_eq_b(vector<double>& b)
     ostringstream osstream;
     size_t n = b.size();
     double* bb = (double*)malloc(n*sizeof(double));
-    if(bb==NULL)
+    if(bb!=NULL)
     {
-        osstream<<"Error. Failed to allocate temporary array for solving Lx=b.(function "<<__FUNCTION__<<" in file "<<__FILE__;
-        show_information_with_leading_time_stamp_with_default_toolkit(osstream);
+        for(size_t i=0; i!=n; ++i) bb[i]=b[i]; // set bb
 
-        return; // failed to allocate array bb
-    }
-
-    for(size_t i=0; i!=n; ++i) bb[i]=b[i]; // set bb
+        cs_ipvec(LU->pinv, bb, LU_workspace, matrix_real->n) ;       /* x = b(p) */
+        int OK = cs_lsolve (LU->L, LU_workspace) ;               /* x = L\x */
+        if(OK == 1)
+        {
+            // now solution is OK
+            for(size_t i=0; i!=n; ++i) b[i]=LU_workspace[i]; // now reset b with bb
 
-    cs_ipvec(LU->pinv, bb, LU_workspace, matrix_real->n) ;       /* x = b(p) */
-    int OK = cs_lsolve (LU->L, LU_workspace) ;               /* x = L\x */
-    if(OK != 1)
+            free(bb);
+        }
+        else
+        {
+            osstream<<"Error. Failed to solve Lx=b.(function "<<__FUNCTION__<<" in file "<<__FILE__;
+            show_information_with_leading_time_stamp_with_default_toolkit(osstream);
+        }
+    }
+    else
     {
-        osstream<<"Error. Failed to solve Lx=b.(function "<<__FUNCTION__<<" in file "<<__FILE__;
+        osstream<<"Error. Failed to allocate temporary array for solving Lx=b.(function "<<__FUNCTION__<<" in file "<<__FILE__;
         show_information_with_leading_time_stamp_with_default_toolkit(osstream);
-        return; // failed to solve equation
     }
-    // now solution is OK
-    for(size_t i=0; i!=n; ++i) b[i]=LU_workspace[i]; // now reset b with bb
-
-    free(bb);
-
-    return;
 }
 
 void SPARSE_MATRIX_CSPARSE::solve_xU_eq_b(vector<double>& b)
@@ -492,30 +504,32 @@ void SPARSE_MATRIX_CSPARSE::solve_xU_eq_b(vector<double>& b)
 
     size_t n = b.size();
     double* bb = (double*)malloc(n*sizeof(double));
-    if(bb==NULL)
+    if(bb!=NULL)
     {
-        snprintf(cbuffer, 1000, "Error. Failed to allocate temporary array for solving xU=b.(function %s in file %s)\n",__FUNCTION__,__FILE__);
-        buffer = cbuffer;
-        show_information_with_leading_time_stamp_with_default_toolkit(buffer);
-        return; // failed to allocate array bb
-    }
-    for(size_t i=0; i!=n; ++i) LU_workspace[i]=b[i]; // set bb
-    int OK = cs_usolve(LU->U, LU_workspace) ;               /* x = U\x */
-    cs_ipvec(LU_symbolic->q, LU_workspace, bb, matrix_real->n) ;          /* b(q) = x */
+        for(size_t i=0; i!=n; ++i) LU_workspace[i]=b[i]; // set bb
+        int OK = cs_usolve(LU->U, LU_workspace) ;               /* x = U\x */
+        cs_ipvec(LU_symbolic->q, LU_workspace, bb, matrix_real->n) ;          /* b(q) = x */
+
+        if(OK == 1)
+        {
+            // now solution is OK
+            for(size_t i=0; i!=n; ++i) b[i]=bb[i]; // now reset b with bb
 
-    if(OK != 1)
+            free(bb);
+        }
+        else
+        {
+            snprintf(cbuffer, 1000, "Error. Failed to solve xU=b.(function %s in file %s)\n",__FUNCTION__,__FILE__);
+            buffer = cbuffer;
+            show_information_with_leading_time_stamp_with_default_toolkit(buffer);
+        }
+    }
+    else
     {
-        snprintf(cbuffer, 1000, "Error. Failed to solve xU=b.(function %s in file %s)\n",__FUNCTION__,__FILE__);
+        snprintf(cbuffer, 1000, "Error. Failed to allocate temporary array for solving xU=b.(function %s in file %s)\n",__FUNCTION__,__FILE__);
         buffer = cbuffer;
         show_information_with_leading_time_stamp_with_default_toolkit(buffer);
-        return; // failed to solve equation
     }
-    // now solution is OK
-    for(size_t i=0; i!=n; ++i) b[i]=bb[i]; // now reset b with bb
-
-    free(bb);
-
-    return;
 }
 
 
@@ -563,35 +577,37 @@ void SPARSE_MATRIX_CSPARSE::save_matrix_to_file(string filename) const
     ofstream file;
     file.open(filename);
 
-    if(not file.is_open())
+    if(file.is_open())
     {
-        osstream<<"File '"<<filename<<"' cannot be opened for saving sparse matrix(CSparse) contents."<<endl
-          <<"No sparse matrix(CSparse) will be exported.";
-        show_information_with_leading_time_stamp_with_default_toolkit(osstream);
-        return;
-    }
-
-    int i=0, j=0, k=0;
+        int i=0, j=0, k=0;
 
-	file<<"ROW,COLUMN,REAL,IMAGINARY"<<endl;
+        file<<"ROW,COLUMN,REAL,IMAGINARY"<<endl;
 
-	int n = get_matrix_size();
-    for(j=0;j!=n;++j)
-    {
-        for(k=matrix_real->p[j];k<matrix_real->p[j+1];++k)
+        int n = get_matrix_size();
+        for(j=0;j!=n;++j)
         {
-            i=matrix_real->i[k];
-
-            if(matrix_imag->n==0)
-                file<<i<<","<<j<<","
-                    <<setprecision(6)<<fixed<<matrix_real->x[k]<<",0.0"<<endl;
-            else
-                file<<i<<","<<j<<","
-                    <<setprecision(6)<<fixed<<matrix_real->x[k]<<","
-                    <<setprecision(6)<<fixed<<matrix_imag->x[k]<<endl;
+            for(k=matrix_real->p[j];k<matrix_real->p[j+1];++k)
+            {
+                i=matrix_real->i[k];
+
+                if(matrix_imag->n==0)
+                    file<<i<<","<<j<<","
+                        <<setprecision(6)<<fixed<<matrix_real->x[k]<<",0.0"<<endl;
+                else
+                    file<<i<<","<<j<<","
+                        <<setprecision(6)<<fixed<<matrix_real->x[k]<<","
+                        <<setprecision(6)<<fixed<<matrix_imag->x[k]<<endl;
+            }
         }
+        file.close();
+    }
+    else
+    {
+        osstream<<"File '"<<filename<<"' cannot be opened for saving sparse matrix(CSparse) contents."<<endl
+          <<"No sparse matrix(CSparse) will be exported.";
+        show_information_with_leading_time_stamp_with_default_toolkit(osstream);
+        return;
     }
-    file.close();
 }
 
 vector<double> operator/(vector<double>&b, SPARSE_MATRIX_CSPARSE& A)
diff --git a/code/source/basic/sparse_matrix_klu.cpp b/code/source/basic/sparse_matrix_klu.cpp
index 0d8a55ec..b7096082 100644
--- a/code/source/basic/sparse_matrix_klu.cpp
+++ b/code/source/basic/sparse_matrix_klu.cpp
@@ -186,75 +186,76 @@ void SPARSE_MATRIX_KLU::add_entry(int row, int col, complex<double> value)
 
 void SPARSE_MATRIX_KLU::convert_to_triplet_form()
 {
-    if(matrix_in_triplet_form())
-        return;
-    cout<<"convert to triplet form"<<endl;
-    triplet_row_index.clear();
-    triplet_column_index.clear();
-    triplet_matrix_real.clear();
-    triplet_matrix_imag.clear();
-
-    int row, col;
-    size_t nz = get_matrix_entry_count();
-    for(int k=0; k!=nz; ++k)
+    if(matrix_in_compressed_column_form())
     {
-        row = get_row_number_of_entry_index(k);
-        col = get_column_number_of_entry_index(k);
-        triplet_row_index.push_back(row);
-        triplet_column_index.push_back(col);
-        triplet_matrix_real.push_back(get_real_entry_value(k));
-        triplet_matrix_imag.push_back(get_imag_entry_value(k));
-    }
-    update_clock_when_matrix_is_changed();
+        triplet_row_index.clear();
+        triplet_column_index.clear();
+        triplet_matrix_real.clear();
+        triplet_matrix_imag.clear();
+
+        int row, col;
+        size_t nz = get_matrix_entry_count();
+        for(int k=0; k!=nz; ++k)
+        {
+            row = get_row_number_of_entry_index(k);
+            col = get_column_number_of_entry_index(k);
+            triplet_row_index.push_back(row);
+            triplet_column_index.push_back(col);
+            triplet_matrix_real.push_back(get_real_entry_value(k));
+            triplet_matrix_imag.push_back(get_imag_entry_value(k));
+        }
+        update_clock_when_matrix_is_changed();
 
-    flag_matrix_in_triplet_form = true;
+        flag_matrix_in_triplet_form = true;
 
-    if(compressed_column_starting_index!=NULL) free(compressed_column_starting_index);
-    if(compressed_row_index!=NULL) free(compressed_row_index);
-    if(compressed_matrix_real!=NULL) free(compressed_matrix_real);
-    if(compressed_matrix_imag!=NULL) free(compressed_matrix_imag);
+        if(compressed_column_starting_index!=NULL) free(compressed_column_starting_index);
+        if(compressed_row_index!=NULL) free(compressed_row_index);
+        if(compressed_matrix_real!=NULL) free(compressed_matrix_real);
+        if(compressed_matrix_imag!=NULL) free(compressed_matrix_imag);
+    }
 }
 
 void SPARSE_MATRIX_KLU::compress_and_merge_duplicate_entries()
 {
     // compress the sparse matrix
-    if(matrix_in_compressed_column_form()) return;
-
-    size_t nz = triplet_matrix_real.size();
-    int* row_index = (int*)calloc(nz, sizeof(int));
-    int* col_index = (int*)calloc(nz, sizeof(int));
-    double* vreal = (double*)calloc(nz, sizeof(double));
-    double* vimag = (double*)calloc(nz, sizeof(double));
-    for(size_t i=0; i<nz; ++i)
-    {
-        row_index[i] = triplet_row_index[i];
-        col_index[i] = triplet_column_index[i];
-        vreal[i]=triplet_matrix_real[i];
-        vimag[i]=triplet_matrix_imag[i];
-        //cout<<row_index[i]<<", "<<col_index[i]<<": "<<vreal[i]<<"+j"<<vimag[i]<<endl;
-    }
-    compressed_column_starting_index = (int*)calloc(n_column+1, sizeof(int));
-    compressed_row_index = (int*)calloc(nz, sizeof(int));
-    // real part
-    compressed_matrix_real = (double*)calloc(nz, sizeof(double));
-    umfpack_di_triplet_to_col (n_row, n_column, nz, row_index, col_index, vreal,
-                               compressed_column_starting_index, compressed_row_index, compressed_matrix_real, (int *) NULL) ;
-    // imaginary part
-    compressed_matrix_imag = (double*)calloc(nz, sizeof(double));
-    umfpack_di_triplet_to_col (n_row, n_column, nz, row_index, col_index, vimag,
-                               compressed_column_starting_index, compressed_row_index, compressed_matrix_imag, (int *) NULL) ;
-    triplet_row_index.clear();
-    triplet_column_index.clear();
-    triplet_matrix_real.clear();
-    triplet_matrix_imag.clear();
-    flag_matrix_in_triplet_form = false;
+    if(matrix_in_triplet_form())
+    {
+        size_t nz = triplet_matrix_real.size();
+        int* row_index = (int*)calloc(nz, sizeof(int));
+        int* col_index = (int*)calloc(nz, sizeof(int));
+        double* vreal = (double*)calloc(nz, sizeof(double));
+        double* vimag = (double*)calloc(nz, sizeof(double));
+        for(size_t i=0; i<nz; ++i)
+        {
+            row_index[i] = triplet_row_index[i];
+            col_index[i] = triplet_column_index[i];
+            vreal[i]=triplet_matrix_real[i];
+            vimag[i]=triplet_matrix_imag[i];
+            //cout<<row_index[i]<<", "<<col_index[i]<<": "<<vreal[i]<<"+j"<<vimag[i]<<endl;
+        }
+        compressed_column_starting_index = (int*)calloc(n_column+1, sizeof(int));
+        compressed_row_index = (int*)calloc(nz, sizeof(int));
+        // real part
+        compressed_matrix_real = (double*)calloc(nz, sizeof(double));
+        umfpack_di_triplet_to_col (n_row, n_column, nz, row_index, col_index, vreal,
+                                   compressed_column_starting_index, compressed_row_index, compressed_matrix_real, (int *) NULL) ;
+        // imaginary part
+        compressed_matrix_imag = (double*)calloc(nz, sizeof(double));
+        umfpack_di_triplet_to_col (n_row, n_column, nz, row_index, col_index, vimag,
+                                   compressed_column_starting_index, compressed_row_index, compressed_matrix_imag, (int *) NULL) ;
+        triplet_row_index.clear();
+        triplet_column_index.clear();
+        triplet_matrix_real.clear();
+        triplet_matrix_imag.clear();
+        flag_matrix_in_triplet_form = false;
 
-    free(row_index);
-    free(col_index);
-    free(vreal);
-    free(vimag);
+        free(row_index);
+        free(col_index);
+        free(vreal);
+        free(vimag);
 
-    update_clock_when_matrix_is_changed();
+        update_clock_when_matrix_is_changed();
+    }
 }
 
 void SPARSE_MATRIX_KLU::transpose()
@@ -311,10 +312,10 @@ int SPARSE_MATRIX_KLU::get_matrix_size() const
 
 int SPARSE_MATRIX_KLU::get_matrix_entry_count() const
 {
-    if(matrix_in_triplet_form())
-        return int(triplet_matrix_real.size());
-    else
-        return compressed_column_starting_index[n_column];
+    if(matrix_in_compressed_column_form())
+        return compressed_column_starting_index[n_column];
+    else
+        return int(triplet_matrix_real.size());
 }
 
 int SPARSE_MATRIX_KLU::get_starting_index_of_column(int col) const
@@ -427,16 +428,16 @@ vector<size_t> SPARSE_MATRIX_KLU::get_reorder_permutation()
 
 void SPARSE_MATRIX_KLU::LU_factorization(int order, double tolerance)
 {
-    if(LU_factorization_is_performed()) return;
-
-    if(Symbolic!=NULL) klu_free_symbolic(&Symbolic, &Common);
-    if(Numeric!=NULL) klu_free_numeric(&Numeric, &Common);
+    if(not LU_factorization_is_performed())
+    {
+        if(Symbolic!=NULL) klu_free_symbolic(&Symbolic, &Common);
+        if(Numeric!=NULL) klu_free_numeric(&Numeric, &Common);
 
-    Symbolic = klu_analyze (n_column, compressed_column_starting_index, compressed_row_index, &Common) ;
-    Numeric = klu_factor (compressed_column_starting_index, compressed_row_index, compressed_matrix_real, Symbolic, &Common) ;
+        Symbolic = klu_analyze (n_column, compressed_column_starting_index, compressed_row_index, &Common) ;
+        Numeric = klu_factor (compressed_column_starting_index, compressed_row_index, compressed_matrix_real, Symbolic, &Common) ;
 
-    update_clock_when_LU_factorization_is_performed(); // mark the clock when finish the LU decomposition
-    return;
+        update_clock_when_LU_factorization_is_performed(); // mark the clock when finish the LU decomposition
+    }
 }
 
 vector<double> SPARSE_MATRIX_KLU::solve_Ax_eq_b(vector<double>& b)
@@ -492,32 +493,33 @@ void SPARSE_MATRIX_KLU::save_matrix_to_file(string filename) const
 
     ofstream file;
     file.open(filename);
-
-    if(not file.is_open())
+    if(file.is_open())
     {
-        osstream<<"File '"<<filename<<"' cannot be opened for saving sparse matrix(CSparse) contents."<<endl
-          <<"No sparse matrix(CSparse) will be exported.";
-        show_information_with_leading_time_stamp_with_default_toolkit(osstream);
-        return;
-    }
+        int i=0, j=0, k=0;
 
-    int i=0, j=0, k=0;
+        file<<"ROW,COLUMN,REAL,IMAGINARY"<<endl;
 
-	file<<"ROW,COLUMN,REAL,IMAGINARY"<<endl;
-
-	int n = get_matrix_size();
-    for(j=0;j!=n;++j)
-    {
-        for(k=compressed_column_starting_index[j];k<compressed_column_starting_index[j+1];++k)
+        int n = get_matrix_size();
+        for(j=0;j!=n;++j)
         {
-            i=compressed_row_index[k];
+            for(k=compressed_column_starting_index[j];k<compressed_column_starting_index[j+1];++k)
+            {
+                i=compressed_row_index[k];
 
-            file<<i<<","<<j<<","
-                <<setprecision(6)<<fixed<<compressed_matrix_real[k]<<","
-                <<setprecision(6)<<fixed<<compressed_matrix_imag[k]<<endl;
+                file<<i<<","<<j<<","
+                    <<setprecision(6)<<fixed<<compressed_matrix_real[k]<<","
+                    <<setprecision(6)<<fixed<<compressed_matrix_imag[k]<<endl;
+            }
         }
+        file.close();
+    }
+    else
+    {
+        osstream<<"File '"<<filename<<"' cannot be opened for saving sparse matrix(CSparse) contents."<<endl
+          <<"No sparse matrix(CSparse) will be exported.";
+        show_information_with_leading_time_stamp_with_default_toolkit(osstream);
+        return;
     }
-    file.close();
 }
 
 vector<double> operator/(vector<double>&b, SPARSE_MATRIX_KLU& A)
diff --git a/code/source/basic/sparse_matrix_umfpack.cpp b/code/source/basic/sparse_matrix_umfpack.cpp
index 41ff0515..d5c5bc5c 100644
--- a/code/source/basic/sparse_matrix_umfpack.cpp
+++ b/code/source/basic/sparse_matrix_umfpack.cpp
@@ -187,75 +187,76 @@ void SPARSE_MATRIX_UMFPACK::add_entry(int row, int col, complex<double> value)
 
 void SPARSE_MATRIX_UMFPACK::convert_to_triplet_form()
 {
-    if(matrix_in_triplet_form())
-        return;
-    cout<<"convert to triplet form"<<endl;
-    triplet_row_index.clear();
-    triplet_column_index.clear();
-    triplet_matrix_real.clear();
-    triplet_matrix_imag.clear();
-
-    int row, col;
-    size_t nz = get_matrix_entry_count();
-    for(int k=0; k!=nz; ++k)
+    if(matrix_in_compressed_column_form())
     {
-        row = get_row_number_of_entry_index(k);
-        col = get_column_number_of_entry_index(k);
-        triplet_row_index.push_back(row);
-        triplet_column_index.push_back(col);
-        triplet_matrix_real.push_back(get_real_entry_value(k));
-        triplet_matrix_imag.push_back(get_imag_entry_value(k));
-    }
-    update_clock_when_matrix_is_changed();
+        triplet_row_index.clear();
+        triplet_column_index.clear();
+        triplet_matrix_real.clear();
+        triplet_matrix_imag.clear();
+
+        int row, col;
+        size_t nz = get_matrix_entry_count();
+        for(int k=0; k!=nz; ++k)
+        {
+            row = get_row_number_of_entry_index(k);
+            col = get_column_number_of_entry_index(k);
+            triplet_row_index.push_back(row);
+            triplet_column_index.push_back(col);
+            triplet_matrix_real.push_back(get_real_entry_value(k));
+            triplet_matrix_imag.push_back(get_imag_entry_value(k));
+        }
+        update_clock_when_matrix_is_changed();
 
-    flag_matrix_in_triplet_form = true;
+        flag_matrix_in_triplet_form = true;
 
-    if(compressed_column_starting_index!=NULL) free(compressed_column_starting_index);
-    if(compressed_row_index!=NULL) free(compressed_row_index);
-    if(compressed_matrix_real!=NULL) free(compressed_matrix_real);
-    if(compressed_matrix_imag!=NULL) free(compressed_matrix_imag);
+        if(compressed_column_starting_index!=NULL) free(compressed_column_starting_index);
+        if(compressed_row_index!=NULL) free(compressed_row_index);
+        if(compressed_matrix_real!=NULL) free(compressed_matrix_real);
+        if(compressed_matrix_imag!=NULL) free(compressed_matrix_imag);
+    }
 }
 
 void SPARSE_MATRIX_UMFPACK::compress_and_merge_duplicate_entries()
 {
     // compress the sparse matrix
-    if(matrix_in_compressed_column_form()) return;
-
-    size_t nz = triplet_matrix_real.size();
-    int* row_index = (int*)calloc(nz, sizeof(int));
-    int* col_index = (int*)calloc(nz, sizeof(int));
-    double* vreal = (double*)calloc(nz, sizeof(double));
-    double* vimag = (double*)calloc(nz, sizeof(double));
-    for(size_t i=0; i<nz; ++i)
-    {
-        row_index[i] = triplet_row_index[i];
-        col_index[i] = triplet_column_index[i];
-        vreal[i]=triplet_matrix_real[i];
-        vimag[i]=triplet_matrix_imag[i];
-        //cout<<row_index[i]<<", "<<col_index[i]<<": "<<vreal[i]<<"+j"<<vimag[i]<<endl;
-    }
-    compressed_column_starting_index = (int*)calloc(n_column+1, sizeof(int));
-    compressed_row_index = (int*)calloc(nz, sizeof(int));
-    // real part
-    compressed_matrix_real = (double*)calloc(nz, sizeof(double));
-    umfpack_di_triplet_to_col (n_row, n_column, nz, row_index, col_index, vreal,
-                               compressed_column_starting_index, compressed_row_index, compressed_matrix_real, (int *) NULL) ;
-    // imaginary part
-    compressed_matrix_imag = (double*)calloc(nz, sizeof(double));
-    umfpack_di_triplet_to_col (n_row, n_column, nz, row_index, col_index, vimag,
-                               compressed_column_starting_index, compressed_row_index, compressed_matrix_imag, (int *) NULL) ;
-    triplet_row_index.clear();
-    triplet_column_index.clear();
-    triplet_matrix_real.clear();
-    triplet_matrix_imag.clear();
-    flag_matrix_in_triplet_form = false;
+    if(matrix_in_triplet_form())
+    {
+        size_t nz = triplet_matrix_real.size();
+        int* row_index = (int*)calloc(nz, sizeof(int));
+        int* col_index = (int*)calloc(nz, sizeof(int));
+        double* vreal = (double*)calloc(nz, sizeof(double));
+        double* vimag = (double*)calloc(nz, sizeof(double));
+        for(size_t i=0; i<nz; ++i)
+        {
+            row_index[i] = triplet_row_index[i];
+            col_index[i] = triplet_column_index[i];
+            vreal[i]=triplet_matrix_real[i];
+            vimag[i]=triplet_matrix_imag[i];
+            //cout<<row_index[i]<<", "<<col_index[i]<<": "<<vreal[i]<<"+j"<<vimag[i]<<endl;
+        }
+        compressed_column_starting_index = (int*)calloc(n_column+1, sizeof(int));
+        compressed_row_index = (int*)calloc(nz, sizeof(int));
+        // real part
+        compressed_matrix_real = (double*)calloc(nz, sizeof(double));
+        umfpack_di_triplet_to_col (n_row, n_column, nz, row_index, col_index, vreal,
+                                   compressed_column_starting_index, compressed_row_index, compressed_matrix_real, (int *) NULL) ;
+        // imaginary part
+        compressed_matrix_imag = (double*)calloc(nz, sizeof(double));
+        umfpack_di_triplet_to_col (n_row, n_column, nz, row_index, col_index, vimag,
+                                   compressed_column_starting_index, compressed_row_index, compressed_matrix_imag, (int *) NULL) ;
+        triplet_row_index.clear();
+        triplet_column_index.clear();
+        triplet_matrix_real.clear();
+        triplet_matrix_imag.clear();
+        flag_matrix_in_triplet_form = false;
 
-    free(row_index);
-    free(col_index);
-    free(vreal);
-    free(vimag);
+        free(row_index);
+        free(col_index);
+        free(vreal);
+        free(vimag);
 
-    update_clock_when_matrix_is_changed();
+        update_clock_when_matrix_is_changed();
+    }
 }
 
 void SPARSE_MATRIX_UMFPACK::transpose()
@@ -312,10 +313,10 @@ int SPARSE_MATRIX_UMFPACK::get_matrix_size() const
 
 int SPARSE_MATRIX_UMFPACK::get_matrix_entry_count() const
 {
-    if(matrix_in_triplet_form())
-        return int(triplet_matrix_real.size());
-    else
-        return compressed_column_starting_index[n_column];
+    if(matrix_in_compressed_column_form())
+        return compressed_column_starting_index[n_column];
+    else
+        return int(triplet_matrix_real.size());
 }
 
 int SPARSE_MATRIX_UMFPACK::get_starting_index_of_column(int col) const
@@ -428,13 +429,13 @@ vector<size_t> SPARSE_MATRIX_UMFPACK::get_reorder_permutation()
 
 void SPARSE_MATRIX_UMFPACK::LU_factorization(int order, double tolerance)
 {
-    if(LU_factorization_is_performed()) return;
-
-    umfpack_di_symbolic (n_row, n_column, compressed_column_starting_index, compressed_row_index, compressed_matrix_real, &Symbolic, NULL, NULL) ;
-    umfpack_di_numeric (compressed_column_starting_index, compressed_row_index, compressed_matrix_real, Symbolic, &Numeric, NULL, NULL) ;
+    if(not LU_factorization_is_performed())
+    {
+        umfpack_di_symbolic (n_row, n_column, compressed_column_starting_index, compressed_row_index, compressed_matrix_real, &Symbolic, NULL, NULL) ;
+        umfpack_di_numeric (compressed_column_starting_index, compressed_row_index, compressed_matrix_real, Symbolic, &Numeric, NULL, NULL) ;
 
-    update_clock_when_LU_factorization_is_performed(); // mark the clock when finish the LU decomposition
-    return;
+        update_clock_when_LU_factorization_is_performed(); // mark the clock when finish the LU decomposition
+    }
 }
 
 vector<double> SPARSE_MATRIX_UMFPACK::solve_Ax_eq_b(vector<double>& b)
@@ -495,31 +496,33 @@ void SPARSE_MATRIX_UMFPACK::save_matrix_to_file(string filename) const
     ofstream file;
     file.open(filename);
 
-    if(not file.is_open())
+    if(file.is_open())
     {
-        osstream<<"File '"<<filename<<"' cannot be opened for saving sparse matrix(CSparse) contents."<<endl
-          <<"No sparse matrix(CSparse) will be exported.";
-        show_information_with_leading_time_stamp_with_default_toolkit(osstream);
-        return;
-    }
+        int i=0, j=0, k=0;
 
-    int i=0, j=0, k=0;
+        file<<"ROW,COLUMN,REAL,IMAGINARY"<<endl;
 
-	file<<"ROW,COLUMN,REAL,IMAGINARY"<<endl;
-
-	int n = get_matrix_size();
-    for(j=0;j!=n;++j)
-    {
-        for(k=compressed_column_starting_index[j];k<compressed_column_starting_index[j+1];++k)
+        int n = get_matrix_size();
+        for(j=0;j!=n;++j)
         {
-            i=compressed_row_index[k];
+            for(k=compressed_column_starting_index[j];k<compressed_column_starting_index[j+1];++k)
+            {
+                i=compressed_row_index[k];
 
-            file<<i<<","<<j<<","
-                <<setprecision(6)<<fixed<<compressed_matrix_real[k]<<","
-                <<setprecision(6)<<fixed<<compressed_matrix_imag[k]<<endl;
+                file<<i<<","<<j<<","
+                    <<setprecision(6)<<fixed<<compressed_matrix_real[k]<<","
+                    <<setprecision(6)<<fixed<<compressed_matrix_imag[k]<<endl;
+            }
         }
+        file.close();
+    }
+    else
+    {
+        osstream<<"File '"<<filename<<"' cannot be opened for saving sparse matrix(CSparse) contents."<<endl
+          <<"No sparse matrix(CSparse) will be exported.";
+        show_information_with_leading_time_stamp_with_default_toolkit(osstream);
+        return;
     }
-    file.close();
 }
 
 vector<double> operator/(vector<double>&b, SPARSE_MATRIX_UMFPACK& A)
diff --git a/code/source/basic/terminal.cpp b/code/source/basic/terminal.cpp
index 29236ea7..187688ee 100644
--- a/code/source/basic/terminal.cpp
+++ b/code/source/basic/terminal.cpp
@@ -22,8 +22,7 @@ TERMINAL::~TERMINAL()
 
 void TERMINAL::append_bus(size_t bus)
 {
-    if(bus==0) return;
-    if(not has_bus(bus))
+    if(bus!=0 and (not has_bus(bus)))
         append_and_sort_buses(bus);
 }
 
diff --git a/code/source/basic/timer.cpp b/code/source/basic/timer.cpp
index 2ddbb7d5..06710e08 100644
--- a/code/source/basic/timer.cpp
+++ b/code/source/basic/timer.cpp
@@ -50,11 +50,11 @@ void TIMER::set_timer_interval_in_s(double t)
 void TIMER::start()
 {
     DEVICE* device = get_attached_device();
-    if(device==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    time_when_timer_is_started_in_s = toolkit.get_dynamic_simulation_time_in_s();
+    if(device!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        time_when_timer_is_started_in_s = toolkit.get_dynamic_simulation_time_in_s();
+    }
 }
 
 void TIMER::reset()
@@ -72,9 +72,7 @@ bool TIMER::is_started() const
 
 bool TIMER::is_timed_out() const
 {
-    if(time_when_timer_is_started_in_s==INFINITE_THRESHOLD)
-        return false;
-    else
+    if(time_when_timer_is_started_in_s!=INFINITE_THRESHOLD)
     {
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         double TIME = toolkit.get_dynamic_simulation_time_in_s();
@@ -84,6 +82,8 @@ bool TIMER::is_timed_out() const
         else
             return false;
     }
+    else
+        return false;
 }
 
 double TIMER::get_timer_interval_in_s() const
@@ -98,10 +98,10 @@ double TIMER::get_time_when_started_in_s() const
 
 bool TIMER::is_valid() const
 {
-    if(get_timer_interval_in_s()==INFINITE_THRESHOLD)
-        return false;
-    else
+    if(get_timer_interval_in_s()!=INFINITE_THRESHOLD)
         return true;
+    else
+        return false;
 }
 
 void TIMER::check()
diff --git a/code/source/basic/utility.cpp b/code/source/basic/utility.cpp
index 9b42441f..e0abf226 100644
--- a/code/source/basic/utility.cpp
+++ b/code/source/basic/utility.cpp
@@ -16,7 +16,6 @@ using namespace std;
 
 double four_over_pi = 4.0/PI;
 double four_over_pi2 = 4.0/(PI*PI);
-
 
 string num2str(int number)
 {
@@ -51,14 +50,18 @@ double str2double(string str)
 
 int get_integer_data(string strval, string strdefault)
 {
-    if(strval.size()==0) strval=strdefault;
-    return str2int(strval);
+    if(strval.size()!=0)
+        return str2int(strval);
+    else
+        return str2int(strdefault);
 }
 
 double get_double_data(string strval, string strdefault)
 {
-    if(strval.size()==0) strval=strdefault;
-    return str2double(strval);
+    if(strval.size()!=0)
+        return str2double(strval);
+    else
+        return str2double(strdefault);
 }
 
 string get_string_data(string strval, string strdefault)
@@ -127,26 +130,40 @@ string string2upper(string str)
 
 double rad2deg(double angle)
 {
-    return angle*180.0/PI;
+    return angle*(180.0/PI);
 }
 
 double deg2rad(double angle)
 {
-    return angle*PI/180.0;
+    return angle*(PI/180.0);
 }
 
 double radps2hz(double w)
 {
-    return w/(2.0*PI);
+    return w/PI2;
+    //return w/(2.0*PI);
 }
 
 double hz2radps(double f)
 {
-    return 2.0*PI*f;
+    return PI2*f;
+    //return 2.0*PI*f;
 }
 
 double round_angle_in_rad_to_PI(double angle)
-{
+{
+    while(fabs(angle)>PI)
+    {
+        if(angle>PI)
+            angle -= PI2;
+        else
+        {
+            if(angle<-PI)
+                angle += PI2;
+        }
+    }
+    return angle;
+/*
     if(angle>PI)
     {
         angle -= (PI+PI);
@@ -160,8 +177,9 @@ double round_angle_in_rad_to_PI(double angle)
         return angle;
     else
         return round_angle_in_rad_to_PI(angle);
-
+*/
 }
+
 double steps_fast_complex_abs(complex<double> z)
 {
 	double x = z.real();
@@ -174,48 +192,55 @@ double steps_fast_complex_arg(complex<double> z)
 	double x = z.real();
 	double y = z.imag();
 
-	if (x == 0.0 and y == 0.0)
-		return 0.0;
-
-	if (x == 0.0)
-	{
-		if (y > 0)
-			return PI * 0.5;
-		else
-		{
-			if (y < 0.0)
-				return -PI * 0.5;
-			else
-				return 0.0;
-		}
-	}
-
-	if (y == 0.0)
+	if(x != 0.0 and y != 0.0)
 	{
-		if (x > 0.0)
-			return 0.0;
-		else
-		{
-			if (x < 0.0)
-				return PI;
-			else
-				return 0.0;
-		}
-	}
-
-	double angle = atan(y / x);
-	if (x < 0.0)
-	{
-		if (y > 0.0)
-			angle += PI;
-		else
-			angle -= PI;
+	    double angle = atan(y / x);
+        if (x < 0.0)
+        {
+            if (y > 0.0)
+                angle += PI;
+            else
+                angle -= PI;
+        }
+        return angle;
 	}
-	return angle;
+	else
+    {
+        if (x == 0.0 and y != 0.0)
+        {
+            if (y > 0)
+                return PI * 0.5;
+            else
+            {
+                if (y < 0.0)
+                    return -PI * 0.5;
+                else
+                    return 0.0;
+            }
+        }
+        else
+        {
+            if (y == 0.0 and x != 0.0)
+            {
+                if (x > 0.0)
+                    return 0.0;
+                else
+                {
+                    if (x < 0.0)
+                        return PI;
+                    else
+                        return 0.0;
+                }
+            }
+            else//x == 0.0 and y == 0.0
+                return 0.0;
+        }
+    }
 }
 
 double steps_fast_pow(double base, double exp)
 {
+	return pow(base, exp);
 	if (fabs(exp - 0.0) < FLOAT_EPSILON)
 		return 1.0;
 	if (fabs(exp - 1.0) < FLOAT_EPSILON)
@@ -224,26 +249,23 @@ double steps_fast_pow(double base, double exp)
 		return base*base;
 	if (fabs(exp - 3.0) < FLOAT_EPSILON)
 		return base*base*base;
-	return pow(base, exp);
 }
 
 double steps_fast_sine(double angle_in_rad)
 {
     double x = angle_in_rad;
     // round to [-PI, PI]
-    while(true)
+    while(x<-PI or x>PI)
     {
         if(x<-PI) x+=PI2;
         else
         {
             if(x>PI) x-=PI2;
         }
-        if(x>=-PI and x<=PI)
-            break;
     }
     //compute sine
     double sin = 0.0;
-    if (x< 0)
+    if (x < 0)
     {
         sin= four_over_pi* x + four_over_pi2 * x* x;
         if (sin< 0) sin= 0.225*(sin*(-sin)- sin)+ sin;
@@ -284,11 +306,11 @@ double steps_fast_arctangent(double angle_in_rad)
 
 string trim_string(string str)
 {
-    if(str.empty())
-        return str;
-
-    str.erase(0,str.find_first_not_of(" \t\n\r"));
-    str.erase(str.find_last_not_of(" \t\n\r")+1);
+    if(not str.empty())
+    {
+        str.erase(0,str.find_first_not_of(" \t\n\r"));
+        str.erase(str.find_last_not_of(" \t\n\r")+1);
+    }
     return str;
 }
 
@@ -328,59 +350,62 @@ string string2csv(string str)
     size_t n2 = n<<1;
 
     char* csv = (char*) malloc(sizeof(char)*n2);
-    if(csv==NULL)
-    {
-        cout<<"Warning. Failed to allocate memory for "<<__FUNCTION__<<"().\n";
-        return "";
-    }
-    for(size_t i=0; i!=n2; ++i)
-        csv[i]='\0';
-
-    size_t ncsv = 0;
-    for(size_t i=0; i!=n; ++i)
+    if(csv!=NULL)
     {
-        char source = str[i];
-        if(source=='"')
+        for(size_t i=0; i!=n2; ++i)
+            csv[i]='\0';
+
+        size_t ncsv = 0;
+        for(size_t i=0; i!=n; ++i)
         {
-            csv[ncsv] = source;
-            ++ncsv;
-            for(++i; i!=n; ++i)
+            char source = str[i];
+            if(source=='"')
             {
-                source=str[i];
-                if(source=='"')
+                csv[ncsv] = source;
+                ++ncsv;
+                for(++i; i!=n; ++i)
                 {
-                    csv[ncsv] = source;
+                    source=str[i];
+                    if(source=='"')
+                    {
+                        csv[ncsv] = source;
+                        ++ncsv;
+                        break;
+                    }
+                    else
+                    {
+                        csv[ncsv] = source;
+                        ++ncsv;
+                    }
+                }
+                continue;
+            }
+            else
+            {
+                if(source==',' or source==' ')
+                {
+                    csv[ncsv]=',';
                     ++ncsv;
-                    break;
+                    continue;
                 }
                 else
                 {
                     csv[ncsv] = source;
                     ++ncsv;
+                    continue;
                 }
             }
-            continue;
         }
-        else
-        {
-            if(source==',' or source==' ')
-            {
-                csv[ncsv]=',';
-                ++ncsv;
-                continue;
-            }
-            else
-            {
-                csv[ncsv] = source;
-                ++ncsv;
-                continue;
-            }
-        }
-    }
 
-    string newstr(csv);
-    free(csv);
-    return newstr;
+        string newstr(csv);
+        free(csv);
+        return newstr;
+    }
+    else
+    {
+        cout<<"Warning. Failed to allocate memory for "<<__FUNCTION__<<"().\n";
+        return "";
+    }
 }
 
 vector<string> split_string(string str, const string sep)
@@ -388,10 +413,8 @@ vector<string> split_string(string str, const string sep)
     vector<string> splitted_str;
     str = trim_string(str);
     size_t newline_index = 0;
-    while(true)
+    while(not str.empty())
     {
-        if(str.empty())
-            break;
         newline_index = str.find_first_of(sep);
         if(newline_index != string::npos)
         {
@@ -427,15 +450,15 @@ string swap_data_in_csv_string(string& data, size_t i, size_t j)
 {
     vector<string> record = split_string(data,",");
     size_t n = record.size();
-    if(i>n or j>n)
-        return data;
-    else
-    {
-        string temp = record[i];
-        record[i]=record[j];
-        record[j]=temp;
-        return string_vector2csv(record);
+    if(i<=n and j<=n)
+    {
+        string temp = record[i];
+        record[i]=record[j];
+        record[j]=temp;
+        return string_vector2csv(record);
     }
+    else
+        return data;
 }
 
 complex<double> xy2dq_with_angle_in_deg(complex<double> V, double angle)
@@ -470,14 +493,14 @@ bool is_file_exist(const string file)
     // check if the file exist
     // date: Sep. 1, 2016
     FILE* fid = fopen(file.c_str(),"r");
-    if(fid==NULL)
+    if(fid!=NULL)
     {
-        return false;
+        fclose(fid);
+        return true;
     }
     else
     {
-        fclose(fid);
-        return true;
+        return false;
     }
 }
 
diff --git a/code/source/basic/utility_test.cpp b/code/source/basic/utility_test.cpp
index 5c205685..779a6352 100644
--- a/code/source/basic/utility_test.cpp
+++ b/code/source/basic/utility_test.cpp
@@ -228,7 +228,7 @@ void UTILITY_TEST::test_radps2hz()
     show_test_information_for_function_of_class(__FUNCTION__,"UTILITY_TEST");
 
     double w = 1.0;
-    double f = w/(2.0*PI);
+    double f = w/PI2;
     TEST_ASSERT(fabs(radps2hz(w)-f)<FLOAT_EPSILON);
 }
 
@@ -237,7 +237,7 @@ void UTILITY_TEST::test_hz2radps()
     show_test_information_for_function_of_class(__FUNCTION__,"UTILITY_TEST");
 
     double f = 1.0;
-    double w = f*(2.0*PI);
+    double w = f*PI2;
     TEST_ASSERT(fabs(hz2radps(f)-w)<FLOAT_EPSILON);
 }
 
diff --git a/code/source/block/differential_block.cpp b/code/source/block/differential_block.cpp
index a4820be7..399b512d 100644
--- a/code/source/block/differential_block.cpp
+++ b/code/source/block/differential_block.cpp
@@ -93,13 +93,14 @@ void DIFFERENTIAL_BLOCK::integrate()
     y = k/t*x-s;
 
     double ds = (k/t*x-s)/t;
-    if(fabs(ds)<FLOAT_EPSILON)
-        return;
+    if(fabs(ds)>FLOAT_EPSILON)
+    {
+        set_state(s);
+        set_output(y);
+    }
     //if(fabs(ds)>DSTATE_THRESHOLD)
     //    cout<<"Derivative of state is changed dramatically in DIFFERENTIAL_BLOCK\n";
 
-    set_state(s);
-    set_output(y);
 }
 
 void DIFFERENTIAL_BLOCK::update()
diff --git a/code/source/block/first_order_block.cpp b/code/source/block/first_order_block.cpp
index 1e973685..2b2bf2f4 100644
--- a/code/source/block/first_order_block.cpp
+++ b/code/source/block/first_order_block.cpp
@@ -48,20 +48,7 @@ void FIRST_ORDER_BLOCK::initialize()
 {
     double k = get_K();
     double t = get_T_in_s();
-    if(t==0.0)
-    {
-        set_state(0.0);
-        set_store(0.0);
-        set_dstate(0.0);
-        if(k!=0.0)
-            set_input(get_output()/get_K());
-        else
-        {
-            set_output(0.0);
-            set_input(0.0);
-        }
-    }
-    else
+    if(t!=0.0)
     {
         ostringstream osstream;
 
@@ -73,7 +60,9 @@ void FIRST_ORDER_BLOCK::initialize()
         double vmin = get_lower_limit();
 
         double y = get_output();
-        if(k==0.0)
+        if(k!=0.0)
+            ;
+        else
         {
             y=0.0;
             set_output(0.0);
@@ -93,10 +82,10 @@ void FIRST_ORDER_BLOCK::initialize()
             z = 0.0;
         }
         ds = 0.0;
-        if(k==0)
-            x = 0.0;
-        else
+        if(k!=0)
             x = y/k;
+        else
+            x = 0.0;
 
         set_state(s);
         set_store(z);
@@ -120,6 +109,19 @@ void FIRST_ORDER_BLOCK::initialize()
             }
         }
     }
+    else
+    {
+        set_state(0.0);
+        set_store(0.0);
+        set_dstate(0.0);
+        if(k!=0.0)
+            set_input(get_output()/get_K());
+        else
+        {
+            set_output(0.0);
+            set_input(0.0);
+        }
+    }
 }
 
 void FIRST_ORDER_BLOCK::run(DYNAMIC_MODE mode)
@@ -133,136 +135,136 @@ void FIRST_ORDER_BLOCK::run(DYNAMIC_MODE mode)
 void FIRST_ORDER_BLOCK::integrate()
 {
     double k = get_K();
-    if(k==0.0)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    double h = toolkit.get_dynamic_simulation_time_step_in_s();
-
-    double t = get_T_in_s();
-
-    LIMITER_TYPE limiter_type = get_limiter_type();
-    double vmax = get_upper_limit();
-    double vmin = get_lower_limit();
+    if(k!=0.0)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        double h = toolkit.get_dynamic_simulation_time_step_in_s();
 
-    double x = get_input();
+        double t = get_T_in_s();
 
-    double s, z, y;
+        LIMITER_TYPE limiter_type = get_limiter_type();
+        double vmax = get_upper_limit();
+        double vmin = get_lower_limit();
 
-    if(t!=0.0)
-    {
-        z = get_store();
-        //s = (z+k*x)/(1.0+2.0*t/h);
-        s = h*(z+k*x)/(h+2.0*t);
-        y = s;
+        double x = get_input();
 
-        double ds = (k*x-s)/t;
-        if(fabs(ds)<FLOAT_EPSILON)
-            return;
-        //if(fabs(ds)>DSTATE_THRESHOLD)
-        //    cout<<"Derivative of state is changed dramatically in FIRST_ORDER_BLOCK\n";
+        double s, z, y;
 
-        if(limiter_type != NO_LIMITER)
+        if(t!=0.0)
         {
-            if(limiter_type == WINDUP_LIMITER)
+            z = get_store();
+            //s = (z+k*x)/(1.0+2.0*t/h);
+            s = h*(z+k*x)/(h+2.0*t);
+            y = s;
+
+            double ds = (k*x-s)/t;
+            if(fabs(ds)<FLOAT_EPSILON)
+                return;
+            //if(fabs(ds)>DSTATE_THRESHOLD)
+            //    cout<<"Derivative of state is changed dramatically in FIRST_ORDER_BLOCK\n";
+
+            if(limiter_type != NO_LIMITER)
             {
-                if(y>vmax)
-                    y = vmax;
-                else
-                {
-                    if(y<vmin)
-                        y = vmin;
-                }
-            }
-            else
-            {
-                if(s>vmax)
+                if(limiter_type == WINDUP_LIMITER)
                 {
-                    s = vmax;
-                    y = vmax;
+                    if(y>vmax)
+                        y = vmax;
+                    else
+                    {
+                        if(y<vmin)
+                            y = vmin;
+                    }
                 }
                 else
                 {
-                    if(s<vmin)
+                    if(s>vmax)
+                    {
+                        s = vmax;
+                        y = vmax;
+                    }
+                    else
                     {
-                        s = vmin;
-                        y = vmin;
+                        if(s<vmin)
+                        {
+                            s = vmin;
+                            y = vmin;
+                        }
                     }
                 }
             }
+            set_state(s);
         }
-        set_state(s);
-    }
-    else
-    {
-        y = k*x;
+        else
+        {
+            y = k*x;
+        }
+        set_output(y);
     }
-    set_output(y);
 }
 
 void FIRST_ORDER_BLOCK::update()
 {
     double k = get_K();
-    if(k==0.0)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    double h = toolkit.get_dynamic_simulation_time_step_in_s();
+    if(k!=0.0)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        double h = toolkit.get_dynamic_simulation_time_step_in_s();
 
-    double t = get_T_in_s();
+        double t = get_T_in_s();
 
-    LIMITER_TYPE limiter_type = get_limiter_type();
-    double vmax = get_upper_limit();
-    double vmin = get_lower_limit();
+        LIMITER_TYPE limiter_type = get_limiter_type();
+        double vmax = get_upper_limit();
+        double vmin = get_lower_limit();
 
-    double x = get_input();
+        double x = get_input();
 
-    double s, ds, z, y;
+        double s, ds, z, y;
 
-    if(t!=0.0)
-    {
-        ds = x/t;
-        s = get_state();
-        y = s;
-        if(limiter_type != NO_LIMITER)
+        if(t!=0.0)
         {
-            if(limiter_type == WINDUP_LIMITER)
-            {
-                if(y>vmax)
-                    y = vmax;
-                else
-                {
-                    if(y<vmin)
-                        y = vmin;
-                }
-            }
-            else
+            ds = x/t;
+            s = get_state();
+            y = s;
+            if(limiter_type != NO_LIMITER)
             {
-                if(s>=vmax and ds>0.0)
+                if(limiter_type == WINDUP_LIMITER)
                 {
-                    ds = 0.0;
-                    y = vmax;
+                    if(y>vmax)
+                        y = vmax;
+                    else
+                    {
+                        if(y<vmin)
+                            y = vmin;
+                    }
                 }
                 else
                 {
-                    if(s<=vmin and ds<0.0)
+                    if(s>=vmax and ds>0.0)
                     {
                         ds = 0.0;
-                        y = vmin;
+                        y = vmax;
+                    }
+                    else
+                    {
+                        if(s<=vmin and ds<0.0)
+                        {
+                            ds = 0.0;
+                            y = vmin;
+                        }
                     }
                 }
             }
+            //z = k*x-(1.0-2.0*t/h)*s;
+            z = k*x-(h-2.0*t)*s/h;
+            set_dstate(ds);
+            set_store(z);
         }
-        //z = k*x-(1.0-2.0*t/h)*s;
-        z = k*x-(h-2.0*t)*s/h;
-        set_dstate(ds);
-        set_store(z);
-    }
-    else
-    {
-        y = k*x;
+        else
+        {
+            y = k*x;
+        }
+        set_output(y);
     }
-    set_output(y);
 }
 
 void FIRST_ORDER_BLOCK::check()
diff --git a/code/source/block/integral_block.cpp b/code/source/block/integral_block.cpp
index 31608f5b..aa8e4382 100644
--- a/code/source/block/integral_block.cpp
+++ b/code/source/block/integral_block.cpp
@@ -32,60 +32,61 @@ void INTEGRAL_BLOCK::initialize()
     ostringstream osstream;
 
     double t = get_T_in_s();
-    double y = get_output();
+    double y = get_output();
 
-    if(fabs(t)<FLOAT_EPSILON or fabs(t-INFINITE_THRESHOLD)<FLOAT_EPSILON)
+    if(fabs(t)>FLOAT_EPSILON and fabs(t-INFINITE_THRESHOLD)>FLOAT_EPSILON)
     {
-        set_state(y);
-        set_store(0.0);
-        set_dstate(0.0);
-        set_input(0.0);
-        return;
-    }
+        LIMITER_TYPE limiter = get_limiter_type();
+        double vmax = get_upper_limit();
+        double vmin = get_lower_limit();
 
-    LIMITER_TYPE limiter = get_limiter_type();
-    double vmax = get_upper_limit();
-    double vmin = get_lower_limit();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        double h = toolkit.get_dynamic_simulation_time_step_in_s();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    double h = toolkit.get_dynamic_simulation_time_step_in_s();
+        double s = y;
+        double ds = 0.0;
+        double x = 0.0;
+        double z = s+0.5*h/t*x;
 
-    double s = y;
-    double ds = 0.0;
-    double x = 0.0;
-    double z = s+0.5*h/t*x;
+        set_state(s);
+        set_store(z);
+        set_dstate(ds);
+        set_input(x);
 
-    set_state(s);
-    set_store(z);
-    set_dstate(ds);
-    set_input(x);
-
-    if(limiter != NO_LIMITER)
-    {
-        if(s>vmax)
+        if(limiter != NO_LIMITER)
         {
-            osstream<<"Initialization Error. State ("<<s<<") exceeds upper limit bound ("<<vmax<<").";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-        }
-        if(s<vmin)
-        {
-            osstream<<"Initialization Error. State ("<<s<<") exceeds lower limit bound ("<<vmin<<").";
-            toolkit.show_information_with_leading_time_stamp(osstream);
+            if(s>vmax)
+            {
+                osstream<<"Initialization Error. State ("<<s<<") exceeds upper limit bound ("<<vmax<<").";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+            if(s<vmin)
+            {
+                osstream<<"Initialization Error. State ("<<s<<") exceeds lower limit bound ("<<vmin<<").";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
         }
     }
+    else
+    {
+        set_state(y);
+        set_store(0.0);
+        set_dstate(0.0);
+        set_input(0.0);
+    }
 }
 
 void INTEGRAL_BLOCK::run(DYNAMIC_MODE mode)
 {
     ostringstream osstream;
     double t = get_T_in_s();
-    if(fabs(t)<FLOAT_EPSILON or fabs(t-INFINITE_THRESHOLD)<FLOAT_EPSILON)
-        return;
-
-    if(mode==INTEGRATE_MODE)
-        integrate();
-    if(mode==UPDATE_MODE)
-        update();
+    if(fabs(t)>FLOAT_EPSILON and fabs(t-INFINITE_THRESHOLD)>FLOAT_EPSILON)
+    {
+        if(mode==INTEGRATE_MODE)
+            integrate();
+        if(mode==UPDATE_MODE)
+            update();
+    }
 }
 
 void INTEGRAL_BLOCK::integrate()
@@ -94,57 +95,57 @@ void INTEGRAL_BLOCK::integrate()
     double h = toolkit.get_dynamic_simulation_time_step_in_s();
 
     double t = get_T_in_s();
-    if(fabs(t)<FLOAT_EPSILON or fabs(t-INFINITE_THRESHOLD)<FLOAT_EPSILON)
-        return;
-
-    LIMITER_TYPE limiter = get_limiter_type();
-    double vmax = get_upper_limit();
-    double vmin = get_lower_limit();
-
-    double x = get_input();
-
-    double ds = x/t;
-    if(fabs(ds)<FLOAT_EPSILON)
-        return;
-    //if(fabs(ds)>DSTATE_THRESHOLD)
-    //    cout<<"Derivative of state is changed dramatically in INTEGRAL_BLOCK\n";
+    if(fabs(t)>FLOAT_EPSILON and fabs(t-INFINITE_THRESHOLD)>FLOAT_EPSILON)
+    {
+        LIMITER_TYPE limiter = get_limiter_type();
+        double vmax = get_upper_limit();
+        double vmin = get_lower_limit();
 
-    double s, z, y;
+        double x = get_input();
 
-    z = get_store();
-    s = z + 0.5*h/t*x;
-    y = s;
-    if(limiter == WINDUP_LIMITER)
-    {
-        if(y>vmax)
-            y = vmax;
-        else
+        double ds = x/t;
+        if(fabs(ds)>FLOAT_EPSILON)
         {
-            if(y<vmin)
-                y = vmin;
-        }
-    }
-    else
-    {
-        if(limiter == NON_WINDUP_LIMITER)
-        {
-            if(s>vmax)
+            double s, z, y;
+
+            z = get_store();
+            s = z + 0.5*h/t*x;
+            y = s;
+            if(limiter == WINDUP_LIMITER)
             {
-                s = vmax;
-                y = vmax;
+                if(y>vmax)
+                    y = vmax;
+                else
+                {
+                    if(y<vmin)
+                        y = vmin;
+                }
             }
             else
             {
-                if(y<vmin)
+                if(limiter == NON_WINDUP_LIMITER)
                 {
-                    s = vmin;
-                    y = vmin;
+                    if(s>vmax)
+                    {
+                        s = vmax;
+                        y = vmax;
+                    }
+                    else
+                    {
+                        if(y<vmin)
+                        {
+                            s = vmin;
+                            y = vmin;
+                        }
+                    }
                 }
             }
+            set_state(s);
+            set_output(y);
         }
+        //if(fabs(ds)>DSTATE_THRESHOLD)
+        //    cout<<"Derivative of state is changed dramatically in INTEGRAL_BLOCK\n";
     }
-    set_state(s);
-    set_output(y);
 }
 
 void INTEGRAL_BLOCK::update()
@@ -153,54 +154,54 @@ void INTEGRAL_BLOCK::update()
     double h = toolkit.get_dynamic_simulation_time_step_in_s();
 
     double t = get_T_in_s();
-    if(fabs(t)<FLOAT_EPSILON or fabs(t-INFINITE_THRESHOLD)<FLOAT_EPSILON)
-        return;
-
-    LIMITER_TYPE limiter = get_limiter_type();
-    double vmax = get_upper_limit();
-    double vmin = get_lower_limit();
+    if(fabs(t)>FLOAT_EPSILON and fabs(t-INFINITE_THRESHOLD)>FLOAT_EPSILON)
+    {
+        LIMITER_TYPE limiter = get_limiter_type();
+        double vmax = get_upper_limit();
+        double vmin = get_lower_limit();
 
-    double x = get_input();
+        double x = get_input();
 
-    double s, z, ds, y;
+        double s, z, ds, y;
 
-    ds = x/t;
-    s = get_state();
-    y = s;
+        ds = x/t;
+        s = get_state();
+        y = s;
 
-    if(limiter == WINDUP_LIMITER)
-    {
-        if(y>vmax)
-            y = vmax;
-        else
-        {
-            if(y<vmin)
-                y = vmin;
-        }
-    }
-    else
-    {
-        if(limiter == NON_WINDUP_LIMITER)
+        if(limiter == WINDUP_LIMITER)
         {
-            if(s>=vmax and ds>0.0)
-            {
+            if(y>vmax)
                 y = vmax;
-                ds = 0.0;
-            }
             else
             {
-                if(s<=vmin and ds<0.0)
-                {
+                if(y<vmin)
                     y = vmin;
+            }
+        }
+        else
+        {
+            if(limiter == NON_WINDUP_LIMITER)
+            {
+                if(s>=vmax and ds>0.0)
+                {
+                    y = vmax;
                     ds = 0.0;
                 }
+                else
+                {
+                    if(s<=vmin and ds<0.0)
+                    {
+                        y = vmin;
+                        ds = 0.0;
+                    }
+                }
             }
         }
+        z = s+0.5*h/t*x;
+        set_store(z);
+        set_dstate(ds);
+        set_output(y);
     }
-    z = s+0.5*h/t*x;
-    set_store(z);
-    set_dstate(ds);
-    set_output(y);
 }
 
 void INTEGRAL_BLOCK::check()
diff --git a/code/source/block/lead_lag_block.cpp b/code/source/block/lead_lag_block.cpp
index bced575b..7a6c1d83 100644
--- a/code/source/block/lead_lag_block.cpp
+++ b/code/source/block/lead_lag_block.cpp
@@ -59,8 +59,28 @@ double LEAD_LAG_BLOCK::get_T2_in_s() const
 void LEAD_LAG_BLOCK::initialize()
 {
     double t1 = get_T1_in_s();
+    if(t1!=0.0)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        double h = toolkit.get_dynamic_simulation_time_step_in_s();
+
+        double k = get_K();
+
+        double y = get_output();
+
+        double s, ds, z, x;
 
-    if(t1==0.0)
+        s = y;
+        x = y/k;
+        z = (1.0-h/(2.0*t1))*s+h/(2.0*t1)*y;
+        ds = 0.0;
+
+        set_state(s);
+        set_store(z);
+        set_dstate(ds);
+        set_input(x);
+    }
+    else
     {
         first_order_block.set_toolkit(get_toolkit(__PRETTY_FUNCTION__));
         first_order_block.set_limiter_type(this->get_limiter_type());
@@ -76,33 +96,20 @@ void LEAD_LAG_BLOCK::initialize()
         this->set_dstate(first_order_block.get_dstate());
         this->set_store(first_order_block.get_store());
         this->set_input(first_order_block.get_input());
-        return;
     }
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    double h = toolkit.get_dynamic_simulation_time_step_in_s();
-
-    double k = get_K();
-
-    double y = get_output();
-
-    double s, ds, z, x;
-
-    s = y;
-    x = y/k;
-    z = (1.0-h/(2.0*t1))*s+h/(2.0*t1)*y;
-    ds = 0.0;
-
-    set_state(s);
-    set_store(z);
-    set_dstate(ds);
-    set_input(x);
 }
 
 void LEAD_LAG_BLOCK::run(DYNAMIC_MODE mode)
 {
     double t1 = get_T1_in_s();
-    if(t1==0.0)
+    if(t1!=0.0)
+    {
+        if(mode==INTEGRATE_MODE)
+            integrate();
+        if(mode==UPDATE_MODE)
+            update();
+    }
+    else
     {
         first_order_block.set_input(this->get_input());
         first_order_block.run(mode);
@@ -112,13 +119,6 @@ void LEAD_LAG_BLOCK::run(DYNAMIC_MODE mode)
         this->set_store(first_order_block.get_store());
         this->set_output(first_order_block.get_output());
     }
-    else
-    {
-        if(mode==INTEGRATE_MODE)
-            integrate();
-        if(mode==UPDATE_MODE)
-            update();
-    }
 }
 
 void LEAD_LAG_BLOCK::integrate()
@@ -145,13 +145,14 @@ void LEAD_LAG_BLOCK::integrate()
     y = t1/t2*(k*x+(t2/t1-1.0)*s);
 
     double ds = (k*x-s)/t2;
-    if(fabs(ds)<FLOAT_EPSILON)
-        return;
+    if(fabs(ds)>FLOAT_EPSILON)
+    {
+        set_state(s);
+        set_output(y);
+    }
     //if(fabs(ds)>DSTATE_THRESHOLD)
     //    cout<<"Derivative of state is changed dramatically in LEAD_LAG_BLOCK\n";
 
-    set_state(s);
-    set_output(y);
 }
 
 void LEAD_LAG_BLOCK::update()
diff --git a/code/source/block/proportional_block.cpp b/code/source/block/proportional_block.cpp
index 20d6ed91..129c316f 100644
--- a/code/source/block/proportional_block.cpp
+++ b/code/source/block/proportional_block.cpp
@@ -34,76 +34,77 @@ double PROPORTIONAL_BLOCK::get_K() const
 void PROPORTIONAL_BLOCK::initialize()
 {
     double k = get_K();
-    if(fabs(k)<FLOAT_EPSILON)
-    {
-        set_input(0.0);
-        return;
-    }
-
-    double y = get_output();
-    double x;
-    if(k==0.0)
+    if(fabs(k)>FLOAT_EPSILON)
     {
-        y = 0.0;
-        set_output(y);
-        x = 0.0;
-    }
-    else
-        x = y/k;
-
-    set_input(x);
-
-    if(get_limiter_type()!=NO_LIMITER)
-    {
-        double vmax = get_upper_limit();
-        double vmin = get_lower_limit();
-        if(y>=vmin and y<=vmax)
-            return;
-
-        ostringstream osstream;
-
-        if(y>vmax)
+        double y = get_output();
+        double x;
+        if(k==0.0)
         {
-            osstream<<"Initialization Error. Proportional output ("<<y<<") exceeds upper limit bound ("<<vmax<<").";
-            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            return;
+            y = 0.0;
+            set_output(y);
+            x = 0.0;
         }
-        if(y<vmin)
+        else
+            x = y/k;
+
+        set_input(x);
+
+        if(get_limiter_type()!=NO_LIMITER)
         {
-            osstream<<"Initialization Error. Proportional output ("<<y<<") exceeds lower limit bound ("<<vmin<<").";
-            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            return;
+            double vmax = get_upper_limit();
+            double vmin = get_lower_limit();
+            if(y>=vmin and y<=vmax)
+                return;
+
+            ostringstream osstream;
+
+            if(y>vmax)
+            {
+                osstream<<"Initialization Error. Proportional output ("<<y<<") exceeds upper limit bound ("<<vmax<<").";
+                STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                return;
+            }
+            if(y<vmin)
+            {
+                osstream<<"Initialization Error. Proportional output ("<<y<<") exceeds lower limit bound ("<<vmin<<").";
+                STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                return;
+            }
         }
     }
+    else
+    {
+        set_input(0.0);
+    }
 }
 
 void PROPORTIONAL_BLOCK::run(DYNAMIC_MODE mode)
 {
     double k = get_K();
-    if(fabs(k)<FLOAT_EPSILON)
-        return;
-
-    LIMITER_TYPE limiter = get_limiter_type();
-    double vmax = get_upper_limit();
-    double vmin = get_lower_limit();
+    if(fabs(k)>FLOAT_EPSILON)
+    {
+        LIMITER_TYPE limiter = get_limiter_type();
+        double vmax = get_upper_limit();
+        double vmin = get_lower_limit();
 
-    double x = get_input();
+        double x = get_input();
 
-    double y = k*x;
+        double y = k*x;
 
-    if(limiter!=NO_LIMITER)
-    {
-        if(y>vmax)
-            y = vmax;
-        else
+        if(limiter!=NO_LIMITER)
         {
-            if(y<vmin)
-                y = vmin;
+            if(y>vmax)
+                y = vmax;
+            else
+            {
+                if(y<vmin)
+                    y = vmin;
+            }
         }
+        set_output(y);
     }
-    set_output(y);
 }
 
 void PROPORTIONAL_BLOCK::integrate()
diff --git a/code/source/block/saturation_block.cpp b/code/source/block/saturation_block.cpp
index 037e213c..b0ac7749 100644
--- a/code/source/block/saturation_block.cpp
+++ b/code/source/block/saturation_block.cpp
@@ -32,6 +32,7 @@ void SATURATION_BLOCK::set_V2(double V)
 {
     this->V2 = V;
 }
+
 void SATURATION_BLOCK::set_S1(double S)
 {
     this->S1 = S;
@@ -42,7 +43,6 @@ void SATURATION_BLOCK::set_S2(double S)
     this->S2 = S;
 }
 
-
 SATURATION_TYPE SATURATION_BLOCK::get_saturation_type() const
 {
     return type;
@@ -70,95 +70,97 @@ double SATURATION_BLOCK::get_S2() const
 
 bool SATURATION_BLOCK::is_saturation_considered() const
 {
-    if(get_S1()==0.0 and get_S2()==0.0)
-        return false;
-    else
+    if(get_S1()!=0.0 or get_S2()!=0.0)
         return true;
+    else
+        return false;
 }
 
 double SATURATION_BLOCK::get_saturation(double V) const
 {
-    if(not is_saturation_considered())
-        return 0.0;
-
-    double S = 0.0;
-
-    double V1 = get_V1();
-    double V2 = get_V2();
-    double S1 = get_S1();
-    double S2 = get_S2();
-    switch(get_saturation_type())
+    if(is_saturation_considered())
     {
-        case QUADRATIC_SATURATION_TYPE:
-        {
-            // S = B*(V-A)^2/V
-            // S1 = B*(V1-A)^2/V1
-            // S2 = B*(V2-A)^2/V2
-            // division:
-            // S1/S2 = ((V1-A)/(V2-A))^2*(V2/V1)
-            // ((V1-A)/(V2-A))^2 = (S1/S2)/(V2/V1) = (S1*V1)/(S2*V2) = C2
-            double C2 = (S1*V1)/(S2*V2);
-            double C = sqrt(C2);
-            // V1-A = C*(V2-A)  or V1-A = -C*(V2-A)
-            // A = (C*V2-V1)/(C-1) or A = (V1+C*V2)/(1+C)
-            // to make sure S function is increasing with V, A must be less than min(V1, V2)
-            // if V1<V2 (and S1<S2, C<1)
-            // if we choose A = (V1+C*V2)/(1+C), we should have
-            // (V1+C*V2)/(1+C)<V1, or V2<V1, which is wrong;
-            // if we choose A = (C*V2-V1)/(C-1), we should have
-            // (C*V2-V1)/(C-1)<V1, or V2>V1, which is correct.
-
-            // if V1>V2 (and S1>S2, C>1)
-            // if we choose A = (V1+C*V2)/(1+C), we should have
-            // (V1+C*V2)/(1+C)<V2, or V1<V2, which is wrong;
-            // if we choose A = (C*V2-V1)/(C-1), we should have
-            // (C*V2-V1)/(C-1)<V2, or V1>V2, which is correct.
-            double A;
-            /*if(C>=1.0)
-                A = (V1+C*V2)/(1.0+C);
-            else
-                A = (C*V2-V1)/(C-1.0);*/
-            A = (C*V2-V1)/(C-1.0);
-            // B=S1*V1/(V1-A)^2
-            double B = S1*V1/((V1-A)*(V1-A));
-
-
-            if(V>A)
-                S = B*(V-A)*(V-A)/V;
-            else
-                S = 0.0;
-
-            break;
-        }
-        case EXPONENTIAL_SATURATION_TYPE_INPUT_AS_BASE:
-        {
-            //S=A*V^B
-            //S1=A*V1^B
-            //S2=A*V2^B
-            // division
-            // S1/S2 = (V1/V2)^B
-            double B = log(S1/S2)/log(V1/V2);
-            double A = S1/pow(V1,B);
-
-            S=A*pow(V,B);
-            break;
-        }
-        case EXPONENTIAL_SATURATION_TYPE_INPUT_AS_EXPONETIAL:
+        double S = 0.0;
+
+        double V1 = get_V1();
+        double V2 = get_V2();
+        double S1 = get_S1();
+        double S2 = get_S2();
+        switch(get_saturation_type())
         {
-            //S=A*B^V
-            //S1=A*B^V1
-            //S2=A*B^V2
-            // division
-            // S1/S2 = B^(V1-V2)
-            double B = pow(S1/S2, 1.0/(V1-V2));
-            double A = S1/pow(B,V1);
-
-            S=A*pow(B,V);
-            break;
+            case QUADRATIC_SATURATION_TYPE:
+            {
+                // S = B*(V-A)^2/V
+                // S1 = B*(V1-A)^2/V1
+                // S2 = B*(V2-A)^2/V2
+                // division:
+                // S1/S2 = ((V1-A)/(V2-A))^2*(V2/V1)
+                // ((V1-A)/(V2-A))^2 = (S1/S2)/(V2/V1) = (S1*V1)/(S2*V2) = C2
+                double C2 = (S1*V1)/(S2*V2);
+                double C = sqrt(C2);
+                // V1-A = C*(V2-A)  or V1-A = -C*(V2-A)
+                // A = (C*V2-V1)/(C-1) or A = (V1+C*V2)/(1+C)
+                // to make sure S function is increasing with V, A must be less than min(V1, V2)
+                // if V1<V2 (and S1<S2, C<1)
+                // if we choose A = (V1+C*V2)/(1+C), we should have
+                // (V1+C*V2)/(1+C)<V1, or V2<V1, which is wrong;
+                // if we choose A = (C*V2-V1)/(C-1), we should have
+                // (C*V2-V1)/(C-1)<V1, or V2>V1, which is correct.
+
+                // if V1>V2 (and S1>S2, C>1)
+                // if we choose A = (V1+C*V2)/(1+C), we should have
+                // (V1+C*V2)/(1+C)<V2, or V1<V2, which is wrong;
+                // if we choose A = (C*V2-V1)/(C-1), we should have
+                // (C*V2-V1)/(C-1)<V2, or V1>V2, which is correct.
+                double A;
+                /*if(C>=1.0)
+                    A = (V1+C*V2)/(1.0+C);
+                else
+                    A = (C*V2-V1)/(C-1.0);*/
+                A = (C*V2-V1)/(C-1.0);
+                // B=S1*V1/(V1-A)^2
+                double B = S1*V1/((V1-A)*(V1-A));
+
+
+                if(V>A)
+                    S = B*(V-A)*(V-A)/V;
+                else
+                    S = 0.0;
+
+                break;
+            }
+            case EXPONENTIAL_SATURATION_TYPE_INPUT_AS_BASE:
+            {
+                //S=A*V^B
+                //S1=A*V1^B
+                //S2=A*V2^B
+                // division
+                // S1/S2 = (V1/V2)^B
+                double B = log(S1/S2)/log(V1/V2);
+                double A = S1/pow(V1,B);
+
+                S=A*pow(V,B);
+                break;
+            }
+            case EXPONENTIAL_SATURATION_TYPE_INPUT_AS_EXPONETIAL:
+            {
+                //S=A*B^V
+                //S1=A*B^V1
+                //S2=A*B^V2
+                // division
+                // S1/S2 = B^(V1-V2)
+                double B = pow(S1/S2, 1.0/(V1-V2));
+                double A = S1/pow(B,V1);
+
+                S=A*pow(B,V);
+                break;
+            }
         }
-    }
 
-    return S;
+        return S;
+    }
+    else
+        return 0.0;
 }
 
 
@@ -168,10 +170,10 @@ void SATURATION_BLOCK::check()
     if( (V1<V2 and S1>S2) or (V1>V2 and S1<S2) )
     {
         osstream<<"Warning. Saturation with greater input should not be less. Saturation block is not properly set."<<endl
-          <<"V1="<<setprecision(3)<<fixed<<V1<<", "
-          <<"S1="<<setprecision(6)<<fixed<<S1<<", "
-          <<"V2="<<setprecision(3)<<fixed<<V2<<", "
-          <<"S2="<<setprecision(6)<<fixed<<S2;
+                <<"V1="<<setprecision(3)<<fixed<<V1<<", "
+                <<"S1="<<setprecision(6)<<fixed<<S1<<", "
+                <<"V2="<<setprecision(3)<<fixed<<V2<<", "
+                <<"S2="<<setprecision(6)<<fixed<<S2;
         show_information_with_leading_time_stamp_with_default_toolkit(osstream);
     }
 }
diff --git a/code/source/device/bus.cpp b/code/source/device/bus.cpp
index f0511358..949ab9e5 100644
--- a/code/source/device/bus.cpp
+++ b/code/source/device/bus.cpp
@@ -198,8 +198,8 @@ void BUS::set_voltage_to_regulate_in_pu(double voltage)
         {
             ostringstream osstream;
             osstream<<"Warning. New voltage to regulate ("<<voltage<<" pu) is not allowed to set for bus "<<get_bus_number()
-              <<" with existing voltage to regulate: "<<get_voltage_to_regulate_in_pu()<<" pu."<<endl
-              <<"Voltage to regulate will not be changed.";
+                    <<" with existing voltage to regulate: "<<get_voltage_to_regulate_in_pu()<<" pu."<<endl
+                    <<"Voltage to regulate will not be changed.";
             STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
             toolkit.show_information_with_leading_time_stamp(osstream);
         }
diff --git a/code/source/device/bus_test.cpp b/code/source/device/bus_test.cpp
index 1c885469..6b9fe23e 100644
--- a/code/source/device/bus_test.cpp
+++ b/code/source/device/bus_test.cpp
@@ -208,8 +208,8 @@ void BUS_TEST::test_set_get_angle()
     TEST_ASSERT(bus.get_angle_in_rad()==0.5);
     TEST_ASSERT(fabs(bus.get_angle_in_deg()-0.5/PI*180.0)<FLOAT_EPSILON);
     bus.set_angle_in_deg(90.0);
-    TEST_ASSERT(bus.get_angle_in_rad()==0.5*PI);
-    TEST_ASSERT(bus.get_angle_in_deg()==90.0);
+    TEST_ASSERT(fabs(bus.get_angle_in_rad()-0.5*PI)<FLOAT_EPSILON);
+    TEST_ASSERT(fabs(bus.get_angle_in_deg()-90.0)<FLOAT_EPSILON);
 }
 
 
diff --git a/code/source/device/energy_storage.cpp b/code/source/device/energy_storage.cpp
index e8bc0f67..f01163d6 100644
--- a/code/source/device/energy_storage.cpp
+++ b/code/source/device/energy_storage.cpp
@@ -67,63 +67,62 @@ DEVICE_ID ENERGY_STORAGE::get_device_id() const
 
 void ENERGY_STORAGE::set_model(const MODEL* model)
 {
-    if(model==NULL)
-        return;
-
-    if(model->get_allowed_device_type()!="ENERGY STORAGE")
-        return;
-
-    if(model->get_model_type()=="ENERGY STORAGE")
+    if(model!=NULL and model->get_allowed_device_type()=="ENERGY STORAGE")
     {
-        set_energy_storage_model((ENERGY_STORAGE_MODEL*) model);
-        return;
+        if(model->get_model_type()=="ENERGY STORAGE")
+        {
+            set_energy_storage_model((ENERGY_STORAGE_MODEL*) model);
+            return;
+        }
+        ostringstream osstream;
+        osstream<<"Warning. Unsupported model type '"<<model->get_model_type()<<"' when setting up energy storage-related model.";
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        toolkit.show_information_with_leading_time_stamp(osstream);
     }
-    ostringstream osstream;
-    osstream<<"Warning. Unsupported model type '"<<model->get_model_type()<<"' when setting up energy storage-related model.";
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    toolkit.show_information_with_leading_time_stamp(osstream);
 }
 
 void ENERGY_STORAGE::set_energy_storage_model(const ENERGY_STORAGE_MODEL* model)
 {
-    if(model==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(model->get_model_type()!="ENERGY STORAGE")
+    if(model!=NULL)
     {
-        ostringstream osstream;
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up energy storage model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    ENERGY_STORAGE_MODEL* oldmodel = get_energy_storage_model();
-    if(oldmodel!=NULL)
-    {
-        delete oldmodel;
-        energy_storage_model = NULL;
-    }
-
-    ENERGY_STORAGE_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="ESTR0")
-    {
-        ESTR0* smodel = (ESTR0*) (model);
-        new_model = (ENERGY_STORAGE_MODEL*) new ESTR0(*smodel);
-    }
-
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        energy_storage_model = new_model;
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append energy storage model of "<<get_device_name();
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        if(model->get_model_type()=="ENERGY STORAGE")
+        {
+            ENERGY_STORAGE_MODEL* oldmodel = get_energy_storage_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                energy_storage_model = NULL;
+            }
+
+            ENERGY_STORAGE_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="ESTR0")
+            {
+                ESTR0* smodel = (ESTR0*) (model);
+                new_model = (ENERGY_STORAGE_MODEL*) new ESTR0(*smodel);
+            }
+
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                energy_storage_model = new_model;
+            }
+            else
+            {
+                ostringstream osstream;
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append energy storage model of "<<get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up energy storage model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            return;
+        }
     }
 }
 
@@ -143,26 +142,26 @@ ENERGY_STORAGE_MODEL* ENERGY_STORAGE::get_energy_storage_model() const
 
 void ENERGY_STORAGE::run(DYNAMIC_MODE mode)
 {
-    if(get_status()==false)
-        return;
-
-    switch(mode)
+    if(get_status()==true)
     {
-        case INITIALIZE_MODE:
-        {
-            ENERGY_STORAGE_MODEL* estorage = get_energy_storage_model();
-            if(estorage==NULL)
-                return;
-            estorage->initialize();
-
-            break;
-        }
-        default:
+        switch(mode)
         {
-            ENERGY_STORAGE_MODEL* estorage = get_energy_storage_model();
-            if(estorage!=NULL)
-                estorage->run(mode);
-            break;
+            case INITIALIZE_MODE:
+            {
+                ENERGY_STORAGE_MODEL* estorage = get_energy_storage_model();
+                if(estorage!=NULL)
+                    estorage->initialize();
+                else
+                    return;
+                break;
+            }
+            default:
+            {
+                ENERGY_STORAGE_MODEL* estorage = get_energy_storage_model();
+                if(estorage!=NULL)
+                    estorage->run(mode);
+                break;
+            }
         }
     }
 }
@@ -171,13 +170,13 @@ void ENERGY_STORAGE::report() const
 {
     ostringstream osstream;
     osstream<<get_device_name()<<": "<<(get_status()==true?"in service":"out of service")<<", "
-      <<"MBASE = "<<setw(6)<<setprecision(2)<<fixed<<get_mbase_in_MVA()<<" MVA"<<endl
-      <<"P = "<<setw(8)<<setprecision(4)<<fixed<<get_p_generation_in_MW()<<" MW, "
-      <<"Pmax = "<<setw(8)<<setprecision(4)<<fixed<<get_p_max_in_MW()<<" MW, "
-      <<"Pmin = "<<setw(8)<<setprecision(4)<<fixed<<get_p_min_in_MW()<<" MW"<<endl
-      <<"Q = "<<setw(8)<<setprecision(4)<<fixed<<get_q_generation_in_MVar()<<" MVar, "
-      <<"Qmax = "<<setw(8)<<setprecision(4)<<fixed<<get_q_max_in_MVar()<<" MVar, "
-      <<"Qmin = "<<setw(8)<<setprecision(4)<<fixed<<get_q_min_in_MVar()<<" MVar";
+            <<"MBASE = "<<setw(6)<<setprecision(2)<<fixed<<get_mbase_in_MVA()<<" MVA"<<endl
+            <<"P = "<<setw(8)<<setprecision(4)<<fixed<<get_p_generation_in_MW()<<" MW, "
+            <<"Pmax = "<<setw(8)<<setprecision(4)<<fixed<<get_p_max_in_MW()<<" MW, "
+            <<"Pmin = "<<setw(8)<<setprecision(4)<<fixed<<get_p_min_in_MW()<<" MW"<<endl
+            <<"Q = "<<setw(8)<<setprecision(4)<<fixed<<get_q_generation_in_MVar()<<" MVar, "
+            <<"Qmax = "<<setw(8)<<setprecision(4)<<fixed<<get_q_max_in_MVar()<<" MVar, "
+            <<"Qmin = "<<setw(8)<<setprecision(4)<<fixed<<get_q_min_in_MVar()<<" MVar";
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     toolkit.show_information_with_leading_time_stamp(osstream);
 }
diff --git a/code/source/device/equivalent_device.cpp b/code/source/device/equivalent_device.cpp
index 97619b55..aa0446e5 100644
--- a/code/source/device/equivalent_device.cpp
+++ b/code/source/device/equivalent_device.cpp
@@ -363,14 +363,14 @@ void EQUIVALENT_DEVICE::report() const
 {
     ostringstream osstream;
     osstream<<get_device_name()<<": "<<(get_status()==true?"in service":"out of service")<<endl
-      <<"equivalent voltage source: "<<(get_equivalent_voltage_source_status()==true?"in service":"out of service")<<", "
-      <<"V = "<<setw(8)<<setprecision(6)<<fixed<< steps_fast_complex_abs(get_equivalent_voltage_source_voltage_in_pu())<<" pu, "
-      <<"Angle = "<<setw(8)<<setprecision(6)<<fixed<<rad2deg(steps_fast_complex_arg(get_equivalent_voltage_source_voltage_in_pu()))<<" deg, "
-      <<"Z = "<<setw(8)<<setprecision(6)<<fixed<<get_equivalent_voltage_source_impedance_in_pu()<<" pu"<<endl
-      <<"equivalent load: "<<(get_equivalent_load_status()==true?"in service":"out of service")<<", "
-      <<"P+jQ[P part] = "<<setw(6)<<setprecision(2)<<fixed<<get_equivalent_nominal_constant_power_load_in_MVA()<<"MVA, "
-      <<"P+jQ[I part] = "<<setw(6)<<setprecision(2)<<fixed<<get_equivalent_nominal_constant_current_load_in_MVA()<<"MVA, "
-      <<"P+jQ[Z part] = "<<setw(6)<<setprecision(2)<<fixed<<get_equivalent_nominal_constant_impedance_load_in_MVA()<<"MVA.";
+            <<"equivalent voltage source: "<<(get_equivalent_voltage_source_status()==true?"in service":"out of service")<<", "
+            <<"V = "<<setw(8)<<setprecision(6)<<fixed<< steps_fast_complex_abs(get_equivalent_voltage_source_voltage_in_pu())<<" pu, "
+            <<"Angle = "<<setw(8)<<setprecision(6)<<fixed<<rad2deg(steps_fast_complex_arg(get_equivalent_voltage_source_voltage_in_pu()))<<" deg, "
+            <<"Z = "<<setw(8)<<setprecision(6)<<fixed<<get_equivalent_voltage_source_impedance_in_pu()<<" pu"<<endl
+            <<"equivalent load: "<<(get_equivalent_load_status()==true?"in service":"out of service")<<", "
+            <<"P+jQ[P part] = "<<setw(6)<<setprecision(2)<<fixed<<get_equivalent_nominal_constant_power_load_in_MVA()<<"MVA, "
+            <<"P+jQ[I part] = "<<setw(6)<<setprecision(2)<<fixed<<get_equivalent_nominal_constant_current_load_in_MVA()<<"MVA, "
+            <<"P+jQ[Z part] = "<<setw(6)<<setprecision(2)<<fixed<<get_equivalent_nominal_constant_impedance_load_in_MVA()<<"MVA.";
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     toolkit.show_information_with_leading_time_stamp(osstream);
 }
@@ -423,48 +423,49 @@ DEVICE_ID EQUIVALENT_DEVICE::get_device_id() const
 
 void EQUIVALENT_DEVICE::set_model(const MODEL* model)
 {
-    if(model->get_allowed_device_type()!="EQUIVALENT DEVICE")
-        return;
-
-    if(model->get_model_type()=="EQUIVALENT MODEL")
+    if(model != NULL and model->get_allowed_device_type()=="EQUIVALENT DEVICE")
     {
-        set_equivalent_model((EQUIVALENT_MODEL*) model);
-        return;
+        if(model->get_model_type()=="EQUIVALENT MODEL")
+        {
+            set_equivalent_model((EQUIVALENT_MODEL*) model);
+            return;
+        }
     }
 }
 
 void EQUIVALENT_DEVICE::set_equivalent_model(const EQUIVALENT_MODEL* model)
 {
-    if(model->get_model_type()!="EQUIVALENT MODEL")
-        return;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    EQUIVALENT_MODEL* oldmodel = get_equivalent_model();
-    if(oldmodel!=NULL)
+    if(model!=NULL and model->get_model_type()=="EQUIVALENT MODEL")
     {
-        delete oldmodel;
-        equivalent_model = NULL;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    EQUIVALENT_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="ARXL")
-    {
-        ARXL* smodel = (ARXL*) (model);
-        new_model = (EQUIVALENT_MODEL*) new ARXL(*smodel);
-    }
+        EQUIVALENT_MODEL* oldmodel = get_equivalent_model();
+        if(oldmodel!=NULL)
+        {
+            delete oldmodel;
+            equivalent_model = NULL;
+        }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        equivalent_model = new_model;
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append equivalent model of "<<get_device_name();
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        EQUIVALENT_MODEL *new_model = NULL;
+        string model_name = model->get_model_name();
+        if(model_name=="ARXL")
+        {
+            ARXL* smodel = (ARXL*) (model);
+            new_model = (EQUIVALENT_MODEL*) new ARXL(*smodel);
+        }
+
+        if(new_model!=NULL)
+        {
+            new_model->set_toolkit(toolkit);
+            new_model->set_device_id(get_device_id());
+            equivalent_model = new_model;
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Warning. Model '"<<model_name<<"' is not supported when append equivalent model of "<<get_device_name();
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
@@ -481,9 +482,10 @@ void EQUIVALENT_DEVICE::run(DYNAMIC_MODE mode)
         case INITIALIZE_MODE:
         {
             EQUIVALENT_MODEL* model = get_equivalent_model();
-            if(model==NULL)
+            if(model!=NULL)
+                model->initialize();
+            else
                 return;
-            model->initialize();
 
             break;
         }
diff --git a/code/source/device/fixed_shunt.cpp b/code/source/device/fixed_shunt.cpp
index 20620b9a..8c289241 100644
--- a/code/source/device/fixed_shunt.cpp
+++ b/code/source/device/fixed_shunt.cpp
@@ -20,26 +20,28 @@ void FIXED_SHUNT::set_shunt_bus(size_t shunt_bus)
 {
     ostringstream osstream;
 
-    if(shunt_bus==0)
+    if(shunt_bus!=0)
     {
-        osstream<<"Warning. Zero bus number (0) is not allowed for setting up fixed shunt bus."<<endl
-          <<"0 will be set to indicate invalid fixed shunt.";
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        this->bus = 0;
-        return;
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        if(psdb.is_bus_exist(shunt_bus))
+            this->bus = shunt_bus;
+        else
+        {
+            osstream<<"Bus "<<shunt_bus<<" does not exist in the power system database '"<<psdb.get_system_name()<<"' for setting up fixed shunt."<<endl
+                    <<"0 will be set to indicate invalid fixed shunt.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            this->bus = 0;
+        }
     }
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    if(psdb.is_bus_exist(shunt_bus))
-        this->bus = shunt_bus;
     else
     {
-        osstream<<"Bus "<<shunt_bus<<" does not exist in the power system database '"<<psdb.get_system_name()<<"' for setting up fixed shunt."<<endl
-          <<"0 will be set to indicate invalid fixed shunt.";
+        osstream<<"Warning. Zero bus number (0) is not allowed for setting up fixed shunt bus."<<endl
+                <<"0 will be set to indicate invalid fixed shunt.";
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         toolkit.show_information_with_leading_time_stamp(osstream);
         this->bus = 0;
+        return;
     }
 }
 
@@ -124,7 +126,7 @@ void FIXED_SHUNT::clear()
 bool FIXED_SHUNT::is_connected_to_bus(size_t target_bus) const
 {
     if(target_bus==get_shunt_bus()) return true;
-    else return false;
+    else                            return false;
 }
 
 bool FIXED_SHUNT::is_in_area(size_t area) const
@@ -157,7 +159,7 @@ void FIXED_SHUNT::report() const
 {
     ostringstream osstream;
     osstream<<get_device_name()<<": "<<(get_status()==true?"in service":"out of service")<<", "
-      <<"P+jQ[Z] = "<<setw(6)<<setprecision(2)<<fixed<<get_nominal_impedance_shunt_in_MVA()<<" MVA.";
+            <<"P+jQ[Z] = "<<setw(6)<<setprecision(2)<<fixed<<get_nominal_impedance_shunt_in_MVA()<<" MVA.";
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     toolkit.show_information_with_leading_time_stamp(osstream);
 }
@@ -214,24 +216,29 @@ complex<double> FIXED_SHUNT::get_actual_impedance_shunt_in_MVA() const
 {
     ostringstream osstream;
 
-    if(get_status() == false)
-        return 0.0;
-
-    complex<double> S0 = get_nominal_impedance_shunt_in_MVA();
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    BUS* busptr = psdb.get_bus(get_shunt_bus());
-
-    if(busptr==NULL)
+    if(get_status() == true)
     {
-        osstream<<"Bus "<<get_shunt_bus()<<" is not found when getting the actual impedance shunt of "<<get_device_name()<<". Nominal impedance shunt in MVA will be returned.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return S0;
+        complex<double> S0 = get_nominal_impedance_shunt_in_MVA();
+
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+
+        BUS* busptr = psdb.get_bus(get_shunt_bus());
+
+        if(busptr!=NULL)
+        {
+            double v = busptr->get_voltage_in_pu();
+            return S0*v*v;
+        }
+        else
+        {
+            osstream<<"Bus "<<get_shunt_bus()<<" is not found when getting the actual impedance shunt of "<<get_device_name()<<". Nominal impedance shunt in MVA will be returned.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            return S0;
+        }
     }
-    double v = busptr->get_voltage_in_pu();
-    return S0*v*v;
+    else
+        return 0.0;
 }
 
 
diff --git a/code/source/device/generator.cpp b/code/source/device/generator.cpp
index 942f74dc..964152aa 100644
--- a/code/source/device/generator.cpp
+++ b/code/source/device/generator.cpp
@@ -93,400 +93,403 @@ DEVICE_ID GENERATOR::get_device_id() const
 
 void GENERATOR::set_model(const MODEL* model)
 {
-    if(model==NULL)
-        return;
-
-    if(model->get_allowed_device_type()!="GENERATOR")
-        return;
-
-    if(model->get_model_type()=="SYNC GENERATOR")
-    {
-        set_sync_generator_model((SYNC_GENERATOR_MODEL*) model);
-        return;
-    }
-    if(model->get_model_type()=="COMPENSATOR")
-    {
-        set_compensator_model((COMPENSATOR_MODEL*) model);
-        return;
-    }
-    if(model->get_model_type()=="EXCITER")
-    {
-        set_exciter_model((EXCITER_MODEL*) model);
-        return;
-    }
-    if(model->get_model_type()=="STABILIZER")
+    if(model!=NULL and model->get_allowed_device_type()=="GENERATOR")
     {
-        set_stabilizer_model((STABILIZER_MODEL*) model);
-        return;
-    }
-    if(model->get_model_type()=="TURBINE GOVERNOR")
-    {
-        set_turbine_governor_model((TURBINE_GOVERNOR_MODEL*) model);
-        return;
-    }
-    if(model->get_model_type()=="TURBINE LOAD CONTROLLER")
-    {
-        set_turbine_load_controller_model((TURBINE_LOAD_CONTROLLER_MODEL*) model);
-        return;
+        if(model->get_model_type()=="SYNC GENERATOR")
+        {
+            set_sync_generator_model((SYNC_GENERATOR_MODEL*) model);
+            return;
+        }
+        if(model->get_model_type()=="COMPENSATOR")
+        {
+            set_compensator_model((COMPENSATOR_MODEL*) model);
+            return;
+        }
+        if(model->get_model_type()=="EXCITER")
+        {
+            set_exciter_model((EXCITER_MODEL*) model);
+            return;
+        }
+        if(model->get_model_type()=="STABILIZER")
+        {
+            set_stabilizer_model((STABILIZER_MODEL*) model);
+            return;
+        }
+        if(model->get_model_type()=="TURBINE GOVERNOR")
+        {
+            set_turbine_governor_model((TURBINE_GOVERNOR_MODEL*) model);
+            return;
+        }
+        if(model->get_model_type()=="TURBINE LOAD CONTROLLER")
+        {
+            set_turbine_load_controller_model((TURBINE_LOAD_CONTROLLER_MODEL*) model);
+            return;
+        }
+        ostringstream osstream;
+        osstream<<"Warning. Unsupported model type '"<<model->get_model_type()<<"' when setting up generator-related model.";
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        toolkit.show_information_with_leading_time_stamp(osstream);
     }
-    ostringstream osstream;
-    osstream<<"Warning. Unsupported model type '"<<model->get_model_type()<<"' when setting up generator-related model.";
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    toolkit.show_information_with_leading_time_stamp(osstream);
 }
 
 void GENERATOR::set_sync_generator_model(const SYNC_GENERATOR_MODEL* model)
 {
-    if(model==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(model->get_model_type()!="SYNC GENERATOR")
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up sync generator model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    SYNC_GENERATOR_MODEL* oldmodel = get_sync_generator_model();
-    if(oldmodel!=NULL)
-    {
-        delete oldmodel;
-        sync_generator_model = NULL;
-    }
-
-    SYNC_GENERATOR_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="GENCLS")
-    {
-        GENCLS* smodel = (GENCLS*) (model);
-        new_model = (SYNC_GENERATOR_MODEL*) new GENCLS(*smodel);
-    }
-    if(model_name=="GENROU")
+    if(model!=NULL)
     {
-        GENROU* smodel = (GENROU*) (model);
-        new_model = (SYNC_GENERATOR_MODEL*) new GENROU(*smodel);
-    }
-    if(model_name=="GENSAL")
-    {
-        GENSAL* smodel = (GENSAL*) (model);
-        new_model = (SYNC_GENERATOR_MODEL*) new GENSAL(*smodel);
-    }
-
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        sync_generator_model = new_model;
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append sync generator model of "<<get_device_name();
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        if(model->get_model_type()=="SYNC GENERATOR")
+        {
+            SYNC_GENERATOR_MODEL* oldmodel = get_sync_generator_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                sync_generator_model = NULL;
+            }
+
+            SYNC_GENERATOR_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="GENCLS")
+            {
+                GENCLS* smodel = (GENCLS*) (model);
+                new_model = (SYNC_GENERATOR_MODEL*) new GENCLS(*smodel);
+            }
+            if(model_name=="GENROU")
+            {
+                GENROU* smodel = (GENROU*) (model);
+                new_model = (SYNC_GENERATOR_MODEL*) new GENROU(*smodel);
+            }
+            if(model_name=="GENSAL")
+            {
+                GENSAL* smodel = (GENSAL*) (model);
+                new_model = (SYNC_GENERATOR_MODEL*) new GENSAL(*smodel);
+            }
+
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                sync_generator_model = new_model;
+            }
+            else
+            {
+                ostringstream osstream;
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append sync generator model of "<<get_device_name();
+                STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up sync generator model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            return;
+        }
     }
 }
 
 void GENERATOR::set_compensator_model(const COMPENSATOR_MODEL* model)
 {
-    if(model==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    if(model->get_model_type()!="COMPENSATOR")
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up compensator model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    COMPENSATOR_MODEL* oldmodel = get_compensator_model();
-    if(oldmodel!=NULL)
+    if(model!=NULL)
     {
-        delete oldmodel;
-        compensator_model=NULL;
-    }
-
-    COMPENSATOR_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="COMP")
-    {
-        COMP* smodel = (COMP*) (model);
-        new_model = (COMPENSATOR_MODEL*) new COMP(*smodel);
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        compensator_model = new_model;
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append compensator model of "<<get_device_name();
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        if(model->get_model_type()=="COMPENSATOR")
+        {
+            COMPENSATOR_MODEL* oldmodel = get_compensator_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                compensator_model=NULL;
+            }
+
+            COMPENSATOR_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="COMP")
+            {
+                COMP* smodel = (COMP*) (model);
+                new_model = (COMPENSATOR_MODEL*) new COMP(*smodel);
+            }
+
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                compensator_model = new_model;
+            }
+            else
+            {
+                ostringstream osstream;
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append compensator model of "<<get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up compensator model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void GENERATOR::set_exciter_model(const EXCITER_MODEL* model)
 {
-    if(model==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    if(model->get_model_type()!="EXCITER")
+    if(model!=NULL)
     {
-        ostringstream osstream;
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up exciter model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    EXCITER_MODEL* oldmodel = get_exciter_model();
-    if(oldmodel!=NULL)
-    {
-        delete oldmodel;
-        exciter_model=NULL;
-    }
-
-    EXCITER_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="SEXS")
-    {
-        SEXS* smodel = (SEXS*) (model);
-        new_model = (EXCITER_MODEL*) new SEXS(*smodel);
-    }
-    if(model_name=="IEEET1")
-    {
-        IEEET1* smodel = (IEEET1*) (model);
-        new_model = (EXCITER_MODEL*) new IEEET1(*smodel);
-    }
-    if(model_name=="PSASPE1")
-    {
-        PSASPE1* smodel = (PSASPE1*) (model);
-        new_model = (EXCITER_MODEL*) new PSASPE1(*smodel);
-    }
-    if(model_name=="PSASPE2")
-    {
-        PSASPE2* smodel = (PSASPE2*) (model);
-        new_model = (EXCITER_MODEL*) new PSASPE2(*smodel);
-    }
-    if(model_name=="PSASPE13")
-    {
-        PSASPE13* smodel = (PSASPE13*) (model);
-        new_model = (EXCITER_MODEL*) new PSASPE13(*smodel);
-    }
-    if(model_name=="CSEET1")
-    {
-        CSEET1* smodel = (CSEET1*) (model);
-        new_model = (EXCITER_MODEL*) new CSEET1(*smodel);
-    }
-    if(model_name=="CSEET2")
-    {
-        CSEET2* smodel = (CSEET2*) (model);
-        new_model = (EXCITER_MODEL*) new CSEET2(*smodel);
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        exciter_model = new_model;
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append exciter model of "<<get_device_name();
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        if(model->get_model_type()=="EXCITER")
+        {
+            EXCITER_MODEL* oldmodel = get_exciter_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                exciter_model=NULL;
+            }
+
+            EXCITER_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="SEXS")
+            {
+                SEXS* smodel = (SEXS*) (model);
+                new_model = (EXCITER_MODEL*) new SEXS(*smodel);
+            }
+            if(model_name=="IEEET1")
+            {
+                IEEET1* smodel = (IEEET1*) (model);
+                new_model = (EXCITER_MODEL*) new IEEET1(*smodel);
+            }
+            if(model_name=="PSASPE1")
+            {
+                PSASPE1* smodel = (PSASPE1*) (model);
+                new_model = (EXCITER_MODEL*) new PSASPE1(*smodel);
+            }
+            if(model_name=="PSASPE2")
+            {
+                PSASPE2* smodel = (PSASPE2*) (model);
+                new_model = (EXCITER_MODEL*) new PSASPE2(*smodel);
+            }
+            if(model_name=="PSASPE13")
+            {
+                PSASPE13* smodel = (PSASPE13*) (model);
+                new_model = (EXCITER_MODEL*) new PSASPE13(*smodel);
+            }
+            if(model_name=="CSEET1")
+            {
+                CSEET1* smodel = (CSEET1*) (model);
+                new_model = (EXCITER_MODEL*) new CSEET1(*smodel);
+            }
+            if(model_name=="CSEET2")
+            {
+                CSEET2* smodel = (CSEET2*) (model);
+                new_model = (EXCITER_MODEL*) new CSEET2(*smodel);
+            }
+
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                exciter_model = new_model;
+            }
+            else
+            {
+                ostringstream osstream;
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append exciter model of "<<get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up exciter model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void GENERATOR::set_stabilizer_model(const STABILIZER_MODEL* model)
 {
-    if(model==NULL)
-        return;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    ostringstream osstream;
-    if(model->get_model_type()!="STABILIZER")
-    {
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up stabilizer model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    STABILIZER_MODEL* oldmodel = get_stabilizer_model();
-    if(oldmodel!=NULL)
-    {
-        delete oldmodel;
-        stabilizer_model=NULL;
-    }
-
-    STABILIZER_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="IEE2ST")
-    {
-        IEE2ST* smodel = (IEE2ST*) (model);
-        new_model = (STABILIZER_MODEL*) new IEE2ST(*smodel);
-    }
-    if(model_name=="PSASPS1")
-    {
-        PSASPS1* smodel = (PSASPS1*) (model);
-        new_model = (STABILIZER_MODEL*) new PSASPS1(*smodel);
-    }
-    if(model_name=="PSASPS2")
-    {
-        PSASPS2* smodel = (PSASPS2*) (model);
-        new_model = (STABILIZER_MODEL*) new PSASPS2(*smodel);
-    }
-    if(model_name=="PSASPS3")
-    {
-        PSASPS3* smodel = (PSASPS3*) (model);
-        new_model = (STABILIZER_MODEL*) new PSASPS3(*smodel);
-    }
-    if(model_name=="PSASPS4")
-    {
-        PSASPS4* smodel = (PSASPS4*) (model);
-        new_model = (STABILIZER_MODEL*) new PSASPS4(*smodel);
-    }
-    if(model_name=="PSASPS5")
-    {
-        PSASPS5* smodel = (PSASPS5*) (model);
-        new_model = (STABILIZER_MODEL*) new PSASPS5(*smodel);
-    }
-
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        stabilizer_model = new_model;
-    }
-    else
+    if(model!=NULL)
     {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append stabilizer model of "<<get_device_name();
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        if(model->get_model_type()=="STABILIZER")
+        {
+            STABILIZER_MODEL* oldmodel = get_stabilizer_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                stabilizer_model=NULL;
+            }
+
+            STABILIZER_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="IEE2ST")
+            {
+                IEE2ST* smodel = (IEE2ST*) (model);
+                new_model = (STABILIZER_MODEL*) new IEE2ST(*smodel);
+            }
+            if(model_name=="PSASPS1")
+            {
+                PSASPS1* smodel = (PSASPS1*) (model);
+                new_model = (STABILIZER_MODEL*) new PSASPS1(*smodel);
+            }
+            if(model_name=="PSASPS2")
+            {
+                PSASPS2* smodel = (PSASPS2*) (model);
+                new_model = (STABILIZER_MODEL*) new PSASPS2(*smodel);
+            }
+            if(model_name=="PSASPS3")
+            {
+                PSASPS3* smodel = (PSASPS3*) (model);
+                new_model = (STABILIZER_MODEL*) new PSASPS3(*smodel);
+            }
+            if(model_name=="PSASPS4")
+            {
+                PSASPS4* smodel = (PSASPS4*) (model);
+                new_model = (STABILIZER_MODEL*) new PSASPS4(*smodel);
+            }
+            if(model_name=="PSASPS5")
+            {
+                PSASPS5* smodel = (PSASPS5*) (model);
+                new_model = (STABILIZER_MODEL*) new PSASPS5(*smodel);
+            }
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                stabilizer_model = new_model;
+            }
+            else
+            {
+                ostringstream osstream;
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append stabilizer model of "<<get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up stabilizer model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void GENERATOR::set_turbine_governor_model(const TURBINE_GOVERNOR_MODEL* model)
 {
-    if(model==NULL)
-        return;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    if(model->get_model_type()!="TURBINE GOVERNOR")
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up turbine governor model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    TURBINE_GOVERNOR_MODEL* oldmodel = get_turbine_governor_model();
-    if(oldmodel!=NULL)
-    {
-        delete oldmodel;
-        turbine_governor_model=NULL;
-    }
-
-    TURBINE_GOVERNOR_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="TGOV1")
+    if(model!=NULL)
     {
-        TGOV1* smodel = (TGOV1*) (model);
-        new_model = (TURBINE_GOVERNOR_MODEL*) new TGOV1(*smodel);
-    }
-    if(model_name=="IEEEG1")
-    {
-        IEEEG1* smodel = (IEEEG1*) (model);
-        new_model = (TURBINE_GOVERNOR_MODEL*) new IEEEG1(*smodel);
-    }
-    if(model_name=="IEEEG2")
-    {
-        IEEEG2* smodel = (IEEEG2*) (model);
-        new_model = (TURBINE_GOVERNOR_MODEL*) new IEEEG2(*smodel);
-    }
-    if(model_name=="IEEEG3")
-    {
-        IEEEG3* smodel = (IEEEG3*) (model);
-        new_model = (TURBINE_GOVERNOR_MODEL*) new IEEEG3(*smodel);
-    }
-    if(model_name=="IEESGO")
-    {
-        IEESGO* smodel = (IEESGO*) (model);
-        new_model = (TURBINE_GOVERNOR_MODEL*) new IEESGO(*smodel);
-    }
-    if(model_name=="IEEEG1SB")
-    {
-        IEEEG1SB* smodel = (IEEEG1SB*) (model);
-        new_model = (TURBINE_GOVERNOR_MODEL*) new IEEEG1SB(*smodel);
-    }
-
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        turbine_governor_model = new_model;
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append turbine governor model of "<<get_device_name();
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        if(model->get_model_type()=="TURBINE GOVERNOR")
+        {
+            TURBINE_GOVERNOR_MODEL* oldmodel = get_turbine_governor_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                turbine_governor_model=NULL;
+            }
+
+            TURBINE_GOVERNOR_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="TGOV1")
+            {
+                TGOV1* smodel = (TGOV1*) (model);
+                new_model = (TURBINE_GOVERNOR_MODEL*) new TGOV1(*smodel);
+            }
+            if(model_name=="IEEEG1")
+            {
+                IEEEG1* smodel = (IEEEG1*) (model);
+                new_model = (TURBINE_GOVERNOR_MODEL*) new IEEEG1(*smodel);
+            }
+            if(model_name=="IEEEG2")
+            {
+                IEEEG2* smodel = (IEEEG2*) (model);
+                new_model = (TURBINE_GOVERNOR_MODEL*) new IEEEG2(*smodel);
+            }
+            if(model_name=="IEEEG3")
+            {
+                IEEEG3* smodel = (IEEEG3*) (model);
+                new_model = (TURBINE_GOVERNOR_MODEL*) new IEEEG3(*smodel);
+            }
+            if(model_name=="IEESGO")
+            {
+                IEESGO* smodel = (IEESGO*) (model);
+                new_model = (TURBINE_GOVERNOR_MODEL*) new IEESGO(*smodel);
+            }
+            if(model_name=="IEEEG1SB")
+            {
+                IEEEG1SB* smodel = (IEEEG1SB*) (model);
+                new_model = (TURBINE_GOVERNOR_MODEL*) new IEEEG1SB(*smodel);
+            }
+
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                turbine_governor_model = new_model;
+            }
+            else
+            {
+                ostringstream osstream;
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append turbine governor model of "<<get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up turbine governor model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void GENERATOR::set_turbine_load_controller_model(const TURBINE_LOAD_CONTROLLER_MODEL* model)
 {
-    if(model==NULL)
-        return;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    if(model->get_model_type()!="TURBINE LOAD CONTROLLER")
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up turbine load controller model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    TURBINE_LOAD_CONTROLLER_MODEL* oldmodel = get_turbine_load_controller_model();
-    if(oldmodel!=NULL)
+    if(model!=NULL)
     {
-        delete oldmodel;
-        turbine_load_controller_model=NULL;
-    }
-
-    TURBINE_LOAD_CONTROLLER_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="LCFB1")
-    {
-        LCFB1* smodel = (LCFB1*) (model);
-        new_model = (TURBINE_LOAD_CONTROLLER_MODEL*) new LCFB1(*smodel);
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        turbine_load_controller_model = new_model;
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append turbine load controller model of "<<get_device_name();
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        if(model->get_model_type()=="TURBINE LOAD CONTROLLER")
+        {
+            TURBINE_LOAD_CONTROLLER_MODEL* oldmodel = get_turbine_load_controller_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                turbine_load_controller_model=NULL;
+            }
+
+            TURBINE_LOAD_CONTROLLER_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="LCFB1")
+            {
+                LCFB1* smodel = (LCFB1*) (model);
+                new_model = (TURBINE_LOAD_CONTROLLER_MODEL*) new LCFB1(*smodel);
+            }
+
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                turbine_load_controller_model = new_model;
+            }
+            else
+            {
+                ostringstream osstream;
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append turbine load controller model of "<<get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up turbine load controller model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
-
 void GENERATOR::clear_sync_generator_model()
 {
     if(sync_generator_model!=NULL)
@@ -495,6 +498,7 @@ void GENERATOR::clear_sync_generator_model()
         sync_generator_model = NULL;
     }
 }
+
 void GENERATOR::clear_compensator_model()
 {
     if(compensator_model!=NULL)
@@ -503,6 +507,7 @@ void GENERATOR::clear_compensator_model()
         compensator_model = NULL;
     }
 }
+
 void GENERATOR::clear_exciter_model()
 {
     if(exciter_model!=NULL)
@@ -511,6 +516,7 @@ void GENERATOR::clear_exciter_model()
         exciter_model = NULL;
     }
 }
+
 void GENERATOR::clear_stabilizer_model()
 {
     if(stabilizer_model!=NULL)
@@ -519,6 +525,7 @@ void GENERATOR::clear_stabilizer_model()
         stabilizer_model = NULL;
     }
 }
+
 void GENERATOR::clear_turbine_governor_model()
 {
     if(turbine_governor_model!=NULL)
@@ -527,6 +534,7 @@ void GENERATOR::clear_turbine_governor_model()
         turbine_governor_model = NULL;
     }
 }
+
 void GENERATOR::clear_turbine_load_controller_model()
 {
     if(turbine_load_controller_model!=NULL)
@@ -568,71 +576,72 @@ TURBINE_LOAD_CONTROLLER_MODEL* GENERATOR::get_turbine_load_controller_model() co
 
 void GENERATOR::run(DYNAMIC_MODE mode)
 {
-    if(get_status()==false)
-        return;
-
-    switch(mode)
+    if(get_status()==true)
     {
-        case INITIALIZE_MODE:
-        {
-            SYNC_GENERATOR_MODEL* gen = get_sync_generator_model();
-            if(gen==NULL)
-                return;
-            gen->initialize();
-
-            COMPENSATOR_MODEL* comp = get_compensator_model();
-            if(comp!=NULL)
-                comp->initialize();
-
-            STABILIZER_MODEL* pss = get_stabilizer_model();
-            if(pss!=NULL)
-                pss->initialize();
-
-            EXCITER_MODEL* exciter = get_exciter_model();
-            if(exciter!=NULL)
-                exciter->initialize();
-
-            TURBINE_GOVERNOR_MODEL* tg = get_turbine_governor_model();
-            if(tg!=NULL)
-                tg->initialize();
-
-            TURBINE_LOAD_CONTROLLER_MODEL* tlc = get_turbine_load_controller_model();
-            if(tlc!=NULL)
-                tlc->initialize();
-
-            break;
-        }
-        case INTEGRATE_MODE:
-        case UPDATE_MODE:
+        switch(mode)
         {
-            COMPENSATOR_MODEL* comp = get_compensator_model();
-            if(comp!=NULL)
-                comp->run(mode);
-
-            STABILIZER_MODEL* pss = get_stabilizer_model();
-            if(pss!=NULL)
-                pss->run(mode);
-
-            EXCITER_MODEL* exciter = get_exciter_model();
-            if(exciter!=NULL)
-                exciter->run(mode);
-
-            TURBINE_LOAD_CONTROLLER_MODEL* tlc = get_turbine_load_controller_model();
-            if(tlc!=NULL)
-                tlc->run(mode);
-
-            TURBINE_GOVERNOR_MODEL* tg = get_turbine_governor_model();
-            if(tg!=NULL)
-                tg->run(mode);
-
-            SYNC_GENERATOR_MODEL* gen = get_sync_generator_model();
-            if(gen!=NULL)
-                gen->run(mode);
-            break;
-        }
-        case RELAY_MODE:
-        {
-            break;
+            case INITIALIZE_MODE:
+            {
+                SYNC_GENERATOR_MODEL* gen = get_sync_generator_model();
+                if(gen!=NULL)
+                    gen->initialize();
+                else
+                    return;
+
+                COMPENSATOR_MODEL* comp = get_compensator_model();
+                if(comp!=NULL)
+                    comp->initialize();
+
+                STABILIZER_MODEL* pss = get_stabilizer_model();
+                if(pss!=NULL)
+                    pss->initialize();
+
+                EXCITER_MODEL* exciter = get_exciter_model();
+                if(exciter!=NULL)
+                    exciter->initialize();
+
+                TURBINE_GOVERNOR_MODEL* tg = get_turbine_governor_model();
+                if(tg!=NULL)
+                    tg->initialize();
+
+                TURBINE_LOAD_CONTROLLER_MODEL* tlc = get_turbine_load_controller_model();
+                if(tlc!=NULL)
+                    tlc->initialize();
+
+                break;
+            }
+            case INTEGRATE_MODE:
+            case UPDATE_MODE:
+            {
+                COMPENSATOR_MODEL* comp = get_compensator_model();
+                if(comp!=NULL)
+                    comp->run(mode);
+
+                STABILIZER_MODEL* pss = get_stabilizer_model();
+                if(pss!=NULL)
+                    pss->run(mode);
+
+                EXCITER_MODEL* exciter = get_exciter_model();
+                if(exciter!=NULL)
+                    exciter->run(mode);
+
+                TURBINE_LOAD_CONTROLLER_MODEL* tlc = get_turbine_load_controller_model();
+                if(tlc!=NULL)
+                    tlc->run(mode);
+
+                TURBINE_GOVERNOR_MODEL* tg = get_turbine_governor_model();
+                if(tg!=NULL)
+                    tg->run(mode);
+
+                SYNC_GENERATOR_MODEL* gen = get_sync_generator_model();
+                if(gen!=NULL)
+                    gen->run(mode);
+                break;
+            }
+            case RELAY_MODE:
+            {
+                break;
+            }
         }
     }
 }
@@ -699,17 +708,19 @@ complex<double> GENERATOR::get_source_dynamic_current_in_pu_based_on_system_base
 
     SYNC_GENERATOR_MODEL* generator_model = get_sync_generator_model();
 
-    if(get_status()==false or generator_model==NULL)
-        return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(get_status()==true and generator_model!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    complex<double> I = generator_model->get_terminal_current_in_pu_based_on_mbase();
-    double mbase = get_mbase_in_MVA();
-    double sbase = psdb.get_system_base_power_in_MVA();
-    I *= (mbase/sbase);
-    return I;
+        complex<double> I = generator_model->get_terminal_current_in_pu_based_on_mbase();
+        double mbase = get_mbase_in_MVA();
+        double sbase = psdb.get_system_base_power_in_MVA();
+        I *= (mbase/sbase);
+        return I;
+    }
+    else
+        return 0.0;
 }
 
 
diff --git a/code/source/device/hvdc.cpp b/code/source/device/hvdc.cpp
index f206f80e..08718886 100644
--- a/code/source/device/hvdc.cpp
+++ b/code/source/device/hvdc.cpp
@@ -39,28 +39,29 @@ void HVDC::set_converter_bus(HVDC_CONVERTER_SIDE converter, const size_t bus)
     ostringstream osstream;
     string converter_name = get_converter_side_name(converter);
 
-    if(bus==0)
+    if(bus!=0)
     {
-        osstream<<"Warning. Zero bus number (0) is not allowed for setting up "<<converter_name<<" bus of HVDC link."<<endl
-          <<"0 will be set to indicate invalid HVDC link.";
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        converter_bus[converter] = bus;
-        return;
-    }
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    if(not psdb.is_bus_exist(bus))
+        if(psdb.is_bus_exist(bus))
+            converter_bus[converter] = bus;
+        else
+        {
+            osstream<<"Bus "<<bus<<" does not exist for setting up "<<converter_name<<" side bus of hvdc link."<<endl
+                    <<"0 will be set to indicate invalid hvdc link.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            converter_bus[converter] = 0;
+        }
+    }
+    else
     {
-        osstream<<"Bus "<<bus<<" does not exist for setting up "<<converter_name<<" side bus of hvdc link."<<endl
-           <<"0 will be set to indicate invalid hvdc link.";
+        osstream<<"Warning. Zero bus number (0) is not allowed for setting up "<<converter_name<<" bus of HVDC link."<<endl
+                <<"0 will be set to indicate invalid HVDC link.";
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         toolkit.show_information_with_leading_time_stamp(osstream);
-        converter_bus[converter] = 0;
-        return;
+        converter_bus[converter] = bus;
     }
-    converter_bus[converter] = bus;
 }
 
 void HVDC::set_converter_valve_side_bus_name(HVDC_CONVERTER_SIDE converter, string name)
@@ -287,7 +288,7 @@ void HVDC::set_converter_operation_mode(HVDC_CONVERTER_SIDE converter, const HVD
         else
         {
             osstream<<"Warning. Neither INVERTER_CONSTANT_VOLTAGE nor INVERTER_CONSTANT_GAMMA is allowed for setting HVDC "<<converter_name<<" operation mode of "<<get_device_name()<<endl
-              <<"INVERTER_CONSTANT_VOLTAGE mode will be set automatically.";
+                    <<"INVERTER_CONSTANT_VOLTAGE mode will be set automatically.";
             STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
             toolkit.show_information_with_leading_time_stamp(osstream);
             operation_mode[converter] = INVERTER_CONSTANT_VOLTAGE;
@@ -297,14 +298,14 @@ void HVDC::set_converter_operation_mode(HVDC_CONVERTER_SIDE converter, const HVD
 
 void HVDC::set_converter_number_of_bridge(HVDC_CONVERTER_SIDE converter, const size_t nbridge)
 {
-    string converter_name = get_converter_side_name(converter);
     if(nbridge > 0)
         this->bridge_number[converter] = nbridge;
     else
     {
+        string converter_name = get_converter_side_name(converter);
         ostringstream osstream;
         osstream<<"Error. Zero (0) is not allowed for setting HVDC "<<converter_name<<" bridge number of "<<get_device_name()<<endl
-          <<"0 will be set to indicate invalid HVDC link.";
+                <<"0 will be set to indicate invalid HVDC link.";
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         toolkit.show_information_with_leading_time_stamp(osstream);
         this->bridge_number[converter] = 0;
@@ -313,14 +314,14 @@ void HVDC::set_converter_number_of_bridge(HVDC_CONVERTER_SIDE converter, const s
 
 void HVDC::set_converter_voltage_drop_per_bridge_in_kV(HVDC_CONVERTER_SIDE converter, const double V)
 {
-    string converter_name = get_converter_side_name(converter);
     if(V >= 0.0)
         this->voltage_drop_per_bridge_in_kV[converter] = V;
     else
     {
+        string converter_name = get_converter_side_name(converter);
         ostringstream osstream;
         osstream<<"Warning. Negative ("<<V<<" kV) is not allowed for setting HVDC "<<converter_name<<" voltage drop of "<<get_device_name()<<endl
-          <<"0 will be set automatically.";
+                <<"0 will be set automatically.";
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         toolkit.show_information_with_leading_time_stamp(osstream);
         this->voltage_drop_per_bridge_in_kV[converter] = 0.0;
@@ -350,13 +351,12 @@ void HVDC::set_converter_min_alpha_or_gamma_in_deg(HVDC_CONVERTER_SIDE converter
 
 void HVDC::set_converter_transformer_grid_side_base_voltage_in_kV(HVDC_CONVERTER_SIDE converter, const double V)
 {
-    ostringstream osstream;
-    string converter_name = get_converter_side_name(converter);
-
     if(V > 0.0)
         this->converter_transformer_grid_side_base_voltage_in_kV[converter] = V;
     else
     {
+        ostringstream osstream;
+        string converter_name = get_converter_side_name(converter);
         if(V == 0.0)
         {
             STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
@@ -370,7 +370,7 @@ void HVDC::set_converter_transformer_grid_side_base_voltage_in_kV(HVDC_CONVERTER
             else
             {
                 osstream<<"Warning. Zero (0.0 kV) is provided for setting HVDC "<<converter_name<<" transformer grid side base voltage of "<<get_device_name()<<endl
-                  <<"However, the "<<converter_name<<" bus doesn't exist. 0.0 will be set to indicate as base voltage of "<<converter_name<<" bus.";
+                        <<"However, the "<<converter_name<<" bus doesn't exist. 0.0 will be set to indicate as base voltage of "<<converter_name<<" bus.";
                 toolkit.show_information_with_leading_time_stamp(osstream);
                 this->converter_transformer_grid_side_base_voltage_in_kV[converter] = 0.0;
             }
@@ -378,7 +378,7 @@ void HVDC::set_converter_transformer_grid_side_base_voltage_in_kV(HVDC_CONVERTER
          else
         {
             osstream<<"Warning. Negative ("<<V<<" kV) is not allowed for setting HVDC "<<converter_name<<" transformer grid side base voltage of "<<get_device_name()<<endl
-              <<"0.0 will be set automatically as base voltage of "<<converter_name<<" bus.";
+                    <<"0.0 will be set automatically as base voltage of "<<converter_name<<" bus.";
             STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
             toolkit.show_information_with_leading_time_stamp(osstream);
             this->converter_transformer_grid_side_base_voltage_in_kV[converter] = 0.0;
@@ -388,13 +388,12 @@ void HVDC::set_converter_transformer_grid_side_base_voltage_in_kV(HVDC_CONVERTER
 
 void HVDC::set_converter_transformer_converter_side_base_voltage_in_kV(HVDC_CONVERTER_SIDE converter, const double V)
 {
-    ostringstream osstream;
-    string converter_name = get_converter_side_name(converter);
-
     if(V > 0.0)
         this->converter_transformer_converter_side_base_voltage_in_kV[converter] = V;
     else
     {
+        string converter_name = get_converter_side_name(converter);
+        ostringstream osstream;
         osstream<<"Error. Non-positive ("<<V<<" kV) is not allowed for setting HVDC "<<converter_name<<" transformer converter side base voltage of "<<get_device_name()<<endl
           <<"0.0 will be set to indicate invalid base voltage.";
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
@@ -465,7 +464,7 @@ bool HVDC::get_status() const
 bool HVDC::is_blocked() const
 {
     if(get_status()==true) return false;
-    else return true;
+    else                   return true;
 }
 
 HVDC_POLE HVDC::get_number_of_poles() const
@@ -569,10 +568,12 @@ double HVDC::get_converter_transformer_grid_side_base_voltage_in_kV(HVDC_CONVERT
     double V = converter_transformer_grid_side_base_voltage_in_kV[converter];
     if(V != 0.0)
         return V;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    return psdb.get_bus_base_voltage_in_kV(get_converter_bus(converter));
+    else
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        return psdb.get_bus_base_voltage_in_kV(get_converter_bus(converter));
+    }
 }
 
 double HVDC::get_converter_transformer_converter_side_base_voltage_in_kV(HVDC_CONVERTER_SIDE converter) const
@@ -941,7 +942,7 @@ void HVDC::clear()
 bool HVDC::is_connected_to_bus(size_t bus) const
 {
     if(get_converter_bus(RECTIFIER)==bus || get_converter_bus(INVERTER)==bus) return true;
-    else return false;
+    else                                                                      return false;
 }
 
 bool HVDC::is_in_area(size_t area) const
@@ -985,14 +986,13 @@ bool HVDC::is_in_zone(size_t zone) const
 void HVDC::report() const
 {
     ostringstream osstream;
-
     osstream<<"HVDC '"<<get_name()<<"': Rdc = "<<get_line_resistance_in_ohm()<<" ohm";
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     osstream<<"Vdc = "<<get_nominal_dc_voltage_per_pole_in_kV()<<" kV, "
-      <<"Idc = "<<get_nominal_dc_current_per_pole_in_kA()<<" kA, "
-      <<"Pdc = "<<get_nominal_dc_power_per_pole_in_MW()<<" MW";
+            <<"Idc = "<<get_nominal_dc_current_per_pole_in_kA()<<" kA, "
+            <<"Pdc = "<<get_nominal_dc_power_per_pole_in_MW()<<" MW";
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     osstream<<"Compensating R = "<<get_compensating_resistance_to_hold_dc_voltage_in_ohm()<<" ohm";
@@ -1003,7 +1003,7 @@ void HVDC::report() const
     osstream<<"AlphaMax = "<<get_converter_max_alpha_or_gamma_in_deg(RECTIFIER)<<" deg, AlphaMin = "<<get_converter_min_alpha_or_gamma_in_deg(RECTIFIER)<<" deg";
     toolkit.show_information_with_leading_time_stamp(osstream);
     osstream<<"Transformer grid side base = "<<get_converter_transformer_grid_side_base_voltage_in_kV(RECTIFIER)<<" kV, "
-      <<"converter side base = "<<get_converter_transformer_converter_side_base_voltage_in_kV(RECTIFIER)<<" kV";
+            <<"converter side base = "<<get_converter_transformer_converter_side_base_voltage_in_kV(RECTIFIER)<<" kV";
     toolkit.show_information_with_leading_time_stamp(osstream);
     osstream<<"Tap max = "<<get_converter_transformer_max_tap_in_pu(RECTIFIER)<<", tap min = "<<get_converter_transformer_min_tap_in_pu(RECTIFIER);
     toolkit.show_information_with_leading_time_stamp(osstream);
@@ -1015,7 +1015,7 @@ void HVDC::report() const
     osstream<<"GammaMax = "<<get_converter_max_alpha_or_gamma_in_deg(INVERTER)<<" deg, GammaMin = "<<get_converter_min_alpha_or_gamma_in_deg(INVERTER)<<" deg";
     toolkit.show_information_with_leading_time_stamp(osstream);
     osstream<<"Transformer grid side base = "<<get_converter_transformer_grid_side_base_voltage_in_kV(INVERTER)<<" kV, "
-      <<"converter side base = "<<get_converter_transformer_converter_side_base_voltage_in_kV(INVERTER)<<" kV";
+            <<"converter side base = "<<get_converter_transformer_converter_side_base_voltage_in_kV(INVERTER)<<" kV";
     toolkit.show_information_with_leading_time_stamp(osstream);
     osstream<<"Tap max = "<<get_converter_transformer_max_tap_in_pu(INVERTER)<<", tap min = "<<get_converter_transformer_min_tap_in_pu(INVERTER);
     toolkit.show_information_with_leading_time_stamp(osstream);
@@ -1030,15 +1030,15 @@ void HVDC::save() const
 
 void HVDC::set_model(const MODEL* model)
 {
-    ostringstream osstream;
-    if(model->get_model_type()=="AUXILIARY SIGNAL")
-        set_auxiliary_signal_model((AUXILIARY_SIGNAL_MODEL*) model);
+    if(model->get_model_type()=="HVDC")
+        set_hvdc_model((HVDC_MODEL*) model);
     else
     {
-        if(model->get_model_type()=="HVDC")
-            set_hvdc_model((HVDC_MODEL*) model);
+        if(model->get_model_type()=="AUXILIARY SIGNAL")
+            set_auxiliary_signal_model((AUXILIARY_SIGNAL_MODEL*) model);
         else
         {
+            ostringstream osstream;
             osstream<<"Waring. Neither AUXILIARY SIGNAL model nor HVDC model is given to set dynamic model for "<<get_device_name();
             STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
             toolkit.show_information_with_leading_time_stamp(osstream);
@@ -1048,93 +1048,98 @@ void HVDC::set_model(const MODEL* model)
 
 void HVDC::set_hvdc_model(const HVDC_MODEL* model)
 {
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    ostringstream osstream;
-    if(model->get_allowed_device_type()!="HVDC")
-    {
-        osstream<<"Waring. Dynamic model of device type "<<model->get_allowed_device_type()<<" is not allowed to set up HVDC model for "<<get_device_name()<<endl
-          <<"No HVDC model is set.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    if(model->get_model_type()!="HVDC")
+    if(model!=NULL)
     {
-        osstream<<"Waring. "<<model->get_model_type()<<" model is not allowed to set up HVDC model for "<<get_device_name()<<endl
-          <<"No HVDC model is set.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    HVDC_MODEL* oldmodel = get_hvdc_model();
-    if(oldmodel!=NULL)
-    {
-        delete oldmodel;
-        hvdc_model = NULL;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        ostringstream osstream;
+        if(model->get_allowed_device_type()=="HVDC")
+        {
+            if(model->get_model_type()=="HVDC")
+            {
+                HVDC_MODEL* oldmodel = get_hvdc_model();
+                if(oldmodel!=NULL)
+                {
+                    delete oldmodel;
+                    hvdc_model = NULL;
+                }
 
-    HVDC_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="CDC4T")
-    {
-        CDC4T* smodel = (CDC4T*) (model);
-        new_model = (HVDC_MODEL*) new CDC4T(*smodel);
-    }
-    if(model_name=="CDC6T")
-    {
-        CDC6T* smodel = (CDC6T*) (model);
-        new_model = (HVDC_MODEL*) new CDC6T(*smodel);
-    }
+                HVDC_MODEL *new_model = NULL;
+                string model_name = model->get_model_name();
+                if(model_name=="CDC4T")
+                {
+                    CDC4T* smodel = (CDC4T*) (model);
+                    new_model = (HVDC_MODEL*) new CDC4T(*smodel);
+                }
+                if(model_name=="CDC6T")
+                {
+                    CDC6T* smodel = (CDC6T*) (model);
+                    new_model = (HVDC_MODEL*) new CDC6T(*smodel);
+                }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        hvdc_model = new_model;
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append HVDC model of "<<get_device_name();
-        toolkit.show_information_with_leading_time_stamp(osstream);
+                if(new_model!=NULL)
+                {
+                    new_model->set_toolkit(toolkit);
+                    new_model->set_device_id(get_device_id());
+                    hvdc_model = new_model;
+                }
+                else
+                {
+                    ostringstream osstream;
+                    osstream<<"Warning. Model '"<<model_name<<"' is not supported when append HVDC model of "<<get_device_name();
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+            }
+            else
+            {
+                osstream<<"Waring. "<<model->get_model_type()<<" model is not allowed to set up HVDC model for "<<get_device_name()<<endl
+                        <<"No HVDC model is set.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Waring. Dynamic model of device type "<<model->get_allowed_device_type()<<" is not allowed to set up HVDC model for "<<get_device_name()<<endl
+                    <<"No HVDC model is set.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void HVDC::set_auxiliary_signal_model(const AUXILIARY_SIGNAL_MODEL* model)
 {
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    ostringstream osstream;
-    if(model->get_model_type()!="AUXILIARY SIGNAL")
-    {
-        osstream<<"Waring. "<< model->get_model_type()<<" model is not allowed to set up AUXILIARY SIGNAL model for "<<get_device_name()<<endl
-          <<"No AUXILIARY SIGNAL model is set.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    AUXILIARY_SIGNAL_MODEL* oldmodel = get_auxiliary_signal_model();
-    if(oldmodel!=NULL)
-    {
-        delete oldmodel;
-        auxiliary_signal_model = NULL;
-    }
-
-    AUXILIARY_SIGNAL_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        auxiliary_signal_model = new_model;
-    }
-    else
+    if(model != NULL)
     {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append AUXILIARY SIGNAL model of "<<get_device_name();
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        if(model->get_model_type()=="AUXILIARY SIGNAL")
+        {
+            AUXILIARY_SIGNAL_MODEL* oldmodel = get_auxiliary_signal_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                auxiliary_signal_model = NULL;
+            }
+
+            AUXILIARY_SIGNAL_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                auxiliary_signal_model = new_model;
+            }
+            else
+            {
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append AUXILIARY SIGNAL model of "<<get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Waring. "<< model->get_model_type()<<" model is not allowed to set up AUXILIARY SIGNAL model for "<<get_device_name()<<endl
+                    <<"No AUXILIARY SIGNAL model is set.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
@@ -1169,28 +1174,24 @@ AUXILIARY_SIGNAL_MODEL* HVDC::get_auxiliary_signal_model() const
 
 void HVDC::run(DYNAMIC_MODE mode)
 {
-    if(get_status()==false)
-        return;
-
-    switch(mode)
+    if(get_status()==true)
     {
-        case INITIALIZE_MODE:
+        switch(mode)
         {
-            HVDC_MODEL* hvdc_model = get_hvdc_model();
-            if(hvdc_model==NULL)
-                return;
-            hvdc_model->initialize();
-
-            break;
-        }
-        default:
-        {
-            HVDC_MODEL* hvdc_model = get_hvdc_model();
-            if(hvdc_model==NULL)
-                return;
-            hvdc_model->run(mode);
-
-            break;
+            case INITIALIZE_MODE:
+            {
+                HVDC_MODEL* hvdc_model = get_hvdc_model();
+                if(hvdc_model!=NULL)
+                    hvdc_model->initialize();
+                break;
+            }
+            default:
+            {
+                HVDC_MODEL* hvdc_model = get_hvdc_model();
+                if(hvdc_model!=NULL)
+                    hvdc_model->run(mode);
+                break;
+            }
         }
     }
 }
@@ -1280,16 +1281,12 @@ DEVICE_ID HVDC::get_device_id() const
 void HVDC::solve_steady_state()
 {
     ostringstream osstream;
-
-    //os<<"Solve "<<get_device_name()<<endl;
-    //show_information_with_leading_time_stamp(osstream);
-
     HVDC_OPERATION_MODE r_mode = get_converter_operation_mode(RECTIFIER), i_mode = get_converter_operation_mode(INVERTER);
 
     if(r_mode != RECTIFIER_CONSTANT_POWER and r_mode != RECTIFIER_CONSTANT_CURRENT)
     {
         osstream<<"Warning. Rectifier of "<<get_device_name()<<" is not in either RECTIFIER_CONSTANT_POWER or"
-                     " RECTIFIER_CONSTANT_CURRENT mode."<<endl<<"HVDC will not be solved.";
+                " RECTIFIER_CONSTANT_CURRENT mode."<<endl<<"HVDC will not be solved.";
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         toolkit.show_information_with_leading_time_stamp(osstream);
         return;
@@ -1298,7 +1295,7 @@ void HVDC::solve_steady_state()
     if(i_mode != INVERTER_CONSTANT_VOLTAGE and r_mode != INVERTER_CONSTANT_GAMMA)
     {
         osstream<<"Warning. Inverter of "<<get_device_name()<<" is not in either INVERTER_CONSTANT_VOLTAGE or"
-                     " INVERTER_CONSTANT_GAMMA mode."<<endl<<"HVDC will not be solved.";
+                " INVERTER_CONSTANT_GAMMA mode."<<endl<<"HVDC will not be solved.";
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         toolkit.show_information_with_leading_time_stamp(osstream);
         return;
@@ -1318,18 +1315,14 @@ void HVDC::solve_steady_state()
         else
             solve_as_rectifier_regulating_current_and_inverter_regulating_gamma();
     }
-    //os<<"AC power at rectifier side: "<<get_converter_ac_active_power_in_MW(RECTIFIER)<<" MW, "<<get_converter_ac_reactive_power_in_MVar(RECTIFIER)<<" MVar."<<endl;
-    //os<<"AC power at inverter side: "<<get_converter_ac_active_power_in_MW(INVERTER)<<" MW, "<<get_converter_ac_reactive_power_in_MVar(INVERTER)<<" MVar."<<endl;
-    //show_information_with_leading_time_stamp(osstream);
 }
 
 void HVDC::show_solved_hvdc_steady_state() const
 {
-    ostringstream osstream;
-
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
+    ostringstream osstream;
     osstream<<"Solved steady state of HVDC '"<<get_name()<<"':";
     toolkit.show_information_with_leading_time_stamp(osstream);
 
@@ -1372,26 +1365,25 @@ void HVDC::show_solved_hvdc_steady_state() const
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     osstream<<"Vdc = "<<get_converter_dc_voltage_in_kV(converter)<<" kV, "
-      <<"Vac = "<<psdb.get_bus_voltage_in_kV(get_converter_bus(converter))<<" kV";
+            <<"Vac = "<<psdb.get_bus_voltage_in_kV(get_converter_bus(converter))<<" kV";
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     osstream<<"Transformer tap = "<<get_converter_transformer_tap_in_pu(converter)<<" pu.";
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     osstream<<"alpha = "<<get_converter_alpha_or_gamma_in_deg(converter)<<" deg, "
-      <<"mu = "<<get_converter_commutating_overlap_angle_in_deg(converter)<<" deg";
+            <<"mu = "<<get_converter_commutating_overlap_angle_in_deg(converter)<<" deg";
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     osstream<<"Rectifier AC current = "<<get_converter_ac_current_in_kA(converter)<<" kA.";
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     osstream<<"Pdc = "<<get_converter_dc_power_in_MW(converter)<<" MW, "
-      <<"Pac = "<<get_converter_ac_active_power_in_MW(converter)<<" MW, "
-      <<"Qac = "<<get_converter_ac_reactive_power_in_MVar(converter)<<" MVar, "
-      <<"Eta = "<<get_converter_ac_power_factor(converter);
+            <<"Pac = "<<get_converter_ac_active_power_in_MW(converter)<<" MW, "
+            <<"Qac = "<<get_converter_ac_reactive_power_in_MVar(converter)<<" MVar, "
+            <<"Eta = "<<get_converter_ac_power_factor(converter);
     toolkit.show_information_with_leading_time_stamp(osstream);
 
-
     converter = INVERTER;
     mode = get_converter_operation_mode(converter);
     switch(mode)
@@ -1420,30 +1412,29 @@ void HVDC::show_solved_hvdc_steady_state() const
             osstream<<"Mode "<<mode<<" is not supported for inverter side of "<<get_device_name()<<endl
                     <<"This line should never appear. If you find it, ask for help.";
             toolkit.show_information_with_leading_time_stamp(osstream);
-        }
-
+        }
     }
     osstream<<"Rectifier: "<<modestr;
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     osstream<<"Vdc = "<<get_converter_dc_voltage_in_kV(converter)<<" kV, "
-      <<"Vac = "<<psdb.get_bus_voltage_in_kV(get_converter_bus(converter))<<" kV";
+            <<"Vac = "<<psdb.get_bus_voltage_in_kV(get_converter_bus(converter))<<" kV";
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     osstream<<"Transformer tap = "<<get_converter_transformer_tap_in_pu(converter)<<" pu.";
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     osstream<<"gamma = "<<get_converter_alpha_or_gamma_in_deg(converter)<<" deg, "
-      <<"mu = "<<get_converter_commutating_overlap_angle_in_deg(converter)<<" deg";
+            <<"mu = "<<get_converter_commutating_overlap_angle_in_deg(converter)<<" deg";
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     osstream<<"Inverter AC current = "<<get_converter_ac_current_in_kA(converter)<<" kA.";
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     osstream<<"Pdc = "<<get_converter_dc_power_in_MW(converter)<<" MW, "
-      <<"Pac = "<<get_converter_ac_active_power_in_MW(converter)<<" MW, "
-      <<"Qac = "<<get_converter_ac_reactive_power_in_MVar(converter)<<" MVar, "
-      <<"Eta = "<<get_converter_ac_power_factor(converter);
+            <<"Pac = "<<get_converter_ac_active_power_in_MW(converter)<<" MW, "
+            <<"Qac = "<<get_converter_ac_reactive_power_in_MVar(converter)<<" MVar, "
+            <<"Eta = "<<get_converter_ac_power_factor(converter);
     toolkit.show_information_with_leading_time_stamp(osstream);
 }
 
@@ -1463,7 +1454,6 @@ void HVDC::set_converter_transformer_tap_in_pu(HVDC_CONVERTER_SIDE converter, do
         converter_transformer_tap_in_pu[converter] = 1.0;
 }
 
-
 void HVDC::set_converter_dc_voltage_in_kV(HVDC_CONVERTER_SIDE converter, const double V)
 {
     if(V>=0.0)
@@ -1472,7 +1462,6 @@ void HVDC::set_converter_dc_voltage_in_kV(HVDC_CONVERTER_SIDE converter, const d
         converter_dc_voltage_in_kV[converter] = 0.0;
 }
 
-
 void HVDC::set_line_dc_current_in_kA(const double I)
 {
     set_converter_dc_current_in_kA(RECTIFIER, I);
@@ -1494,7 +1483,6 @@ double HVDC::get_converter_transformer_tap_in_pu(HVDC_CONVERTER_SIDE converter)
     return converter_transformer_tap_in_pu[converter];
 }
 
-
 double HVDC::get_converter_commutating_overlap_angle_in_deg(HVDC_CONVERTER_SIDE converter) const
 {
     ostringstream osstream;
@@ -1579,10 +1567,10 @@ double HVDC::get_converter_ac_apparent_power_in_MVA(HVDC_CONVERTER_SIDE converte
 {
     double Pac = get_converter_ac_active_power_in_MW(converter);
     double pf = get_converter_ac_power_factor(converter);
-    if(pf==0.0)
-        return Pac;
-    else
+    if(pf!=0.0)
         return Pac/pf;
+    else
+        return Pac;
 /*
     double Iac = get_converter_ac_current_in_kA(converter);
     double U = psdb.get_bus_voltage_in_kV(get_converter_bus(converter));
@@ -1784,7 +1772,6 @@ void HVDC::solve_best_converter_transformer_tap_with_min_angle(HVDC_CONVERTER_SI
     //show_information_with_leading_time_stamp(osstream);
 
     set_converter_transformer_tap_in_pu(converter, Tap);
-    return;
 }
 
 void HVDC::solve_as_rectifier_regulating_current_and_inverter_regulating_voltage()
@@ -1906,11 +1893,10 @@ void HVDC::solve_as_rectifier_regulating_power_and_inverter_regulating_gamma()
         TapR =  get_converter_transformer_tap_in_pu(RECTIFIER);
         // with Tap, solve alpha
         cosAlpha = solve_desired_converter_cosAngle_with_desired_dc_voltage_current_and_transformer_tap(RECTIFIER, VdcR, Idc, TapR);
-        if(cosAlpha<cos(alpha_min))
-            //solved
-            set_converter_alpha_or_gamma_in_deg(RECTIFIER, rad2deg(acos(cosAlpha)));
-        else
+        if(cosAlpha>=cos(alpha_min))
             set_converter_alpha_or_gamma_in_deg(RECTIFIER, get_converter_min_alpha_or_gamma_in_deg(RECTIFIER));
+        else//solved
+            set_converter_alpha_or_gamma_in_deg(RECTIFIER, rad2deg(acos(cosAlpha)));
     }
     else //RECTIFIER
     {
@@ -1925,10 +1911,10 @@ void HVDC::solve_as_rectifier_regulating_power_and_inverter_regulating_gamma()
         TapR = get_converter_transformer_tap_in_pu(RECTIFIER);
         // solve cosAlpha
         cosAlpha = solve_desired_converter_cosAngle_with_desired_dc_voltage_current_and_transformer_tap(RECTIFIER, VdcR, Idc, TapR);
-        if(cosAlpha<cos(alpha_min))
-            set_converter_alpha_or_gamma_in_deg(RECTIFIER, rad2deg(cosAlpha));
-        else
+        if(cosAlpha>=cos(alpha_min))
             set_converter_alpha_or_gamma_in_deg(RECTIFIER, get_converter_min_alpha_or_gamma_in_deg(RECTIFIER));
+        else
+            set_converter_alpha_or_gamma_in_deg(RECTIFIER, rad2deg(cosAlpha));
     }
     solve_with_solved_tap_and_firing_angle();
 }
@@ -1965,11 +1951,10 @@ void HVDC::solve_as_rectifier_regulating_current_and_inverter_regulating_gamma()
     double TapR = get_converter_transformer_tap_in_pu(RECTIFIER);
     // with Tap, solve alpha
     cosAlpha = solve_desired_converter_cosAngle_with_desired_dc_voltage_current_and_transformer_tap(RECTIFIER, VdcR, Idc, TapR);
-    if(cosAlpha<cos(alpha_min))
-        //solved
-        set_converter_alpha_or_gamma_in_deg(RECTIFIER, rad2deg(acos(cosAlpha)));
-    else
+    if(cosAlpha>=cos(alpha_min))
         set_converter_alpha_or_gamma_in_deg(RECTIFIER, get_converter_min_alpha_or_gamma_in_deg(RECTIFIER));
+    else//solved
+        set_converter_alpha_or_gamma_in_deg(RECTIFIER, rad2deg(acos(cosAlpha)));
 
     solve_with_solved_tap_and_firing_angle();
 }
@@ -2005,12 +1990,10 @@ void HVDC::solve_as_rectifier_regulating_alpha_and_inverter_regulating_current()
     // with Tap, solve alpha
     double cosGamma = solve_desired_converter_cosAngle_with_desired_dc_voltage_current_and_transformer_tap(INVERTER, VdcI, Idc, TapI);
 
-    if(cosGamma<cos(gamma_min))
-        //solved
-        set_converter_alpha_or_gamma_in_deg(INVERTER, rad2deg(acos(cosGamma)));
-    else
+    if(cosGamma>=cos(gamma_min))
         set_converter_alpha_or_gamma_in_deg(INVERTER, get_converter_min_alpha_or_gamma_in_deg(INVERTER));
-
+    else//solved
+        set_converter_alpha_or_gamma_in_deg(INVERTER, rad2deg(acos(cosGamma)));
 
     solve_with_solved_tap_and_firing_angle();
 }
@@ -2127,12 +2110,14 @@ double HVDC::solve_converter_dc_voltage_in_kV_with_dc_current_and_transformer_ta
 
 complex<double> HVDC::get_converter_dynamic_current_in_pu_based_on_system_base_power(HVDC_CONVERTER_SIDE converter)
 {
-    if(get_status()==false)
-        return 0.0;
-
-    HVDC_MODEL* model = get_hvdc_model();
-    if(model==NULL)
+    if(get_status() == true)
+    {
+        HVDC_MODEL* model = get_hvdc_model();
+        if(model!=NULL)
+            return model->get_converter_ac_current_in_pu(converter);
+        else
+            return 0.0;
+    }
+    else
         return 0.0;
-
-    return model->get_converter_ac_current_in_pu(converter);
 }
diff --git a/code/source/device/line.cpp b/code/source/device/line.cpp
index 8a56f169..e258df31 100644
--- a/code/source/device/line.cpp
+++ b/code/source/device/line.cpp
@@ -20,53 +20,53 @@ void LINE::set_sending_side_bus(size_t bus)
 {
     ostringstream osstream;
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(bus==0)
+    if(bus!=0)
     {
-        osstream<<"Warning. Zero bus number (0) is not allowed for setting up sending side bus of line."<<endl
-          <<"0 will be set to indicate invalid transmission line.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        sending_side_bus = 0;
-        return;
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        if(psdb.is_bus_exist(bus))
+            sending_side_bus = bus;
+        else
+        {
+            osstream<<"Warning. Bus "<<bus<<" does not exist for setting up sending side bus of line."<<endl
+              <<"0 will be set to indicate invalid transmission line.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            sending_side_bus = 0;
+        }
     }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    if(not psdb.is_bus_exist(bus))
+    else
     {
-        osstream<<"Warning. Bus "<<bus<<" does not exist for setting up sending side bus of line."<<endl
+        osstream<<"Warning. Zero bus number (0) is not allowed for setting up sending side bus of line."<<endl
           <<"0 will be set to indicate invalid transmission line.";
         toolkit.show_information_with_leading_time_stamp(osstream);
         sending_side_bus = 0;
-        return;
     }
-    sending_side_bus = bus;
 }
 
 void LINE::set_receiving_side_bus(size_t bus)
 {
     ostringstream osstream;
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    if(bus==0)
+    if(bus!=0)
     {
-        osstream<<"Warning. Zero bus number (0) is not allowed for setting up receiving side bus of line."<<endl
-          <<"0 will be set to indicate invalid transmission line.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        receiving_side_bus = 0;
-        return;
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        if(psdb.is_bus_exist(bus))
+            receiving_side_bus = bus;
+        else
+        {
+            osstream<<"Warning. Bus "<<bus<<" does not exist for setting up receiving side bus of line."<<endl
+                    <<"0 will be set to indicate invalid transmission line.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            receiving_side_bus = 0;
+            return;
+        }
     }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    if(not psdb.is_bus_exist(bus))
+    else
     {
-        osstream<<"Warning. Bus "<<bus<<" does not exist for setting up receiving side bus of line."<<endl
-          <<"0 will be set to indicate invalid transmission line.";
+        osstream<<"Warning. Zero bus number (0) is not allowed for setting up receiving side bus of line."<<endl
+                <<"0 will be set to indicate invalid transmission line.";
         toolkit.show_information_with_leading_time_stamp(osstream);
         receiving_side_bus = 0;
-        return;
     }
-    receiving_side_bus = bus;
 }
 
 void LINE::set_identifier(string line_id)
@@ -132,7 +132,7 @@ void LINE::set_rating(RATING line_rating)
 void LINE::set_meter_end_bus(size_t meter_bus)
 {
     if(meter_bus == get_receiving_side_bus()) meter_end_bus = get_receiving_side_bus();
-    else                                 meter_end_bus = get_sending_side_bus();
+    else                                      meter_end_bus = get_sending_side_bus();
 }
 
 void LINE::set_length(double line_length)
@@ -226,7 +226,7 @@ bool LINE::is_zero_impedance_line() const
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
     double z_th = psdb.get_zero_impedance_threshold_in_pu();
     double y = abs(get_line_positive_sequence_y_in_pu());
-    double z= abs(get_line_positive_sequence_z_in_pu());
+    double z = abs(get_line_positive_sequence_z_in_pu());
     if(y<FLOAT_EPSILON and (z<=z_th or (z-z_th)<FLOAT_EPSILON))
         return true;
     else
@@ -235,93 +235,95 @@ bool LINE::is_zero_impedance_line() const
 
 void LINE::set_fault(size_t to_bus, double location, FAULT& fault)
 {
-    ostringstream osstream;
-    if(not is_connected_to_bus(to_bus))
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(location<0.0 or location>1.0)
+    if(is_connected_to_bus(to_bus))
     {
-        osstream<<"Warning. Fault location ("<<location<<") is out of allowed range [0.0, 1.0] for "<<get_device_name()<<"."<<endl
-               <<"No fault will be set.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        ostringstream osstream;
+        if(location<0.0 or location>1.0)
+        {
+            osstream<<"Warning. Fault location ("<<location<<") is out of allowed range [0.0, 1.0] for "<<get_device_name()<<"."<<endl
+                    <<"No fault will be set.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            return;
+        }
 
-    if(not fault.is_faulted())
-    {
-        osstream<<"Warning. Given fault is not faulted for "<<get_device_name()<<"."<<endl
-               <<"No fault will be set.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
+        if(not fault.is_faulted())
+        {
+            osstream<<"Warning. Given fault is not faulted for "<<get_device_name()<<"."<<endl
+                   <<"No fault will be set.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            return;
+        }
 
-    string fault_type = fault.get_fault_type_string();
+        string fault_type = fault.get_fault_type_string();
 
-    complex<double> y = fault.get_fault_shunt_in_pu();
-    osstream<<fault_type<<" fault is set for "<<get_device_name()<<"."<<endl
-           <<"Fault shunt is "<<y<<" pu at location "<<location<<" to bus "<<to_bus;
+        complex<double> y = fault.get_fault_shunt_in_pu();
+        osstream<<fault_type<<" fault is set for "<<get_device_name()<<"."<<endl
+               <<"Fault shunt is "<<y<<" pu at location "<<location<<" to bus "<<to_bus;
 
-    if(to_bus == get_receiving_side_bus())
-        location = 1.0-location;
+        if(to_bus == get_receiving_side_bus())
+            location = 1.0-location;
 
-    map<double,FAULT>::iterator iter;
-    for(iter=faults.begin(); iter!=faults.end(); ++iter)
-    {
-        if(fabs(iter->first-location)<FLOAT_EPSILON)
-            break;
-    }
-    if(iter!=faults.end())
-    {
-        osstream<<"Fault at location "<<location<<" (to sending side bus) already exist for "<<get_device_name()<<"."<<endl
-              <<"Setting fault at this location will remove the previous one";
-        iter->second = fault;
-    }
-    else
-    {
-        faults.insert(pair<double,FAULT>(location, fault));
+        map<double,FAULT>::iterator iter;
+        for(iter=faults.begin(); iter!=faults.end(); ++iter)
+        {
+            if(fabs(iter->first-location)<FLOAT_EPSILON)
+                break;
+        }
+        if(iter!=faults.end())
+        {
+            osstream<<"Fault at location "<<location<<" (to sending side bus) already exist for "<<get_device_name()<<"."<<endl
+                  <<"Setting fault at this location will remove the previous one";
+            iter->second = fault;
+        }
+        else
+        {
+            faults.insert(pair<double,FAULT>(location, fault));
+        }
+        toolkit.show_information_with_leading_time_stamp(osstream);
     }
-    toolkit.show_information_with_leading_time_stamp(osstream);
 }
 
 double LINE::get_fault_location_of_fault(size_t index) const
 {
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    ostringstream osstream;
-    if(index>=get_fault_count())
+    if(index<get_fault_count())
+    {
+        map<double,FAULT>::const_iterator iter=faults.begin();
+
+        for(size_t i=0; i!=index; ++i)
+            ++iter;
+
+        return iter->first;
+    }
+    else
     {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        ostringstream osstream;
         osstream<<"Invalid index ("<<index<<") was given to get fault location. [0, "<<faults.size()<<") is allowed.";
         toolkit.show_information_with_leading_time_stamp(osstream);
         return 9999.9;
     }
-    map<double,FAULT>::const_iterator iter=faults.begin();
-
-    for(size_t i=0; i!=index; ++i)
-		++iter;
-
-    return iter->first;
 }
 
 FAULT LINE::get_fault_at_location(size_t to_bus, double location) const
 {
     FAULT nofault;
-    if(not is_connected_to_bus(to_bus))
-        return nofault;
-
-    if(location<0.0 or location>1.0)
-        return nofault;
-
-    if(to_bus == get_receiving_side_bus())
-        location = 1.0-location;
-
-    map<double,FAULT>::const_iterator iter;
-    for(iter=faults.begin(); iter!=faults.end(); ++iter)
+    if(is_connected_to_bus(to_bus) and (location>=0.0 and location<=1.0))
     {
-        if(fabs(iter->first-location)<FLOAT_EPSILON)
-            break;
+        if(to_bus == get_receiving_side_bus())
+            location = 1.0-location;
+
+        map<double,FAULT>::const_iterator iter;
+        for(iter=faults.begin(); iter!=faults.end(); ++iter)
+        {
+            if(fabs(iter->first-location)<FLOAT_EPSILON)
+                break;
+        }
+        if(iter!=faults.end())
+            return iter->second;
+        else
+            return nofault;
     }
-    if(iter!=faults.end())
-        return iter->second;
     else
         return nofault;
 }
@@ -333,38 +335,35 @@ void LINE::clear_all_faults()
 
 void LINE::clear_fault_at_location(size_t to_bus, double location)
 {
-    if(not is_connected_to_bus(to_bus))
-        return;
-
-    if(location<0.0 or location>1.0)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    if(to_bus == get_receiving_side_bus())
-        location = 1.0-location;
-
-    map<double,FAULT>::iterator iter;
-    for(iter=faults.begin(); iter!=faults.end(); ++iter)
-    {
-        if(fabs(iter->first-location)<FLOAT_EPSILON)
-            break;
-    }
-    if(iter!=faults.end())
+    if(is_connected_to_bus(to_bus) and (location>=0.0 and location<=1.0))
     {
-        ostringstream osstream;
-        FAULT fault = iter->second;
-        string fault_type_str = fault.get_fault_type_string();
-        complex<double> y = fault.get_fault_shunt_in_pu();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-        if(to_bus==get_sending_side_bus())
-            osstream<<fault_type_str<<" is cleared for "<<get_device_name()<<endl
-              <<"Fault shunt "<<y<<" pu at location "<<location<<" to bus "<<get_sending_side_bus()<<".";
-        else
-            osstream<<fault_type_str<<" is cleared for "<<get_device_name()<<endl
-              <<"Fault shunt "<<y<<" pu at location "<<1.0-location<<" to bus "<<get_receiving_side_bus()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        faults.erase(iter);
+        if(to_bus == get_receiving_side_bus())
+            location = 1.0-location;
+
+        map<double,FAULT>::iterator iter;
+        for(iter=faults.begin(); iter!=faults.end(); ++iter)
+        {
+            if(fabs(iter->first-location)<FLOAT_EPSILON)
+                break;
+        }
+        if(iter!=faults.end())
+        {
+            ostringstream osstream;
+            FAULT fault = iter->second;
+            string fault_type_str = fault.get_fault_type_string();
+            complex<double> y = fault.get_fault_shunt_in_pu();
+
+            if(to_bus==get_sending_side_bus())
+                osstream<<fault_type_str<<" is cleared for "<<get_device_name()<<endl
+                  <<"Fault shunt "<<y<<" pu at location "<<location<<" to bus "<<get_sending_side_bus()<<".";
+            else
+                osstream<<fault_type_str<<" is cleared for "<<get_device_name()<<endl
+                  <<"Fault shunt "<<y<<" pu at location "<<1.0-location<<" to bus "<<get_receiving_side_bus()<<".";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            faults.erase(iter);
+        }
     }
 }
 
@@ -430,8 +429,8 @@ void LINE::clear()
 
 bool LINE::is_connected_to_bus(size_t bus) const
 {
-    if(get_sending_side_bus()==bus || get_receiving_side_bus()==bus) return true;
-    else return false;
+    if(get_sending_side_bus()==bus or get_receiving_side_bus()==bus) return true;
+    else                                                             return false;
 }
 
 bool LINE::is_in_area(size_t area) const
@@ -596,50 +595,54 @@ complex<double> LINE::get_line_complex_voltage_at_receiving_side_in_kV() const
 
 complex<double> LINE::get_line_complex_current_at_sending_side_in_pu() const
 {
-    if(get_sending_side_breaker_status()==false)
-        return 0.0;
-
-    complex<double> Z = get_line_positive_sequence_z_in_pu();
-    complex<double> Y = get_line_positive_sequence_y_in_pu();
-    complex<double> Ys = 0.5*Y + get_shunt_positive_sequence_y_at_sending_side_in_pu();
-    complex<double> Yr = 0.5*Y + get_shunt_positive_sequence_y_at_receiving_side_in_pu();
+    if(get_sending_side_breaker_status()==true)
+    {
+        complex<double> Z = get_line_positive_sequence_z_in_pu();
+        complex<double> Y = get_line_positive_sequence_y_in_pu();
+        complex<double> Ys = 0.5*Y + get_shunt_positive_sequence_y_at_sending_side_in_pu();
+        complex<double> Yr = 0.5*Y + get_shunt_positive_sequence_y_at_receiving_side_in_pu();
 
-    complex<double> Vs = get_line_complex_voltage_at_sending_side_in_pu();
+        complex<double> Vs = get_line_complex_voltage_at_sending_side_in_pu();
 
-    if(get_receiving_side_breaker_status()==false)
-    {
-        complex<double> Yeq = Ys+1.0/(Z+1.0/Yr);
-        return Vs*Yeq;
+        if(get_receiving_side_breaker_status()==true)
+        {
+            complex<double> Vr = get_line_complex_voltage_at_receiving_side_in_pu();
+            return (Vs-Vr)/Z+Vs*Ys;
+        }
+        else
+        {
+            complex<double> Yeq = Ys+1.0/(Z+1.0/Yr);
+            return Vs*Yeq;
+        }
     }
     else
-    {
-        complex<double> Vr = get_line_complex_voltage_at_receiving_side_in_pu();
-        return (Vs-Vr)/Z+Vs*Ys;
-    }
+        return 0.0;
 }
 
 complex<double> LINE::get_line_complex_current_at_receiving_side_in_pu() const
 {
-    if(get_receiving_side_breaker_status()==false)
-        return 0.0;
-
-    complex<double> Z = get_line_positive_sequence_z_in_pu();
-    complex<double> Y = get_line_positive_sequence_y_in_pu();
-    complex<double> Ys = 0.5*Y + get_shunt_positive_sequence_y_at_sending_side_in_pu();
-    complex<double> Yr = 0.5*Y + get_shunt_positive_sequence_y_at_receiving_side_in_pu();
+    if(get_receiving_side_breaker_status()==true)
+    {
+        complex<double> Z = get_line_positive_sequence_z_in_pu();
+        complex<double> Y = get_line_positive_sequence_y_in_pu();
+        complex<double> Ys = 0.5*Y + get_shunt_positive_sequence_y_at_sending_side_in_pu();
+        complex<double> Yr = 0.5*Y + get_shunt_positive_sequence_y_at_receiving_side_in_pu();
 
 
-    complex<double> Vr = get_line_complex_voltage_at_receiving_side_in_pu();
-    if(get_sending_side_breaker_status()==false)
-    {
-        complex<double> Yeq = Yr+1.0/(Z+1.0/Ys);
-        return Vr*Yeq;
+        complex<double> Vr = get_line_complex_voltage_at_receiving_side_in_pu();
+        if(get_sending_side_breaker_status()==true)
+        {
+            complex<double> Vs = get_line_complex_voltage_at_sending_side_in_pu();
+            return (Vr-Vs)/Z+Vr*Yr;
+        }
+        else
+        {
+            complex<double> Yeq = Yr+1.0/(Z+1.0/Ys);
+            return Vr*Yeq;
+        }
     }
     else
-    {
-        complex<double> Vs = get_line_complex_voltage_at_sending_side_in_pu();
-        return (Vr-Vs)/Z+Vr*Yr;
-    }
+        return 0.0;
 }
 
 complex<double> LINE::get_line_complex_current_at_sending_side_in_kA() const
@@ -698,18 +701,18 @@ complex<double> LINE::get_line_complex_power_at_receiving_side_in_MVA() const
 
 complex<double> LINE::get_line_complex_apparent_impedance_at_sending_side_in_pu() const
 {
-    if(get_sending_side_breaker_status()==false)
-        return INFINITE_THRESHOLD;
-    else
+    if(get_sending_side_breaker_status()==true)
         return get_line_complex_voltage_at_sending_side_in_pu()/get_line_complex_current_at_sending_side_in_pu();
+    else
+        return INFINITE_THRESHOLD;
 }
 
 complex<double> LINE::get_line_complex_apparent_impedance_at_receiving_side_in_pu() const
 {
-    if(get_receiving_side_breaker_status()==false)
-        return INFINITE_THRESHOLD;
-    else
+    if(get_receiving_side_breaker_status()==true)
         return get_line_complex_voltage_at_receiving_side_in_pu()/get_line_complex_current_at_receiving_side_in_pu();
+    else
+        return INFINITE_THRESHOLD;
 }
 
 complex<double> LINE::get_line_complex_apparent_impedance_at_sending_side_in_ohm() const
@@ -719,14 +722,14 @@ complex<double> LINE::get_line_complex_apparent_impedance_at_sending_side_in_ohm
 
     double mvabase = psdb.get_system_base_power_in_MVA();
 
-    if(get_sending_side_breaker_status()==false)
-        return INDEX_NOT_EXIST;
-    else
+    if(get_sending_side_breaker_status()==true)
     {
         double Vbase_kV = get_line_base_voltage_in_kV();
         double Zbase_ohm = Vbase_kV*Vbase_kV/mvabase;
         return get_line_complex_apparent_impedance_at_sending_side_in_pu()*Zbase_ohm;
     }
+    else
+        return INDEX_NOT_EXIST;
 }
 
 complex<double> LINE::get_line_complex_apparent_impedance_at_receiving_side_in_ohm() const
@@ -738,14 +741,14 @@ complex<double> LINE::get_line_complex_apparent_impedance_at_receiving_side_in_o
 
     mvabase = psdb.get_system_base_power_in_MVA();
 
-    if(get_receiving_side_breaker_status()==false)
-        return INFINITE_THRESHOLD;
-    else
+    if(get_receiving_side_breaker_status()==true)
     {
         double Vbase_kV = get_line_base_voltage_in_kV();
         double Zbase_ohm = Vbase_kV*Vbase_kV/mvabase;
         return get_line_complex_apparent_impedance_at_receiving_side_in_pu()*Zbase_ohm;
     }
+    else
+        return INFINITE_THRESHOLD;
 }
 
 
diff --git a/code/source/device/load.cpp b/code/source/device/load.cpp
index f5522c18..047d916e 100644
--- a/code/source/device/load.cpp
+++ b/code/source/device/load.cpp
@@ -39,26 +39,28 @@ void LOAD::set_load_bus(size_t load_bus)
     ostringstream osstream;
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    if(load_bus==0)
+    if(load_bus!=0)
     {
-        osstream<<"Warning. Zero bus number (0) is not allowed for setting up load bus."<<endl
-          <<"0 will be set to indicate invalid load.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+
+        if(not psdb.is_bus_exist(load_bus))
+        {
+            osstream<<"Bus "<<load_bus<<" does not exist for setting up load."<<endl
+              <<"0 will be set to indicate invalid load.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            this->bus = 0;
+            return;
+        }
         this->bus = load_bus;
-        return;
     }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    if(not psdb.is_bus_exist(load_bus))
+    else
     {
-        osstream<<"Bus "<<load_bus<<" does not exist for setting up load."<<endl
+        osstream<<"Warning. Zero bus number (0) is not allowed for setting up load bus."<<endl
           <<"0 will be set to indicate invalid load.";
         toolkit.show_information_with_leading_time_stamp(osstream);
-        this->bus = 0;
+        this->bus = load_bus;
         return;
     }
-    this->bus = load_bus;
 }
 
 void LOAD::set_identifier(string load_id)
@@ -274,92 +276,101 @@ complex<double> LOAD::get_actual_total_load_in_MVA() const
 
 complex<double> LOAD::get_actual_constant_power_load_in_MVA() const
 {
-    ostringstream osstream;
+    if(get_status() == true)
+    {
+        complex<double> S0 = get_nominal_constant_power_load_in_MVA();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    if(get_status() == false)
-        return 0.0;
+        BUS* busptr = psdb.get_bus(get_load_bus());
+        if(busptr!=NULL)
+        {
+            double v = busptr->get_voltage_in_pu();
 
-    complex<double> S0 = get_nominal_constant_power_load_in_MVA();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            complex<double> s;
+            if(v>=get_voltage_threshold_of_constant_power_load_in_pu())
+                s = S0;
+            else
+                s = S0/get_voltage_threshold_of_constant_power_load_in_pu()*v;
 
-    BUS* busptr = psdb.get_bus(get_load_bus());
-    if(busptr==NULL)
-    {
-        osstream<<"Bus "<<get_load_bus()<<" is not found in power system database '"<<psdb.get_system_name()<<"'."<<endl
-          <<get_device_name()<<" actual constant power load will be returned as it nominal power.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return S0;
+            return s;
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Bus "<<get_load_bus()<<" is not found in power system database '"<<psdb.get_system_name()<<"'."<<endl
+              <<get_device_name()<<" actual constant power load will be returned as it nominal power.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            return S0;
+        }
     }
-
-    double v = busptr->get_voltage_in_pu();
-
-    complex<double> s;
-    if(v>=get_voltage_threshold_of_constant_power_load_in_pu())
-        s = S0;
     else
-        s = S0/get_voltage_threshold_of_constant_power_load_in_pu()*v;
-
-    return s;
+        return 0.0;
 }
 
 complex<double> LOAD::get_actual_constant_current_load_in_MVA() const
 {
-    ostringstream osstream;
-
-    if(get_status() == false)
-        return 0.0;
-
-    complex<double> S0 = get_nominal_constant_current_load_in_MVA();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    BUS* busptr = psdb.get_bus(get_load_bus());
-    if(busptr==NULL)
+    if(get_status() == true)
     {
-        osstream<<"Bus "<<get_load_bus()<<" is not found in power system database '"<<psdb.get_system_name()<<"'."<<endl
-          <<get_device_name()<<" actual constant current load will be returned as it nominal power.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return S0;
-    }
+        complex<double> S0 = get_nominal_constant_current_load_in_MVA();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    double v = busptr->get_voltage_in_pu();
+        BUS* busptr = psdb.get_bus(get_load_bus());
+        if(busptr!=NULL)
+        {
+            double v = busptr->get_voltage_in_pu();
 
-    complex<double> s = S0*v;
-    return s;
+            complex<double> s = S0*v;
+            return s;
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Bus "<<get_load_bus()<<" is not found in power system database '"<<psdb.get_system_name()<<"'."<<endl
+              <<get_device_name()<<" actual constant current load will be returned as it nominal power.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            return S0;
+        }
+    }
+    else
+        return 0.0;
 }
 
 complex<double> LOAD::get_actual_constant_impedance_load_in_MVA() const
 {
-    ostringstream osstream;
-
-    if(get_status() == false)
-        return 0.0;
-
-    complex<double> S0 = get_nominal_constant_impedance_load_in_MVA();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    BUS* busptr = psdb.get_bus(get_load_bus());
-    if(busptr==NULL)
+    if(get_status() == true)
     {
-        osstream<<"Bus "<<get_load_bus()<<" is not found in power system database '"<<psdb.get_system_name()<<"'."<<endl
-          <<get_device_name()<<" actual constant impedance load will be returned as it nominal power.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return S0;
-    }
+        complex<double> S0 = get_nominal_constant_impedance_load_in_MVA();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    double v = busptr->get_voltage_in_pu();
+        BUS* busptr = psdb.get_bus(get_load_bus());
+        if(busptr!=NULL)
+        {
+            double v = busptr->get_voltage_in_pu();
 
-    complex<double> s = S0*v*v;
-    return s;
+            complex<double> s = S0*v*v;
+            return s;
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Bus "<<get_load_bus()<<" is not found in power system database '"<<psdb.get_system_name()<<"'."<<endl
+              <<get_device_name()<<" actual constant impedance load will be returned as it nominal power.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            return S0;
+        }
+    }
+    else
+        return 0.0;
 }
 
 
 void LOAD::set_voltage_threshold_of_constant_power_load_in_pu(double v)
 {
-    if(v<=0.0) return;
-    voltage_threshold_of_constant_power_load_in_pu = v;
+    if(v>0.0)
+        voltage_threshold_of_constant_power_load_in_pu = v;
 }
 
 double LOAD::get_voltage_threshold_of_constant_power_load_in_pu()
@@ -370,141 +381,137 @@ double LOAD::get_voltage_threshold_of_constant_power_load_in_pu()
 
 void LOAD::set_model(const MODEL* model)
 {
-    if(model->get_allowed_device_type()!="LOAD")
-        return;
-
-    if(model->get_model_type()=="LOAD CHARACTERISTICS")
-    {
-        set_load_model((LOAD_MODEL*) model);
-        return;
-    }
-    if(model->get_model_type()=="LOAD VOLTAGE RELAY")
+    if(model->get_allowed_device_type()=="LOAD")
     {
-        set_load_voltage_relay_model((LOAD_VOLTAGE_RELAY_MODEL*) model);
-        return;
-    }
-    if(model->get_model_type()=="LOAD FREQUENCY RELAY")
-    {
-        set_load_frequency_relay_model((LOAD_FREQUENCY_RELAY_MODEL*) model);
-        return;
+        if(model->get_model_type()=="LOAD CHARACTERISTICS")
+        {
+            set_load_model((LOAD_MODEL*) model);
+            return;
+        }
+        if(model->get_model_type()=="LOAD VOLTAGE RELAY")
+        {
+            set_load_voltage_relay_model((LOAD_VOLTAGE_RELAY_MODEL*) model);
+            return;
+        }
+        if(model->get_model_type()=="LOAD FREQUENCY RELAY")
+        {
+            set_load_frequency_relay_model((LOAD_FREQUENCY_RELAY_MODEL*) model);
+            return;
+        }
     }
 }
 
 void LOAD::set_load_model(const LOAD_MODEL* model)
 {
-    if(model->get_model_type()!="LOAD CHARACTERISTICS")
-        return;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    LOAD_MODEL* oldmodel = get_load_model();
-    if(oldmodel!=NULL and oldmodel->get_subsystem_type()>=model->get_subsystem_type())
+    if(model!=NULL and model->get_model_type()=="LOAD CHARACTERISTICS")
     {
-        delete oldmodel;
-        load_model = NULL;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    LOAD_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="IEEL")
-    {
-        IEEL* smodel = (IEEL*) (model);
-        new_model = (LOAD_MODEL*) new IEEL(*smodel);
-    }
+        LOAD_MODEL* oldmodel = get_load_model();
+        if(oldmodel!=NULL and oldmodel->get_subsystem_type()>=model->get_subsystem_type())
+        {
+            delete oldmodel;
+            load_model = NULL;
+        }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        load_model = new_model;
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append load model of "<<get_device_name()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        LOAD_MODEL *new_model = NULL;
+        string model_name = model->get_model_name();
+        if(model_name=="IEEL")
+        {
+            IEEL* smodel = (IEEL*) (model);
+            new_model = (LOAD_MODEL*) new IEEL(*smodel);
+        }
+
+        if(new_model!=NULL)
+        {
+            new_model->set_toolkit(toolkit);
+            new_model->set_device_id(get_device_id());
+            load_model = new_model;
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Warning. Model '"<<model_name<<"' is not supported when append load model of "<<get_device_name()<<".";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void LOAD::set_load_frequency_relay_model(const LOAD_FREQUENCY_RELAY_MODEL* model)
 {
-    if(model == NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(model->get_model_type()!="LOAD FREQUENCY RELAY")
-        return;
-
-    LOAD_FREQUENCY_RELAY_MODEL* oldmodel = get_load_frequency_relay_model();
-    if(oldmodel!=NULL and oldmodel->get_subsystem_type()>=model->get_subsystem_type())
+    if(model != NULL and model->get_model_type()=="LOAD FREQUENCY RELAY")
     {
-        delete oldmodel;
-        load_frequency_relay_model = NULL;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        LOAD_FREQUENCY_RELAY_MODEL* oldmodel = get_load_frequency_relay_model();
+        if(oldmodel!=NULL and oldmodel->get_subsystem_type()>=model->get_subsystem_type())
+        {
+            delete oldmodel;
+            load_frequency_relay_model = NULL;
+        }
 
-    LOAD_FREQUENCY_RELAY_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="UFLS")
-    {
-        UFLS* smodel = (UFLS*) (model);
-        new_model = (LOAD_FREQUENCY_RELAY_MODEL*) new UFLS(*smodel);
-    }
-    if(model_name=="PUFLS")
-    {
-        PUFLS* smodel = (PUFLS*) (model);
-        new_model = (LOAD_FREQUENCY_RELAY_MODEL*) new PUFLS(*smodel);
-    }
+        LOAD_FREQUENCY_RELAY_MODEL *new_model = NULL;
+        string model_name = model->get_model_name();
+        if(model_name=="UFLS")
+        {
+            UFLS* smodel = (UFLS*) (model);
+            new_model = (LOAD_FREQUENCY_RELAY_MODEL*) new UFLS(*smodel);
+        }
+        if(model_name=="PUFLS")
+        {
+            PUFLS* smodel = (PUFLS*) (model);
+            new_model = (LOAD_FREQUENCY_RELAY_MODEL*) new PUFLS(*smodel);
+        }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        load_frequency_relay_model = new_model;
-        ostringstream osstream;
-        osstream<<new_model->get_model_name()<<" is added.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append load frequency relay model of "<<get_device_name()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        if(new_model!=NULL)
+        {
+            new_model->set_toolkit(toolkit);
+            new_model->set_device_id(get_device_id());
+            load_frequency_relay_model = new_model;
+            ostringstream osstream;
+            osstream<<new_model->get_model_name()<<" is added.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Warning. Model '"<<model_name<<"' is not supported when append load frequency relay model of "<<get_device_name()<<".";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void LOAD::set_load_voltage_relay_model(const LOAD_VOLTAGE_RELAY_MODEL* model)
 {
-    if(model == NULL)
-        return;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(model->get_model_type()!="LOAD VOLTAGE RELAY")
-        return;
-
-    LOAD_VOLTAGE_RELAY_MODEL* oldmodel = get_load_voltage_relay_model();
-    if(oldmodel!=NULL and oldmodel->get_subsystem_type()>=model->get_subsystem_type())
+    if(model != NULL and model->get_model_type()=="LOAD VOLTAGE RELAY")
     {
-        delete oldmodel;
-        load_voltage_relay_model = NULL;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        LOAD_VOLTAGE_RELAY_MODEL* oldmodel = get_load_voltage_relay_model();
+        if(oldmodel!=NULL and oldmodel->get_subsystem_type()>=model->get_subsystem_type())
+        {
+            delete oldmodel;
+            load_voltage_relay_model = NULL;
+        }
 
-    LOAD_VOLTAGE_RELAY_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="UVLS")
-    {
-        UVLS* smodel = (UVLS*) (model);
-        new_model = (LOAD_VOLTAGE_RELAY_MODEL*) new UVLS(*smodel);
-    }
+        LOAD_VOLTAGE_RELAY_MODEL *new_model = NULL;
+        string model_name = model->get_model_name();
+        if(model_name=="UVLS")
+        {
+            UVLS* smodel = (UVLS*) (model);
+            new_model = (LOAD_VOLTAGE_RELAY_MODEL*) new UVLS(*smodel);
+        }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        load_voltage_relay_model = new_model;
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append load voltage relay model of "<<get_device_name()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        if(new_model!=NULL)
+        {
+            new_model->set_toolkit(toolkit);
+            new_model->set_device_id(get_device_id());
+            load_voltage_relay_model = new_model;
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Warning. Model '"<<model_name<<"' is not supported when append load voltage relay model of "<<get_device_name()<<".";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
@@ -526,60 +533,60 @@ LOAD_VOLTAGE_RELAY_MODEL* LOAD::get_load_voltage_relay_model() const
 
 void LOAD::run(DYNAMIC_MODE mode)
 {
-    if(get_status()==false)
-        return;
-
-    switch(mode)
+    if(get_status()==true)
     {
-        case INITIALIZE_MODE:
-        {
-            LOAD_MODEL* load = get_load_model();
-            if(load==NULL)
-                return;
-            load->initialize();
-
-            LOAD_VOLTAGE_RELAY_MODEL* uvls = get_load_voltage_relay_model();
-            if(uvls!=NULL)
-                uvls->initialize();
-
-            LOAD_FREQUENCY_RELAY_MODEL* ufls = get_load_frequency_relay_model();
-            if(ufls!=NULL)
-                ufls->initialize();
-
-            break;
-        }
-        case INTEGRATE_MODE:
-        case UPDATE_MODE:
+        switch(mode)
         {
-            LOAD_VOLTAGE_RELAY_MODEL* uvls = get_load_voltage_relay_model();
-            if(uvls!=NULL)
-                uvls->run(mode);
-
-            LOAD_FREQUENCY_RELAY_MODEL* ufls = get_load_frequency_relay_model();
-            if(ufls!=NULL)
-                ufls->run(mode);
-
-            LOAD_MODEL* load = get_load_model();
-            if(load!=NULL)
-                load->run(mode);
-            break;
-        }
-        case RELAY_MODE:
-        {
-            LOAD_VOLTAGE_RELAY_MODEL* uvls = get_load_voltage_relay_model();
-            if(uvls!=NULL)
-                uvls->run(mode);
-
-            LOAD_FREQUENCY_RELAY_MODEL* ufls = get_load_frequency_relay_model();
-            if(ufls!=NULL)
-                ufls->run(mode);
+            case INITIALIZE_MODE:
+            {
+                LOAD_MODEL* load = get_load_model();
+                if(load != NULL)
+                {
+                    load->initialize();
+
+                    LOAD_VOLTAGE_RELAY_MODEL* uvls = get_load_voltage_relay_model();
+                    if(uvls!=NULL)
+                        uvls->initialize();
+
+                    LOAD_FREQUENCY_RELAY_MODEL* ufls = get_load_frequency_relay_model();
+                    if(ufls!=NULL)
+                        ufls->initialize();
+                }
+                break;
+            }
+            case INTEGRATE_MODE:
+            case UPDATE_MODE:
+            {
+                LOAD_VOLTAGE_RELAY_MODEL* uvls = get_load_voltage_relay_model();
+                if(uvls!=NULL)
+                    uvls->run(mode);
+
+                LOAD_FREQUENCY_RELAY_MODEL* ufls = get_load_frequency_relay_model();
+                if(ufls!=NULL)
+                    ufls->run(mode);
+
+                LOAD_MODEL* load = get_load_model();
+                if(load!=NULL)
+                    load->run(mode);
+                break;
+            }
+            case RELAY_MODE:
+            {
+                LOAD_VOLTAGE_RELAY_MODEL* uvls = get_load_voltage_relay_model();
+                if(uvls!=NULL)
+                    uvls->run(mode);
+
+                LOAD_FREQUENCY_RELAY_MODEL* ufls = get_load_frequency_relay_model();
+                if(ufls!=NULL)
+                    ufls->run(mode);
+            }
         }
     }
 }
 
 complex<double> LOAD::get_dynamic_load_in_MVA()
 {
-    if(get_status())//==true
+    if(get_status()==true)
     {
         double scale = 1.0+get_load_total_scale_factor_in_pu();
 
@@ -616,7 +623,7 @@ double LOAD::get_load_manually_scale_factor_in_pu() const
 
 double LOAD::get_load_relay_shed_scale_factor_in_pu() const
 {
-    if(get_status())//==true
+    if(get_status()==true)
     {
         LOAD_FREQUENCY_RELAY_MODEL* frelay = get_load_frequency_relay_model();
         LOAD_VOLTAGE_RELAY_MODEL* vrelay = get_load_voltage_relay_model();
@@ -638,7 +645,7 @@ double LOAD::get_load_relay_shed_scale_factor_in_pu() const
 
 complex<double> LOAD::get_dynamics_load_current_in_pu_based_on_system_base_power()
 {
-    if(get_status())//==true
+    if(get_status()==true)
     {
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
diff --git a/code/source/device/pv_unit.cpp b/code/source/device/pv_unit.cpp
index 3dceb372..3512f150 100644
--- a/code/source/device/pv_unit.cpp
+++ b/code/source/device/pv_unit.cpp
@@ -84,56 +84,58 @@ void PV_UNIT::run(DYNAMIC_MODE mode)
     ostringstream osstream;
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    if(get_status()==false)
-        return;
-
-    PV_CONVERTER_MODEL* conv = get_pv_converter_model();
-    PV_ELECTRICAL_MODEL* elec = get_pv_electrical_model();
-    PV_PANEL_MODEL* panel = get_pv_panel_model();
-    PV_IRRADIANCE_MODEL* irrd = get_pv_irradiance_model();
-
-    switch(mode)
+    if(get_status()==true)
     {
-        case INITIALIZE_MODE:
+        PV_CONVERTER_MODEL* conv = get_pv_converter_model();
+        PV_ELECTRICAL_MODEL* elec = get_pv_electrical_model();
+        PV_PANEL_MODEL* panel = get_pv_panel_model();
+        PV_IRRADIANCE_MODEL* irrd = get_pv_irradiance_model();
+
+        switch(mode)
         {
-            if(conv==NULL)
+            case INITIALIZE_MODE:
             {
-                osstream<<"Error. No PV_CONVERTER_MODEL is provided for "<<get_device_name()<<" for dynamic initialization.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-                return;
+                if(conv!=NULL)
+                    conv->initialize();
+                else
+                {
+                    osstream<<"Error. No PV_CONVERTER_MODEL is provided for "<<get_device_name()<<" for dynamic initialization.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    return;
+                }
+
+                if(irrd!=NULL)
+                    irrd->initialize();
+
+                if(panel!=NULL)
+                    panel->initialize();
+                else
+                {
+                    osstream<<"Error. No PV_PANEL_MODEL is provided for "<<get_device_name()<<" for dynamic initialization.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    return;
+                }
+
+                if(elec!=NULL)
+                    elec->initialize();
+
+                break;
             }
-            conv->initialize();
-
-            if(irrd!=NULL)
-                irrd->initialize();
-
-            if(panel==NULL)
+            default:
             {
-                osstream<<"Error. No PV_PANEL_MODEL is provided for "<<get_device_name()<<" for dynamic initialization.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-                return;
-            }
-            panel->initialize();
-
-            if(elec!=NULL)
-                elec->initialize();
-
-            break;
-        }
-        default:
-        {
-            //if(irrd!=NULL)
-            //    irrd->run(mode);
+                //if(irrd!=NULL)
+                //    irrd->run(mode);
 
-            if(elec!=NULL)
-                elec->run(mode);
+                if(elec!=NULL)
+                    elec->run(mode);
 
-            if(panel!=NULL)
-                panel->run(mode);
+                if(panel!=NULL)
+                    panel->run(mode);
 
-            if(conv!=NULL)
-                conv->run(mode);
-            break;
+                if(conv!=NULL)
+                    conv->run(mode);
+                break;
+            }
         }
     }
 }
@@ -162,110 +164,108 @@ void PV_UNIT::save() const
 
 void PV_UNIT::set_model(const MODEL* model)
 {
-    if(model == NULL)
-        return;
-
-    if(model->get_allowed_device_type()!="PV UNIT")
-        return;
-
-    if(model->get_model_type()=="PV CONVERTER")
+    if(model != NULL)
     {
-        set_pv_converter_model((PV_CONVERTER_MODEL*) model);
-        return;
-    }
+        if(model->get_allowed_device_type()=="PV UNIT")
+        {
+            if(model->get_model_type()=="PV CONVERTER")
+            {
+                set_pv_converter_model((PV_CONVERTER_MODEL*) model);
+                return;
+            }
 
-    if(model->get_model_type()=="PV PANEL")
-    {
-        set_pv_panel_model((PV_PANEL_MODEL*) model);
-        return;
-    }
+            if(model->get_model_type()=="PV PANEL")
+            {
+                set_pv_panel_model((PV_PANEL_MODEL*) model);
+                return;
+            }
 
-    if(model->get_model_type()=="PV ELECTRICAL")
-    {
-        set_pv_electrical_model((PV_ELECTRICAL_MODEL*) model);
-        return;
-    }
+            if(model->get_model_type()=="PV ELECTRICAL")
+            {
+                set_pv_electrical_model((PV_ELECTRICAL_MODEL*) model);
+                return;
+            }
 
-    if(model->get_model_type()=="PV IRRADIANCE")
-    {
-        set_pv_irradiance_model((PV_IRRADIANCE_MODEL*) model);
-        return;
-    }
+            if(model->get_model_type()=="PV IRRADIANCE")
+            {
+                set_pv_irradiance_model((PV_IRRADIANCE_MODEL*) model);
+                return;
+            }
 
-    ostringstream osstream;
-    osstream<<"Warning. Unsupported model type '"<<model->get_model_type()<<"' when setting up pv unit-related model.";
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    toolkit.show_information_with_leading_time_stamp(osstream);
+            ostringstream osstream;
+            osstream<<"Warning. Unsupported model type '"<<model->get_model_type()<<"' when setting up pv unit-related model.";
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
+    }
 }
 
 void PV_UNIT::set_pv_converter_model(const PV_CONVERTER_MODEL* model)
 {
     ostringstream osstream;
-    if(model==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(model->get_model_type()!="PV UNIT")
-    {
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up pv converter model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    PV_CONVERTER_MODEL* oldmodel = get_pv_converter_model();
-    if(oldmodel!=NULL)
+    if(model!=NULL)
     {
-        delete oldmodel;
-        pv_converter_model = NULL;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        if(model->get_model_type()=="PV UNIT")
+        {
+            PV_CONVERTER_MODEL* oldmodel = get_pv_converter_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                pv_converter_model = NULL;
+            }
 
-    PV_CONVERTER_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="XXX")
-    {
-        //WT3G0* smodel = (WT3G0*) (model);
-        //new_model = (PV_UNIT_MODEL*) new WT3G0(*smodel);
-    }
+            PV_CONVERTER_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="XXX")
+            {
+                //WT3G0* smodel = (WT3G0*) (model);
+                //new_model = (PV_UNIT_MODEL*) new WT3G0(*smodel);
+            }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        pv_converter_model = new_model;
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                pv_converter_model = new_model;
 
-        set_number_of_lumped_pv_units(new_model->get_number_of_lumped_pv_units());
-        set_rated_power_per_pv_unit_in_MW(new_model->get_rated_power_per_pv_unit_in_MW());
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append pv converter model of "<<get_device_name()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+                set_number_of_lumped_pv_units(new_model->get_number_of_lumped_pv_units());
+                set_rated_power_per_pv_unit_in_MW(new_model->get_rated_power_per_pv_unit_in_MW());
+            }
+            else
+            {
+                ostringstream osstream;
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append pv converter model of "<<get_device_name()<<".";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up pv converter model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void PV_UNIT::set_pv_panel_model(const PV_PANEL_MODEL* model)
 {
     ostringstream osstream;
-    if(model==NULL)
+    if(model!=NULL)
         return;
-
 }
 
 void PV_UNIT::set_pv_electrical_model(const PV_ELECTRICAL_MODEL* model)
 {
     ostringstream osstream;
-    if(model==NULL)
+    if(model!=NULL)
         return;
-
 }
 
 void PV_UNIT::set_pv_irradiance_model(const PV_IRRADIANCE_MODEL* model)
 {
     ostringstream osstream;
-    if(model==NULL)
+    if(model!=NULL)
         return;
-
 }
 
 PV_CONVERTER_MODEL* PV_UNIT::get_pv_converter_model()
diff --git a/code/source/device/source.cpp b/code/source/device/source.cpp
index d936d820..c09bccad 100644
--- a/code/source/device/source.cpp
+++ b/code/source/device/source.cpp
@@ -169,14 +169,14 @@ bool SOURCE::get_status() const
 
 double SOURCE::get_mbase_in_MVA() const
 {
-    if(mbase_MVA==0.0)
+    if(mbase_MVA!=0.0)
+        return mbase_MVA;
+    else
     {
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
         return psdb.get_system_base_power_in_MVA();
     }
-    else
-        return mbase_MVA;
 }
 
 double SOURCE::get_p_generation_in_MW() const
@@ -286,7 +286,7 @@ void SOURCE::clear()
 bool SOURCE::is_connected_to_bus(size_t bus) const
 {
     if(get_source_bus()==bus) return true;
-    else return false;
+    else                      return false;
 }
 
 bool SOURCE::is_in_area(size_t area) const
diff --git a/code/source/device/transformer.cpp b/code/source/device/transformer.cpp
index c93c5037..a7671daf 100644
--- a/code/source/device/transformer.cpp
+++ b/code/source/device/transformer.cpp
@@ -111,7 +111,6 @@ void TRANSFORMER::set_winding_bus(TRANSFORMER_WINDING_SIDE winding, size_t bus)
     winding_bus[winding] = bus;
 }
 
-
 void TRANSFORMER::set_winding_breaker_status(TRANSFORMER_WINDING_SIDE winding, bool status)
 {
     winding_breaker_status[winding] = status;
@@ -146,64 +145,70 @@ void TRANSFORMER::set_winding_nominal_capacity_in_MVA(TRANSFORMER_WINDING_SIDE w
 {
     ostringstream osstream;
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(winding1==winding2)
+    if(winding1!=winding2)
+    {
+        if(winding1>winding2)
+        {
+            TRANSFORMER_WINDING_SIDE temp_winding;
+            temp_winding = winding1;
+            winding1 = winding2;
+            winding2 = temp_winding;
+        }
+
+        if(s==0.0)
+        {
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            s = psdb.get_system_base_power_in_MVA();
+        }
+        if(winding1==PRIMARY_SIDE and winding2==TERTIARY_SIDE)
+            winding_nominal_capacity_in_MVA[TERTIARY_SIDE]=s;
+        else
+            winding_nominal_capacity_in_MVA[winding1]=s;
+    }
+    else
     {
         osstream<<"Warning. The same windings ("<<get_winding_name(winding1)<<") are not allowed to set winding nominal capacity.";
         toolkit.show_information_with_leading_time_stamp(osstream);
         return;
     }
-    if(winding1>winding2)
-    {
-        TRANSFORMER_WINDING_SIDE temp_winding;
-        temp_winding = winding1;
-        winding1 = winding2;
-        winding2 = temp_winding;
-    }
-
-    if(s==0.0)
-    {
-        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-        s = psdb.get_system_base_power_in_MVA();
-    }
-    if(winding1==PRIMARY_SIDE and winding2==TERTIARY_SIDE)
-        winding_nominal_capacity_in_MVA[TERTIARY_SIDE]=s;
-    else
-        winding_nominal_capacity_in_MVA[winding1]=s;
 }
 
 void TRANSFORMER::set_leakage_impedance_between_windings_based_on_winding_nominals_in_pu(TRANSFORMER_WINDING_SIDE winding1, TRANSFORMER_WINDING_SIDE winding2, complex<double> z)
 {
     ostringstream osstream;
-    if(winding1==winding2)
-    {
-        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-        osstream<<"Warning. The same windings ("<<get_winding_name(winding1)<<") are not allowed to set winding leakage impedance.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-    if(winding1>winding2)
+    if(winding1!=winding2)
     {
-        TRANSFORMER_WINDING_SIDE temp_winding;
-        temp_winding = winding1;
-        winding1 = winding2;
-        winding2 = temp_winding;
+        if(winding1>winding2)
+        {
+            TRANSFORMER_WINDING_SIDE temp_winding;
+            temp_winding = winding1;
+            winding1 = winding2;
+            winding2 = temp_winding;
+        }
+        if(z==0.0)
+        {
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            osstream<<"Warning. The leakage impedance between "<<get_winding_name(winding1)<<" and "<<get_winding_name(winding2)<<" windings is zero for "<<get_device_name()<<endl
+                    <<"Correction is required. Check original data.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
+
+        if(winding1==PRIMARY_SIDE and winding2==SECONDARY_SIDE)
+            zl_primary2secondary_in_pu = z;
+        else
+        {
+            if(winding1==SECONDARY_SIDE and winding2==TERTIARY_SIDE)
+                zl_secondary2tertiary_in_pu = z;
+            else
+                zl_primary2tertiary_in_pu = z;
+        }
     }
-    if(z==0.0)
+    else
     {
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-        osstream<<"Warning. The leakage impedance between "<<get_winding_name(winding1)<<" and "<<get_winding_name(winding2)<<" windings is zero for "<<get_device_name()<<endl
-                <<"Correction is required. Check original data.";
+        osstream<<"Warning. The same windings ("<<get_winding_name(winding1)<<") are not allowed to set winding leakage impedance.";
         toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-
-    if(winding1==PRIMARY_SIDE and winding2==SECONDARY_SIDE)
-        zl_primary2secondary_in_pu = z;
-    else
-    {
-        if(winding1==SECONDARY_SIDE and winding2==TERTIARY_SIDE)
-            zl_secondary2tertiary_in_pu = z;
-        else
-            zl_primary2tertiary_in_pu = z;
+        return;
     }
 }
 
@@ -307,8 +312,6 @@ void TRANSFORMER::set_controlled_min_active_power_into_winding_in_MW(TRANSFORMER
     controlled_min_active_power_into_winding_in_MW[winding] = p;
 }
 
-
-
 string TRANSFORMER::get_identifier() const
 {
     return identifier;
@@ -352,52 +355,58 @@ double TRANSFORMER::get_winding_nominal_voltage_in_kV(TRANSFORMER_WINDING_SIDE w
 double TRANSFORMER::get_winding_nominal_capacity_in_MVA(TRANSFORMER_WINDING_SIDE winding1, TRANSFORMER_WINDING_SIDE winding2) const
 {
     ostringstream osstream;
-    if(winding1==winding2)
+    if(winding1!=winding2)
+    {
+        if(winding1>winding2)
+        {
+            TRANSFORMER_WINDING_SIDE temp_winding;
+            temp_winding = winding1;
+            winding1 = winding2;
+            winding2 = temp_winding;
+        }
+        if(winding1==PRIMARY_SIDE and winding2==TERTIARY_SIDE)
+            return winding_nominal_capacity_in_MVA[TERTIARY_SIDE];
+        else
+            return winding_nominal_capacity_in_MVA[winding1];
+    }
+    else
     {
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         osstream<<"Warning. The same windings ("<<get_winding_name(winding1)<<") are not allowed to get winding nominal capacity. Zero will be returned.";
         toolkit.show_information_with_leading_time_stamp(osstream);
         return 0.0;
     }
-    if(winding1>winding2)
-    {
-        TRANSFORMER_WINDING_SIDE temp_winding;
-        temp_winding = winding1;
-        winding1 = winding2;
-        winding2 = temp_winding;
-    }
-    if(winding1==PRIMARY_SIDE and winding2==TERTIARY_SIDE)
-        return winding_nominal_capacity_in_MVA[TERTIARY_SIDE];
-    else
-        return winding_nominal_capacity_in_MVA[winding1];
 }
 
 complex<double> TRANSFORMER::get_leakage_impedance_between_windings_based_on_winding_nominals_in_pu(TRANSFORMER_WINDING_SIDE winding1, TRANSFORMER_WINDING_SIDE winding2) const
 {
     ostringstream osstream;
-    if(winding1==winding2)
+    if(winding1!=winding2)
+    {
+        if(winding1>winding2)
+        {
+            TRANSFORMER_WINDING_SIDE temp_winding;
+            temp_winding = winding1;
+            winding1 = winding2;
+            winding2 = temp_winding;
+        }
+        if(winding1==PRIMARY_SIDE and winding2==TERTIARY_SIDE)
+            return zl_primary2tertiary_in_pu;
+        else
+        {
+            if(winding1==PRIMARY_SIDE)
+                return zl_primary2secondary_in_pu;
+            else
+                return zl_secondary2tertiary_in_pu;
+        }
+    }
+    else
     {
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         osstream<<"Warning. The same windings ("<<get_winding_name(winding1)<<") are not allowed to get winding nominal leakage impedance. Zero will be returned.";
         toolkit.show_information_with_leading_time_stamp(osstream);
         return 0.0;
     }
-    if(winding1>winding2)
-    {
-        TRANSFORMER_WINDING_SIDE temp_winding;
-        temp_winding = winding1;
-        winding1 = winding2;
-        winding2 = temp_winding;
-    }
-    if(winding1==PRIMARY_SIDE and winding2==TERTIARY_SIDE)
-        return zl_primary2tertiary_in_pu;
-    else
-    {
-        if(winding1==PRIMARY_SIDE)
-            return zl_primary2secondary_in_pu;
-        else
-            return zl_secondary2tertiary_in_pu;
-    }
 }
 double TRANSFORMER::get_winding_turn_ratio_based_on_winding_nominal_voltage_in_pu(TRANSFORMER_WINDING_SIDE winding) const
 {
@@ -587,12 +596,15 @@ void TRANSFORMER::clear()
 
 bool TRANSFORMER::is_connected_to_bus(size_t bus) const
 {
-    if(bus == 0) return false;
-
-    if(bus == get_winding_bus(PRIMARY_SIDE) ||
-       bus == get_winding_bus(SECONDARY_SIDE) ||
-       bus == get_winding_bus(TERTIARY_SIDE))
-        return true;
+    if(bus != 0)
+    {
+        if(bus == get_winding_bus(PRIMARY_SIDE) or
+           bus == get_winding_bus(SECONDARY_SIDE) or
+           bus == get_winding_bus(TERTIARY_SIDE))
+            return true;
+        else
+            return false;
+    }
     else
         return false;
 }
@@ -858,7 +870,7 @@ TRANSFORMER& TRANSFORMER::operator=(const TRANSFORMER& transformer)
 bool TRANSFORMER::is_two_winding_transformer() const
 {
     if(get_winding_bus(TERTIARY_SIDE)==0) return true;
-    else return false;
+    else                                  return false;
 }
 
 bool TRANSFORMER::is_three_winding_transformer() const
@@ -898,141 +910,149 @@ complex<double> TRANSFORMER::get_star_bus_complex_voltage_in_pu() const
 
 complex<double> TRANSFORMER::get_two_winding_trans_star_bus_complex_voltage_in_pu() const
 {
-    if(is_three_winding_transformer())
-        return get_three_winding_trans_star_bus_complex_voltage_in_pu();
-
-    if(get_winding_breaker_status(PRIMARY_SIDE)==false and get_winding_breaker_status(SECONDARY_SIDE)==false)
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    complex<double> Zps_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
-    get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
-
-    complex<double> Zp, Zs;
-    Zp = 0.5*Zps_original;
-    Zs = Zp;
-
-    complex<double> Y = get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
-
-    complex<double> V_primary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(PRIMARY_SIDE));
-    complex<double> V_secondary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(SECONDARY_SIDE));
-
-    double tap_primary = get_primary_winding_off_nominal_turn_ratio_in_pu();
-    double angle_primary = get_winding_angle_shift_in_deg(PRIMARY_SIDE);
-    angle_primary = deg2rad(angle_primary);
-    double tap_secondary = get_secondary_winding_off_nominal_turn_ratio_in_pu();
-    double angle_secondary = get_winding_angle_shift_in_deg(SECONDARY_SIDE);
-    angle_secondary = deg2rad(angle_secondary);
-
-    complex<double> k_primary(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary));
-    complex<double> k_secondary(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
-
-    complex<double> Vp = V_primary/k_primary, Vs = V_secondary/k_secondary;
-
-    complex<double> Yeq, Vstar, Istar;
-    if(get_winding_breaker_status(PRIMARY_SIDE)==true and get_winding_breaker_status(SECONDARY_SIDE)==true)
-    {
-        Yeq = Y + 1.0/Zp + 1.0/Zs;
-        Istar = Vp/Zp + Vs/Zs;
-    }
-    if(get_winding_breaker_status(PRIMARY_SIDE)==true and get_winding_breaker_status(SECONDARY_SIDE)==false)
-    {
-        Yeq = Y + 1.0/Zp;
-        Istar = Vp/Zp;
-    }
-    if(get_winding_breaker_status(PRIMARY_SIDE)==false and get_winding_breaker_status(SECONDARY_SIDE)==true)
+    if(is_two_winding_transformer())
     {
-        Yeq = Y + 1.0/Zs;
-        Istar = Vs/Zs;
+        if(get_winding_breaker_status(PRIMARY_SIDE)==true or get_winding_breaker_status(SECONDARY_SIDE)==true)
+        {
+            ostringstream osstream;
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+
+            complex<double> Zps_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+            get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+
+            complex<double> Zp, Zs;
+            Zp = 0.5*Zps_original;
+            Zs = Zp;
+
+            complex<double> Y = get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
+
+            complex<double> V_primary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(PRIMARY_SIDE));
+            complex<double> V_secondary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(SECONDARY_SIDE));
+
+            double tap_primary = get_primary_winding_off_nominal_turn_ratio_in_pu();
+            double angle_primary = get_winding_angle_shift_in_deg(PRIMARY_SIDE);
+            angle_primary = deg2rad(angle_primary);
+            double tap_secondary = get_secondary_winding_off_nominal_turn_ratio_in_pu();
+            double angle_secondary = get_winding_angle_shift_in_deg(SECONDARY_SIDE);
+            angle_secondary = deg2rad(angle_secondary);
+
+            complex<double> k_primary(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary));
+            complex<double> k_secondary(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
+
+            complex<double> Vp = V_primary/k_primary, Vs = V_secondary/k_secondary;
+
+            complex<double> Yeq, Vstar, Istar;
+            if(get_winding_breaker_status(PRIMARY_SIDE)==true and get_winding_breaker_status(SECONDARY_SIDE)==true)
+            {
+                Yeq = Y + 1.0/Zp + 1.0/Zs;
+                Istar = Vp/Zp + Vs/Zs;
+            }
+            if(get_winding_breaker_status(PRIMARY_SIDE)==true and get_winding_breaker_status(SECONDARY_SIDE)==false)
+            {
+                Yeq = Y + 1.0/Zp;
+                Istar = Vp/Zp;
+            }
+            if(get_winding_breaker_status(PRIMARY_SIDE)==false and get_winding_breaker_status(SECONDARY_SIDE)==true)
+            {
+                Yeq = Y + 1.0/Zs;
+                Istar = Vs/Zs;
+            }
+            Vstar = Istar/Yeq;
+            return Vstar;
+        }
+        else
+            return 0.0;
     }
-    Vstar = Istar/Yeq;
-    return Vstar;
+    else
+        return get_three_winding_trans_star_bus_complex_voltage_in_pu();
 }
 
 complex<double> TRANSFORMER::get_three_winding_trans_star_bus_complex_voltage_in_pu() const
 {
-    if(is_two_winding_transformer())
-        return get_two_winding_trans_star_bus_complex_voltage_in_pu();
-
-    if(get_winding_breaker_status(PRIMARY_SIDE)==false and get_winding_breaker_status(SECONDARY_SIDE)==false and get_winding_breaker_status(TERTIARY_SIDE)==false)
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    complex<double> Zps_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
-    complex<double> Zst_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
-    complex<double> Zpt_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
-
-    complex<double> Zp, Zs, Zt;
-    Zp = 0.5*(Zps_original+Zpt_original-Zst_original);
-    Zs = 0.5*(Zps_original+Zst_original-Zpt_original);
-    Zt = 0.5*(Zpt_original+Zst_original-Zps_original);
-
-    complex<double> Y = get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
-
-    complex<double> V_primary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(PRIMARY_SIDE));
-    complex<double> V_secondary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(SECONDARY_SIDE));
-    complex<double> V_tertiary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(TERTIARY_SIDE));
-
-    double tap_primary = get_primary_winding_off_nominal_turn_ratio_in_pu();
-    double angle_primary = get_winding_angle_shift_in_deg(PRIMARY_SIDE);
-    angle_primary = deg2rad(angle_primary);
-    double tap_secondary = get_secondary_winding_off_nominal_turn_ratio_in_pu();
-    double angle_secondary = get_winding_angle_shift_in_deg(SECONDARY_SIDE);
-    angle_secondary = deg2rad(angle_secondary);
-    double tap_tertiary = get_tertiary_winding_off_nominal_turn_ratio_in_pu();
-    double angle_tertiary = get_winding_angle_shift_in_deg(TERTIARY_SIDE);
-    angle_tertiary = deg2rad(angle_tertiary);
-
-    complex<double> k_primary(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary));
-    complex<double> k_secondary(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
-    complex<double> k_tertiary(tap_tertiary*cos(angle_tertiary),tap_tertiary*sin(angle_tertiary));
-
-    complex<double> Vp = V_primary/k_primary, Vs = V_secondary/k_secondary, Vt = V_tertiary/k_tertiary;
-
-    complex<double> Yeq, Vstar, Istar;
-    if(get_winding_breaker_status(PRIMARY_SIDE)==true and get_winding_breaker_status(SECONDARY_SIDE)==true and get_winding_breaker_status(TERTIARY_SIDE)==true)
-    {
-        Yeq = Y + 1.0/Zp + 1.0/Zs + 1.0/Zt;
-        Istar = Vp/Zp + Vs/Zs + Vt/Zt;
-    }
-    if(get_winding_breaker_status(PRIMARY_SIDE)==true and get_winding_breaker_status(SECONDARY_SIDE)==true and get_winding_breaker_status(TERTIARY_SIDE)==false)
-    {
-        Yeq = Y + 1.0/Zp + 1.0/Zs;
-        Istar = Vp/Zp + Vs/Zs;
-    }
-    if(get_winding_breaker_status(PRIMARY_SIDE)==true and get_winding_breaker_status(SECONDARY_SIDE)==false and get_winding_breaker_status(TERTIARY_SIDE)==true)
-    {
-        Yeq = Y + 1.0/Zp + 1.0/Zt;
-        Istar = Vp/Zp + Vt/Zt;
-    }
-    if(get_winding_breaker_status(PRIMARY_SIDE)==true and get_winding_breaker_status(SECONDARY_SIDE)==false and get_winding_breaker_status(TERTIARY_SIDE)==false)
-    {
-        Yeq = Y + 1.0/Zp;
-        Istar = Vp/Zp;
-    }
-    if(get_winding_breaker_status(PRIMARY_SIDE)==false and get_winding_breaker_status(SECONDARY_SIDE)==true and get_winding_breaker_status(TERTIARY_SIDE)==true)
-    {
-        Yeq = Y + 1.0/Zs + 1.0/Zt;
-        Istar = Vs/Zs + Vt/Zt;
-    }
-    if(get_winding_breaker_status(PRIMARY_SIDE)==false and get_winding_breaker_status(SECONDARY_SIDE)==true and get_winding_breaker_status(TERTIARY_SIDE)==false)
-    {
-        Yeq = Y + 1.0/Zs;
-        Istar = Vs/Zs;
-    }
-    if(get_winding_breaker_status(PRIMARY_SIDE)==false and get_winding_breaker_status(SECONDARY_SIDE)==false and get_winding_breaker_status(TERTIARY_SIDE)==true)
+    if(is_three_winding_transformer())
     {
-        Yeq = Y + 1.0/Zt;
-        Istar = Vt/Zt;
+        if(get_winding_breaker_status(PRIMARY_SIDE)==true or get_winding_breaker_status(SECONDARY_SIDE)==true or get_winding_breaker_status(TERTIARY_SIDE)==true)
+        {
+            ostringstream osstream;
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+
+            complex<double> Zps_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+            complex<double> Zst_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
+            complex<double> Zpt_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
+
+            complex<double> Zp, Zs, Zt;
+            Zp = 0.5*(Zps_original+Zpt_original-Zst_original);
+            Zs = 0.5*(Zps_original+Zst_original-Zpt_original);
+            Zt = 0.5*(Zpt_original+Zst_original-Zps_original);
+
+            complex<double> Y = get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
+
+            complex<double> V_primary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(PRIMARY_SIDE));
+            complex<double> V_secondary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(SECONDARY_SIDE));
+            complex<double> V_tertiary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(TERTIARY_SIDE));
+
+            double tap_primary = get_primary_winding_off_nominal_turn_ratio_in_pu();
+            double angle_primary = get_winding_angle_shift_in_deg(PRIMARY_SIDE);
+            angle_primary = deg2rad(angle_primary);
+            double tap_secondary = get_secondary_winding_off_nominal_turn_ratio_in_pu();
+            double angle_secondary = get_winding_angle_shift_in_deg(SECONDARY_SIDE);
+            angle_secondary = deg2rad(angle_secondary);
+            double tap_tertiary = get_tertiary_winding_off_nominal_turn_ratio_in_pu();
+            double angle_tertiary = get_winding_angle_shift_in_deg(TERTIARY_SIDE);
+            angle_tertiary = deg2rad(angle_tertiary);
+
+            complex<double> k_primary(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary));
+            complex<double> k_secondary(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
+            complex<double> k_tertiary(tap_tertiary*cos(angle_tertiary),tap_tertiary*sin(angle_tertiary));
+
+            complex<double> Vp = V_primary/k_primary, Vs = V_secondary/k_secondary, Vt = V_tertiary/k_tertiary;
+
+            complex<double> Yeq, Vstar, Istar;
+            if(get_winding_breaker_status(PRIMARY_SIDE)==true and get_winding_breaker_status(SECONDARY_SIDE)==true and get_winding_breaker_status(TERTIARY_SIDE)==true)
+            {
+                Yeq = Y + 1.0/Zp + 1.0/Zs + 1.0/Zt;
+                Istar = Vp/Zp + Vs/Zs + Vt/Zt;
+            }
+            if(get_winding_breaker_status(PRIMARY_SIDE)==true and get_winding_breaker_status(SECONDARY_SIDE)==true and get_winding_breaker_status(TERTIARY_SIDE)==false)
+            {
+                Yeq = Y + 1.0/Zp + 1.0/Zs;
+                Istar = Vp/Zp + Vs/Zs;
+            }
+            if(get_winding_breaker_status(PRIMARY_SIDE)==true and get_winding_breaker_status(SECONDARY_SIDE)==false and get_winding_breaker_status(TERTIARY_SIDE)==true)
+            {
+                Yeq = Y + 1.0/Zp + 1.0/Zt;
+                Istar = Vp/Zp + Vt/Zt;
+            }
+            if(get_winding_breaker_status(PRIMARY_SIDE)==true and get_winding_breaker_status(SECONDARY_SIDE)==false and get_winding_breaker_status(TERTIARY_SIDE)==false)
+            {
+                Yeq = Y + 1.0/Zp;
+                Istar = Vp/Zp;
+            }
+            if(get_winding_breaker_status(PRIMARY_SIDE)==false and get_winding_breaker_status(SECONDARY_SIDE)==true and get_winding_breaker_status(TERTIARY_SIDE)==true)
+            {
+                Yeq = Y + 1.0/Zs + 1.0/Zt;
+                Istar = Vs/Zs + Vt/Zt;
+            }
+            if(get_winding_breaker_status(PRIMARY_SIDE)==false and get_winding_breaker_status(SECONDARY_SIDE)==true and get_winding_breaker_status(TERTIARY_SIDE)==false)
+            {
+                Yeq = Y + 1.0/Zs;
+                Istar = Vs/Zs;
+            }
+            if(get_winding_breaker_status(PRIMARY_SIDE)==false and get_winding_breaker_status(SECONDARY_SIDE)==false and get_winding_breaker_status(TERTIARY_SIDE)==true)
+            {
+                Yeq = Y + 1.0/Zt;
+                Istar = Vt/Zt;
+            }
+            Vstar = Istar/Yeq;
+            return Vstar;
+        }
+        else
+            return 0.0;
     }
-    Vstar = Istar/Yeq;
-    return Vstar;
+    else
+        return get_two_winding_trans_star_bus_complex_voltage_in_pu();
 }
 
 complex<double> TRANSFORMER::get_star_bus_complex_voltage_in_kV_based_on_winding_nominal_voltage(TRANSFORMER_WINDING_SIDE side) const
@@ -1106,166 +1126,176 @@ complex<double> TRANSFORMER::get_secondary_winding_complex_current_in_pu() const
 complex<double> TRANSFORMER::get_tertiary_winding_complex_current_in_pu() const
 {
 
-    if(is_two_winding_transformer())
-        return 0.0;
-    else
+    if(is_three_winding_transformer())
         return get_three_winding_trans_tertiary_winding_complex_current_in_pu();
+    else
+        return 0.0;
 }
 
 complex<double> TRANSFORMER::get_two_winding_trans_primary_winding_complex_current_in_pu() const
 {
-    if(get_winding_breaker_status(PRIMARY_SIDE)==false)
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(get_winding_breaker_status(PRIMARY_SIDE)==true)
+    {
+        ostringstream osstream;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    complex<double> Z = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+        complex<double> Z = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
 
-    Z *= 0.5;
+        Z *= 0.5;
 
-    double tap_primary = get_primary_winding_off_nominal_turn_ratio_in_pu();
-    double angle_primary = get_winding_angle_shift_in_deg(PRIMARY_SIDE);
-    angle_primary = deg2rad(angle_primary);
+        double tap_primary = get_primary_winding_off_nominal_turn_ratio_in_pu();
+        double angle_primary = get_winding_angle_shift_in_deg(PRIMARY_SIDE);
+        angle_primary = deg2rad(angle_primary);
 
-    complex<double> k_primary(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary));
+        complex<double> k_primary(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary));
 
-    complex<double> V_primary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(PRIMARY_SIDE));
+        complex<double> V_primary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(PRIMARY_SIDE));
 
-    complex<double> Vp = V_primary/k_primary;
+        complex<double> Vp = V_primary/k_primary;
 
-    complex<double> Vstar = get_two_winding_trans_star_bus_complex_voltage_in_pu();
+        complex<double> Vstar = get_two_winding_trans_star_bus_complex_voltage_in_pu();
 
-    complex<double> I = (Vp-Vstar)/Z;
+        complex<double> I = (Vp-Vstar)/Z;
 
-    return I/conj(k_primary);
+        return I/conj(k_primary);
+    }
+    else
+        return 0.0;
 }
 
 complex<double> TRANSFORMER::get_two_winding_trans_secondary_winding_complex_current_in_pu() const
 {
-    if(get_winding_breaker_status(SECONDARY_SIDE)==false)
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(get_winding_breaker_status(SECONDARY_SIDE)==true)
+    {
+        ostringstream osstream;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    complex<double> Z = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+        complex<double> Z = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
 
-    Z *= 0.5;
+        Z *= 0.5;
 
-    double tap_secondary = get_secondary_winding_off_nominal_turn_ratio_in_pu();
-    double angle_secondary = get_winding_angle_shift_in_deg(SECONDARY_SIDE);
-    angle_secondary = deg2rad(angle_secondary);
+        double tap_secondary = get_secondary_winding_off_nominal_turn_ratio_in_pu();
+        double angle_secondary = get_winding_angle_shift_in_deg(SECONDARY_SIDE);
+        angle_secondary = deg2rad(angle_secondary);
 
-    complex<double> k_secondary(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
+        complex<double> k_secondary(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
 
-    complex<double> V_secondary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(SECONDARY_SIDE));
+        complex<double> V_secondary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(SECONDARY_SIDE));
 
-    complex<double> Vs = V_secondary/k_secondary;
+        complex<double> Vs = V_secondary/k_secondary;
 
-    complex<double> Vstar = get_two_winding_trans_star_bus_complex_voltage_in_pu();
+        complex<double> Vstar = get_two_winding_trans_star_bus_complex_voltage_in_pu();
 
-    complex<double> I = (Vs-Vstar)/Z;
+        complex<double> I = (Vs-Vstar)/Z;
 
-    return I/conj(k_secondary);
+        return I/conj(k_secondary);
+    }
+    else
+        return 0.0;
 }
 
 complex<double> TRANSFORMER::get_three_winding_trans_primary_winding_complex_current_in_pu() const
 {
-    if(get_winding_breaker_status(PRIMARY_SIDE)==false)
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(get_winding_breaker_status(PRIMARY_SIDE)==true)
+    {
+        ostringstream osstream;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    complex<double> Zps_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
-    complex<double> Zst_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
-    complex<double> Zpt_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
+        complex<double> Zps_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+        complex<double> Zst_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
+        complex<double> Zpt_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
 
-    complex<double> Zp = 0.5*(Zps_original+Zpt_original-Zst_original);
+        complex<double> Zp = 0.5*(Zps_original+Zpt_original-Zst_original);
 
-    complex<double> V_primary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(PRIMARY_SIDE));
+        complex<double> V_primary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(PRIMARY_SIDE));
 
-    double tap_primary = get_primary_winding_off_nominal_turn_ratio_in_pu();
-    double angle_primary = get_winding_angle_shift_in_deg(PRIMARY_SIDE);
-    angle_primary = deg2rad(angle_primary);
+        double tap_primary = get_primary_winding_off_nominal_turn_ratio_in_pu();
+        double angle_primary = get_winding_angle_shift_in_deg(PRIMARY_SIDE);
+        angle_primary = deg2rad(angle_primary);
 
-    complex<double> k_primary(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary));
+        complex<double> k_primary(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary));
 
-    complex<double> Vp = V_primary/k_primary;
+        complex<double> Vp = V_primary/k_primary;
 
-    complex<double> Vstar = get_three_winding_trans_star_bus_complex_voltage_in_pu();
+        complex<double> Vstar = get_three_winding_trans_star_bus_complex_voltage_in_pu();
 
-    complex<double> I = (Vp-Vstar)/Zp;
+        complex<double> I = (Vp-Vstar)/Zp;
 
-    return I/conj(k_primary);
+        return I/conj(k_primary);
+    }
+    else
+        return 0.0;
 }
 
 complex<double> TRANSFORMER::get_three_winding_trans_secondary_winding_complex_current_in_pu() const
 {
-    if(get_winding_breaker_status(SECONDARY_SIDE)==false)
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(get_winding_breaker_status(SECONDARY_SIDE)==true)
+    {
+        ostringstream osstream;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    complex<double> Zps_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
-    complex<double> Zst_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
-    complex<double> Zpt_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
+        complex<double> Zps_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+        complex<double> Zst_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
+        complex<double> Zpt_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
 
-    complex<double> Zs = 0.5*(Zps_original+Zst_original-Zpt_original);
+        complex<double> Zs = 0.5*(Zps_original+Zst_original-Zpt_original);
 
-    complex<double> V_secondary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(SECONDARY_SIDE));
+        complex<double> V_secondary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(SECONDARY_SIDE));
 
-    double tap_secondary = get_secondary_winding_off_nominal_turn_ratio_in_pu();
-    double angle_secondary = get_winding_angle_shift_in_deg(SECONDARY_SIDE);
-    angle_secondary = deg2rad(angle_secondary);
+        double tap_secondary = get_secondary_winding_off_nominal_turn_ratio_in_pu();
+        double angle_secondary = get_winding_angle_shift_in_deg(SECONDARY_SIDE);
+        angle_secondary = deg2rad(angle_secondary);
 
-    complex<double> k_secondary(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
+        complex<double> k_secondary(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
 
-    complex<double> Vs = V_secondary/k_secondary;
+        complex<double> Vs = V_secondary/k_secondary;
 
-    complex<double> Vstar = get_three_winding_trans_star_bus_complex_voltage_in_pu();
+        complex<double> Vstar = get_three_winding_trans_star_bus_complex_voltage_in_pu();
 
-    complex<double> I = (Vs-Vstar)/Zs;
+        complex<double> I = (Vs-Vstar)/Zs;
 
-    return I/conj(k_secondary);
+        return I/conj(k_secondary);
+    }
+    else
+        return 0.0;
 }
 
 complex<double> TRANSFORMER::get_three_winding_trans_tertiary_winding_complex_current_in_pu() const
 {
-    if(get_winding_breaker_status(TERTIARY_SIDE)==false)
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(get_winding_breaker_status(TERTIARY_SIDE)==true)
+    {
+        ostringstream osstream;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    complex<double> Zps_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
-    complex<double> Zst_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
-    complex<double> Zpt_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
+        complex<double> Zps_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+        complex<double> Zst_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
+        complex<double> Zpt_original = get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
 
-    complex<double> Zt = 0.5*(Zpt_original+Zst_original-Zps_original);
+        complex<double> Zt = 0.5*(Zpt_original+Zst_original-Zps_original);
 
-    complex<double> V_tertiary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(TERTIARY_SIDE));
+        complex<double> V_tertiary = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(TERTIARY_SIDE));
 
-    double tap_tertiary = get_tertiary_winding_off_nominal_turn_ratio_in_pu();
-    double angle_tertiary = get_winding_angle_shift_in_deg(TERTIARY_SIDE);
-    angle_tertiary = deg2rad(angle_tertiary);
+        double tap_tertiary = get_tertiary_winding_off_nominal_turn_ratio_in_pu();
+        double angle_tertiary = get_winding_angle_shift_in_deg(TERTIARY_SIDE);
+        angle_tertiary = deg2rad(angle_tertiary);
 
-    complex<double> k_tertiary(tap_tertiary*cos(angle_tertiary),tap_tertiary*sin(angle_tertiary));
+        complex<double> k_tertiary(tap_tertiary*cos(angle_tertiary),tap_tertiary*sin(angle_tertiary));
 
-    complex<double> Vt = V_tertiary/k_tertiary;
+        complex<double> Vt = V_tertiary/k_tertiary;
 
-    complex<double> Vstar = get_three_winding_trans_star_bus_complex_voltage_in_pu();
+        complex<double> Vstar = get_three_winding_trans_star_bus_complex_voltage_in_pu();
 
-    complex<double> I = (Vt-Vstar)/Zt;
+        complex<double> I = (Vt-Vstar)/Zt;
 
-    return I/conj(k_tertiary);
+        return I/conj(k_tertiary);
+    }
+    else
+        return 0.0;
 }
 
 
@@ -1284,47 +1314,53 @@ complex<double> TRANSFORMER::get_winding_complex_current_in_kA(TRANSFORMER_WINDI
 
 complex<double> TRANSFORMER::get_primary_winding_complex_current_in_kA() const
 {
-    if(get_winding_breaker_status(PRIMARY_SIDE)==false)
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(get_winding_breaker_status(PRIMARY_SIDE)==true)
+    {
+        ostringstream osstream;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    double Vbase = psdb.get_bus_base_voltage_in_kV(get_winding_bus(PRIMARY_SIDE));
-    double Ibase = psdb.get_system_base_power_in_MVA()/(sqrt(3.0)*Vbase);
+        double Vbase = psdb.get_bus_base_voltage_in_kV(get_winding_bus(PRIMARY_SIDE));
+        double Ibase = psdb.get_system_base_power_in_MVA()/(sqrt(3.0)*Vbase);
 
-    return get_primary_winding_complex_current_in_pu()*Ibase;
+        return get_primary_winding_complex_current_in_pu()*Ibase;
+    }
+    else
+        return 0.0;
 }
 
 complex<double> TRANSFORMER::get_secondary_winding_complex_current_in_kA() const
 {
-    if(get_winding_breaker_status(SECONDARY_SIDE)==false)
-        return 0.0;
+    if(get_winding_breaker_status(SECONDARY_SIDE)==true)
+    {
+        ostringstream osstream;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        double Vbase = psdb.get_bus_base_voltage_in_kV(get_winding_bus(SECONDARY_SIDE));
+        double Ibase = psdb.get_system_base_power_in_MVA()/(sqrt(3.0)*Vbase);
 
-    double Vbase = psdb.get_bus_base_voltage_in_kV(get_winding_bus(SECONDARY_SIDE));
-    double Ibase = psdb.get_system_base_power_in_MVA()/(sqrt(3.0)*Vbase);
-
-    return get_secondary_winding_complex_current_in_pu()*Ibase;
+        return get_secondary_winding_complex_current_in_pu()*Ibase;
+    }
+    else
+        return 0.0;
 }
 
 complex<double> TRANSFORMER::get_tertiary_winding_complex_current_in_kA() const
 {
-    if(is_two_winding_transformer() or get_winding_breaker_status(TERTIARY_SIDE)==false)
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(is_three_winding_transformer() and get_winding_breaker_status(TERTIARY_SIDE)==true)
+    {
+        ostringstream osstream;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    double Vbase = psdb.get_bus_base_voltage_in_kV(get_winding_bus(TERTIARY_SIDE));
-    double Ibase = psdb.get_system_base_power_in_MVA()/(sqrt(3.0)*Vbase);
+        double Vbase = psdb.get_bus_base_voltage_in_kV(get_winding_bus(TERTIARY_SIDE));
+        double Ibase = psdb.get_system_base_power_in_MVA()/(sqrt(3.0)*Vbase);
 
-    return get_tertiary_winding_complex_current_in_pu()*Ibase;
+        return get_tertiary_winding_complex_current_in_pu()*Ibase;
+    }
+    else
+        return 0.0;
 }
 
 complex<double> TRANSFORMER::get_winding_complex_power_in_pu(TRANSFORMER_WINDING_SIDE side) const
@@ -1343,47 +1379,53 @@ complex<double> TRANSFORMER::get_winding_complex_power_in_pu(TRANSFORMER_WINDING
 
 complex<double> TRANSFORMER::get_primary_winding_complex_power_in_pu() const
 {
-    if(get_winding_breaker_status(PRIMARY_SIDE)==false)
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(get_winding_breaker_status(PRIMARY_SIDE)==true)
+    {
+        ostringstream osstream;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    complex<double> V, I;
-    V = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(PRIMARY_SIDE));
-    I = get_primary_winding_complex_current_in_pu();
-    return V*conj(I);
+        complex<double> V, I;
+        V = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(PRIMARY_SIDE));
+        I = get_primary_winding_complex_current_in_pu();
+        return V*conj(I);
+    }
+    else
+        return 0.0;
 }
 
 complex<double> TRANSFORMER::get_secondary_winding_complex_power_in_pu() const
 {
-    if(get_winding_breaker_status(SECONDARY_SIDE)==false)
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(get_winding_breaker_status(SECONDARY_SIDE)==true)
+    {
+        ostringstream osstream;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    complex<double> V, I;
-    V = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(SECONDARY_SIDE));
-    I = get_secondary_winding_complex_current_in_pu();
-    return V*conj(I);
+        complex<double> V, I;
+        V = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(SECONDARY_SIDE));
+        I = get_secondary_winding_complex_current_in_pu();
+        return V*conj(I);
+    }
+    else
+        return 0.0;
 }
 
 complex<double> TRANSFORMER::get_tertiary_winding_complex_power_in_pu() const
 {
-    if(is_two_winding_transformer() or get_winding_breaker_status(TERTIARY_SIDE)==false)
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(is_three_winding_transformer() and get_winding_breaker_status(TERTIARY_SIDE)==true)
+    {
+        ostringstream osstream;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    complex<double> V, I;
-    V = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(TERTIARY_SIDE));
-    I = get_tertiary_winding_complex_current_in_pu();
-    return V*conj(I);
+        complex<double> V, I;
+        V = psdb.get_bus_complex_voltage_in_pu(get_winding_bus(TERTIARY_SIDE));
+        I = get_tertiary_winding_complex_current_in_pu();
+        return V*conj(I);
+    }
+    else
+        return 0.0;
 }
 
 
@@ -1431,30 +1473,32 @@ complex<double> TRANSFORMER::get_leakage_impedance_between_windings_based_on_sys
 {
     ostringstream osstream;
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(winding1==winding2)
-    {
-        osstream<<"Warning. The same windings ("<<get_winding_name(winding1)<<") are not allowed to get winding leakage impedance based on system base. Zero will be returned.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return 0.0;
-    }
-    if(winding1>winding2)
+    if(winding1!=winding2)
     {
-        TRANSFORMER_WINDING_SIDE temp_winding;
-        temp_winding = winding1;
-        winding1 = winding2;
-        winding2 = temp_winding;
-    }
-
-    double Sbase = 100.0;
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        if(winding1>winding2)
+        {
+            TRANSFORMER_WINDING_SIDE temp_winding;
+            temp_winding = winding1;
+            winding1 = winding2;
+            winding2 = temp_winding;
+        }
+        double Sbase = 100.0;
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    Sbase = psdb.get_system_base_power_in_MVA();
+        Sbase = psdb.get_system_base_power_in_MVA();
 
-    double Sbase_winding = get_winding_nominal_capacity_in_MVA(winding1, winding2);
+        double Sbase_winding = get_winding_nominal_capacity_in_MVA(winding1, winding2);
 
-    complex<double> Z = get_leakage_impedance_between_windings_based_on_winding_nominals_in_pu(winding1, winding2);
+        complex<double> Z = get_leakage_impedance_between_windings_based_on_winding_nominals_in_pu(winding1, winding2);
 
-    return Z*Sbase/Sbase_winding;
+        return Z*Sbase/Sbase_winding;
+    }
+    else
+    {
+        osstream<<"Warning. The same windings ("<<get_winding_name(winding1)<<") are not allowed to get winding leakage impedance based on system base. Zero will be returned.";
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        return 0.0;
+    }
 }
 
 double TRANSFORMER::get_winding_off_nominal_turn_ratio_in_pu(TRANSFORMER_WINDING_SIDE side) const
@@ -1499,18 +1543,20 @@ double TRANSFORMER::get_secondary_winding_off_nominal_turn_ratio_in_pu() const
 
 double TRANSFORMER::get_tertiary_winding_off_nominal_turn_ratio_in_pu() const
 {
-    if(is_two_winding_transformer())
-        return 0.0;
-
-    ostringstream osstream;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(is_three_winding_transformer())
+    {
+        ostringstream osstream;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    double Tr = get_winding_turn_ratio_based_on_winding_nominal_voltage_in_pu(TERTIARY_SIDE);
-    double Vnom = get_winding_nominal_voltage_in_kV(TERTIARY_SIDE);
-    double Vbase = psdb.get_bus_base_voltage_in_kV(get_winding_bus(TERTIARY_SIDE));
+        double Tr = get_winding_turn_ratio_based_on_winding_nominal_voltage_in_pu(TERTIARY_SIDE);
+        double Vnom = get_winding_nominal_voltage_in_kV(TERTIARY_SIDE);
+        double Vbase = psdb.get_bus_base_voltage_in_kV(get_winding_bus(TERTIARY_SIDE));
 
-    return Tr*Vnom/Vbase;
+        return Tr*Vnom/Vbase;
+    }
+    else
+        return 0.0;
 }
 
 complex<double> TRANSFORMER::get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu() const
diff --git a/code/source/device/wt_generator.cpp b/code/source/device/wt_generator.cpp
index 61f85093..49ca8091 100644
--- a/code/source/device/wt_generator.cpp
+++ b/code/source/device/wt_generator.cpp
@@ -90,94 +90,97 @@ void WT_GENERATOR::run(DYNAMIC_MODE mode)
 {
     ostringstream osstream;
 
-    if(get_status()==false)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    WT_GENERATOR_MODEL* gen = get_wt_generator_model();
-    WT_AERODYNAMIC_MODEL* aero = get_wt_aerodynamic_model();
-    WT_TURBINE_MODEL* turbine = get_wt_turbine_model();
-    WT_ELECTRICAL_MODEL* elec = get_wt_electrical_model();
-    WT_PITCH_MODEL* pitch = get_wt_pitch_model();
-    WIND_SPEED_MODEL* wind = get_wind_speed_model();
-    WT_RELAY_MODEL* relay = get_wt_relay_model();
-
-    switch(mode)
+    if(get_status()==true)
     {
-        case INITIALIZE_MODE:
-        {
-            if(gen==NULL)
-            {
-                osstream<<"Error. No WT_GENERATOR_MODEL is provided for "<<get_device_name()<<" for dynamic initialization.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-                return;
-            }
-            gen->initialize();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-            if(wind!=NULL)
-                wind->initialize();
+        WT_GENERATOR_MODEL* gen = get_wt_generator_model();
+        WT_AERODYNAMIC_MODEL* aero = get_wt_aerodynamic_model();
+        WT_TURBINE_MODEL* turbine = get_wt_turbine_model();
+        WT_ELECTRICAL_MODEL* elec = get_wt_electrical_model();
+        WT_PITCH_MODEL* pitch = get_wt_pitch_model();
+        WIND_SPEED_MODEL* wind = get_wind_speed_model();
+        WT_RELAY_MODEL* relay = get_wt_relay_model();
 
-            if(aero==NULL)
+        switch(mode)
+        {
+            case INITIALIZE_MODE:
             {
-                osstream<<"Error. No WT_AERO_DYNAMIC_MODEL is provided for "<<get_device_name()<<" for dynamic initialization.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-                return;
+                if(gen!=NULL)
+                    gen->initialize();
+                else
+                {
+                    osstream<<"Error. No WT_GENERATOR_MODEL is provided for "<<get_device_name()<<" for dynamic initialization.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    return;
+                }
+
+                if(wind!=NULL)
+                    wind->initialize();
+
+                if(aero!=NULL)
+                    aero->initialize();
+                else
+                {
+                    osstream<<"Error. No WT_AERO_DYNAMIC_MODEL is provided for "<<get_device_name()<<" for dynamic initialization.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    return;
+                }
+
+                if(turbine!=NULL)
+                    turbine->initialize();
+                else
+                {
+                    osstream<<"Error. No WT_TURBINE_MODEL is provided for "<<get_device_name()<<" for dynamic initialization.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    return;
+                }
+
+
+                if(elec!=NULL)
+                    elec->initialize();
+
+                if(pitch!=NULL)
+                    pitch->initialize();
+
+                if(relay!=NULL)
+                    relay->initialize();
+
+                break;
             }
-            aero->initialize();
-
-            if(turbine==NULL)
+            case INTEGRATE_MODE:
+            case UPDATE_MODE:
             {
-                osstream<<"Error. No WT_TURBINE_MODEL is provided for "<<get_device_name()<<" for dynamic initialization.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-                return;
-            }
-            turbine->initialize();
+                if(relay!=NULL)
+                    relay->run(mode);
 
+                if(pitch!=NULL)
+                    pitch->run(mode);
 
-            if(elec!=NULL)
-                elec->initialize();
+                //if(wind!=NULL)
+                //    wind->run(mode);
 
-            if(pitch!=NULL)
-                pitch->initialize();
+                if(turbine!=NULL)
+                    turbine->run(mode);
 
-            if(relay!=NULL)
-                relay->initialize();
+                if(elec!=NULL)
+                    elec->run(mode);
 
-            break;
-        }
-        case INTEGRATE_MODE:
-        case UPDATE_MODE:
-        {
-            if(relay!=NULL)
-                relay->run(mode);
-
-            if(pitch!=NULL)
-                pitch->run(mode);
-
-            //if(wind!=NULL)
-            //    wind->run(mode);
+                if(turbine!=NULL)
+                    turbine->run(mode);
 
-            if(turbine!=NULL)
-                turbine->run(mode);
+                //if(aero!=NULL)
+                //    aero->run(mode);
 
-            if(elec!=NULL)
-                elec->run(mode);
-
-            if(turbine!=NULL)
-                turbine->run(mode);
-
-            //if(aero!=NULL)
-            //    aero->run(mode);
-
-            if(gen!=NULL)
-                gen->run(mode);
-            break;
-        }
-        case RELAY_MODE:
-        {
-            if(relay!=NULL)
-                relay->run(mode);
+                if(gen!=NULL)
+                    gen->run(mode);
+                break;
+            }
+            case RELAY_MODE:
+            {
+                if(relay!=NULL)
+                    relay->run(mode);
+            }
         }
     }
 }
@@ -206,199 +209,202 @@ void WT_GENERATOR::save() const
 
 void WT_GENERATOR::set_model(const MODEL* model)
 {
-    if(model == NULL)
-        return;
-
-    if(model->get_allowed_device_type()!="WT GENERATOR")
-        return;
-
-    if(model->get_model_type()=="WT GENERATOR")
+    if(model != NULL)
     {
-        set_wt_generator_model((WT_GENERATOR_MODEL*) model);
-        return;
-    }
+        if(model->get_allowed_device_type()=="WT GENERATOR")
+        {
+            if(model->get_model_type()=="WT GENERATOR")
+            {
+                set_wt_generator_model((WT_GENERATOR_MODEL*) model);
+                return;
+            }
 
-    if(model->get_model_type()=="WT AERODYNAMIC")
-    {
-        set_wt_aerodynamic_model((WT_AERODYNAMIC_MODEL*) model);
-        return;
-    }
+            if(model->get_model_type()=="WT AERODYNAMIC")
+            {
+                set_wt_aerodynamic_model((WT_AERODYNAMIC_MODEL*) model);
+                return;
+            }
 
-    if(model->get_model_type()=="WT TURBINE")
-    {
-        set_wt_turbine_model((WT_TURBINE_MODEL*) model);
-        return;
-    }
+            if(model->get_model_type()=="WT TURBINE")
+            {
+                set_wt_turbine_model((WT_TURBINE_MODEL*) model);
+                return;
+            }
 
-    if(model->get_model_type()=="WT ELECTRICAL")
-    {
-        set_wt_electrical_model((WT_ELECTRICAL_MODEL*) model);
-        return;
-    }
+            if(model->get_model_type()=="WT ELECTRICAL")
+            {
+                set_wt_electrical_model((WT_ELECTRICAL_MODEL*) model);
+                return;
+            }
 
-    if(model->get_model_type()=="WT PITCH")
-    {
-        set_wt_pitch_model((WT_PITCH_MODEL*) model);
-        return;
-    }
+            if(model->get_model_type()=="WT PITCH")
+            {
+                set_wt_pitch_model((WT_PITCH_MODEL*) model);
+                return;
+            }
 
-    if(model->get_model_type()=="WIND SPEED")
-    {
-        set_wind_speed_model((WIND_SPEED_MODEL*) model);
-        return;
-    }
+            if(model->get_model_type()=="WIND SPEED")
+            {
+                set_wind_speed_model((WIND_SPEED_MODEL*) model);
+                return;
+            }
 
-    if(model->get_model_type()=="WT RELAY")
-    {
-        set_wt_relay_model((WT_RELAY_MODEL*) model);
-        return;
-    }
+            if(model->get_model_type()=="WT RELAY")
+            {
+                set_wt_relay_model((WT_RELAY_MODEL*) model);
+                return;
+            }
 
-    ostringstream osstream;
-    osstream<<"Warning. Unsupported model type '"<<model->get_model_type()<<"' when setting up wind-turbine generator-related model.";
+            ostringstream osstream;
+            osstream<<"Warning. Unsupported model type '"<<model->get_model_type()<<"' when setting up wind-turbine generator-related model.";
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    toolkit.show_information_with_leading_time_stamp(osstream);
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
+    }
 }
 
 void WT_GENERATOR::set_wt_generator_model(const WT_GENERATOR_MODEL* model)
 {
     ostringstream osstream;
-    if(model==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(model->get_model_type()!="WT GENERATOR")
+    if(model!=NULL)
     {
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wt generator model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    WT_GENERATOR_MODEL* oldmodel = get_wt_generator_model();
-    if(oldmodel!=NULL)
-    {
-        delete oldmodel;
-        wt_generator_model = NULL;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        if(model->get_model_type()=="WT GENERATOR")
+        {
+            WT_GENERATOR_MODEL* oldmodel = get_wt_generator_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                wt_generator_model = NULL;
+            }
 
-    WT_GENERATOR_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="WT3G1")
-    {
-        WT3G1* smodel = (WT3G1*) (model);
-        new_model = (WT_GENERATOR_MODEL*) new WT3G1(*smodel);
-    }
-    if(model_name=="WT3G0")
-    {
-        WT3G0* smodel = (WT3G0*) (model);
-        new_model = (WT_GENERATOR_MODEL*) new WT3G0(*smodel);
-    }
-    if(model_name=="WT3G2")
-    {
-        WT3G2* smodel = (WT3G2*) (model);
-        new_model = (WT_GENERATOR_MODEL*) new WT3G2(*smodel);
-    }
+            WT_GENERATOR_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="WT3G1")
+            {
+                WT3G1* smodel = (WT3G1*) (model);
+                new_model = (WT_GENERATOR_MODEL*) new WT3G1(*smodel);
+            }
+            if(model_name=="WT3G0")
+            {
+                WT3G0* smodel = (WT3G0*) (model);
+                new_model = (WT_GENERATOR_MODEL*) new WT3G0(*smodel);
+            }
+            if(model_name=="WT3G2")
+            {
+                WT3G2* smodel = (WT3G2*) (model);
+                new_model = (WT_GENERATOR_MODEL*) new WT3G2(*smodel);
+            }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        wt_generator_model = new_model;
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                wt_generator_model = new_model;
 
-        set_number_of_lumped_wt_generators(new_model->get_number_of_lumped_wt_generators());
-        set_rated_power_per_wt_generator_in_MW(new_model->get_rated_power_per_wt_generator_in_MW());
-    }
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wt generator model of "<<get_device_name()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+                set_number_of_lumped_wt_generators(new_model->get_number_of_lumped_wt_generators());
+                set_rated_power_per_wt_generator_in_MW(new_model->get_rated_power_per_wt_generator_in_MW());
+            }
+            else
+            {
+                ostringstream osstream;
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wt generator model of "<<get_device_name()<<".";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wt generator model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void WT_GENERATOR::set_wt_aerodynamic_model(const WT_AERODYNAMIC_MODEL* model)
 {
     ostringstream osstream;
-    if(model==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(model->get_model_type()!="WT AERODYNAMIC")
-    {
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wt aerodynamic model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    WT_AERODYNAMIC_MODEL* oldmodel = get_wt_aerodynamic_model();
-    if(oldmodel!=NULL)
+    if(model!=NULL)
     {
-        delete oldmodel;
-        wt_aerodynamic_model = NULL;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        if(model->get_model_type()=="WT AERODYNAMIC")
+        {
+            WT_AERODYNAMIC_MODEL* oldmodel = get_wt_aerodynamic_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                wt_aerodynamic_model = NULL;
+            }
 
-    WT_AERODYNAMIC_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="AERD0")
-    {
-        AERD0* smodel = (AERD0*) (model);
-        new_model = (WT_AERODYNAMIC_MODEL*) new AERD0(*smodel);
-    }
+            WT_AERODYNAMIC_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="AERD0")
+            {
+                AERD0* smodel = (AERD0*) (model);
+                new_model = (WT_AERODYNAMIC_MODEL*) new AERD0(*smodel);
+            }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        wt_aerodynamic_model = new_model;
-    }
-    else
-    {
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wt aerodynamic model of "<<get_device_name()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                wt_aerodynamic_model = new_model;
+            }
+            else
+            {
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wt aerodynamic model of "<<get_device_name()<<".";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wt aerodynamic model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void WT_GENERATOR::set_wt_turbine_model(const WT_TURBINE_MODEL* model)
 {
     ostringstream osstream;
-    if(model==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    if(model->get_model_type()!="WT TURBINE")
+    if(model!=NULL)
     {
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wt turbine model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    WT_TURBINE_MODEL* oldmodel = get_wt_turbine_model();
-    if(oldmodel!=NULL)
-    {
-        delete oldmodel;
-        wt_turbine_model = NULL;
-    }
+        if(model->get_model_type()=="WT TURBINE")
+        {
+            WT_TURBINE_MODEL* oldmodel = get_wt_turbine_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                wt_turbine_model = NULL;
+            }
 
-    WT_TURBINE_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="WT3T0")
-    {
-        WT3T0* smodel = (WT3T0*) (model);
-        new_model = (WT_TURBINE_MODEL*) new WT3T0(*smodel);
-    }
+            WT_TURBINE_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="WT3T0")
+            {
+                WT3T0* smodel = (WT3T0*) (model);
+                new_model = (WT_TURBINE_MODEL*) new WT3T0(*smodel);
+            }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        wt_turbine_model = new_model;
-    }
-    else
-    {
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wt turbine model of "<<get_device_name()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                wt_turbine_model = new_model;
+            }
+            else
+            {
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wt turbine model of "<<get_device_name()<<".";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wt turbine model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
@@ -406,126 +412,129 @@ void WT_GENERATOR::set_wt_turbine_model(const WT_TURBINE_MODEL* model)
 void WT_GENERATOR::set_wt_electrical_model(const WT_ELECTRICAL_MODEL* model)
 {
     ostringstream osstream;
-    if(model==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(model->get_model_type()!="WT ELECTRICAL")
+    if(model!=NULL)
     {
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wt electrical model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    WT_ELECTRICAL_MODEL* oldmodel = get_wt_electrical_model();
-    if(oldmodel!=NULL)
-    {
-        delete oldmodel;
-        wt_electrical_model = NULL;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        if(model->get_model_type()=="WT ELECTRICAL")
+        {
+            WT_ELECTRICAL_MODEL* oldmodel = get_wt_electrical_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                wt_electrical_model = NULL;
+            }
 
-    WT_ELECTRICAL_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="WT3E0")
-    {
-        WT3E0* smodel = (WT3E0*) (model);
-        new_model = (WT_ELECTRICAL_MODEL*) new WT3E0(*smodel);
-    }
+            WT_ELECTRICAL_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="WT3E0")
+            {
+                WT3E0* smodel = (WT3E0*) (model);
+                new_model = (WT_ELECTRICAL_MODEL*) new WT3E0(*smodel);
+            }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        wt_electrical_model = new_model;
-    }
-    else
-    {
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wt electrical model of "<<get_device_name()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                wt_electrical_model = new_model;
+            }
+            else
+            {
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wt electrical model of "<<get_device_name()<<".";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wt electrical model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void WT_GENERATOR::set_wt_pitch_model(const WT_PITCH_MODEL* model)
 {
     ostringstream osstream;
-    if(model==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(model->get_model_type()!="WT PITCH")
-    {
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wt pitch model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    WT_PITCH_MODEL* oldmodel = get_wt_pitch_model();
-    if(oldmodel!=NULL)
+    if(model!=NULL)
     {
-        delete oldmodel;
-        wt_pitch_model = NULL;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        if(model->get_model_type()=="WT PITCH")
+        {
+            WT_PITCH_MODEL* oldmodel = get_wt_pitch_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                wt_pitch_model = NULL;
+            }
 
-    WT_PITCH_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="WT3P0")
-    {
-        WT3P0* smodel = (WT3P0*) (model);
-        new_model = (WT_PITCH_MODEL*) new WT3P0(*smodel);
-    }
+            WT_PITCH_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="WT3P0")
+            {
+                WT3P0* smodel = (WT3P0*) (model);
+                new_model = (WT_PITCH_MODEL*) new WT3P0(*smodel);
+            }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        wt_pitch_model = new_model;
-    }
-    else
-    {
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wt pitch model of "<<get_device_name()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                wt_pitch_model = new_model;
+            }
+            else
+            {
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wt pitch model of "<<get_device_name()<<".";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wt pitch model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void WT_GENERATOR::set_wind_speed_model(const WIND_SPEED_MODEL* model)
 {
     ostringstream osstream;
-    if(model==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(model->get_model_type()!="WIND SPEED")
-    {
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wind speed model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    WIND_SPEED_MODEL* oldmodel = get_wind_speed_model();
-    if(oldmodel!=NULL)
+    if(model!=NULL)
     {
-        delete oldmodel;
-        wind_speed_model = NULL;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        if(model->get_model_type()=="WIND SPEED")
+        {
+            WIND_SPEED_MODEL* oldmodel = get_wind_speed_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                wind_speed_model = NULL;
+            }
 
-    WIND_SPEED_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="FILEWIND")
-    {
-        FILEWIND* smodel = (FILEWIND*) (model);
-        new_model = (WIND_SPEED_MODEL*) new FILEWIND(*smodel);
-    }
+            WIND_SPEED_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="FILEWIND")
+            {
+                FILEWIND* smodel = (FILEWIND*) (model);
+                new_model = (WIND_SPEED_MODEL*) new FILEWIND(*smodel);
+            }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        wind_speed_model = new_model;
-    }
-    else
-    {
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wind speed model of "<<get_device_name()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                wind_speed_model = new_model;
+            }
+            else
+            {
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wind speed model of "<<get_device_name()<<".";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wind speed model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
@@ -533,44 +542,45 @@ void WT_GENERATOR::set_wind_speed_model(const WIND_SPEED_MODEL* model)
 void WT_GENERATOR::set_wt_relay_model(const WT_RELAY_MODEL* model)
 {
     ostringstream osstream;
-    if(model==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(model->get_model_type()!="WT RELAY")
+    if(model!=NULL)
     {
-        osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wt relay model.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    WT_RELAY_MODEL* oldmodel = get_wt_relay_model();
-    if(oldmodel!=NULL)
-    {
-        delete oldmodel;
-        wt_relay_model = NULL;
-    }
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        if(model->get_model_type()=="WT RELAY")
+        {
+            WT_RELAY_MODEL* oldmodel = get_wt_relay_model();
+            if(oldmodel!=NULL)
+            {
+                delete oldmodel;
+                wt_relay_model = NULL;
+            }
 
-    WT_RELAY_MODEL *new_model = NULL;
-    string model_name = model->get_model_name();
-    if(model_name=="WTRLY0")
-    {
-        WTRLY0* smodel = (WTRLY0*) (model);
-        new_model = (WT_RELAY_MODEL*) new WTRLY0(*smodel);
-    }
+            WT_RELAY_MODEL *new_model = NULL;
+            string model_name = model->get_model_name();
+            if(model_name=="WTRLY0")
+            {
+                WTRLY0* smodel = (WTRLY0*) (model);
+                new_model = (WT_RELAY_MODEL*) new WTRLY0(*smodel);
+            }
 
-    if(new_model!=NULL)
-    {
-        new_model->set_toolkit(toolkit);
-        new_model->set_device_id(get_device_id());
-        wt_relay_model = new_model;
-        //osstream<<"wt relay model is set";
-        //toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    else
-    {
-        osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wt relay model of "<<get_device_name()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+            if(new_model!=NULL)
+            {
+                new_model->set_toolkit(toolkit);
+                new_model->set_device_id(get_device_id());
+                wt_relay_model = new_model;
+                //osstream<<"wt relay model is set";
+                //toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+            else
+            {
+                osstream<<"Warning. Model '"<<model_name<<"' is not supported when append wt relay model of "<<get_device_name()<<".";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Model of type '"<<model->get_model_type()<<"' is not allowed when setting up wt relay model.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
diff --git a/code/source/meter/meter.cpp b/code/source/meter/meter.cpp
index fc6ff0cd..08eb89c9 100644
--- a/code/source/meter/meter.cpp
+++ b/code/source/meter/meter.cpp
@@ -252,24 +252,26 @@ void METER::set_meter_type(string meter_type)
 {
     ostringstream osstream;
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    if(not device_id.is_valid())
+    if(device_id.is_valid())
     {
-        osstream<<"Warning. Device id is invalid for setting up meter type. Set up proper device id first.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    meter_type = string2upper(meter_type);
+        meter_type = string2upper(meter_type);
 
-    if(is_valid_meter_type(meter_type))
-    {
-        this->meter_type = meter_type;
+        if(is_valid_meter_type(meter_type))
+        {
+            this->meter_type = meter_type;
+        }
+        else
+        {
+            osstream<<"Warning, Invalid meter type '"<<meter_type<<"' is not supported for setting up meter type of "<<device_id.get_device_name()<<".";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            this->meter_type = "";
+        }
     }
     else
     {
-        osstream<<"Warning, Invalid meter type '"<<meter_type<<"' is not supported for setting up meter type of "<<device_id.get_device_name()<<".";
+        osstream<<"Warning. Device id is invalid for setting up meter type. Set up proper device id first.";
         toolkit.show_information_with_leading_time_stamp(osstream);
-        this->meter_type = "";
+        return;
     }
 }
 
@@ -277,117 +279,121 @@ void METER::set_internal_variable_name(string name)
 {
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     ostringstream osstream;
-    if(not device_id.is_valid())
+    if(device_id.is_valid())
     {
-        osstream<<"Warning. Device id is invalid for setting up meter internal variable name. Set up proper device id first.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    if(meter_type.find("INTERNAL VARIABLE") != string::npos)
-    {
-        if(is_internal_variable_name_valid(name))
-            this->internal_variable_name = name;
-        else
+        if(meter_type.find("INTERNAL VARIABLE") != string::npos)
+        {
+            if(is_internal_variable_name_valid(name))
+                this->internal_variable_name = name;
+            else
+            {
+                osstream<<"Warning, Internal variable name '"<<name<<"' is not valid. No internal variable name will be set.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                this->internal_variable_name = "";
+            }
+        }
+        else
         {
-            osstream<<"Warning, Internal variable name '"<<name<<"' is not valid. No internal variable name will be set.";
+            osstream<<"Warning, Meter type '"<<meter_type<<"' is not valid Internal Variable Meter. No internal variable name will be set.";
             toolkit.show_information_with_leading_time_stamp(osstream);
-            this->internal_variable_name = "";
-        }
+            this->internal_variable_name = "";
+        }
     }
     else
     {
-        osstream<<"Warning, Meter type '"<<meter_type<<"' is not valid Internal Variable Meter. No internal variable name will be set.";
+        osstream<<"Warning. Device id is invalid for setting up meter internal variable name. Set up proper device id first.";
         toolkit.show_information_with_leading_time_stamp(osstream);
-        this->internal_variable_name = "";
+        return;
     }
 }
 
 bool METER::is_internal_variable_name_valid(string name) const
 {
-    if(get_device_pointer()==NULL)
-        return false;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+    if(get_device_pointer()!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    name = string2upper(name);
-    string meter_type = get_meter_type();
-    MODEL* model=NULL;
-    if(get_device_type()=="LOAD")
-    {
-        LOAD* ptr = (LOAD*)get_device_pointer();
-        if(meter_type=="LOAD MODEL INTERNAL VARIABLE")
-            model = ptr->get_load_model();
-        if(meter_type=="FREQUENCY RELAY MODEL INTERNAL VARIABLE")
-            model = ptr->get_load_frequency_relay_model();
-        if(meter_type=="VOLTAGE RELAY MODEL INTERNAL VARIABLE")
-            model = ptr->get_load_voltage_relay_model();
-    }
-    if(get_device_type()=="GENERATOR")
-    {
-        GENERATOR* ptr = (GENERATOR*)get_device_pointer();
-        if(meter_type=="SYNC GENERATOR MODEL INTERNAL VARIABLE")
-            model = ptr->get_sync_generator_model();
-        if(meter_type=="COMPENSATOR MODEL INTERNAL VARIABLE")
-            model = ptr->get_compensator_model();
-        if(meter_type=="EXCITER MODEL INTERNAL VARIABLE")
-            model = ptr->get_exciter_model();
-        if(meter_type=="STABILIZER MODEL INTERNAL VARIABLE")
-            model = ptr->get_stabilizer_model();
-        if(meter_type=="TURBINE GOVERNOR MODEL INTERNAL VARIABLE")
-            model = ptr->get_turbine_governor_model();
-        if(meter_type=="TURBINE LOAD CONTROLLER MODEL INTERNAL VARIABLE")
-            model = ptr->get_turbine_load_controller_model();
-    }
-    if(get_device_type()=="WT GENERATOR")
-    {
-        WT_GENERATOR* ptr = (WT_GENERATOR*)get_device_pointer();
-        if(meter_type=="WT GENERATOR MODEL INTERNAL VARIABLE")
-            model = ptr->get_wt_generator_model();
-        if(meter_type=="WT AERODYNAMIC MODEL INTERNAL VARIABLE")
-            model = ptr->get_wt_aerodynamic_model();
-        if(meter_type=="WT TURBINE MODEL INTERNAL VARIABLE")
-            model = ptr->get_wt_turbine_model();
-        if(meter_type=="WT ELECTRICAL MODEL INTERNAL VARIABLE")
-            model = ptr->get_wt_electrical_model();
-        if(meter_type=="WT PITCH MODEL INTERNAL VARIABLE")
-            model = ptr->get_wt_pitch_model();
-        if(meter_type=="WIND SPEED MODEL INTERNAL VARIABLE")
-            model = ptr->get_wind_speed_model();
-    }
-    if(get_device_type()=="PV UNIT")
-    {
-        PV_UNIT* ptr = (PV_UNIT*)get_device_pointer();
-        if(meter_type=="PV PANEL MODEL INTERNAL VARIABLE")
-            model = ptr->get_pv_panel_model();
-        if(meter_type=="PV CONVERTER MODEL INTERNAL VARIABLE")
-            model = ptr->get_pv_converter_model();
-        if(meter_type=="PV ELECTRICAL MODEL INTERNAL VARIABLE")
-            model = ptr->get_pv_electrical_model();
-        if(meter_type=="PV IRRADIANCE MODEL INTERNAL VARIABLE")
-            model = ptr->get_pv_irradiance_model();
-    }
-    if(get_device_type()=="ENERGY STORAGE")
-    {
-        ENERGY_STORAGE* ptr = (ENERGY_STORAGE*)get_device_pointer();
-        if(meter_type=="ENERGY STORAGE MODEL INTERNAL VARIABLE")
-            model = ptr->get_energy_storage_model();
-    }
-    if(get_device_type()=="HVDC")
-    {
-        HVDC* ptr = (HVDC*)get_device_pointer();
-        if(meter_type=="HVDC MODEL INTERNAL VARIABLE")
-            model = ptr->get_hvdc_model();
-    }
-    if(model!=NULL)
-        return model->is_model_inernal_variable_exist(name);
-    else
-    {
-        ostringstream osstream;
-        osstream<<"Warning. No dynamic model is found when check if internal variable name is valid.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return false;
+        name = string2upper(name);
+        string meter_type = get_meter_type();
+        MODEL* model=NULL;
+        if(get_device_type()=="LOAD")
+        {
+            LOAD* ptr = (LOAD*)get_device_pointer();
+            if(meter_type=="LOAD MODEL INTERNAL VARIABLE")
+                model = ptr->get_load_model();
+            if(meter_type=="FREQUENCY RELAY MODEL INTERNAL VARIABLE")
+                model = ptr->get_load_frequency_relay_model();
+            if(meter_type=="VOLTAGE RELAY MODEL INTERNAL VARIABLE")
+                model = ptr->get_load_voltage_relay_model();
+        }
+        if(get_device_type()=="GENERATOR")
+        {
+            GENERATOR* ptr = (GENERATOR*)get_device_pointer();
+            if(meter_type=="SYNC GENERATOR MODEL INTERNAL VARIABLE")
+                model = ptr->get_sync_generator_model();
+            if(meter_type=="COMPENSATOR MODEL INTERNAL VARIABLE")
+                model = ptr->get_compensator_model();
+            if(meter_type=="EXCITER MODEL INTERNAL VARIABLE")
+                model = ptr->get_exciter_model();
+            if(meter_type=="STABILIZER MODEL INTERNAL VARIABLE")
+                model = ptr->get_stabilizer_model();
+            if(meter_type=="TURBINE GOVERNOR MODEL INTERNAL VARIABLE")
+                model = ptr->get_turbine_governor_model();
+            if(meter_type=="TURBINE LOAD CONTROLLER MODEL INTERNAL VARIABLE")
+                model = ptr->get_turbine_load_controller_model();
+        }
+        if(get_device_type()=="WT GENERATOR")
+        {
+            WT_GENERATOR* ptr = (WT_GENERATOR*)get_device_pointer();
+            if(meter_type=="WT GENERATOR MODEL INTERNAL VARIABLE")
+                model = ptr->get_wt_generator_model();
+            if(meter_type=="WT AERODYNAMIC MODEL INTERNAL VARIABLE")
+                model = ptr->get_wt_aerodynamic_model();
+            if(meter_type=="WT TURBINE MODEL INTERNAL VARIABLE")
+                model = ptr->get_wt_turbine_model();
+            if(meter_type=="WT ELECTRICAL MODEL INTERNAL VARIABLE")
+                model = ptr->get_wt_electrical_model();
+            if(meter_type=="WT PITCH MODEL INTERNAL VARIABLE")
+                model = ptr->get_wt_pitch_model();
+            if(meter_type=="WIND SPEED MODEL INTERNAL VARIABLE")
+                model = ptr->get_wind_speed_model();
+        }
+        if(get_device_type()=="PV UNIT")
+        {
+            PV_UNIT* ptr = (PV_UNIT*)get_device_pointer();
+            if(meter_type=="PV PANEL MODEL INTERNAL VARIABLE")
+                model = ptr->get_pv_panel_model();
+            if(meter_type=="PV CONVERTER MODEL INTERNAL VARIABLE")
+                model = ptr->get_pv_converter_model();
+            if(meter_type=="PV ELECTRICAL MODEL INTERNAL VARIABLE")
+                model = ptr->get_pv_electrical_model();
+            if(meter_type=="PV IRRADIANCE MODEL INTERNAL VARIABLE")
+                model = ptr->get_pv_irradiance_model();
+        }
+        if(get_device_type()=="ENERGY STORAGE")
+        {
+            ENERGY_STORAGE* ptr = (ENERGY_STORAGE*)get_device_pointer();
+            if(meter_type=="ENERGY STORAGE MODEL INTERNAL VARIABLE")
+                model = ptr->get_energy_storage_model();
+        }
+        if(get_device_type()=="HVDC")
+        {
+            HVDC* ptr = (HVDC*)get_device_pointer();
+            if(meter_type=="HVDC MODEL INTERNAL VARIABLE")
+                model = ptr->get_hvdc_model();
+        }
+        if(model!=NULL)
+            return model->is_model_inernal_variable_exist(name);
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Warning. No dynamic model is found when check if internal variable name is valid.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            return false;
+        }
     }
+    else
+        return false;
 }
 
 void METER::set_meter_side_bus(size_t meter_side)
@@ -416,13 +422,15 @@ void METER::check()
 }
 bool METER::is_valid_meter_type(string meter_type) const
 {
-    if(not device_id.is_valid())
-        return false;
-
-    string device_type = device_id.get_device_type();
-    meter_type = string2upper(meter_type);
+    if(device_id.is_valid())
+    {
+        string device_type = device_id.get_device_type();
+        meter_type = string2upper(meter_type);
 
-    return is_valid_meter_type_of_device(meter_type, device_type);
+        return is_valid_meter_type_of_device(meter_type, device_type);
+    }
+    else
+        return false;
 }
 
 bool METER::is_valid_meter_type_of_device(string meter_type, string device_type) const
@@ -432,13 +440,7 @@ bool METER::is_valid_meter_type_of_device(string meter_type, string device_type)
 
     device_type = string2upper(device_type);
     map<string, vector<string> >::const_iterator it = SUPPORTED_METERS.find(device_type);
-    if(it==SUPPORTED_METERS.end())
-    {
-        osstream<<"Warning. Device type "<<device_type<<" is not supported for setting up meter.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return false;
-    }
-    else
+    if(it!=SUPPORTED_METERS.end())
     {
         vector<string> supported_meters = it->second;
         size_t n = supported_meters.size();
@@ -453,6 +455,12 @@ bool METER::is_valid_meter_type_of_device(string meter_type, string device_type)
         }
         return flag_valid;
     }
+    else
+    {
+        osstream<<"Warning. Device type "<<device_type<<" is not supported for setting up meter.";
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        return false;
+    }
 }
 
 DEVICE_ID METER::get_device_id() const
@@ -489,9 +497,7 @@ string METER::get_meter_name() const
 {
     string name;
     string meter_type = get_meter_type();
-    if(meter_type=="")
-        return "";
-    else
+    if(meter_type!="")
     {
         name = get_meter_type();
         if(meter_type.find("INTERNAL VARIABLE")!=string::npos)
@@ -507,6 +513,8 @@ string METER::get_meter_name() const
         name = trim_string(name);
         return name;
     }
+    else
+        return "";
 }
 
 bool METER::is_valid() const
@@ -633,24 +641,41 @@ size_t METER::get_buffer_size() const
 
 void METER::initialize_meter_buffer()
 {
-    if(get_device_pointer()==NULL)
+    if(get_device_pointer()!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        double current_time = toolkit.get_dynamic_simulation_time_in_s();
+
+        double value = get_meter_value();
+        buffer.initialize_buffer(current_time, value);
+    }
+    else
+    {
         set_device_pointer();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    double current_time = toolkit.get_dynamic_simulation_time_in_s();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        double current_time = toolkit.get_dynamic_simulation_time_in_s();
 
-    double value = get_meter_value();
-    buffer.initialize_buffer(current_time, value);
+        double value = get_meter_value();
+        buffer.initialize_buffer(current_time, value);
+    }
 }
 
 void METER::update_meter_buffer()
 {
-    if(get_device_pointer()==NULL)
+    if(get_device_pointer()!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        double current_time = toolkit.get_dynamic_simulation_time_in_s();
+        buffer.append_data(current_time, get_meter_value());
+    }
+    else
+    {
         set_device_pointer();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    double current_time = toolkit.get_dynamic_simulation_time_in_s();
-
-    buffer.append_data(current_time, get_meter_value());
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        double current_time = toolkit.get_dynamic_simulation_time_in_s();
+        buffer.append_data(current_time, get_meter_value());
+    }
 }
 
 
@@ -671,1567 +696,1504 @@ size_t METER::get_delay_index_of_time(double time) const
 
 double METER::get_meter_value() const
 {
-    if(get_device_pointer()==NULL)
-        return 0.0;
-
-    string device_type = get_device_type();
-    if(device_type=="BUS")
-        return get_meter_value_as_a_bus();
-    if(device_type=="LINE")
-        return get_meter_value_as_a_line();
-    if(device_type=="TRANSFORMER")
-        return get_meter_value_as_a_transformer();
-    if(device_type=="LOAD")
-        return get_meter_value_as_a_load();
-    if(device_type=="GENERATOR")
-        return get_meter_value_as_a_generator();
-    if(device_type=="WT GENERATOR")
-        return get_meter_value_as_a_wt_generator();
-    if(device_type=="HVDC")
-        return get_meter_value_as_an_hvdc();
-    if(device_type=="EQUIVALENT DEVICE")
-        return get_meter_value_as_an_equivalent_device();
+    if(get_device_pointer()!=NULL)
+    {
+        string device_type = get_device_type();
+        if(device_type=="BUS")
+            return get_meter_value_as_a_bus();
+        if(device_type=="LINE")
+            return get_meter_value_as_a_line();
+        if(device_type=="TRANSFORMER")
+            return get_meter_value_as_a_transformer();
+        if(device_type=="LOAD")
+            return get_meter_value_as_a_load();
+        if(device_type=="GENERATOR")
+            return get_meter_value_as_a_generator();
+        if(device_type=="WT GENERATOR")
+            return get_meter_value_as_a_wt_generator();
+        if(device_type=="HVDC")
+            return get_meter_value_as_an_hvdc();
+        if(device_type=="EQUIVALENT DEVICE")
+            return get_meter_value_as_an_equivalent_device();
 
-    return 0.0;
+        return 0.0;
+    }
+    else
+        return 0.0;
 }
 
 
 double METER::get_meter_value_as_a_bus() const
 {
     BUS* bus = (BUS*) get_device_pointer();
-    if(bus->get_bus_type()==OUT_OF_SERVICE)
-        return 0.0;
+    if(bus->get_bus_type()!=OUT_OF_SERVICE)
+    {
+        if(meter_type=="VOLTAGE IN PU")
+            return bus->get_voltage_in_pu();
+        if(meter_type=="VOLTAGE IN KV")
+            return bus->get_voltage_in_pu();
+        if(meter_type=="ANGLE IN DEG")
+            return bus->get_angle_in_deg();
+        if(meter_type=="FREQUENCY DEVIATION IN PU")
+            return bus->get_frequency_deviation_in_pu();
+        if(meter_type=="FREQUENCY DEVIATION IN HZ")
+            return bus->get_frequency_deviation_in_Hz();
+        if(meter_type=="FREQUENCY IN PU")
+            return 1.0+bus->get_frequency_deviation_in_pu();
+        if(meter_type=="FREQUENCY IN HZ")
+            return bus->get_base_frequency_in_Hz()+bus->get_frequency_deviation_in_Hz();
 
-    if(meter_type=="VOLTAGE IN PU")
-        return bus->get_voltage_in_pu();
-    if(meter_type=="VOLTAGE IN KV")
-        return bus->get_voltage_in_pu();
-    if(meter_type=="ANGLE IN DEG")
-        return bus->get_angle_in_deg();
-    if(meter_type=="FREQUENCY DEVIATION IN PU")
-        return bus->get_frequency_deviation_in_pu();
-    if(meter_type=="FREQUENCY DEVIATION IN HZ")
-        return bus->get_frequency_deviation_in_Hz();
-    if(meter_type=="FREQUENCY IN PU")
-        return 1.0+bus->get_frequency_deviation_in_pu();
-    if(meter_type=="FREQUENCY IN HZ")
-        return bus->get_base_frequency_in_Hz()+bus->get_frequency_deviation_in_Hz();
-
-    return 0.0;
+        return 0.0;
+    }
+    else
+        return 0.0;
 }
 
 double METER::get_meter_value_as_a_line() const
 {
     LINE* line = (LINE*) get_device_pointer();
-    if(line == NULL)
-        return 0.0;
+    if(line != NULL)
+    {
+        if(line->get_sending_side_breaker_status()==true or line->get_receiving_side_breaker_status()==true)
+        {
+            size_t metered_bus = get_meter_side_bus();
+            if(meter_type=="CURRENT IN KA")
+            {
+                if(metered_bus!=line->get_receiving_side_bus())
+                    return steps_fast_complex_abs(line->get_line_complex_current_at_sending_side_in_kA());
+                else
+                    return steps_fast_complex_abs(line->get_line_complex_current_at_receiving_side_in_kA());
+            }
+            if(meter_type=="CURRENT IN PU")
+            {
+                if(metered_bus!=line->get_receiving_side_bus())
+                    return steps_fast_complex_abs(line->get_line_complex_current_at_sending_side_in_pu());
+                else
+                    return steps_fast_complex_abs(line->get_line_complex_current_at_receiving_side_in_pu());
+            }
 
-    if(line->get_sending_side_breaker_status()==false and line->get_receiving_side_breaker_status()==false)
-        return 0.0;
+            if(meter_type=="ACTIVE POWER IN MW")
+            {
+                if(metered_bus!=line->get_receiving_side_bus())
+                    return (line->get_line_complex_power_at_sending_side_in_MVA()).real();
+                else
+                    return (line->get_line_complex_power_at_receiving_side_in_MVA()).real();
+            }
 
-    size_t metered_bus = get_meter_side_bus();
-    if(meter_type=="CURRENT IN KA")
-    {
-        if(metered_bus!=line->get_receiving_side_bus())
-            return steps_fast_complex_abs(line->get_line_complex_current_at_sending_side_in_kA());
-        else
-            return steps_fast_complex_abs(line->get_line_complex_current_at_receiving_side_in_kA());
-    }
-    if(meter_type=="CURRENT IN PU")
-    {
-        if(metered_bus!=line->get_receiving_side_bus())
-            return steps_fast_complex_abs(line->get_line_complex_current_at_sending_side_in_pu());
-        else
-            return steps_fast_complex_abs(line->get_line_complex_current_at_receiving_side_in_pu());
-    }
+            if(meter_type=="ACTIVE POWER IN PU")
+            {
+                if(metered_bus!=line->get_receiving_side_bus())
+                    return (line->get_line_complex_power_at_sending_side_in_pu()).real();
+                else
+                    return (line->get_line_complex_power_at_receiving_side_in_pu()).real();
+            }
 
-    if(meter_type=="ACTIVE POWER IN MW")
-    {
-        if(metered_bus!=line->get_receiving_side_bus())
-            return (line->get_line_complex_power_at_sending_side_in_MVA()).real();
-        else
-            return (line->get_line_complex_power_at_receiving_side_in_MVA()).real();
-    }
+            if(meter_type=="REACTIVE POWER IN MVAR")
+            {
+                if(metered_bus!=line->get_receiving_side_bus())
+                    return (line->get_line_complex_power_at_sending_side_in_MVA()).imag();
+                else
+                    return (line->get_line_complex_power_at_receiving_side_in_MVA()).imag();
+            }
 
-    if(meter_type=="ACTIVE POWER IN PU")
-    {
-        if(metered_bus!=line->get_receiving_side_bus())
-            return (line->get_line_complex_power_at_sending_side_in_pu()).real();
-        else
-            return (line->get_line_complex_power_at_receiving_side_in_pu()).real();
-    }
+            if(meter_type=="REACTIVE POWER IN PU")
+            {
+                if(metered_bus!=line->get_receiving_side_bus())
+                    return (line->get_line_complex_power_at_sending_side_in_pu()).imag();
+                else
+                    return (line->get_line_complex_power_at_receiving_side_in_pu()).imag();
+            }
 
-    if(meter_type=="REACTIVE POWER IN MVAR")
-    {
-        if(metered_bus!=line->get_receiving_side_bus())
-            return (line->get_line_complex_power_at_sending_side_in_MVA()).imag();
-        else
-            return (line->get_line_complex_power_at_receiving_side_in_MVA()).imag();
-    }
+            if(meter_type=="APPARENT IMPEDANCE IN OHM")
+            {
+                if(metered_bus!=line->get_receiving_side_bus())
+                    return steps_fast_complex_abs(line->get_line_complex_apparent_impedance_at_sending_side_in_ohm());
+                else
+                    return steps_fast_complex_abs(line->get_line_complex_apparent_impedance_at_receiving_side_in_ohm());
+            }
 
-    if(meter_type=="REACTIVE POWER IN PU")
-    {
-        if(metered_bus!=line->get_receiving_side_bus())
-            return (line->get_line_complex_power_at_sending_side_in_pu()).imag();
-        else
-            return (line->get_line_complex_power_at_receiving_side_in_pu()).imag();
-    }
+            if(meter_type=="APPARENT IMPEDANCE IN PU")
+            {
+                if(metered_bus!=line->get_receiving_side_bus())
+                    return steps_fast_complex_abs(line->get_line_complex_apparent_impedance_at_sending_side_in_pu());
+                else
+                    return steps_fast_complex_abs(line->get_line_complex_apparent_impedance_at_receiving_side_in_pu());
+            }
 
-    if(meter_type=="APPARENT IMPEDANCE IN OHM")
-    {
-        if(metered_bus!=line->get_receiving_side_bus())
-            return steps_fast_complex_abs(line->get_line_complex_apparent_impedance_at_sending_side_in_ohm());
-        else
-            return steps_fast_complex_abs(line->get_line_complex_apparent_impedance_at_receiving_side_in_ohm());
-    }
+            if(meter_type=="APPARENT IMPEDANCE ANGLE IN DEG")
+            {
+                if(metered_bus!=line->get_receiving_side_bus())
+                    return rad2deg(steps_fast_complex_arg(line->get_line_complex_apparent_impedance_at_sending_side_in_ohm()));
+                else
+                    return rad2deg(steps_fast_complex_arg(line->get_line_complex_apparent_impedance_at_receiving_side_in_ohm()));
+            }
 
-    if(meter_type=="APPARENT IMPEDANCE IN PU")
-    {
-        if(metered_bus!=line->get_receiving_side_bus())
-            return steps_fast_complex_abs(line->get_line_complex_apparent_impedance_at_sending_side_in_pu());
-        else
-            return steps_fast_complex_abs(line->get_line_complex_apparent_impedance_at_receiving_side_in_pu());
-    }
+            if(meter_type=="APPARENT IMPEDANCE ANGLE IN RAD")
+            {
+                if(metered_bus!=line->get_receiving_side_bus())
+                    return steps_fast_complex_arg(line->get_line_complex_apparent_impedance_at_sending_side_in_ohm());
+                else
+                    return steps_fast_complex_arg(line->get_line_complex_apparent_impedance_at_receiving_side_in_ohm());
+            }
 
-    if(meter_type=="APPARENT IMPEDANCE ANGLE IN DEG")
-    {
-        if(metered_bus!=line->get_receiving_side_bus())
-            return rad2deg(steps_fast_complex_arg(line->get_line_complex_apparent_impedance_at_sending_side_in_ohm()));
-        else
-            return rad2deg(steps_fast_complex_arg(line->get_line_complex_apparent_impedance_at_receiving_side_in_ohm()));
-    }
 
-    if(meter_type=="APPARENT IMPEDANCE ANGLE IN RAD")
-    {
-        if(metered_bus!=line->get_receiving_side_bus())
-            return steps_fast_complex_arg(line->get_line_complex_apparent_impedance_at_sending_side_in_ohm());
+            if(meter_type=="CURRENT AT SENDING SIDE IN KA")
+                return steps_fast_complex_abs(line->get_line_complex_current_at_sending_side_in_kA());
+            if(meter_type=="ACTIVE POWER AT SENDING SIDE IN MW")
+                return (line->get_line_complex_power_at_sending_side_in_MVA()).real();
+            if(meter_type=="REACTIVE POWER AT SENDING SIDE IN MVAR")
+                return (line->get_line_complex_power_at_sending_side_in_MVA()).imag();
+            if(meter_type=="CURRENT AT RECEIVING SIDE IN KA")
+                return steps_fast_complex_abs(line->get_line_complex_current_at_receiving_side_in_kA());
+            if(meter_type=="ACTIVE POWER AT RECEIVING SIDE IN MW")
+                return (line->get_line_complex_power_at_receiving_side_in_MVA()).real();
+            if(meter_type=="REACTIVE POWER AT RECEIVING SIDE IN MVAR")
+                return (line->get_line_complex_power_at_receiving_side_in_MVA()).imag();
+
+            if(meter_type=="APPARENT IMPEDANCE AT SENDING SIDE IN OHM")
+                return steps_fast_complex_abs(line->get_line_complex_apparent_impedance_at_sending_side_in_ohm());
+            if(meter_type=="APPARENT IMPEDANCE ANGLE AT SENDING SIDE IN DEG")
+                return rad2deg(steps_fast_complex_arg(line->get_line_complex_apparent_impedance_at_sending_side_in_ohm()));
+            if(meter_type=="APPARENT IMPEDANCE AT RECEIVING SIDE IN OHM")
+                return steps_fast_complex_abs(line->get_line_complex_apparent_impedance_at_receiving_side_in_ohm());
+            if(meter_type=="APPARENT IMPEDANCE ANGLE AT RECEIVING SIDE IN DEG")
+                return rad2deg(steps_fast_complex_arg(line->get_line_complex_apparent_impedance_at_receiving_side_in_ohm()));
+
+            return 0.0;
+        }
         else
-            return steps_fast_complex_arg(line->get_line_complex_apparent_impedance_at_receiving_side_in_ohm());
+            return 0.0;
     }
-
-
-    if(meter_type=="CURRENT AT SENDING SIDE IN KA")
-        return steps_fast_complex_abs(line->get_line_complex_current_at_sending_side_in_kA());
-    if(meter_type=="ACTIVE POWER AT SENDING SIDE IN MW")
-        return (line->get_line_complex_power_at_sending_side_in_MVA()).real();
-    if(meter_type=="REACTIVE POWER AT SENDING SIDE IN MVAR")
-        return (line->get_line_complex_power_at_sending_side_in_MVA()).imag();
-    if(meter_type=="CURRENT AT RECEIVING SIDE IN KA")
-        return steps_fast_complex_abs(line->get_line_complex_current_at_receiving_side_in_kA());
-    if(meter_type=="ACTIVE POWER AT RECEIVING SIDE IN MW")
-        return (line->get_line_complex_power_at_receiving_side_in_MVA()).real();
-    if(meter_type=="REACTIVE POWER AT RECEIVING SIDE IN MVAR")
-        return (line->get_line_complex_power_at_receiving_side_in_MVA()).imag();
-
-    if(meter_type=="APPARENT IMPEDANCE AT SENDING SIDE IN OHM")
-        return steps_fast_complex_abs(line->get_line_complex_apparent_impedance_at_sending_side_in_ohm());
-    if(meter_type=="APPARENT IMPEDANCE ANGLE AT SENDING SIDE IN DEG")
-        return rad2deg(steps_fast_complex_arg(line->get_line_complex_apparent_impedance_at_sending_side_in_ohm()));
-    if(meter_type=="APPARENT IMPEDANCE AT RECEIVING SIDE IN OHM")
-        return steps_fast_complex_abs(line->get_line_complex_apparent_impedance_at_receiving_side_in_ohm());
-    if(meter_type=="APPARENT IMPEDANCE ANGLE AT RECEIVING SIDE IN DEG")
-        return rad2deg(steps_fast_complex_arg(line->get_line_complex_apparent_impedance_at_receiving_side_in_ohm()));
-
-    return 0.0;
+    else
+        return 0.0;
 }
 
 double METER::get_meter_value_as_a_transformer() const
 {
     TRANSFORMER* trans = (TRANSFORMER*) get_device_pointer();
-    if(trans == NULL)
-        return 0.0;
-    size_t metered_bus = get_meter_side_bus();
-    if(trans->is_two_winding_transformer())
+    if(trans != NULL)
     {
-        if(meter_type=="CURRENT IN KA")
+        size_t metered_bus = get_meter_side_bus();
+        if(trans->is_two_winding_transformer())
         {
-            if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE))
-                return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(PRIMARY_SIDE));
-            else
-                return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(SECONDARY_SIDE));
-        }
+            if(meter_type=="CURRENT IN KA")
+            {
+                if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE))
+                    return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(PRIMARY_SIDE));
+                else
+                    return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(SECONDARY_SIDE));
+            }
 
-        if(meter_type=="CURRENT IN PU")
-        {
-            if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE))
-                return steps_fast_complex_abs(trans->get_winding_complex_current_in_pu(PRIMARY_SIDE));
-            else
-                return steps_fast_complex_abs(trans->get_winding_complex_current_in_pu(SECONDARY_SIDE));
-        }
+            if(meter_type=="CURRENT IN PU")
+            {
+                if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE))
+                    return steps_fast_complex_abs(trans->get_winding_complex_current_in_pu(PRIMARY_SIDE));
+                else
+                    return steps_fast_complex_abs(trans->get_winding_complex_current_in_pu(SECONDARY_SIDE));
+            }
 
-        if(meter_type=="ACTIVE POWER IN MW")
-        {
-            if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE))
-                return (trans->get_winding_complex_power_in_MVA(PRIMARY_SIDE)).real();
-            else
-                return (trans->get_winding_complex_power_in_MVA(SECONDARY_SIDE)).real();
-        }
+            if(meter_type=="ACTIVE POWER IN MW")
+            {
+                if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE))
+                    return (trans->get_winding_complex_power_in_MVA(PRIMARY_SIDE)).real();
+                else
+                    return (trans->get_winding_complex_power_in_MVA(SECONDARY_SIDE)).real();
+            }
 
-        if(meter_type=="ACTIVE POWER IN PU")
-        {
-            if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE))
-                return (trans->get_winding_complex_power_in_pu(PRIMARY_SIDE)).real();
-            else
-                return (trans->get_winding_complex_power_in_pu(SECONDARY_SIDE)).real();
-        }
+            if(meter_type=="ACTIVE POWER IN PU")
+            {
+                if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE))
+                    return (trans->get_winding_complex_power_in_pu(PRIMARY_SIDE)).real();
+                else
+                    return (trans->get_winding_complex_power_in_pu(SECONDARY_SIDE)).real();
+            }
 
-        if(meter_type=="REACTIVE POWER IN MVAR")
-        {
-            if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE))
-                return (trans->get_winding_complex_power_in_MVA(PRIMARY_SIDE)).imag();
-            else
-                return (trans->get_winding_complex_power_in_MVA(SECONDARY_SIDE)).imag();
-        }
+            if(meter_type=="REACTIVE POWER IN MVAR")
+            {
+                if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE))
+                    return (trans->get_winding_complex_power_in_MVA(PRIMARY_SIDE)).imag();
+                else
+                    return (trans->get_winding_complex_power_in_MVA(SECONDARY_SIDE)).imag();
+            }
 
-        if(meter_type=="REACTIVE POWER IN PU")
-        {
-            if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE))
-                return (trans->get_winding_complex_power_in_pu(PRIMARY_SIDE)).imag();
-            else
-                return (trans->get_winding_complex_power_in_pu(SECONDARY_SIDE)).imag();
+            if(meter_type=="REACTIVE POWER IN PU")
+            {
+                if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE))
+                    return (trans->get_winding_complex_power_in_pu(PRIMARY_SIDE)).imag();
+                else
+                    return (trans->get_winding_complex_power_in_pu(SECONDARY_SIDE)).imag();
+            }
         }
-    }
-    else
-    {
-        if(meter_type=="CURRENT IN KA")
+        else
         {
-            if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE) and metered_bus!=trans->get_winding_bus(TERTIARY_SIDE))
-                return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(PRIMARY_SIDE));
-            else
+            if(meter_type=="CURRENT IN KA")
             {
-                if(metered_bus==trans->get_winding_bus(SECONDARY_SIDE))
-                    return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(SECONDARY_SIDE));
+                if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE) and metered_bus!=trans->get_winding_bus(TERTIARY_SIDE))
+                    return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(PRIMARY_SIDE));
                 else
-                    return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(TERTIARY_SIDE));
+                {
+                    if(metered_bus==trans->get_winding_bus(SECONDARY_SIDE))
+                        return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(SECONDARY_SIDE));
+                    else
+                        return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(TERTIARY_SIDE));
+                }
             }
-        }
 
-        if(meter_type=="CURRENT IN PU")
-        {
-            if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE) and metered_bus!=trans->get_winding_bus(TERTIARY_SIDE))
-                return steps_fast_complex_abs(trans->get_winding_complex_current_in_pu(PRIMARY_SIDE));
-            else
+            if(meter_type=="CURRENT IN PU")
             {
-                if(metered_bus==trans->get_winding_bus(SECONDARY_SIDE))
-                    return steps_fast_complex_abs(trans->get_winding_complex_current_in_pu(SECONDARY_SIDE));
+                if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE) and metered_bus!=trans->get_winding_bus(TERTIARY_SIDE))
+                    return steps_fast_complex_abs(trans->get_winding_complex_current_in_pu(PRIMARY_SIDE));
                 else
-                    return steps_fast_complex_abs(trans->get_winding_complex_current_in_pu(TERTIARY_SIDE));
+                {
+                    if(metered_bus==trans->get_winding_bus(SECONDARY_SIDE))
+                        return steps_fast_complex_abs(trans->get_winding_complex_current_in_pu(SECONDARY_SIDE));
+                    else
+                        return steps_fast_complex_abs(trans->get_winding_complex_current_in_pu(TERTIARY_SIDE));
+                }
             }
-        }
 
-        if(meter_type=="ACTIVE POWER IN MW")
-        {
-            if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE) and metered_bus!=trans->get_winding_bus(TERTIARY_SIDE))
-                return (trans->get_winding_complex_power_in_MVA(PRIMARY_SIDE)).real();
-            else
+            if(meter_type=="ACTIVE POWER IN MW")
             {
-                if(metered_bus==trans->get_winding_bus(SECONDARY_SIDE))
-                    return (trans->get_winding_complex_power_in_MVA(SECONDARY_SIDE)).real();
+                if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE) and metered_bus!=trans->get_winding_bus(TERTIARY_SIDE))
+                    return (trans->get_winding_complex_power_in_MVA(PRIMARY_SIDE)).real();
                 else
-                    return (trans->get_winding_complex_power_in_MVA(TERTIARY_SIDE)).real();
+                {
+                    if(metered_bus==trans->get_winding_bus(SECONDARY_SIDE))
+                        return (trans->get_winding_complex_power_in_MVA(SECONDARY_SIDE)).real();
+                    else
+                        return (trans->get_winding_complex_power_in_MVA(TERTIARY_SIDE)).real();
+                }
             }
-        }
 
-        if(meter_type=="ACTIVE POWER IN PU")
-        {
-            if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE) and metered_bus!=trans->get_winding_bus(TERTIARY_SIDE))
-                return (trans->get_winding_complex_power_in_pu(PRIMARY_SIDE)).real();
-            else
+            if(meter_type=="ACTIVE POWER IN PU")
             {
-                if(metered_bus==trans->get_winding_bus(SECONDARY_SIDE))
-                    return (trans->get_winding_complex_power_in_pu(SECONDARY_SIDE)).real();
+                if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE) and metered_bus!=trans->get_winding_bus(TERTIARY_SIDE))
+                    return (trans->get_winding_complex_power_in_pu(PRIMARY_SIDE)).real();
                 else
-                    return (trans->get_winding_complex_power_in_pu(TERTIARY_SIDE)).real();
+                {
+                    if(metered_bus==trans->get_winding_bus(SECONDARY_SIDE))
+                        return (trans->get_winding_complex_power_in_pu(SECONDARY_SIDE)).real();
+                    else
+                        return (trans->get_winding_complex_power_in_pu(TERTIARY_SIDE)).real();
+                }
             }
-        }
 
-        if(meter_type=="REACTIVE POWER IN MVAR")
-        {
-            if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE) and metered_bus!=trans->get_winding_bus(TERTIARY_SIDE))
-                return (trans->get_winding_complex_power_in_MVA(PRIMARY_SIDE)).imag();
-            else
+            if(meter_type=="REACTIVE POWER IN MVAR")
             {
-                if(metered_bus==trans->get_winding_bus(SECONDARY_SIDE))
-                    return (trans->get_winding_complex_power_in_MVA(SECONDARY_SIDE)).imag();
+                if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE) and metered_bus!=trans->get_winding_bus(TERTIARY_SIDE))
+                    return (trans->get_winding_complex_power_in_MVA(PRIMARY_SIDE)).imag();
                 else
-                    return (trans->get_winding_complex_power_in_MVA(TERTIARY_SIDE)).imag();
+                {
+                    if(metered_bus==trans->get_winding_bus(SECONDARY_SIDE))
+                        return (trans->get_winding_complex_power_in_MVA(SECONDARY_SIDE)).imag();
+                    else
+                        return (trans->get_winding_complex_power_in_MVA(TERTIARY_SIDE)).imag();
+                }
             }
-        }
 
-        if(meter_type=="REACTIVE POWER IN PU")
-        {
-            if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE) and metered_bus!=trans->get_winding_bus(TERTIARY_SIDE))
-                return (trans->get_winding_complex_power_in_pu(PRIMARY_SIDE)).imag();
-            else
+            if(meter_type=="REACTIVE POWER IN PU")
             {
-                if(metered_bus==trans->get_winding_bus(SECONDARY_SIDE))
-                    return (trans->get_winding_complex_power_in_pu(SECONDARY_SIDE)).imag();
+                if(metered_bus!=trans->get_winding_bus(SECONDARY_SIDE) and metered_bus!=trans->get_winding_bus(TERTIARY_SIDE))
+                    return (trans->get_winding_complex_power_in_pu(PRIMARY_SIDE)).imag();
                 else
-                    return (trans->get_winding_complex_power_in_pu(TERTIARY_SIDE)).imag();
+                {
+                    if(metered_bus==trans->get_winding_bus(SECONDARY_SIDE))
+                        return (trans->get_winding_complex_power_in_pu(SECONDARY_SIDE)).imag();
+                    else
+                        return (trans->get_winding_complex_power_in_pu(TERTIARY_SIDE)).imag();
+                }
             }
         }
-    }
-
 
 
-    if(meter_type=="CURRENT AT PRIMARY WINDING IN KA")
-        return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(PRIMARY_SIDE));
-    if(meter_type=="CURRENT AT SECONDARY WINDING IN KA")
-        return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(SECONDARY_SIDE));
-    if(meter_type=="CURRENT AT TERTIARY WINDING IN KA")
-        return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(TERTIARY_SIDE));
-    if(meter_type=="ACTIVE POWER AT PRIMARY WINDING IN MW")
-        return (trans->get_winding_complex_power_in_MVA(PRIMARY_SIDE)).real();
-    if(meter_type=="ACTIVE POWER AT SECONDARY WINDING IN MW")
-        return (trans->get_winding_complex_power_in_MVA(SECONDARY_SIDE)).real();
-    if(meter_type=="ACTIVE POWER AT TERTIARY WINDING IN MW")
-        return (trans->get_winding_complex_power_in_MVA(TERTIARY_SIDE)).real();
-    if(meter_type=="REACTIVE POWER AT PRIMARY WINDING IN MVAR")
-        return (trans->get_winding_complex_power_in_MVA(PRIMARY_SIDE)).imag();
-    if(meter_type=="REACTIVE POWER AT SECONDARY WINDING IN MVAR")
-        return (trans->get_winding_complex_power_in_MVA(SECONDARY_SIDE)).imag();
-    if(meter_type=="REACTIVE POWER AT TERTIARY WINDING IN MVAR")
-        return (trans->get_winding_complex_power_in_MVA(TERTIARY_SIDE)).imag();
-
-    return 0.0;
-}
+        if(meter_type=="CURRENT AT PRIMARY WINDING IN KA")
+            return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(PRIMARY_SIDE));
+        if(meter_type=="CURRENT AT SECONDARY WINDING IN KA")
+            return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(SECONDARY_SIDE));
+        if(meter_type=="CURRENT AT TERTIARY WINDING IN KA")
+            return steps_fast_complex_abs(trans->get_winding_complex_current_in_kA(TERTIARY_SIDE));
+        if(meter_type=="ACTIVE POWER AT PRIMARY WINDING IN MW")
+            return (trans->get_winding_complex_power_in_MVA(PRIMARY_SIDE)).real();
+        if(meter_type=="ACTIVE POWER AT SECONDARY WINDING IN MW")
+            return (trans->get_winding_complex_power_in_MVA(SECONDARY_SIDE)).real();
+        if(meter_type=="ACTIVE POWER AT TERTIARY WINDING IN MW")
+            return (trans->get_winding_complex_power_in_MVA(TERTIARY_SIDE)).real();
+        if(meter_type=="REACTIVE POWER AT PRIMARY WINDING IN MVAR")
+            return (trans->get_winding_complex_power_in_MVA(PRIMARY_SIDE)).imag();
+        if(meter_type=="REACTIVE POWER AT SECONDARY WINDING IN MVAR")
+            return (trans->get_winding_complex_power_in_MVA(SECONDARY_SIDE)).imag();
+        if(meter_type=="REACTIVE POWER AT TERTIARY WINDING IN MVAR")
+            return (trans->get_winding_complex_power_in_MVA(TERTIARY_SIDE)).imag();
 
-double METER::get_meter_value_as_a_load() const
-{
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    LOAD* load = (LOAD*) get_device_pointer();
-    if(load==NULL)
-        return 0.0;
-    if(load->get_status()==false)
         return 0.0;
-
-    if(meter_type=="ACTIVE POWER IN MW")
-        return (load->get_dynamic_load_in_MVA()).real();
-
-    if(meter_type=="ACTIVE POWER IN PU")
-        return (load->get_dynamic_load_in_pu()).real();
-
-    if(meter_type=="REACTIVE POWER IN MVAR")
-        return (load->get_dynamic_load_in_MVA()).imag();
-
-    if(meter_type=="REACTIVE POWER IN PU")
-        return (load->get_dynamic_load_in_pu()).imag();
-
-    if(meter_type=="CURRENT IN KA")
-    {
-        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-        double sbase = psdb.get_system_base_power_in_MVA();
-        double vbase = psdb.get_bus_base_voltage_in_kV(load->get_load_bus());
-        double ibase = sbase/(sqrt(3.0)*vbase);
-        return ibase* steps_fast_complex_abs(load->get_dynamics_load_current_in_pu_based_on_system_base_power());
-    }
-
-
-    if(meter_type=="CURRENT IN PU")
-    {
-        return steps_fast_complex_abs(load->get_dynamics_load_current_in_pu_based_on_system_base_power());
-    }
-
-    if(meter_type=="LOAD MODEL INTERNAL VARIABLE")
-    {
-        LOAD_MODEL* model = load->get_load_model();
-        if(model==NULL)
-            return 0.0;
-        else
-            return model->get_model_internal_variable_with_name(internal_variable_name);
-    }
-    if(meter_type=="FREQUENCY RELAY MODEL INTERNAL VARIABLE")
-    {
-        LOAD_FREQUENCY_RELAY_MODEL* model = load->get_load_frequency_relay_model();
-        if(model==NULL)
-            return 0.0;
-        else
-            return model->get_model_internal_variable_with_name(internal_variable_name);
-    }
-    if(meter_type=="VOLTAGE RELAY MODEL INTERNAL VARIABLE")
-    {
-        LOAD_VOLTAGE_RELAY_MODEL* model = load->get_load_voltage_relay_model();
-        if(model==NULL)
-            return 0.0;
-        else
-            return model->get_model_internal_variable_with_name(internal_variable_name);
-    }
-    if(meter_type=="TOTAL SCALE IN PU")
-    {
-        return load->get_load_total_scale_factor_in_pu();
-    }
-    if(meter_type=="MANUALLY SCALE IN PU")
-    {
-        return load->get_load_manually_scale_factor_in_pu();
-    }
-    if(meter_type=="RELAY SHED SCALE IN PU")
-    {
-        return load->get_load_relay_shed_scale_factor_in_pu();
     }
-    return 0.0;
-}
-double METER::get_meter_value_as_a_generator() const
-{
-    GENERATOR* generator = (GENERATOR*) get_device_pointer();
-    if(generator == NULL)
-        return 0.0;
-
-    if(generator->get_status()==false)
+    else
         return 0.0;
+}
 
+double METER::get_meter_value_as_a_load() const
+{
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    double fbase = psdb.get_bus_base_frequency_in_Hz(generator->get_generator_bus());
-    double sbase = psdb.get_system_base_power_in_MVA();
-    double mbase = generator->get_mbase_in_MVA();
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    COMPENSATOR_MODEL* comp_model = generator->get_compensator_model();
-    STABILIZER_MODEL* stabilizer_model = generator->get_stabilizer_model();
-    EXCITER_MODEL* exciter_model = generator->get_exciter_model();
-    TURBINE_GOVERNOR_MODEL* turbine_governor_model = generator->get_turbine_governor_model();
-    TURBINE_LOAD_CONTROLLER_MODEL* turbine_lfc_model = generator->get_turbine_load_controller_model();
-
-    if(meter_type=="ROTOR ANGLE IN DEG")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_rotor_angle_in_deg();
-    }
-    if(meter_type =="ROTOR SPEED IN PU")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_rotor_speed_in_pu();
-    }
-    if(meter_type =="ROTOR SPEED IN HZ")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return fbase*gen_model->get_rotor_speed_in_pu();
-    }
-    if(meter_type =="ROTOR SPEED DEVIATION IN PU")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_rotor_speed_deviation_in_pu();
-    }
-    if(meter_type =="ROTOR SPEED DEVIATION IN HZ")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return fbase*gen_model->get_rotor_speed_deviation_in_pu();
-    }
-    if(meter_type =="INTERNAL VOLTAGE IN PU")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return steps_fast_complex_abs(gen_model->get_internal_voltage_in_pu_in_dq_axis());
-    }
-    if(meter_type =="TERMINAL CURRENT IN PU ON MBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_current_in_pu_based_on_mbase();
-    }
-    if(meter_type =="TERMINAL CURRENT IN PU ON SBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_current_in_pu_based_on_sbase();
-    }
-    if(meter_type =="TERMINAL CURRENT IN KA")
+    LOAD* load = (LOAD*) get_device_pointer();
+    if(load!=NULL)
     {
-        if(gen_model == NULL)
-            return 0.0;
-        else
+        if(load->get_status()==true)
         {
-            double vbase = psdb.get_bus_base_voltage_in_kV(generator->get_generator_bus());
-            double ibase = sbase/(sqrt(3.0)*vbase);
-            return ibase*gen_model->get_terminal_current_in_pu_based_on_sbase();
-        }
-    }
-    if(meter_type =="TERMINAL ACTIVE POWER IN PU ON MBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_active_power_in_MW()/mbase;
-    }
-    if(meter_type =="TERMINAL ACTIVE POWER IN PU ON SBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_active_power_in_MW()/sbase;
-    }
-    if(meter_type =="TERMINAL ACTIVE POWER IN MW")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_active_power_in_MW();
-    }
-    if(meter_type =="TERMINAL REACTIVE POWER IN PU ON MBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_reactive_power_in_MVar()/mbase;
-    }
-    if(meter_type =="TERMINAL REACTIVE POWER IN PU ON SBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_reactive_power_in_MVar()/sbase;
-    }
-    if(meter_type =="TERMINAL REACTIVE POWER IN MVAR")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_reactive_power_in_MVar();
-    }
-    if(meter_type =="TERMINAL APPRAENT POWER IN PU ON MBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-        {
-            double p = gen_model->get_terminal_active_power_in_pu_based_on_mbase();
-            double q = gen_model->get_terminal_reactive_power_in_pu_based_on_mbase();
-            return sqrt(p*p+q*q);
-        }
-    }
-    if(meter_type =="TERMINAL APPRAENT POWER IN PU ON SBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-        {
-            double p = gen_model->get_terminal_active_power_in_pu_based_on_mbase();
-            double q = gen_model->get_terminal_reactive_power_in_pu_based_on_mbase();
-            return sqrt(p*p+q*q)*mbase/sbase;
-        }
-    }
-    if(meter_type =="TERMINAL APPRAENT POWER IN MVA")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-        {
-            double p = gen_model->get_terminal_active_power_in_pu_based_on_mbase();
-            double q = gen_model->get_terminal_reactive_power_in_pu_based_on_mbase();
-            return sqrt(p*p+q*q)*mbase;
-        }
-    }
-    if(meter_type =="AIRGAP POWER IN PU ON MBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_air_gap_power_in_pu_based_on_mbase();
-    }
-    if(meter_type =="AIRGAP POWER IN PU ON SBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_air_gap_power_in_MW()/sbase;
-    }
-    if(meter_type =="AIRGAP POWER IN MW")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_air_gap_power_in_MW();
-    }
-    if(meter_type =="ACCELERATING POWER IN PU ON MBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_accelerating_power_in_pu_based_on_mbase();
-    }
-    if(meter_type =="ACCELERATING POWER IN PU ON SBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_accelerating_power_in_MW()/sbase;
-    }
-    if(meter_type =="ACCELERATING POWER IN MW")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_accelerating_power_in_MW();
-    }
-    if(meter_type =="MECHANICAL POWER IN PU ON MBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_mechanical_power_in_pu_based_on_mbase();
-    }
-    if(meter_type =="MECHANICAL POWER IN PU ON SBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_mechanical_power_in_MW()/sbase;
-    }
-    if(meter_type =="MECHANICAL POWER IN MW")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_mechanical_power_in_MW();
-    }
-    if(meter_type =="MECHANICAL POWER REFERENCE IN PU ON MBASE")
-    {
-        if(turbine_governor_model == NULL)
-            return 0.0;
-        else
-            return turbine_governor_model->get_mechanical_power_reference_in_pu_based_on_mbase();
-    }
-    if(meter_type =="MECHANICAL POWER REFERENCE IN PU ON SBASE")
-    {
-        if(turbine_governor_model == NULL)
-            return 0.0;
-        else
-            return turbine_governor_model->get_mechanical_power_reference_in_pu_based_on_mbase()*mbase/sbase;
-    }
-    if(meter_type =="MECHANICAL POWER REFERENCE IN MW")
-    {
-        if(turbine_governor_model == NULL)
-            return 0.0;
-        else
-            return turbine_governor_model->get_mechanical_power_reference_in_pu_based_on_mbase()*mbase;
-    }
-    if(meter_type =="COMPENSATED VOLTAGE IN PU")
-    {
-        if(exciter_model == NULL)
-            return 0.0;
-        else
-            return exciter_model->get_compensated_voltage_in_pu();
-    }
-    if(meter_type =="VOLTAGE REFERENCE IN PU")
-    {
-        if(exciter_model == NULL)
-            return 0.0;
-        else
-            return exciter_model->get_voltage_reference_in_pu();
-    }
-    if(meter_type =="STABILIZING SIGNAL IN PU")
-    {
-        if(exciter_model == NULL)
-            return 0.0;
-        else
-            return exciter_model->get_stabilizing_signal_in_pu();
-    }
-    if(meter_type =="EXCITATION VOLTAGE IN PU")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_excitation_voltage_in_pu();
-    }
-    if(meter_type=="SYNC GENERATOR MODEL INTERNAL VARIABLE")
-    {
-        if(gen_model==NULL)
-            return 0.0;
-        else
-            return gen_model->get_model_internal_variable_with_name(internal_variable_name);
-    }
-    if(meter_type=="COMPENSATOR MODEL INTERNAL VARIABLE")
-    {
-        if(comp_model==NULL)
-            return 0.0;
-        else
-            return comp_model->get_model_internal_variable_with_name(internal_variable_name);
-    }
-    if(meter_type=="STABILIZER MODEL INTERNAL VARIABLE")
-    {
-        if(stabilizer_model==NULL)
-            return 0.0;
-        else
-            return stabilizer_model->get_model_internal_variable_with_name(internal_variable_name);
-    }
-    if(meter_type=="EXCITER MODEL INTERNAL VARIABLE")
-    {
-        if(exciter_model==NULL)
-            return 0.0;
-        else
-            return exciter_model->get_model_internal_variable_with_name(internal_variable_name);
-    }
-    if(meter_type=="TURBINE GOVERNOR MODEL INTERNAL VARIABLE")
-    {
-        if(turbine_governor_model==NULL)
-            return 0.0;
-        else
-            return turbine_governor_model->get_model_internal_variable_with_name(internal_variable_name);
-    }
-    if(meter_type=="TURBINE LOAD CONTROLLER MODEL INTERNAL VARIABLE")
-    {
-        if(turbine_lfc_model==NULL)
-            return 0.0;
-        else
-            return turbine_lfc_model->get_model_internal_variable_with_name(internal_variable_name);
-    }
+            if(meter_type=="ACTIVE POWER IN MW")
+                return (load->get_dynamic_load_in_MVA()).real();
 
-    return 0.0;
-}
+            if(meter_type=="ACTIVE POWER IN PU")
+                return (load->get_dynamic_load_in_pu()).real();
 
-double METER::get_meter_value_as_a_wt_generator() const
-{
-    ostringstream osstream;
+            if(meter_type=="REACTIVE POWER IN MVAR")
+                return (load->get_dynamic_load_in_MVA()).imag();
 
-    WT_GENERATOR* generator = (WT_GENERATOR*) get_device_pointer();
-    if(generator == NULL)
-        return 0.0;
+            if(meter_type=="REACTIVE POWER IN PU")
+                return (load->get_dynamic_load_in_pu()).imag();
 
-    if(generator->get_status()==false)
-        return 0.0;
+            if(meter_type=="CURRENT IN KA")
+            {
+                POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+                double sbase = psdb.get_system_base_power_in_MVA();
+                double vbase = psdb.get_bus_base_voltage_in_kV(load->get_load_bus());
+                double ibase = sbase/(sqrt(3.0)*vbase);
+                return ibase* steps_fast_complex_abs(load->get_dynamics_load_current_in_pu_based_on_system_base_power());
+            }
 
-    size_t bus = generator->get_generator_bus();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    double fbase = psdb.get_bus_base_frequency_in_Hz(generator->get_generator_bus());
-    double sbase = psdb.get_system_base_power_in_MVA();
-    double mbase = generator->get_mbase_in_MVA();
-
-    WT_GENERATOR_MODEL* gen_model = generator->get_wt_generator_model();
-    WT_AERODYNAMIC_MODEL* aerd_model = generator->get_wt_aerodynamic_model();
-    WT_TURBINE_MODEL* turbine_model = generator->get_wt_turbine_model();
-    WT_ELECTRICAL_MODEL* electrical_model = generator->get_wt_electrical_model();
-    WT_PITCH_MODEL* pitch_model = generator->get_wt_pitch_model();
-    WIND_SPEED_MODEL* windspeed_model = generator->get_wind_speed_model();
-
-    if(meter_type=="TERMINAL CURRENT IN PU ON MBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_current_in_pu_based_on_mbase();
-    }
-    if(meter_type=="TERMINAL CURRENT IN PU ON SBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_current_in_pu_based_on_mbase()*mbase/sbase;
-    }
+            if(meter_type=="CURRENT IN PU")
+            {
+                return steps_fast_complex_abs(load->get_dynamics_load_current_in_pu_based_on_system_base_power());
+            }
 
-    if(meter_type=="TERMINAL CURRENT IN KA")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-        {
-            double vbase = psdb.get_bus_base_voltage_in_kV(bus);
-            double ibase = mbase/(sqrt(3.0)*vbase);
-            return gen_model->get_terminal_current_in_pu_based_on_mbase()*ibase;
-        }
-    }
-    if(meter_type=="TERMINAL ACTIVE POWER IN PU ON MBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_active_power_in_pu_based_on_mbase();
-    }
-    if(meter_type=="TERMINAL ACTIVE POWER IN PU ON SBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_active_power_in_MW()/sbase;
-    }
-    if(meter_type=="TERMINAL ACTIVE POWER IN MW")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_active_power_in_MW();
-    }
-    if(meter_type=="TERMINAL REACTIVE POWER IN PU ON MBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_reactive_power_in_pu_based_on_mbase();
-    }
-    if(meter_type=="TERMINAL REACTIVE POWER IN PU ON SBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_reactive_power_in_MVar()/sbase;
-    }
-    if(meter_type=="TERMINAL REACTIVE POWER IN MVAR")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-            return gen_model->get_terminal_reactive_power_in_MVar();
-    }
-    if(meter_type=="TERMINAL APPARENT POWER IN PU ON MBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-        {
-            double p = gen_model->get_terminal_active_power_in_pu_based_on_mbase();
-            double q = gen_model->get_terminal_reactive_power_in_pu_based_on_mbase();
-            return sqrt(p*p+q*q);
-        }
-    }
-    if(meter_type=="TERMINAL APPARENT POWER IN PU ON SBASE")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-        {
-            double p = gen_model->get_terminal_active_power_in_MW()/sbase;
-            double q = gen_model->get_terminal_reactive_power_in_MVar()/sbase;
-            return sqrt(p*p+q*q);
-        }
-    }
-    if(meter_type=="TERMINAL APPARENT POWER IN MVAR")
-    {
-        if(gen_model == NULL)
-            return 0.0;
-        else
-        {
-            double p = gen_model->get_terminal_active_power_in_MW();
-            double q = gen_model->get_terminal_reactive_power_in_MVar();
-            return sqrt(p*p+q*q);
-        }
-    }
-    if(meter_type=="MECHANICAL POWER IN PU ON MBASE")
-    {
-        if(aerd_model == NULL)
-            return 0.0;
-        else
-            return aerd_model->get_turbine_mechanical_power_in_MW()/mbase;
-    }
-    if(meter_type=="MECHANICAL POWER IN PU ON SBASE")
-    {
-        if(aerd_model == NULL)
-            return 0.0;
-        else
-            return aerd_model->get_turbine_mechanical_power_in_MW()/sbase;
-    }
-    if(meter_type=="MECHANICAL POWER IN MW")
-    {
-        if(aerd_model == NULL)
-            return 0.0;
-        else
-            return aerd_model->get_turbine_mechanical_power_in_MW();
-    }
-    if(meter_type=="MAX AVAILABLE MECHANICAL POWER IN PU ON MBASE")
-    {
-        if(aerd_model == NULL)
-            return 0.0;
-        else
-        {
-            double vwind = aerd_model->get_wind_speed_in_mps();
-            double pmax = aerd_model->get_maximum_available_mechanical_power_per_wt_generator_in_MW(vwind);
-            size_t n = generator->get_number_of_lumped_wt_generators();
-            return pmax*n/mbase;
-        }
-    }
-    if(meter_type=="MAX AVAILABLE MECHANICAL POWER IN PU ON SBASE")
-    {
-        if(aerd_model == NULL)
-            return 0.0;
-        else
-        {
-            double vwind = aerd_model->get_wind_speed_in_mps();
-            double pmax = aerd_model->get_maximum_available_mechanical_power_per_wt_generator_in_MW(vwind);
-            size_t n = generator->get_number_of_lumped_wt_generators();
-            return pmax*n/sbase;
-        }
-    }
-    if(meter_type=="MAX AVAILABLE MECHANICAL POWER IN MW")
-    {
-        if(aerd_model == NULL)
-            return 0.0;
-        else
-        {
-            double vwind = aerd_model->get_wind_speed_in_mps();
-            double pmax = aerd_model->get_maximum_available_mechanical_power_per_wt_generator_in_MW(vwind);
-            size_t n = generator->get_number_of_lumped_wt_generators();
-            return pmax*n;
-        }
-    }
-    if(meter_type=="SPEED REFERENCE IN PU")
-    {
-        if(aerd_model == NULL)
-            return 0.0;
-        else
-            return aerd_model->get_turbine_reference_speed_in_pu();
-    }
-    if(meter_type=="SPEED REFERENCE IN RAD/S")
-    {
-        if(aerd_model == NULL)
-            return 0.0;
-        else
-            return aerd_model->get_turbine_reference_speed_in_rad_per_s();
-    }
-    if(meter_type=="TURBINE SPEED DEVIATION IN PU")
-    {
-        if(turbine_model == NULL)
-            return 0.0;
-        else
-            return turbine_model->get_turbine_speed_in_pu()-1.0;
-    }
-    if(meter_type=="TURBINE SPEED DEVIATION IN HZ")
-    {
-        if(turbine_model == NULL)
+            if(meter_type=="LOAD MODEL INTERNAL VARIABLE")
+            {
+                LOAD_MODEL* model = load->get_load_model();
+                if(model==NULL)
+                    return 0.0;
+                else
+                    return model->get_model_internal_variable_with_name(internal_variable_name);
+            }
+            if(meter_type=="FREQUENCY RELAY MODEL INTERNAL VARIABLE")
+            {
+                LOAD_FREQUENCY_RELAY_MODEL* model = load->get_load_frequency_relay_model();
+                if(model==NULL)
+                    return 0.0;
+                else
+                    return model->get_model_internal_variable_with_name(internal_variable_name);
+            }
+            if(meter_type=="VOLTAGE RELAY MODEL INTERNAL VARIABLE")
+            {
+                LOAD_VOLTAGE_RELAY_MODEL* model = load->get_load_voltage_relay_model();
+                if(model==NULL)
+                    return 0.0;
+                else
+                    return model->get_model_internal_variable_with_name(internal_variable_name);
+            }
+            if(meter_type=="TOTAL SCALE IN PU")
+            {
+                return load->get_load_total_scale_factor_in_pu();
+            }
+            if(meter_type=="MANUALLY SCALE IN PU")
+            {
+                return load->get_load_manually_scale_factor_in_pu();
+            }
+            if(meter_type=="RELAY SHED SCALE IN PU")
+            {
+                return load->get_load_relay_shed_scale_factor_in_pu();
+            }
             return 0.0;
-        else
-        {
-            double fn = aerd_model->get_nominal_turbine_speed_in_rad_per_s()/(2.0*PI);
-            return (turbine_model->get_turbine_speed_in_pu()-1.0)*fn;
         }
-    }
-    if(meter_type=="TURBINE SPEED IN PU")
-    {
-        if(turbine_model == NULL)
-            return 0.0;
-        else
-            return turbine_model->get_turbine_speed_in_pu();
-    }
-    if(meter_type=="TURBINE SPEED IN HZ")
-    {
-        if(turbine_model == NULL)
-            return 0.0;
         else
-        {
-            double wn = aerd_model->get_nominal_turbine_speed_in_rad_per_s()/(2.0*PI);
-            return turbine_model->get_turbine_speed_in_pu()*wn;
-        }
-    }
-    if(meter_type=="ROTOR SPEED DEVIATION IN PU")
-    {
-        if(turbine_model == NULL)
             return 0.0;
-        else
-            return turbine_model->get_generator_speed_in_pu()-1.0;
     }
-    if(meter_type=="ROTOR SPEED DEVIATION IN HZ")
+    else
+        return 0.0;
+}
+
+double METER::get_meter_value_as_a_generator() const
+{
+    GENERATOR* generator = (GENERATOR*) get_device_pointer();
+    if(generator != NULL)
     {
-        if(turbine_model == NULL)
-            return 0.0;
-        else
+        if(generator->get_status()==true)
         {
-            double fn = fbase/aerd_model->get_number_of_pole_pairs();
-            return (turbine_model->get_generator_speed_in_pu()-1.0)*fn;
-        }
-    }
-    if(meter_type=="ROTOR SPEED IN PU")
-    {
-        if(turbine_model == NULL)
-            return 0.0;
-        else
-            return turbine_model->get_generator_speed_in_pu();
-    }
-    if(meter_type=="ROTOR SPEED IN HZ")
-    {
-        if(turbine_model == NULL)
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            double fbase = psdb.get_bus_base_frequency_in_Hz(generator->get_generator_bus());
+            double sbase = psdb.get_system_base_power_in_MVA();
+            double mbase = generator->get_mbase_in_MVA();
+
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            COMPENSATOR_MODEL* comp_model = generator->get_compensator_model();
+            STABILIZER_MODEL* stabilizer_model = generator->get_stabilizer_model();
+            EXCITER_MODEL* exciter_model = generator->get_exciter_model();
+            TURBINE_GOVERNOR_MODEL* turbine_governor_model = generator->get_turbine_governor_model();
+            TURBINE_LOAD_CONTROLLER_MODEL* turbine_lfc_model = generator->get_turbine_load_controller_model();
+
+            if(meter_type=="ROTOR ANGLE IN DEG")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_rotor_angle_in_deg();
+            }
+            if(meter_type =="ROTOR SPEED IN PU")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_rotor_speed_in_pu();
+            }
+            if(meter_type =="ROTOR SPEED IN HZ")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return fbase*gen_model->get_rotor_speed_in_pu();
+            }
+            if(meter_type =="ROTOR SPEED DEVIATION IN PU")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_rotor_speed_deviation_in_pu();
+            }
+            if(meter_type =="ROTOR SPEED DEVIATION IN HZ")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return fbase*gen_model->get_rotor_speed_deviation_in_pu();
+            }
+            if(meter_type =="INTERNAL VOLTAGE IN PU")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return steps_fast_complex_abs(gen_model->get_internal_voltage_in_pu_in_dq_axis());
+            }
+            if(meter_type =="TERMINAL CURRENT IN PU ON MBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_terminal_current_in_pu_based_on_mbase();
+            }
+            if(meter_type =="TERMINAL CURRENT IN PU ON SBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_terminal_current_in_pu_based_on_sbase();
+            }
+            if(meter_type =="TERMINAL CURRENT IN KA")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                {
+                    double vbase = psdb.get_bus_base_voltage_in_kV(generator->get_generator_bus());
+                    double ibase = sbase/(sqrt(3.0)*vbase);
+                    return ibase*gen_model->get_terminal_current_in_pu_based_on_sbase();
+                }
+            }
+            if(meter_type =="TERMINAL ACTIVE POWER IN PU ON MBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_terminal_active_power_in_MW()/mbase;
+            }
+            if(meter_type =="TERMINAL ACTIVE POWER IN PU ON SBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_terminal_active_power_in_MW()/sbase;
+            }
+            if(meter_type =="TERMINAL ACTIVE POWER IN MW")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_terminal_active_power_in_MW();
+            }
+            if(meter_type =="TERMINAL REACTIVE POWER IN PU ON MBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_terminal_reactive_power_in_MVar()/mbase;
+            }
+            if(meter_type =="TERMINAL REACTIVE POWER IN PU ON SBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_terminal_reactive_power_in_MVar()/sbase;
+            }
+            if(meter_type =="TERMINAL REACTIVE POWER IN MVAR")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_terminal_reactive_power_in_MVar();
+            }
+            if(meter_type =="TERMINAL APPRAENT POWER IN PU ON MBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                {
+                    double p = gen_model->get_terminal_active_power_in_pu_based_on_mbase();
+                    double q = gen_model->get_terminal_reactive_power_in_pu_based_on_mbase();
+                    return sqrt(p*p+q*q);
+                }
+            }
+            if(meter_type =="TERMINAL APPRAENT POWER IN PU ON SBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                {
+                    double p = gen_model->get_terminal_active_power_in_pu_based_on_mbase();
+                    double q = gen_model->get_terminal_reactive_power_in_pu_based_on_mbase();
+                    return sqrt(p*p+q*q)*mbase/sbase;
+                }
+            }
+            if(meter_type =="TERMINAL APPRAENT POWER IN MVA")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                {
+                    double p = gen_model->get_terminal_active_power_in_pu_based_on_mbase();
+                    double q = gen_model->get_terminal_reactive_power_in_pu_based_on_mbase();
+                    return sqrt(p*p+q*q)*mbase;
+                }
+            }
+            if(meter_type =="AIRGAP POWER IN PU ON MBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_air_gap_power_in_pu_based_on_mbase();
+            }
+            if(meter_type =="AIRGAP POWER IN PU ON SBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_air_gap_power_in_MW()/sbase;
+            }
+            if(meter_type =="AIRGAP POWER IN MW")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_air_gap_power_in_MW();
+            }
+            if(meter_type =="ACCELERATING POWER IN PU ON MBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_accelerating_power_in_pu_based_on_mbase();
+            }
+            if(meter_type =="ACCELERATING POWER IN PU ON SBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_accelerating_power_in_MW()/sbase;
+            }
+            if(meter_type =="ACCELERATING POWER IN MW")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_accelerating_power_in_MW();
+            }
+            if(meter_type =="MECHANICAL POWER IN PU ON MBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_mechanical_power_in_pu_based_on_mbase();
+            }
+            if(meter_type =="MECHANICAL POWER IN PU ON SBASE")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_mechanical_power_in_MW()/sbase;
+            }
+            if(meter_type =="MECHANICAL POWER IN MW")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_mechanical_power_in_MW();
+            }
+            if(meter_type =="MECHANICAL POWER REFERENCE IN PU ON MBASE")
+            {
+                if(turbine_governor_model == NULL)
+                    return 0.0;
+                else
+                    return turbine_governor_model->get_mechanical_power_reference_in_pu_based_on_mbase();
+            }
+            if(meter_type =="MECHANICAL POWER REFERENCE IN PU ON SBASE")
+            {
+                if(turbine_governor_model == NULL)
+                    return 0.0;
+                else
+                    return turbine_governor_model->get_mechanical_power_reference_in_pu_based_on_mbase()*mbase/sbase;
+            }
+            if(meter_type =="MECHANICAL POWER REFERENCE IN MW")
+            {
+                if(turbine_governor_model == NULL)
+                    return 0.0;
+                else
+                    return turbine_governor_model->get_mechanical_power_reference_in_pu_based_on_mbase()*mbase;
+            }
+            if(meter_type =="COMPENSATED VOLTAGE IN PU")
+            {
+                if(exciter_model == NULL)
+                    return 0.0;
+                else
+                    return exciter_model->get_compensated_voltage_in_pu();
+            }
+            if(meter_type =="VOLTAGE REFERENCE IN PU")
+            {
+                if(exciter_model == NULL)
+                    return 0.0;
+                else
+                    return exciter_model->get_voltage_reference_in_pu();
+            }
+            if(meter_type =="STABILIZING SIGNAL IN PU")
+            {
+                if(exciter_model == NULL)
+                    return 0.0;
+                else
+                    return exciter_model->get_stabilizing_signal_in_pu();
+            }
+            if(meter_type =="EXCITATION VOLTAGE IN PU")
+            {
+                if(gen_model == NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_excitation_voltage_in_pu();
+            }
+            if(meter_type=="SYNC GENERATOR MODEL INTERNAL VARIABLE")
+            {
+                if(gen_model==NULL)
+                    return 0.0;
+                else
+                    return gen_model->get_model_internal_variable_with_name(internal_variable_name);
+            }
+            if(meter_type=="COMPENSATOR MODEL INTERNAL VARIABLE")
+            {
+                if(comp_model==NULL)
+                    return 0.0;
+                else
+                    return comp_model->get_model_internal_variable_with_name(internal_variable_name);
+            }
+            if(meter_type=="STABILIZER MODEL INTERNAL VARIABLE")
+            {
+                if(stabilizer_model==NULL)
+                    return 0.0;
+                else
+                    return stabilizer_model->get_model_internal_variable_with_name(internal_variable_name);
+            }
+            if(meter_type=="EXCITER MODEL INTERNAL VARIABLE")
+            {
+                if(exciter_model==NULL)
+                    return 0.0;
+                else
+                    return exciter_model->get_model_internal_variable_with_name(internal_variable_name);
+            }
+            if(meter_type=="TURBINE GOVERNOR MODEL INTERNAL VARIABLE")
+            {
+                if(turbine_governor_model==NULL)
+                    return 0.0;
+                else
+                    return turbine_governor_model->get_model_internal_variable_with_name(internal_variable_name);
+            }
+            if(meter_type=="TURBINE LOAD CONTROLLER MODEL INTERNAL VARIABLE")
+            {
+                if(turbine_lfc_model==NULL)
+                    return 0.0;
+                else
+                    return turbine_lfc_model->get_model_internal_variable_with_name(internal_variable_name);
+            }
+
             return 0.0;
-        else
-        {
-            double fn = fbase/aerd_model->get_number_of_pole_pairs();
-            return turbine_model->get_generator_speed_in_pu()*fn;
         }
-    }
-    if(meter_type=="ROTOR ANGLE IN DEG")
-    {
-        if(turbine_model == NULL)
-            return 0.0;
-        else
-            return turbine_model->get_rotor_angle_in_deg();
-    }
-    if(meter_type=="ROTOR ANGLE IN RAD")
-    {
-        if(turbine_model == NULL)
-            return 0.0;
-        else
-            return turbine_model->get_rotor_angle_in_rad();
-    }
-    if(meter_type=="ACTIVE CURRENT COMMAND IN PU")
-    {
-        if(electrical_model == NULL)
-            return gen_model->get_active_current_command_in_pu_based_on_mbase();
-        else
-            return electrical_model->get_active_current_command_in_pu_based_on_mbase();
-    }
-    if(meter_type=="REACTIVE CURRENT COMMAND IN PU")
-    {
-        if(electrical_model == NULL)
-            return gen_model->get_reactive_current_command_in_pu_based_on_mbase();
-        else
-            return electrical_model->get_reactive_current_command_in_pu_based_on_mbase();
-    }
-    if(meter_type=="ACTIVE POWER COMMAND IN PU")
-    {
-        if(electrical_model == NULL)
-            return 0.0;
-        else
-            return electrical_model->get_active_power_command_in_pu_based_on_mbase();
-    }
-    if(meter_type=="REACTIVE POWER COMMAND IN PU")
-    {
-        if(electrical_model == NULL)
-            return 0.0;
-        else
-            return electrical_model->get_reactive_power_command_in_pu_based_on_mbase();
-    }
-    if(meter_type=="REACTIVE VOLTAGE COMMAND IN PU")
-    {
-        if(electrical_model == NULL)
-            return 0.0;
-        else
-            return electrical_model->get_reactive_voltage_command_in_pu();
-    }
-    if(meter_type=="PITCH ANGLE IN DEG")
-    {
-        if(pitch_model == NULL)
-            return aerd_model->get_initial_pitch_angle_in_deg();
-        else
-            return pitch_model->get_pitch_angle_in_deg();
-    }
-    if(meter_type=="WIND SPEED IN PU")
-    {
-        if(windspeed_model == NULL)
-            return aerd_model->get_wind_speed_in_mps()/aerd_model->get_nominal_wind_speed_in_mps();
-        else
-            return windspeed_model->get_wind_speed_in_pu();
-    }
-    if(meter_type=="WIND SPEED IN MPS")
-    {
-        if(windspeed_model == NULL)
-            return aerd_model->get_wind_speed_in_mps();
-        else
-            return windspeed_model->get_wind_speed_in_mps();
-    }
-    if(meter_type=="WT GENERATOR MODEL INTERNAL VARIABLE")
-    {
-        if(gen_model==NULL)
-            return 0.0;
-        else
-            return gen_model->get_model_internal_variable_with_name(internal_variable_name);
-    }
-    if(meter_type=="WT AERODYNAMIC MODEL INTERNAL VARIABLE")
-    {
-        if(aerd_model==NULL)
-            return 0.0;
-        else
-            return aerd_model->get_model_internal_variable_with_name(internal_variable_name);
-    }
-    if(meter_type=="WT TURBINE MODEL INTERNAL VARIABLE")
-    {
-        if(turbine_model==NULL)
-            return 0.0;
         else
-            return turbine_model->get_model_internal_variable_with_name(internal_variable_name);
-    }
-    if(meter_type=="WT ELECTRICAL MODEL INTERNAL VARIABLE")
-    {
-        if(electrical_model==NULL)
             return 0.0;
-        else
-            return electrical_model->get_model_internal_variable_with_name(internal_variable_name);
     }
-    if(meter_type=="WT PITCH MODEL INTERNAL VARIABLE")
+    else
+        return 0.0;
+}
+
+double METER::get_meter_value_as_a_wt_generator() const
+{
+    ostringstream osstream;
+
+    WT_GENERATOR* generator = (WT_GENERATOR*) get_device_pointer();
+    if(generator != NULL)
     {
-        if(pitch_model==NULL)
+        if(generator->get_status()==true)
+        {
+            size_t bus = generator->get_generator_bus();
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            double fbase = psdb.get_bus_base_frequency_in_Hz(generator->get_generator_bus());
+            double sbase = psdb.get_system_base_power_in_MVA();
+            double mbase = generator->get_mbase_in_MVA();
+
+            WT_GENERATOR_MODEL* gen_model = generator->get_wt_generator_model();
+            WT_AERODYNAMIC_MODEL* aerd_model = generator->get_wt_aerodynamic_model();
+            WT_TURBINE_MODEL* turbine_model = generator->get_wt_turbine_model();
+            WT_ELECTRICAL_MODEL* electrical_model = generator->get_wt_electrical_model();
+            WT_PITCH_MODEL* pitch_model = generator->get_wt_pitch_model();
+            WIND_SPEED_MODEL* windspeed_model = generator->get_wind_speed_model();
+
+            if(meter_type=="TERMINAL CURRENT IN PU ON MBASE")
+            {
+                if(gen_model != NULL)
+                    return gen_model->get_terminal_current_in_pu_based_on_mbase();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TERMINAL CURRENT IN PU ON SBASE")
+            {
+                if(gen_model != NULL)
+                    return gen_model->get_terminal_current_in_pu_based_on_mbase()*mbase/sbase;
+                else
+                    return 0.0;
+            }
+
+            if(meter_type=="TERMINAL CURRENT IN KA")
+            {
+                if(gen_model != NULL)
+                {
+                    double vbase = psdb.get_bus_base_voltage_in_kV(bus);
+                    double ibase = mbase/(sqrt(3.0)*vbase);
+                    return gen_model->get_terminal_current_in_pu_based_on_mbase()*ibase;
+                }
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TERMINAL ACTIVE POWER IN PU ON MBASE")
+            {
+                if(gen_model != NULL)
+                    return gen_model->get_terminal_active_power_in_pu_based_on_mbase();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TERMINAL ACTIVE POWER IN PU ON SBASE")
+            {
+                if(gen_model != NULL)
+                    return gen_model->get_terminal_active_power_in_MW()/sbase;
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TERMINAL ACTIVE POWER IN MW")
+            {
+                if(gen_model != NULL)
+                    return gen_model->get_terminal_active_power_in_MW();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TERMINAL REACTIVE POWER IN PU ON MBASE")
+            {
+                if(gen_model != NULL)
+                    return gen_model->get_terminal_reactive_power_in_pu_based_on_mbase();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TERMINAL REACTIVE POWER IN PU ON SBASE")
+            {
+                if(gen_model != NULL)
+                    return gen_model->get_terminal_reactive_power_in_MVar()/sbase;
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TERMINAL REACTIVE POWER IN MVAR")
+            {
+                if(gen_model != NULL)
+                    return gen_model->get_terminal_reactive_power_in_MVar();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TERMINAL APPARENT POWER IN PU ON MBASE")
+            {
+                if(gen_model != NULL)
+                {
+                    double p = gen_model->get_terminal_active_power_in_pu_based_on_mbase();
+                    double q = gen_model->get_terminal_reactive_power_in_pu_based_on_mbase();
+                    return sqrt(p*p+q*q);
+                }
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TERMINAL APPARENT POWER IN PU ON SBASE")
+            {
+                if(gen_model != NULL)
+                {
+                    double p = gen_model->get_terminal_active_power_in_MW()/sbase;
+                    double q = gen_model->get_terminal_reactive_power_in_MVar()/sbase;
+                    return sqrt(p*p+q*q);
+                }
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TERMINAL APPARENT POWER IN MVAR")
+            {
+                if(gen_model != NULL)
+                {
+                    double p = gen_model->get_terminal_active_power_in_MW();
+                    double q = gen_model->get_terminal_reactive_power_in_MVar();
+                    return sqrt(p*p+q*q);
+                }
+                else
+                    return 0.0;
+            }
+            if(meter_type=="MECHANICAL POWER IN PU ON MBASE")
+            {
+                if(aerd_model != NULL)
+                    return aerd_model->get_turbine_mechanical_power_in_MW()/mbase;
+                else
+                    return 0.0;
+            }
+            if(meter_type=="MECHANICAL POWER IN PU ON SBASE")
+            {
+                if(aerd_model != NULL)
+                    return aerd_model->get_turbine_mechanical_power_in_MW()/sbase;
+                else
+                    return 0.0;
+            }
+            if(meter_type=="MECHANICAL POWER IN MW")
+            {
+                if(aerd_model != NULL)
+                    return aerd_model->get_turbine_mechanical_power_in_MW();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="MAX AVAILABLE MECHANICAL POWER IN PU ON MBASE")
+            {
+                if(aerd_model != NULL)
+                {
+                    double vwind = aerd_model->get_wind_speed_in_mps();
+                    double pmax = aerd_model->get_maximum_available_mechanical_power_per_wt_generator_in_MW(vwind);
+                    size_t n = generator->get_number_of_lumped_wt_generators();
+                    return pmax*n/mbase;
+                }
+                else
+                    return 0.0;
+            }
+            if(meter_type=="MAX AVAILABLE MECHANICAL POWER IN PU ON SBASE")
+            {
+                if(aerd_model != NULL)
+                {
+                    double vwind = aerd_model->get_wind_speed_in_mps();
+                    double pmax = aerd_model->get_maximum_available_mechanical_power_per_wt_generator_in_MW(vwind);
+                    size_t n = generator->get_number_of_lumped_wt_generators();
+                    return pmax*n/sbase;
+                }
+                else
+                    return 0.0;
+            }
+            if(meter_type=="MAX AVAILABLE MECHANICAL POWER IN MW")
+            {
+                if(aerd_model != NULL)
+                {
+                    double vwind = aerd_model->get_wind_speed_in_mps();
+                    double pmax = aerd_model->get_maximum_available_mechanical_power_per_wt_generator_in_MW(vwind);
+                    size_t n = generator->get_number_of_lumped_wt_generators();
+                    return pmax*n;
+                }
+                else
+                    return 0.0;
+            }
+            if(meter_type=="SPEED REFERENCE IN PU")
+            {
+                if(aerd_model != NULL)
+                    return aerd_model->get_turbine_reference_speed_in_pu();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="SPEED REFERENCE IN RAD/S")
+            {
+                if(aerd_model != NULL)
+                    return aerd_model->get_turbine_reference_speed_in_rad_per_s();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TURBINE SPEED DEVIATION IN PU")
+            {
+                if(turbine_model != NULL)
+                    return turbine_model->get_turbine_speed_in_pu()-1.0;
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TURBINE SPEED DEVIATION IN HZ")
+            {
+                if(turbine_model != NULL)
+                {
+                    double fn = aerd_model->get_nominal_turbine_speed_in_rad_per_s()/(2.0*PI);
+                    return (turbine_model->get_turbine_speed_in_pu()-1.0)*fn;
+                }
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TURBINE SPEED IN PU")
+            {
+                if(turbine_model != NULL)
+                    return turbine_model->get_turbine_speed_in_pu();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="TURBINE SPEED IN HZ")
+            {
+                if(turbine_model != NULL)
+                {
+                    double wn = aerd_model->get_nominal_turbine_speed_in_rad_per_s()/(2.0*PI);
+                    return turbine_model->get_turbine_speed_in_pu()*wn;
+                }
+                else
+                    return 0.0;
+            }
+            if(meter_type=="ROTOR SPEED DEVIATION IN PU")
+            {
+                if(turbine_model != NULL)
+                    return turbine_model->get_generator_speed_in_pu()-1.0;
+                else
+                    return 0.0;
+            }
+            if(meter_type=="ROTOR SPEED DEVIATION IN HZ")
+            {
+                if(turbine_model != NULL)
+                {
+                    double fn = fbase/aerd_model->get_number_of_pole_pairs();
+                    return (turbine_model->get_generator_speed_in_pu()-1.0)*fn;
+                }
+                else
+                    return 0.0;
+            }
+            if(meter_type=="ROTOR SPEED IN PU")
+            {
+                if(turbine_model != NULL)
+                    return turbine_model->get_generator_speed_in_pu();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="ROTOR SPEED IN HZ")
+            {
+                if(turbine_model != NULL)
+                {
+                    double fn = fbase/aerd_model->get_number_of_pole_pairs();
+                    return turbine_model->get_generator_speed_in_pu()*fn;
+                }
+                else
+                    return 0.0;
+            }
+            if(meter_type=="ROTOR ANGLE IN DEG")
+            {
+                if(turbine_model != NULL)
+                    return turbine_model->get_rotor_angle_in_deg();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="ROTOR ANGLE IN RAD")
+            {
+                if(turbine_model != NULL)
+                    return turbine_model->get_rotor_angle_in_rad();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="ACTIVE CURRENT COMMAND IN PU")
+            {
+                if(electrical_model != NULL)
+                    return electrical_model->get_active_current_command_in_pu_based_on_mbase();
+                else
+                    return gen_model->get_active_current_command_in_pu_based_on_mbase();
+            }
+            if(meter_type=="REACTIVE CURRENT COMMAND IN PU")
+            {
+                if(electrical_model != NULL)
+                    return electrical_model->get_reactive_current_command_in_pu_based_on_mbase();
+                else
+                    return gen_model->get_reactive_current_command_in_pu_based_on_mbase();
+            }
+            if(meter_type=="ACTIVE POWER COMMAND IN PU")
+            {
+                if(electrical_model != NULL)
+                    return electrical_model->get_active_power_command_in_pu_based_on_mbase();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="REACTIVE POWER COMMAND IN PU")
+            {
+                if(electrical_model != NULL)
+                    return electrical_model->get_reactive_power_command_in_pu_based_on_mbase();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="REACTIVE VOLTAGE COMMAND IN PU")
+            {
+                if(electrical_model != NULL)
+                    return electrical_model->get_reactive_voltage_command_in_pu();
+                else
+                    return 0.0;
+            }
+            if(meter_type=="PITCH ANGLE IN DEG")
+            {
+                if(pitch_model != NULL)
+                    return pitch_model->get_pitch_angle_in_deg();
+                else
+                    return aerd_model->get_initial_pitch_angle_in_deg();
+            }
+            if(meter_type=="WIND SPEED IN PU")
+            {
+                if(windspeed_model != NULL)
+                    return windspeed_model->get_wind_speed_in_pu();
+                else
+                    return aerd_model->get_wind_speed_in_mps()/aerd_model->get_nominal_wind_speed_in_mps();
+            }
+            if(meter_type=="WIND SPEED IN MPS")
+            {
+                if(windspeed_model != NULL)
+                    return windspeed_model->get_wind_speed_in_mps();
+                else
+                    return aerd_model->get_wind_speed_in_mps();
+            }
+            if(meter_type=="WT GENERATOR MODEL INTERNAL VARIABLE")
+            {
+                if(gen_model!=NULL)
+                    return gen_model->get_model_internal_variable_with_name(internal_variable_name);
+                else
+                    return 0.0;
+            }
+            if(meter_type=="WT AERODYNAMIC MODEL INTERNAL VARIABLE")
+            {
+                if(aerd_model!=NULL)
+                    return aerd_model->get_model_internal_variable_with_name(internal_variable_name);
+                else
+                    return 0.0;
+            }
+            if(meter_type=="WT TURBINE MODEL INTERNAL VARIABLE")
+            {
+                if(turbine_model!=NULL)
+                    return turbine_model->get_model_internal_variable_with_name(internal_variable_name);
+                else
+                    return 0.0;
+            }
+            if(meter_type=="WT ELECTRICAL MODEL INTERNAL VARIABLE")
+            {
+                if(electrical_model!=NULL)
+                    return electrical_model->get_model_internal_variable_with_name(internal_variable_name);
+                else
+                    return 0.0;
+            }
+            if(meter_type=="WT PITCH MODEL INTERNAL VARIABLE")
+            {
+                if(pitch_model!=NULL)
+                    return pitch_model->get_model_internal_variable_with_name(internal_variable_name);
+                else
+                    return 0.0;
+            }
+            if(meter_type=="WIND SPEED MODEL INTERNAL VARIABLE")
+            {
+                if(windspeed_model!=NULL)
+                    return windspeed_model->get_model_internal_variable_with_name(internal_variable_name);
+                else
+                    return 0.0;
+            }
             return 0.0;
+        }
         else
-            return pitch_model->get_model_internal_variable_with_name(internal_variable_name);
-    }
-    if(meter_type=="WIND SPEED MODEL INTERNAL VARIABLE")
-    {
-        if(windspeed_model==NULL)
             return 0.0;
-        else
-            return windspeed_model->get_model_internal_variable_with_name(internal_variable_name);
     }
-    return 0.0;
+    else
+        return 0.0;
 }
 
 double METER::get_meter_value_as_an_hvdc() const
 {
     HVDC* hvdc = (HVDC*) get_device_pointer();
-    if(hvdc == NULL)
-        return 0.0;
-
-    if(hvdc->get_status()==false)
-        return 0.0;
-
-    HVDC_MODEL* hvdc_model = hvdc->get_hvdc_model();
-
-    if(meter_type=="DC CURRENT IN KA")
+    if(hvdc != NULL)
     {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_dc_current_in_kA(RECTIFIER);
-    }
+        if(hvdc->get_status()==true)
+        {
+            HVDC_MODEL* hvdc_model = hvdc->get_hvdc_model();
+            if(hvdc_model != NULL)
+            {
+                if(meter_type=="DC CURRENT IN KA")
+                    return hvdc_model->get_converter_dc_current_in_kA(RECTIFIER);
 
-    if(meter_type=="RECTIFIER DC CURRENT IN KA")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_dc_current_in_kA(RECTIFIER);
-    }
+                if(meter_type=="RECTIFIER DC CURRENT IN KA")
+                    return hvdc_model->get_converter_dc_current_in_kA(RECTIFIER);
 
-    if(meter_type=="RECTIFIER AC CURRENT IN KA")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return steps_fast_complex_abs(hvdc_model->get_converter_ac_current_in_kA(RECTIFIER));
-    }
+                if(meter_type=="RECTIFIER AC CURRENT IN KA")
+                    return steps_fast_complex_abs(hvdc_model->get_converter_ac_current_in_kA(RECTIFIER));
 
-    if(meter_type=="INVERTER DC CURRENT IN KA")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_dc_current_in_kA(INVERTER);
-    }
-    if(meter_type=="INVERTER AC CURRENT IN KA")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return steps_fast_complex_abs(hvdc_model->get_converter_ac_current_in_kA(INVERTER));
-    }
+                if(meter_type=="INVERTER DC CURRENT IN KA")
+                    return hvdc_model->get_converter_dc_current_in_kA(INVERTER);
 
-    if(meter_type=="RECTIFIER ALPHA IN DEG")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_alpha_or_gamma_in_deg(RECTIFIER);
-    }
+                if(meter_type=="INVERTER AC CURRENT IN KA")
+                    return steps_fast_complex_abs(hvdc_model->get_converter_ac_current_in_kA(INVERTER));
 
-    if(meter_type=="INVERTER GAMMA IN DEG")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_alpha_or_gamma_in_deg(INVERTER);
-    }
+                if(meter_type=="RECTIFIER ALPHA IN DEG")
+                    return hvdc_model->get_converter_alpha_or_gamma_in_deg(RECTIFIER);
 
-    if(meter_type=="RECTIFIER MU IN DEG")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_commutation_overlap_angle_in_deg(RECTIFIER);
-    }
+                if(meter_type=="INVERTER GAMMA IN DEG")
+                    return hvdc_model->get_converter_alpha_or_gamma_in_deg(INVERTER);
 
-    if(meter_type=="INVERTER MU IN DEG")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_commutation_overlap_angle_in_deg(INVERTER);
-    }
+                if(meter_type=="RECTIFIER MU IN DEG")
+                    return hvdc_model->get_converter_commutation_overlap_angle_in_deg(RECTIFIER);
 
-    if(meter_type=="RECTIFIER DC VOLTAGE IN KV")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_dc_voltage_in_kV(RECTIFIER);
-    }
+                if(meter_type=="INVERTER MU IN DEG")
+                    return hvdc_model->get_converter_commutation_overlap_angle_in_deg(INVERTER);
 
-    if(meter_type=="INVERTER DC VOLTAGE IN KV")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_dc_voltage_in_kV(INVERTER);
-    }
+                if(meter_type=="RECTIFIER DC VOLTAGE IN KV")
+                    return hvdc_model->get_converter_dc_voltage_in_kV(RECTIFIER);
 
-    if(meter_type=="RECTIFIER AC VOLTAGE IN PU")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_ac_voltage_in_pu(RECTIFIER);
-    }
+                if(meter_type=="INVERTER DC VOLTAGE IN KV")
+                    return hvdc_model->get_converter_dc_voltage_in_kV(INVERTER);
 
-    if(meter_type=="INVERTER AC VOLTAGE IN PU")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_ac_voltage_in_pu(INVERTER);
-    }
+                if(meter_type=="RECTIFIER AC VOLTAGE IN PU")
+                    return hvdc_model->get_converter_ac_voltage_in_pu(RECTIFIER);
 
-    if(meter_type=="RECTIFIER DC POWER IN MW")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_dc_power_in_MW(RECTIFIER);
-    }
+                if(meter_type=="INVERTER AC VOLTAGE IN PU")
+                    return hvdc_model->get_converter_ac_voltage_in_pu(INVERTER);
 
-    if(meter_type=="INVERTER DC POWER IN MW")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_dc_power_in_MW(INVERTER);
-    }
+                if(meter_type=="RECTIFIER DC POWER IN MW")
+                    return hvdc_model->get_converter_dc_power_in_MW(RECTIFIER);
 
-    if(meter_type=="RECTIFIER AC ACTIVE POWER IN MW")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_ac_complex_power_in_MVA(RECTIFIER).real();
-    }
+                if(meter_type=="INVERTER DC POWER IN MW")
+                    return hvdc_model->get_converter_dc_power_in_MW(INVERTER);
 
-    if(meter_type=="INVERTER AC ACTIVE POWER IN MW")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_ac_complex_power_in_MVA(INVERTER).real();
-    }
+                if(meter_type=="RECTIFIER AC ACTIVE POWER IN MW")
+                    return hvdc_model->get_converter_ac_complex_power_in_MVA(RECTIFIER).real();
 
-    if(meter_type=="RECTIFIER AC REACTIVE POWER IN MVAR")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_ac_complex_power_in_MVA(RECTIFIER).imag();
-    }
+                if(meter_type=="INVERTER AC ACTIVE POWER IN MW")
+                    return hvdc_model->get_converter_ac_complex_power_in_MVA(INVERTER).real();
 
-    if(meter_type=="INVERTER AC REACTIVE POWER IN MVAR")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
-        else
-            return hvdc_model->get_converter_ac_complex_power_in_MVA(INVERTER).imag();
-    }
+                if(meter_type=="RECTIFIER AC REACTIVE POWER IN MVAR")
+                    return hvdc_model->get_converter_ac_complex_power_in_MVA(RECTIFIER).imag();
 
-    if(meter_type=="HVDC MODEL INTERNAL VARIABLE")
-    {
-        if(hvdc_model == NULL)
-            return 0.0;
+                if(meter_type=="INVERTER AC REACTIVE POWER IN MVAR")
+                    return hvdc_model->get_converter_ac_complex_power_in_MVA(INVERTER).imag();
+
+                if(meter_type=="HVDC MODEL INTERNAL VARIABLE")
+                    return hvdc_model->get_model_internal_variable_with_name(internal_variable_name);
+
+                return 0.0;
+            }
+            else
+                return 0.0;
+        }
         else
-            return hvdc_model->get_model_internal_variable_with_name(internal_variable_name);
+            return 0.0;
     }
-
-    return 0.0;
+    else
+        return 0.0;
 }
 
 double METER::get_meter_value_as_an_equivalent_device() const
 {
     EQUIVALENT_DEVICE* edevice = (EQUIVALENT_DEVICE*) get_device_pointer();
-    if(edevice == NULL)
-        return 0.0;
-
-    if(meter_type=="VOLTAGE SOURCE VOLTAGE IN PU")
+    if(edevice != NULL)
     {
-        return steps_fast_complex_abs(edevice->get_equivalent_voltage_source_voltage_in_pu());
-        if(edevice->get_equivalent_voltage_source_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="VOLTAGE SOURCE VOLTAGE IN PU")
+        {
             return steps_fast_complex_abs(edevice->get_equivalent_voltage_source_voltage_in_pu());
-    }
+            if(edevice->get_equivalent_voltage_source_status()==true)
+                return steps_fast_complex_abs(edevice->get_equivalent_voltage_source_voltage_in_pu());
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="VOLTAGE SOURCE VOLTAGE ANGLE IN DEG")
-    {
-        return rad2deg(steps_fast_complex_arg(edevice->get_equivalent_voltage_source_voltage_in_pu()));
-        if(edevice->get_equivalent_voltage_source_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="VOLTAGE SOURCE VOLTAGE ANGLE IN DEG")
+        {
             return rad2deg(steps_fast_complex_arg(edevice->get_equivalent_voltage_source_voltage_in_pu()));
-    }
+            if(edevice->get_equivalent_voltage_source_status()==true)
+                return rad2deg(steps_fast_complex_arg(edevice->get_equivalent_voltage_source_voltage_in_pu()));
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="VOLTAGE SOURCE RESISTANCE IN PU")
-    {
-        return edevice->get_equivalent_voltage_source_impedance_in_pu().real();
-        if(edevice->get_equivalent_voltage_source_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="VOLTAGE SOURCE RESISTANCE IN PU")
+        {
             return edevice->get_equivalent_voltage_source_impedance_in_pu().real();
-    }
+            if(edevice->get_equivalent_voltage_source_status()==true)
+                return edevice->get_equivalent_voltage_source_impedance_in_pu().real();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="VOLTAGE SOURCE REACTANCE IN PU")
-    {
-        return edevice->get_equivalent_voltage_source_impedance_in_pu().imag();
-        if(edevice->get_equivalent_voltage_source_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="VOLTAGE SOURCE REACTANCE IN PU")
+        {
             return edevice->get_equivalent_voltage_source_impedance_in_pu().imag();
-    }
+            if(edevice->get_equivalent_voltage_source_status()==true)
+                return edevice->get_equivalent_voltage_source_impedance_in_pu().imag();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="ACTIVE CONSTANT POWER LOAD IN MW")
-    {
-        return edevice->get_equivalent_nominal_constant_power_load_in_MVA().real();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="ACTIVE CONSTANT POWER LOAD IN MW")
+        {
             return edevice->get_equivalent_nominal_constant_power_load_in_MVA().real();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_nominal_constant_power_load_in_MVA().real();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="REACTIVE CONSTANT POWER LOAD IN MVAR")
-    {
-        return edevice->get_equivalent_nominal_constant_power_load_in_MVA().imag();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="REACTIVE CONSTANT POWER LOAD IN MVAR")
+        {
             return edevice->get_equivalent_nominal_constant_power_load_in_MVA().imag();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_nominal_constant_power_load_in_MVA().imag();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="ACTIVE CONSTANT CURRENT LOAD IN MW")
-    {
-        return edevice->get_equivalent_nominal_constant_current_load_in_MVA().real();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="ACTIVE CONSTANT CURRENT LOAD IN MW")
+        {
             return edevice->get_equivalent_nominal_constant_current_load_in_MVA().real();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_nominal_constant_current_load_in_MVA().real();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="REACTIVE CONSTANT CURRENT LOAD IN MVAR")
-    {
-        return edevice->get_equivalent_nominal_constant_current_load_in_MVA().imag();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="REACTIVE CONSTANT CURRENT LOAD IN MVAR")
+        {
             return edevice->get_equivalent_nominal_constant_current_load_in_MVA().imag();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_nominal_constant_current_load_in_MVA().imag();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="ACTIVE CONSTANT IMPEDANCE LOAD IN MW")
-    {
-        return edevice->get_equivalent_nominal_constant_impedance_load_in_MVA().real();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="ACTIVE CONSTANT IMPEDANCE LOAD IN MW")
+        {
             return edevice->get_equivalent_nominal_constant_impedance_load_in_MVA().real();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_nominal_constant_impedance_load_in_MVA().real();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="REACTIVE CONSTANT IMPEDANCE LOAD IN MVAR")
-    {
-        return edevice->get_equivalent_nominal_constant_impedance_load_in_MVA().imag();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="REACTIVE CONSTANT IMPEDANCE LOAD IN MVAR")
+        {
             return edevice->get_equivalent_nominal_constant_impedance_load_in_MVA().imag();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_nominal_constant_impedance_load_in_MVA().imag();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="ACTIVE POWER GENERATION IN MW")
-    {
-        return edevice->get_equivalent_generation_in_MVA().real();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="ACTIVE POWER GENERATION IN MW")
+        {
             return edevice->get_equivalent_generation_in_MVA().real();
-    }
-    if(meter_type=="REACTIVE POWER GENERATION IN MVAR")
-    {
-        return edevice->get_equivalent_generation_in_MVA().imag();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_generation_in_MVA().real();
+            else
+                return 0.0;
+        }
+        if(meter_type=="REACTIVE POWER GENERATION IN MVAR")
+        {
             return edevice->get_equivalent_generation_in_MVA().imag();
-    }
-    if(meter_type=="ACTIVE POWER LOAD IN MW")
-    {
-        return edevice->get_equivalent_load_in_MVA().real();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_generation_in_MVA().imag();
+            else
+                return 0.0;
+        }
+        if(meter_type=="ACTIVE POWER LOAD IN MW")
+        {
             return edevice->get_equivalent_load_in_MVA().real();
-    }
-    if(meter_type=="REACTIVE POWER LOAD IN MVAR")
-    {
-        return edevice->get_equivalent_load_in_MVA().imag();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_load_in_MVA().real();
+            else
+                return 0.0;
+        }
+        if(meter_type=="REACTIVE POWER LOAD IN MVAR")
+        {
             return edevice->get_equivalent_load_in_MVA().imag();
-    }
-    if(meter_type=="ACTIVE POWER NET LOAD IN MW")
-    {
-        return edevice->get_total_equivalent_power_as_load_in_MVA().real();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_load_in_MVA().imag();
+            else
+                return 0.0;
+        }
+        if(meter_type=="ACTIVE POWER NET LOAD IN MW")
+        {
             return edevice->get_total_equivalent_power_as_load_in_MVA().real();
-    }
-    if(meter_type=="REACTIVE POWER NET LOAD IN MVAR")
-    {
-        return edevice->get_total_equivalent_power_as_load_in_MVA().imag();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_total_equivalent_power_as_load_in_MVA().real();
+            else
+                return 0.0;
+        }
+        if(meter_type=="REACTIVE POWER NET LOAD IN MVAR")
+        {
             return edevice->get_total_equivalent_power_as_load_in_MVA().imag();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_total_equivalent_power_as_load_in_MVA().imag();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="ACTIVE CONSTANT POWER LOAD IN PU")
-    {
-        return edevice->get_equivalent_nominal_constant_power_load_in_pu().real();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="ACTIVE CONSTANT POWER LOAD IN PU")
+        {
             return edevice->get_equivalent_nominal_constant_power_load_in_pu().real();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_nominal_constant_power_load_in_pu().real();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="REACTIVE CONSTANT POWER LOAD IN PU")
-    {
-        return edevice->get_equivalent_nominal_constant_power_load_in_pu().imag();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="REACTIVE CONSTANT POWER LOAD IN PU")
+        {
             return edevice->get_equivalent_nominal_constant_power_load_in_pu().imag();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_nominal_constant_power_load_in_pu().imag();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="ACTIVE CONSTANT CURRENT LOAD IN PU")
-    {
-        return edevice->get_equivalent_nominal_constant_current_load_in_pu().real();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="ACTIVE CONSTANT CURRENT LOAD IN PU")
+        {
             return edevice->get_equivalent_nominal_constant_current_load_in_pu().real();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_nominal_constant_current_load_in_pu().real();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="REACTIVE CONSTANT CURRENT LOAD IN PU")
-    {
-        return edevice->get_equivalent_nominal_constant_current_load_in_pu().imag();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="REACTIVE CONSTANT CURRENT LOAD IN PU")
+        {
             return edevice->get_equivalent_nominal_constant_current_load_in_pu().imag();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_nominal_constant_current_load_in_pu().imag();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="ACTIVE CONSTANT IMPEDANCE LOAD IN PU")
-    {
-        return edevice->get_equivalent_nominal_constant_impedance_load_in_pu().real();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="ACTIVE CONSTANT IMPEDANCE LOAD IN PU")
+        {
             return edevice->get_equivalent_nominal_constant_impedance_load_in_pu().real();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_nominal_constant_impedance_load_in_pu().real();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="REACTIVE CONSTANT IMPEDANCE LOAD IN PU")
-    {
-        return edevice->get_equivalent_nominal_constant_impedance_load_in_pu().imag();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="REACTIVE CONSTANT IMPEDANCE LOAD IN PU")
+        {
             return edevice->get_equivalent_nominal_constant_impedance_load_in_pu().imag();
-    }
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_nominal_constant_impedance_load_in_pu().imag();
+            else
+                return 0.0;
+        }
 
-    if(meter_type=="ACTIVE POWER GENERATION IN PU")
-    {
-        return edevice->get_equivalent_generation_in_pu().real();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+        if(meter_type=="ACTIVE POWER GENERATION IN PU")
+        {
             return edevice->get_equivalent_generation_in_pu().real();
-    }
-    if(meter_type=="REACTIVE POWER GENERATION IN PU")
-    {
-        return edevice->get_equivalent_generation_in_pu().imag();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_generation_in_pu().real();
+            else
+                return 0.0;
+        }
+        if(meter_type=="REACTIVE POWER GENERATION IN PU")
+        {
             return edevice->get_equivalent_generation_in_pu().imag();
-    }
-    if(meter_type=="ACTIVE POWER LOAD IN PU")
-    {
-        return edevice->get_equivalent_load_in_pu().real();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_generation_in_pu().imag();
+            else
+                return 0.0;
+        }
+        if(meter_type=="ACTIVE POWER LOAD IN PU")
+        {
             return edevice->get_equivalent_load_in_pu().real();
-    }
-    if(meter_type=="REACTIVE POWER LOAD IN PU")
-    {
-        return edevice->get_equivalent_load_in_pu().imag();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_load_in_pu().real();
+            else
+                return 0.0;
+        }
+        if(meter_type=="REACTIVE POWER LOAD IN PU")
+        {
             return edevice->get_equivalent_load_in_pu().imag();
-    }
-    if(meter_type=="ACTIVE POWER NET LOAD IN PU")
-    {
-        return edevice->get_total_equivalent_power_as_load_in_pu().real();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_equivalent_load_in_pu().imag();
+            else
+                return 0.0;
+        }
+        if(meter_type=="ACTIVE POWER NET LOAD IN PU")
+        {
             return edevice->get_total_equivalent_power_as_load_in_pu().real();
-    }
-    if(meter_type=="REACTIVE POWER NET LOAD IN PU")
-    {
-        return edevice->get_total_equivalent_power_as_load_in_pu().imag();
-        if(edevice->get_equivalent_load_status()==false)
-            return 0.0;
-        else
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_total_equivalent_power_as_load_in_pu().real();
+            else
+                return 0.0;
+        }
+        if(meter_type=="REACTIVE POWER NET LOAD IN PU")
+        {
             return edevice->get_total_equivalent_power_as_load_in_pu().imag();
+            if(edevice->get_equivalent_load_status()==true)
+                return edevice->get_total_equivalent_power_as_load_in_pu().imag();
+            else
+                return 0.0;
+        }
+        return 0.0;
     }
-
-    return 0.0;
+    else
+        return 0.0;
 }
 
 
 double METER::get_meter_value_as_an_energy_storage() const
 {
     ENERGY_STORAGE* estorage = (ENERGY_STORAGE*) get_device_pointer();
-    if(estorage == NULL)
-        return 0.0;
-    ENERGY_STORAGE_MODEL* model = estorage->get_energy_storage_model();
-    if(model==NULL)
-        return 0.0;
-
-    if(meter_type=="STATE OF ENERGY IN PU")
-        return model->get_energy_state_in_pu();
-
-    if(meter_type=="ACTIVE POWER IN MW")
-        return model->get_terminal_active_power_in_MW();
+    if(estorage != NULL)
+    {
+        ENERGY_STORAGE_MODEL* model = estorage->get_energy_storage_model();
+        if(model!=NULL)
+        {
+            if(meter_type=="STATE OF ENERGY IN PU")
+                return model->get_energy_state_in_pu();
 
-    if(meter_type=="ACTIVE POWER IN PU")
-        return model->get_terminal_active_power_in_pu_based_on_mbase();
+            if(meter_type=="ACTIVE POWER IN MW")
+                return model->get_terminal_active_power_in_MW();
 
-    if(meter_type=="REACTIVE POWER IN MVAR")
-        return model->get_terminal_reactive_power_in_MVar();
+            if(meter_type=="ACTIVE POWER IN PU")
+                return model->get_terminal_active_power_in_pu_based_on_mbase();
 
-    if(meter_type=="REACTIVE POWER IN PU")
-        return model->get_terminal_reactive_power_in_pu_based_on_mbase();
+            if(meter_type=="REACTIVE POWER IN MVAR")
+                return model->get_terminal_reactive_power_in_MVar();
 
-    if(meter_type=="TERMINAL CURRENT IN KA")
-        return model->get_terminal_current_in_kA();
+            if(meter_type=="REACTIVE POWER IN PU")
+                return model->get_terminal_reactive_power_in_pu_based_on_mbase();
 
-    if(meter_type=="TERMINAL CURRENT IN PU")
-        return model->get_terminal_current_in_pu_based_on_mbase();
+            if(meter_type=="TERMINAL CURRENT IN KA")
+                return model->get_terminal_current_in_kA();
 
-    if(meter_type=="ENERGY STORAGE MODEL INTERNAL VARIABLE")
-        return model->get_model_internal_variable_with_name(internal_variable_name);
+            if(meter_type=="TERMINAL CURRENT IN PU")
+                return model->get_terminal_current_in_pu_based_on_mbase();
 
+            if(meter_type=="ENERGY STORAGE MODEL INTERNAL VARIABLE")
+                return model->get_model_internal_variable_with_name(internal_variable_name);
 
-    return 0.0;
+            return 0.0;
+        }
+        else
+            return 0.0;
+    }
+    else
+        return 0.0;
 }
 
 
diff --git a/code/source/meter/meter_setter.cpp b/code/source/meter/meter_setter.cpp
index aca3e6fa..6810942e 100644
--- a/code/source/meter/meter_setter.cpp
+++ b/code/source/meter/meter_setter.cpp
@@ -47,13 +47,13 @@ METER METER_SETTER::prepare_bus_voltage_in_pu_meter(size_t bus)
 
     bool successful = prepare_bus_meter(meter, bus);
 
-    if(not successful)
-        return meter;
-    else
+    if(successful)
     {
         meter.set_meter_type("VOLTAGE IN PU");
         return meter;
     }
+    else
+        return meter;
 }
 METER METER_SETTER::prepare_bus_voltage_in_kV_meter(size_t bus)
 {
@@ -62,13 +62,13 @@ METER METER_SETTER::prepare_bus_voltage_in_kV_meter(size_t bus)
 
     bool successful = prepare_bus_meter(meter, bus);
 
-    if(not successful)
-        return meter;
-    else
+    if(successful)
     {
         meter.set_meter_type("VOLTAGE IN KV");
         return meter;
     }
+    else
+        return meter;
 }
 
 METER METER_SETTER::prepare_bus_angle_in_deg_meter(size_t bus)
@@ -78,13 +78,13 @@ METER METER_SETTER::prepare_bus_angle_in_deg_meter(size_t bus)
 
     bool successful = prepare_bus_meter(meter, bus);
 
-    if(not successful)
-        return meter;
-    else
+    if(successful)
     {
        meter.set_meter_type("ANGLE IN DEG");
         return meter;
     }
+    else
+        return meter;
 }
 
 METER METER_SETTER::prepare_bus_angle_in_rad_meter(size_t bus)
@@ -94,13 +94,13 @@ METER METER_SETTER::prepare_bus_angle_in_rad_meter(size_t bus)
 
     bool successful = prepare_bus_meter(meter, bus);
 
-    if(not successful)
-        return meter;
-    else
+    if(successful)
     {
        meter.set_meter_type("ANGLE IN RAD");
         return meter;
     }
+    else
+        return meter;
 }
 
 METER METER_SETTER::prepare_bus_frequency_in_pu_meter(size_t bus)
diff --git a/code/source/model/bus_frequency_model/bus_frequency_model.cpp b/code/source/model/bus_frequency_model/bus_frequency_model.cpp
index 55f17499..d24d1c18 100644
--- a/code/source/model/bus_frequency_model/bus_frequency_model.cpp
+++ b/code/source/model/bus_frequency_model/bus_frequency_model.cpp
@@ -40,22 +40,25 @@ void BUS_FREQUENCY_MODEL::initialize()
 {
     ostringstream osstream;
 
-    if(bus_ptr==NULL)
+    if(bus_ptr!=NULL)
+    {
+        STEPS& toolkit = bus_ptr->get_toolkit(__PRETTY_FUNCTION__);
+        set_toolkit(toolkit);
+
+        double DELT = toolkit.get_dynamic_simulation_time_step_in_s();
+        frequency_block.set_toolkit(toolkit);
+        frequency_block.set_T_in_s(DELT*4.0);
+
+        frequency_block.set_input(bus_ptr->get_angle_in_rad());
+
+        frequency_block.initialize();
+    }
+    else
     {
         osstream<<"Warning. Bus frequency model is not properly set since bus pointer is NULL. This line should never appear.";
         show_information_with_leading_time_stamp_with_default_toolkit(osstream);
         return;
     }
-    STEPS& toolkit = bus_ptr->get_toolkit(__PRETTY_FUNCTION__);
-    set_toolkit(toolkit);
-
-    double DELT = toolkit.get_dynamic_simulation_time_step_in_s();
-    frequency_block.set_toolkit(toolkit);
-    frequency_block.set_T_in_s(DELT*4.0);
-
-    frequency_block.set_input(bus_ptr->get_angle_in_rad());
-
-    frequency_block.initialize();
 }
 
 void BUS_FREQUENCY_MODEL::run(DYNAMIC_MODE mode)
diff --git a/code/source/model/load_model/IEEL.cpp b/code/source/model/load_model/IEEL.cpp
index e63d866a..5522186f 100644
--- a/code/source/model/load_model/IEEL.cpp
+++ b/code/source/model/load_model/IEEL.cpp
@@ -211,66 +211,70 @@ double IEEL::get_Q_Kf() const
 bool IEEL::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<17)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!="IEELBL" and model_name!="IEELAR" and model_name!="IEELZN" and model_name!="IEELOW" and model_name!="IEELAL")
-        return is_successful;
-
-    double ap1, ap2, ap3, aq1, aq2, aq3, kfp, kfq, np1, np2, np3, nq1, nq2, nq3;
-
-    size_t i=3;
-    ap1 = get_double_data(data[i],"0.0"); i++;
-    ap2 = get_double_data(data[i],"0.0"); i++;
-    ap3 = get_double_data(data[i],"0.0"); i++;
-    aq1 = get_double_data(data[i],"0.0"); i++;
-    aq2 = get_double_data(data[i],"0.0"); i++;
-    aq3 = get_double_data(data[i],"0.0"); i++;
-    kfp = get_double_data(data[i],"0.0"); i++;
-    kfq = get_double_data(data[i],"0.0"); i++;
-    np1 = get_double_data(data[i],"0.0"); i++;
-    np2 = get_double_data(data[i],"0.0"); i++;
-    np3 = get_double_data(data[i],"0.0"); i++;
-    nq1 = get_double_data(data[i],"0.0"); i++;
-    nq2 = get_double_data(data[i],"0.0"); i++;
-    nq3 = get_double_data(data[i],"0.0"); i++;
-
-    set_P_alpha_1(ap1);
-    set_P_alpha_2(ap2);
-    set_P_alpha_3(ap3);
-    set_Q_alpha_1(aq1);
-    set_Q_alpha_2(aq2);
-    set_Q_alpha_3(aq3);
-    set_P_n_power_1(np1);
-    set_P_n_power_2(np2);
-    set_P_n_power_3(np3);
-    set_Q_n_power_1(nq1);
-    set_Q_n_power_2(nq2);
-    set_Q_n_power_3(nq3);
-    set_P_Kf(kfp);
-    set_Q_Kf(kfq);
-
-    if(model_name=="IEELAL")
-        set_subsystem_type(ALL_SYSTEM_TYPE);
-    else
+    if(data.size()>=17)
     {
-        if(model_name=="IEELAR")
-            set_subsystem_type(AREA_SUBSYSTEM_TYPE);
-        else
+        string model_name = get_string_data(data[0],"");
+        if(model_name=="IEELAL" or model_name=="IEELBL" or model_name=="IEELAR" or model_name=="IEELZN" or model_name=="IEELOW")
         {
-            if(model_name=="IEELZN")
-                set_subsystem_type(ZONE_SUBSYSTEM_TYPE);
+            double ap1, ap2, ap3, aq1, aq2, aq3, kfp, kfq, np1, np2, np3, nq1, nq2, nq3;
+
+            size_t i=3;
+            ap1 = get_double_data(data[i],"0.0"); i++;
+            ap2 = get_double_data(data[i],"0.0"); i++;
+            ap3 = get_double_data(data[i],"0.0"); i++;
+            aq1 = get_double_data(data[i],"0.0"); i++;
+            aq2 = get_double_data(data[i],"0.0"); i++;
+            aq3 = get_double_data(data[i],"0.0"); i++;
+            kfp = get_double_data(data[i],"0.0"); i++;
+            kfq = get_double_data(data[i],"0.0"); i++;
+            np1 = get_double_data(data[i],"0.0"); i++;
+            np2 = get_double_data(data[i],"0.0"); i++;
+            np3 = get_double_data(data[i],"0.0"); i++;
+            nq1 = get_double_data(data[i],"0.0"); i++;
+            nq2 = get_double_data(data[i],"0.0"); i++;
+            nq3 = get_double_data(data[i],"0.0"); i++;
+
+            set_P_alpha_1(ap1);
+            set_P_alpha_2(ap2);
+            set_P_alpha_3(ap3);
+            set_Q_alpha_1(aq1);
+            set_Q_alpha_2(aq2);
+            set_Q_alpha_3(aq3);
+            set_P_n_power_1(np1);
+            set_P_n_power_2(np2);
+            set_P_n_power_3(np3);
+            set_Q_n_power_1(nq1);
+            set_Q_n_power_2(nq2);
+            set_Q_n_power_3(nq3);
+            set_P_Kf(kfp);
+            set_Q_Kf(kfq);
+
+            if(model_name=="IEELAL")
+                set_subsystem_type(ALL_SYSTEM_TYPE);
             else
             {
-                //IEELBL
-                set_subsystem_type(BUS_SUBSYSTEM_TYPE);
+                if(model_name=="IEELAR")
+                    set_subsystem_type(AREA_SUBSYSTEM_TYPE);
+                else
+                {
+                    if(model_name=="IEELZN")
+                        set_subsystem_type(ZONE_SUBSYSTEM_TYPE);
+                    else
+                    {
+                        //IEELBL
+                        set_subsystem_type(BUS_SUBSYSTEM_TYPE);
+                    }
+                }
             }
+            is_successful = true;
+
+            return is_successful;
         }
+        else
+            return is_successful;
     }
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool IEEL::setup_model_with_psse_string(string data)
@@ -348,35 +352,35 @@ complex<double> IEEL::get_load_power_in_MVA() const
     double kf = get_P_Kf();
 
     double P = 0.0;
-    if(fabs(n1)<FLOAT_EPSILON)
+    if(fabs(n1)>FLOAT_EPSILON)
+        P += alpha1*steps_fast_pow(V,n1);
+    else
     {
         if(V>Vth)
             P += alpha1;
         else
             P += (alpha1/Vth*V);
     }
-    else
-        P += alpha1*steps_fast_pow(V,n1);
 
-    if(fabs(n2)<FLOAT_EPSILON)
+    if(fabs(n2)>FLOAT_EPSILON)
+        P += alpha2*steps_fast_pow(V,n2);
+    else
     {
         if(V>Vth)
             P += alpha2;
         else
             P += (alpha2/Vth*V);
     }
-    else
-        P += alpha2*steps_fast_pow(V,n2);
 
-    if(fabs(n3)<FLOAT_EPSILON)
+    if(fabs(n3)>FLOAT_EPSILON)
+        P += alpha3*steps_fast_pow(V,n3);
+    else
     {
         if(V>Vth)
             P += alpha3;
         else
             P += (alpha3/Vth*V);
     }
-    else
-        P += alpha3*steps_fast_pow(V,n3);
 
     P = get_initial_load_power_in_MVA().real()*P*(1.0+kf*f);
 
@@ -389,35 +393,35 @@ complex<double> IEEL::get_load_power_in_MVA() const
     kf = get_Q_Kf();
 
     double Q = 0.0;
-    if(fabs(n1)<FLOAT_EPSILON)
+    if(fabs(n1)>FLOAT_EPSILON)
+        Q += alpha1*steps_fast_pow(V,n1);
+    else
     {
         if(V>Vth)
             Q += alpha1;
         else
             Q += (alpha1/Vth*V);
     }
-    else
-        Q += alpha1*steps_fast_pow(V,n1);
 
-    if(fabs(n2)<FLOAT_EPSILON)
+    if(fabs(n2)>FLOAT_EPSILON)
+        Q += alpha2*steps_fast_pow(V,n2);
+    else
     {
         if(V>Vth)
             Q += alpha2;
         else
             Q += (alpha2/Vth*V);
     }
-    else
-        Q += alpha2*steps_fast_pow(V,n2);
 
     if(fabs(n3)<FLOAT_EPSILON)
+        Q += alpha3*steps_fast_pow(V,n3);
+    else
     {
         if(V>Vth)
             Q += alpha3;
         else
             Q += (alpha3/Vth*V);
     }
-    else
-        Q += alpha3*steps_fast_pow(V,n3);
 
     Q = get_initial_load_power_in_MVA().imag()*Q*(1.0+kf*f);
 
diff --git a/code/source/model/load_relay_model/PUFLS.cpp b/code/source/model/load_relay_model/PUFLS.cpp
index 6a0146a9..fb0343cb 100644
--- a/code/source/model/load_relay_model/PUFLS.cpp
+++ b/code/source/model/load_relay_model/PUFLS.cpp
@@ -205,76 +205,80 @@ bool PUFLS::setup_model_with_steps_string_vector(vector<string>& data)
     bool is_successful = false;
     size_t n = data.size();
 
-    if(n<12)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!="PUFLSAL" and model_name!="PUFLSAR" and model_name!="PUFLSZN" and model_name!="PUFLSBL")
-        return is_successful;
-
-    double t_freq, fth_continuous, tdelay, K_scale, max_scale;
-    size_t signal_flag;
-    double fth_additional, additional_scale, additional_time_delay;
-
-    size_t i=3;
-    signal_flag = get_integer_data(data[i], "0"); i++;
-    t_freq = get_double_data(data[i],"0.0"); i++;
-    fth_continuous = get_double_data(data[i],"0.0"); i++;
-    K_scale = get_double_data(data[i],"0.0"); i++;
-    tdelay = get_double_data(data[i],"0.0"); i++;
-    max_scale = get_double_data(data[i],"0.0"); i++;
-
-    set_frequency_sensor_time_in_s(t_freq);
-    set_continuous_frequency_threshold_in_Hz(fth_continuous);
-    set_time_delay_in_s(tdelay);
-    set_scale_K_in_pu_per_Hz(K_scale);
-    set_maximum_continuous_shed_scale_in_pu(max_scale);
-
-    fth_additional = get_double_data(data[i],"0.0"); i++;
-    additional_time_delay = get_double_data(data[i],"0.0"); i++;
-    additional_scale = get_double_data(data[i],"0.0"); i++;
-
-    if(signal_flag==0)
-        set_additional_stage_trigger_signal(REALTIME_FREQUENCY);
-    else
-        set_additional_stage_trigger_signal(MINIMUM_FREQUENCY);
-    set_additional_stage_frequency_threshold_in_Hz(fth_additional);
-    set_additional_stage_time_delay_in_s(additional_time_delay);
-    set_additional_stage_shed_scale_in_pu(additional_scale);
-
     if(n>=12)
     {
-        tdelay = get_double_data(data[i],"0.0"); i++;
-        set_discrete_stage_time_delay_in_s(tdelay);
-
-        for(size_t stage=0; i!=n and stage!=MAX_LOAD_RELAY_STAGE; ++i, ++stage)
+        string model_name = get_string_data(data[0],"");
+        if(model_name=="PUFLSAL" or model_name=="PUFLSBL" or model_name=="PUFLSAR" or model_name=="PUFLSZN")
         {
-            double scale = get_double_data(data[i],"0.0");
-            set_discrete_stage_shed_scale_in_pu(stage, scale);
-        }
-    }
+            double t_freq, fth_continuous, tdelay, K_scale, max_scale;
+            size_t signal_flag;
+            double fth_additional, additional_scale, additional_time_delay;
+
+            size_t i=3;
+            signal_flag = get_integer_data(data[i], "0"); i++;
+            t_freq = get_double_data(data[i],"0.0"); i++;
+            fth_continuous = get_double_data(data[i],"0.0"); i++;
+            K_scale = get_double_data(data[i],"0.0"); i++;
+            tdelay = get_double_data(data[i],"0.0"); i++;
+            max_scale = get_double_data(data[i],"0.0"); i++;
+
+            set_frequency_sensor_time_in_s(t_freq);
+            set_continuous_frequency_threshold_in_Hz(fth_continuous);
+            set_time_delay_in_s(tdelay);
+            set_scale_K_in_pu_per_Hz(K_scale);
+            set_maximum_continuous_shed_scale_in_pu(max_scale);
+
+            fth_additional = get_double_data(data[i],"0.0"); i++;
+            additional_time_delay = get_double_data(data[i],"0.0"); i++;
+            additional_scale = get_double_data(data[i],"0.0"); i++;
+
+            if(signal_flag==0)
+                set_additional_stage_trigger_signal(REALTIME_FREQUENCY);
+            else
+                set_additional_stage_trigger_signal(MINIMUM_FREQUENCY);
+            set_additional_stage_frequency_threshold_in_Hz(fth_additional);
+            set_additional_stage_time_delay_in_s(additional_time_delay);
+            set_additional_stage_shed_scale_in_pu(additional_scale);
 
+            if(n>=12)
+            {
+                tdelay = get_double_data(data[i],"0.0"); i++;
+                set_discrete_stage_time_delay_in_s(tdelay);
 
-    if(model_name=="PUFLSAL")
-        set_subsystem_type(ALL_SYSTEM_TYPE);
-    else
-    {
-        if(model_name=="PUFLSAR")
-            set_subsystem_type(AREA_SUBSYSTEM_TYPE);
-        else
-        {
-            if(model_name=="PUFLSZN")
-                set_subsystem_type(ZONE_SUBSYSTEM_TYPE);
+                for(size_t stage=0; i!=n and stage!=MAX_LOAD_RELAY_STAGE; ++i, ++stage)
+                {
+                    double scale = get_double_data(data[i],"0.0");
+                    set_discrete_stage_shed_scale_in_pu(stage, scale);
+                }
+            }
+
+
+            if(model_name=="PUFLSAL")
+                set_subsystem_type(ALL_SYSTEM_TYPE);
             else
             {
-                //PUFLSBL
-                set_subsystem_type(BUS_SUBSYSTEM_TYPE);
+                if(model_name=="PUFLSAR")
+                    set_subsystem_type(AREA_SUBSYSTEM_TYPE);
+                else
+                {
+                    if(model_name=="PUFLSZN")
+                        set_subsystem_type(ZONE_SUBSYSTEM_TYPE);
+                    else
+                    {
+                        //PUFLSBL
+                        set_subsystem_type(BUS_SUBSYSTEM_TYPE);
+                    }
+                }
             }
+            is_successful = true;
+
+            return is_successful;
         }
+        else
+            return is_successful;
     }
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool PUFLS::setup_model_with_psse_string(string data)
@@ -307,40 +311,40 @@ void PUFLS::set_block_toolkit()
 void PUFLS::initialize()
 {
     LOAD* load = get_load_pointer();
-    if(load==NULL)
-        return;
+    if(load!=NULL)
+    {
+        set_block_toolkit();
 
-    set_block_toolkit();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        double fbase = get_bus_base_frequency_in_Hz();
 
-    double fbase = get_bus_base_frequency_in_Hz();
+        additional_stage_timer.set_attached_device(load);
+        for(size_t stage=0; stage!=MAX_LOAD_RELAY_STAGE; ++stage)
+            discrete_stage_timer[stage].set_attached_device(load);
 
-    additional_stage_timer.set_attached_device(load);
-    for(size_t stage=0; stage!=MAX_LOAD_RELAY_STAGE; ++stage)
-        discrete_stage_timer[stage].set_attached_device(load);
+        double t_delay = get_time_delay_in_s();
+        double delt = toolkit.get_dynamic_simulation_time_step_in_s();
 
-    double t_delay = get_time_delay_in_s();
-    double delt = toolkit.get_dynamic_simulation_time_step_in_s();
+        frequency_sensor.set_output(fbase);
+        frequency_sensor.initialize();
 
-    frequency_sensor.set_output(fbase);
-    frequency_sensor.initialize();
+        double current_time = toolkit.get_dynamic_simulation_time_in_s();
 
-    double current_time = toolkit.get_dynamic_simulation_time_in_s();
+        history_minimum_frequency_buffer.set_buffer_size(2*(size_t)(t_delay/delt)+2);
+        history_minimum_frequency_buffer.initialize_buffer(current_time, fbase);
 
-    history_minimum_frequency_buffer.set_buffer_size(2*(size_t)(t_delay/delt)+2);
-    history_minimum_frequency_buffer.initialize_buffer(current_time, fbase);
+        additional_stage_timer.reset();
+        flag_additional_stage_is_tripped = false;
 
-    additional_stage_timer.reset();
-    flag_additional_stage_is_tripped = false;
+        for(size_t stage=0; stage!=MAX_LOAD_RELAY_STAGE; ++stage)
+        {
+            discrete_stage_timer[stage].reset();
+            flag_discrete_stage_is_tripped[stage] = false;
+        }
 
-    for(size_t stage=0; stage!=MAX_LOAD_RELAY_STAGE; ++stage)
-    {
-        discrete_stage_timer[stage].reset();
-        flag_discrete_stage_is_tripped[stage] = false;
+        current_continuous_shed_command_in_pu = 0.0;
     }
-
-    current_continuous_shed_command_in_pu = 0.0;
 }
 
 void PUFLS::run(DYNAMIC_MODE mode)
@@ -475,10 +479,7 @@ double PUFLS::get_total_discrete_shed_scale_in_pu() const
 {
     double scale = 0.0;
     for(size_t stage=0; stage!=MAX_LOAD_RELAY_STAGE; ++stage)
-    {
-        if(is_discrete_stage_tipped(stage))
-            scale += discrete_stage_shed_scale_in_pu[stage];
-    }
+        scale += (is_discrete_stage_tipped(stage)*discrete_stage_shed_scale_in_pu[stage]);
     return scale;
 }
 
@@ -618,128 +619,125 @@ bool PUFLS::is_additional_stage_timer_started() const
 
 void PUFLS::trip_additional_stage()
 {
-    if(is_additional_stage_tripped())
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    double current_time = toolkit.get_dynamic_simulation_time_in_s();
+    if(not is_additional_stage_tripped())
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        double current_time = toolkit.get_dynamic_simulation_time_in_s();
 
-    ostringstream osstream;
-    osstream<<"PUFLS additional stage of "<<get_device_name()<<" is timed out at time "
-      <<setprecision(3)<<fixed<<current_time<<" s. "<<endl
-      <<setprecision(4)<<fixed<<get_additional_stage_shed_scale_in_pu()*100.0<<"% loads is tripped.";
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    flag_additional_stage_is_tripped = true;
-    additional_stage_timer.reset();
+        ostringstream osstream;
+        osstream<<"PUFLS additional stage of "<<get_device_name()<<" is timed out at time "
+          <<setprecision(3)<<fixed<<current_time<<" s. "<<endl
+          <<setprecision(4)<<fixed<<get_additional_stage_shed_scale_in_pu()*100.0<<"% loads is tripped.";
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        flag_additional_stage_is_tripped = true;
+        additional_stage_timer.reset();
+    }
 }
 
 void PUFLS::try_to_start_additional_stage_timer()
 {
-    if(is_additional_stage_timer_started())
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    double current_time = toolkit.get_dynamic_simulation_time_in_s();
-
-    ostringstream osstream;
-    double current_freq = frequency_sensor.get_output();
-    double f_th = get_additional_stage_frequency_threshold_in_Hz();
-    switch(get_additional_stage_trigger_signal())
+    if(not is_additional_stage_timer_started())
     {
-        case REALTIME_FREQUENCY:
-        {
-            if(current_freq<f_th)
-            {
-                osstream<<"PUFLS additional stage timer of "<<get_device_name()<<" is started at time "<<current_time
-                  <<" s due to drop of frequency."<<endl
-                  <<"Current frequency is "<<current_freq<<" Hz, and stage frequency threshold is "<<f_th<<" Hz.",
-                toolkit.show_information_with_leading_time_stamp(osstream);
-                start_additional_stage_timer();
-            }
-            break;
-        }
-        default: // MINIMUM_FREQUENCY
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        double current_time = toolkit.get_dynamic_simulation_time_in_s();
+
+        ostringstream osstream;
+        double current_freq = frequency_sensor.get_output();
+        double f_th = get_additional_stage_frequency_threshold_in_Hz();
+        switch(get_additional_stage_trigger_signal())
         {
-            if(current_freq<f_th)
+            case REALTIME_FREQUENCY:
             {
-                if(is_frequency_recovering_beyond_current_minimum_frequency()) // frequency is recovering
+                if(current_freq<f_th)
                 {
-                    osstream<<"PUFLS additional stage timer of "<<get_device_name()<<" is started at time "
-                      <<current_time<<" s due to recovery of frequency."<<endl
-                      <<"Current frequency is "<<current_freq<<" Hz.";
+                    osstream<<"PUFLS additional stage timer of "<<get_device_name()<<" is started at time "<<current_time
+                      <<" s due to drop of frequency."<<endl
+                      <<"Current frequency is "<<current_freq<<" Hz, and stage frequency threshold is "<<f_th<<" Hz.",
                     toolkit.show_information_with_leading_time_stamp(osstream);
                     start_additional_stage_timer();
                 }
-                else
+                break;
+            }
+            default: // MINIMUM_FREQUENCY
+            {
+                if(current_freq<f_th)
                 {
-                    if(is_minimum_frequency_not_changing())
+                    if(is_frequency_recovering_beyond_current_minimum_frequency()) // frequency is recovering
                     {
                         osstream<<"PUFLS additional stage timer of "<<get_device_name()<<" is started at time "
-                          <<current_time<<" s since minimum frequency is not changing."<<endl
+                          <<current_time<<" s due to recovery of frequency."<<endl
                           <<"Current frequency is "<<current_freq<<" Hz.";
                         toolkit.show_information_with_leading_time_stamp(osstream);
                         start_additional_stage_timer();
                     }
+                    else
+                    {
+                        if(is_minimum_frequency_not_changing())
+                        {
+                            osstream<<"PUFLS additional stage timer of "<<get_device_name()<<" is started at time "
+                              <<current_time<<" s since minimum frequency is not changing."<<endl
+                              <<"Current frequency is "<<current_freq<<" Hz.";
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                            start_additional_stage_timer();
+                        }
+                    }
                 }
+                break;
             }
-            break;
         }
     }
 }
 void PUFLS::start_additional_stage_timer()
 {
-    if(is_additional_stage_timer_started())
-        return;
-
-    additional_stage_timer.start();
+    if(not is_additional_stage_timer_started())
+        additional_stage_timer.start();
 }
 
 void PUFLS::try_to_reset_additional_stage_timer()
 {
-    if(not is_additional_stage_timer_started())
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    double current_time = toolkit.get_dynamic_simulation_time_in_s();
-
-    ostringstream osstream;
-    double current_freq = frequency_sensor.get_output();
-    double f_th = get_additional_stage_frequency_threshold_in_Hz();
-    switch(get_additional_stage_trigger_signal())
+    if(is_additional_stage_timer_started())
     {
-        case REALTIME_FREQUENCY:
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        double current_time = toolkit.get_dynamic_simulation_time_in_s();
+
+        ostringstream osstream;
+        double current_freq = frequency_sensor.get_output();
+        double f_th = get_additional_stage_frequency_threshold_in_Hz();
+        switch(get_additional_stage_trigger_signal())
         {
-            if(current_freq>f_th)
+            case REALTIME_FREQUENCY:
             {
-                char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
-                snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "PUFLS additional stage timer of %s is reset at time %.3fs due to recovery of frequency.\n"
-                        "Current frequency is %.4fHz, and stage frequency threshold is %.4fHz.",get_device_name().c_str(),current_time,
-                        current_freq,f_th);
-                toolkit.show_information_with_leading_time_stamp(buffer);
-                reset_additional_stage_timer();
+                if(current_freq>f_th)
+                {
+                    char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
+                    snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "PUFLS additional stage timer of %s is reset at time %.3fs due to recovery of frequency.\n"
+                            "Current frequency is %.4fHz, and stage frequency threshold is %.4fHz.",get_device_name().c_str(),current_time,
+                            current_freq,f_th);
+                    toolkit.show_information_with_leading_time_stamp(buffer);
+                    reset_additional_stage_timer();
+                }
+                break;
             }
-            break;
-        }
-        default: // MINIMUM_FREQUENCY
-        {
-            if(is_minimum_frequency_declining())
+            default: // MINIMUM_FREQUENCY
             {
-                osstream<<"PUFLS additional stage timer of "<<get_device_name()<<" is reset at time "<<current_time
-                  <<" s due to declining of minimum frequency."<<endl
-                  <<"Current frequency is "<<current_freq<<" Hz.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-                reset_additional_stage_timer();
+                if(is_minimum_frequency_declining())
+                {
+                    osstream<<"PUFLS additional stage timer of "<<get_device_name()<<" is reset at time "<<current_time
+                      <<" s due to declining of minimum frequency."<<endl
+                      <<"Current frequency is "<<current_freq<<" Hz.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    reset_additional_stage_timer();
+                }
+                break;
             }
-            break;
         }
     }
 }
 
 void PUFLS::reset_additional_stage_timer()
 {
-    if(not is_additional_stage_timer_started())
-        return;
-    additional_stage_timer.reset();
+    if(is_additional_stage_timer_started())
+        additional_stage_timer.reset();
 }
 
 bool PUFLS::is_frequency_recovering_beyond_current_minimum_frequency() const
@@ -778,8 +776,7 @@ double PUFLS::get_total_shed_scale_factor_in_pu() const
         total_shed_scale += get_total_discrete_shed_scale_in_pu();
     }
 
-    if(flag_additional_stage_is_tripped)
-        total_shed_scale += get_additional_stage_shed_scale_in_pu();
+    total_shed_scale += (flag_additional_stage_is_tripped*get_additional_stage_shed_scale_in_pu());
     //cout<<"total shed scale = "<<total_shed_scale<<endl;
 
     return total_shed_scale;
diff --git a/code/source/model/load_relay_model/UFLS.cpp b/code/source/model/load_relay_model/UFLS.cpp
index de613d98..5a52073e 100644
--- a/code/source/model/load_relay_model/UFLS.cpp
+++ b/code/source/model/load_relay_model/UFLS.cpp
@@ -81,23 +81,20 @@ void UFLS::set_frequency_sensor_time_in_s(double t)
 
 void UFLS::set_frequency_threshold_in_Hz_of_stage(size_t i, double f)
 {
-    if(i>=MAX_LOAD_RELAY_STAGE)
-        return;
-    frequency_threshold_in_Hz[i] = f;
+    if(i<MAX_LOAD_RELAY_STAGE)
+        frequency_threshold_in_Hz[i] = f;
 }
 
 void UFLS::set_time_delay_in_s_of_stage(size_t i, double t)
 {
-    if(i>=MAX_LOAD_RELAY_STAGE)
-        return;
-    stage_timer[i].set_timer_interval_in_s(t);
+    if(i<MAX_LOAD_RELAY_STAGE)
+        stage_timer[i].set_timer_interval_in_s(t);
 }
 
 void UFLS::set_scale_in_pu_of_stage(size_t i, double s)
 {
-    if(i>=MAX_LOAD_RELAY_STAGE)
-        return;
-    scale_in_pu[i] = s;
+    if(i<MAX_LOAD_RELAY_STAGE)
+        scale_in_pu[i] = s;
 }
 
 void UFLS::set_breaker_time_in_s(double t)
@@ -143,59 +140,63 @@ double UFLS::get_breaker_time_in_s() const
 bool UFLS::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<20)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!="UFLSAL" and model_name!="UFLSAR" and model_name!="UFLSZN" and model_name!="UFLSBL")
-        return is_successful;
-
-    double t_sensor, tbreak, fth, tdelay, scale;
+    if(data.size()>=20)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name=="UFLSAL" or model_name=="UFLSBL" or model_name=="UFLSAR" or model_name=="UFLSZN")
+        {
+            double t_sensor, tbreak, fth, tdelay, scale;
 
-    size_t i=3;
+            size_t i=3;
 
-    t_sensor = get_double_data(data[i],"0.0"); ++i;
-    set_frequency_sensor_time_in_s(t_sensor);
+            t_sensor = get_double_data(data[i],"0.0"); ++i;
+            set_frequency_sensor_time_in_s(t_sensor);
 
-    tbreak = get_double_data(data[i],"0.0"); ++i;
-    set_breaker_time_in_s(tbreak);
+            tbreak = get_double_data(data[i],"0.0"); ++i;
+            set_breaker_time_in_s(tbreak);
 
-    size_t stage = 0;
+            size_t stage = 0;
 
-    size_t n = data.size()-2;
-    for(i=5; i<n; i=i+3)
-    {
-        fth = get_double_data(data[i],"0.0");
-        tdelay = get_double_data(data[i+1],"0.0");
-        scale = get_double_data(data[i+2],"0.0");
+            size_t n = data.size()-2;
+            for(i=5; i<n; i=i+3)
+            {
+                fth = get_double_data(data[i],"0.0");
+                tdelay = get_double_data(data[i+1],"0.0");
+                scale = get_double_data(data[i+2],"0.0");
 
-        set_frequency_threshold_in_Hz_of_stage(stage, fth);
-        set_time_delay_in_s_of_stage(stage, tdelay);
-        set_scale_in_pu_of_stage(stage, scale);
+                set_frequency_threshold_in_Hz_of_stage(stage, fth);
+                set_time_delay_in_s_of_stage(stage, tdelay);
+                set_scale_in_pu_of_stage(stage, scale);
 
-        ++stage;
-    }
+                ++stage;
+            }
 
-    if(model_name=="UFLSAL")
-        set_subsystem_type(ALL_SYSTEM_TYPE);
-    else
-    {
-        if(model_name=="UFLSAR")
-            set_subsystem_type(AREA_SUBSYSTEM_TYPE);
-        else
-        {
-            if(model_name=="UFLSZN")
-                set_subsystem_type(ZONE_SUBSYSTEM_TYPE);
+            if(model_name=="UFLSAL")
+                set_subsystem_type(ALL_SYSTEM_TYPE);
             else
             {
-                //UFLSBL
-                set_subsystem_type(BUS_SUBSYSTEM_TYPE);
+                if(model_name=="UFLSBL")
+                    set_subsystem_type(BUS_SUBSYSTEM_TYPE);
+                else
+                {
+                    if(model_name=="UFLSAR")
+                        set_subsystem_type(AREA_SUBSYSTEM_TYPE);
+                    else
+                    {
+                        //UFLSZN
+                        set_subsystem_type(ZONE_SUBSYSTEM_TYPE);
+                    }
+                }
             }
+            is_successful = true;
+
+            return is_successful;
         }
+        else
+            return is_successful;
     }
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool UFLS::setup_model_with_psse_string(string data)
@@ -228,27 +229,27 @@ void UFLS::set_block_toolkit()
 void UFLS::initialize()
 {
     LOAD* load = get_load_pointer();
-    if(load==NULL)
-        return;
-
-    set_block_toolkit();
+    if(load!=NULL)
+    {
+        set_block_toolkit();
 
-    double fbase = get_bus_base_frequency_in_Hz();
+        double fbase = get_bus_base_frequency_in_Hz();
 
-    for(size_t i=0; i!=MAX_LOAD_RELAY_STAGE; ++i)
-    {
-        stage_timer[i].set_attached_device(load);
-        breaker_timer[i].set_attached_device(load);
-    }
+        for(size_t i=0; i!=MAX_LOAD_RELAY_STAGE; ++i)
+        {
+            stage_timer[i].set_attached_device(load);
+            breaker_timer[i].set_attached_device(load);
+        }
 
-    frequency_sensor.set_output(fbase);
-    frequency_sensor.initialize();
+        frequency_sensor.set_output(fbase);
+        frequency_sensor.initialize();
 
-    for(size_t i=0; i!=MAX_LOAD_RELAY_STAGE; ++i)
-    {
-        stage_timer[i].reset();
-        breaker_timer[i].reset();
-        flag_stage_is_tripped[i]=false;
+        for(size_t i=0; i!=MAX_LOAD_RELAY_STAGE; ++i)
+        {
+            stage_timer[i].reset();
+            breaker_timer[i].reset();
+            flag_stage_is_tripped[i]=false;
+        }
     }
 }
 
@@ -330,11 +331,7 @@ double UFLS::get_total_shed_scale_factor_in_pu() const
 {
     double total_scale = 0.0;
     for(size_t i=0; i!=MAX_LOAD_RELAY_STAGE; ++i)
-    {
-        if(is_stage_tripped(i))
-            total_scale += get_scale_in_pu_of_stage(i);
-
-    }
+        total_scale += (is_stage_tripped(i)*get_scale_in_pu_of_stage(i));
     return total_scale;
 }
 
@@ -409,10 +406,10 @@ void UFLS::trip_stage(size_t i)
 
 bool UFLS::is_stage_tripped(size_t i) const
 {
-    if(i>=MAX_LOAD_RELAY_STAGE)
+    if(i<MAX_LOAD_RELAY_STAGE)
+        return flag_stage_is_tripped[i];
+    else
         return false;
-
-    return flag_stage_is_tripped[i];
 }
 
 void UFLS::check()
diff --git a/code/source/model/load_relay_model/UVLS.cpp b/code/source/model/load_relay_model/UVLS.cpp
index 88094c52..8431dab2 100644
--- a/code/source/model/load_relay_model/UVLS.cpp
+++ b/code/source/model/load_relay_model/UVLS.cpp
@@ -81,23 +81,20 @@ void UVLS::set_voltage_sensor_time_in_s(double t)
 
 void UVLS::set_voltage_threshold_in_pu_of_stage(size_t i, double f)
 {
-    if(i>=MAX_LOAD_RELAY_STAGE)
-        return;
-    voltage_threshold_in_pu[i] = f;
+    if(i<MAX_LOAD_RELAY_STAGE)
+        voltage_threshold_in_pu[i] = f;
 }
 
 void UVLS::set_time_delay_in_s_of_stage(size_t i, double t)
 {
-    if(i>=MAX_LOAD_RELAY_STAGE)
-        return;
-    stage_timer[i].set_timer_interval_in_s(t);
+    if(i<MAX_LOAD_RELAY_STAGE)
+        stage_timer[i].set_timer_interval_in_s(t);
 }
 
 void UVLS::set_scale_in_pu_of_stage(size_t i, double s)
 {
-    if(i>=MAX_LOAD_RELAY_STAGE)
-        return;
-    scale_in_pu[i] = s;
+    if(i<MAX_LOAD_RELAY_STAGE)
+        scale_in_pu[i] = s;
 }
 
 void UVLS::set_breaker_time_in_s(double t)
@@ -143,59 +140,63 @@ double UVLS::get_breaker_time_in_s() const
 bool UVLS::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<20)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!="UVLSAL" and model_name!="UVLSAR" and model_name!="UVLSZN" and model_name!="UVLSBL")
-        return is_successful;
-
-    double t_sensor, tbreak, vth, tdelay, scale;
+    if(data.size()>=20)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name=="UVLSAL" or model_name!="UVLSBL" or model_name!="UVLSAR" or model_name!="UVLSZN")
+        {
+            double t_sensor, tbreak, vth, tdelay, scale;
 
-    size_t i=3;
+            size_t i=3;
 
-    t_sensor = get_double_data(data[i],"0.0"); ++i;
-    set_voltage_sensor_time_in_s(t_sensor);
+            t_sensor = get_double_data(data[i],"0.0"); ++i;
+            set_voltage_sensor_time_in_s(t_sensor);
 
-    tbreak = get_double_data(data[i],"0.0"); ++i;
-    set_breaker_time_in_s(tbreak);
+            tbreak = get_double_data(data[i],"0.0"); ++i;
+            set_breaker_time_in_s(tbreak);
 
-    size_t stage = 0;
+            size_t stage = 0;
 
-    size_t n = data.size()-2;
-    for(i=5; i<n; i=i+3)
-    {
-        vth = get_double_data(data[i],"0.0");
-        tdelay = get_double_data(data[i+1],"0.0");
-        scale = get_double_data(data[i+2],"0.0");
+            size_t n = data.size()-2;
+            for(i=5; i<n; i=i+3)
+            {
+                vth = get_double_data(data[i],"0.0");
+                tdelay = get_double_data(data[i+1],"0.0");
+                scale = get_double_data(data[i+2],"0.0");
 
-        set_voltage_threshold_in_pu_of_stage(stage, vth);
-        set_time_delay_in_s_of_stage(stage, tdelay);
-        set_scale_in_pu_of_stage(stage, scale);
+                set_voltage_threshold_in_pu_of_stage(stage, vth);
+                set_time_delay_in_s_of_stage(stage, tdelay);
+                set_scale_in_pu_of_stage(stage, scale);
 
-        ++stage;
-    }
+                ++stage;
+            }
 
-    if(model_name=="UVLSAL")
-        set_subsystem_type(ALL_SYSTEM_TYPE);
-    else
-    {
-        if(model_name=="UVLSAR")
-            set_subsystem_type(AREA_SUBSYSTEM_TYPE);
-        else
-        {
-            if(model_name=="UVLSZN")
-                set_subsystem_type(ZONE_SUBSYSTEM_TYPE);
+            if(model_name=="UVLSAL")
+                set_subsystem_type(ALL_SYSTEM_TYPE);
             else
             {
-                //UVLSBL
-                set_subsystem_type(BUS_SUBSYSTEM_TYPE);
+                if(model_name=="UVLSBL")
+                    set_subsystem_type(BUS_SUBSYSTEM_TYPE);
+                else
+                {
+                    if(model_name=="UVLSAR")
+                        set_subsystem_type(AREA_SUBSYSTEM_TYPE);
+                    else
+                    {//UVLSZN
+                        set_subsystem_type(ZONE_SUBSYSTEM_TYPE);
+                    }
+                }
             }
+            is_successful = true;
+
+            return is_successful;
+
         }
+        else
+            return is_successful;
     }
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool UVLS::setup_model_with_psse_string(string data)
@@ -228,30 +229,30 @@ void UVLS::set_block_toolkit()
 void UVLS::initialize()
 {
     LOAD* load = get_load_pointer();
-    if(load==NULL)
-        return;
+    if(load!=NULL)
+    {
+        set_block_toolkit();
 
-    set_block_toolkit();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        double volt = psdb.get_bus_voltage_in_pu(load->get_load_bus());
 
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    double volt = psdb.get_bus_voltage_in_pu(load->get_load_bus());
-
-    for(size_t i=0; i!=MAX_LOAD_RELAY_STAGE; ++i)
-    {
-        stage_timer[i].set_attached_device(load);
-        breaker_timer[i].set_attached_device(load);
-    }
+        for(size_t i=0; i!=MAX_LOAD_RELAY_STAGE; ++i)
+        {
+            stage_timer[i].set_attached_device(load);
+            breaker_timer[i].set_attached_device(load);
+        }
 
-    voltage_sensor.set_output(volt);
-    voltage_sensor.initialize();
+        voltage_sensor.set_output(volt);
+        voltage_sensor.initialize();
 
-    for(size_t i=0; i!=MAX_LOAD_RELAY_STAGE; ++i)
-    {
-        stage_timer[i].reset();
-        breaker_timer[i].reset();
-        flag_stage_is_tripped[i]=false;
+        for(size_t i=0; i!=MAX_LOAD_RELAY_STAGE; ++i)
+        {
+            stage_timer[i].reset();
+            breaker_timer[i].reset();
+            flag_stage_is_tripped[i]=false;
+        }
     }
 }
 
@@ -333,11 +334,7 @@ double UVLS::get_total_shed_scale_factor_in_pu() const
 {
     double total_scale = 0.0;
     for(size_t i=0; i!=MAX_LOAD_RELAY_STAGE; ++i)
-    {
-        if(is_stage_tripped(i))
-            total_scale += get_scale_in_pu_of_stage(i);
-
-    }
+        total_scale += (is_stage_tripped(i)*get_scale_in_pu_of_stage(i));
     return total_scale;
 }
 
@@ -412,10 +409,11 @@ void UVLS::trip_stage(size_t i)
 
 bool UVLS::is_stage_tripped(size_t i) const
 {
-    if(i>=MAX_LOAD_RELAY_STAGE)
+    if(i<MAX_LOAD_RELAY_STAGE)
+        return flag_stage_is_tripped[i];
+    else
         return false;
 
-    return flag_stage_is_tripped[i];
 }
 
 void UVLS::check()
diff --git a/code/source/model/load_relay_model/load_frequency_relay_model.cpp b/code/source/model/load_relay_model/load_frequency_relay_model.cpp
index 65e9c73d..5a9afe43 100644
--- a/code/source/model/load_relay_model/load_frequency_relay_model.cpp
+++ b/code/source/model/load_relay_model/load_frequency_relay_model.cpp
@@ -22,27 +22,31 @@ string LOAD_FREQUENCY_RELAY_MODEL::get_model_type() const
 double LOAD_FREQUENCY_RELAY_MODEL::get_bus_frequency_in_Hz() const
 {
     LOAD* load = get_load_pointer();
-    if(load==NULL)
-        return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(load!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    size_t bus = load->get_load_bus();
+        size_t bus = load->get_load_bus();
 
-    return psdb.get_bus_frequency_in_Hz(bus);
+        return psdb.get_bus_frequency_in_Hz(bus);
+    }
+    else
+        return 0.0;
 }
 
 double LOAD_FREQUENCY_RELAY_MODEL::get_bus_base_frequency_in_Hz() const
 {
     LOAD* load = get_load_pointer();
-    if(load==NULL)
-        return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(load!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    size_t bus = load->get_load_bus();
+        size_t bus = load->get_load_bus();
 
-    return psdb.get_bus_base_frequency_in_Hz(bus);
+        return psdb.get_bus_base_frequency_in_Hz(bus);
+    }
+    else
+        return 0.0;
 }
diff --git a/code/source/model/load_relay_model/load_voltage_relay_model.cpp b/code/source/model/load_relay_model/load_voltage_relay_model.cpp
index faed35ff..b5cbfed1 100644
--- a/code/source/model/load_relay_model/load_voltage_relay_model.cpp
+++ b/code/source/model/load_relay_model/load_voltage_relay_model.cpp
@@ -22,12 +22,15 @@ string LOAD_VOLTAGE_RELAY_MODEL::get_model_type() const
 double LOAD_VOLTAGE_RELAY_MODEL::get_bus_voltage_in_pu() const
 {
     LOAD* load = get_load_pointer();
-    if(load==NULL)
-        return 0.0;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(load!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    size_t bus = load->get_load_bus();
+        size_t bus = load->get_load_bus();
 
-    return psdb.get_bus_voltage_in_pu(bus);
+        return psdb.get_bus_voltage_in_pu(bus);
+    }
+    else
+        return 0.0;
 }
diff --git a/code/source/model/model_var_table.cpp b/code/source/model/model_var_table.cpp
index 144d5fb7..31f557bd 100644
--- a/code/source/model/model_var_table.cpp
+++ b/code/source/model/model_var_table.cpp
@@ -19,20 +19,22 @@ void MODEL_VAR_TABLE::clear()
 
 void MODEL_VAR_TABLE::add_variable_name_index_pair(string var_name, size_t var_index)
 {
-    if(var_name=="")  return;
-    var_name = string2upper(var_name);
-    map<string, size_t>::const_iterator iter_name = var_name2index_map.begin();
-    map<size_t, string>::const_iterator iter_index = var_index2name_map.begin();
-    iter_name = var_name2index_map.find(var_name);
-    iter_index = var_index2name_map.find(var_index);
-    if(iter_name!=var_name2index_map.end() or iter_index!=var_index2name_map.end())
-    {// var_name or var_index already exists
-        return;
-    }
-    else
-    {
-        var_name2index_map.insert(pair<string, size_t>(var_name, var_index));
-        var_index2name_map.insert(pair<size_t, string>(var_index, var_name));
+    if(var_name!="")
+    {
+        var_name = string2upper(var_name);
+        map<string, size_t>::const_iterator iter_name = var_name2index_map.begin();
+        map<size_t, string>::const_iterator iter_index = var_index2name_map.begin();
+        iter_name = var_name2index_map.find(var_name);
+        iter_index = var_index2name_map.find(var_index);
+        if(iter_name==var_name2index_map.end() and iter_index==var_index2name_map.end())
+        {// var_name and var_index not exist
+            var_name2index_map.insert(pair<string, size_t>(var_name, var_index));
+            var_index2name_map.insert(pair<size_t, string>(var_index, var_name));
+        }
+        else
+        {// var_name or var_index already exists
+            return;
+        }
     }
 }
 
diff --git a/code/source/model/pvu_models/pv_converter_model/pv_converter_model.cpp b/code/source/model/pvu_models/pv_converter_model/pv_converter_model.cpp
index 54822f60..cf59aed6 100644
--- a/code/source/model/pvu_models/pv_converter_model/pv_converter_model.cpp
+++ b/code/source/model/pvu_models/pv_converter_model/pv_converter_model.cpp
@@ -61,25 +61,29 @@ double PV_CONVERTER_MODEL::get_initial_reactive_current_command_in_pu_based_on_m
 double PV_CONVERTER_MODEL::get_active_current_command_in_pu_based_on_mbase() const
 {
     PV_UNIT* pv_unit = get_pv_unit_pointer();
-    if(pv_unit==NULL)
-        return 0.0;
-
-    PV_ELECTRICAL_MODEL* model = pv_unit->get_pv_electrical_model();
-    if(model!=NULL and model->is_model_initialized())
-        return model->get_active_current_command_in_pu_based_on_mbase();
+    if(pv_unit!=NULL)
+    {
+        PV_ELECTRICAL_MODEL* model = pv_unit->get_pv_electrical_model();
+        if(model!=NULL and model->is_model_initialized())
+            return model->get_active_current_command_in_pu_based_on_mbase();
+        else
+            return get_initial_active_current_command_in_pu_based_on_mbase();
+    }
     else
-        return get_initial_active_current_command_in_pu_based_on_mbase();
+        return 0.0;
 }
 
 double PV_CONVERTER_MODEL::get_reactive_current_command_in_pu_based_on_mbase() const
 {
     PV_UNIT* pv_unit = get_pv_unit_pointer();
-    if(pv_unit==NULL)
-        return 0.0;
-
-    PV_ELECTRICAL_MODEL* model = pv_unit->get_pv_electrical_model();
-    if(model!=NULL and model->is_model_initialized())
-        return model->get_reactive_current_command_in_pu_based_on_mbase();
+    if(pv_unit!=NULL)
+    {
+        PV_ELECTRICAL_MODEL* model = pv_unit->get_pv_electrical_model();
+        if(model!=NULL and model->is_model_initialized())
+            return model->get_reactive_current_command_in_pu_based_on_mbase();
+        else
+            return get_initial_reactive_current_command_in_pu_based_on_mbase();
+    }
     else
-        return get_initial_reactive_current_command_in_pu_based_on_mbase();
+        return 0.0;
 }
diff --git a/code/source/model/pvu_models/pv_converter_model/pvcv0.cpp b/code/source/model/pvu_models/pv_converter_model/pvcv0.cpp
index 9125efb2..935a2e49 100644
--- a/code/source/model/pvu_models/pv_converter_model/pvcv0.cpp
+++ b/code/source/model/pvu_models/pv_converter_model/pvcv0.cpp
@@ -190,73 +190,77 @@ bool PVCV0::setup_model_with_steps_string_vector(vector<string>& data)
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     ostringstream osstream;
     bool is_successful = false;
-    if(data.size()<18)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    size_t ibus;
-    string id;
-    size_t n_lumped_turbine;
-    double t_EQcmd, t_IPcmd, kpll, kipll, pllmax, pllmin, prate, lvpl_v1, lvpl_v2, lvpl_g,
-           hvrc_v, hvrc_i, lvpl_rate, t_lvpl;
-
-    ibus = size_t(get_integer_data(data[1],"0"));
-    id = get_string_data(data[2],"");
-
-    size_t i=3;
-    n_lumped_turbine = size_t(get_integer_data(data[i],"1")); i++;
-    prate = get_double_data(data[i],"0.0"); i++;
-    t_IPcmd = get_double_data(data[i],"0.0"); i++;
-    lvpl_rate = get_double_data(data[i],"0.0"); i++;
-    t_lvpl = get_double_data(data[i],"0.0"); i++;
-    lvpl_v1 = get_double_data(data[i],"0.0"); i++;
-    lvpl_v2 = get_double_data(data[i],"0.0"); i++;
-    lvpl_g = get_double_data(data[i],"0.0"); i++;
-    t_EQcmd = get_double_data(data[i],"0.0"); i++;
-    hvrc_v = get_double_data(data[i],"0.0"); i++;
-    hvrc_i = get_double_data(data[i],"0.0"); i++;
-    kpll = get_double_data(data[i],"0.0"); i++;
-    kipll = get_double_data(data[i],"0.0"); i++;
-    pllmax = get_double_data(data[i],"0.0"); i++;
-    pllmin = get_double_data(data[i],"0.0");
-
-    DEVICE_ID did = get_pv_unit_device_id(ibus, id);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    PV_UNIT* gen = psdb.get_pv_unit(did);
-    if(gen==NULL)
+    if(data.size()>=18)
     {
-        osstream<<"Error when loading data to build "<<get_model_name()<<" model for "<<did.get_device_name()<<endl
-               <<"No such wt pv_unit exists in the power system database.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return is_successful;
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t ibus;
+            string id;
+            size_t n_lumped_turbine;
+            double t_EQcmd, t_IPcmd, kpll, kipll, pllmax, pllmin, prate, lvpl_v1, lvpl_v2, lvpl_g,
+                   hvrc_v, hvrc_i, lvpl_rate, t_lvpl;
+
+            ibus = size_t(get_integer_data(data[1],"0"));
+            id = get_string_data(data[2],"");
+
+            size_t i=3;
+            n_lumped_turbine = size_t(get_integer_data(data[i],"1")); i++;
+            prate = get_double_data(data[i],"0.0"); i++;
+            t_IPcmd = get_double_data(data[i],"0.0"); i++;
+            lvpl_rate = get_double_data(data[i],"0.0"); i++;
+            t_lvpl = get_double_data(data[i],"0.0"); i++;
+            lvpl_v1 = get_double_data(data[i],"0.0"); i++;
+            lvpl_v2 = get_double_data(data[i],"0.0"); i++;
+            lvpl_g = get_double_data(data[i],"0.0"); i++;
+            t_EQcmd = get_double_data(data[i],"0.0"); i++;
+            hvrc_v = get_double_data(data[i],"0.0"); i++;
+            hvrc_i = get_double_data(data[i],"0.0"); i++;
+            kpll = get_double_data(data[i],"0.0"); i++;
+            kipll = get_double_data(data[i],"0.0"); i++;
+            pllmax = get_double_data(data[i],"0.0"); i++;
+            pllmin = get_double_data(data[i],"0.0");
+
+            DEVICE_ID did = get_pv_unit_device_id(ibus, id);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            PV_UNIT* gen = psdb.get_pv_unit(did);
+            if(gen==NULL)
+            {
+                osstream<<"Error when loading data to build "<<get_model_name()<<" model for "<<did.get_device_name()<<endl
+                       <<"No such wt pv_unit exists in the power system database.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                return is_successful;
+            }
+
+            gen->set_number_of_lumped_pv_units(n_lumped_turbine);
+            gen->set_rated_power_per_pv_unit_in_MW(prate);
+
+            set_converter_activer_current_command_T_in_s(t_IPcmd);
+            set_LVPL_max_rate_of_active_current_change(lvpl_rate);
+            set_LVPL_voltage_sensor_T_in_s(t_lvpl);
+            LVPL lvpl;
+            lvpl.set_low_voltage_in_pu(lvpl_v1);
+            lvpl.set_high_voltage_in_pu(lvpl_v2);
+            lvpl.set_gain_at_high_voltage(lvpl_g);
+            set_LVPL(lvpl);
+
+            set_converter_reactiver_voltage_command_T_in_s(t_EQcmd);
+            set_HVRC_voltage_in_pu(hvrc_v);
+            set_HVRC_current_in_pu(hvrc_i);
+            set_KPLL(kpll);
+            set_KIPLL(kipll);
+            set_PLLmax(pllmax);
+            set_PLLmin(pllmin);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
     }
-
-    gen->set_number_of_lumped_pv_units(n_lumped_turbine);
-    gen->set_rated_power_per_pv_unit_in_MW(prate);
-
-    set_converter_activer_current_command_T_in_s(t_IPcmd);
-    set_LVPL_max_rate_of_active_current_change(lvpl_rate);
-    set_LVPL_voltage_sensor_T_in_s(t_lvpl);
-    LVPL lvpl;
-    lvpl.set_low_voltage_in_pu(lvpl_v1);
-    lvpl.set_high_voltage_in_pu(lvpl_v2);
-    lvpl.set_gain_at_high_voltage(lvpl_g);
-    set_LVPL(lvpl);
-
-    set_converter_reactiver_voltage_command_T_in_s(t_EQcmd);
-    set_HVRC_voltage_in_pu(hvrc_v);
-    set_HVRC_current_in_pu(hvrc_i);
-    set_KPLL(kpll);
-    set_KIPLL(kipll);
-    set_PLLmax(pllmax);
-    set_PLLmin(pllmin);
-
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool PVCV0::setup_model_with_psse_string(string data)
@@ -283,174 +287,174 @@ void PVCV0::set_block_toolkit()
 void PVCV0::initialize()
 {
     ostringstream oosstream;
-    if(is_model_initialized())
-        return;
-
-    PV_UNIT* pv_unit = get_pv_unit_pointer();
-    if(pv_unit==NULL)
-        return;
-
-    set_block_toolkit();
-
-    size_t n_lumped = get_number_of_lumped_pv_units();
-    double fbase = get_bus_base_frequency_in_Hz();
-    double wbase = 2.0*PI*fbase;
-
-    double kipll = get_KIPLL();
-    if(kipll!=0.0)
-    {
-        PLL_frequency_integrator.set_T_in_s(1.0/kipll);
-        double pllmax = get_PLLmax();
-        PLL_frequency_integrator.set_upper_limit(pllmax);
-        PLL_frequency_integrator.set_lower_limit(-pllmax);
-    }
-
-    PLL_angle_integrator.set_T_in_s(1.0/wbase);
-
-    double mbase = get_mbase_in_MVA();
-    mbase /= n_lumped;
-
-    complex<double> Zsource = get_source_impedance_in_pu_based_on_mbase();
-    double xeq = Zsource.imag();
-
-    double P = pv_unit->get_p_generation_in_MW()/n_lumped;
-    double Q = pv_unit->get_q_generation_in_MVar()/n_lumped;
-    complex<double> S(P/mbase,Q/mbase);
-
-
-    complex<double> Vxy = get_terminal_complex_voltage_in_pu();
-    double V = steps_fast_complex_abs(Vxy);
-    double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
-    // ignore voltage angle
-    complex<double> Ixy = conj(S/Vxy);
-    complex<double> Isource = Ixy + Vxy/Zsource;
-
-    double Ix = Isource.real();
-    double Iy = Isource.imag();
-
-    double IP = Ix*cos(angle_in_rad) + Iy*sin(angle_in_rad);
-    double IQ =-Ix*sin(angle_in_rad) + Iy*cos(angle_in_rad);
-    //complex<double> IPQ = xy2dq_with_angle_in_rad(Isource, angle_in_rad);
-    //double IP = IPQ.real();
-    //double IQ = IPQ.imag();
-
-    double EQ = IQ*(-xeq);
-
-    active_current_commander.set_output(IP);
-    active_current_commander.initialize();
-
-    reactive_voltage_commander.set_output(EQ);
-    reactive_voltage_commander.initialize();
-
-    if(kipll!=0.0)
+    if(not is_model_initialized())
     {
-        PLL_frequency_integrator.set_output(0.0);
-        PLL_frequency_integrator.initialize();
+        PV_UNIT* pv_unit = get_pv_unit_pointer();
+        if(pv_unit!=NULL)
+        {
+            set_block_toolkit();
+
+            size_t n_lumped = get_number_of_lumped_pv_units();
+            double fbase = get_bus_base_frequency_in_Hz();
+            double wbase = 2.0*PI*fbase;
+
+            double kipll = get_KIPLL();
+            if(kipll!=0.0)
+            {
+                PLL_frequency_integrator.set_T_in_s(1.0/kipll);
+                double pllmax = get_PLLmax();
+                PLL_frequency_integrator.set_upper_limit(pllmax);
+                PLL_frequency_integrator.set_lower_limit(-pllmax);
+            }
+
+            PLL_angle_integrator.set_T_in_s(1.0/wbase);
+
+            double mbase = get_mbase_in_MVA();
+            mbase /= n_lumped;
+
+            complex<double> Zsource = get_source_impedance_in_pu_based_on_mbase();
+            double xeq = Zsource.imag();
+
+            double P = pv_unit->get_p_generation_in_MW()/n_lumped;
+            double Q = pv_unit->get_q_generation_in_MVar()/n_lumped;
+            complex<double> S(P/mbase,Q/mbase);
+
+
+            complex<double> Vxy = get_terminal_complex_voltage_in_pu();
+            double V = steps_fast_complex_abs(Vxy);
+            double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
+            // ignore voltage angle
+            complex<double> Ixy = conj(S/Vxy);
+            complex<double> Isource = Ixy + Vxy/Zsource;
+
+            double Ix = Isource.real();
+            double Iy = Isource.imag();
+
+            double IP = Ix*cos(angle_in_rad) + Iy*sin(angle_in_rad);
+            double IQ =-Ix*sin(angle_in_rad) + Iy*cos(angle_in_rad);
+            //complex<double> IPQ = xy2dq_with_angle_in_rad(Isource, angle_in_rad);
+            //double IP = IPQ.real();
+            //double IQ = IPQ.imag();
+
+            double EQ = IQ*(-xeq);
+
+            active_current_commander.set_output(IP);
+            active_current_commander.initialize();
+
+            reactive_voltage_commander.set_output(EQ);
+            reactive_voltage_commander.initialize();
+
+            if(kipll!=0.0)
+            {
+                PLL_frequency_integrator.set_output(0.0);
+                PLL_frequency_integrator.initialize();
+            }
+
+            PLL_angle_integrator.set_output(angle_in_rad);
+            PLL_angle_integrator.initialize();
+
+            LVPL_voltage_sensor.set_output(V);
+            LVPL_voltage_sensor.initialize();
+
+            set_initial_active_current_command_in_pu_based_on_mbase(IP);
+            set_initial_reactive_current_command_in_pu_based_on_mbase(IQ);
+
+            set_flag_model_initialized_as_true();
+
+            oosstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
+                    <<"(1) Initial active current command = "<<get_initial_active_current_command_in_pu_based_on_mbase()<<endl
+                    <<"(2) Initial reactive current command = "<<get_initial_reactive_current_command_in_pu_based_on_mbase()<<endl
+                    <<"(3) States of blocks"<<endl
+                    <<"    active_current_commander block state: "<<active_current_commander.get_state()<<endl
+                    <<"    reactive_voltage_commander block state: "<<reactive_voltage_commander.get_state()<<endl
+                    <<"    PLL_frequency_integrator block state: "<<PLL_frequency_integrator.get_state()<<endl
+                    <<"    PLL_angle_integrator block state: "<<PLL_angle_integrator.get_state()<<endl
+                    <<"    LVPL_voltage_sensor block state: "<<LVPL_voltage_sensor.get_state()<<endl
+                    <<"(4) active power generation :"<<get_terminal_active_power_in_MW()<<"MW"<<endl
+                    <<"(5) reactive power generation :"<<get_terminal_reactive_power_in_MVar()<<"MVar"<<endl
+                    <<"(6) terminal current :"<<get_terminal_current_in_pu_based_on_mbase()<<"pu";
+            //show_information_with_leading_time_stamp(oosstream);
+        }
     }
-
-    PLL_angle_integrator.set_output(angle_in_rad);
-    PLL_angle_integrator.initialize();
-
-    LVPL_voltage_sensor.set_output(V);
-    LVPL_voltage_sensor.initialize();
-
-    set_initial_active_current_command_in_pu_based_on_mbase(IP);
-    set_initial_reactive_current_command_in_pu_based_on_mbase(IQ);
-
-    set_flag_model_initialized_as_true();
-
-    oosstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
-            <<"(1) Initial active current command = "<<get_initial_active_current_command_in_pu_based_on_mbase()<<endl
-            <<"(2) Initial reactive current command = "<<get_initial_reactive_current_command_in_pu_based_on_mbase()<<endl
-            <<"(3) States of blocks"<<endl
-            <<"    active_current_commander block state: "<<active_current_commander.get_state()<<endl
-            <<"    reactive_voltage_commander block state: "<<reactive_voltage_commander.get_state()<<endl
-            <<"    PLL_frequency_integrator block state: "<<PLL_frequency_integrator.get_state()<<endl
-            <<"    PLL_angle_integrator block state: "<<PLL_angle_integrator.get_state()<<endl
-            <<"    LVPL_voltage_sensor block state: "<<LVPL_voltage_sensor.get_state()<<endl
-            <<"(4) active power generation :"<<get_terminal_active_power_in_MW()<<"MW"<<endl
-            <<"(5) reactive power generation :"<<get_terminal_reactive_power_in_MVar()<<"MVar"<<endl
-            <<"(6) terminal current :"<<get_terminal_current_in_pu_based_on_mbase()<<"pu";
-    //show_information_with_leading_time_stamp(oosstream);
 }
 
 void PVCV0::run(DYNAMIC_MODE mode)
 {
     PV_UNIT* pv_unit = get_pv_unit_pointer();
-    if(pv_unit==NULL)
-        return;
+    if(pv_unit!=NULL)
+    {
+        double fbase = get_bus_base_frequency_in_Hz();
+        double wbase = 2.0*PI*fbase;
+        complex<double> Zsource = get_source_impedance_in_pu_based_on_mbase();
+        double Xeq = Zsource.imag();
 
-    double fbase = get_bus_base_frequency_in_Hz();
-    double wbase = 2.0*PI*fbase;
-    complex<double> Zsource = get_source_impedance_in_pu_based_on_mbase();
-    double Xeq = Zsource.imag();
+        //complex<double> Zsource = get_source_impedance_in_pu_based_on_mbase();
 
-    //complex<double> Zsource = get_source_impedance_in_pu_based_on_mbase();
+        complex<double> Vxy = get_terminal_complex_voltage_in_pu();
+        double V = steps_fast_complex_abs(Vxy);
+        double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
+        double angle_in_deg = rad2deg(angle_in_rad);
 
-    complex<double> Vxy = get_terminal_complex_voltage_in_pu();
-    double V = steps_fast_complex_abs(Vxy);
-    double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
-    double angle_in_deg = rad2deg(angle_in_rad);
+        LVPL_voltage_sensor.set_input(V);
+        LVPL_voltage_sensor.run(mode);
 
-    LVPL_voltage_sensor.set_input(V);
-    LVPL_voltage_sensor.run(mode);
+        double lvpl_order = lvpl.get_LVPL_order(LVPL_voltage_sensor.get_output());
 
-    double lvpl_order = lvpl.get_LVPL_order(LVPL_voltage_sensor.get_output());
+        double IP = get_active_current_command_in_pu_based_on_mbase();
 
-    double IP = get_active_current_command_in_pu_based_on_mbase();
+        double input = active_current_commander.get_output();
+        if(input>lvpl_order)
+            input = lvpl_order;
 
-    double input = active_current_commander.get_output();
-    if(input>lvpl_order)
-        input = lvpl_order;
+        input = IP - input;
+        double lvpl_rate_max = get_LVPL_max_rate_of_active_current_change();
+        if(input>lvpl_rate_max)
+            input = lvpl_rate_max;
 
-    input = IP - input;
-    double lvpl_rate_max = get_LVPL_max_rate_of_active_current_change();
-    if(input>lvpl_rate_max)
-        input = lvpl_rate_max;
+        active_current_commander.set_input(input);
+        active_current_commander.run(mode);
 
-    active_current_commander.set_input(input);
-    active_current_commander.run(mode);
+        double IQ = get_reactive_current_command_in_pu_based_on_mbase();
 
-    double IQ = get_reactive_current_command_in_pu_based_on_mbase();
+        double EQ = IQ*(-Xeq);
+        reactive_voltage_commander.set_input(EQ);
+        reactive_voltage_commander.run(mode);
 
-    double EQ = IQ*(-Xeq);
-    reactive_voltage_commander.set_input(EQ);
-    reactive_voltage_commander.run(mode);
+        double kpll = get_KPLL();
+        double kipll = get_KIPLL();
+        if(kpll!=0.0 or kipll!=0.0)
+        {
+            double Vr = Vxy.real();
+            double Vi = Vxy.imag();
 
-    double kpll = get_KPLL();
-    double kipll = get_KIPLL();
-    if(kpll==0.0 and kipll==0.0)
-    {
-        set_pll_angle_in_deg(angle_in_deg);
-    }
-    else
-    {
-        double Vr = Vxy.real();
-        double Vi = Vxy.imag();
+            double angle = get_pll_angle_in_rad();
+            double Vy = -Vr*sin(angle)+Vi*cos(angle);
 
-        double angle = get_pll_angle_in_rad();
-        double Vy = -Vr*sin(angle)+Vi*cos(angle);
+            input = Vy*kpll/wbase;
+            PLL_frequency_integrator.set_input(input);
+            PLL_frequency_integrator.run(mode);
 
-        input = Vy*kpll/wbase;
-        PLL_frequency_integrator.set_input(input);
-        PLL_frequency_integrator.run(mode);
+            double output = PLL_frequency_integrator.get_output();
+            input += output;
 
-        double output = PLL_frequency_integrator.get_output();
-        input += output;
+            double pllmax = get_PLLmax();
+            if(input>pllmax)
+                input = pllmax;
+            if(input<-pllmax)
+                input = -pllmax;
 
-        double pllmax = get_PLLmax();
-        if(input>pllmax)
-            input = pllmax;
-        if(input<-pllmax)
-            input = -pllmax;
+            PLL_angle_integrator.set_input(input);
+            PLL_angle_integrator.run(mode);
+        }
+        else
+        {
+            set_pll_angle_in_deg(angle_in_deg);
+        }
+        IP = get_active_current_command_in_pu_based_on_mbase();
 
-        PLL_angle_integrator.set_input(input);
-        PLL_angle_integrator.run(mode);
+        if(mode==UPDATE_MODE)
+            set_flag_model_updated_as_true();
     }
-    IP = get_active_current_command_in_pu_based_on_mbase();
-
-    if(mode==UPDATE_MODE)
-        set_flag_model_updated_as_true();
 }
 
 complex<double> PVCV0::get_source_Norton_equivalent_complex_current_in_pu_in_xy_axis_based_on_sbase()
@@ -709,14 +713,14 @@ double PVCV0::get_pll_angle_in_rad()
 {
     double kpll = get_KPLL();
     double kipll = get_KIPLL();
-    if(kpll==0.0 and kipll==0.0)
+    if(kpll!=0.0 or kipll!=0.0)
+        return PLL_angle_integrator.get_output();
+    else
     {
         complex<double> Vxy = get_terminal_complex_voltage_in_pu();
         double angle = atan2(Vxy.imag(), Vxy.real());
         return angle;
     }
-    else
-        return PLL_angle_integrator.get_output();
 }
 
 double PVCV0::get_pll_angle_in_deg()
@@ -733,9 +737,7 @@ double PVCV0::get_pll_frequency_deviation_in_pu()
 
     double kpll = get_KPLL();
     double kipll = get_KIPLL();
-    if(kpll==0.0 and kipll==0.0)
-        return 0.0;
-    else
+    if(kpll!=0.0 or kipll!=0.0)
     {
         double Vr = Vxy.real();
         double Vi = Vxy.imag();
@@ -749,6 +751,8 @@ double PVCV0::get_pll_frequency_deviation_in_pu()
 
         return input+output;
     }
+    else
+        return 0.0;
 }
 
 double PVCV0::get_pll_frequency_deviation_in_Hz()
diff --git a/code/source/model/pvu_models/pv_electrical_model/pv_electrical_model.cpp b/code/source/model/pvu_models/pv_electrical_model/pv_electrical_model.cpp
index 3f1b66aa..edf7b56f 100644
--- a/code/source/model/pvu_models/pv_electrical_model/pv_electrical_model.cpp
+++ b/code/source/model/pvu_models/pv_electrical_model/pv_electrical_model.cpp
@@ -21,15 +21,21 @@ string PV_ELECTRICAL_MODEL::get_model_type() const
 complex<double> PV_ELECTRICAL_MODEL::get_pv_unit_terminal_generation_in_MVA() const
 {
     PV_UNIT* pv_unit = get_pv_unit_pointer();
-    if(pv_unit==NULL)
-        return 0.0;
-    PV_CONVERTER_MODEL* pv_unitmodel = pv_unit->get_pv_converter_model();
-    if(pv_unitmodel==NULL)
-        return 0.0;
-    if(not pv_unitmodel->is_model_initialized())
-        pv_unitmodel->initialize();
-
-    return pv_unitmodel->get_terminal_complex_power_in_MVA();
+    if(pv_unit!=NULL)
+    {
+        PV_CONVERTER_MODEL* pv_unitmodel = pv_unit->get_pv_converter_model();
+        if(pv_unitmodel!=NULL)
+        {
+            if(not pv_unitmodel->is_model_initialized())
+                pv_unitmodel->initialize();
+
+            return pv_unitmodel->get_terminal_complex_power_in_MVA();
+        }
+        else
+            return 0.0;
+    }
+    else
+        return 0.0;
 }
 
 complex<double> PV_ELECTRICAL_MODEL::get_pv_unit_terminal_generation_in_pu_based_on_mbase() const
@@ -40,14 +46,16 @@ complex<double> PV_ELECTRICAL_MODEL::get_pv_unit_terminal_generation_in_pu_based
 complex<double> PV_ELECTRICAL_MODEL::get_terminal_bus_complex_voltage_in_pu() const
 {
     PV_UNIT* pv_unit = get_pv_unit_pointer();
-    if(pv_unit==NULL)
+    if(pv_unit!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+
+        size_t bus = pv_unit->get_unit_bus();
+        return psdb.get_bus_complex_voltage_in_pu(bus);
+    }
+    else
         return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    size_t bus = pv_unit->get_unit_bus();
-    return psdb.get_bus_complex_voltage_in_pu(bus);
 }
 
 double PV_ELECTRICAL_MODEL::get_terminal_bus_voltage_in_pu() const
@@ -65,25 +73,29 @@ double PV_ELECTRICAL_MODEL::get_terminal_bus_frequency_in_pu() const
 double PV_ELECTRICAL_MODEL::get_terminal_bus_frequency_deviation_in_pu() const
 {
     PV_UNIT* pv_unit = get_pv_unit_pointer();
-    if(pv_unit==NULL)
+    if(pv_unit!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+
+        size_t bus = pv_unit->get_unit_bus();
+        return psdb.get_bus_frequency_deviation_in_pu(bus);
+    }
+    else
         return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    size_t bus = pv_unit->get_unit_bus();
-    return psdb.get_bus_frequency_deviation_in_pu(bus);
 }
 
 complex<double> PV_ELECTRICAL_MODEL::get_pv_unit_terminal_complex_current_in_pu() const
 {
     PV_UNIT* pv_unit = get_pv_unit_pointer();
-    if(pv_unit==NULL)
-        return 0.0;
-
-    PV_CONVERTER_MODEL* model = pv_unit->get_pv_converter_model();
-    if(model!=NULL and model->is_model_initialized())
-        return model->get_terminal_complex_current_in_pu_in_xy_axis_based_on_mbase();
+    if(pv_unit!=NULL)
+    {
+        PV_CONVERTER_MODEL* model = pv_unit->get_pv_converter_model();
+        if(model!=NULL and model->is_model_initialized())
+            return model->get_terminal_complex_current_in_pu_in_xy_axis_based_on_mbase();
+        else
+            return 0.0;
+    }
     else
         return 0.0;
 }
@@ -114,17 +126,17 @@ void PV_ELECTRICAL_MODEL::set_voltage_reference_in_pu(double vref)
 void PV_ELECTRICAL_MODEL::set_voltage_reference_in_pu_with_bus_to_regulate()
 {
     PV_UNIT* source = get_pv_unit_pointer();
-    if(source==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(source!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    size_t bus = get_bus_to_regulate();
-    if(bus==0)
-        bus = source->get_source_bus();
+        size_t bus = get_bus_to_regulate();
+        if(bus==0)
+            bus = source->get_source_bus();
 
-    return set_voltage_reference_in_pu(psdb.get_bus_voltage_in_pu(bus));
+        return set_voltage_reference_in_pu(psdb.get_bus_voltage_in_pu(bus));
+    }
 }
 
 double PV_ELECTRICAL_MODEL::get_voltage_reference_in_pu() const
diff --git a/code/source/model/pvu_models/pv_irradiance_model/pv_irradiance_model.cpp b/code/source/model/pvu_models/pv_irradiance_model/pv_irradiance_model.cpp
index a0ce458e..453065b3 100644
--- a/code/source/model/pvu_models/pv_irradiance_model/pv_irradiance_model.cpp
+++ b/code/source/model/pvu_models/pv_irradiance_model/pv_irradiance_model.cpp
@@ -20,13 +20,16 @@ string PV_IRRADIANCE_MODEL::get_model_type() const
 double PV_IRRADIANCE_MODEL::get_nominal_irradiance_in_Wpm2() const
 {
     PV_UNIT* pv_unit = get_pv_unit_pointer();
-    if(pv_unit==NULL)
+    if(pv_unit!=NULL)
+    {
+        PV_IRRADIANCE_MODEL* pvirrd = pv_unit->get_pv_irradiance_model();
+        if(pvirrd!=NULL)
+            return pvirrd->get_nominal_irradiance_in_Wpm2();
+        else
+            return 0.0;
+    }
+    else
         return 0.0;
-    PV_IRRADIANCE_MODEL* pvirrd = pv_unit->get_pv_irradiance_model();
-    if(pvirrd==NULL)
-        return 0.0;
-
-    return pvirrd->get_nominal_irradiance_in_Wpm2();
 }
 
 double PV_IRRADIANCE_MODEL::get_solar_irradiance_in_Wpm2()
diff --git a/code/source/model/pvu_models/pv_panel_model/pv_panel_model.cpp b/code/source/model/pvu_models/pv_panel_model/pv_panel_model.cpp
index 28adaec6..d770339d 100644
--- a/code/source/model/pvu_models/pv_panel_model/pv_panel_model.cpp
+++ b/code/source/model/pvu_models/pv_panel_model/pv_panel_model.cpp
@@ -45,8 +45,10 @@ void PV_PANEL_MODEL::initialize()
     ostringstream osstream;
 
     PV_UNIT* pv_unit = get_pv_unit_pointer();
-    if(pv_unit==NULL)
-        return;
+    if(pv_unit!=NULL)
+    {
+        ;
+    }
 }
 
 void PV_PANEL_MODEL::run(DYNAMIC_MODE mode)
diff --git a/code/source/model/pvu_models/pv_panel_model/pvp0.cpp b/code/source/model/pvu_models/pv_panel_model/pvp0.cpp
index 55359f44..9f540644 100644
--- a/code/source/model/pvu_models/pv_panel_model/pvp0.cpp
+++ b/code/source/model/pvu_models/pv_panel_model/pvp0.cpp
@@ -73,14 +73,14 @@ void PVP0::set_block_toolkit()
 void PVP0::initialize()
 {
     ostringstream oosstream;
-    if(is_model_initialized())
-        return;
-
-    PV_UNIT* pv_unit = get_pv_unit_pointer();
-    if(pv_unit==NULL)
-        return;
-
-    set_block_toolkit();
+    if(not is_model_initialized())
+    {
+        PV_UNIT* pv_unit = get_pv_unit_pointer();
+        if(pv_unit!=NULL)
+        {
+            set_block_toolkit();
+        }
+    }
 }
 
 void PVP0::run(DYNAMIC_MODE mode)
diff --git a/code/source/model/pvu_models/pvu_model.cpp b/code/source/model/pvu_models/pvu_model.cpp
index dac1bdbb..b8a56138 100644
--- a/code/source/model/pvu_models/pvu_model.cpp
+++ b/code/source/model/pvu_models/pvu_model.cpp
@@ -29,50 +29,56 @@ double PVU_MODEL::get_mbase_in_MVA() const
 complex<double> PVU_MODEL::get_terminal_complex_voltage_in_pu() const
 {
     PV_UNIT* gen = get_pv_unit_pointer();
-    if(gen==NULL)
-        return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(gen!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    size_t bus = gen->get_unit_bus();
-    complex<double> Vxy = psdb.get_bus_complex_voltage_in_pu(bus);
-    return Vxy;
+        size_t bus = gen->get_unit_bus();
+        complex<double> Vxy = psdb.get_bus_complex_voltage_in_pu(bus);
+        return Vxy;
+    }
+    else
+        return 0.0;
 }
 
 size_t PVU_MODEL::get_number_of_lumped_pv_units() const
 {
     PV_UNIT* gen = get_pv_unit_pointer();
-    if(gen==NULL)
+    if(gen!=NULL)
+        return gen->get_number_of_lumped_pv_units();
+    else
         return 0;
-    return gen->get_number_of_lumped_pv_units();
 }
 
 double PVU_MODEL::get_rated_power_per_pv_unit_in_MW() const
 {
     PV_UNIT* gen = get_pv_unit_pointer();
-    if(gen==NULL)
+    if(gen!=NULL)
+        return gen->get_rated_power_per_pv_unit_in_MW();
+    else
         return 0.0;
-    return gen->get_rated_power_per_pv_unit_in_MW();
 }
 
 double PVU_MODEL::get_bus_base_frequency_in_Hz() const
 {
     PV_UNIT* pvu = get_pv_unit_pointer();
-    if(pvu==NULL)
-        return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(pvu!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    return psdb.get_bus_base_frequency_in_Hz(pvu->get_unit_bus());
+        return psdb.get_bus_base_frequency_in_Hz(pvu->get_unit_bus());
+    }
+    else
+        return 0.0;
 }
 
 complex<double> PVU_MODEL::get_source_impedance_in_pu_based_on_mbase() const
 {
     PV_UNIT* pv_unit = get_pv_unit_pointer();
-    if(pv_unit==NULL)
-        return 0.0;
-    else
+    if(pv_unit!=NULL)
         return pv_unit->get_source_impedance_in_pu();
+    else
+        return 0.0;
 }
diff --git a/code/source/model/sg_models/compensator_model/COMP.cpp b/code/source/model/sg_models/compensator_model/COMP.cpp
index fa7fedb6..ddd05190 100644
--- a/code/source/model/sg_models/compensator_model/COMP.cpp
+++ b/code/source/model/sg_models/compensator_model/COMP.cpp
@@ -62,23 +62,27 @@ double COMP::get_Xe() const
 bool COMP::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<4)
+    if(data.size()>=4)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double xe;
+
+            size_t i=3;
+            xe = get_double_data(data[i],"0.0");
+
+            set_Xe(xe);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    double xe;
-
-    size_t i=3;
-    xe = get_double_data(data[i],"0.0");
-
-    set_Xe(xe);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool COMP::setup_model_with_psse_string(string data)
@@ -105,12 +109,12 @@ void COMP::set_block_toolkit()
 
 void COMP::initialize()
 {
-    if(is_model_initialized())
-        return;
-
-    set_block_toolkit();
+    if(not is_model_initialized())
+    {
+        set_block_toolkit();
 
-    set_flag_model_initialized_as_false();
+        set_flag_model_initialized_as_false();
+    }
 }
 
 void COMP::run(DYNAMIC_MODE mode)
@@ -118,6 +122,7 @@ void COMP::run(DYNAMIC_MODE mode)
     if(mode==UPDATE_MODE)
         set_flag_model_updated_as_true();
 }
+
 double COMP::get_compensated_voltage_in_pu() const
 {
     complex<double> Vt = get_generator_terminal_voltage_in_pu();
@@ -127,6 +132,7 @@ double COMP::get_compensated_voltage_in_pu() const
     complex<double> Vct = Vt-j*xe*It;
     return steps_fast_complex_abs(Vct);
 }
+
 void COMP::check()
 {
     ;
diff --git a/code/source/model/sg_models/compensator_model/compensator_model.cpp b/code/source/model/sg_models/compensator_model/compensator_model.cpp
index f5863b54..e5857d94 100644
--- a/code/source/model/sg_models/compensator_model/compensator_model.cpp
+++ b/code/source/model/sg_models/compensator_model/compensator_model.cpp
@@ -27,29 +27,32 @@ complex<double> COMPENSATOR_MODEL::get_generator_terminal_voltage_in_pu() const
 {
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-    else
+    if(generator!=NULL)
     {
         size_t bus = generator->get_generator_bus();
         POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
         return psdb.get_bus_complex_voltage_in_pu(bus);
     }
+    else
+        return 0.0;
 }
 
 complex<double> COMPENSATOR_MODEL::get_generator_terminal_current_in_pu() const
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-    else
+    if(generator!=NULL)
     {
         SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-        if(gen_model==NULL)
+        if(gen_model!=NULL)
+        {
+            if(not gen_model->is_model_initialized())
+                gen_model->initialize();
+            complex<double> I = gen_model->get_terminal_complex_current_in_pu_in_xy_axis_based_on_mbase();
+            return I;
+        }
+        else
             return 0.0;
-        if(not gen_model->is_model_initialized())
-            gen_model->initialize();
-        complex<double> I = gen_model->get_terminal_complex_current_in_pu_in_xy_axis_based_on_mbase();
-        return I;
     }
+    else
+        return 0.0;
 }
diff --git a/code/source/model/sg_models/exciter_model/CSEET1.cpp b/code/source/model/sg_models/exciter_model/CSEET1.cpp
index 4d1fe7e5..a4bc2f2d 100644
--- a/code/source/model/sg_models/exciter_model/CSEET1.cpp
+++ b/code/source/model/sg_models/exciter_model/CSEET1.cpp
@@ -565,17 +565,19 @@ double CSEET1::get_initial_Ve_with_Fex_function() const
     size_t iter_count = 0;
     while(true)
     {
-        iter_count ++;
+        ++iter_count;
 
         Ve = Efd/Fex;
         newFex = get_Fex(Ve, Ifd);
 
-        if(fabs(Fex-newFex)<FLOAT_EPSILON)
-            break;
-        else
+        if(fabs(Fex-newFex)>FLOAT_EPSILON)
             Fex = newFex;
+        else
+            break;
 
-        if(Fex == 0.0)
+        if(Fex != 0.0)
+            ;
+        else
         {
             osstream<<"Fatal error. Fex = 0.0 is encountered when initializing exciter CSEET1 of "<<get_device_name()<<".";
             toolkit.show_information_with_leading_time_stamp(osstream);
@@ -583,7 +585,9 @@ double CSEET1::get_initial_Ve_with_Fex_function() const
             break;
         }
 
-        if(iter_count>10)
+        if(iter_count<=10)
+            ;
+        else
         {
             osstream<<"Warning. Initial Ve is not solved within 10 iterations when initializing exciter CSEET1 of "<<get_device_name()<<".";
             toolkit.show_information_with_leading_time_stamp(osstream);
@@ -626,139 +630,142 @@ double CSEET1::get_Fex(double Ve, double Ifd) const
 bool CSEET1::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<35)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
+    if(data.size()>=35)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t excitation_source, exciter_brush, feedback_slot, tuner_type;
+            double tr;
+            // serial
+            double serial_k;
+            size_t serial_kv;
+            double t1, t2, va1max, va1min, t3, t4;
+            // parallel
+            double parallel_kp, parallel_ki, vimax, vimin, parallel_kd, parallel_td, vdmax, vdmin;
+            // common
+            double ka, ta, vamax, vamin, kh, kf, tf, kb, t5, vrmax, vrmin, te, vemax, ke, se75, se100, kc, kd, efdmax;
+
+            size_t i=3;
+            excitation_source = get_integer_data(data[i],"0"); i++; if(excitation_source!=0) excitation_source = 1;
+            exciter_brush = get_integer_data(data[i],"0"); i++; if(exciter_brush!=0) exciter_brush = 1;
+            feedback_slot = get_integer_data(data[i],"0"); i++; if(feedback_slot!=0) feedback_slot = 1;
+            tuner_type = get_integer_data(data[i],"0"); i++; if(tuner_type!=0) tuner_type = 1;
+            tr = get_double_data(data[i],"1.0"); i++;
+
+            if(excitation_source==0)
+                set_excitation_source(SELF_EXCITATION);
+            else
+                set_excitation_source(SEPARATE_EXCITATION);
 
-    size_t excitation_source, exciter_brush, feedback_slot, tuner_type;
-    double tr;
-    // serial
-    double serial_k;
-    size_t serial_kv;
-    double t1, t2, va1max, va1min, t3, t4;
-    // parallel
-    double parallel_kp, parallel_ki, vimax, vimin, parallel_kd, parallel_td, vdmax, vdmin;
-    // common
-    double ka, ta, vamax, vamin, kh, kf, tf, kb, t5, vrmax, vrmin, te, vemax, ke, se75, se100, kc, kd, efdmax;
-
-    size_t i=3;
-    excitation_source = get_integer_data(data[i],"0"); i++; if(excitation_source!=0) excitation_source = 1;
-    exciter_brush = get_integer_data(data[i],"0"); i++; if(exciter_brush!=0) exciter_brush = 1;
-    feedback_slot = get_integer_data(data[i],"0"); i++; if(feedback_slot!=0) feedback_slot = 1;
-    tuner_type = get_integer_data(data[i],"0"); i++; if(tuner_type!=0) tuner_type = 1;
-    tr = get_double_data(data[i],"1.0"); i++;
-
-    if(excitation_source==0)
-        set_excitation_source(SELF_EXCITATION);
-    else
-        set_excitation_source(SEPARATE_EXCITATION);
+            if(exciter_brush==0)
+                set_exciter_brush(WITHOUT_BRUSH);
+            else
+                set_exciter_brush(WITH_BRUSH);
 
-    if(exciter_brush==0)
-        set_exciter_brush(WITHOUT_BRUSH);
-    else
-        set_exciter_brush(WITH_BRUSH);
+            if(feedback_slot==0)
+                set_feedback_slot(AT_VOLTAGE_ERROR);
+            else
+                set_feedback_slot(AT_REGULATOR);
 
-    if(feedback_slot==0)
-        set_feedback_slot(AT_VOLTAGE_ERROR);
-    else
-        set_feedback_slot(AT_REGULATOR);
+            if(tuner_type==0)
+                set_tuner_type(SERIAL_TUNER);
+            else
+                set_tuner_type(PARALLEL_TUNER);
 
-    if(tuner_type==0)
-        set_tuner_type(SERIAL_TUNER);
-    else
-        set_tuner_type(PARALLEL_TUNER);
+            set_TR_in_s(tr);
 
-    set_TR_in_s(tr);
 
+            if(tuner_type==0) // serial
+            {
+                serial_k = get_double_data(data[i],"1.0"); i++;
+                serial_kv = get_integer_data(data[i],"1"); i++;
+                t1 = get_double_data(data[i],"1.0"); i++;
+                t2 = get_double_data(data[i],"1.0"); i++;
+                va1max = get_double_data(data[i],"999.0"); i++;
+                va1min = get_double_data(data[i],"-999.0"); i++;
+                t3 = get_double_data(data[i],"1.0"); i++;
+                t4 = get_double_data(data[i],"1.0"); i++;
+
+                set_serial_tuner_K(serial_k);
+                set_serial_tuner_KV(serial_kv);
+                set_serial_tuner_T1_in_s(t1);
+                set_serial_tuner_T2_in_s(t2);
+                set_serial_tuner_VA1max_in_pu(va1max);
+                set_serial_tuner_VA1min_in_pu(va1min);
+                set_serial_tuner_T3_in_s(t3);
+                set_serial_tuner_T4_in_s(t4);
+            }
+            else
+            {
+                parallel_kp = get_double_data(data[i],"1.0"); i++;
+                parallel_ki = get_double_data(data[i],"1.0"); i++;
+                vimax = get_double_data(data[i],"999.0"); i++;
+                vimin = get_double_data(data[i],"-999.0"); i++;
+                parallel_kd = get_double_data(data[i],"1.0"); i++;
+                parallel_td = get_double_data(data[i],"1.0"); i++;
+                vdmax = get_double_data(data[i],"999.0"); i++;
+                vdmin = get_double_data(data[i],"-999.0"); i++;
+
+                set_parallel_tuner_KP(parallel_kp);
+                set_parallel_tuner_KI(parallel_ki);
+                set_parallel_tuner_VImax_in_pu(vimax);
+                set_parallel_tuner_VImin_in_pu(vimin);
+                set_parallel_tuner_KD(parallel_kd);
+                set_parallel_tuner_TD_in_s(parallel_td);
+                set_parallel_tuner_VDmax_in_pu(vdmax);
+                set_parallel_tuner_VDmin_in_pu(vdmin);
+            }
 
-    if(tuner_type==0) // serial
-    {
-        serial_k = get_double_data(data[i],"1.0"); i++;
-        serial_kv = get_integer_data(data[i],"1"); i++;
-        t1 = get_double_data(data[i],"1.0"); i++;
-        t2 = get_double_data(data[i],"1.0"); i++;
-        va1max = get_double_data(data[i],"999.0"); i++;
-        va1min = get_double_data(data[i],"-999.0"); i++;
-        t3 = get_double_data(data[i],"1.0"); i++;
-        t4 = get_double_data(data[i],"1.0"); i++;
-
-        set_serial_tuner_K(serial_k);
-        set_serial_tuner_KV(serial_kv);
-        set_serial_tuner_T1_in_s(t1);
-        set_serial_tuner_T2_in_s(t2);
-        set_serial_tuner_VA1max_in_pu(va1max);
-        set_serial_tuner_VA1min_in_pu(va1min);
-        set_serial_tuner_T3_in_s(t3);
-        set_serial_tuner_T4_in_s(t4);
+            ka = get_double_data(data[i],"1.0"); i++;
+            ta = get_double_data(data[i],"0.0"); i++;
+            vamax = get_double_data(data[i],"0.0"); i++;
+            vamin = get_double_data(data[i],"0.0"); i++;
+            kh = get_double_data(data[i],"0.0"); i++;
+            kf = get_double_data(data[i],"0.0"); i++;
+            tf = get_double_data(data[i],"0.0"); i++;
+            kb = get_double_data(data[i],"0.0"); i++;
+            t5 = get_double_data(data[i],"0.0"); i++;
+            vrmax = get_double_data(data[i],"0.0"); i++;
+            vrmin = get_double_data(data[i],"0.0"); i++;
+            te = get_double_data(data[i],"0.0"); i++;
+            vemax = get_double_data(data[i],"0.0"); i++;
+            ke = get_double_data(data[i],"0.0"); i++;
+            se75 = get_double_data(data[i],"0.0"); i++;
+            se100 = get_double_data(data[i],"0.0"); i++;
+            kc = get_double_data(data[i],"0.0"); i++;
+            kd = get_double_data(data[i],"0.0"); i++;
+            efdmax = get_double_data(data[i],"0.0"); i++;
+
+            set_KA(ka);
+            set_TA_in_s(ta);
+            set_VAmax_in_pu(vamax);
+            set_VAmin_in_pu(vamin);
+            set_KH(kh);
+            set_KF(kf);
+            set_TF_in_s(tf);
+            set_KB(kb);
+            set_T5_in_s(t5);
+            set_VRmax_in_pu(vrmax);
+            set_VRmin_in_pu(vrmin);
+            set_TE_in_s(te);
+            set_Vemax_in_pu(vemax);
+            set_KE(ke);
+            set_SE75_in_pu(se75);
+            set_SE100_in_pu(se100);
+            set_KC(kc);
+            set_KD(kd);
+            set_Efdmax_in_pu(efdmax);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
     }
     else
-    {
-        parallel_kp = get_double_data(data[i],"1.0"); i++;
-        parallel_ki = get_double_data(data[i],"1.0"); i++;
-        vimax = get_double_data(data[i],"999.0"); i++;
-        vimin = get_double_data(data[i],"-999.0"); i++;
-        parallel_kd = get_double_data(data[i],"1.0"); i++;
-        parallel_td = get_double_data(data[i],"1.0"); i++;
-        vdmax = get_double_data(data[i],"999.0"); i++;
-        vdmin = get_double_data(data[i],"-999.0"); i++;
-
-        set_parallel_tuner_KP(parallel_kp);
-        set_parallel_tuner_KI(parallel_ki);
-        set_parallel_tuner_VImax_in_pu(vimax);
-        set_parallel_tuner_VImin_in_pu(vimin);
-        set_parallel_tuner_KD(parallel_kd);
-        set_parallel_tuner_TD_in_s(parallel_td);
-        set_parallel_tuner_VDmax_in_pu(vdmax);
-        set_parallel_tuner_VDmin_in_pu(vdmin);
-    }
-
-    ka = get_double_data(data[i],"1.0"); i++;
-    ta = get_double_data(data[i],"0.0"); i++;
-    vamax = get_double_data(data[i],"0.0"); i++;
-    vamin = get_double_data(data[i],"0.0"); i++;
-    kh = get_double_data(data[i],"0.0"); i++;
-    kf = get_double_data(data[i],"0.0"); i++;
-    tf = get_double_data(data[i],"0.0"); i++;
-    kb = get_double_data(data[i],"0.0"); i++;
-    t5 = get_double_data(data[i],"0.0"); i++;
-    vrmax = get_double_data(data[i],"0.0"); i++;
-    vrmin = get_double_data(data[i],"0.0"); i++;
-    te = get_double_data(data[i],"0.0"); i++;
-    vemax = get_double_data(data[i],"0.0"); i++;
-    ke = get_double_data(data[i],"0.0"); i++;
-    se75 = get_double_data(data[i],"0.0"); i++;
-    se100 = get_double_data(data[i],"0.0"); i++;
-    kc = get_double_data(data[i],"0.0"); i++;
-    kd = get_double_data(data[i],"0.0"); i++;
-    efdmax = get_double_data(data[i],"0.0"); i++;
-
-    set_KA(ka);
-    set_TA_in_s(ta);
-    set_VAmax_in_pu(vamax);
-    set_VAmin_in_pu(vamin);
-    set_KH(kh);
-    set_KF(kf);
-    set_TF_in_s(tf);
-    set_KB(kb);
-    set_T5_in_s(t5);
-    set_VRmax_in_pu(vrmax);
-    set_VRmin_in_pu(vrmin);
-    set_TE_in_s(te);
-    set_Vemax_in_pu(vemax);
-    set_KE(ke);
-    set_SE75_in_pu(se75);
-    set_SE100_in_pu(se100);
-    set_KC(kc);
-    set_KD(kd);
-    set_Efdmax_in_pu(efdmax);
-
-    is_successful = true;
-
-    return is_successful;
+        return is_successful;
 }
 
 bool CSEET1::setup_model_with_psse_string(string data)
@@ -794,252 +801,257 @@ void CSEET1::set_block_toolkit()
 
 void CSEET1::initialize()
 {
-    if(is_model_initialized())
-        return;
-
-    GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
-
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
-
-    set_block_toolkit();
-
-    if(get_tuner_type()==SERIAL_TUNER)
+    if(not is_model_initialized())
     {
-        if(get_serial_tuner_KV()==false)
+        GENERATOR* generator = get_generator_pointer();
+        if(generator!=NULL)
         {
-            double K = get_serial_tuner_K();
-            double T1 = get_serial_tuner_T1_in_s();
-            double T2 = get_serial_tuner_T2_in_s();
-            double VA1max = get_serial_tuner_VA1max_in_pu();
-            double VA1min = get_serial_tuner_VA1min_in_pu();
-
-            serial_tuner1_pi.set_Kp(K*T1/T2);
-            serial_tuner1_pi.set_Ki(K/T2);
-            serial_tuner1_pi.set_upper_limit(VA1max);
-            serial_tuner1_pi.set_lower_limit(VA1min);
-        }
-    }
-
-    double Efd = get_initial_excitation_voltage_in_pu_from_sync_generator_model();
-    double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
-
-    double Ve = get_initial_Ve_with_Fex_function();
-    exciter.set_output(Ve);
-    exciter.initialize();
-
-    double SE = saturation_block.get_saturation(Ve);
-    double KE = get_KE();
-    double KD = get_KD();
-
-    double Vfe = (SE+KE)*Ve+Ifd*KD;
-    regulator2.set_output(Vfe);
-    regulator2.initialize();
-
-    double V_input_to_feedbacker = 0.0;
-
-    if(get_exciter_brush()==WITHOUT_BRUSH)
-        V_input_to_feedbacker = Vfe;
-    else
-        V_input_to_feedbacker = Efd;
-
-    feedbacker.set_input(V_input_to_feedbacker);
-    feedbacker.initialize();
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
+
+                set_block_toolkit();
+
+                if(get_tuner_type()==SERIAL_TUNER)
+                {
+                    if(get_serial_tuner_KV()==false)
+                    {
+                        double K = get_serial_tuner_K();
+                        double T1 = get_serial_tuner_T1_in_s();
+                        double T2 = get_serial_tuner_T2_in_s();
+                        double VA1max = get_serial_tuner_VA1max_in_pu();
+                        double VA1min = get_serial_tuner_VA1min_in_pu();
+
+                        serial_tuner1_pi.set_Kp(K*T1/T2);
+                        serial_tuner1_pi.set_Ki(K/T2);
+                        serial_tuner1_pi.set_upper_limit(VA1max);
+                        serial_tuner1_pi.set_lower_limit(VA1min);
+                    }
+                }
+
+                double Efd = get_initial_excitation_voltage_in_pu_from_sync_generator_model();
+                double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
+
+                double Ve = get_initial_Ve_with_Fex_function();
+                exciter.set_output(Ve);
+                exciter.initialize();
+
+                double SE = saturation_block.get_saturation(Ve);
+                double KE = get_KE();
+                double KD = get_KD();
+
+                double Vfe = (SE+KE)*Ve+Ifd*KD;
+                regulator2.set_output(Vfe);
+                regulator2.initialize();
+
+                double V_input_to_feedbacker = 0.0;
+
+                if(get_exciter_brush()==WITHOUT_BRUSH)
+                    V_input_to_feedbacker = Vfe;
+                else
+                    V_input_to_feedbacker = Efd;
+
+                feedbacker.set_input(V_input_to_feedbacker);
+                feedbacker.initialize();
+
+                double KH = get_KH();
+                double V_regulator1 = regulator2.get_input()+KH*V_input_to_feedbacker;
+
+                regulator1.set_output(V_regulator1);
+                regulator1.initialize();
+
+                double V_input_to_tuner;
+                if(get_tuner_type()==SERIAL_TUNER)
+                {
+                    serial_tuner2.set_output(regulator1.get_input());
+                    serial_tuner2.initialize();
+
+
+                    if(get_serial_tuner_KV()==true)
+                    {
+                        serial_tuner1_lead_lag.set_output(serial_tuner2.get_input());
+                        serial_tuner1_lead_lag.initialize();
+                        V_input_to_tuner = serial_tuner1_lead_lag.get_input();
+                    }
+                    else
+                    {
+                        serial_tuner1_pi.set_output(serial_tuner2.get_input());
+                        serial_tuner1_pi.initialize();
+                        V_input_to_tuner = serial_tuner1_pi.get_input();
+                    }
+                }
+                else
+                {
+                    parallel_tuner_integral.set_output(regulator1.get_input());
+                    parallel_tuner_integral.initialize();
 
-    double KH = get_KH();
-    double V_regulator1 = regulator2.get_input()+KH*V_input_to_feedbacker;
+                    V_input_to_tuner = 0.0;
+                    parallel_tuner_differential.set_input(V_input_to_tuner);
+                    parallel_tuner_differential.initialize();
+                }
 
-    regulator1.set_output(V_regulator1);
-    regulator1.initialize();
+                double Ecomp = get_compensated_voltage_in_pu();
 
-    double V_input_to_tuner;
-    if(get_tuner_type()==SERIAL_TUNER)
-    {
-        serial_tuner2.set_output(regulator1.get_input());
-        serial_tuner2.initialize();
+                sensor.set_output(Ecomp);
+                sensor.initialize();
 
+                double Vref = V_input_to_tuner+Ecomp;
+                set_voltage_reference_in_pu(Vref);
 
-        if(get_serial_tuner_KV()==true)
-        {
-            serial_tuner1_lead_lag.set_output(serial_tuner2.get_input());
-            serial_tuner1_lead_lag.initialize();
-            V_input_to_tuner = serial_tuner1_lead_lag.get_input();
-        }
-        else
-        {
-            serial_tuner1_pi.set_output(serial_tuner2.get_input());
-            serial_tuner1_pi.initialize();
-            V_input_to_tuner = serial_tuner1_pi.get_input();
+                set_flag_model_initialized_as_true();
+            }
         }
     }
-    else
-    {
-        parallel_tuner_integral.set_output(regulator1.get_input());
-        parallel_tuner_integral.initialize();
-
-        V_input_to_tuner = 0.0;
-        parallel_tuner_differential.set_input(V_input_to_tuner);
-        parallel_tuner_differential.initialize();
-    }
-
-    double Ecomp = get_compensated_voltage_in_pu();
-
-    sensor.set_output(Ecomp);
-    sensor.initialize();
-
-    double Vref = V_input_to_tuner+Ecomp;
-    set_voltage_reference_in_pu(Vref);
-
-    set_flag_model_initialized_as_true();
 }
 
 void CSEET1::run(DYNAMIC_MODE mode)
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
-
-    double Ecomp = get_compensated_voltage_in_pu();
-    double Vref = get_voltage_reference_in_pu();
-    double Vs = get_stabilizing_signal_in_pu();
-    double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
+    if(generator!=NULL)
+    {
+        SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+        if(gen_model!=NULL)
+        {
+            double Ecomp = get_compensated_voltage_in_pu();
+            double Vref = get_voltage_reference_in_pu();
+            double Vs = get_stabilizing_signal_in_pu();
+            double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
 
-    double Ve = exciter.get_output();
-    double Vemax = get_Vemax_in_pu();
-    if(Ve>Vemax)
-        Ve = Vemax;
+            double Ve = exciter.get_output();
+            double Vemax = get_Vemax_in_pu();
+            if(Ve>Vemax)
+                Ve = Vemax;
 
-    double Efd = get_excitation_voltage_in_pu();
+            double Efd = get_excitation_voltage_in_pu();
 
-    double SE = saturation_block.get_saturation(Ve);
-    double KE = get_KE();
-    double KD = get_KD();
+            double SE = saturation_block.get_saturation(Ve);
+            double KE = get_KE();
+            double KD = get_KD();
 
-    double Vfe = (SE+KE)*Ve+KD*Ifd;
-    double V_to_feedback = Vfe;
-    if(get_exciter_brush()==WITH_BRUSH)
-        V_to_feedback = Efd;
+            double Vfe = (SE+KE)*Ve+KD*Ifd;
+            double V_to_feedback = Vfe;
+            if(get_exciter_brush()==WITH_BRUSH)
+                V_to_feedback = Efd;
 
-    feedbacker.set_input(V_to_feedback);
-    feedbacker.run(mode);
+            feedbacker.set_input(V_to_feedback);
+            feedbacker.run(mode);
 
-    sensor.set_input(Ecomp);
-    sensor.run(mode);
+            sensor.set_input(Ecomp);
+            sensor.run(mode);
 
-    double input;
-    input = Vref+Vs-sensor.get_output();
+            double input;
+            input = Vref+Vs-sensor.get_output();
 
-    if(get_feedback_slot()==AT_VOLTAGE_ERROR)
-        input -= feedbacker.get_output();
+            if(get_feedback_slot()==AT_VOLTAGE_ERROR)
+                input -= feedbacker.get_output();
 
-    if(get_tuner_type()==SERIAL_TUNER)
-    {
-        if(get_serial_tuner_KV()==true)
-        {
-            serial_tuner1_lead_lag.set_input(input);
-            serial_tuner1_lead_lag.run(mode);
-            input = serial_tuner1_lead_lag.get_output();
-        }
-        else
-        {
-            serial_tuner1_pi.set_input(input);
-            serial_tuner1_pi.run(mode);
-            input = serial_tuner1_pi.get_output();
-        }
-
-        serial_tuner2.set_input(input);
-        serial_tuner2.run(mode);
-        input = serial_tuner2.get_output();
-    }
-    else
-    {
-        parallel_tuner_integral.set_input(input);
-        parallel_tuner_integral.run(mode);
-        parallel_tuner_differential.set_input(input);
-        parallel_tuner_differential.run(mode);
+            if(get_tuner_type()==SERIAL_TUNER)
+            {
+                if(get_serial_tuner_KV()==true)
+                {
+                    serial_tuner1_lead_lag.set_input(input);
+                    serial_tuner1_lead_lag.run(mode);
+                    input = serial_tuner1_lead_lag.get_output();
+                }
+                else
+                {
+                    serial_tuner1_pi.set_input(input);
+                    serial_tuner1_pi.run(mode);
+                    input = serial_tuner1_pi.get_output();
+                }
+
+                serial_tuner2.set_input(input);
+                serial_tuner2.run(mode);
+                input = serial_tuner2.get_output();
+            }
+            else
+            {
+                parallel_tuner_integral.set_input(input);
+                parallel_tuner_integral.run(mode);
+                parallel_tuner_differential.set_input(input);
+                parallel_tuner_differential.run(mode);
 
-        input = input*get_parallel_tuner_KP()+parallel_tuner_integral.get_output()+parallel_tuner_differential.get_output();
-    }
+                input = input*get_parallel_tuner_KP()+parallel_tuner_integral.get_output()+parallel_tuner_differential.get_output();
+            }
 
-    if(get_feedback_slot()==AT_REGULATOR)
-        input -= feedbacker.get_output();
+            if(get_feedback_slot()==AT_REGULATOR)
+                input -= feedbacker.get_output();
 
-    regulator1.set_input(input);
-    regulator1.run(mode);
-    input = regulator1.get_output();
+            regulator1.set_input(input);
+            regulator1.run(mode);
+            input = regulator1.get_output();
 
-    double KH = get_KH();
-    input = input-KH*V_to_feedback;
+            double KH = get_KH();
+            input = input-KH*V_to_feedback;
 
-    regulator2.set_input(input);
-    regulator2.run(mode);
+            regulator2.set_input(input);
+            regulator2.run(mode);
 
-    double Vr = regulator2.get_output();
-    double Vrmax = get_VRmax_in_pu();
-    double Vrmin = get_VRmin_in_pu();
+            double Vr = regulator2.get_output();
+            double Vrmax = get_VRmax_in_pu();
+            double Vrmin = get_VRmin_in_pu();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    size_t bus = generator->get_generator_bus();
-    double Vt = psdb.get_bus_voltage_in_pu(bus);
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            size_t bus = generator->get_generator_bus();
+            double Vt = psdb.get_bus_voltage_in_pu(bus);
 
-    if(get_excitation_source()==SELF_EXCITATION)
-    {
-        Vrmax *= Vt;
-        Vrmin *= Vt;
-    }
+            if(get_excitation_source()==SELF_EXCITATION)
+            {
+                Vrmax *= Vt;
+                Vrmin *= Vt;
+            }
 
-    if(Vr>Vrmax)
-        Vr = Vrmax;
+            if(Vr>Vrmax)
+                Vr = Vrmax;
 
-    if(Vr<Vrmin)
-        Vr = Vrmin;
+            if(Vr<Vrmin)
+                Vr = Vrmin;
 
-    input = Vr-Vfe;
-    exciter.set_input(input);
-    exciter.run(mode);
+            input = Vr-Vfe;
+            exciter.set_input(input);
+            exciter.run(mode);
 
-    //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
+            //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
 
-    if(mode == UPDATE_MODE)
-        set_flag_model_updated_as_true();
+            if(mode == UPDATE_MODE)
+                set_flag_model_updated_as_true();
+        }
+    }
 }
 
 double CSEET1::get_excitation_voltage_in_pu() const
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return 0.0;
-
-    double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
+    if(generator!=NULL)
+    {
+        SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+        if(gen_model!=NULL)
+        {
+            double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
 
-    double Ve = exciter.get_output();
-    double Vemax = get_Vemax_in_pu();
-    if(Ve>Vemax)
-        Ve = Vemax;
+            double Ve = exciter.get_output();
+            double Vemax = get_Vemax_in_pu();
+            if(Ve>Vemax)
+                Ve = Vemax;
 
-    double Fex = get_Fex(Ve, Ifd);
-    double Efd = Ve*Fex;
-    double Efdmax = get_Efdmax_in_pu();
-    if(Efd>Efdmax)
-        Efd = Efdmax;
+            double Fex = get_Fex(Ve, Ifd);
+            double Efd = Ve*Fex;
+            double Efdmax = get_Efdmax_in_pu();
+            if(Efd>Efdmax)
+                Efd = Efdmax;
 
-    return Efd;
+            return Efd;
+        }
+        else
+            return 0.0;
+    }
+    else
+        return 0.0;
 }
+
 void CSEET1::check()
 {
     ;
diff --git a/code/source/model/sg_models/exciter_model/CSEET2.cpp b/code/source/model/sg_models/exciter_model/CSEET2.cpp
index abf523db..db5bbe84 100644
--- a/code/source/model/sg_models/exciter_model/CSEET2.cpp
+++ b/code/source/model/sg_models/exciter_model/CSEET2.cpp
@@ -412,112 +412,116 @@ double CSEET2::get_KC() const
 bool CSEET2::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<21)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    size_t excitation_source, stabilizer_slot, tuner_type;
-    double tr;
-    // serial
-    double serial_k;
-    size_t serial_kv;
-    double t1, t2, va1max, va1min, t3, t4;
-    // parallel
-    double parallel_kp, parallel_ki, vimax, vimin, parallel_kd, parallel_td, vdmax, vdmin;
-    // common
-    double ka, ta, vamax, vamin, kf, tf, vrmax, vrmin, kc;
-
-    size_t i=3;
-    excitation_source = get_integer_data(data[i],"0"); i++; if(excitation_source!=0) excitation_source = 1;
-    stabilizer_slot = get_integer_data(data[i],"0"); i++; if(stabilizer_slot!=0) stabilizer_slot = 1;
-    tuner_type = get_integer_data(data[i],"0"); i++; if(tuner_type!=0) tuner_type = 1;
-    tr = get_double_data(data[i],"1.0"); i++;
-
-    if(excitation_source==0)
-        set_excitation_source(SELF_EXCITATION);
-    else
-        set_excitation_source(SEPARATE_EXCITATION);
-
-    if(stabilizer_slot==0)
-        set_stabilizer_slot(AT_VOLTAGE_ERROR);
-    else
-        set_stabilizer_slot(AT_REGULATOR);
-
-    if(tuner_type==0)
-        set_tuner_type(SERIAL_TUNER);
-    else
-        set_tuner_type(PARALLEL_TUNER);
-
-    set_TR_in_s(tr);
+    if(data.size()>=21)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t excitation_source, stabilizer_slot, tuner_type;
+            double tr;
+            // serial
+            double serial_k;
+            size_t serial_kv;
+            double t1, t2, va1max, va1min, t3, t4;
+            // parallel
+            double parallel_kp, parallel_ki, vimax, vimin, parallel_kd, parallel_td, vdmax, vdmin;
+            // common
+            double ka, ta, vamax, vamin, kf, tf, vrmax, vrmin, kc;
+
+            size_t i=3;
+            excitation_source = get_integer_data(data[i],"0"); i++; if(excitation_source!=0) excitation_source = 1;
+            stabilizer_slot = get_integer_data(data[i],"0"); i++; if(stabilizer_slot!=0) stabilizer_slot = 1;
+            tuner_type = get_integer_data(data[i],"0"); i++; if(tuner_type!=0) tuner_type = 1;
+            tr = get_double_data(data[i],"1.0"); i++;
+
+            if(excitation_source==0)
+                set_excitation_source(SELF_EXCITATION);
+            else
+                set_excitation_source(SEPARATE_EXCITATION);
 
+            if(stabilizer_slot==0)
+                set_stabilizer_slot(AT_VOLTAGE_ERROR);
+            else
+                set_stabilizer_slot(AT_REGULATOR);
 
-    if(tuner_type==0) // serial
-    {
-        serial_k = get_double_data(data[i],"1.0"); i++;
-        serial_kv = get_integer_data(data[i],"1"); i++;
-        t1 = get_double_data(data[i],"1.0"); i++;
-        t2 = get_double_data(data[i],"1.0"); i++;
-        va1max = get_double_data(data[i],"999.0"); i++;
-        va1min = get_double_data(data[i],"-999.0"); i++;
-        t3 = get_double_data(data[i],"1.0"); i++;
-        t4 = get_double_data(data[i],"1.0"); i++;
-
-        set_serial_tuner_K(serial_k);
-        set_serial_tuner_KV(serial_kv);
-        set_serial_tuner_T1_in_s(t1);
-        set_serial_tuner_T2_in_s(t2);
-        set_serial_tuner_VA1max_in_pu(va1max);
-        set_serial_tuner_VA1min_in_pu(va1min);
-        set_serial_tuner_T3_in_s(t3);
-        set_serial_tuner_T4_in_s(t4);
+            if(tuner_type==0)
+                set_tuner_type(SERIAL_TUNER);
+            else
+                set_tuner_type(PARALLEL_TUNER);
+
+            set_TR_in_s(tr);
+
+
+            if(tuner_type==0) // serial
+            {
+                serial_k = get_double_data(data[i],"1.0"); i++;
+                serial_kv = get_integer_data(data[i],"1"); i++;
+                t1 = get_double_data(data[i],"1.0"); i++;
+                t2 = get_double_data(data[i],"1.0"); i++;
+                va1max = get_double_data(data[i],"999.0"); i++;
+                va1min = get_double_data(data[i],"-999.0"); i++;
+                t3 = get_double_data(data[i],"1.0"); i++;
+                t4 = get_double_data(data[i],"1.0"); i++;
+
+                set_serial_tuner_K(serial_k);
+                set_serial_tuner_KV(serial_kv);
+                set_serial_tuner_T1_in_s(t1);
+                set_serial_tuner_T2_in_s(t2);
+                set_serial_tuner_VA1max_in_pu(va1max);
+                set_serial_tuner_VA1min_in_pu(va1min);
+                set_serial_tuner_T3_in_s(t3);
+                set_serial_tuner_T4_in_s(t4);
+            }
+            else
+            {
+                parallel_kp = get_double_data(data[i],"1.0"); i++;
+                parallel_ki = get_double_data(data[i],"1.0"); i++;
+                vimax = get_double_data(data[i],"999.0"); i++;
+                vimin = get_double_data(data[i],"-999.0"); i++;
+                parallel_kd = get_double_data(data[i],"1.0"); i++;
+                parallel_td = get_double_data(data[i],"1.0"); i++;
+                vdmax = get_double_data(data[i],"999.0"); i++;
+                vdmin = get_double_data(data[i],"-999.0"); i++;
+
+                set_parallel_tuner_KP(parallel_kp);
+                set_parallel_tuner_KI(parallel_ki);
+                set_parallel_tuner_VImax_in_pu(vimax);
+                set_parallel_tuner_VImin_in_pu(vimin);
+                set_parallel_tuner_KD(parallel_kd);
+                set_parallel_tuner_TD_in_s(parallel_td);
+                set_parallel_tuner_VDmax_in_pu(vdmax);
+                set_parallel_tuner_VDmin_in_pu(vdmin);
+            }
+
+            ka = get_double_data(data[i],"1.0"); i++;
+            ta = get_double_data(data[i],"0.0"); i++;
+            vamax = get_double_data(data[i],"0.0"); i++;
+            vamin = get_double_data(data[i],"0.0"); i++;
+            kf = get_double_data(data[i],"0.0"); i++;
+            tf = get_double_data(data[i],"0.0"); i++;
+            vrmax = get_double_data(data[i],"0.0"); i++;
+            vrmin = get_double_data(data[i],"0.0"); i++;
+            kc = get_double_data(data[i],"0.0"); i++;
+
+            set_KA(ka);
+            set_TA_in_s(ta);
+            set_VAmax_in_pu(vamax);
+            set_VAmin_in_pu(vamin);
+            set_KF(kf);
+            set_TF_in_s(tf);
+            set_VRmax_in_pu(vrmax);
+            set_VRmin_in_pu(vrmin);
+            set_KC(kc);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
     }
     else
-    {
-        parallel_kp = get_double_data(data[i],"1.0"); i++;
-        parallel_ki = get_double_data(data[i],"1.0"); i++;
-        vimax = get_double_data(data[i],"999.0"); i++;
-        vimin = get_double_data(data[i],"-999.0"); i++;
-        parallel_kd = get_double_data(data[i],"1.0"); i++;
-        parallel_td = get_double_data(data[i],"1.0"); i++;
-        vdmax = get_double_data(data[i],"999.0"); i++;
-        vdmin = get_double_data(data[i],"-999.0"); i++;
-
-        set_parallel_tuner_KP(parallel_kp);
-        set_parallel_tuner_KI(parallel_ki);
-        set_parallel_tuner_VImax_in_pu(vimax);
-        set_parallel_tuner_VImin_in_pu(vimin);
-        set_parallel_tuner_KD(parallel_kd);
-        set_parallel_tuner_TD_in_s(parallel_td);
-        set_parallel_tuner_VDmax_in_pu(vdmax);
-        set_parallel_tuner_VDmin_in_pu(vdmin);
-    }
-
-    ka = get_double_data(data[i],"1.0"); i++;
-    ta = get_double_data(data[i],"0.0"); i++;
-    vamax = get_double_data(data[i],"0.0"); i++;
-    vamin = get_double_data(data[i],"0.0"); i++;
-    kf = get_double_data(data[i],"0.0"); i++;
-    tf = get_double_data(data[i],"0.0"); i++;
-    vrmax = get_double_data(data[i],"0.0"); i++;
-    vrmin = get_double_data(data[i],"0.0"); i++;
-    kc = get_double_data(data[i],"0.0"); i++;
-
-    set_KA(ka);
-    set_TA_in_s(ta);
-    set_VAmax_in_pu(vamax);
-    set_VAmin_in_pu(vamin);
-    set_KF(kf);
-    set_TF_in_s(tf);
-    set_VRmax_in_pu(vrmax);
-    set_VRmin_in_pu(vrmin);
-    set_KC(kc);
-
-    is_successful = true;
-
-    return is_successful;
+        return is_successful;
 }
 
 bool CSEET2::setup_model_with_psse_string(string data)
@@ -551,195 +555,199 @@ void CSEET2::set_block_toolkit()
 
 void CSEET2::initialize()
 {
-    if(is_model_initialized())
-        return;
-
-    GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
-
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
-
-    set_block_toolkit();
-
-    if(get_tuner_type()==SERIAL_TUNER)
-    {
-        if(get_serial_tuner_KV()==false)
-        {
-            double K = get_serial_tuner_K();
-            double T1 = get_serial_tuner_T1_in_s();
-            double T2 = get_serial_tuner_T2_in_s();
-
-            serial_tuner1_pi.set_Kp(K*T1/T2);
-            serial_tuner1_pi.set_Ki(K/T2);
-        }
-    }
-
-    double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
-    double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
-    double Kc = get_KC();
-
-    double Vr = Efd + Kc*Ifd;
-
-    regulator.set_output(Vr);
-    regulator.initialize();
-
-    feedbacker.set_input(Vr);
-    feedbacker.initialize();
-
-    double output = regulator.get_input();
-
-    if(get_tuner_type()==SERIAL_TUNER)
+    if(not is_model_initialized())
     {
-        serial_tuner2.set_output(output);
-        serial_tuner2.initialize();
-
-        output = serial_tuner2.get_input();
-        if(get_serial_tuner_KV()==true)
-        {
-            serial_tuner1_lead_lag.set_output(output);
-            serial_tuner1_lead_lag.initialize();
-            output = serial_tuner1_lead_lag.get_input();
-        }
-        else
+        GENERATOR* generator = get_generator_pointer();
+        if(generator!=NULL)
         {
-            serial_tuner1_pi.set_output(output);
-            serial_tuner1_pi.initialize();
-            output = serial_tuner1_pi.get_input();
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
+
+                set_block_toolkit();
+
+                if(get_tuner_type()==SERIAL_TUNER)
+                {
+                    if(get_serial_tuner_KV()==false)
+                    {
+                        double K = get_serial_tuner_K();
+                        double T1 = get_serial_tuner_T1_in_s();
+                        double T2 = get_serial_tuner_T2_in_s();
+
+                        serial_tuner1_pi.set_Kp(K*T1/T2);
+                        serial_tuner1_pi.set_Ki(K/T2);
+                    }
+                }
+
+                double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
+                double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
+                double Kc = get_KC();
+
+                double Vr = Efd + Kc*Ifd;
+
+                regulator.set_output(Vr);
+                regulator.initialize();
+
+                feedbacker.set_input(Vr);
+                feedbacker.initialize();
+
+                double output = regulator.get_input();
+
+                if(get_tuner_type()==SERIAL_TUNER)
+                {
+                    serial_tuner2.set_output(output);
+                    serial_tuner2.initialize();
+
+                    output = serial_tuner2.get_input();
+                    if(get_serial_tuner_KV()==true)
+                    {
+                        serial_tuner1_lead_lag.set_output(output);
+                        serial_tuner1_lead_lag.initialize();
+                        output = serial_tuner1_lead_lag.get_input();
+                    }
+                    else
+                    {
+                        serial_tuner1_pi.set_output(output);
+                        serial_tuner1_pi.initialize();
+                        output = serial_tuner1_pi.get_input();
+                    }
+                }
+                else // parallel tuner
+                {
+                    parallel_integral.set_output(output);
+                    parallel_integral.initialize();
+
+                    parallel_differential.set_input(0.0);
+                    parallel_differential.initialize();
+
+                    output = 0.0;
+                }
+
+                double Ecomp = get_compensated_voltage_in_pu();
+                sensor.set_output(Ecomp);
+                sensor.initialize();
+
+                double Vref = Ecomp+output;
+                set_voltage_reference_in_pu(Vref);
+
+                set_flag_model_initialized_as_true();
+            }
         }
     }
-    else // parallel tuner
-    {
-        parallel_integral.set_output(output);
-        parallel_integral.initialize();
-
-        parallel_differential.set_input(0.0);
-        parallel_differential.initialize();
-
-        output = 0.0;
-    }
-
-    double Ecomp = get_compensated_voltage_in_pu();
-    sensor.set_output(Ecomp);
-    sensor.initialize();
-
-    double Vref = Ecomp+output;
-    set_voltage_reference_in_pu(Vref);
-
-    set_flag_model_initialized_as_true();
 }
 
 void CSEET2::run(DYNAMIC_MODE mode)
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
-
-    double Ecomp = get_compensated_voltage_in_pu();
-    double Vref = get_voltage_reference_in_pu();
-    double Vs = get_stabilizing_signal_in_pu();
-
-    double input;
-    sensor.set_input(Ecomp);
-    sensor.run(mode);
-
-    input = Vref-sensor.get_output();
-    if(get_stabilizer_slot()==AT_VOLTAGE_ERROR)
-        input += Vs;
-
-    if(get_tuner_type()==SERIAL_TUNER)
+    if(generator!=NULL)
     {
-        if(get_serial_tuner_KV()==true)
-        {
-            serial_tuner1_lead_lag.set_input(input);
-            serial_tuner1_lead_lag.run(mode);
-            input = serial_tuner1_lead_lag.get_output();
-        }
-        else
+        SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+        if(gen_model!=NULL)
         {
-            serial_tuner1_pi.set_input(input);
-            serial_tuner1_pi.run(mode);
-            input = serial_tuner1_pi.get_output();
+            double Ecomp = get_compensated_voltage_in_pu();
+            double Vref = get_voltage_reference_in_pu();
+            double Vs = get_stabilizing_signal_in_pu();
+
+            double input;
+            sensor.set_input(Ecomp);
+            sensor.run(mode);
+
+            input = Vref-sensor.get_output();
+            if(get_stabilizer_slot()==AT_VOLTAGE_ERROR)
+                input += Vs;
+
+            if(get_tuner_type()==SERIAL_TUNER)
+            {
+                if(get_serial_tuner_KV()==true)
+                {
+                    serial_tuner1_lead_lag.set_input(input);
+                    serial_tuner1_lead_lag.run(mode);
+                    input = serial_tuner1_lead_lag.get_output();
+                }
+                else
+                {
+                    serial_tuner1_pi.set_input(input);
+                    serial_tuner1_pi.run(mode);
+                    input = serial_tuner1_pi.get_output();
+                }
+                serial_tuner2.set_input(input);
+                serial_tuner2.run(mode);
+                input = serial_tuner2.get_output();
+            }
+            else // parallel tuner
+            {
+                parallel_integral.set_input(input);
+                parallel_integral.run(mode);
+
+                parallel_differential.set_input(input);
+                parallel_differential.run(mode);
+
+                input = get_parallel_tuner_KP()*input+parallel_integral.get_output()+parallel_differential.get_output();
+            }
+
+
+            input -= feedbacker.get_output();
+            if(get_stabilizer_slot()==AT_REGULATOR)
+                input += Vs;
+
+            regulator.set_input(input);
+            regulator.run(mode);
+            input = regulator.get_output();
+
+            feedbacker.set_input(input);
+            feedbacker.run(mode);
+
+            //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
+
+            if(mode == UPDATE_MODE)
+                set_flag_model_updated_as_true();
         }
-        serial_tuner2.set_input(input);
-        serial_tuner2.run(mode);
-        input = serial_tuner2.get_output();
     }
-    else // parallel tuner
-    {
-        parallel_integral.set_input(input);
-        parallel_integral.run(mode);
-
-        parallel_differential.set_input(input);
-        parallel_differential.run(mode);
-
-        input = get_parallel_tuner_KP()*input+parallel_integral.get_output()+parallel_differential.get_output();
-    }
-
-
-    input -= feedbacker.get_output();
-    if(get_stabilizer_slot()==AT_REGULATOR)
-        input += Vs;
-
-    regulator.set_input(input);
-    regulator.run(mode);
-    input = regulator.get_output();
-
-    feedbacker.set_input(input);
-    feedbacker.run(mode);
-
-    //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
-
-    if(mode == UPDATE_MODE)
-        set_flag_model_updated_as_true();
 }
 
 double CSEET2::get_excitation_voltage_in_pu() const
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return 0.0;
-
-    double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
+    if(generator!=NULL)
+    {
+        SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+        if(gen_model!=NULL)
+        {
+            double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
 
-    double Efd = regulator.get_output();
-    double Vrmax = get_VRmax_in_pu();
-    double Vrmin = get_VRmin_in_pu();
+            double Efd = regulator.get_output();
+            double Vrmax = get_VRmax_in_pu();
+            double Vrmin = get_VRmin_in_pu();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    size_t bus = generator->get_generator_bus();
-    double Vt = psdb.get_bus_voltage_in_pu(bus);
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            size_t bus = generator->get_generator_bus();
+            double Vt = psdb.get_bus_voltage_in_pu(bus);
 
-    if(get_excitation_source()==SELF_EXCITATION)
-    {
-        Vrmax *= Vt;
-        Vrmin *= Vt;
-    }
+            if(get_excitation_source()==SELF_EXCITATION)
+            {
+                Vrmax *= Vt;
+                Vrmin *= Vt;
+            }
 
-    if(Efd>Vrmax)
-        Efd = Vrmax;
+            if(Efd>Vrmax)
+                Efd = Vrmax;
 
-    if(Efd<Vrmin)
-        Efd = Vrmin;
+            if(Efd<Vrmin)
+                Efd = Vrmin;
 
-    double Kc = get_KC();
-    Efd -= Kc*Ifd;
+            double Kc = get_KC();
+            Efd -= Kc*Ifd;
 
-    return Efd;
+            return Efd;
+        }
+        else
+            return 0.0;
+    }
+    else
+        return 0.0;
 }
 void CSEET2::check()
 {
diff --git a/code/source/model/sg_models/exciter_model/IEEET1.cpp b/code/source/model/sg_models/exciter_model/IEEET1.cpp
index 855523d5..07a99a09 100644
--- a/code/source/model/sg_models/exciter_model/IEEET1.cpp
+++ b/code/source/model/sg_models/exciter_model/IEEET1.cpp
@@ -196,48 +196,52 @@ double IEEET1::get_SE2_in_pu() const
 bool IEEET1::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<17)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=17)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double tr, ka, ta, vrmax, vrmin, ke, te, kf, tf, e1, se1, e2, se2;
+
+            size_t i=3;
+            tr = get_double_data(data[i],"0.0"); i++;
+            ka = get_double_data(data[i],"0.0"); i++;
+            ta = get_double_data(data[i],"0.0"); i++;
+            vrmax = get_double_data(data[i],"0.0"); i++;
+            vrmin = get_double_data(data[i],"0.0"); i++;
+            ke = get_double_data(data[i],"0.0"); i++;
+            te = get_double_data(data[i],"0.0"); i++;
+            kf = get_double_data(data[i],"0.0"); i++;
+            tf = get_double_data(data[i],"0.0"); i++;
+            /*double temp = get_double_data(data[i],"0.0");*/ i++;
+            e1 = get_double_data(data[i],"0.0"); i++;
+            se1 = get_double_data(data[i],"0.0"); i++;
+            e2 = get_double_data(data[i],"0.0"); i++;
+            se2 = get_double_data(data[i],"0.0");
+
+            set_TR_in_s(tr);
+            set_KA(ka);
+            set_TA_in_s(ta);
+            set_VRmax_in_pu(vrmax);
+            set_VRmin_in_pu(vrmin);
+            set_KE(ke);
+            set_TE_in_s(te);
+            set_KF(kf);
+            set_TF_in_s(tf);
+            set_E1_in_pu(e1);
+            set_SE1_in_pu(se1);
+            set_E2_in_pu(e2);
+            set_SE2_in_pu(se2);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    double tr, ka, ta, vrmax, vrmin, ke, te, kf, tf, e1, se1, e2, se2;
-
-    size_t i=3;
-    tr = get_double_data(data[i],"0.0"); i++;
-    ka = get_double_data(data[i],"0.0"); i++;
-    ta = get_double_data(data[i],"0.0"); i++;
-    vrmax = get_double_data(data[i],"0.0"); i++;
-    vrmin = get_double_data(data[i],"0.0"); i++;
-    ke = get_double_data(data[i],"0.0"); i++;
-    te = get_double_data(data[i],"0.0"); i++;
-    kf = get_double_data(data[i],"0.0"); i++;
-    tf = get_double_data(data[i],"0.0"); i++;
-    /*double temp = get_double_data(data[i],"0.0");*/ i++;
-    e1 = get_double_data(data[i],"0.0"); i++;
-    se1 = get_double_data(data[i],"0.0"); i++;
-    e2 = get_double_data(data[i],"0.0"); i++;
-    se2 = get_double_data(data[i],"0.0");
-
-    set_TR_in_s(tr);
-    set_KA(ka);
-    set_TA_in_s(ta);
-    set_VRmax_in_pu(vrmax);
-    set_VRmin_in_pu(vrmin);
-    set_KE(ke);
-    set_TE_in_s(te);
-    set_KF(kf);
-    set_TF_in_s(tf);
-    set_E1_in_pu(e1);
-    set_SE1_in_pu(se1);
-    set_E2_in_pu(e2);
-    set_SE2_in_pu(se2);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool IEEET1::setup_model_with_psse_string(string data)
@@ -267,97 +271,97 @@ void IEEET1::set_block_toolkit()
 void IEEET1::initialize()
 {
     ostringstream osstream;
-    if(is_model_initialized())
-        return;
-
-    GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
-
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
-
-    set_block_toolkit();
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    double Ecomp = get_compensated_voltage_in_pu();
-
-    sensor.set_output(Ecomp);
-    sensor.initialize();
-
-    double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
-
-    exciter.set_output(Efd);
-    exciter.initialize();
-
-    feedbacker.set_input(Efd);
-    feedbacker.initialize();
-
-    double KE = get_KE();
-    double SE = saturation_block.get_saturation(Efd);
-    double input = (KE+SE)*Efd;
-
-    if(input>get_VRmax_in_pu())
-    {
-        osstream<<"Initialization error. VR of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"VR is "<<input<<", and VRmax is "<<get_VRmax_in_pu()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    if(input<get_VRmin_in_pu())
+    if(not is_model_initialized())
     {
-        osstream<<"Initialization error. VR of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-          <<"VR is "<<input<<", and VRmin is "<<get_VRmin_in_pu()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        GENERATOR* generator = get_generator_pointer();
+        if(generator!=NULL)
+        {
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
+
+                set_block_toolkit();
+
+                STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+                double Ecomp = get_compensated_voltage_in_pu();
+
+                sensor.set_output(Ecomp);
+                sensor.initialize();
+
+                double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
+
+                exciter.set_output(Efd);
+                exciter.initialize();
+
+                feedbacker.set_input(Efd);
+                feedbacker.initialize();
+
+                double KE = get_KE();
+                double SE = saturation_block.get_saturation(Efd);
+                double input = (KE+SE)*Efd;
+
+                if(input>get_VRmax_in_pu())
+                {
+                    osstream<<"Initialization error. VR of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                      <<"VR is "<<input<<", and VRmax is "<<get_VRmax_in_pu()<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                if(input<get_VRmin_in_pu())
+                {
+                    osstream<<"Initialization error. VR of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                      <<"VR is "<<input<<", and VRmin is "<<get_VRmin_in_pu()<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+
+                regulator.set_output(input);
+                regulator.initialize();
+
+                input = regulator.get_input();
+
+                double Vref = input+Ecomp;
+                set_voltage_reference_in_pu(Vref);
+
+                set_flag_model_initialized_as_true();
+            }
+        }
     }
-
-    regulator.set_output(input);
-    regulator.initialize();
-
-    input = regulator.get_input();
-
-    double Vref = input+Ecomp;
-    set_voltage_reference_in_pu(Vref);
-
-    set_flag_model_initialized_as_true();
 }
 
 void IEEET1::run(DYNAMIC_MODE mode)
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    double Ecomp = get_compensated_voltage_in_pu();
-    double Vref = get_voltage_reference_in_pu();
-    double Vs = get_stabilizing_signal_in_pu();
+    if(generator!=NULL)
+    {
+        double Ecomp = get_compensated_voltage_in_pu();
+        double Vref = get_voltage_reference_in_pu();
+        double Vs = get_stabilizing_signal_in_pu();
 
-    sensor.set_input(Ecomp);
-    sensor.run(mode);
+        sensor.set_input(Ecomp);
+        sensor.run(mode);
 
-    double Efd = exciter.get_output();
-    feedbacker.set_input(Efd);
-    feedbacker.run(mode);
+        double Efd = exciter.get_output();
+        feedbacker.set_input(Efd);
+        feedbacker.run(mode);
 
-    double input = Vref-sensor.get_output()+Vs-feedbacker.get_output();
+        double input = Vref-sensor.get_output()+Vs-feedbacker.get_output();
 
-    regulator.set_input(input);
-    regulator.run(mode);
+        regulator.set_input(input);
+        regulator.run(mode);
 
-    double KE = get_KE();
-    double SE = saturation_block.get_saturation(Efd);
-    input = regulator.get_output()-(KE+SE)*Efd;
+        double KE = get_KE();
+        double SE = saturation_block.get_saturation(Efd);
+        input = regulator.get_output()-(KE+SE)*Efd;
 
-    exciter.set_input(input);
-    exciter.run(mode);
+        exciter.set_input(input);
+        exciter.run(mode);
 
-    //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
+        //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
 
-    if(mode == UPDATE_MODE)
-        set_flag_model_updated_as_true();
+        if(mode == UPDATE_MODE)
+            set_flag_model_updated_as_true();
+    }
 }
 
 double IEEET1::get_excitation_voltage_in_pu() const
diff --git a/code/source/model/sg_models/exciter_model/PSASPE1.cpp b/code/source/model/sg_models/exciter_model/PSASPE1.cpp
index 8bd21694..c5fc33ff 100644
--- a/code/source/model/sg_models/exciter_model/PSASPE1.cpp
+++ b/code/source/model/sg_models/exciter_model/PSASPE1.cpp
@@ -172,40 +172,43 @@ double PSASPE1::get_TF_in_s() const
 bool PSASPE1::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<12)
+    if(data.size()>=12)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double kr, tr, ka, ta, te, kf, tf, efdmax, efdmin;
+
+            size_t i=3;
+            kr = get_double_data(data[i],"1.0"); i++;
+            tr = get_double_data(data[i],"0.0"); i++;
+            ka = get_double_data(data[i],"0.0"); i++;
+            ta = get_double_data(data[i],"0.0"); i++;
+            te = get_double_data(data[i],"0.0"); i++;
+            kf = get_double_data(data[i],"0.0"); i++;
+            tf = get_double_data(data[i],"0.0"); i++;
+            efdmax = get_double_data(data[i],"0.0"); i++;
+            efdmin = get_double_data(data[i],"0.0"); i++;
+
+            set_KR(kr);
+            set_TR_in_s(tr);
+            set_KA(ka);
+            set_TA_in_s(ta);
+            set_TE_in_s(te);
+            set_KF(kf);
+            set_TF_in_s(tf);
+            set_Efdmax_in_pu(efdmax);
+            set_Efdmax_in_pu(efdmin);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-
-    double kr, tr, ka, ta, te, kf, tf, efdmax, efdmin;
-
-    size_t i=3;
-    kr = get_double_data(data[i],"1.0"); i++;
-    tr = get_double_data(data[i],"0.0"); i++;
-    ka = get_double_data(data[i],"0.0"); i++;
-    ta = get_double_data(data[i],"0.0"); i++;
-    te = get_double_data(data[i],"0.0"); i++;
-    kf = get_double_data(data[i],"0.0"); i++;
-    tf = get_double_data(data[i],"0.0"); i++;
-    efdmax = get_double_data(data[i],"0.0"); i++;
-    efdmin = get_double_data(data[i],"0.0"); i++;
-
-    set_KR(kr);
-    set_TR_in_s(tr);
-    set_KA(ka);
-    set_TA_in_s(ta);
-    set_TE_in_s(te);
-    set_KF(kf);
-    set_TF_in_s(tf);
-    set_Efdmax_in_pu(efdmax);
-    set_Efdmax_in_pu(efdmin);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool PSASPE1::setup_model_with_psse_string(string data)
@@ -235,79 +238,79 @@ void PSASPE1::set_block_toolkit()
 
 void PSASPE1::initialize()
 {
-    if(is_model_initialized())
-        return;
-
-    GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
+    if(not is_model_initialized())
+    {
+        GENERATOR* generator = get_generator_pointer();
+        if(generator!=NULL)
+        {
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
 
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
-
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
-
-    set_block_toolkit();
+                set_block_toolkit();
 
-    double Ecomp = get_compensated_voltage_in_pu();
+                double Ecomp = get_compensated_voltage_in_pu();
 
-    set_voltage_reference_in_pu(Ecomp);
+                set_voltage_reference_in_pu(Ecomp);
 
-    sensor.set_output(0.0);
-    sensor.initialize();
+                sensor.set_output(0.0);
+                sensor.initialize();
 
-    double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
-    Efd0 = Efd;
+                double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
+                Efd0 = Efd;
 
-    exciter.set_output(Efd);
-    exciter.initialize();
+                exciter.set_output(Efd);
+                exciter.initialize();
 
-    feedbacker.set_input(Efd);
-    feedbacker.initialize();
+                feedbacker.set_input(Efd);
+                feedbacker.initialize();
 
-    regulator.set_output(0.0);
-    regulator.initialize();
+                regulator.set_output(0.0);
+                regulator.initialize();
 
-    set_flag_model_initialized_as_true();
+                set_flag_model_initialized_as_true();
+            }
+        }
+    }
 }
 
 void PSASPE1::run(DYNAMIC_MODE mode)
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    double Ecomp = get_compensated_voltage_in_pu();
-    double Vref = get_voltage_reference_in_pu();
-    double Vs = get_stabilizing_signal_in_pu();
-
-    double input = Vref-Ecomp;
-    sensor.set_input(input);
-    sensor.run(mode);
-
-    input = sensor.get_output()+Vs-feedbacker.get_output();
-    regulator.set_input(input);
-    regulator.run(mode);
-
-    input = Efd0+regulator.get_output();
-    double VAmax = get_VAmax_in_pu();
-    double VAmin = get_VAmin_in_pu();
-    if(input>VAmax) input = VAmax;
-    if(input<VAmin) input = VAmin;
-
-    exciter.set_input(input);
-    exciter.run(mode);
-
-    double Efd = get_excitation_voltage_in_pu();
-
-    feedbacker.set_input(Efd);
-    feedbacker.run(mode);
-    //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
-
-    if(mode == UPDATE_MODE)
-        set_flag_model_updated_as_true();
+    if(generator!=NULL)
+    {
+        double Ecomp = get_compensated_voltage_in_pu();
+        double Vref = get_voltage_reference_in_pu();
+        double Vs = get_stabilizing_signal_in_pu();
+
+        double input = Vref-Ecomp;
+        sensor.set_input(input);
+        sensor.run(mode);
+
+        input = sensor.get_output()+Vs-feedbacker.get_output();
+        regulator.set_input(input);
+        regulator.run(mode);
+
+        input = Efd0+regulator.get_output();
+        double VAmax = get_VAmax_in_pu();
+        double VAmin = get_VAmin_in_pu();
+        if(input>VAmax) input = VAmax;
+        if(input<VAmin) input = VAmin;
+
+        exciter.set_input(input);
+        exciter.run(mode);
+
+        double Efd = get_excitation_voltage_in_pu();
+
+        feedbacker.set_input(Efd);
+        feedbacker.run(mode);
+        //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
+
+        if(mode == UPDATE_MODE)
+            set_flag_model_updated_as_true();
+    }
 }
 
 double PSASPE1::get_excitation_voltage_in_pu() const
diff --git a/code/source/model/sg_models/exciter_model/PSASPE13.cpp b/code/source/model/sg_models/exciter_model/PSASPE13.cpp
index 401c4655..c7281fcc 100644
--- a/code/source/model/sg_models/exciter_model/PSASPE13.cpp
+++ b/code/source/model/sg_models/exciter_model/PSASPE13.cpp
@@ -208,47 +208,51 @@ double PSASPE13::get_KC() const
 bool PSASPE13::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<17)
+    if(data.size()>=17)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t i=3;
+            double tr = get_double_data(data[i],"0.0"); i++;
+            double vimax = get_double_data(data[i],"0.0"); i++;
+            double vimin = get_double_data(data[i],"0.0"); i++;
+            double tc = get_double_data(data[i],"0.0"); i++;
+            double tb = get_double_data(data[i],"0.0"); i++;
+            double ka = get_double_data(data[i],"0.0"); i++;
+            double ta = get_double_data(data[i],"0.0"); i++;
+            double vrmax = get_double_data(data[i],"0.0"); i++;
+            double vrmin = get_double_data(data[i],"0.0"); i++;
+            double kf = get_double_data(data[i],"0.0"); i++;
+            double tf = get_double_data(data[i],"0.0"); i++;
+            double efdmax = get_double_data(data[i],"0.0"); i++;
+            double efdmin = get_double_data(data[i],"0.0"); i++;
+            double kc = get_double_data(data[i],"0.0"); i++;
+
+            set_TR_in_s(tr);
+            set_VImax_in_pu(vimax);
+            set_VImin_in_pu(vimin);
+            set_TC_in_s(tc);
+            set_TB_in_s(tb);
+            set_KA(ka);
+            set_TA_in_s(ta);
+            set_VRmax_in_pu(vrmax);
+            set_VRmin_in_pu(vrmin);
+            set_KF(kf);
+            set_TF_in_s(tf);
+            set_Efdmax_in_pu(efdmax);
+            set_Efdmax_in_pu(efdmin);
+            set_KC(kc);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    size_t i=3;
-    double tr = get_double_data(data[i],"0.0"); i++;
-    double vimax = get_double_data(data[i],"0.0"); i++;
-    double vimin = get_double_data(data[i],"0.0"); i++;
-    double tc = get_double_data(data[i],"0.0"); i++;
-    double tb = get_double_data(data[i],"0.0"); i++;
-    double ka = get_double_data(data[i],"0.0"); i++;
-    double ta = get_double_data(data[i],"0.0"); i++;
-    double vrmax = get_double_data(data[i],"0.0"); i++;
-    double vrmin = get_double_data(data[i],"0.0"); i++;
-    double kf = get_double_data(data[i],"0.0"); i++;
-    double tf = get_double_data(data[i],"0.0"); i++;
-    double efdmax = get_double_data(data[i],"0.0"); i++;
-    double efdmin = get_double_data(data[i],"0.0"); i++;
-    double kc = get_double_data(data[i],"0.0"); i++;
-
-    set_TR_in_s(tr);
-    set_VImax_in_pu(vimax);
-    set_VImin_in_pu(vimin);
-    set_TC_in_s(tc);
-    set_TB_in_s(tb);
-    set_KA(ka);
-    set_TA_in_s(ta);
-    set_VRmax_in_pu(vrmax);
-    set_VRmin_in_pu(vrmin);
-    set_KF(kf);
-    set_TF_in_s(tf);
-    set_Efdmax_in_pu(efdmax);
-    set_Efdmax_in_pu(efdmin);
-    set_KC(kc);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool PSASPE13::setup_model_with_psse_string(string data)
@@ -278,106 +282,110 @@ void PSASPE13::set_block_toolkit()
 
 void PSASPE13::initialize()
 {
-    if(is_model_initialized())
-        return;
+    if(not is_model_initialized())
+    {
+        GENERATOR* generator = get_generator_pointer();
+        if(generator!=NULL)
+        {
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
 
-    GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
+                set_block_toolkit();
 
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
+                double Ecomp = get_compensated_voltage_in_pu();
+                double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
 
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
+                regulator.set_output(Efd);
+                regulator.initialize();
+                double output = regulator.get_input();
 
-    set_block_toolkit();
+                feedbacker.set_input(Efd);
+                feedbacker.initialize();
 
-    double Ecomp = get_compensated_voltage_in_pu();
-    double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
+                tuner.set_output(output);
+                tuner.initialize();
 
-    regulator.set_output(Efd);
-    regulator.initialize();
-    double output = regulator.get_input();
+                sensor.set_output(Ecomp);
+                sensor.initialize();
 
-    feedbacker.set_input(Efd);
-    feedbacker.initialize();
+                double Vref = Ecomp+tuner.get_input();
 
-    tuner.set_output(output);
-    tuner.initialize();
+                set_voltage_reference_in_pu(Vref);
 
-    sensor.set_output(Ecomp);
-    sensor.initialize();
-
-    double Vref = Ecomp+tuner.get_input();
-
-    set_voltage_reference_in_pu(Vref);
-
-    set_flag_model_initialized_as_true();
+                set_flag_model_initialized_as_true();
+            }
+        }
+    }
 }
 
 void PSASPE13::run(DYNAMIC_MODE mode)
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
+    if(generator!=NULL)
+    {
+        double Ecomp = get_compensated_voltage_in_pu();
+        double Vref = get_voltage_reference_in_pu();
+        double Vs = get_stabilizing_signal_in_pu();
 
-    double Ecomp = get_compensated_voltage_in_pu();
-    double Vref = get_voltage_reference_in_pu();
-    double Vs = get_stabilizing_signal_in_pu();
+        sensor.set_input(Ecomp);
+        sensor.run(mode);
 
-    sensor.set_input(Ecomp);
-    sensor.run(mode);
+        double input = Vref-sensor.get_output()+Vs+feedbacker.get_output();
+        double VImax = get_VImax_in_pu();
+        double VImin = get_VImin_in_pu();
+        if(input>VImax) input = VImax;
+        if(input<VImin) input = VImin;
 
-    double input = Vref-sensor.get_output()+Vs+feedbacker.get_output();
-    double VImax = get_VImax_in_pu();
-    double VImin = get_VImin_in_pu();
-    if(input>VImax) input = VImax;
-    if(input<VImin) input = VImin;
+        tuner.set_input(input);
+        tuner.run(mode);
 
-    tuner.set_input(input);
-    tuner.run(mode);
+        regulator.set_input(tuner.get_output());
+        regulator.run(mode);
 
-    regulator.set_input(tuner.get_output());
-    regulator.run(mode);
+        feedbacker.set_input(regulator.get_output());
+        feedbacker.run(mode);
+        //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
 
-    feedbacker.set_input(regulator.get_output());
-    feedbacker.run(mode);
-    //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
-
-    if(mode == UPDATE_MODE)
-        set_flag_model_updated_as_true();
+        if(mode == UPDATE_MODE)
+            set_flag_model_updated_as_true();
+    }
 }
 
 double PSASPE13::get_excitation_voltage_in_pu() const
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
+    if(generator!=NULL)
+    {
+        SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+        if(gen_model!=NULL)
+        {
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            size_t bus = generator->get_generator_bus();
+            double Vt = psdb.get_bus_voltage_in_pu(bus);
+            double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
+
+            double Efd = regulator.get_output();
+            double Efdmax = get_Efdmax_in_pu();
+            double Efdmin = get_Efdmin_in_pu();
+            double KC = get_KC();
+
+            Efdmax = Vt*Efdmax-KC*Ifd;
+            Efdmin= Vt*Efdmin-KC*Ifd;
+
+            if(Efd>Efdmax) Efd = Efdmax;
+            if(Efd<Efdmin) Efd = Efdmin;
+
+            return Efd;
+        }
+        else
+            return 0.0;
+    }
+    else
         return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    size_t bus = generator->get_generator_bus();
-    double Vt = psdb.get_bus_voltage_in_pu(bus);
-    double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
-
-    double Efd = regulator.get_output();
-    double Efdmax = get_Efdmax_in_pu();
-    double Efdmin = get_Efdmin_in_pu();
-    double KC = get_KC();
-
-    Efdmax = Vt*Efdmax-KC*Ifd;
-    Efdmin= Vt*Efdmin-KC*Ifd;
-
-    if(Efd>Efdmax) Efd = Efdmax;
-    if(Efd<Efdmin) Efd = Efdmin;
-
-    return Efd;
 }
 void PSASPE13::check()
 {
diff --git a/code/source/model/sg_models/exciter_model/PSASPE14.cpp b/code/source/model/sg_models/exciter_model/PSASPE14.cpp
index 0db6961f..f3e2e4ef 100644
--- a/code/source/model/sg_models/exciter_model/PSASPE14.cpp
+++ b/code/source/model/sg_models/exciter_model/PSASPE14.cpp
@@ -261,33 +261,36 @@ double PSASPE14::get_Kc() const
 bool PSASPE14::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<17)
+    if(data.size()>=17)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t i=3;
+            double tr = get_double_data(data[i],"0.0"); i++;
+            double vimax = get_double_data(data[i],"0.0"); i++;
+            double vimin = get_double_data(data[i],"0.0"); i++;
+            double tc = get_double_data(data[i],"0.0"); i++;
+            double tb = get_double_data(data[i],"0.0"); i++;
+            double ka = get_double_data(data[i],"0.0"); i++;
+            double ta = get_double_data(data[i],"0.0"); i++;
+            double vrmax = get_double_data(data[i],"0.0"); i++;
+            double vrmin = get_double_data(data[i],"0.0"); i++;
+            double kf = get_double_data(data[i],"0.0"); i++;
+            double tf = get_double_data(data[i],"0.0"); i++;
+            double efdmax = get_double_data(data[i],"0.0"); i++;
+            double efdmin = get_double_data(data[i],"0.0"); i++;
+            double kc = get_double_data(data[i],"0.0"); i++;
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    size_t i=3;
-    double tr = get_double_data(data[i],"0.0"); i++;
-    double vimax = get_double_data(data[i],"0.0"); i++;
-    double vimin = get_double_data(data[i],"0.0"); i++;
-    double tc = get_double_data(data[i],"0.0"); i++;
-    double tb = get_double_data(data[i],"0.0"); i++;
-    double ka = get_double_data(data[i],"0.0"); i++;
-    double ta = get_double_data(data[i],"0.0"); i++;
-    double vrmax = get_double_data(data[i],"0.0"); i++;
-    double vrmin = get_double_data(data[i],"0.0"); i++;
-    double kf = get_double_data(data[i],"0.0"); i++;
-    double tf = get_double_data(data[i],"0.0"); i++;
-    double efdmax = get_double_data(data[i],"0.0"); i++;
-    double efdmin = get_double_data(data[i],"0.0"); i++;
-    double kc = get_double_data(data[i],"0.0"); i++;
-
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool PSASPE14::setup_model_with_psse_string(string data)
@@ -319,67 +322,71 @@ void PSASPE14::set_block_toolkit()
 
 void PSASPE14::initialize()
 {
-    if(is_model_initialized())
-        return;
-
-    GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
+    if(not is_model_initialized())
+    {
+        GENERATOR* generator = get_generator_pointer();
+        if(generator!=NULL)
+        {
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
 
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
+                set_block_toolkit();
 
-    set_block_toolkit();
+                double Ecomp = get_compensated_voltage_in_pu();
+                double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
 
-    double Ecomp = get_compensated_voltage_in_pu();
-    double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
+                regulator.set_output(Efd);
+                regulator.initialize();
+                double output = regulator.get_input();
 
-    regulator.set_output(Efd);
-    regulator.initialize();
-    double output = regulator.get_input();
-
-    set_flag_model_initialized_as_true();
+                set_flag_model_initialized_as_true();
+            }
+        }
+    }
 }
 
 void PSASPE14::run(DYNAMIC_MODE mode)
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    double Ecomp = get_compensated_voltage_in_pu();
-    double Vref = get_voltage_reference_in_pu();
-    double Vs = get_stabilizing_signal_in_pu();
+    if(generator!=NULL)
+    {
+        double Ecomp = get_compensated_voltage_in_pu();
+        double Vref = get_voltage_reference_in_pu();
+        double Vs = get_stabilizing_signal_in_pu();
 
-    //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
+        //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
 
-    if(mode == UPDATE_MODE)
-        set_flag_model_updated_as_true();
+        if(mode == UPDATE_MODE)
+            set_flag_model_updated_as_true();
+    }
 }
 
 double PSASPE14::get_excitation_voltage_in_pu() const
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
+    if(generator!=NULL)
+    {
+        SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+        if(gen_model!=NULL)
+        {
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            size_t bus = generator->get_generator_bus();
+            double Vt = psdb.get_bus_voltage_in_pu(bus);
+            double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
+
+            return 0.0;
+        }
+        else
+            return 0.0;
+    }
+    else
         return 0.0;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    size_t bus = generator->get_generator_bus();
-    double Vt = psdb.get_bus_voltage_in_pu(bus);
-    double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
-
-
-    return 0.0;
 }
+
 void PSASPE14::check()
 {
     ;
diff --git a/code/source/model/sg_models/exciter_model/PSASPE2.cpp b/code/source/model/sg_models/exciter_model/PSASPE2.cpp
index adc43ec1..642dd1a1 100644
--- a/code/source/model/sg_models/exciter_model/PSASPE2.cpp
+++ b/code/source/model/sg_models/exciter_model/PSASPE2.cpp
@@ -230,54 +230,57 @@ double PSASPE2::get_Ke() const
 bool PSASPE2::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<19)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=19)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double kr, tr, k2, t1, t2, t3, t4, ka, ta, efdmax, efdmin, vta, vtb, kpt, kit, ke;
+
+            size_t i=3;
+            kr = get_double_data(data[i],"1.0"); i++;
+            tr = get_double_data(data[i],"0.0"); i++;
+            k2 = get_double_data(data[i],"0.0"); i++;
+            t1 = get_double_data(data[i],"0.0"); i++;
+            t2 = get_double_data(data[i],"0.0"); i++;
+            t3 = get_double_data(data[i],"0.0"); i++;
+            t4 = get_double_data(data[i],"0.0"); i++;
+            ka = get_double_data(data[i],"0.0"); i++;
+            ta = get_double_data(data[i],"0.0"); i++;
+            efdmax = get_double_data(data[i],"0.0"); i++;
+            efdmin = get_double_data(data[i],"0.0"); i++;
+            vta = get_double_data(data[i],"0.0"); i++;
+            vtb = get_double_data(data[i],"0.0"); i++;
+            kpt = get_double_data(data[i],"0.0"); i++;
+            kit = get_double_data(data[i],"0.0"); i++;
+            ke = get_double_data(data[i],"0.0"); i++;
+
+            set_KR(kr);
+            set_TR_in_s(tr);
+            set_K2(k2);
+            set_T1_in_s(t1);
+            set_T2_in_s(t2);
+            set_T3_in_s(t3);
+            set_T4_in_s(t4);
+            set_KA(ka);
+            set_TA_in_s(ta);
+            set_Efdmax_in_pu(efdmax);
+            set_Efdmax_in_pu(efdmin);
+            set_Vta_in_pu(vta);
+            set_Vtb_in_pu(vtb);
+            set_Kpt(kpt);
+            set_Kit(kit);
+            set_Ke(ke);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-
-    double kr, tr, k2, t1, t2, t3, t4, ka, ta, efdmax, efdmin, vta, vtb, kpt, kit, ke;
-
-    size_t i=3;
-    kr = get_double_data(data[i],"1.0"); i++;
-    tr = get_double_data(data[i],"0.0"); i++;
-    k2 = get_double_data(data[i],"0.0"); i++;
-    t1 = get_double_data(data[i],"0.0"); i++;
-    t2 = get_double_data(data[i],"0.0"); i++;
-    t3 = get_double_data(data[i],"0.0"); i++;
-    t4 = get_double_data(data[i],"0.0"); i++;
-    ka = get_double_data(data[i],"0.0"); i++;
-    ta = get_double_data(data[i],"0.0"); i++;
-    efdmax = get_double_data(data[i],"0.0"); i++;
-    efdmin = get_double_data(data[i],"0.0"); i++;
-    vta = get_double_data(data[i],"0.0"); i++;
-    vtb = get_double_data(data[i],"0.0"); i++;
-    kpt = get_double_data(data[i],"0.0"); i++;
-    kit = get_double_data(data[i],"0.0"); i++;
-    ke = get_double_data(data[i],"0.0"); i++;
-
-    set_KR(kr);
-    set_TR_in_s(tr);
-    set_K2(k2);
-    set_T1_in_s(t1);
-    set_T2_in_s(t2);
-    set_T3_in_s(t3);
-    set_T4_in_s(t4);
-    set_KA(ka);
-    set_TA_in_s(ta);
-    set_Efdmax_in_pu(efdmax);
-    set_Efdmax_in_pu(efdmin);
-    set_Vta_in_pu(vta);
-    set_Vtb_in_pu(vtb);
-    set_Kpt(kpt);
-    set_Kit(kit);
-    set_Ke(ke);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool PSASPE2::setup_model_with_psse_string(string data)
@@ -308,135 +311,139 @@ void PSASPE2::set_block_toolkit()
 
 void PSASPE2::initialize()
 {
-    if(is_model_initialized())
-        return;
-
-    GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
+    if(not is_model_initialized())
+    {
+        GENERATOR* generator = get_generator_pointer();
+        if(generator!=NULL)
+        {
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
 
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
+                set_block_toolkit();
 
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
+                STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    set_block_toolkit();
+                double Ecomp = get_compensated_voltage_in_pu();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+                set_voltage_reference_in_pu(Ecomp);
 
-    double Ecomp = get_compensated_voltage_in_pu();
+                sensor.set_output(0.0);
+                sensor.initialize();
 
-    set_voltage_reference_in_pu(Ecomp);
+                if(get_K2()==true)
+                {
+                    tuner1_lead_lag.set_output(0.0);
+                    tuner1_lead_lag.initialize();
+                }
+                else
+                {
+                    tuner1_pi.set_output(0.0);
+                    tuner1_pi.initialize();
+                }
 
-    sensor.set_output(0.0);
-    sensor.initialize();
+                tuner2.set_output(0.0);
+                tuner2.initialize();
 
-    if(get_K2()==true)
-    {
-        tuner1_lead_lag.set_output(0.0);
-        tuner1_lead_lag.initialize();
-    }
-    else
-    {
-        tuner1_pi.set_output(0.0);
-        tuner1_pi.initialize();
-    }
-
-    tuner2.set_output(0.0);
-    tuner2.initialize();
+                regulator.set_output(0.0);
+                regulator.initialize();
 
-    regulator.set_output(0.0);
-    regulator.initialize();
+                double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
+                this->Efd0 = Efd;
 
-    double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
-    this->Efd0 = Efd;
+                POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+                size_t bus = generator->get_generator_bus();
+                this->Vt0 = psdb.get_bus_voltage_in_pu(bus);
 
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    size_t bus = generator->get_generator_bus();
-    this->Vt0 = psdb.get_bus_voltage_in_pu(bus);
-
-    set_flag_model_initialized_as_true();
+                set_flag_model_initialized_as_true();
+            }
+        }
+    }
 }
 
 void PSASPE2::run(DYNAMIC_MODE mode)
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    double Ecomp = get_compensated_voltage_in_pu();
-    double Vref = get_voltage_reference_in_pu();
-    double Vs = get_stabilizing_signal_in_pu();
+    if(generator!=NULL)
+    {
+        double Ecomp = get_compensated_voltage_in_pu();
+        double Vref = get_voltage_reference_in_pu();
+        double Vs = get_stabilizing_signal_in_pu();
 
-    double input = Vref-Ecomp+Vs;
-    sensor.set_input(input);
-    sensor.run(mode);
+        double input = Vref-Ecomp+Vs;
+        sensor.set_input(input);
+        sensor.run(mode);
 
-    input = sensor.get_output();
-    if(get_K2()==true)
-    {
-        tuner1_lead_lag.set_input(input);
-        tuner1_lead_lag.run(mode);
-        input = tuner1_lead_lag.get_output();
-    }
-    else
-    {
-        tuner1_pi.set_input(input);
-        tuner1_pi.run(mode);
-        input = tuner1_pi.get_output();
-    }
+        input = sensor.get_output();
+        if(get_K2()==true)
+        {
+            tuner1_lead_lag.set_input(input);
+            tuner1_lead_lag.run(mode);
+            input = tuner1_lead_lag.get_output();
+        }
+        else
+        {
+            tuner1_pi.set_input(input);
+            tuner1_pi.run(mode);
+            input = tuner1_pi.get_output();
+        }
 
-    tuner2.set_input(input);
-    tuner2.run(mode);
+        tuner2.set_input(input);
+        tuner2.run(mode);
 
-    input = tuner2.get_output();
-    regulator.set_input(input);
-    regulator.run(mode);
+        input = tuner2.get_output();
+        regulator.set_input(input);
+        regulator.run(mode);
 
-    //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
+        //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
 
-    if(mode == UPDATE_MODE)
-        set_flag_model_updated_as_true();
+        if(mode == UPDATE_MODE)
+            set_flag_model_updated_as_true();
+    }
 }
 
 double PSASPE2::get_excitation_voltage_in_pu() const
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return 0.0;
+    if(generator!=NULL)
+    {
+        SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+        if(gen_model!=NULL)
+        {
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            size_t bus = generator->get_generator_bus();
+            complex<double> Vt = psdb.get_bus_complex_voltage_in_pu(bus);
+            complex<double> It = gen_model->get_terminal_complex_current_in_pu_in_xy_axis_based_on_mbase();
+            double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    size_t bus = generator->get_generator_bus();
-    complex<double> Vt = psdb.get_bus_complex_voltage_in_pu(bus);
-    complex<double> It = gen_model->get_terminal_complex_current_in_pu_in_xy_axis_based_on_mbase();
-    double Ifd = gen_model->get_field_current_in_pu_based_on_mbase();
+            double Efdmax = get_Efdmax_in_pu();
+            double Efdmin = get_Efdmin_in_pu();
 
-    double Efdmax = get_Efdmax_in_pu();
-    double Efdmin = get_Efdmin_in_pu();
+            double Vta = get_Vta_in_pu(), Vtb = get_Vtb_in_pu();
+            double Kv1 = 1.0/(Vt0*Vta), Kv2 = 1.0/(Vt0/Vtb);
 
-    double Vta = get_Vta_in_pu(), Vtb = get_Vtb_in_pu();
-    double Kv1 = 1.0/(Vt0*Vta), Kv2 = 1.0/(Vt0/Vtb);
+            double Kpt = get_Kpt(), Kit = get_Kit(), Ke = get_Ke();
+            complex<double> imag_1(0.0, 1.0);
 
-    double Kpt = get_Kpt(), Kit = get_Kit(), Ke = get_Ke();
-    complex<double> imag_1(0.0, 1.0);
+            double scale = abs(Kpt*Vt + imag_1*Kit*It);
+            Efdmax = Kv1*scale*Efdmax - Ke*Ifd;
+            Efdmin = Kv2*scale*Efdmin - Ke*Ifd;
 
-    double scale = abs(Kpt*Vt + imag_1*Kit*It);
-    Efdmax = Kv1*scale*Efdmax - Ke*Ifd;
-    Efdmin = Kv2*scale*Efdmin - Ke*Ifd;
+            double Efd = Efd0 + regulator.get_output();
 
-    double Efd = Efd0 + regulator.get_output();
+            if(Efd>Efdmax) Efd = Efdmax;
+            if(Efd<Efdmin) Efd = Efdmin;
 
-    if(Efd>Efdmax) Efd = Efdmax;
-    if(Efd<Efdmin) Efd = Efdmin;
-
-    return Efd;
+            return Efd;
+        }
+        else
+            return 0.0;
+    }
+    else
+        return 0.0;
 }
 void PSASPE2::check()
 {
diff --git a/code/source/model/sg_models/exciter_model/SEXS.cpp b/code/source/model/sg_models/exciter_model/SEXS.cpp
index b343768c..3e85136e 100644
--- a/code/source/model/sg_models/exciter_model/SEXS.cpp
+++ b/code/source/model/sg_models/exciter_model/SEXS.cpp
@@ -122,35 +122,38 @@ double SEXS::get_Efdmin_in_pu() const
 bool SEXS::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<8)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=8)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double ta_over_tb, ta, tb, k, te, emax, emin;
+
+            size_t i=3;
+            ta_over_tb = get_double_data(data[i],"0.0"); i++;
+            tb = get_double_data(data[i],"0.0"); i++;
+            k = get_double_data(data[i],"0.0"); i++;
+            te = get_double_data(data[i],"0.0"); i++;
+            emin = get_double_data(data[i],"0.0"); i++;
+            emax = get_double_data(data[i],"0.0"); i++;
+            ta = ta_over_tb*tb;
+
+            set_TA_in_s(ta);
+            set_TB_in_s(tb);
+            set_K(k);
+            set_TE_in_s(te);
+            set_Efdmin_in_pu(emin);
+            set_Efdmax_in_pu(emax);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-
-    double ta_over_tb, ta, tb, k, te, emax, emin;
-
-    size_t i=3;
-    ta_over_tb = get_double_data(data[i],"0.0"); i++;
-    tb = get_double_data(data[i],"0.0"); i++;
-    k = get_double_data(data[i],"0.0"); i++;
-    te = get_double_data(data[i],"0.0"); i++;
-    emin = get_double_data(data[i],"0.0"); i++;
-    emax = get_double_data(data[i],"0.0"); i++;
-    ta = ta_over_tb*tb;
-
-    set_TA_in_s(ta);
-    set_TB_in_s(tb);
-    set_K(k);
-    set_TE_in_s(te);
-    set_Efdmin_in_pu(emin);
-    set_Efdmax_in_pu(emax);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool SEXS::setup_model_with_psse_string(string data)
@@ -179,77 +182,78 @@ void SEXS::set_block_toolkit()
 void SEXS::initialize()
 {
     ostringstream osstream;
-    if(is_model_initialized())
-        return;
-
-    GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
-
-    set_block_toolkit();
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    double Ecomp = get_compensated_voltage_in_pu();
-
-    double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
-
-    if(Efd>get_Efdmax_in_pu())
-    {
-        osstream<<"Initialization error. Efd of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"Efd is "<<Efd<<", and Efdmax is "<<get_Efdmax_in_pu()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    if(Efd<get_Efdmin_in_pu())
+    if(not is_model_initialized())
     {
-        osstream<<"Initialization error. Efd of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-          <<"Efd is "<<Efd<<", and Efdmin is "<<get_Efdmin_in_pu()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        GENERATOR* generator = get_generator_pointer();
+        if(generator!=NULL)
+        {
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
+
+                set_block_toolkit();
+
+                STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+
+                double Ecomp = get_compensated_voltage_in_pu();
+
+                double Efd =  get_initial_excitation_voltage_in_pu_from_sync_generator_model();
+
+                if(Efd>get_Efdmax_in_pu())
+                {
+                    osstream<<"Initialization error. Efd of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                      <<"Efd is "<<Efd<<", and Efdmax is "<<get_Efdmax_in_pu()<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                if(Efd<get_Efdmin_in_pu())
+                {
+                    osstream<<"Initialization error. Efd of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                      <<"Efd is "<<Efd<<", and Efdmin is "<<get_Efdmin_in_pu()<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                exciter.set_output(Efd);
+                exciter.initialize();
+
+                double input = exciter.get_input();
+                phase_tuner.set_output(input);
+                phase_tuner.initialize();
+
+                input = phase_tuner.get_input();
+
+                double Vref = input+Ecomp;
+                set_voltage_reference_in_pu(Vref);
+
+                set_flag_model_initialized_as_true();
+            }
+        }
     }
-    exciter.set_output(Efd);
-    exciter.initialize();
-
-    double input = exciter.get_input();
-    phase_tuner.set_output(input);
-    phase_tuner.initialize();
-
-    input = phase_tuner.get_input();
-
-    double Vref = input+Ecomp;
-    set_voltage_reference_in_pu(Vref);
-
-    set_flag_model_initialized_as_true();
 }
 
 void SEXS::run(DYNAMIC_MODE mode)
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    double Ecomp = get_compensated_voltage_in_pu();
-    double Vref = get_voltage_reference_in_pu();
-    double Vs = get_stabilizing_signal_in_pu();
+    if(generator!=NULL)
+    {
+        double Ecomp = get_compensated_voltage_in_pu();
+        double Vref = get_voltage_reference_in_pu();
+        double Vs = get_stabilizing_signal_in_pu();
 
-    double input = Vref-Ecomp+Vs;
+        double input = Vref-Ecomp+Vs;
 
-    phase_tuner.set_input(input);
-    phase_tuner.run(mode);
+        phase_tuner.set_input(input);
+        phase_tuner.run(mode);
 
-    input = phase_tuner.get_output();
-    exciter.set_input(input);
-    exciter.run(mode);
+        input = phase_tuner.get_output();
+        exciter.set_input(input);
+        exciter.run(mode);
 
-    //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
+        //cout<<"Ecomp="<<Ecomp<<", Vref="<<Vref<<", Vs="<<Vs<<", Efd="<<exciter.get_output()<<endl;
 
-    if(mode == UPDATE_MODE)
-        set_flag_model_updated_as_true();
+        if(mode == UPDATE_MODE)
+            set_flag_model_updated_as_true();
+    }
 }
 
 double SEXS::get_excitation_voltage_in_pu() const
diff --git a/code/source/model/sg_models/exciter_model/exciter_model.cpp b/code/source/model/sg_models/exciter_model/exciter_model.cpp
index ccf55561..51fa6b02 100644
--- a/code/source/model/sg_models/exciter_model/exciter_model.cpp
+++ b/code/source/model/sg_models/exciter_model/exciter_model.cpp
@@ -45,18 +45,19 @@ double EXCITER_MODEL::get_compensated_voltage_in_pu() const
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-    COMPENSATOR_MODEL* comp_model = generator->get_compensator_model();
-    if(comp_model==NULL)
+    if(generator!=NULL)
     {
-        size_t bus = generator->get_generator_bus();
-        return psdb.get_bus_voltage_in_pu(bus);
+        COMPENSATOR_MODEL* comp_model = generator->get_compensator_model();
+        if(comp_model!=NULL)
+            return comp_model->get_compensated_voltage_in_pu();
+        else
+        {
+            size_t bus = generator->get_generator_bus();
+            return psdb.get_bus_voltage_in_pu(bus);
+        }
     }
     else
-    {
-        return comp_model->get_compensated_voltage_in_pu();
-    }
+        return 0.0;
 }
 
 double EXCITER_MODEL::get_stabilizing_signal_in_pu() const
diff --git a/code/source/model/sg_models/sg_model.cpp b/code/source/model/sg_models/sg_model.cpp
index 18f99787..7e6c0a36 100644
--- a/code/source/model/sg_models/sg_model.cpp
+++ b/code/source/model/sg_models/sg_model.cpp
@@ -29,25 +29,29 @@ double SG_MODEL::get_mbase_in_MVA() const
 double SG_MODEL::get_bus_base_frequency_in_Hz() const
 {
     GENERATOR* gen = get_generator_pointer();
-    if(gen==NULL)
-        return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(gen!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    return psdb.get_bus_base_frequency_in_Hz(gen->get_generator_bus());
+        return psdb.get_bus_base_frequency_in_Hz(gen->get_generator_bus());
+    }
+    else
+        return 0.0;
 }
 
 complex<double> SG_MODEL::get_terminal_complex_voltage_in_pu() const
 {
     GENERATOR* gen = get_generator_pointer();
-    if(gen==NULL)
+    if(gen!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+
+        size_t bus = gen->get_generator_bus();
+        complex<double> Vxy = psdb.get_bus_complex_voltage_in_pu(bus);
+        return Vxy;
+    }
+    else
         return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    size_t bus = gen->get_generator_bus();
-    complex<double> Vxy = psdb.get_bus_complex_voltage_in_pu(bus);
-    return Vxy;
 }
diff --git a/code/source/model/sg_models/stabilizer_model/IEE2ST.cpp b/code/source/model/sg_models/stabilizer_model/IEE2ST.cpp
index 52a8759a..5d95b1b8 100644
--- a/code/source/model/sg_models/stabilizer_model/IEE2ST.cpp
+++ b/code/source/model/sg_models/stabilizer_model/IEE2ST.cpp
@@ -229,67 +229,71 @@ double IEE2ST::get_Vcmin() const
 bool IEE2ST::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<23)
-        is_successful = false;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    size_t signal_type[2], bus[2];
-    double k1, t1, k2, t2, t3, t4, t5, t6, t7, t8, t9, t10,
-           vsmax, vsmin, vcl, vcu;
-
-    size_t i=3;
-    signal_type[0] = get_integer_data(data[i],"0"); i++;
-    bus[0] = get_integer_data(data[i],"0"); i++;
-    signal_type[1] = get_integer_data(data[i],"0"); i++;
-    bus[1] = get_integer_data(data[i],"0"); i++;
-
-    for(size_t i=0; i<2; ++i)
+    if(data.size()>=23)
     {
-        SIGNAL signal = prepare_signal_with_signal_type_and_bus(signal_type[i], bus[i]);
-        if(signal.is_valid())
-            set_input_signal_at_slot(i, signal);
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t signal_type[2], bus[2];
+            double k1, t1, k2, t2, t3, t4, t5, t6, t7, t8, t9, t10,
+                   vsmax, vsmin, vcl, vcu;
+
+            size_t i=3;
+            signal_type[0] = get_integer_data(data[i],"0"); i++;
+            bus[0] = get_integer_data(data[i],"0"); i++;
+            signal_type[1] = get_integer_data(data[i],"0"); i++;
+            bus[1] = get_integer_data(data[i],"0"); i++;
+
+            for(size_t i=0; i<2; ++i)
+            {
+                SIGNAL signal = prepare_signal_with_signal_type_and_bus(signal_type[i], bus[i]);
+                if(signal.is_valid())
+                    set_input_signal_at_slot(i, signal);
+            }
+
+            k1 = get_double_data(data[i],"0.0"); i++;
+            k2 = get_double_data(data[i],"0.0"); i++;
+            t1 = get_double_data(data[i],"0.0"); i++;
+            t2 = get_double_data(data[i],"0.0"); i++;
+            t3 = get_double_data(data[i],"0.0"); i++;
+            t4 = get_double_data(data[i],"0.0"); i++;
+            t5 = get_double_data(data[i],"0.0"); i++;
+            t6 = get_double_data(data[i],"0.0"); i++;
+            t7 = get_double_data(data[i],"0.0"); i++;
+            t8 = get_double_data(data[i],"0.0"); i++;
+            t9 = get_double_data(data[i],"0.0"); i++;
+            t10 = get_double_data(data[i],"0.0"); i++;
+            vsmax = get_double_data(data[i],"0.0"); i++;
+            vsmin = get_double_data(data[i],"0.0"); i++;
+            vcu = get_double_data(data[i],"0.0"); i++;
+            vcl = get_double_data(data[i],"0.0"); i++;
+
+            set_K1(k1);
+            set_K2(k2);
+            set_T1_in_s(t1);
+            set_T2_in_s(t2);
+            set_T3_in_s(t3);
+            set_T4_in_s(t4);
+            set_T5_in_s(t5);
+            set_T6_in_s(t6);
+            set_T7_in_s(t7);
+            set_T8_in_s(t8);
+            set_T9_in_s(t9);
+            set_T10_in_s(t10);
+            set_Vsmax(vsmax);
+            set_Vsmin(vsmin);
+            set_Vcmax(vcu);
+            set_Vcmin(vcl);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
     }
-
-    k1 = get_double_data(data[i],"0.0"); i++;
-    k2 = get_double_data(data[i],"0.0"); i++;
-    t1 = get_double_data(data[i],"0.0"); i++;
-    t2 = get_double_data(data[i],"0.0"); i++;
-    t3 = get_double_data(data[i],"0.0"); i++;
-    t4 = get_double_data(data[i],"0.0"); i++;
-    t5 = get_double_data(data[i],"0.0"); i++;
-    t6 = get_double_data(data[i],"0.0"); i++;
-    t7 = get_double_data(data[i],"0.0"); i++;
-    t8 = get_double_data(data[i],"0.0"); i++;
-    t9 = get_double_data(data[i],"0.0"); i++;
-    t10 = get_double_data(data[i],"0.0"); i++;
-    vsmax = get_double_data(data[i],"0.0"); i++;
-    vsmin = get_double_data(data[i],"0.0"); i++;
-    vcu = get_double_data(data[i],"0.0"); i++;
-    vcl = get_double_data(data[i],"0.0"); i++;
-
-    set_K1(k1);
-    set_K2(k2);
-    set_T1_in_s(t1);
-    set_T2_in_s(t2);
-    set_T3_in_s(t3);
-    set_T4_in_s(t4);
-    set_T5_in_s(t5);
-    set_T6_in_s(t6);
-    set_T7_in_s(t7);
-    set_T8_in_s(t8);
-    set_T9_in_s(t9);
-    set_T10_in_s(t10);
-    set_Vsmax(vsmax);
-    set_Vsmin(vsmin);
-    set_Vcmax(vcu);
-    set_Vcmin(vcl);
-
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool IEE2ST::setup_model_with_psse_string(string data)
@@ -325,107 +329,105 @@ void IEE2ST::initialize()
     ostringstream osstream;
 
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
+    if(generator!=NULL)
     {
-        deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
+        EXCITER_MODEL* exciter = generator->get_exciter_model();
+        if(exciter!=NULL)
+        {
+            if(not exciter->is_model_initialized())
+                exciter->initialize();
+
+            set_block_toolkit();
+
+            phase_tuner_3.set_output(0.0);
+            phase_tuner_3.initialize();
+
+            phase_tuner_2.set_output(0.0);
+            phase_tuner_2.initialize();
+
+            phase_tuner_1.set_output(0.0);
+            phase_tuner_1.initialize();
+
+            double value_slot_1 = get_signal_value_of_slot(0);
+            double value_slot_2 = get_signal_value_of_slot(1);
+            double value_sensor_1 = value_slot_1*get_K1();
+            double value_sensor_2 = value_slot_2*get_K2();
+
+            sensor_1.set_output(value_sensor_1);
+            sensor_1.initialize();
+
+            sensor_2.set_output(value_sensor_2);
+            sensor_2.initialize();
+
+            double value_sum = value_sensor_1 + value_sensor_2;
+
+            double T3 = get_T3_in_s();
+            if(T3>0.0)
+            {
+                filter.set_input(value_sum);
+                filter.initialize();
+            }
+            else
+            {
+                osstream<<"Initialization failed. T3<=0.0 in model "<<get_model_name()<<" of "
+                  <<get_generator_pointer()->get_device_name()<<" requires input signals with 0 steady state value."<<endl
+                  <<"However, "<<value_sum<<" is given. Check input signals in slots.";
+                alternative_filter.set_output(0.0);
+                alternative_filter.initialize();
+            }
+        }
+        else
+            deactivate_model();
     }
-
-    EXCITER_MODEL* exciter = generator->get_exciter_model();
-    if(exciter==NULL)
-    {
+    else
         deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
-    }
-    if(not exciter->is_model_initialized())
-        exciter->initialize();
-
-    set_block_toolkit();
-
-    phase_tuner_3.set_output(0.0);
-    phase_tuner_3.initialize();
-
-    phase_tuner_2.set_output(0.0);
-    phase_tuner_2.initialize();
-
-    phase_tuner_1.set_output(0.0);
-    phase_tuner_1.initialize();
-
-    double value_slot_1 = get_signal_value_of_slot(0);
-    double value_slot_2 = get_signal_value_of_slot(1);
-    double value_sensor_1 = value_slot_1*get_K1();
-    double value_sensor_2 = value_slot_2*get_K2();
 
-    sensor_1.set_output(value_sensor_1);
-    sensor_1.initialize();
-
-    sensor_2.set_output(value_sensor_2);
-    sensor_2.initialize();
-
-    double value_sum = value_sensor_1 + value_sensor_2;
-
-    double T3 = get_T3_in_s();
-    if(T3>0.0)
-    {
-        filter.set_input(value_sum);
-        filter.initialize();
-    }
-    else
-    {
-        osstream<<"Initialization failed. T3<=0.0 in model "<<get_model_name()<<" of "
-          <<get_generator_pointer()->get_device_name()<<" requires input signals with 0 steady state value."<<endl
-          <<"However, "<<value_sum<<" is given. Check input signals in slots.";
-        alternative_filter.set_output(0.0);
-        alternative_filter.initialize();
-    }
     set_flag_model_initialized_as_true();
 }
 
 void IEE2ST::run(DYNAMIC_MODE mode)
 {
-    if(not is_model_active())
-        return;
-
-    double value_slot_1 = get_signal_value_of_slot(0);
-    sensor_1.set_input(value_slot_1);
-    sensor_1.run(mode);
-    double output1 = sensor_1.get_output();
+    if(is_model_active())
+    {
+        double value_slot_1 = get_signal_value_of_slot(0);
+        sensor_1.set_input(value_slot_1);
+        sensor_1.run(mode);
+        double output1 = sensor_1.get_output();
 
-    double value_slot_2 = get_signal_value_of_slot(1);
-    sensor_2.set_input(value_slot_2);
-    sensor_2.run(mode);
-    double output2 = sensor_2.get_output();
+        double value_slot_2 = get_signal_value_of_slot(1);
+        sensor_2.set_input(value_slot_2);
+        sensor_2.run(mode);
+        double output2 = sensor_2.get_output();
 
-    double input = output1+output2;
-    double T3 = get_T3_in_s();
-    if(T3>0.0)
-    {
-        filter.set_input(input);
-        filter.run(mode);
-        input = filter.get_output();
-    }
-    else
-    {
-        alternative_filter.set_input(input);
-        alternative_filter.run(mode);
-        input = alternative_filter.get_output();
-    }
+        double input = output1+output2;
+        double T3 = get_T3_in_s();
+        if(T3>0.0)
+        {
+            filter.set_input(input);
+            filter.run(mode);
+            input = filter.get_output();
+        }
+        else
+        {
+            alternative_filter.set_input(input);
+            alternative_filter.run(mode);
+            input = alternative_filter.get_output();
+        }
 
-    phase_tuner_1.set_input(input);
-    phase_tuner_1.run(mode);
+        phase_tuner_1.set_input(input);
+        phase_tuner_1.run(mode);
 
-    input = phase_tuner_1.get_output();
-    phase_tuner_2.set_input(input);
-    phase_tuner_2.run(mode);
+        input = phase_tuner_1.get_output();
+        phase_tuner_2.set_input(input);
+        phase_tuner_2.run(mode);
 
-    input = phase_tuner_2.get_output();
-    phase_tuner_3.set_input(input);
-    phase_tuner_3.run(mode);
+        input = phase_tuner_2.get_output();
+        phase_tuner_3.set_input(input);
+        phase_tuner_3.run(mode);
 
-    if(mode==UPDATE_MODE)
-        set_flag_model_updated_as_true();
+        if(mode==UPDATE_MODE)
+            set_flag_model_updated_as_true();
+    }
 }
 
 double IEE2ST::get_stabilizing_signal_in_pu() const
diff --git a/code/source/model/sg_models/stabilizer_model/PSASPS1.cpp b/code/source/model/sg_models/stabilizer_model/PSASPS1.cpp
index 3cfca515..28bf987e 100644
--- a/code/source/model/sg_models/stabilizer_model/PSASPS1.cpp
+++ b/code/source/model/sg_models/stabilizer_model/PSASPS1.cpp
@@ -188,44 +188,48 @@ double PSASPS1::get_Vsmin() const
 bool PSASPS1::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<14)
-        is_successful = false;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=14)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t k;
+            double kq1, kq2, kq3, tq, t1e, t2e, t3e, t4e, vsmax, vsmin;
+
+            size_t i=3;
+            kq1 = get_double_data(data[i],"0.0"); i++;
+            kq2 = get_double_data(data[i],"0.0"); i++;
+            kq3 = get_double_data(data[i],"0.0"); i++;
+            k = get_integer_data(data[i],"0"); i++;
+            tq = get_double_data(data[i],"0.0"); i++;
+            t1e = get_double_data(data[i],"0.0"); i++;
+            t2e = get_double_data(data[i],"0.0"); i++;
+            t3e = get_double_data(data[i],"0.0"); i++;
+            t4e = get_double_data(data[i],"0.0"); i++;
+            vsmax = get_double_data(data[i],"0.0"); i++;
+            vsmin = get_double_data(data[i],"0.0"); i++;
+
+            set_Kq1(kq1);
+            set_Kq2(kq2);
+            set_Kq3(kq3);
+            set_K(k);
+            set_Tq_in_s(tq);
+            set_T1e_in_s(t1e);
+            set_T2e_in_s(t2e);
+            set_T3e_in_s(t3e);
+            set_T4e_in_s(t4e);
+            set_Vsmax(vsmax);
+            set_Vsmin(vsmin);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    size_t k;
-    double kq1, kq2, kq3, tq, t1e, t2e, t3e, t4e, vsmax, vsmin;
-
-    size_t i=3;
-    kq1 = get_double_data(data[i],"0.0"); i++;
-    kq2 = get_double_data(data[i],"0.0"); i++;
-    kq3 = get_double_data(data[i],"0.0"); i++;
-    k = get_integer_data(data[i],"0"); i++;
-    tq = get_double_data(data[i],"0.0"); i++;
-    t1e = get_double_data(data[i],"0.0"); i++;
-    t2e = get_double_data(data[i],"0.0"); i++;
-    t3e = get_double_data(data[i],"0.0"); i++;
-    t4e = get_double_data(data[i],"0.0"); i++;
-    vsmax = get_double_data(data[i],"0.0"); i++;
-    vsmin = get_double_data(data[i],"0.0"); i++;
-
-    set_Kq1(kq1);
-    set_Kq2(kq2);
-    set_Kq3(kq3);
-    set_K(k);
-    set_Tq_in_s(tq);
-    set_T1e_in_s(t1e);
-    set_T2e_in_s(t2e);
-    set_T3e_in_s(t3e);
-    set_T4e_in_s(t4e);
-    set_Vsmax(vsmax);
-    set_Vsmin(vsmin);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool PSASPS1::setup_model_with_psse_string(string data)
@@ -258,91 +262,87 @@ void PSASPS1::initialize()
     ostringstream osstream;
 
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-    {
-        deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
-    }
-
-    EXCITER_MODEL* exciter = generator->get_exciter_model();
-    if(exciter==NULL)
+    if(generator!=NULL)
     {
-        deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
-    }
-    if(not exciter->is_model_initialized())
-        exciter->initialize();
-
+        EXCITER_MODEL* exciter = generator->get_exciter_model();
+        if(exciter!=NULL)
+        {
+            if(not exciter->is_model_initialized())
+                exciter->initialize();
 
-    set_block_toolkit();
+            set_block_toolkit();
 
-    size_t bus = generator->get_generator_bus();
+            size_t bus = generator->get_generator_bus();
 
-    SIGNAL signal = prepare_signal_with_signal_type_and_bus(1, bus);
-    if(signal.is_valid())
-        set_input_signal_at_slot(0, signal);
+            SIGNAL signal = prepare_signal_with_signal_type_and_bus(1, bus);
+            if(signal.is_valid())
+                set_input_signal_at_slot(0, signal);
 
-    signal = prepare_signal_with_signal_type_and_bus(3, bus);
-    if(signal.is_valid())
-        set_input_signal_at_slot(1, signal);
+            signal = prepare_signal_with_signal_type_and_bus(3, bus);
+            if(signal.is_valid())
+                set_input_signal_at_slot(1, signal);
 
-    signal = prepare_signal_with_signal_type_and_bus(5, bus);
-    if(signal.is_valid())
-        set_input_signal_at_slot(2, signal);
+            signal = prepare_signal_with_signal_type_and_bus(5, bus);
+            if(signal.is_valid())
+                set_input_signal_at_slot(2, signal);
 
-    phase_tuner_3.set_output(0.0);
-    phase_tuner_3.initialize();
+            phase_tuner_3.set_output(0.0);
+            phase_tuner_3.initialize();
 
-    phase_tuner_2.set_output(0.0);
-    phase_tuner_2.initialize();
+            phase_tuner_2.set_output(0.0);
+            phase_tuner_2.initialize();
 
-    phase_tuner_1.set_output(0.0);
-    phase_tuner_1.initialize();
+            phase_tuner_1.set_output(0.0);
+            phase_tuner_1.initialize();
 
-    dedc_block.set_output(0.0);
-    dedc_block.initialize();
+            dedc_block.set_output(0.0);
+            dedc_block.initialize();
 
-    speed_deviation_ref_pu = get_signal_value_of_slot(0);
-    Pe_ref_pu = get_signal_value_of_slot(1);
-    Vterminal_ref_pu = get_signal_value_of_slot(2);
+            speed_deviation_ref_pu = get_signal_value_of_slot(0);
+            Pe_ref_pu = get_signal_value_of_slot(1);
+            Vterminal_ref_pu = get_signal_value_of_slot(2);
+        }
+        else
+            deactivate_model();
+    }
+    else
+        deactivate_model();
 
     set_flag_model_initialized_as_true();
 }
 
 void PSASPS1::run(DYNAMIC_MODE mode)
 {
-    if(not is_model_active())
-        return;
-
-    double speed_deviation_pu = get_signal_value_of_slot(0);
-    double Pe_pu = get_signal_value_of_slot(1);
-    double Vterminal_pu = get_signal_value_of_slot(2);
-
-    double input = Kq1*(speed_deviation_pu-speed_deviation_ref_pu)+Kq2*(Pe_pu-Pe_ref_pu)+Kq3*(Vterminal_pu-Vterminal_ref_pu);
-    if(K==0)
-    {
-        dedc_block.set_input(input);
-        dedc_block.run(mode);
-        input = dedc_block.get_output();
-    }
-    else
+    if(is_model_active())
     {
-        phase_tuner_1.set_input(input);
-        phase_tuner_1.run(mode);
-        input = phase_tuner_1.get_output();
-    }
+        double speed_deviation_pu = get_signal_value_of_slot(0);
+        double Pe_pu = get_signal_value_of_slot(1);
+        double Vterminal_pu = get_signal_value_of_slot(2);
+
+        double input = Kq1*(speed_deviation_pu-speed_deviation_ref_pu)+Kq2*(Pe_pu-Pe_ref_pu)+Kq3*(Vterminal_pu-Vterminal_ref_pu);
+        if(K==0)
+        {
+            dedc_block.set_input(input);
+            dedc_block.run(mode);
+            input = dedc_block.get_output();
+        }
+        else
+        {
+            phase_tuner_1.set_input(input);
+            phase_tuner_1.run(mode);
+            input = phase_tuner_1.get_output();
+        }
 
-    phase_tuner_2.set_input(input);
-    phase_tuner_2.run(mode);
-    input = phase_tuner_2.get_output();
+        phase_tuner_2.set_input(input);
+        phase_tuner_2.run(mode);
+        input = phase_tuner_2.get_output();
 
-    phase_tuner_3.set_input(input);
-    phase_tuner_3.run(mode);
+        phase_tuner_3.set_input(input);
+        phase_tuner_3.run(mode);
 
-    if(mode==UPDATE_MODE)
-        set_flag_model_updated_as_true();
+        if(mode==UPDATE_MODE)
+            set_flag_model_updated_as_true();
+    }
 }
 
 double PSASPS1::get_stabilizing_signal_in_pu() const
diff --git a/code/source/model/sg_models/stabilizer_model/PSASPS2.cpp b/code/source/model/sg_models/stabilizer_model/PSASPS2.cpp
index 86982026..cebc1ecd 100644
--- a/code/source/model/sg_models/stabilizer_model/PSASPS2.cpp
+++ b/code/source/model/sg_models/stabilizer_model/PSASPS2.cpp
@@ -205,47 +205,51 @@ double PSASPS2::get_Vsmin() const
 bool PSASPS2::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<16)
+    if(data.size()>=16)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double kw, kp, kt, tw1, tw2, t1, t2, t3, t4, t5, t6, vsmax, vsmin;
+
+            size_t i=3;
+            kw = get_double_data(data[i],"0.0"); i++;
+            kp = get_double_data(data[i],"0.0"); i++;
+            kt = get_double_data(data[i],"0.0"); i++;
+            tw1= get_double_data(data[i],"0.0"); i++;
+            tw2= get_double_data(data[i],"0.0"); i++;
+            t1 = get_double_data(data[i],"0.0"); i++;
+            t2 = get_double_data(data[i],"0.0"); i++;
+            t3 = get_double_data(data[i],"0.0"); i++;
+            t4 = get_double_data(data[i],"0.0"); i++;
+            t5 = get_double_data(data[i],"0.0"); i++;
+            t6 = get_double_data(data[i],"0.0"); i++;
+            vsmax = get_double_data(data[i],"0.0"); i++;
+            vsmin = get_double_data(data[i],"0.0"); i++;
+
+            set_Kw(kw);
+            set_Kp(kp);
+            set_Kt(kt);
+            set_Tw1_in_s(tw1);
+            set_Tw2_in_s(tw2);
+            set_T1_in_s(t1);
+            set_T2_in_s(t2);
+            set_T3_in_s(t3);
+            set_T4_in_s(t4);
+            set_T5_in_s(t5);
+            set_T6_in_s(t6);
+            set_Vsmax(vsmax);
+            set_Vsmin(vsmin);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         is_successful = false;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    double kw, kp, kt, tw1, tw2, t1, t2, t3, t4, t5, t6, vsmax, vsmin;
-
-    size_t i=3;
-    kw = get_double_data(data[i],"0.0"); i++;
-    kp = get_double_data(data[i],"0.0"); i++;
-    kt = get_double_data(data[i],"0.0"); i++;
-    tw1= get_double_data(data[i],"0.0"); i++;
-    tw2= get_double_data(data[i],"0.0"); i++;
-    t1 = get_double_data(data[i],"0.0"); i++;
-    t2 = get_double_data(data[i],"0.0"); i++;
-    t3 = get_double_data(data[i],"0.0"); i++;
-    t4 = get_double_data(data[i],"0.0"); i++;
-    t5 = get_double_data(data[i],"0.0"); i++;
-    t6 = get_double_data(data[i],"0.0"); i++;
-    vsmax = get_double_data(data[i],"0.0"); i++;
-    vsmin = get_double_data(data[i],"0.0"); i++;
-
-    set_Kw(kw);
-    set_Kp(kp);
-    set_Kt(kt);
-    set_Tw1_in_s(tw1);
-    set_Tw2_in_s(tw2);
-    set_T1_in_s(t1);
-    set_T2_in_s(t2);
-    set_T3_in_s(t3);
-    set_T4_in_s(t4);
-    set_T5_in_s(t5);
-    set_T6_in_s(t6);
-    set_Vsmax(vsmax);
-    set_Vsmin(vsmin);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool PSASPS2::setup_model_with_psse_string(string data)
@@ -279,93 +283,90 @@ void PSASPS2::initialize()
     ostringstream osstream;
 
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-    {
-        deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
-    }
-
-    EXCITER_MODEL* exciter = generator->get_exciter_model();
-    if(exciter==NULL)
+    if(generator!=NULL)
     {
-        deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
-    }
-    if(not exciter->is_model_initialized())
-        exciter->initialize();
+        EXCITER_MODEL* exciter = generator->get_exciter_model();
+        if(exciter!=NULL)
+        {
+            if(not exciter->is_model_initialized())
+                exciter->initialize();
 
-    set_block_toolkit();
+            set_block_toolkit();
 
-    size_t bus = generator->get_generator_bus();
+            size_t bus = generator->get_generator_bus();
 
-    SIGNAL signal = prepare_signal_with_signal_type_and_bus(1, bus);
-    if(signal.is_valid())
-        set_input_signal_at_slot(0, signal);
+            SIGNAL signal = prepare_signal_with_signal_type_and_bus(1, bus);
+            if(signal.is_valid())
+                set_input_signal_at_slot(0, signal);
 
-    signal = prepare_signal_with_signal_type_and_bus(3, bus);
-    if(signal.is_valid())
-        set_input_signal_at_slot(1, signal);
+            signal = prepare_signal_with_signal_type_and_bus(3, bus);
+            if(signal.is_valid())
+                set_input_signal_at_slot(1, signal);
 
-    signal = prepare_signal_with_signal_type_and_bus(7, bus);
-    if(signal.is_valid())
-        set_input_signal_at_slot(2, signal);
+            signal = prepare_signal_with_signal_type_and_bus(7, bus);
+            if(signal.is_valid())
+                set_input_signal_at_slot(2, signal);
 
-    phase_tuner_3.set_output(0.0);
-    phase_tuner_3.initialize();
+            phase_tuner_3.set_output(0.0);
+            phase_tuner_3.initialize();
 
-    phase_tuner_2.set_output(0.0);
-    phase_tuner_2.initialize();
+            phase_tuner_2.set_output(0.0);
+            phase_tuner_2.initialize();
 
-    phase_tuner_1.set_output(0.0);
-    phase_tuner_1.initialize();
+            phase_tuner_1.set_output(0.0);
+            phase_tuner_1.initialize();
 
-    dedc_block_2.set_output(0.0);
-    dedc_block_2.initialize();
+            dedc_block_2.set_output(0.0);
+            dedc_block_2.initialize();
 
-    dedc_block_1.set_output(0.0);
-    dedc_block_1.initialize();
+            dedc_block_1.set_output(0.0);
+            dedc_block_1.initialize();
 
-    speed_deviation_ref_pu = get_signal_value_of_slot(0);
-    Pe_ref_pu = get_signal_value_of_slot(1);
-    Pmech_ref_pu = get_signal_value_of_slot(2);
+            speed_deviation_ref_pu = get_signal_value_of_slot(0);
+            Pe_ref_pu = get_signal_value_of_slot(1);
+            Pmech_ref_pu = get_signal_value_of_slot(2);
+        }
+        else
+            deactivate_model();
+    }
+    else
+        deactivate_model();
 
     set_flag_model_initialized_as_true();
 }
 
 void PSASPS2::run(DYNAMIC_MODE mode)
 {
-    if(not is_model_active())
-        return;
-
-    double speed_deviation_pu = get_signal_value_of_slot(0);
-    double Pe_pu = get_signal_value_of_slot(1);
-    double Pmech_pu = get_signal_value_of_slot(2);
+    if(is_model_active())
+    {
+        double speed_deviation_pu = get_signal_value_of_slot(0);
+        double Pe_pu = get_signal_value_of_slot(1);
+        double Pmech_pu = get_signal_value_of_slot(2);
 
-    double input = Kw*(speed_deviation_pu-speed_deviation_ref_pu)-Kp*(Pe_pu-Pe_ref_pu)-Kt*(Pmech_ref_pu-Pmech_pu);
+        double input = Kw*(speed_deviation_pu-speed_deviation_ref_pu)-Kp*(Pe_pu-Pe_ref_pu)-Kt*(Pmech_ref_pu-Pmech_pu);
 
-    dedc_block_1.set_input(input);
-    dedc_block_1.run(mode);
-    input = dedc_block_1.get_output();
+        dedc_block_1.set_input(input);
+        dedc_block_1.run(mode);
+        input = dedc_block_1.get_output();
 
-    dedc_block_2.set_input(input);
-    dedc_block_2.run(mode);
-    input = dedc_block_2.get_output();
+        dedc_block_2.set_input(input);
+        dedc_block_2.run(mode);
+        input = dedc_block_2.get_output();
 
-    phase_tuner_1.set_input(input);
-    phase_tuner_1.run(mode);
-    input = phase_tuner_1.get_output();
+        phase_tuner_1.set_input(input);
+        phase_tuner_1.run(mode);
+        input = phase_tuner_1.get_output();
 
-    phase_tuner_2.set_input(input);
-    phase_tuner_2.run(mode);
-    input = phase_tuner_2.get_output();
+        phase_tuner_2.set_input(input);
+        phase_tuner_2.run(mode);
+        input = phase_tuner_2.get_output();
 
-    phase_tuner_3.set_input(input);
-    phase_tuner_3.run(mode);
+        phase_tuner_3.set_input(input);
+        phase_tuner_3.run(mode);
 
-    if(mode==UPDATE_MODE)
-        set_flag_model_updated_as_true();
+        if(mode==UPDATE_MODE)
+            set_flag_model_updated_as_true();
+    }
 }
 
 double PSASPS2::get_stabilizing_signal_in_pu() const
diff --git a/code/source/model/sg_models/stabilizer_model/PSASPS3.cpp b/code/source/model/sg_models/stabilizer_model/PSASPS3.cpp
index c4aaa136..4c4fc894 100644
--- a/code/source/model/sg_models/stabilizer_model/PSASPS3.cpp
+++ b/code/source/model/sg_models/stabilizer_model/PSASPS3.cpp
@@ -261,58 +261,62 @@ double PSASPS3::get_Vsmin() const
 bool PSASPS3::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<21)
-        is_successful = false;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=21)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            int dedc1_flag;
+            double macc, iacc, nacc, tacc, td, ti1, ti2, ti3, ti4, k0, k1, k2, k3, k4, kp, vsmax, vsmin;
+
+            size_t i=3;
+            macc = get_double_data(data[i],"0.0"); i++;
+            iacc = get_double_data(data[i],"0.0"); i++;
+            nacc = get_double_data(data[i],"0.0"); i++;
+            dedc1_flag= get_integer_data(data[i],"0"); i++;
+            tacc= get_double_data(data[i],"0.0"); i++;
+            td= get_double_data(data[i],"0.0"); i++;
+            ti1 = get_double_data(data[i],"0.0"); i++;
+            ti2 = get_double_data(data[i],"0.0"); i++;
+            ti3 = get_double_data(data[i],"0.0"); i++;
+            ti4 = get_double_data(data[i],"0.0"); i++;
+            k0 = get_double_data(data[i],"0.0"); i++;
+            k1 = get_double_data(data[i],"0.0"); i++;
+            k2 = get_double_data(data[i],"0.0"); i++;
+            k3 = get_double_data(data[i],"0.0"); i++;
+            k4 = get_double_data(data[i],"0.0"); i++;
+            kp = get_double_data(data[i],"0.0"); i++;
+            vsmax = get_double_data(data[i],"0.0"); i++;
+            vsmin = get_double_data(data[i],"0.0"); i++;
+
+            set_Macc(macc);
+            set_Iacc(iacc);
+            set_Nacc(nacc);
+            set_dedc_1_flag(dedc1_flag);
+            set_Tacc_in_s(tacc);
+            set_TD_in_s(td);
+            set_Ti1_in_s(ti1);
+            set_Ti2_in_s(ti2);
+            set_Ti3_in_s(ti3);
+            set_Ti4_in_s(ti4);
+            set_K0(k0);
+            set_K1(k1);
+            set_K2(k2);
+            set_K3(k3);
+            set_K4(k4);
+            set_KP(kp);
+            set_Vsmax(vsmax);
+            set_Vsmin(vsmin);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    int dedc1_flag;
-    double macc, iacc, nacc, tacc, td, ti1, ti2, ti3, ti4, k0, k1, k2, k3, k4, kp, vsmax, vsmin;
-
-    size_t i=3;
-    macc = get_double_data(data[i],"0.0"); i++;
-    iacc = get_double_data(data[i],"0.0"); i++;
-    nacc = get_double_data(data[i],"0.0"); i++;
-    dedc1_flag= get_integer_data(data[i],"0"); i++;
-    tacc= get_double_data(data[i],"0.0"); i++;
-    td= get_double_data(data[i],"0.0"); i++;
-    ti1 = get_double_data(data[i],"0.0"); i++;
-    ti2 = get_double_data(data[i],"0.0"); i++;
-    ti3 = get_double_data(data[i],"0.0"); i++;
-    ti4 = get_double_data(data[i],"0.0"); i++;
-    k0 = get_double_data(data[i],"0.0"); i++;
-    k1 = get_double_data(data[i],"0.0"); i++;
-    k2 = get_double_data(data[i],"0.0"); i++;
-    k3 = get_double_data(data[i],"0.0"); i++;
-    k4 = get_double_data(data[i],"0.0"); i++;
-    kp = get_double_data(data[i],"0.0"); i++;
-    vsmax = get_double_data(data[i],"0.0"); i++;
-    vsmin = get_double_data(data[i],"0.0"); i++;
-
-    set_Macc(macc);
-    set_Iacc(iacc);
-    set_Nacc(nacc);
-    set_dedc_1_flag(dedc1_flag);
-    set_Tacc_in_s(tacc);
-    set_TD_in_s(td);
-    set_Ti1_in_s(ti1);
-    set_Ti2_in_s(ti2);
-    set_Ti3_in_s(ti3);
-    set_Ti4_in_s(ti4);
-    set_K0(k0);
-    set_K1(k1);
-    set_K2(k2);
-    set_K3(k3);
-    set_K4(k4);
-    set_KP(kp);
-    set_Vsmax(vsmax);
-    set_Vsmin(vsmin);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool PSASPS3::setup_model_with_psse_string(string data)
@@ -347,105 +351,102 @@ void PSASPS3::initialize()
     ostringstream osstream;
 
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
+    if(generator!=NULL)
     {
-        deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
-    }
-
-    EXCITER_MODEL* exciter = generator->get_exciter_model();
-    if(exciter==NULL)
-    {
-        deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
-    }
-    if(not exciter->is_model_initialized())
-        exciter->initialize();
+        EXCITER_MODEL* exciter = generator->get_exciter_model();
+        if(exciter!=NULL)
+        {
+            if(not exciter->is_model_initialized())
+                exciter->initialize();
 
-    set_block_toolkit();
+            set_block_toolkit();
 
-    size_t bus = generator->get_generator_bus();
+            size_t bus = generator->get_generator_bus();
 
-    SIGNAL signal = prepare_signal_with_signal_type_and_bus(1, bus);
-    if(signal.is_valid())
-        set_input_signal_at_slot(0, signal);
+            SIGNAL signal = prepare_signal_with_signal_type_and_bus(1, bus);
+            if(signal.is_valid())
+                set_input_signal_at_slot(0, signal);
 
-    signal = prepare_signal_with_signal_type_and_bus(3, bus);
-    if(signal.is_valid())
-        set_input_signal_at_slot(1, signal);
+            signal = prepare_signal_with_signal_type_and_bus(3, bus);
+            if(signal.is_valid())
+                set_input_signal_at_slot(1, signal);
 
-    signal = prepare_signal_with_signal_type_and_bus(7, bus);
-    if(signal.is_valid())
-        set_input_signal_at_slot(2, signal);
+            signal = prepare_signal_with_signal_type_and_bus(7, bus);
+            if(signal.is_valid())
+                set_input_signal_at_slot(2, signal);
 
-    phase_tuner_4.set_output(0.0);
-    phase_tuner_4.initialize();
+            phase_tuner_4.set_output(0.0);
+            phase_tuner_4.initialize();
 
-    phase_tuner_3.set_output(0.0);
-    phase_tuner_3.initialize();
+            phase_tuner_3.set_output(0.0);
+            phase_tuner_3.initialize();
 
-    phase_tuner_2.set_output(0.0);
-    phase_tuner_2.initialize();
+            phase_tuner_2.set_output(0.0);
+            phase_tuner_2.initialize();
 
-    phase_tuner_1.set_output(0.0);
-    phase_tuner_1.initialize();
+            phase_tuner_1.set_output(0.0);
+            phase_tuner_1.initialize();
 
-    dedc_block_2.set_output(0.0);
-    dedc_block_2.initialize();
+            dedc_block_2.set_output(0.0);
+            dedc_block_2.initialize();
 
-    dedc_block_1.set_output(0.0);
-    dedc_block_1.initialize();
+            dedc_block_1.set_output(0.0);
+            dedc_block_1.initialize();
 
-    speed_deviation_ref_pu = get_signal_value_of_slot(0);
-    Pe_ref_pu = get_signal_value_of_slot(1);
-    Pmech_ref_pu = get_signal_value_of_slot(2);
+            speed_deviation_ref_pu = get_signal_value_of_slot(0);
+            Pe_ref_pu = get_signal_value_of_slot(1);
+            Pmech_ref_pu = get_signal_value_of_slot(2);
+        }
+        else
+            deactivate_model();
+    }
+    else
+        deactivate_model();
 
     set_flag_model_initialized_as_true();
 }
 
 void PSASPS3::run(DYNAMIC_MODE mode)
 {
-    if(not is_model_active())
-        return;
-
-    double speed_deviation_pu = get_signal_value_of_slot(0);
-    double Pe_pu = get_signal_value_of_slot(1);
-    double Pmech_pu = get_signal_value_of_slot(2);
+    if(is_model_active())
+    {
+        double speed_deviation_pu = get_signal_value_of_slot(0);
+        double Pe_pu = get_signal_value_of_slot(1);
+        double Pmech_pu = get_signal_value_of_slot(2);
 
-    double input = Macc*(speed_deviation_pu-speed_deviation_ref_pu)+Iacc*(Pmech_pu-Pmech_ref_pu)-Nacc*(Pe_pu-Pe_ref_pu);
+        double input = Macc*(speed_deviation_pu-speed_deviation_ref_pu)+Iacc*(Pmech_pu-Pmech_ref_pu)-Nacc*(Pe_pu-Pe_ref_pu);
 
-    if(get_dedc_1_flag())
-    {
-        dedc_block_1.set_input(input);
-        dedc_block_1.run(mode);
-        input = dedc_block_1.get_output();
-    }
+        if(get_dedc_1_flag())
+        {
+            dedc_block_1.set_input(input);
+            dedc_block_1.run(mode);
+            input = dedc_block_1.get_output();
+        }
 
-    dedc_block_2.set_input(input);
-    dedc_block_2.run(mode);
-    input = dedc_block_2.get_output();
+        dedc_block_2.set_input(input);
+        dedc_block_2.run(mode);
+        input = dedc_block_2.get_output();
 
-    input -= (phase_tuner_1.get_output()+phase_tuner_2.get_output()+phase_tuner_3.get_output()+phase_tuner_4.get_output());
+        input -= (phase_tuner_1.get_output()+phase_tuner_2.get_output()+phase_tuner_3.get_output()+phase_tuner_4.get_output());
 
-    phase_tuner_1.set_input(input);
-    phase_tuner_1.run(mode);
-    input = phase_tuner_1.get_output();
+        phase_tuner_1.set_input(input);
+        phase_tuner_1.run(mode);
+        input = phase_tuner_1.get_output();
 
-    phase_tuner_2.set_input(input);
-    phase_tuner_2.run(mode);
-    input = phase_tuner_2.get_output();
+        phase_tuner_2.set_input(input);
+        phase_tuner_2.run(mode);
+        input = phase_tuner_2.get_output();
 
-    phase_tuner_3.set_input(input);
-    phase_tuner_3.run(mode);
-    input = phase_tuner_3.get_output();
+        phase_tuner_3.set_input(input);
+        phase_tuner_3.run(mode);
+        input = phase_tuner_3.get_output();
 
-    phase_tuner_4.set_input(input);
-    phase_tuner_4.run(mode);
+        phase_tuner_4.set_input(input);
+        phase_tuner_4.run(mode);
 
-    if(mode==UPDATE_MODE)
-        set_flag_model_updated_as_true();
+        if(mode==UPDATE_MODE)
+            set_flag_model_updated_as_true();
+    }
 }
 
 double PSASPS3::get_stabilizing_signal_in_pu() const
diff --git a/code/source/model/sg_models/stabilizer_model/PSASPS4.cpp b/code/source/model/sg_models/stabilizer_model/PSASPS4.cpp
index da93ce0d..ec08ddb8 100644
--- a/code/source/model/sg_models/stabilizer_model/PSASPS4.cpp
+++ b/code/source/model/sg_models/stabilizer_model/PSASPS4.cpp
@@ -434,139 +434,136 @@ void PSASPS4::initialize()
     ostringstream osstream;
 
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
+    if(generator!=NULL)
     {
-        deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
+        EXCITER_MODEL* exciter = generator->get_exciter_model();
+        if(exciter!=NULL)
+        {
+            if(not exciter->is_model_initialized())
+                exciter->initialize();
+
+            set_block_toolkit();
+
+            size_t bus = generator->get_generator_bus();
+
+            SIGNAL signal = prepare_signal_with_signal_type_and_bus(1, bus);
+            if(signal.is_valid())
+                set_input_signal_at_slot(0, signal);
+
+            signal = prepare_signal_with_signal_type_and_bus(3, bus);
+            if(signal.is_valid())
+                set_input_signal_at_slot(1, signal);
+
+            phase_tuner_3.set_output(0.0);
+            phase_tuner_3.initialize();
+
+            phase_tuner_2.set_output(0.0);
+            phase_tuner_2.initialize();
+
+            phase_tuner_1.set_output(0.0);
+            phase_tuner_1.initialize();
+
+            notch_filter_first_order_block_4.set_output(0.0);
+            notch_filter_first_order_block_4.initialize();
+            notch_filter_first_order_block_3.set_output(0.0);
+            notch_filter_first_order_block_3.initialize();
+            notch_filter_first_order_block_2.set_output(0.0);
+            notch_filter_first_order_block_2.initialize();
+            notch_filter_first_order_block_1.set_output(0.0);
+            notch_filter_first_order_block_1.initialize();
+
+            notch_filter_phase_tuner.set_output(0.0);
+            notch_filter_phase_tuner.initialize();
+
+            pelec_dedc_block_2.set_output(0.0);
+            pelec_dedc_block_2.initialize();
+            pelec_dedc_block_1.set_output(0.0);
+            pelec_dedc_block_1.initialize();
+            pelec_sensor.set_output(0.0);
+            pelec_sensor.initialize();
+
+            speed_dedc_block_2.set_output(0.0);
+            speed_dedc_block_2.initialize();
+            speed_dedc_block_1.set_output(0.0);
+            speed_dedc_block_1.initialize();
+            speed_sensor.set_output(0.0);
+            speed_sensor.initialize();
+
+            speed_deviation_ref_pu = get_signal_value_of_slot(0);
+            Pe_ref_pu = get_signal_value_of_slot(1);
+        }
+        else
+            deactivate_model();
     }
-
-    EXCITER_MODEL* exciter = generator->get_exciter_model();
-    if(exciter==NULL)
-    {
+    else
         deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
-    }
-    if(not exciter->is_model_initialized())
-        exciter->initialize();
-
-    set_block_toolkit();
-
-    size_t bus = generator->get_generator_bus();
-
-    SIGNAL signal = prepare_signal_with_signal_type_and_bus(1, bus);
-    if(signal.is_valid())
-        set_input_signal_at_slot(0, signal);
-
-    signal = prepare_signal_with_signal_type_and_bus(3, bus);
-    if(signal.is_valid())
-        set_input_signal_at_slot(1, signal);
-
-    phase_tuner_3.set_output(0.0);
-    phase_tuner_3.initialize();
-
-    phase_tuner_2.set_output(0.0);
-    phase_tuner_2.initialize();
-
-    phase_tuner_1.set_output(0.0);
-    phase_tuner_1.initialize();
-
-    notch_filter_first_order_block_4.set_output(0.0);
-    notch_filter_first_order_block_4.initialize();
-    notch_filter_first_order_block_3.set_output(0.0);
-    notch_filter_first_order_block_3.initialize();
-    notch_filter_first_order_block_2.set_output(0.0);
-    notch_filter_first_order_block_2.initialize();
-    notch_filter_first_order_block_1.set_output(0.0);
-    notch_filter_first_order_block_1.initialize();
-
-    notch_filter_phase_tuner.set_output(0.0);
-    notch_filter_phase_tuner.initialize();
-
-    pelec_dedc_block_2.set_output(0.0);
-    pelec_dedc_block_2.initialize();
-    pelec_dedc_block_1.set_output(0.0);
-    pelec_dedc_block_1.initialize();
-    pelec_sensor.set_output(0.0);
-    pelec_sensor.initialize();
-
-    speed_dedc_block_2.set_output(0.0);
-    speed_dedc_block_2.initialize();
-    speed_dedc_block_1.set_output(0.0);
-    speed_dedc_block_1.initialize();
-    speed_sensor.set_output(0.0);
-    speed_sensor.initialize();
-
-    speed_deviation_ref_pu = get_signal_value_of_slot(0);
-    Pe_ref_pu = get_signal_value_of_slot(1);
 
     set_flag_model_initialized_as_true();
 }
 
 void PSASPS4::run(DYNAMIC_MODE mode)
 {
-    if(not is_model_active())
-        return;
-
-    double value_slot_1 = get_signal_value_of_slot(0);
-    speed_sensor.set_input(value_slot_1-speed_deviation_ref_pu);
-    speed_sensor.run(mode);
+    if(is_model_active())
+    {
+        double value_slot_1 = get_signal_value_of_slot(0);
+        speed_sensor.set_input(value_slot_1-speed_deviation_ref_pu);
+        speed_sensor.run(mode);
 
-    double input = speed_sensor.get_output();
-    speed_dedc_block_1.set_input(input);
-    speed_dedc_block_1.run(mode);
+        double input = speed_sensor.get_output();
+        speed_dedc_block_1.set_input(input);
+        speed_dedc_block_1.run(mode);
 
-    input = speed_dedc_block_1.get_output();
-    speed_dedc_block_2.set_input(input);
-    speed_dedc_block_2.run(mode);
+        input = speed_dedc_block_1.get_output();
+        speed_dedc_block_2.set_input(input);
+        speed_dedc_block_2.run(mode);
 
-    double value_slot_2 = get_signal_value_of_slot(1);
-    pelec_sensor.set_input(value_slot_2-Pe_ref_pu);
-    pelec_sensor.run(mode);
+        double value_slot_2 = get_signal_value_of_slot(1);
+        pelec_sensor.set_input(value_slot_2-Pe_ref_pu);
+        pelec_sensor.run(mode);
 
-    input = pelec_sensor.get_output();
-    pelec_dedc_block_1.set_input(input);
-    pelec_dedc_block_1.run(mode);
+        input = pelec_sensor.get_output();
+        pelec_dedc_block_1.set_input(input);
+        pelec_dedc_block_1.run(mode);
 
-    input = pelec_dedc_block_1.get_output();
-    pelec_dedc_block_2.set_input(input);
-    pelec_dedc_block_2.run(mode);
+        input = pelec_dedc_block_1.get_output();
+        pelec_dedc_block_2.set_input(input);
+        pelec_dedc_block_2.run(mode);
 
-    input = speed_dedc_block_2.get_output()+Ks*pelec_dedc_block_2.get_output();
-    notch_filter_phase_tuner.set_input(input);
-    notch_filter_phase_tuner.run(mode);
+        input = speed_dedc_block_2.get_output()+Ks*pelec_dedc_block_2.get_output();
+        notch_filter_phase_tuner.set_input(input);
+        notch_filter_phase_tuner.run(mode);
 
-    input = notch_filter_phase_tuner.get_output();
-    notch_filter_first_order_block_1.set_input(input);
-    notch_filter_first_order_block_1.run(mode);
+        input = notch_filter_phase_tuner.get_output();
+        notch_filter_first_order_block_1.set_input(input);
+        notch_filter_first_order_block_1.run(mode);
 
-    input = notch_filter_first_order_block_1.get_output();
-    notch_filter_first_order_block_2.set_input(input);
-    notch_filter_first_order_block_2.run(mode);
+        input = notch_filter_first_order_block_1.get_output();
+        notch_filter_first_order_block_2.set_input(input);
+        notch_filter_first_order_block_2.run(mode);
 
-    input = notch_filter_first_order_block_2.get_output();
-    notch_filter_first_order_block_3.set_input(input);
-    notch_filter_first_order_block_3.run(mode);
+        input = notch_filter_first_order_block_2.get_output();
+        notch_filter_first_order_block_3.set_input(input);
+        notch_filter_first_order_block_3.run(mode);
 
-    input = notch_filter_first_order_block_3.get_output();
-    notch_filter_first_order_block_4.set_input(input);
-    notch_filter_first_order_block_4.run(mode);
+        input = notch_filter_first_order_block_3.get_output();
+        notch_filter_first_order_block_4.set_input(input);
+        notch_filter_first_order_block_4.run(mode);
 
-    input = notch_filter_first_order_block_4.get_output()-pelec_dedc_block_2.get_output();
-    phase_tuner_1.set_input(input);
-    phase_tuner_1.run(mode);
+        input = notch_filter_first_order_block_4.get_output()-pelec_dedc_block_2.get_output();
+        phase_tuner_1.set_input(input);
+        phase_tuner_1.run(mode);
 
-    input = phase_tuner_1.get_output();
-    phase_tuner_2.set_input(input);
-    phase_tuner_2.run(mode);
+        input = phase_tuner_1.get_output();
+        phase_tuner_2.set_input(input);
+        phase_tuner_2.run(mode);
 
-    input = phase_tuner_2.get_output();
-    phase_tuner_3.set_input(input);
-    phase_tuner_3.run(mode);
+        input = phase_tuner_2.get_output();
+        phase_tuner_3.set_input(input);
+        phase_tuner_3.run(mode);
 
-    if(mode==UPDATE_MODE)
-        set_flag_model_updated_as_true();
+        if(mode==UPDATE_MODE)
+            set_flag_model_updated_as_true();
+    }
 }
 
 double PSASPS4::get_stabilizing_signal_in_pu() const
diff --git a/code/source/model/sg_models/stabilizer_model/PSASPS5.cpp b/code/source/model/sg_models/stabilizer_model/PSASPS5.cpp
index c9184839..876df119 100644
--- a/code/source/model/sg_models/stabilizer_model/PSASPS5.cpp
+++ b/code/source/model/sg_models/stabilizer_model/PSASPS5.cpp
@@ -229,67 +229,70 @@ double PSASPS5::get_Vcmin() const
 bool PSASPS5::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<23)
-        is_successful = false;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    size_t signal_type[2], bus[2];
-    double k1, t1, k2, t2, t3, t4, t5, t6, t7, t8, t9, t10,
-           lsmax, lsmin, vcl, vcu;
-
-    size_t i=3;
-    signal_type[0] = get_integer_data(data[i],"0"); i++;
-    bus[0] = get_integer_data(data[i],"0"); i++;
-    signal_type[1] = get_integer_data(data[i],"0"); i++;
-    bus[1] = get_integer_data(data[i],"0"); i++;
-
-    for(size_t i=0; i<2; ++i)
+    if(data.size()>=23)
     {
-        SIGNAL signal = prepare_signal_with_signal_type_and_bus(signal_type[i], bus[i]);
-        if(signal.is_valid())
-            set_input_signal_at_slot(i, signal);
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t signal_type[2], bus[2];
+            double k1, t1, k2, t2, t3, t4, t5, t6, t7, t8, t9, t10,
+                   lsmax, lsmin, vcl, vcu;
+
+            size_t i=3;
+            signal_type[0] = get_integer_data(data[i],"0"); i++;
+            bus[0] = get_integer_data(data[i],"0"); i++;
+            signal_type[1] = get_integer_data(data[i],"0"); i++;
+            bus[1] = get_integer_data(data[i],"0"); i++;
+
+            for(size_t i=0; i<2; ++i)
+            {
+                SIGNAL signal = prepare_signal_with_signal_type_and_bus(signal_type[i], bus[i]);
+                if(signal.is_valid())
+                    set_input_signal_at_slot(i, signal);
+            }
+
+            k1 = get_double_data(data[i],"0.0"); i++;
+            k2 = get_double_data(data[i],"0.0"); i++;
+            t1 = get_double_data(data[i],"0.0"); i++;
+            t2 = get_double_data(data[i],"0.0"); i++;
+            t3 = get_double_data(data[i],"0.0"); i++;
+            t4 = get_double_data(data[i],"0.0"); i++;
+            t5 = get_double_data(data[i],"0.0"); i++;
+            t6 = get_double_data(data[i],"0.0"); i++;
+            t7 = get_double_data(data[i],"0.0"); i++;
+            t8 = get_double_data(data[i],"0.0"); i++;
+            t9 = get_double_data(data[i],"0.0"); i++;
+            t10 = get_double_data(data[i],"0.0"); i++;
+            lsmax = get_double_data(data[i],"0.0"); i++;
+            lsmin = get_double_data(data[i],"0.0"); i++;
+            vcu = get_double_data(data[i],"0.0"); i++;
+            vcl = get_double_data(data[i],"0.0"); i++;
+
+            set_K1(k1);
+            set_K2(k2);
+            set_T1_in_s(t1);
+            set_T2_in_s(t2);
+            set_T3_in_s(t3);
+            set_T4_in_s(t4);
+            set_T5_in_s(t5);
+            set_T6_in_s(t6);
+            set_T7_in_s(t7);
+            set_T8_in_s(t8);
+            set_T9_in_s(t9);
+            set_T10_in_s(t10);
+            set_Vsmax(lsmax);
+            set_Vsmin(lsmin);
+            set_Vcmax(vcu);
+            set_Vcmin(vcl);
+
+            is_successful = true;
+            return is_successful;
+        }
+        else
+            return is_successful;
     }
-
-    k1 = get_double_data(data[i],"0.0"); i++;
-    k2 = get_double_data(data[i],"0.0"); i++;
-    t1 = get_double_data(data[i],"0.0"); i++;
-    t2 = get_double_data(data[i],"0.0"); i++;
-    t3 = get_double_data(data[i],"0.0"); i++;
-    t4 = get_double_data(data[i],"0.0"); i++;
-    t5 = get_double_data(data[i],"0.0"); i++;
-    t6 = get_double_data(data[i],"0.0"); i++;
-    t7 = get_double_data(data[i],"0.0"); i++;
-    t8 = get_double_data(data[i],"0.0"); i++;
-    t9 = get_double_data(data[i],"0.0"); i++;
-    t10 = get_double_data(data[i],"0.0"); i++;
-    lsmax = get_double_data(data[i],"0.0"); i++;
-    lsmin = get_double_data(data[i],"0.0"); i++;
-    vcu = get_double_data(data[i],"0.0"); i++;
-    vcl = get_double_data(data[i],"0.0"); i++;
-
-    set_K1(k1);
-    set_K2(k2);
-    set_T1_in_s(t1);
-    set_T2_in_s(t2);
-    set_T3_in_s(t3);
-    set_T4_in_s(t4);
-    set_T5_in_s(t5);
-    set_T6_in_s(t6);
-    set_T7_in_s(t7);
-    set_T8_in_s(t8);
-    set_T9_in_s(t9);
-    set_T10_in_s(t10);
-    set_Vsmax(lsmax);
-    set_Vsmin(lsmin);
-    set_Vcmax(vcu);
-    set_Vcmin(vcl);
-
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool PSASPS5::setup_model_with_psse_string(string data)
@@ -318,107 +321,105 @@ void PSASPS5::initialize()
     ostringstream osstream;
 
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
+    if(generator!=NULL)
     {
-        deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
+        EXCITER_MODEL* exciter = generator->get_exciter_model();
+        if(exciter!=NULL)
+        {
+            if(not exciter->is_model_initialized())
+                exciter->initialize();
+
+            set_block_toolkit();
+
+            phase_tuner_3.set_output(0.0);
+            phase_tuner_3.initialize();
+
+            phase_tuner_2.set_output(0.0);
+            phase_tuner_2.initialize();
+
+            phase_tuner_1.set_output(0.0);
+            phase_tuner_1.initialize();
+
+            double value_slot_1 = get_signal_value_of_slot(0);
+            double value_slot_2 = get_signal_value_of_slot(1);
+            double value_sensor_1 = value_slot_1*get_K1();
+            double value_sensor_2 = value_slot_2*get_K2();
+
+            sensor_1.set_output(value_sensor_1);
+            sensor_1.initialize();
+
+            sensor_2.set_output(value_sensor_2);
+            sensor_2.initialize();
+
+            double value_sum = value_sensor_1 + value_sensor_2;
+
+            double T3 = get_T3_in_s();
+            if(T3>0.0)
+            {
+                filter.set_input(value_sum);
+                filter.initialize();
+            }
+            else
+            {
+                osstream<<"Initialization failed. T3<=0.0 in model "<<get_model_name()<<" of "
+                  <<get_generator_pointer()->get_device_name()<<" requires input signals with 0 steady state value."<<endl
+                  <<"However, "<<value_sum<<" is given. Check input signals in slots.";
+                alternative_filter.set_output(0.0);
+                alternative_filter.initialize();
+            }
+        }
+        else
+            deactivate_model();
     }
-
-    EXCITER_MODEL* exciter = generator->get_exciter_model();
-    if(exciter==NULL)
-    {
+    else
         deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
-    }
-    if(not exciter->is_model_initialized())
-        exciter->initialize();
-
-    set_block_toolkit();
-
-    phase_tuner_3.set_output(0.0);
-    phase_tuner_3.initialize();
-
-    phase_tuner_2.set_output(0.0);
-    phase_tuner_2.initialize();
-
-    phase_tuner_1.set_output(0.0);
-    phase_tuner_1.initialize();
-
-    double value_slot_1 = get_signal_value_of_slot(0);
-    double value_slot_2 = get_signal_value_of_slot(1);
-    double value_sensor_1 = value_slot_1*get_K1();
-    double value_sensor_2 = value_slot_2*get_K2();
 
-    sensor_1.set_output(value_sensor_1);
-    sensor_1.initialize();
-
-    sensor_2.set_output(value_sensor_2);
-    sensor_2.initialize();
-
-    double value_sum = value_sensor_1 + value_sensor_2;
-
-    double T3 = get_T3_in_s();
-    if(T3>0.0)
-    {
-        filter.set_input(value_sum);
-        filter.initialize();
-    }
-    else
-    {
-        osstream<<"Initialization failed. T3<=0.0 in model "<<get_model_name()<<" of "
-          <<get_generator_pointer()->get_device_name()<<" requires input signals with 0 steady state value."<<endl
-          <<"However, "<<value_sum<<" is given. Check input signals in slots.";
-        alternative_filter.set_output(0.0);
-        alternative_filter.initialize();
-    }
     set_flag_model_initialized_as_true();
 }
 
 void PSASPS5::run(DYNAMIC_MODE mode)
 {
-    if(not is_model_active())
-        return;
-
-    double value_slot_1 = get_signal_value_of_slot(0);
-    sensor_1.set_input(value_slot_1);
-    sensor_1.run(mode);
-    double output1 = sensor_1.get_output();
+    if(is_model_active())
+    {
+        double value_slot_1 = get_signal_value_of_slot(0);
+        sensor_1.set_input(value_slot_1);
+        sensor_1.run(mode);
+        double output1 = sensor_1.get_output();
 
-    double value_slot_2 = get_signal_value_of_slot(1);
-    sensor_2.set_input(value_slot_2);
-    sensor_2.run(mode);
-    double output2 = sensor_2.get_output();
+        double value_slot_2 = get_signal_value_of_slot(1);
+        sensor_2.set_input(value_slot_2);
+        sensor_2.run(mode);
+        double output2 = sensor_2.get_output();
 
-    double input = output1+output2;
-    double T3 = get_T3_in_s();
-    if(T3>0.0)
-    {
-        filter.set_input(input);
-        filter.run(mode);
-        input = filter.get_output();
-    }
-    else
-    {
-        alternative_filter.set_input(input);
-        alternative_filter.run(mode);
-        input = alternative_filter.get_output();
-    }
+        double input = output1+output2;
+        double T3 = get_T3_in_s();
+        if(T3>0.0)
+        {
+            filter.set_input(input);
+            filter.run(mode);
+            input = filter.get_output();
+        }
+        else
+        {
+            alternative_filter.set_input(input);
+            alternative_filter.run(mode);
+            input = alternative_filter.get_output();
+        }
 
-    phase_tuner_1.set_input(input);
-    phase_tuner_1.run(mode);
+        phase_tuner_1.set_input(input);
+        phase_tuner_1.run(mode);
 
-    input = phase_tuner_1.get_output();
-    phase_tuner_2.set_input(input);
-    phase_tuner_2.run(mode);
+        input = phase_tuner_1.get_output();
+        phase_tuner_2.set_input(input);
+        phase_tuner_2.run(mode);
 
-    input = phase_tuner_2.get_output();
-    phase_tuner_3.set_input(input);
-    phase_tuner_3.run(mode);
+        input = phase_tuner_2.get_output();
+        phase_tuner_3.set_input(input);
+        phase_tuner_3.run(mode);
 
-    if(mode==UPDATE_MODE)
-        set_flag_model_updated_as_true();
+        if(mode==UPDATE_MODE)
+            set_flag_model_updated_as_true();
+    }
 }
 
 double PSASPS5::get_stabilizing_signal_in_pu() const
diff --git a/code/source/model/sg_models/stabilizer_model/stabilizer_model.cpp b/code/source/model/sg_models/stabilizer_model/stabilizer_model.cpp
index 387deeac..c22e7f1b 100644
--- a/code/source/model/sg_models/stabilizer_model/stabilizer_model.cpp
+++ b/code/source/model/sg_models/stabilizer_model/stabilizer_model.cpp
@@ -50,32 +50,34 @@ void STABILIZER_MODEL::set_input_signal_at_slot(size_t slot, SIGNAL& signal)
 SIGNAL STABILIZER_MODEL::get_input_signal_at_slot(size_t slot) const
 {
     SIGNAL signal;
-    if(slot>=MAX_STABILIZER_INPUT_SIGNAL_SLOT)
-        return signal;
-    else
+    if(slot<MAX_STABILIZER_INPUT_SIGNAL_SLOT)
         return signals[slot];
+    else
+        return signal;
 }
 
 bool STABILIZER_MODEL::is_slot_valid(size_t slot) const
 {
-    if(slot>=MAX_STABILIZER_INPUT_SIGNAL_SLOT)
-        return false;
-    else
+    if(slot<MAX_STABILIZER_INPUT_SIGNAL_SLOT)
     {
         if(signals[slot].is_valid())
             return true;
         else
             return false;
     }
+    else
+        return false;
 }
 
 double STABILIZER_MODEL::get_signal_value_of_slot(size_t slot) const
 {
-    if(not this->is_slot_valid(slot))
+    if(this->is_slot_valid(slot))
+    {
+        SIGNAL signal = signals[slot];
+        return signal.get_meter_value();
+    }
+    else
         return 0.0;
-
-    SIGNAL signal = signals[slot];
-    return signal.get_meter_value();
 }
 
 size_t STABILIZER_MODEL::convert_signal_type_string_to_number(string signal_type) const
@@ -127,87 +129,94 @@ SIGNAL STABILIZER_MODEL::prepare_signal_with_signal_type_and_bus(size_t signal_t
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    if(bus==0)
-        return signal;
-
-    switch(signal_type)
+    if(bus!=0)
     {
-        case 1:
-        {
-            vector<GENERATOR*> gens = psdb.get_generators_connecting_to_bus(bus);
-            if(gens.size()==0)
-                break;
-            GENERATOR* gen = gens[0];
-            DEVICE_ID did = gen->get_device_id();
-            signal.set_device_id(did);
-            signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
-            break;
-        }
-        case 2:
-        {
-            BUS* busptr = psdb.get_bus(bus);
-            if(busptr==NULL)
-                break;
-            DEVICE_ID did = busptr->get_device_id();
-            signal.set_device_id(did);
-            signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
-            break;
-        }
-        case 3:
-        {
-            vector<GENERATOR*> gens = psdb.get_generators_connecting_to_bus(bus);
-            if(gens.size()==0)
-                break;
-            GENERATOR* gen = gens[0];
-            DEVICE_ID did = gen->get_device_id();
-            signal.set_device_id(did);
-            signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
-            break;
-        }
-        case 4:
-        {
-            vector<GENERATOR*> gens = psdb.get_generators_connecting_to_bus(bus);
-            if(gens.size()==0)
-                break;
-            GENERATOR* gen = gens[0];
-            DEVICE_ID did = gen->get_device_id();
-            signal.set_device_id(did);
-            signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
-            break;
-        }
-        case 5:
-        {
-            BUS* busptr = psdb.get_bus(bus);
-            if(busptr==NULL)
-                break;
-            DEVICE_ID did = busptr->get_device_id();
-            signal.set_device_id(did);
-            signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
-            break;
-        }
-        case 6:
-        {
-            BUS* busptr = psdb.get_bus(bus);
-            if(busptr==NULL)
-                break;
-            DEVICE_ID did = busptr->get_device_id();
-            signal.set_device_id(did);
-            signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
-            break;
-        }
-        case 7:
-        {
-            vector<GENERATOR*> gens = psdb.get_generators_connecting_to_bus(bus);
-            if(gens.size()==0)
-                break;
-            GENERATOR* gen = gens[0];
-            DEVICE_ID did = gen->get_device_id();
-            signal.set_device_id(did);
-            signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
-            break;
-        }
-        default:
-            break;
+        switch(signal_type)
+            {
+                case 1:
+                {
+                    vector<GENERATOR*> gens = psdb.get_generators_connecting_to_bus(bus);
+                    if(gens.size()!=0)
+                    {
+                        GENERATOR* gen = gens[0];
+                        DEVICE_ID did = gen->get_device_id();
+                        signal.set_device_id(did);
+                        signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
+                    }
+                    break;
+                }
+                case 2:
+                {
+                    BUS* busptr = psdb.get_bus(bus);
+                    if(busptr!=NULL)
+                    {
+                        DEVICE_ID did = busptr->get_device_id();
+                        signal.set_device_id(did);
+                        signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
+                    }
+                    break;
+                }
+                case 3:
+                {
+                    vector<GENERATOR*> gens = psdb.get_generators_connecting_to_bus(bus);
+                    if(gens.size()!=0)
+                    {
+                        GENERATOR* gen = gens[0];
+                        DEVICE_ID did = gen->get_device_id();
+                        signal.set_device_id(did);
+                        signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
+                    }
+                    break;
+                }
+                case 4:
+                {
+                    vector<GENERATOR*> gens = psdb.get_generators_connecting_to_bus(bus);
+                    if(gens.size()!=0)
+                    {
+                        GENERATOR* gen = gens[0];
+                        DEVICE_ID did = gen->get_device_id();
+                        signal.set_device_id(did);
+                        signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
+                    }
+                    break;
+                }
+                case 5:
+                {
+                    BUS* busptr = psdb.get_bus(bus);
+                    if(busptr!=NULL)
+                    {
+                        DEVICE_ID did = busptr->get_device_id();
+                        signal.set_device_id(did);
+                        signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
+                    }
+                    break;
+                }
+                case 6:
+                {
+                    BUS* busptr = psdb.get_bus(bus);
+                    if(busptr!=NULL)
+                    {
+                        DEVICE_ID did = busptr->get_device_id();
+                        signal.set_device_id(did);
+                        signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
+                    }
+                    break;
+                }
+                case 7:
+                {
+                    vector<GENERATOR*> gens = psdb.get_generators_connecting_to_bus(bus);
+                    if(gens.size()!=0)
+                    {
+                        GENERATOR* gen = gens[0];
+                        DEVICE_ID did = gen->get_device_id();
+                        signal.set_device_id(did);
+                        signal.set_meter_type(convert_signal_type_number_to_string(signal_type));
+                    }
+                    break;
+                }
+                default:
+                    break;
+            }
     }
     return signal;
 }
diff --git a/code/source/model/sg_models/sync_generator_model/gencls.cpp b/code/source/model/sg_models/sync_generator_model/gencls.cpp
index cbcd50c3..55ed4915 100644
--- a/code/source/model/sg_models/sync_generator_model/gencls.cpp
+++ b/code/source/model/sg_models/sync_generator_model/gencls.cpp
@@ -67,25 +67,29 @@ void GENCLS::update_source_impedance()
 bool GENCLS::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<5)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    double H, D;
+    if(data.size()>=5)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double H, D;
 
-    size_t i=3;
-    H = get_double_data(data[i],"0.0"); i++;
-    D = get_double_data(data[i],"0.0");
+            size_t i=3;
+            H = get_double_data(data[i],"0.0"); i++;
+            D = get_double_data(data[i],"0.0");
 
-    set_H_in_s(H);
-    set_D(D);
+            set_H_in_s(H);
+            set_D(D);
 
-    is_successful = true;
+            is_successful = true;
 
-    return is_successful;
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
+        return is_successful;
 }
 
 bool GENCLS::setup_model_with_psse_string(string data)
diff --git a/code/source/model/sg_models/sync_generator_model/genrou.cpp b/code/source/model/sg_models/sync_generator_model/genrou.cpp
index e889bbb3..40bddf90 100644
--- a/code/source/model/sg_models/sync_generator_model/genrou.cpp
+++ b/code/source/model/sg_models/sync_generator_model/genrou.cpp
@@ -84,53 +84,56 @@ void GENROU::update_source_impedance()
 bool GENROU::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<17)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=17)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double xd, xq, xdp, xqp, xpp, xl, td0p, tq0p, td0pp, tq0pp;
+            double H, D;
+            double s1, s1p2;
+
+            size_t i=3;
+            td0p = get_double_data(data[i],"0.0"); i++;
+            td0pp = get_double_data(data[i],"0.0"); i++;
+            tq0p = get_double_data(data[i],"0.0"); i++;
+            tq0pp = get_double_data(data[i],"0.0"); i++;
+            H = get_double_data(data[i],"0.0"); i++;
+            D = get_double_data(data[i],"0.0"); i++;
+            xd = get_double_data(data[i],"0.0"); i++;
+            xq = get_double_data(data[i],"0.0"); i++;
+            xdp = get_double_data(data[i],"0.0"); i++;
+            xqp = get_double_data(data[i],"0.0"); i++;
+            xpp = get_double_data(data[i],"0.0"); i++;
+            xl = get_double_data(data[i],"0.0"); i++;
+            s1 = get_double_data(data[i],"0.0"); i++;
+            s1p2 = get_double_data(data[i],"0.0");
+
+            set_Xd(xd);
+            set_Xq(xq);
+            set_Xdp(xdp);
+            set_Xqp(xqp);
+            set_Xdpp(xpp);
+            set_Xqpp(xpp);
+            set_Xl(xl);
+            set_Td0p_in_s(td0p);
+            set_Td0pp_in_s(td0pp);
+            set_Tq0p_in_s(tq0p);
+            set_Tq0pp_in_s(tq0pp);
+            set_H_in_s(H);
+            set_D(D);
+            set_saturation_at_1(s1);
+            set_saturation_at_1p2(s1p2);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-
-    double xd, xq, xdp, xqp, xpp, xl, td0p, tq0p, td0pp, tq0pp;
-    double H, D;
-    double s1, s1p2;
-
-    size_t i=3;
-    td0p = get_double_data(data[i],"0.0"); i++;
-    td0pp = get_double_data(data[i],"0.0"); i++;
-    tq0p = get_double_data(data[i],"0.0"); i++;
-    tq0pp = get_double_data(data[i],"0.0"); i++;
-    H = get_double_data(data[i],"0.0"); i++;
-    D = get_double_data(data[i],"0.0"); i++;
-    xd = get_double_data(data[i],"0.0"); i++;
-    xq = get_double_data(data[i],"0.0"); i++;
-    xdp = get_double_data(data[i],"0.0"); i++;
-    xqp = get_double_data(data[i],"0.0"); i++;
-    xpp = get_double_data(data[i],"0.0"); i++;
-    xl = get_double_data(data[i],"0.0"); i++;
-    s1 = get_double_data(data[i],"0.0"); i++;
-    s1p2 = get_double_data(data[i],"0.0");
-
-    set_Xd(xd);
-    set_Xq(xq);
-    set_Xdp(xdp);
-    set_Xqp(xqp);
-    set_Xdpp(xpp);
-    set_Xqpp(xpp);
-    set_Xl(xl);
-    set_Td0p_in_s(td0p);
-    set_Td0pp_in_s(td0pp);
-    set_Tq0p_in_s(tq0p);
-    set_Tq0pp_in_s(tq0pp);
-    set_H_in_s(H);
-    set_D(D);
-    set_saturation_at_1(s1);
-    set_saturation_at_1p2(s1p2);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool GENROU::setup_model_with_psse_string(string data)
@@ -317,10 +320,10 @@ void GENROU::initialize_rotor_angle()
 
     double rotor_angle_EQ = steps_fast_complex_arg(EQ/Vxy) + steps_fast_complex_arg(Vxy);
     double rotor_angle = 0.0;
-    if(C == 0.0)
-        rotor_angle = PI*0.5;
-    else
+    if(C != 0.0)
         rotor_angle = atan(D/C);
+    else
+        rotor_angle = PI*0.5;
 
     while(true)
     {
diff --git a/code/source/model/sg_models/sync_generator_model/gensal.cpp b/code/source/model/sg_models/sync_generator_model/gensal.cpp
index d20d4e55..df27e46a 100644
--- a/code/source/model/sg_models/sync_generator_model/gensal.cpp
+++ b/code/source/model/sg_models/sync_generator_model/gensal.cpp
@@ -81,48 +81,52 @@ void GENSAL::update_source_impedance()
 bool GENSAL::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<15)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=15)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double xd, xq, xdp, xpp, xl, td0p, td0pp, tq0pp;
+            double H, D;
+            double s1, s1p2;
+
+            size_t i=3;
+            td0p = get_double_data(data[i],"0.0"); i++;
+            td0pp = get_double_data(data[i],"0.0"); i++;
+            tq0pp = get_double_data(data[i],"0.0"); i++;
+            H = get_double_data(data[i],"0.0"); i++;
+            D = get_double_data(data[i],"0.0"); i++;
+            xd = get_double_data(data[i],"0.0"); i++;
+            xq = get_double_data(data[i],"0.0"); i++;
+            xdp = get_double_data(data[i],"0.0"); i++;
+            xpp = get_double_data(data[i],"0.0"); i++;
+            xl = get_double_data(data[i],"0.0"); i++;
+            s1 = get_double_data(data[i],"0.0"); i++;
+            s1p2 = get_double_data(data[i],"0.0");
+
+            set_Xd(xd);
+            set_Xq(xq);
+            set_Xdp(xdp);
+            set_Xdpp(xpp);
+            set_Xqpp(xpp);
+            set_Xl(xl);
+            set_Td0p_in_s(td0p);
+            set_Td0pp_in_s(td0pp);
+            set_Tq0pp_in_s(tq0pp);
+            set_H_in_s(H);
+            set_D(D);
+            set_saturation_at_1(s1);
+            set_saturation_at_1p2(s1p2);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    double xd, xq, xdp, xpp, xl, td0p, td0pp, tq0pp;
-    double H, D;
-    double s1, s1p2;
-
-    size_t i=3;
-    td0p = get_double_data(data[i],"0.0"); i++;
-    td0pp = get_double_data(data[i],"0.0"); i++;
-    tq0pp = get_double_data(data[i],"0.0"); i++;
-    H = get_double_data(data[i],"0.0"); i++;
-    D = get_double_data(data[i],"0.0"); i++;
-    xd = get_double_data(data[i],"0.0"); i++;
-    xq = get_double_data(data[i],"0.0"); i++;
-    xdp = get_double_data(data[i],"0.0"); i++;
-    xpp = get_double_data(data[i],"0.0"); i++;
-    xl = get_double_data(data[i],"0.0"); i++;
-    s1 = get_double_data(data[i],"0.0"); i++;
-    s1p2 = get_double_data(data[i],"0.0");
-
-    set_Xd(xd);
-    set_Xq(xq);
-    set_Xdp(xdp);
-    set_Xdpp(xpp);
-    set_Xqpp(xpp);
-    set_Xl(xl);
-    set_Td0p_in_s(td0p);
-    set_Td0pp_in_s(td0pp);
-    set_Tq0pp_in_s(tq0pp);
-    set_H_in_s(H);
-    set_D(D);
-    set_saturation_at_1(s1);
-    set_saturation_at_1p2(s1p2);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool GENSAL::setup_model_with_psse_string(string data)
@@ -257,10 +261,10 @@ void GENSAL::initialize_rotor_angle()
 
     double rotor_angle_EQ = steps_fast_complex_arg(EQ/Vxy) + steps_fast_complex_arg(Vxy);
     double rotor_angle = 0.0;
-    if(C == 0.0)
-        rotor_angle = PI*0.5;
-    else
+    if(C != 0.0)
         rotor_angle = atan(D/C);
+    else
+        rotor_angle = PI*0.5;
 
     while(true)
     {
diff --git a/code/source/model/sg_models/sync_generator_model/sync_generator_model.cpp b/code/source/model/sg_models/sync_generator_model/sync_generator_model.cpp
index 7476206f..920e738a 100644
--- a/code/source/model/sg_models/sync_generator_model/sync_generator_model.cpp
+++ b/code/source/model/sg_models/sync_generator_model/sync_generator_model.cpp
@@ -181,14 +181,16 @@ double SYNC_GENERATOR_MODEL::get_Xqpp() const
 
 double SYNC_GENERATOR_MODEL::get_Xpp() const
 {
-    if(Xdpp!=Xqpp)
+    if(Xdpp==Xqpp)
+        return Xdpp;
+    else
     {
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         ostringstream osstream;
         osstream<<"Warning. Subtransient Xd\"("<<Xdpp<<") is not equal to Xq\"("<<Xqpp<<"). Xd\" will be returned.";
         toolkit.show_information_with_leading_time_stamp(osstream);
+        return Xdpp;
     }
-    return Xdpp;
 }
 
 double SYNC_GENERATOR_MODEL::get_Xl() const
@@ -288,10 +290,11 @@ bool SYNC_GENERATOR_MODEL::is_saturation_considered() const
 
 double SYNC_GENERATOR_MODEL::get_saturation_with_flux(double flux) const
 {
-    if(not is_saturation_considered())
+    if(is_saturation_considered())
+        return saturation_block.get_saturation(flux);
+    else
         return 0.0;
 
-    return saturation_block.get_saturation(flux);
     /*
     switch(get_saturation_type())
     {
diff --git a/code/source/model/sg_models/turbine-governors/IEEEG1.cpp b/code/source/model/sg_models/turbine-governors/IEEEG1.cpp
index 8849a17f..3f1ad862 100644
--- a/code/source/model/sg_models/turbine-governors/IEEEG1.cpp
+++ b/code/source/model/sg_models/turbine-governors/IEEEG1.cpp
@@ -284,62 +284,65 @@ double IEEEG1::get_K8() const
 bool IEEEG1::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<25)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=25)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double k, t1, t2, t3, uo, uc, pmax, pmin, t4, k1, k2, t5, k3, k4, t6, k5, k6, t7, k7, k8;
+
+            size_t i=5;
+            k = get_double_data(data[i],"0.0"); i++;
+            t1 = get_double_data(data[i],"0.0"); i++;
+            t2 = get_double_data(data[i],"0.0"); i++;
+            t3 = get_double_data(data[i],"0.0"); i++;
+            uo = get_double_data(data[i],"0.0"); i++;
+            uc = get_double_data(data[i],"0.0"); i++;
+            pmax = get_double_data(data[i],"0.0"); i++;
+            pmin = get_double_data(data[i],"0.0"); i++;
+            t4 = get_double_data(data[i],"0.0"); i++;
+            k1 = get_double_data(data[i],"0.0"); i++;
+            k2 = get_double_data(data[i],"0.0"); i++;
+            t5 = get_double_data(data[i],"0.0"); i++;
+            k3 = get_double_data(data[i],"0.0"); i++;
+            k4 = get_double_data(data[i],"0.0"); i++;
+            t6 = get_double_data(data[i],"0.0"); i++;
+            k5 = get_double_data(data[i],"0.0"); i++;
+            k6 = get_double_data(data[i],"0.0"); i++;
+            t7 = get_double_data(data[i],"0.0"); i++;
+            k7 = get_double_data(data[i],"0.0"); i++;
+            k8 = get_double_data(data[i],"0.0");
+
+            set_K(k);
+            set_T1_in_s(t1);
+            set_T2_in_s(t2);
+            set_T3_in_s(t3);
+            set_Uo_in_pu(uo);
+            set_Uc_in_pu(uc);
+            set_Pmax_in_pu(pmax);
+            set_Pmin_in_pu(pmin);
+            set_T4_in_s(t4);
+            set_K1(k1);
+            set_K2(k2);
+            set_T5_in_s(t5);
+            set_K3(k3);
+            set_K4(k4);
+            set_T6_in_s(t6);
+            set_K5(k5);
+            set_K6(k6);
+            set_T7_in_s(t7);
+            set_K7(k7);
+            set_K8(k8);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-
-    double k, t1, t2, t3, uo, uc, pmax, pmin, t4, k1, k2, t5, k3, k4, t6, k5, k6, t7, k7, k8;
-
-    size_t i=5;
-    k = get_double_data(data[i],"0.0"); i++;
-    t1 = get_double_data(data[i],"0.0"); i++;
-    t2 = get_double_data(data[i],"0.0"); i++;
-    t3 = get_double_data(data[i],"0.0"); i++;
-    uo = get_double_data(data[i],"0.0"); i++;
-    uc = get_double_data(data[i],"0.0"); i++;
-    pmax = get_double_data(data[i],"0.0"); i++;
-    pmin = get_double_data(data[i],"0.0"); i++;
-    t4 = get_double_data(data[i],"0.0"); i++;
-    k1 = get_double_data(data[i],"0.0"); i++;
-    k2 = get_double_data(data[i],"0.0"); i++;
-    t5 = get_double_data(data[i],"0.0"); i++;
-    k3 = get_double_data(data[i],"0.0"); i++;
-    k4 = get_double_data(data[i],"0.0"); i++;
-    t6 = get_double_data(data[i],"0.0"); i++;
-    k5 = get_double_data(data[i],"0.0"); i++;
-    k6 = get_double_data(data[i],"0.0"); i++;
-    t7 = get_double_data(data[i],"0.0"); i++;
-    k7 = get_double_data(data[i],"0.0"); i++;
-    k8 = get_double_data(data[i],"0.0");
-
-    set_K(k);
-    set_T1_in_s(t1);
-    set_T2_in_s(t2);
-    set_T3_in_s(t3);
-    set_Uo_in_pu(uo);
-    set_Uc_in_pu(uc);
-    set_Pmax_in_pu(pmax);
-    set_Pmin_in_pu(pmin);
-    set_T4_in_s(t4);
-    set_K1(k1);
-    set_K2(k2);
-    set_T5_in_s(t5);
-    set_K3(k3);
-    set_K4(k4);
-    set_T6_in_s(t6);
-    set_K5(k5);
-    set_K6(k6);
-    set_T7_in_s(t7);
-    set_K7(k7);
-    set_K8(k8);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool IEEEG1::setup_model_with_psse_string(string data)
@@ -372,61 +375,61 @@ void IEEEG1::set_block_toolkit()
 void IEEEG1::initialize()
 {
     ostringstream osstream;
-    if(is_model_initialized())
-        return;
-
-    GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
-
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
-
-    set_block_toolkit();
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    double pmech0 = get_initial_mechanical_power_in_pu_based_on_mbase_from_sync_generator_model();
-
-    droop.set_output(0.0);
-    droop.initialize();
-
-    double sumK=get_K1()+get_K3()+get_K5()+get_K7();
-
-    double valve = pmech0/sumK;
-
-    if(valve>get_Pmax_in_pu())
+    if(not is_model_initialized())
     {
-        osstream<<"Initialization error. Valve of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"Valve is "<<valve<<", and Pmax is "<<get_Pmax_in_pu()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        GENERATOR* generator = get_generator_pointer();
+        if(generator!=NULL)
+        {
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
+
+                set_block_toolkit();
+
+                STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+
+                double pmech0 = get_initial_mechanical_power_in_pu_based_on_mbase_from_sync_generator_model();
+
+                droop.set_output(0.0);
+                droop.initialize();
+
+                double sumK=get_K1()+get_K3()+get_K5()+get_K7();
+
+                double valve = pmech0/sumK;
+
+                if(valve>get_Pmax_in_pu())
+                {
+                    osstream<<"Initialization error. Valve of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                      <<"Valve is "<<valve<<", and Pmax is "<<get_Pmax_in_pu()<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                if(valve<get_Pmin_in_pu())
+                {
+                    osstream<<"Initialization error. Valve of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                      <<"Valve is "<<valve<<", and Pmin is "<<get_Pmin_in_pu()<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+
+                servo_motor.set_output(valve);
+                delayer1.set_output(valve);
+                delayer2.set_output(valve);
+                delayer3.set_output(valve);
+                delayer4.set_output(valve);
+
+                servo_motor.initialize();
+                delayer1.initialize();
+                delayer2.initialize();
+                delayer3.initialize();
+                delayer4.initialize();
+
+                set_initial_mechanical_power_reference_in_pu_based_on_mbase(valve);
+
+                set_flag_model_initialized_as_true();
+            }
+        }
     }
-    if(valve<get_Pmin_in_pu())
-    {
-        osstream<<"Initialization error. Valve of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-          <<"Valve is "<<valve<<", and Pmin is "<<get_Pmin_in_pu()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-
-    servo_motor.set_output(valve);
-    delayer1.set_output(valve);
-    delayer2.set_output(valve);
-    delayer3.set_output(valve);
-    delayer4.set_output(valve);
-
-    servo_motor.initialize();
-    delayer1.initialize();
-    delayer2.initialize();
-    delayer3.initialize();
-    delayer4.initialize();
-
-    set_initial_mechanical_power_reference_in_pu_based_on_mbase(valve);
-
-    set_flag_model_initialized_as_true();
 }
 
 void IEEEG1::run(DYNAMIC_MODE mode)
diff --git a/code/source/model/sg_models/turbine-governors/IEEEG1SB.cpp b/code/source/model/sg_models/turbine-governors/IEEEG1SB.cpp
index 021433a7..4a7770e6 100644
--- a/code/source/model/sg_models/turbine-governors/IEEEG1SB.cpp
+++ b/code/source/model/sg_models/turbine-governors/IEEEG1SB.cpp
@@ -366,77 +366,80 @@ double IEEEG1SB::get_Kb() const
 bool IEEEG1SB::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<32)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=32)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double k, t1, t2, t3, uo, uc, pmax, pmin, t4, k1, k2, t5, k3, k4, t6, k5, k6, t7, k7, k8,
+                   kp, ki, tfuel, tfd1, tfd2, cb, kb;
+
+            size_t i=5;
+            k = get_double_data(data[i],"0.0"); i++;
+            t1 = get_double_data(data[i],"0.0"); i++;
+            t2 = get_double_data(data[i],"0.0"); i++;
+            t3 = get_double_data(data[i],"0.0"); i++;
+            uo = get_double_data(data[i],"0.0"); i++;
+            uc = get_double_data(data[i],"0.0"); i++;
+            pmax = get_double_data(data[i],"0.0"); i++;
+            pmin = get_double_data(data[i],"0.0"); i++;
+            t4 = get_double_data(data[i],"0.0"); i++;
+            k1 = get_double_data(data[i],"0.0"); i++;
+            k2 = get_double_data(data[i],"0.0"); i++;
+            t5 = get_double_data(data[i],"0.0"); i++;
+            k3 = get_double_data(data[i],"0.0"); i++;
+            k4 = get_double_data(data[i],"0.0"); i++;
+            t6 = get_double_data(data[i],"0.0"); i++;
+            k5 = get_double_data(data[i],"0.0"); i++;
+            k6 = get_double_data(data[i],"0.0"); i++;
+            t7 = get_double_data(data[i],"0.0"); i++;
+            k7 = get_double_data(data[i],"0.0"); i++;
+            k8 = get_double_data(data[i],"0.0"); i++;
+            kp = get_double_data(data[i],"0.0"); i++;
+            ki = get_double_data(data[i],"0.0"); i++;
+            tfuel = get_double_data(data[i],"0.0"); i++;
+            tfd1 = get_double_data(data[i],"0.0"); i++;
+            tfd2 = get_double_data(data[i],"0.0"); i++;
+            cb = get_double_data(data[i],"0.0"); i++;
+            kb = get_double_data(data[i],"0.0");
+
+            set_K(k);
+            set_T1_in_s(t1);
+            set_T2_in_s(t2);
+            set_T3_in_s(t3);
+            set_Uo_in_pu(uo);
+            set_Uc_in_pu(uc);
+            set_Pmax_in_pu(pmax);
+            set_Pmin_in_pu(pmin);
+            set_T4_in_s(t4);
+            set_K1(k1);
+            set_K2(k2);
+            set_T5_in_s(t5);
+            set_K3(k3);
+            set_K4(k4);
+            set_T6_in_s(t6);
+            set_K5(k5);
+            set_K6(k6);
+            set_T7_in_s(t7);
+            set_K7(k7);
+            set_K8(k8);
+            set_KP(kp);
+            set_KI(ki);
+            set_Tfuel_in_s(tfuel);
+            set_TFD1_in_s(tfd1);
+            set_TFD2_in_s(tfd2);
+            set_Cb_in_s(cb);
+            set_Kb(kb);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-
-    double k, t1, t2, t3, uo, uc, pmax, pmin, t4, k1, k2, t5, k3, k4, t6, k5, k6, t7, k7, k8,
-           kp, ki, tfuel, tfd1, tfd2, cb, kb;
-
-    size_t i=5;
-    k = get_double_data(data[i],"0.0"); i++;
-    t1 = get_double_data(data[i],"0.0"); i++;
-    t2 = get_double_data(data[i],"0.0"); i++;
-    t3 = get_double_data(data[i],"0.0"); i++;
-    uo = get_double_data(data[i],"0.0"); i++;
-    uc = get_double_data(data[i],"0.0"); i++;
-    pmax = get_double_data(data[i],"0.0"); i++;
-    pmin = get_double_data(data[i],"0.0"); i++;
-    t4 = get_double_data(data[i],"0.0"); i++;
-    k1 = get_double_data(data[i],"0.0"); i++;
-    k2 = get_double_data(data[i],"0.0"); i++;
-    t5 = get_double_data(data[i],"0.0"); i++;
-    k3 = get_double_data(data[i],"0.0"); i++;
-    k4 = get_double_data(data[i],"0.0"); i++;
-    t6 = get_double_data(data[i],"0.0"); i++;
-    k5 = get_double_data(data[i],"0.0"); i++;
-    k6 = get_double_data(data[i],"0.0"); i++;
-    t7 = get_double_data(data[i],"0.0"); i++;
-    k7 = get_double_data(data[i],"0.0"); i++;
-    k8 = get_double_data(data[i],"0.0"); i++;
-    kp = get_double_data(data[i],"0.0"); i++;
-    ki = get_double_data(data[i],"0.0"); i++;
-    tfuel = get_double_data(data[i],"0.0"); i++;
-    tfd1 = get_double_data(data[i],"0.0"); i++;
-    tfd2 = get_double_data(data[i],"0.0"); i++;
-    cb = get_double_data(data[i],"0.0"); i++;
-    kb = get_double_data(data[i],"0.0");
-
-    set_K(k);
-    set_T1_in_s(t1);
-    set_T2_in_s(t2);
-    set_T3_in_s(t3);
-    set_Uo_in_pu(uo);
-    set_Uc_in_pu(uc);
-    set_Pmax_in_pu(pmax);
-    set_Pmin_in_pu(pmin);
-    set_T4_in_s(t4);
-    set_K1(k1);
-    set_K2(k2);
-    set_T5_in_s(t5);
-    set_K3(k3);
-    set_K4(k4);
-    set_T6_in_s(t6);
-    set_K5(k5);
-    set_K6(k6);
-    set_T7_in_s(t7);
-    set_K7(k7);
-    set_K8(k8);
-    set_KP(kp);
-    set_KI(ki);
-    set_Tfuel_in_s(tfuel);
-    set_TFD1_in_s(tfd1);
-    set_TFD2_in_s(tfd2);
-    set_Cb_in_s(cb);
-    set_Kb(kb);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool IEEEG1SB::setup_model_with_psse_string(string data)
@@ -474,74 +477,76 @@ void IEEEG1SB::set_block_toolkit()
 void IEEEG1SB::initialize()
 {
     ostringstream osstream;
-    if(is_model_initialized())
-        return;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+    if(not is_model_initialized())
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
+        GENERATOR* generator = get_generator_pointer();
+        if(generator!=NULL)
+        {
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
 
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
+                set_block_toolkit();
 
-    set_block_toolkit();
+                double pmech0 = get_initial_mechanical_power_in_pu_based_on_mbase_from_sync_generator_model();
 
-    double pmech0 = get_initial_mechanical_power_in_pu_based_on_mbase_from_sync_generator_model();
+                droop.set_output(0.0);
+                droop.initialize();
 
-    droop.set_output(0.0);
-    droop.initialize();
+                double sumK=get_K1()+get_K3()+get_K5()+get_K7();
 
-    double sumK=get_K1()+get_K3()+get_K5()+get_K7();
+                double valve = pmech0/sumK;
 
-    double valve = pmech0/sumK;
+                if(valve>get_Pmax_in_pu())
+                {
+                    osstream<<"Initialization error. Valve of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                      <<"Valve is "<<valve<<", and Pmax is "<<get_Pmax_in_pu()<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                if(valve<get_Pmin_in_pu())
+                {
+                    osstream<<"Initialization error. Valve of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                      <<"Valve is "<<valve<<", and Pmin is "<<get_Pmin_in_pu()<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
 
-    if(valve>get_Pmax_in_pu())
-    {
-        osstream<<"Initialization error. Valve of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"Valve is "<<valve<<", and Pmax is "<<get_Pmax_in_pu()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    if(valve<get_Pmin_in_pu())
-    {
-        osstream<<"Initialization error. Valve of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-          <<"Valve is "<<valve<<", and Pmin is "<<get_Pmin_in_pu()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-
-    servo_motor.set_output(valve);
-    delayer1.set_output(valve);
-    delayer2.set_output(valve);
-    delayer3.set_output(valve);
-    delayer4.set_output(valve);
+                servo_motor.set_output(valve);
+                delayer1.set_output(valve);
+                delayer2.set_output(valve);
+                delayer3.set_output(valve);
+                delayer4.set_output(valve);
 
-    servo_motor.initialize();
-    delayer1.initialize();
-    delayer2.initialize();
-    delayer3.initialize();
-    delayer4.initialize();
+                servo_motor.initialize();
+                delayer1.initialize();
+                delayer2.initialize();
+                delayer3.initialize();
+                delayer4.initialize();
 
-    set_initial_mechanical_power_reference_in_pu_based_on_mbase(valve);
+                set_initial_mechanical_power_reference_in_pu_based_on_mbase(valve);
 
-    drum.set_output(1.0+get_Kb()*valve*valve);
-    drum.initialize();
+                drum.set_output(1.0+get_Kb()*valve*valve);
+                drum.initialize();
 
-    fuel_delayer2.set_output(valve);
-    fuel_delayer2.initialize();
+                fuel_delayer2.set_output(valve);
+                fuel_delayer2.initialize();
 
-    fuel_delayer1.set_output(valve);
-    fuel_delayer1.initialize();
+                fuel_delayer1.set_output(valve);
+                fuel_delayer1.initialize();
 
-    fuel_producer.set_output(valve);
-    fuel_producer.initialize();
+                fuel_producer.set_output(valve);
+                fuel_producer.initialize();
 
-    boiler_PI.set_output(valve);
-    boiler_PI.initialize();
+                boiler_PI.set_output(valve);
+                boiler_PI.initialize();
 
-    set_flag_model_initialized_as_true();
+                set_flag_model_initialized_as_true();
+            }
+        }
+    }
 }
 
 void IEEEG1SB::run(DYNAMIC_MODE mode)
diff --git a/code/source/model/sg_models/turbine-governors/IEEEG2.cpp b/code/source/model/sg_models/turbine-governors/IEEEG2.cpp
index 79cbe143..64b428b6 100644
--- a/code/source/model/sg_models/turbine-governors/IEEEG2.cpp
+++ b/code/source/model/sg_models/turbine-governors/IEEEG2.cpp
@@ -132,35 +132,39 @@ double IEEEG2::get_T4_in_s() const
 bool IEEEG2::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<10)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=10)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double k, t1, t2, t3, pmax, pmin, t4;
+
+            size_t i=3;
+            k = get_double_data(data[i],"0.0"); i++;
+            t1 = get_double_data(data[i],"0.0"); i++;
+            t2 = get_double_data(data[i],"0.0"); i++;
+            t3 = get_double_data(data[i],"0.0"); i++;
+            pmax = get_double_data(data[i],"0.0"); i++;
+            pmin = get_double_data(data[i],"0.0"); i++;
+            t4 = get_double_data(data[i],"0.0"); i++;
+
+            set_K(k);
+            set_T1_in_s(t1);
+            set_T2_in_s(t2);
+            set_T3_in_s(t3);
+            set_Pmax_in_pu(pmax);
+            set_Pmin_in_pu(pmin);
+            set_T4_in_s(t4);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    double k, t1, t2, t3, pmax, pmin, t4;
-
-    size_t i=3;
-    k = get_double_data(data[i],"0.0"); i++;
-    t1 = get_double_data(data[i],"0.0"); i++;
-    t2 = get_double_data(data[i],"0.0"); i++;
-    t3 = get_double_data(data[i],"0.0"); i++;
-    pmax = get_double_data(data[i],"0.0"); i++;
-    pmin = get_double_data(data[i],"0.0"); i++;
-    t4 = get_double_data(data[i],"0.0"); i++;
-
-    set_K(k);
-    set_T1_in_s(t1);
-    set_T2_in_s(t2);
-    set_T3_in_s(t3);
-    set_Pmax_in_pu(pmax);
-    set_Pmin_in_pu(pmin);
-    set_T4_in_s(t4);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool IEEEG2::setup_model_with_psse_string(string data)
@@ -191,88 +195,88 @@ void IEEEG2::initialize()
 {
     ostringstream osstream;
 
-    if(is_model_initialized())
-        return;
-
-    GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
-
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
-
-    set_block_toolkit();
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    double pmech0 = get_initial_mechanical_power_in_pu_based_on_mbase_from_sync_generator_model();
-
-    droop.set_output(0.0);
-    droop.initialize();
-
-    tuner.set_output(0.0);
-    tuner.initialize();
-
-    if(pmech0>get_Pmax_in_pu())
+    if(not is_model_initialized())
     {
-        osstream<<"Initialization error. Pmech of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"Pmech is "<<pmech0<<", and Pmax is "<<get_Pmax_in_pu()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
+        GENERATOR* generator = get_generator_pointer();
+        if(generator!=NULL)
+        {
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
+
+                set_block_toolkit();
+
+                STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+
+                double pmech0 = get_initial_mechanical_power_in_pu_based_on_mbase_from_sync_generator_model();
+
+                droop.set_output(0.0);
+                droop.initialize();
+
+                tuner.set_output(0.0);
+                tuner.initialize();
+
+                if(pmech0>get_Pmax_in_pu())
+                {
+                    osstream<<"Initialization error. Pmech of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                      <<"Pmech is "<<pmech0<<", and Pmax is "<<get_Pmax_in_pu()<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                if(pmech0<get_Pmin_in_pu())
+                {
+                    osstream<<"Initialization error. Pmech of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                      <<"Pmech is "<<pmech0<<", and Pmin is "<<get_Pmin_in_pu()<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+
+                water_hammer.set_output(pmech0);
+                water_hammer.initialize();
+
+                set_initial_mechanical_power_reference_in_pu_based_on_mbase(pmech0);
+
+                set_flag_model_initialized_as_true();
+            }
+        }
     }
-    if(pmech0<get_Pmin_in_pu())
-    {
-        osstream<<"Initialization error. Pmech of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-          <<"Pmech is "<<pmech0<<", and Pmin is "<<get_Pmin_in_pu()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-
-    water_hammer.set_output(pmech0);
-    water_hammer.initialize();
-
-    set_initial_mechanical_power_reference_in_pu_based_on_mbase(pmech0);
-
-    set_flag_model_initialized_as_true();
 }
 
 void IEEEG2::run(DYNAMIC_MODE mode)
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
+    if(generator!=NULL)
+    {
+        SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+        if(gen_model!=NULL)
+        {
+            double Pref = get_mechanical_power_reference_in_pu_based_on_mbase();
+            double speed = get_rotor_speed_deviation_in_pu_from_sync_generator_model();
 
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
+            droop.set_input(speed);
+            droop.run(mode);
 
-    double Pref = get_mechanical_power_reference_in_pu_based_on_mbase();
-    double speed = get_rotor_speed_deviation_in_pu_from_sync_generator_model();
+            double input = droop.get_output();
 
-    droop.set_input(speed);
-    droop.run(mode);
+            tuner.set_input(input);
+            tuner.run(mode);
 
-    double input = droop.get_output();
+            input = Pref - tuner.get_output();
 
-    tuner.set_input(input);
-    tuner.run(mode);
+            double Pmax = get_Pmax_in_pu();
+            double Pmin = get_Pmin_in_pu();
+            if(input>Pmax)
+                input = Pmax;
+            if(input<Pmin)
+                input = Pmin;
 
-    input = Pref - tuner.get_output();
+            water_hammer.set_input(input);
+            water_hammer.run(mode);
 
-    double Pmax = get_Pmax_in_pu();
-    double Pmin = get_Pmin_in_pu();
-    if(input>Pmax)
-        input = Pmax;
-    if(input<Pmin)
-        input = Pmin;
-
-    water_hammer.set_input(input);
-    water_hammer.run(mode);
-
-    if(mode==UPDATE_MODE)
-        set_flag_model_updated_as_true();
+            if(mode==UPDATE_MODE)
+                set_flag_model_updated_as_true();
+        }
+    }
 }
 
 double IEEEG2::get_mechanical_power_in_pu_based_on_mbase() const
diff --git a/code/source/model/sg_models/turbine-governors/IEEEG3.cpp b/code/source/model/sg_models/turbine-governors/IEEEG3.cpp
index 65120036..ddab5a5d 100644
--- a/code/source/model/sg_models/turbine-governors/IEEEG3.cpp
+++ b/code/source/model/sg_models/turbine-governors/IEEEG3.cpp
@@ -212,49 +212,53 @@ double IEEEG3::get_a23() const
 bool IEEEG3::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<17)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=17)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double tg, tp, uo, uc, pmax, pmin, sigma, delta, tr, tw, a11, a13, a21, a23;
+
+            size_t i=3;
+            tg = get_double_data(data[i],"0.0"); i++;
+            tp = get_double_data(data[i],"0.0"); i++;
+            uo = get_double_data(data[i],"0.0"); i++;
+            uc = get_double_data(data[i],"0.0"); i++;
+            pmax = get_double_data(data[i],"0.0"); i++;
+            pmin = get_double_data(data[i],"0.0"); i++;
+            sigma = get_double_data(data[i],"0.0"); i++;
+            delta = get_double_data(data[i],"0.0"); i++;
+            tr = get_double_data(data[i],"0.0"); i++;
+            tw = get_double_data(data[i],"0.0"); i++;
+            a11 = get_double_data(data[i],"0.0"); i++;
+            a13 = get_double_data(data[i],"0.0"); i++;
+            a21 = get_double_data(data[i],"0.0"); i++;
+            a23 = get_double_data(data[i],"0.0"); i++;
+
+            set_TG_in_s(tg);
+            set_TP_in_s(tp);
+            set_Uo_in_pu(uo);
+            set_Uc_in_pu(uc);
+            set_Pmax_in_pu(pmax);
+            set_Pmin_in_pu(pmin);
+            set_sigma(sigma);
+            set_delta(delta);
+            set_TR_in_s(tr);
+            set_TW_in_s(tw);
+            set_a11(a11);
+            set_a13(a13);
+            set_a21(a21);
+            set_a23(a23);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    double tg, tp, uo, uc, pmax, pmin, sigma, delta, tr, tw, a11, a13, a21, a23;
-
-    size_t i=3;
-    tg = get_double_data(data[i],"0.0"); i++;
-    tp = get_double_data(data[i],"0.0"); i++;
-    uo = get_double_data(data[i],"0.0"); i++;
-    uc = get_double_data(data[i],"0.0"); i++;
-    pmax = get_double_data(data[i],"0.0"); i++;
-    pmin = get_double_data(data[i],"0.0"); i++;
-    sigma = get_double_data(data[i],"0.0"); i++;
-    delta = get_double_data(data[i],"0.0"); i++;
-    tr = get_double_data(data[i],"0.0"); i++;
-    tw = get_double_data(data[i],"0.0"); i++;
-    a11 = get_double_data(data[i],"0.0"); i++;
-    a13 = get_double_data(data[i],"0.0"); i++;
-    a21 = get_double_data(data[i],"0.0"); i++;
-    a23 = get_double_data(data[i],"0.0"); i++;
-
-    set_TG_in_s(tg);
-    set_TP_in_s(tp);
-    set_Uo_in_pu(uo);
-    set_Uc_in_pu(uc);
-    set_Pmax_in_pu(pmax);
-    set_Pmin_in_pu(pmin);
-    set_sigma(sigma);
-    set_delta(delta);
-    set_TR_in_s(tr);
-    set_TW_in_s(tw);
-    set_a11(a11);
-    set_a13(a13);
-    set_a21(a21);
-    set_a23(a23);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool IEEEG3::setup_model_with_psse_string(string data)
@@ -285,72 +289,73 @@ void IEEEG3::set_block_toolkit()
 void IEEEG3::initialize()
 {
     ostringstream osstream;
-    if(is_model_initialized())
-        return;
-
-    GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return;
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
+    if(not is_model_initialized())
+    {
+        GENERATOR* generator = get_generator_pointer();
+        if(generator!=NULL)
+        {
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
 
-    set_block_toolkit();
+                set_block_toolkit();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+                STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    double delta = get_delta();
-    double TR = get_TR_in_s();
-    feedbacker.set_K(delta*TR);
+                double delta = get_delta();
+                double TR = get_TR_in_s();
+                feedbacker.set_K(delta*TR);
 
-    double a11 = get_a11();
-    double a13 = get_a13();
-    double a21 = get_a21();
-    double a23 = get_a23();
-    double TW = get_TW_in_s();
+                double a11 = get_a11();
+                double a13 = get_a13();
+                double a21 = get_a21();
+                double a23 = get_a23();
+                double TW = get_TW_in_s();
 
-    water_hammer.set_K(a23);
-    water_hammer.set_T1_in_s((a11-a13*a21/a23)*TW);
-    water_hammer.set_T2_in_s(a11*TW);
+                water_hammer.set_K(a23);
+                water_hammer.set_T1_in_s((a11-a13*a21/a23)*TW);
+                water_hammer.set_T2_in_s(a11*TW);
 
 
-    double pmech0 = get_initial_mechanical_power_in_pu_based_on_mbase_from_sync_generator_model();
+                double pmech0 = get_initial_mechanical_power_in_pu_based_on_mbase_from_sync_generator_model();
 
-    water_hammer.set_output(pmech0);
-    water_hammer.initialize();
+                water_hammer.set_output(pmech0);
+                water_hammer.initialize();
 
-    double valve = water_hammer.get_input();
-    feedbacker.set_input(valve);
-    feedbacker.initialize();
+                double valve = water_hammer.get_input();
+                feedbacker.set_input(valve);
+                feedbacker.initialize();
 
 
-    if(valve>get_Pmax_in_pu())
-    {
-        osstream<<"Initialization error. Valve of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"Valve is "<<valve<<", and Pmax is "<<get_Pmax_in_pu()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    if(valve<get_Pmin_in_pu())
-    {
-        osstream<<"Initialization error. Valve of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-          <<"Valve is "<<valve<<", and Pmin is "<<get_Pmin_in_pu()<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
+                if(valve>get_Pmax_in_pu())
+                {
+                    osstream<<"Initialization error. Valve of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                      <<"Valve is "<<valve<<", and Pmax is "<<get_Pmax_in_pu()<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                if(valve<get_Pmin_in_pu())
+                {
+                    osstream<<"Initialization error. Valve of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                      <<"Valve is "<<valve<<", and Pmin is "<<get_Pmin_in_pu()<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
 
-    servo_motor.set_output(valve);
-    servo_motor.initialize();
+                servo_motor.set_output(valve);
+                servo_motor.initialize();
 
-    governor.set_output(0.0);
-    governor.initialize();
+                governor.set_output(0.0);
+                governor.initialize();
 
-    double Pref = get_sigma()*valve;
+                double Pref = get_sigma()*valve;
 
-    set_initial_mechanical_power_reference_in_pu_based_on_mbase(Pref);
+                set_initial_mechanical_power_reference_in_pu_based_on_mbase(Pref);
 
-    set_flag_model_initialized_as_true();
+                set_flag_model_initialized_as_true();
+            }
+        }
+    }
 }
 
 void IEEEG3::run(DYNAMIC_MODE mode)
diff --git a/code/source/model/sg_models/turbine-governors/IEESGO.cpp b/code/source/model/sg_models/turbine-governors/IEESGO.cpp
index 5daa9136..099642c9 100644
--- a/code/source/model/sg_models/turbine-governors/IEESGO.cpp
+++ b/code/source/model/sg_models/turbine-governors/IEESGO.cpp
@@ -176,42 +176,46 @@ double IEESGO::get_Pmin_in_pu() const
 bool IEESGO::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<14)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=14)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double t1, t2, t3, t4, t5, t6, k1, k2, k3, pmax, pmin;
+            size_t i=3;
+            t1 = get_double_data(data[i],"0.0"); i++;
+            t2 = get_double_data(data[i],"0.0"); i++;
+            t3 = get_double_data(data[i],"0.0"); i++;
+            t4 = get_double_data(data[i],"0.0"); i++;
+            t5 = get_double_data(data[i],"0.0"); i++;
+            t6 = get_double_data(data[i],"0.0"); i++;
+            k1 = get_double_data(data[i],"0.0"); i++;
+            k2 = get_double_data(data[i],"0.0"); i++;
+            k3 = get_double_data(data[i],"0.0"); i++;
+            pmax = get_double_data(data[i],"0.0"); i++;
+            pmin = get_double_data(data[i],"0.0"); i++;
+
+            set_K1(k1);
+            set_K2(k2);
+            set_K3(k3);
+            set_T1_in_s(t1);
+            set_T2_in_s(t2);
+            set_T3_in_s(t3);
+            set_T4_in_s(t4);
+            set_T5_in_s(t5);
+            set_T6_in_s(t6);
+            set_Pmax_in_pu(pmax);
+            set_Pmin_in_pu(pmin);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    double t1, t2, t3, t4, t5, t6, k1, k2, k3, pmax, pmin;
-    size_t i=3;
-    t1 = get_double_data(data[i],"0.0"); i++;
-    t2 = get_double_data(data[i],"0.0"); i++;
-    t3 = get_double_data(data[i],"0.0"); i++;
-    t4 = get_double_data(data[i],"0.0"); i++;
-    t5 = get_double_data(data[i],"0.0"); i++;
-    t6 = get_double_data(data[i],"0.0"); i++;
-    k1 = get_double_data(data[i],"0.0"); i++;
-    k2 = get_double_data(data[i],"0.0"); i++;
-    k3 = get_double_data(data[i],"0.0"); i++;
-    pmax = get_double_data(data[i],"0.0"); i++;
-    pmin = get_double_data(data[i],"0.0"); i++;
-
-    set_K1(k1);
-    set_K2(k2);
-    set_K3(k3);
-    set_T1_in_s(t1);
-    set_T2_in_s(t2);
-    set_T3_in_s(t3);
-    set_T4_in_s(t4);
-    set_T5_in_s(t5);
-    set_T6_in_s(t6);
-    set_Pmax_in_pu(pmax);
-    set_Pmin_in_pu(pmin);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool IEESGO::setup_model_with_psse_string(string data)
diff --git a/code/source/model/sg_models/turbine-governors/TGOV1.cpp b/code/source/model/sg_models/turbine-governors/TGOV1.cpp
index 845116aa..d317dcf1 100644
--- a/code/source/model/sg_models/turbine-governors/TGOV1.cpp
+++ b/code/source/model/sg_models/turbine-governors/TGOV1.cpp
@@ -75,6 +75,7 @@ void TGOV1::set_T3_in_s(double T)
 {
     turbine.set_T2_in_s(T);
 }
+
 void TGOV1::set_Valvemax_in_pu(double V)
 {
     governor.set_upper_limit(V);
@@ -84,6 +85,7 @@ void TGOV1::set_Valvemin_in_pu(double V)
 {
     governor.set_lower_limit(V);
 }
+
 void TGOV1::set_D(double D)
 {
     damping.set_K(D);
@@ -117,44 +119,48 @@ double TGOV1::get_Valvemin_in_pu() const
 {
     return governor.get_lower_limit();
 }
+
 double TGOV1::get_D() const
 {
     return damping.get_K();
 }
 
-
 bool TGOV1::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<9)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=9)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double r, t1, vmax, vmin, t2, t3, d;
+
+            size_t i=3;
+            r = get_double_data(data[i],"0.0"); i++;
+            t1 = get_double_data(data[i],"0.0"); i++;
+            vmax = get_double_data(data[i],"0.0"); i++;
+            vmin = get_double_data(data[i],"0.0"); i++;
+            t2 = get_double_data(data[i],"0.0"); i++;
+            t3 = get_double_data(data[i],"0.0"); i++;
+            d = get_double_data(data[i],"0.0"); i++;
+
+            set_R(r);
+            set_T1_in_s(t1);
+            set_Valvemax_in_pu(vmax);
+            set_Valvemin_in_pu(vmin);
+            set_T2_in_s(t2);
+            set_T3_in_s(t3);
+            set_D(d);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    double r, t1, vmax, vmin, t2, t3, d;
-
-    size_t i=3;
-    r = get_double_data(data[i],"0.0"); i++;
-    t1 = get_double_data(data[i],"0.0"); i++;
-    vmax = get_double_data(data[i],"0.0"); i++;
-    vmin = get_double_data(data[i],"0.0"); i++;
-    t2 = get_double_data(data[i],"0.0"); i++;
-    t3 = get_double_data(data[i],"0.0"); i++;
-    d = get_double_data(data[i],"0.0"); i++;
-
-    set_R(r);
-    set_T1_in_s(t1);
-    set_Valvemax_in_pu(vmax);
-    set_Valvemin_in_pu(vmin);
-    set_T2_in_s(t2);
-    set_T3_in_s(t3);
-    set_D(d);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool TGOV1::setup_model_with_psse_string(string data)
diff --git a/code/source/model/sg_models/turbine-governors/turbine_governor_model.cpp b/code/source/model/sg_models/turbine-governors/turbine_governor_model.cpp
index ff91a633..ce7dc6ca 100644
--- a/code/source/model/sg_models/turbine-governors/turbine_governor_model.cpp
+++ b/code/source/model/sg_models/turbine-governors/turbine_governor_model.cpp
@@ -24,30 +24,31 @@ string TURBINE_GOVERNOR_MODEL::get_model_type() const
 double TURBINE_GOVERNOR_MODEL::get_rotor_speed_deviation_in_pu_from_sync_generator_model() const
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-
-    SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-    if(gen_model==NULL)
-        return 0.0;
+    if(generator!=NULL)
+    {
+        SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+        if(gen_model!=NULL)
+            return gen_model->get_rotor_speed_deviation_in_pu();
+        else
+            return 0.0;
+    }
     else
-        return gen_model->get_rotor_speed_deviation_in_pu();
-
-
+        return 0.0;
 }
+
 double TURBINE_GOVERNOR_MODEL::get_initial_mechanical_power_in_pu_based_on_mbase_from_sync_generator_model() const
 {
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-    else
+    if(generator!=NULL)
     {
         SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
-        if(gen_model==NULL)
-            return 0.0;
-        else
+        if(gen_model!=NULL)
             return gen_model->get_initial_mechanical_power_in_pu_based_on_mbase();
+        else
+            return 0.0;
     }
+    else
+        return 0.0;
 }
 
 void TURBINE_GOVERNOR_MODEL::set_initial_mechanical_power_reference_in_pu_based_on_mbase(double P)
diff --git a/code/source/model/sg_models/turbine_load_controller_model/lcfb1.cpp b/code/source/model/sg_models/turbine_load_controller_model/lcfb1.cpp
index 6f4002ad..42928c5f 100644
--- a/code/source/model/sg_models/turbine_load_controller_model/lcfb1.cpp
+++ b/code/source/model/sg_models/turbine_load_controller_model/lcfb1.cpp
@@ -186,41 +186,45 @@ double LCFB1::get_Pelec0() const
 bool LCFB1::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<12)
-        is_successful = false;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
+    if(data.size()>=12)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t frequency_flag, power_flag;
+            double fb, tpelec, db, emax, kp, ki, irmax;
+
+            size_t i=3;
+            frequency_flag = get_integer_data(data[i],"0"); i++;
+            power_flag = get_integer_data(data[i],"0"); i++;
+
+            fb = get_double_data(data[i],"0.0"); i++;
+            tpelec = get_double_data(data[i],"0.0"); i++;
+            db = get_double_data(data[i],"0.0"); i++;
+            emax = get_double_data(data[i],"0.0"); i++;
+            kp = get_double_data(data[i],"0.0"); i++;
+            ki = get_double_data(data[i],"0.0"); i++;
+            irmax = get_double_data(data[i],"0.0");
+
+            set_frequency_regulation_flag((frequency_flag==0?false:true));
+            set_power_regulation_flag((power_flag==0?false:true));
+            set_Fb(fb);
+            set_Tpelec_in_s(tpelec);
+            set_db(db);
+            set_Emax(emax);
+            set_Kp(kp);
+            set_Ki(ki);
+            set_Irmax(irmax);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
         return is_successful;
-
-    size_t frequency_flag, power_flag;
-    double fb, tpelec, db, emax, kp, ki, irmax;
-
-    size_t i=3;
-    frequency_flag = get_integer_data(data[i],"0"); i++;
-    power_flag = get_integer_data(data[i],"0"); i++;
-
-    fb = get_double_data(data[i],"0.0"); i++;
-    tpelec = get_double_data(data[i],"0.0"); i++;
-    db = get_double_data(data[i],"0.0"); i++;
-    emax = get_double_data(data[i],"0.0"); i++;
-    kp = get_double_data(data[i],"0.0"); i++;
-    ki = get_double_data(data[i],"0.0"); i++;
-    irmax = get_double_data(data[i],"0.0");
-
-    set_frequency_regulation_flag((frequency_flag==0?false:true));
-    set_power_regulation_flag((power_flag==0?false:true));
-    set_Fb(fb);
-    set_Tpelec_in_s(tpelec);
-    set_db(db);
-    set_Emax(emax);
-    set_Kp(kp);
-    set_Ki(ki);
-    set_Irmax(irmax);
-
-    is_successful = true;
-
-    return is_successful;
 }
 
 bool LCFB1::setup_model_with_psse_string(string data)
@@ -251,28 +255,29 @@ void LCFB1::initialize()
     ostringstream osstream;
 
     GENERATOR* generator = get_generator_pointer();
-    if(generator==NULL)
+    if(generator!=NULL)
     {
-        deactivate_model();
-        set_flag_model_initialized_as_true();
-        return;
-    }
+        set_block_toolkit();
 
-    set_block_toolkit();
-
-    double pref = get_initial_mechanical_power_reference_in_pu_based_on_mbase_from_turbine_governor_model();
-    set_Pref0(pref);
+        double pref = get_initial_mechanical_power_reference_in_pu_based_on_mbase_from_turbine_governor_model();
+        set_Pref0(pref);
 
-    error_integrator.set_output(0.0);
-    error_integrator.initialize();
+        error_integrator.set_output(0.0);
+        error_integrator.initialize();
 
-    double pelec = get_terminal_active_power_in_pu_based_on_mbase_from_generator_model();
-    Pelec_sensor.set_output(pelec);
-    Pelec_sensor.initialize();
+        double pelec = get_terminal_active_power_in_pu_based_on_mbase_from_generator_model();
+        Pelec_sensor.set_output(pelec);
+        Pelec_sensor.initialize();
 
-    set_Pelec0(pelec);
+        set_Pelec0(pelec);
 
-    set_flag_model_initialized_as_true();
+        set_flag_model_initialized_as_true();
+    }
+    else
+    {
+        deactivate_model();
+        set_flag_model_initialized_as_true();
+    }
 }
 
 void LCFB1::run(DYNAMIC_MODE mode)
diff --git a/code/source/model/wtg_models/wind_speed_model/filewind.cpp b/code/source/model/wtg_models/wind_speed_model/filewind.cpp
index efdfd788..8068a78c 100644
--- a/code/source/model/wtg_models/wind_speed_model/filewind.cpp
+++ b/code/source/model/wtg_models/wind_speed_model/filewind.cpp
@@ -71,20 +71,24 @@ string FILEWIND::get_wind_speed_serial_file() const
 bool FILEWIND::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<4)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    string file;
-    file = get_string_data(data[3],"0.0");
+    if(data.size()>=4)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            string file;
+            file = get_string_data(data[3],"0.0");
 
-    set_wind_speed_serial_file(file);
+            set_wind_speed_serial_file(file);
 
-    is_successful = true;
-    return is_successful;
+            is_successful = true;
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
+        return is_successful;
 }
 
 bool FILEWIND::setup_model_with_psse_string(string data)
@@ -144,49 +148,50 @@ void FILEWIND::load_wind_speed_from_file()
         return;
     }
     ifstream fid(file);
-    if(not fid.is_open())
-    {
-        oosstream<<"Initialization error. Fail to load wind speed data from file '"<<file<<"'. Check model "<<get_model_name()<<" of "<<get_device_name();
-        toolkit.show_information_with_leading_time_stamp(oosstream);
-        return;
-    }
-
-    time.clear();
-    wind_speed.clear();
-    wind_direction.clear();
+    if(fid.is_open())
+    {
+        time.clear();
+        wind_speed.clear();
+        wind_direction.clear();
+
+        string data;
+        vector<string> datavec;
+        getline(fid, data); // skip the head line
+        while(true)
+        {
+            getline(fid, data);
+            if(data.size()<3)
+                break;
+            data = trim_string(data);
+            data = string2csv(data);
+            datavec = split_string(data,",");
+            if(datavec.size()<2)
+                break;
+
+            double t = get_double_data(datavec.front(),"0.0");
+            datavec.erase(datavec.begin());
 
-    string data;
-    vector<string> datavec;
-    getline(fid, data); // skip the head line
-    while(true)
-    {
-        getline(fid, data);
-        if(data.size()<3)
-            break;
-        data = trim_string(data);
-        data = string2csv(data);
-        datavec = split_string(data,",");
-        if(datavec.size()<2)
-            break;
-
-        double t = get_double_data(datavec.front(),"0.0");
-        datavec.erase(datavec.begin());
-
-        double v = get_double_data(datavec.front(),"0.0");
-        datavec.erase(datavec.begin());
-
-        double direction = 0.0;
-        if(datavec.size()>0)
-        {
-            direction = get_double_data(datavec.front(),"0.0");
+            double v = get_double_data(datavec.front(),"0.0");
             datavec.erase(datavec.begin());
-        }
 
-        time.push_back(t);
-        wind_speed.push_back(v);
-        wind_direction.push_back(direction);
+            double direction = 0.0;
+            if(datavec.size()>0)
+            {
+                direction = get_double_data(datavec.front(),"0.0");
+                datavec.erase(datavec.begin());
+            }
+
+            time.push_back(t);
+            wind_speed.push_back(v);
+            wind_direction.push_back(direction);
+        }
+        fid.close();
+    }
+    else
+    {
+        oosstream<<"Initialization error. Fail to load wind speed data from file '"<<file<<"'. Check model "<<get_model_name()<<" of "<<get_device_name();
+        toolkit.show_information_with_leading_time_stamp(oosstream);
     }
-    fid.close();
 }
 
 void FILEWIND::run(DYNAMIC_MODE mode)
@@ -233,15 +238,19 @@ double FILEWIND::get_wind_direction_in_deg()
 double FILEWIND::get_wind_speed_in_pu()
 {
     WT_GENERATOR* generator = get_wt_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-
-    WT_AERODYNAMIC_MODEL* aero_model = generator->get_wt_aerodynamic_model();
-    if(aero_model==NULL)
+    if(generator!=NULL)
+    {
+        WT_AERODYNAMIC_MODEL* aero_model = generator->get_wt_aerodynamic_model();
+        if(aero_model!=NULL)
+        {
+            double vwind = get_wind_speed_in_mps();
+            return vwind/aero_model->get_nominal_wind_speed_in_mps();
+        }
+        else
+            return 0.0;
+    }
+    else
         return 0.0;
-
-    double vwind = get_wind_speed_in_mps();
-    return vwind/aero_model->get_nominal_wind_speed_in_mps();
 }
 */
 void FILEWIND::set_previous_position(size_t pos)
diff --git a/code/source/model/wtg_models/wind_speed_model/wind_speed_model.cpp b/code/source/model/wtg_models/wind_speed_model/wind_speed_model.cpp
index 3ed74897..6f10a458 100644
--- a/code/source/model/wtg_models/wind_speed_model/wind_speed_model.cpp
+++ b/code/source/model/wtg_models/wind_speed_model/wind_speed_model.cpp
@@ -22,13 +22,16 @@ string WIND_SPEED_MODEL::get_model_type() const
 double WIND_SPEED_MODEL::get_nominal_wind_speed_in_mps() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
+    if(gen!=NULL)
+    {
+        WT_AERODYNAMIC_MODEL* aerd = gen->get_wt_aerodynamic_model();
+        if(aerd!=NULL)
+            return aerd->get_nominal_wind_speed_in_mps();
+        else
+            return 0.0;
+    }
+    else
         return 0.0;
-    WT_AERODYNAMIC_MODEL* aerd = gen->get_wt_aerodynamic_model();
-    if(aerd==NULL)
-        return 0.0;
-
-    return aerd->get_nominal_wind_speed_in_mps();
 }
 
 double WIND_SPEED_MODEL::get_wind_speed_in_mps()
diff --git a/code/source/model/wtg_models/wt_aerodynamic_model/aerd0.cpp b/code/source/model/wtg_models/wt_aerodynamic_model/aerd0.cpp
index 1c9ee735..af0fb169 100644
--- a/code/source/model/wtg_models/wt_aerodynamic_model/aerd0.cpp
+++ b/code/source/model/wtg_models/wt_aerodynamic_model/aerd0.cpp
@@ -174,74 +174,78 @@ string AERD0::get_model_name() const
 bool AERD0::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<19)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    int speed_mode_flag=0;
-    size_t n;
-    double vwind0, gear_eta, rou0_air, min_speed, max_speed;
-    double rou_air;
-    double c1, c2, c3, c4, c5, c6, c7, c8;
-
-    size_t i=3;
-    speed_mode_flag = get_integer_data(data[i],"0"); i++;
-    n = size_t(get_integer_data(data[i],"1")); i++;
-    vwind0 = get_double_data(data[i],"0.0"); i++;
-    gear_eta = get_double_data(data[i],"0.0"); i++;
-    rou0_air = get_double_data(data[i],"0.0"); i++;
-    min_speed = get_double_data(data[i],"0.6"); i++;
-    max_speed = get_double_data(data[i],"1.2"); i++;
-    rou_air = get_double_data(data[i],"0.0"); i++;
-    c1 = get_double_data(data[i],"0.0"); i++;
-    c2 = get_double_data(data[i],"0.0"); i++;
-    c3 = get_double_data(data[i],"0.0"); i++;
-    c4 = get_double_data(data[i],"0.0"); i++;
-    c5 = get_double_data(data[i],"0.0"); i++;
-    c6 = get_double_data(data[i],"0.0");i++;
-    c7 = get_double_data(data[i],"0.0");i++;
-    c8 = get_double_data(data[i],"0.0");
-
-    switch(speed_mode_flag)
-    {
-        case -1:
-        {
-            set_turbine_speed_mode(WT_UNDERSPEED_MODE);
-            break;
-        }
-        case 1:
+    if(data.size()>=19)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
         {
-            set_turbine_speed_mode(WT_OVERSPEED_MODE);
-            break;
-        }
-        default:
-        {
-            set_turbine_speed_mode(WT_MPPT_MODE);
-            break;
-        }
+            int speed_mode_flag=0;
+            size_t n;
+            double vwind0, gear_eta, rou0_air, min_speed, max_speed;
+            double rou_air;
+            double c1, c2, c3, c4, c5, c6, c7, c8;
+
+            size_t i=3;
+            speed_mode_flag = get_integer_data(data[i],"0"); i++;
+            n = size_t(get_integer_data(data[i],"1")); i++;
+            vwind0 = get_double_data(data[i],"0.0"); i++;
+            gear_eta = get_double_data(data[i],"0.0"); i++;
+            rou0_air = get_double_data(data[i],"0.0"); i++;
+            min_speed = get_double_data(data[i],"0.6"); i++;
+            max_speed = get_double_data(data[i],"1.2"); i++;
+            rou_air = get_double_data(data[i],"0.0"); i++;
+            c1 = get_double_data(data[i],"0.0"); i++;
+            c2 = get_double_data(data[i],"0.0"); i++;
+            c3 = get_double_data(data[i],"0.0"); i++;
+            c4 = get_double_data(data[i],"0.0"); i++;
+            c5 = get_double_data(data[i],"0.0"); i++;
+            c6 = get_double_data(data[i],"0.0");i++;
+            c7 = get_double_data(data[i],"0.0");i++;
+            c8 = get_double_data(data[i],"0.0");
+
+            switch(speed_mode_flag)
+            {
+                case -1:
+                {
+                    set_turbine_speed_mode(WT_UNDERSPEED_MODE);
+                    break;
+                }
+                case 1:
+                {
+                    set_turbine_speed_mode(WT_OVERSPEED_MODE);
+                    break;
+                }
+                default:
+                {
+                    set_turbine_speed_mode(WT_MPPT_MODE);
+                    break;
+                }
+            }
+            set_number_of_pole_pairs(n);
+            set_nominal_wind_speed_in_mps(vwind0);
+            set_gear_efficiency(gear_eta);
+            set_nominal_air_density_in_kgpm3(rou0_air);
+            set_min_steady_state_turbine_speed_in_pu(min_speed);
+            set_max_steady_state_turbine_speed_in_pu(max_speed);
+            set_air_density_in_kgpm3(rou_air);
+            set_C1(c1);
+            set_C2(c2);
+            set_C3(c3);
+            set_C4(c4);
+            set_C5(c5);
+            set_C6(c6);
+            set_C7(c7);
+            set_C8(c8);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
     }
-    set_number_of_pole_pairs(n);
-    set_nominal_wind_speed_in_mps(vwind0);
-    set_gear_efficiency(gear_eta);
-    set_nominal_air_density_in_kgpm3(rou0_air);
-    set_min_steady_state_turbine_speed_in_pu(min_speed);
-    set_max_steady_state_turbine_speed_in_pu(max_speed);
-    set_air_density_in_kgpm3(rou_air);
-    set_C1(c1);
-    set_C2(c2);
-    set_C3(c3);
-    set_C4(c4);
-    set_C5(c5);
-    set_C6(c6);
-    set_C7(c7);
-    set_C8(c8);
-
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool AERD0::setup_model_with_psse_string(string data)
diff --git a/code/source/model/wtg_models/wt_aerodynamic_model/aerdf.cpp b/code/source/model/wtg_models/wt_aerodynamic_model/aerdf.cpp
index cbabe453..065ec4a4 100644
--- a/code/source/model/wtg_models/wt_aerodynamic_model/aerdf.cpp
+++ b/code/source/model/wtg_models/wt_aerodynamic_model/aerdf.cpp
@@ -67,14 +67,14 @@ void AERDF::load_data_from_Cp_file()
         return;
     }
     ifstream fid(cp_file_name);
-    if(not fid.is_open())
+    if(fid.is_open())
+        fid.close();
+    else
     {
         oosstream<<"Initialization error. Fail to open wind turbine Cp data file '"<<cp_file_name<<"'. Check model "<<get_model_name()<<" of "<<get_device_name();
         toolkit.show_information_with_leading_time_stamp(oosstream);
         return;
     }
-    else
-        fid.close();
 
     load_pitch_angles();
     load_tip_speed_ratios();
@@ -252,60 +252,64 @@ string AERDF::get_model_name() const
 bool AERDF::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<11)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    int speed_mode_flag=0;
-    size_t n;
-    double vwind0, gear_eta, rou0_air, min_speed, max_speed;
-    double rou_air;
-    string file;
-
-    size_t i=3;
-    speed_mode_flag = get_integer_data(data[i],"0"); i++;
-    n = size_t(get_integer_data(data[i],"1")); i++;
-    vwind0 = get_double_data(data[i],"0.0"); i++;
-    gear_eta = get_double_data(data[i],"0.0"); i++;
-    rou0_air = get_double_data(data[i],"0.0"); i++;
-    min_speed = get_double_data(data[i],"0.6"); i++;
-    max_speed = get_double_data(data[i],"1.2"); i++;
-    rou_air = get_double_data(data[i],"0.0"); i++;
-    file = get_string_data(data[i],"");
-
-    switch(speed_mode_flag)
-    {
-        case -1:
+    if(data.size()>=11)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
         {
-            set_turbine_speed_mode(WT_UNDERSPEED_MODE);
-            break;
-        }
-        case 1:
-        {
-            set_turbine_speed_mode(WT_OVERSPEED_MODE);
-            break;
-        }
-        default:
-        {
-            set_turbine_speed_mode(WT_MPPT_MODE);
-            break;
-        }
+            int speed_mode_flag=0;
+            size_t n;
+            double vwind0, gear_eta, rou0_air, min_speed, max_speed;
+            double rou_air;
+            string file;
+
+            size_t i=3;
+            speed_mode_flag = get_integer_data(data[i],"0"); i++;
+            n = size_t(get_integer_data(data[i],"1")); i++;
+            vwind0 = get_double_data(data[i],"0.0"); i++;
+            gear_eta = get_double_data(data[i],"0.0"); i++;
+            rou0_air = get_double_data(data[i],"0.0"); i++;
+            min_speed = get_double_data(data[i],"0.6"); i++;
+            max_speed = get_double_data(data[i],"1.2"); i++;
+            rou_air = get_double_data(data[i],"0.0"); i++;
+            file = get_string_data(data[i],"");
+
+            switch(speed_mode_flag)
+            {
+                case -1:
+                {
+                    set_turbine_speed_mode(WT_UNDERSPEED_MODE);
+                    break;
+                }
+                case 1:
+                {
+                    set_turbine_speed_mode(WT_OVERSPEED_MODE);
+                    break;
+                }
+                default:
+                {
+                    set_turbine_speed_mode(WT_MPPT_MODE);
+                    break;
+                }
+            }
+            set_number_of_pole_pairs(n);
+            set_nominal_wind_speed_in_mps(vwind0);
+            set_gear_efficiency(gear_eta);
+            set_nominal_air_density_in_kgpm3(rou0_air);
+            set_min_steady_state_turbine_speed_in_pu(min_speed);
+            set_max_steady_state_turbine_speed_in_pu(max_speed);
+            set_air_density_in_kgpm3(rou_air);
+            set_Cp_file(file);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
     }
-    set_number_of_pole_pairs(n);
-    set_nominal_wind_speed_in_mps(vwind0);
-    set_gear_efficiency(gear_eta);
-    set_nominal_air_density_in_kgpm3(rou0_air);
-    set_min_steady_state_turbine_speed_in_pu(min_speed);
-    set_max_steady_state_turbine_speed_in_pu(max_speed);
-    set_air_density_in_kgpm3(rou_air);
-    set_Cp_file(file);
-
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool AERDF::setup_model_with_psse_string(string data)
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
index aa13b63e..75986c11 100644
--- 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
@@ -80,14 +80,16 @@ string WT_AERODYNAMIC_MODEL::get_model_type() const
 double WT_AERODYNAMIC_MODEL::get_damping_in_pu() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return 0.0;
-
-    WT_TURBINE_MODEL* turbine = gen->get_wt_turbine_model();
-    if(turbine==NULL)
-        return 0.0;
+    if(gen!=NULL)
+    {
+        WT_TURBINE_MODEL* turbine = gen->get_wt_turbine_model();
+        if(turbine!=NULL)
+            return turbine->get_damping_in_pu();
+        else
+            return 0.0;
+    }
     else
-        return turbine->get_damping_in_pu();
+        return 0.0;
 }
 
 void WT_AERODYNAMIC_MODEL::set_number_of_pole_pairs(size_t n)
@@ -244,41 +246,48 @@ double WT_AERODYNAMIC_MODEL::get_min_steady_state_turbine_speed_in_pu() const
 double WT_AERODYNAMIC_MODEL::get_wind_speed_in_mps() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
+    if(gen!=NULL)
+    {
+        WIND_SPEED_MODEL* model = gen->get_wind_speed_model();
+        if(model!=NULL and model->is_model_initialized())
+            return model->get_wind_speed_in_mps();
+        else
+            return get_nominal_wind_speed_in_mps();
+    }
+    else
         return 0.0;
 
-    WIND_SPEED_MODEL* model = gen->get_wind_speed_model();
-    if(model!=NULL and model->is_model_initialized())
-        return model->get_wind_speed_in_mps();
-    else
-        return get_nominal_wind_speed_in_mps();
 }
 
 
 double WT_AERODYNAMIC_MODEL::get_pitch_angle_in_deg() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return 0.0;
-
-    WT_PITCH_MODEL* model = gen->get_wt_pitch_model();
-    if(model!=NULL and model->is_model_initialized())
-        return model->get_pitch_angle_in_deg();
+    if(gen!=NULL)
+    {
+        WT_PITCH_MODEL* model = gen->get_wt_pitch_model();
+        if(model!=NULL and model->is_model_initialized())
+            return model->get_pitch_angle_in_deg();
+        else
+            return get_initial_pitch_angle_in_deg();
+    }
     else
-        return get_initial_pitch_angle_in_deg();
+        return 0.0;
 }
 
 double WT_AERODYNAMIC_MODEL::get_turbine_speed_in_rad_per_s() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return 0.0;
-
-    WT_TURBINE_MODEL* model = gen->get_wt_turbine_model();
-    if(model!=NULL and model->is_model_initialized())
-        return model->get_turbine_speed_in_pu()*get_nominal_turbine_speed_in_rad_per_s();
+    if(gen!=NULL)
+    {
+        WT_TURBINE_MODEL* model = gen->get_wt_turbine_model();
+        if(model!=NULL and model->is_model_initialized())
+            return model->get_turbine_speed_in_pu()*get_nominal_turbine_speed_in_rad_per_s();
+        else
+            return get_initial_turbine_speed_in_rad_per_s();
+    }
     else
-        return get_initial_turbine_speed_in_rad_per_s();
+        return 0.0;
 }
 
 double WT_AERODYNAMIC_MODEL::get_turbine_frequency_in_Hz() const
@@ -309,64 +318,66 @@ void WT_AERODYNAMIC_MODEL::initialize()
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return;
-    WT_GENERATOR_MODEL* genmodel = gen->get_wt_generator_model();
-    if(genmodel==NULL)
-        return;
-    if(not genmodel->is_model_initialized())
-        genmodel->initialize();
+    if(gen!=NULL)
+    {
+        WT_GENERATOR_MODEL* genmodel = gen->get_wt_generator_model();
+        if(genmodel!=NULL)
+        {
+            if(not genmodel->is_model_initialized())
+                genmodel->initialize();
 
-    set_block_toolkit();
-
-    set_cpmax_at_zero_pitch();
-
-    initialize_wind_turbine_blade_radius_and_gear_ratio();
-    //current_turbine_speed_reference_without_limit_in_rad_per_s = get_turbine_reference_speed_in_rad_per_s_without_speed_limit();
-
-    double pmax = get_maximum_available_mechanical_power_per_wt_generator_in_MW(get_wind_speed_in_mps());
-    double cp_max = get_cpmax_at_zero_pitch();
-    double pmech = gen->get_p_generation_in_MW()/gen->get_number_of_lumped_wt_generators()/get_gear_efficiency();
-    if(pmax<pmech)
-    {
-        osstream<<"Initialization error. Wind speed "<<get_wind_speed_in_mps()<<" m/s is not enough to generate power for "<<get_device_name()
-               <<endl
-               <<"Maximum available mechanical power is "<<pmax<<" MW with Cpmax = "<<cp_max<<" and MPPT lambda = "<<get_lambda_at_Cpmax(0.0)<<" at 0.0 pitch angle.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
+            set_block_toolkit();
+
+            set_cpmax_at_zero_pitch();
+
+            initialize_wind_turbine_blade_radius_and_gear_ratio();
+            //current_turbine_speed_reference_without_limit_in_rad_per_s = get_turbine_reference_speed_in_rad_per_s_without_speed_limit();
+
+            double pmax = get_maximum_available_mechanical_power_per_wt_generator_in_MW(get_wind_speed_in_mps());
+            double cp_max = get_cpmax_at_zero_pitch();
+            double pmech = gen->get_p_generation_in_MW()/gen->get_number_of_lumped_wt_generators()/get_gear_efficiency();
+            if(pmax<pmech)
+            {
+                osstream<<"Initialization error. Wind speed "<<get_wind_speed_in_mps()<<" m/s is not enough to generate power for "<<get_device_name()
+                       <<endl
+                       <<"Maximum available mechanical power is "<<pmax<<" MW with Cpmax = "<<cp_max<<" and MPPT lambda = "<<get_lambda_at_Cpmax(0.0)<<" at 0.0 pitch angle.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
 
-    initialize_pitch_angle_and_turbine_speed();
+            initialize_pitch_angle_and_turbine_speed();
 
-    set_flag_model_initialized_as_true();
+            set_flag_model_initialized_as_true();
 
-    osstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
-            <<"(1) Turbine radius is "<<get_turbine_blade_radius_in_m()<<" m"<<endl
-            <<"(2) Gear turn ratio is "<<get_generator_to_turbine_gear_ratio()<<endl
-            <<"(3) Initial turbine speed is "<<get_initial_turbine_speed_in_pu()<<" pu"<<endl
-            <<"(4) Initial pitch angle is "<<get_initial_pitch_angle_in_deg()<<" deg"<<endl;
+            osstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
+                    <<"(1) Turbine radius is "<<get_turbine_blade_radius_in_m()<<" m"<<endl
+                    <<"(2) Gear turn ratio is "<<get_generator_to_turbine_gear_ratio()<<endl
+                    <<"(3) Initial turbine speed is "<<get_initial_turbine_speed_in_pu()<<" pu"<<endl
+                    <<"(4) Initial pitch angle is "<<get_initial_pitch_angle_in_deg()<<" deg"<<endl;
 
-    double lambda = get_initial_turbine_speed_in_rad_per_s()*get_turbine_blade_radius_in_m()/get_wind_speed_in_mps();
-    double pitch = get_initial_pitch_angle_in_deg();
-    double der = get_derivative_of_Cp_over_lambda(lambda, pitch);
-    osstream<<"With initial pitch angle and rotor speed, the initial operating point is located at the ";
-    if(fabs(der)<1e-5)
-        osstream<<"MPPT";
-    else
-    {
-        if(der>0.0)
-            osstream<<"ascending";
-        else
-            osstream<<"descending";
-    }
-    osstream<<" side of Cp curve (Cp v.s. w)";
-    double w0 = get_initial_turbine_speed_in_rad_per_s();
-    osstream<<"With pitch = "<<pitch<<" deg and initial w = "<<w0<<" rad/s, the near OPs are: "<<endl;
-    for(double w = w0-0.2; w<w0+0.21; w+=0.1)
-    {
-        double pmax = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w);
-        osstream<<pitch<<"deg, "<<w<<"rad/s, "<<pmax*get_number_of_lumped_wt_generators()<<"MW"<<endl;
+            double lambda = get_initial_turbine_speed_in_rad_per_s()*get_turbine_blade_radius_in_m()/get_wind_speed_in_mps();
+            double pitch = get_initial_pitch_angle_in_deg();
+            double der = get_derivative_of_Cp_over_lambda(lambda, pitch);
+            osstream<<"With initial pitch angle and rotor speed, the initial operating point is located at the ";
+            if(fabs(der)<1e-5)
+                osstream<<"MPPT";
+            else
+            {
+                if(der>0.0)
+                    osstream<<"ascending";
+                else
+                    osstream<<"descending";
+            }
+            osstream<<" side of Cp curve (Cp v.s. w)";
+            double w0 = get_initial_turbine_speed_in_rad_per_s();
+            osstream<<"With pitch = "<<pitch<<" deg and initial w = "<<w0<<" rad/s, the near OPs are: "<<endl;
+            for(double w = w0-0.2; w<w0+0.21; w+=0.1)
+            {
+                double pmax = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w);
+                osstream<<pitch<<"deg, "<<w<<"rad/s, "<<pmax*get_number_of_lumped_wt_generators()<<"MW"<<endl;
+            }
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
-    toolkit.show_information_with_leading_time_stamp(osstream);
 }
 
 void WT_AERODYNAMIC_MODEL::initialize_wind_turbine_blade_radius_and_gear_ratio()
@@ -574,143 +585,147 @@ void WT_AERODYNAMIC_MODEL::initialize_pitch_angle_and_turbine_speed_with_mppt_mo
     toolkit.show_information_with_leading_time_stamp(osstream);
 
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return;
-
-    double D = get_damping_in_pu();
-    double mbase = get_mbase_in_MVA();
-    complex<double> zsource = get_source_impedance_in_pu_based_on_mbase();
+    if(gen!=NULL)
+    {
+        double D = get_damping_in_pu();
+        double mbase = get_mbase_in_MVA();
+        complex<double> zsource = get_source_impedance_in_pu_based_on_mbase();
 
-    complex<double> selec = gen->get_complex_generation_in_MVA();
-    complex<double> vterm = get_terminal_complex_voltage_in_pu();
+        complex<double> selec = gen->get_complex_generation_in_MVA();
+        complex<double> vterm = get_terminal_complex_voltage_in_pu();
 
-    selec /= mbase;
-    double iterm = steps_fast_complex_abs(selec)/ steps_fast_complex_abs(vterm);
-    selec += (iterm*iterm*zsource);
+        selec /= mbase;
+        double iterm = steps_fast_complex_abs(selec)/ steps_fast_complex_abs(vterm);
+        selec += (iterm*iterm*zsource);
 
-    selec *= mbase;
+        selec *= mbase;
 
-    double pelec = selec.real();
-    size_t n = get_number_of_lumped_wt_generators();
-    pelec /= n;
+        double pelec = selec.real();
+        size_t n = get_number_of_lumped_wt_generators();
+        pelec /= n;
 
-    double vwind = get_wind_speed_in_mps();
+        double vwind = get_wind_speed_in_mps();
 
-    double pmax = get_total_wind_power_per_wt_generator_in_MW(vwind);
+        double pmax = get_total_wind_power_per_wt_generator_in_MW(vwind);
 
-    double wn = get_nominal_turbine_speed_in_rad_per_s();
+        double wn = get_nominal_turbine_speed_in_rad_per_s();
 
-    double pitch_low = 0.0, pitch_high = 0.0;
-    double pitch_step = 2.0;
-    double w_mppt_low = 0.0, w_mppt_high = 0.0;
+        double pitch_low = 0.0, pitch_high = 0.0;
+        double pitch_step = 2.0;
+        double w_mppt_low = 0.0, w_mppt_high = 0.0;
 
-    w_mppt_low = get_mppt_speed_in_rad_per_s(pitch_low);
+        w_mppt_low = get_mppt_speed_in_rad_per_s(pitch_low);
 
-    double w_low = (w_mppt_low-wn)/wn;
-    double cpmax_low = get_Cpmax(pitch_low);
-    //osstream<<"pitch_low = "<<pitch_low<<", w_mppt_low = "<<w_mppt_low<<", w_low = "<<w_low<<", pmechmax = "<<pmax*cpmax_low;
-    //show_information_with_leading_time_stamp(osstream);
-    double pmech_low = pelec+(D*w_low)*(w_mppt_low/wn)*(mbase/n);
-    if(pmech_low>pmax*cpmax_low)
-    {
-        osstream<<"Error. Mechanical power with Cpmax at 0 pitch angle is less than required mechanical power."<<endl
-                <<"Initialization of "<<get_model_name()<<" of "<<get_device_name()<<" failed.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-    if(fabs(pmech_low-pmax*cpmax_low)<FLOAT_EPSILON)
-    {
-        set_initial_pitch_angle_in_deg(pitch_low);
-        set_initial_turbine_speed_in_rad_per_s(w_mppt_low);
-        return;
-    }
-
-    size_t iter_max = 100;
-    size_t iter = 0;
-
-    while(true)
-    {
-        pitch_high = pitch_low+pitch_step;
-        w_mppt_high = get_mppt_speed_in_rad_per_s(pitch_high);
-
-        double w_high = (w_mppt_high-wn)/wn;
-        double cpmax_high = get_Cpmax(pitch_high);
-        double pmech_high = pelec+(D*w_high)*(w_mppt_high/wn)*(mbase/n);
-        if(pmech_high>pmax*cpmax_high)
-            break;
-        else
+        double w_low = (w_mppt_low-wn)/wn;
+        double cpmax_low = get_Cpmax(pitch_low);
+        //osstream<<"pitch_low = "<<pitch_low<<", w_mppt_low = "<<w_mppt_low<<", w_low = "<<w_low<<", pmechmax = "<<pmax*cpmax_low;
+        //show_information_with_leading_time_stamp(osstream);
+        double pmech_low = pelec+(D*w_low)*(w_mppt_low/wn)*(mbase/n);
+        if(pmech_low<=pmax*cpmax_low)
         {
-            pitch_low = pitch_high;
-            w_mppt_low = w_mppt_high;
-        }
-        ++iter;
-        if(iter>iter_max)
-        {
-            if(toolkit.is_detailed_log_enabled())
+            if(fabs(pmech_low-pmax*cpmax_low)>FLOAT_EPSILON)
             {
-                osstream<<"Warning. Failed to exit loop within "<<iter_max<<" iterations @ line "<<__LINE__<<" of "<<__FILE__;
-                toolkit.show_information_with_leading_time_stamp(osstream);
-            }
-            break;
-        }
-    }
-    iter = 0;
-    while(true)
-    {
-        double pitch = 0.5*(pitch_low+pitch_high);
-        double w_mppt = get_mppt_speed_in_rad_per_s(pitch);
-        double w = (w_mppt-wn)/wn;
-        double pmech = pelec+(D*w)*(w_mppt/wn)*(mbase/n);
-        double cpmax = get_Cpmax(pitch);
+                size_t iter_max = 100;
+                size_t iter = 0;
+
+                while(true)
+                {
+                    pitch_high = pitch_low+pitch_step;
+                    w_mppt_high = get_mppt_speed_in_rad_per_s(pitch_high);
+
+                    double w_high = (w_mppt_high-wn)/wn;
+                    double cpmax_high = get_Cpmax(pitch_high);
+                    double pmech_high = pelec+(D*w_high)*(w_mppt_high/wn)*(mbase/n);
+                    if(pmech_high<=pmax*cpmax_high)
+                    {
+                        pitch_low = pitch_high;
+                        w_mppt_low = w_mppt_high;
+                    }
+                    else
+                        break;
+                    ++iter;
+                    if(iter>iter_max)
+                    {
+                        if(toolkit.is_detailed_log_enabled())
+                        {
+                            osstream<<"Warning. Failed to exit loop within "<<iter_max<<" iterations @ line "<<__LINE__<<" of "<<__FILE__;
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                        break;
+                    }
+                }
+                iter = 0;
+                while(true)
+                {
+                    double pitch = 0.5*(pitch_low+pitch_high);
+                    double w_mppt = get_mppt_speed_in_rad_per_s(pitch);
+                    double w = (w_mppt-wn)/wn;
+                    double pmech = pelec+(D*w)*(w_mppt/wn)*(mbase/n);
+                    double cpmax = get_Cpmax(pitch);
+
+                    //osstream<<"pitch = "<<pitch<<", w_mppt = "<<w_mppt<<", w = "<<w<<", pmechmax = "<<pmax*cpmax;
+                    //show_information_with_leading_time_stamp(osstream);
+                    if(fabs(pmech-pmax*cpmax)>FLOAT_EPSILON)
+                    {
+                        if(pmech>pmax*cpmax)
+                            pitch_high = pitch;
+                        else
+                            pitch_low = pitch;
+
+                        ++iter;
+                        if(iter>iter_max)
+                        {
+                            osstream<<"Warning. Failed to initialize pitch angle and turbine speed within "<<iter_max<<" iterations when turbine speed mode is WT_MPPT_MODE."<<endl
+                                    <<"Initial pitch angle is set as "<<pitch<<" deg, and initial turbine speed is set as "<<w_mppt<<" rad/s";
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                            set_initial_pitch_angle_in_deg(pitch);
+                            set_initial_turbine_speed_in_rad_per_s(w_mppt);
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        set_initial_pitch_angle_in_deg(pitch);
+                        set_initial_turbine_speed_in_rad_per_s(w_mppt);
+                        break;
+                    }
+                }
 
-        //osstream<<"pitch = "<<pitch<<", w_mppt = "<<w_mppt<<", w = "<<w<<", pmechmax = "<<pmax*cpmax;
-        //show_information_with_leading_time_stamp(osstream);
-        if(fabs(pmech-pmax*cpmax)<FLOAT_EPSILON)
-        {
-            set_initial_pitch_angle_in_deg(pitch);
-            set_initial_turbine_speed_in_rad_per_s(w_mppt);
-            break;
-        }
-        if(pmech>pmax*cpmax)
-            pitch_high = pitch;
+                double w = get_initial_turbine_speed_in_rad_per_s();
+                double wmax = get_max_steady_state_turbine_speed_in_pu();
+                double wmin = get_min_steady_state_turbine_speed_in_pu();
+                if(w>wmax*wn)
+                {
+                    osstream<<"In WT_MPPT_MODE, initialized turbine speed = "<<w<<" rad/s, greater than wmax = "<<wmax*wn<<" rad/s."<<endl
+                            <<"Initial turbine speed will be set as wmax = "<<wmax*wn<<" rad/s";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    set_initial_turbine_speed_in_rad_per_s(wmax*wn);
+                    initialize_pitch_angle();
+                    return;
+                }
+                if(w<wmin*wn)
+                {
+                    osstream<<"In WT_MPPT_MODE, initialized turbine speed = "<<w<<" rad/s, less than wmin = "<<wmin*wn<<" rad/s."<<endl
+                            <<"Initial turbine speed will be set as wmin = "<<wmin*wn<<" rad/s";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    set_initial_turbine_speed_in_rad_per_s(wmin*wn);
+                    initialize_pitch_angle();
+                    return;
+                }
+            }
+            else
+            {
+                set_initial_pitch_angle_in_deg(pitch_low);
+                set_initial_turbine_speed_in_rad_per_s(w_mppt_low);
+            }
+        }
         else
-            pitch_low = pitch;
-
-        ++iter;
-        if(iter>iter_max)
         {
-            osstream<<"Warning. Failed to initialize pitch angle and turbine speed within "<<iter_max<<" iterations when turbine speed mode is WT_MPPT_MODE."<<endl
-                    <<"Initial pitch angle is set as "<<pitch<<" deg, and initial turbine speed is set as "<<w_mppt<<" rad/s";
+            osstream<<"Error. Mechanical power with Cpmax at 0 pitch angle is less than required mechanical power."<<endl
+                    <<"Initialization of "<<get_model_name()<<" of "<<get_device_name()<<" failed.";
             toolkit.show_information_with_leading_time_stamp(osstream);
-            set_initial_pitch_angle_in_deg(pitch);
-            set_initial_turbine_speed_in_rad_per_s(w_mppt);
-            break;
-        }
-    }
-
-    double w = get_initial_turbine_speed_in_rad_per_s();
-    double wmax = get_max_steady_state_turbine_speed_in_pu();
-    double wmin = get_min_steady_state_turbine_speed_in_pu();
-    if(w>wmax*wn)
-    {
-        osstream<<"In WT_MPPT_MODE, initialized turbine speed = "<<w<<" rad/s, greater than wmax = "<<wmax*wn<<" rad/s."<<endl
-                <<"Initial turbine speed will be set as wmax = "<<wmax*wn<<" rad/s";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        set_initial_turbine_speed_in_rad_per_s(wmax*wn);
-        initialize_pitch_angle();
-        return;
-    }
-    if(w<wmin*wn)
-    {
-        osstream<<"In WT_MPPT_MODE, initialized turbine speed = "<<w<<" rad/s, less than wmin = "<<wmin*wn<<" rad/s."<<endl
-                <<"Initial turbine speed will be set as wmin = "<<wmin*wn<<" rad/s";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        set_initial_turbine_speed_in_rad_per_s(wmin*wn);
-        initialize_pitch_angle();
-        return;
+        }
     }
-
-
 }
 
 void WT_AERODYNAMIC_MODEL::initialize_pitch_angle()
@@ -719,113 +734,122 @@ void WT_AERODYNAMIC_MODEL::initialize_pitch_angle()
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return;
-
-    double D = get_damping_in_pu();
-    double mbase = get_mbase_in_MVA();
-    complex<double> zsource = get_source_impedance_in_pu_based_on_mbase();
-
-    complex<double> selec = gen->get_complex_generation_in_MVA();
-    complex<double> vterm = get_terminal_complex_voltage_in_pu();
-
-    selec /= mbase;
-    double iterm = steps_fast_complex_abs(selec)/ steps_fast_complex_abs(vterm);
-    selec += (iterm*iterm*zsource);
+    if(gen!=NULL)
+    {
+        double D = get_damping_in_pu();
+        double mbase = get_mbase_in_MVA();
+        complex<double> zsource = get_source_impedance_in_pu_based_on_mbase();
 
-    selec *= mbase;
+        complex<double> selec = gen->get_complex_generation_in_MVA();
+        complex<double> vterm = get_terminal_complex_voltage_in_pu();
 
-    double pelec = selec.real();
-    size_t n = get_number_of_lumped_wt_generators();
-    pelec /= n;
+        selec /= mbase;
+        double iterm = steps_fast_complex_abs(selec)/ steps_fast_complex_abs(vterm);
+        selec += (iterm*iterm*zsource);
 
-    double pn = get_rated_power_per_wt_generator_in_MW();
-
-    if(pelec>pn)
-    {
-        osstream<<"Error when getting initial turbine speed of "<<get_model_name()<<" model of "<<get_device_name()<<". Initial power exceeds WT nominal power.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
+        selec *= mbase;
 
-    double wn = get_nominal_turbine_speed_in_rad_per_s();
-    double w = get_initial_turbine_speed_in_rad_per_s();
-    double dspeed = (w-wn)/wn;
-    double pdamp = D*dspeed*(mbase/wn)*w/n;
-    double eta = get_gear_efficiency();
-    double pmech = (pelec+pdamp)/eta;
+        double pelec = selec.real();
+        size_t n = get_number_of_lumped_wt_generators();
+        pelec /= n;
 
-    double pitch_low = 0.0, pitch_high = 0.0;
-    double pitch_step = 2.0;
+        double pn = get_rated_power_per_wt_generator_in_MW();
 
-    set_initial_pitch_angle_in_deg(pitch_low);
-    double pwind = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w);
+        if(pelec<=pn)
+        {
+            double wn = get_nominal_turbine_speed_in_rad_per_s();
+            double w = get_initial_turbine_speed_in_rad_per_s();
+            double dspeed = (w-wn)/wn;
+            double pdamp = D*dspeed*(mbase/wn)*w/n;
+            double eta = get_gear_efficiency();
+            double pmech = (pelec+pdamp)/eta;
+
+            double pitch_low = 0.0, pitch_high = 0.0;
+            double pitch_step = 2.0;
+
+            set_initial_pitch_angle_in_deg(pitch_low);
+            double pwind = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w);
 
-    size_t iter_count = 0, iter_max = 100;
-    while(true)
-    {
-        pitch_high = pitch_low + pitch_step;
-
-        set_initial_pitch_angle_in_deg(pitch_high);
-        pwind = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w);
-
-        if(pwind>pelec)
-            pitch_low = pitch_high;
-        else
-            break;
-        ++iter_count;
-        if(iter_count>iter_max)
-        {
-            if(toolkit.is_detailed_log_enabled())
-            {
-                osstream<<"Warning. Failed to exit loop within "<<iter_max<<" iterations @ line "<<__LINE__<<" of "<<__FILE__;
-                toolkit.show_information_with_leading_time_stamp(osstream);
+            size_t iter_count = 0, iter_max = 100;
+            while(true)
+            {
+                pitch_high = pitch_low + pitch_step;
+
+                set_initial_pitch_angle_in_deg(pitch_high);
+                pwind = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w);
+
+                if(pwind>pelec)
+                    pitch_low = pitch_high;
+                else
+                    break;
+                ++iter_count;
+                if(iter_count<=iter_max)
+                    ;
+                else
+                {
+                    if(toolkit.is_detailed_log_enabled())
+                    {
+                        osstream<<"Warning. Failed to exit loop within "<<iter_max<<" iterations @ line "<<__LINE__<<" of "<<__FILE__;
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                    }
+                    break;
+                }
             }
-            break;
-        }
-    }
 
-    set_initial_pitch_angle_in_deg(pitch_low);
-    double pwind_low = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w);
-    set_initial_pitch_angle_in_deg(pitch_high);
-    double pwind_high = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w);
+            set_initial_pitch_angle_in_deg(pitch_low);
+            double pwind_low = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w);
+            set_initial_pitch_angle_in_deg(pitch_high);
+            double pwind_high = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w);
 
-    osstream<<"Desired pmech = "<<pmech<<" MW (per wind turbine)"<<endl
-            <<"Initial pitch angle: low pitch = "<<pitch_low<<" deg, pmech = "<<pwind_low<<" MW"<<endl
-            <<"                     high pitch = "<<pitch_high<<" deg, pmech = "<<pwind_high<<" MW"<<endl;
+            osstream<<"Desired pmech = "<<pmech<<" MW (per wind turbine)"<<endl
+                    <<"Initial pitch angle: low pitch = "<<pitch_low<<" deg, pmech = "<<pwind_low<<" MW"<<endl
+                    <<"                     high pitch = "<<pitch_high<<" deg, pmech = "<<pwind_high<<" MW"<<endl;
 
-    iter_count = 0;
-    while(true)
-    {
-        double pitch_new = 0.5*(pitch_low+pitch_high);
-        set_initial_pitch_angle_in_deg(pitch_new);
-        double pnew = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w);
-        osstream<<"Iteration "<<iter_count<<": pitch = "<<pitch_new<<" deg, pmech = "<<pnew<<" MW"<<endl;
-
-        if(fabs(pnew-pmech)<FLOAT_EPSILON)
-        {
-            osstream<<__FUNCTION__<<"() takes "<<iter_count<<" iterations.";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            break;
-        }
-        if(pnew>pmech)
-            pitch_low = pitch_new;
-        if(pnew<pmech)
-            pitch_high = pitch_new;
+            iter_count = 0;
+            while(true)
+            {
+                double pitch_new = 0.5*(pitch_low+pitch_high);
+                set_initial_pitch_angle_in_deg(pitch_new);
+                double pnew = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w);
+                osstream<<"Iteration "<<iter_count<<": pitch = "<<pitch_new<<" deg, pmech = "<<pnew<<" MW"<<endl;
 
-        iter_count++;
-        if(iter_count>iter_max)
+                if(fabs(pnew-pmech)>FLOAT_EPSILON)
+                {
+                    if(pnew>pmech)
+                        pitch_low = pitch_new;
+                    if(pnew<pmech)
+                        pitch_high = pitch_new;
+
+                    ++iter_count;
+                    if(iter_count<=iter_max)
+                        ;
+                    else
+                    {
+                        string iteration_info = osstream.str();
+                        osstream.str("");
+                        osstream<<"Warning. 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
+                                <<iteration_info;
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                        break;
+                    }
+                }
+                else
+                {
+                    osstream<<__FUNCTION__<<"() takes "<<iter_count<<" iterations.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    break;
+                }
+            }
+        }
+        else
         {
-            string iteration_info = osstream.str();
-            osstream.str("");
-            osstream<<"Warning. 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
-                    <<iteration_info;
+            osstream<<"Error when getting initial turbine speed of "<<get_model_name()<<" model of "<<get_device_name()<<". Initial power exceeds WT nominal power.";
             toolkit.show_information_with_leading_time_stamp(osstream);
-            break;
-        }
+            return;
+        }
     }
 }
 
@@ -893,36 +917,39 @@ double WT_AERODYNAMIC_MODEL::get_turbine_reference_speed_in_rad_per_s_without_sp
     ostringstream osstream;
 
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return 0.0;
-
-    WT_GENERATOR_MODEL* wtgenmodel = gen->get_wt_generator_model();
-    if(wtgenmodel==NULL)
-        return 0.0;
-
-    complex<double> selec = wtgenmodel->get_terminal_complex_power_in_MVA();
-    double iterm = wtgenmodel->get_terminal_current_in_pu_based_on_mbase();
-    complex<double> zsource = get_source_impedance_in_pu_based_on_mbase();
-    double mbase = get_mbase_in_MVA();
-    selec += (iterm*iterm*zsource)*mbase;
+    if(gen!=NULL)
+    {
+        WT_GENERATOR_MODEL* wtgenmodel = gen->get_wt_generator_model();
+        if(wtgenmodel!=NULL)
+        {
+            complex<double> selec = wtgenmodel->get_terminal_complex_power_in_MVA();
+            double iterm = wtgenmodel->get_terminal_current_in_pu_based_on_mbase();
+            complex<double> zsource = get_source_impedance_in_pu_based_on_mbase();
+            double mbase = get_mbase_in_MVA();
+            selec += (iterm*iterm*zsource)*mbase;
 
-    size_t n = get_number_of_lumped_wt_generators();
-    selec /= n;
+            size_t n = get_number_of_lumped_wt_generators();
+            selec /= n;
 
-    double pelec = selec.real();
+            double pelec = selec.real();
 
-    double pitch = get_pitch_angle_in_deg();
-    if(fabs(get_current_pelec_including_loss_per_turbine_in_MW()-pelec)<FLOAT_EPSILON and
-       fabs(get_current_pitch_angle_in_deg()-pitch)<FLOAT_EPSILON)
-        return get_current_turbine_speed_reference_without_limit_in_rad_per_s();
+            double pitch = get_pitch_angle_in_deg();
+            if(fabs(get_current_pelec_including_loss_per_turbine_in_MW()-pelec)<FLOAT_EPSILON and
+               fabs(get_current_pitch_angle_in_deg()-pitch)<FLOAT_EPSILON)
+                return get_current_turbine_speed_reference_without_limit_in_rad_per_s();
+            else
+            {
+                set_current_pitch_angle_in_deg(pitch);
+                set_current_pelec_including_loss_per_turbine_in_MW(pelec);
+                update_current_turbine_speed_reference_without_limit();
+                return get_current_turbine_speed_reference_without_limit_in_rad_per_s();
+            }
+        }
+        else
+            return 0.0;
+    }
     else
-    {
-        set_current_pitch_angle_in_deg(pitch);
-        set_current_pelec_including_loss_per_turbine_in_MW(pelec);
-        update_current_turbine_speed_reference_without_limit();
-        return get_current_turbine_speed_reference_without_limit_in_rad_per_s();
-    }
-
+        return 0.0;
 }
 
 double WT_AERODYNAMIC_MODEL::get_mppt_speed_in_rad_per_s(double pitch_in_deg)
@@ -960,17 +987,19 @@ void WT_AERODYNAMIC_MODEL::update_current_lambda_at_cpmax_with_current_pitch_ang
     while(true)
     {
         double der = get_derivative_of_Cp_over_lambda(lambda_low, pitch);
-        if(der>0.0)
-            break;
-        else
-        {
-            if(der==0.0)
-                lambda_low += lambda_step;
-            else
-                lambda_low -= lambda_step;
+        if(der<=0.0)
+        {
+            if(der==0.0)
+                lambda_low += lambda_step;
+            else
+                lambda_low -= lambda_step;
         }
+        else
+            break;
         ++iter_count;
-        if(iter_count>iter_max)
+        if(iter_count<=iter_max)
+            ;
+        else
         {
             if(toolkit.is_detailed_log_enabled())
             {
@@ -984,17 +1013,19 @@ void WT_AERODYNAMIC_MODEL::update_current_lambda_at_cpmax_with_current_pitch_ang
     while(true)
     {
         double der = get_derivative_of_Cp_over_lambda(lambda_high, pitch);
-        if(der<0.0)
-            break;
-        else
-        {
-            if(der==0.0)
-                lambda_high -= lambda_step;
-            else
-                lambda_high += lambda_step;
+        if(der>=0.0)
+        {
+            if(der==0.0)
+                lambda_high -= lambda_step;
+            else
+                lambda_high += lambda_step;
         }
+        else
+            break;
         ++iter_count;
-        if(iter_count>iter_max)
+        if(iter_count<=iter_max)
+            ;
+        else
         {
             if(toolkit.is_detailed_log_enabled())
             {
@@ -1011,23 +1042,22 @@ void WT_AERODYNAMIC_MODEL::update_current_lambda_at_cpmax_with_current_pitch_ang
     {
         lambda_new = 0.5*(lambda_low+lambda_high);
         double der_new =  get_derivative_of_Cp_over_lambda(lambda_new, pitch);
-        if(fabs(der_new)<FLOAT_EPSILON)
-        {
-            break;
-        }
-
-        if(der_new>0.0)
-            lambda_low = lambda_new;
+        if(fabs(der_new)>FLOAT_EPSILON)
+        {
+            if(der_new>0.0)
+                lambda_low = lambda_new;
+            else
+                lambda_high = lambda_new;
+
+            ++iter_count;
+            if(iter_count<=iter_max)
+                ;
+            else
+                break;
+        }
         else
-            lambda_high = lambda_new;
-
-        iter_count++;
-        if(iter_count>iter_max)
-        {
             break;
-        }
     }
-
     current_lambda_at_cpmax = lambda_new;
 }
 
@@ -1060,147 +1090,158 @@ void WT_AERODYNAMIC_MODEL::update_current_turbine_speed_reference_without_limit(
 
     double vwind = get_wind_speed_in_mps();
     double pmax = cpmax*get_total_wind_power_per_wt_generator_in_MW(vwind);
-    if(pmax<pmech)
+    if(pmax>=pmech)
     {
-        /*osstream<<"Warning. Current electrical power generation of "<<get_device_name()<<" exceeds the maximum available wind power:"<<endl
-               <<"Current electrical power generation = "<<pmech*n<<"MW. Maximum available wind power = "<<pmax*n<<" MW"<<endl
-               <<"Current wind speed = "<<vwind<<" m, pitch angle = "<<pitch<<" deg, Cpmax = "<<cpmax<<" at w_mpppt = "<<w_mppt<<" rad/s"<<endl
-               <<"MPPT speed will be returned as speed reference: "<<w_mppt<<" rad/s.";
-        toolkit.show_information_with_leading_time_stamp(osstream);*/
-
-        current_turbine_speed_reference_without_limit_in_rad_per_s = w_mppt;
-        return;
-    }
-
-    // pmax>pmech
+        // pmax>pmech
 
-    double damping = get_damping_in_pu();
-    double wn = get_nominal_turbine_speed_in_rad_per_s();
-    double eta = get_gear_efficiency();
+        double damping = get_damping_in_pu();
+        double wn = get_nominal_turbine_speed_in_rad_per_s();
+        double eta = get_gear_efficiency();
 
-    double mbase = get_mbase_in_MVA();
-    size_t n = get_number_of_lumped_wt_generators();
+        double mbase = get_mbase_in_MVA();
+        size_t n = get_number_of_lumped_wt_generators();
 
-    double w_low, w_high;
-    double w_step = 0.5;
-    double p_low, p_high;
+        double w_low, w_high;
+        double w_step = 0.5;
+        double p_low, p_high;
 
-    size_t iter_count =0, iter_max = 100;
-    if(get_turbine_speed_mode()==WT_UNDERSPEED_MODE)
-    {
-        w_high = w_mppt;
-        iter_count = 0;
-        while(true)
+        size_t iter_count =0, iter_max = 100;
+        if(get_turbine_speed_mode()==WT_UNDERSPEED_MODE)
         {
-            w_low = w_high - w_step;
-            p_low = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w_low);
-            double telec = pelec/w_low;
-            double tdamp = damping*(w_low/wn-1.0)*(mbase/wn)/n;
-            double tmech = telec+tdamp;
-            pmech = tmech*w_low;
-            pmech /= eta;
-            if(p_low<pmech)
-                break;
-            else
-                w_high = w_low;
+            w_high = w_mppt;
+            iter_count = 0;
+            while(true)
+            {
+                w_low = w_high - w_step;
+                p_low = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w_low);
+                double telec = pelec/w_low;
+                double tdamp = damping*(w_low/wn-1.0)*(mbase/wn)/n;
+                double tmech = telec+tdamp;
+                pmech = tmech*w_low;
+                pmech /= eta;
+                if(p_low>=pmech)
+                    w_high = w_low;
+                else
+                    break;
 
-            ++iter_count;
-            if(iter_count>iter_max)
-            {
-                if(toolkit.is_detailed_log_enabled())
+                ++iter_count;
+                if(iter_count<=iter_max)
+                    ;
+                else
                 {
-                    osstream<<"Warning. Failed to exit loop within "<<iter_max<<" iterations @ line "<<__LINE__<<" of "<<__FILE__;
-                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    if(toolkit.is_detailed_log_enabled())
+                    {
+                        osstream<<"Warning. Failed to exit loop within "<<iter_max<<" iterations @ line "<<__LINE__<<" of "<<__FILE__;
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                    }
+                    break;
                 }
-                break;
             }
         }
-    }
-    else
-    {
-        w_low = w_mppt;
-        iter_count = 0;
-        while(true)
+        else
         {
-            w_high = w_low + w_step;
-            p_high = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w_high);
-            double telec = pelec/w_high;
-            double tdamp = damping*(w_high/wn-1.0)*(mbase/wn)/n;
-            double tmech = telec+tdamp;
-            pmech = tmech*w_high;
-            pmech /= eta;
-            if(p_high<pmech)
-                break;
-            else
-                w_low = w_high;
-            ++iter_count;
-            if(iter_count>iter_max)
-            {
-                if(toolkit.is_detailed_log_enabled())
+            w_low = w_mppt;
+            iter_count = 0;
+            while(true)
+            {
+                w_high = w_low + w_step;
+                p_high = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w_high);
+                double telec = pelec/w_high;
+                double tdamp = damping*(w_high/wn-1.0)*(mbase/wn)/n;
+                double tmech = telec+tdamp;
+                pmech = tmech*w_high;
+                pmech /= eta;
+                if(p_high>=pmech)
+                    w_low = w_high;
+                else
+                    break;
+                ++iter_count;
+                if(iter_count<=iter_max)
+                    ;
+                else
                 {
-                    osstream<<"Warning. Failed to exit loop within "<<iter_max<<" iterations @ line "<<__LINE__<<" of "<<__FILE__;
-                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    if(toolkit.is_detailed_log_enabled())
+                    {
+                        osstream<<"Warning. Failed to exit loop within "<<iter_max<<" iterations @ line "<<__LINE__<<" of "<<__FILE__;
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                    }
+                    break;
                 }
-                break;
             }
         }
-    }
 
-    //double plow = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(wlow);
-    //double phigh = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(whigh);
+        //double plow = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(wlow);
+        //double phigh = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(whigh);
 
 
-    double w = 0.0;
-    iter_count = 0;
-    while(true)
-    {
-        double w_new = 0.5*(w_low+w_high);
-        double p_new = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w_new);
-        //cout<<"when w = "<<w_new<<" rad/s ("<<w_new/wn<<" pu), extracted mechanical power = "<<pnew<<"MW"<<endl;
-        double telec = pelec/w_new;
-        double tdamp = damping*(w_new/wn-1.0)*(mbase/wn)/n;
-        double tmech = telec+tdamp;
-        //cout<<"telec = "<<telec<<", tdamp = "<<tdamp<<", tmech = "<<tmech<<endl;
-        //cout<<"pelec = "<<telec*w_new<<", pdamp = "<<tdamp*w_new<<", pmech = "<<tmech*w_new<<endl;
-        pmech = tmech*w_new;
-        pmech /= eta;
-        if(fabs(p_new-pmech)<FLOAT_EPSILON)
-        {
-            w = w_new;
-            //osstream<<__FUNCTION__<<"() takes "<<iter_count<<" iterations.";
-            //show_information_with_leading_time_stamp(osstream);
-            break;
-        }
-        if(get_turbine_speed_mode()==WT_UNDERSPEED_MODE)
-        {
-            if(p_new>pmech)
-                w_high = w_new;
-            else
-                w_low = w_new;
-        }
-        else
+        double w = 0.0;
+        iter_count = 0;
+        while(true)
         {
-            if(p_new>pmech)
-                w_low = w_new;
+            double w_new = 0.5*(w_low+w_high);
+            double p_new = get_extracted_power_from_wind_per_wt_generator_in_MW_with_turbine_speed_in_rad_per_s(w_new);
+            //cout<<"when w = "<<w_new<<" rad/s ("<<w_new/wn<<" pu), extracted mechanical power = "<<pnew<<"MW"<<endl;
+            double telec = pelec/w_new;
+            double tdamp = damping*(w_new/wn-1.0)*(mbase/wn)/n;
+            double tmech = telec+tdamp;
+            //cout<<"telec = "<<telec<<", tdamp = "<<tdamp<<", tmech = "<<tmech<<endl;
+            //cout<<"pelec = "<<telec*w_new<<", pdamp = "<<tdamp*w_new<<", pmech = "<<tmech*w_new<<endl;
+            pmech = tmech*w_new;
+            pmech /= eta;
+            if(fabs(p_new-pmech)>FLOAT_EPSILON)
+            {
+                if(get_turbine_speed_mode()==WT_UNDERSPEED_MODE)
+                {
+                    if(p_new>pmech)
+                        w_high = w_new;
+                    else
+                        w_low = w_new;
+                }
+                else
+                {
+                    if(p_new>pmech)
+                        w_low = w_new;
+                    else
+                        w_high = w_new;
+                }
+                iter_count++;
+                if(iter_count<=iter_max)
+                    ;
+                else
+                {
+                    w = w_new;
+                    /*osstream<<"Warning. Failed to get reference wt turbine speed in "<<iter_max<<" iterations."<<endl
+                           <<"Current electrical power generation = "<<pmech*n<<"MW. Maximum available wind power = "<<pmax*n<<" MW at 0.0 pitch ange"<<endl
+                           <<"Maximum available wind power = "<<get_total_wind_power_per_wt_generator_in_MW(vwind)*cpmax*n<<" MW at current pitch ange"<<endl
+                           <<"Current wind speed = "<<vwind<<" m/s, pitch angle = "<<pitch<<" deg, Cpmax = "<<cpmax<<" at w_mpppt = "<<w_mppt<<" rad/s"<<endl
+                           <<"Reference turbine speed is returned as "<<w<<" rad/s."<<endl
+                           <<"Check "<<get_model_name()<<" model of "<<get_device_name();
+                    toolkit.show_information_with_leading_time_stamp(osstream);*/
+                    break;
+                }
+            }
             else
-                w_high = w_new;
-        }
-        iter_count++;
-        if(iter_count>iter_max)
-        {
-            w = w_new;
-            /*osstream<<"Warning. Failed to get reference wt turbine speed in "<<iter_max<<" iterations."<<endl
-                   <<"Current electrical power generation = "<<pmech*n<<"MW. Maximum available wind power = "<<pmax*n<<" MW at 0.0 pitch ange"<<endl
-                   <<"Maximum available wind power = "<<get_total_wind_power_per_wt_generator_in_MW(vwind)*cpmax*n<<" MW at current pitch ange"<<endl
-                   <<"Current wind speed = "<<vwind<<" m/s, pitch angle = "<<pitch<<" deg, Cpmax = "<<cpmax<<" at w_mpppt = "<<w_mppt<<" rad/s"<<endl
-                   <<"Reference turbine speed is returned as "<<w<<" rad/s."<<endl
-                   <<"Check "<<get_model_name()<<" model of "<<get_device_name();
-            toolkit.show_information_with_leading_time_stamp(osstream);*/
-            break;
+            {
+                w = w_new;
+                //osstream<<__FUNCTION__<<"() takes "<<iter_count<<" iterations.";
+                //show_information_with_leading_time_stamp(osstream);
+                break;
+            }
         }
-    }
 
-    current_turbine_speed_reference_without_limit_in_rad_per_s = w;
+        current_turbine_speed_reference_without_limit_in_rad_per_s = w;
+    }
+    else
+    {
+        /*osstream<<"Warning. Current electrical power generation of "<<get_device_name()<<" exceeds the maximum available wind power:"<<endl
+               <<"Current electrical power generation = "<<pmech*n<<"MW. Maximum available wind power = "<<pmax*n<<" MW"<<endl
+               <<"Current wind speed = "<<vwind<<" m, pitch angle = "<<pitch<<" deg, Cpmax = "<<cpmax<<" at w_mpppt = "<<w_mppt<<" rad/s"<<endl
+               <<"MPPT speed will be returned as speed reference: "<<w_mppt<<" rad/s.";
+        toolkit.show_information_with_leading_time_stamp(osstream);*/
+
+        current_turbine_speed_reference_without_limit_in_rad_per_s = w_mppt;
+        return;
+    }
 }
 
 double WT_AERODYNAMIC_MODEL::get_current_pitch_angle_in_deg() const
diff --git a/code/source/model/wtg_models/wt_electrical_model/wt3e0.cpp b/code/source/model/wtg_models/wt_electrical_model/wt3e0.cpp
index 675aa900..69dbc3d3 100644
--- a/code/source/model/wtg_models/wt_electrical_model/wt3e0.cpp
+++ b/code/source/model/wtg_models/wt_electrical_model/wt3e0.cpp
@@ -453,124 +453,128 @@ double WT3E0::get_speed_reference_bias_in_pu() const
 bool WT3E0::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<38)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    size_t bus, voltage_flag;
-    int var_control_flag;
-    double tfv, kpv, kiv, xc, tfp, kpp, kip, pmax, pmin, qmax, qmin,
-           ipmax, trv, rpmax, rpmin, tspeed, kqi, vmax, vmin,
-           kqv, eqmax, eqmin, tv, tp, fn,
-           kvi, tvi, kdroop, tdroop, fupper, flower, kint;
-
-    size_t i=3;
-    bus = get_integer_data(data[i],"0"); i++;
-    var_control_flag = get_integer_data(data[i],"0"); i++;
-    voltage_flag = size_t(get_integer_data(data[i],"0")); i++;
-    xc = get_double_data(data[i],"0.0"); i++;
-    trv = get_double_data(data[i],"0.0"); i++;
-    fn = get_double_data(data[i],"0.0"); i++;
-    kpv = get_double_data(data[i],"0.0"); i++;
-    tv = get_double_data(data[i],"0.0"); i++;
-    kiv = get_double_data(data[i],"0.0"); i++;
-    qmin = get_double_data(data[i],"0.0"); i++;
-    qmax = get_double_data(data[i],"0.0"); i++;
-    tfv = get_double_data(data[i],"0.0"); i++;
-    tp = get_double_data(data[i],"0.0"); i++;
-    kqi = get_double_data(data[i],"0.0"); i++;
-    vmin = get_double_data(data[i],"0.0"); i++;
-    vmax = get_double_data(data[i],"0.0"); i++;
-    kqv = get_double_data(data[i],"0.0"); i++;
-    eqmin = get_double_data(data[i],"0.0"); i++;
-    eqmax = get_double_data(data[i],"0.0"); i++;
-    tspeed = get_double_data(data[i],"0.0"); i++;
-    kpp = get_double_data(data[i],"0.0"); i++;
-    kip = get_double_data(data[i],"0.0"); i++;
-    kvi = get_double_data(data[i],"0.0"); i++;
-    tvi = get_double_data(data[i],"0.0"); i++;
-    kdroop = get_double_data(data[i],"0.0"); i++;
-    tdroop = get_double_data(data[i],"0.0"); i++;
-    flower = get_double_data(data[i],"0.0"); i++;
-    fupper = get_double_data(data[i],"0.0"); i++;
-    kint = get_double_data(data[i],"0.0"); i++;
-    rpmin = get_double_data(data[i],"0.0"); i++;
-    rpmax = get_double_data(data[i],"0.0"); i++;
-    tfp = get_double_data(data[i],"0.0"); i++;
-    pmin = get_double_data(data[i],"0.0"); i++;
-    pmax = get_double_data(data[i],"0.0"); i++;
-    ipmax = get_double_data(data[i],"0.0");
-
-    set_bus_to_regulate(bus);
-    PE_VAR_CONTROL_MODE mode;
-    switch(var_control_flag)
+    if(data.size()>=38)
     {
-        case 0:
-        {
-            mode = CONSTANT_VAR_MODE;
-            break;
-        }
-        case 1:
-        {
-            mode = CONSTANT_VOLTAGE_MODE;
-            break;
-        }
-        case -1:
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
         {
-            mode = CONSTANT_POWER_FACTOR_MODE;
-            break;
-        }
-        default:
-        {
-            mode = CONSTANT_VAR_MODE;
-            break;
+            size_t bus, voltage_flag;
+            int var_control_flag;
+            double tfv, kpv, kiv, xc, tfp, kpp, kip, pmax, pmin, qmax, qmin,
+                   ipmax, trv, rpmax, rpmin, tspeed, kqi, vmax, vmin,
+                   kqv, eqmax, eqmin, tv, tp, fn,
+                   kvi, tvi, kdroop, tdroop, fupper, flower, kint;
+
+            size_t i=3;
+            bus = get_integer_data(data[i],"0"); i++;
+            var_control_flag = get_integer_data(data[i],"0"); i++;
+            voltage_flag = size_t(get_integer_data(data[i],"0")); i++;
+            xc = get_double_data(data[i],"0.0"); i++;
+            trv = get_double_data(data[i],"0.0"); i++;
+            fn = get_double_data(data[i],"0.0"); i++;
+            kpv = get_double_data(data[i],"0.0"); i++;
+            tv = get_double_data(data[i],"0.0"); i++;
+            kiv = get_double_data(data[i],"0.0"); i++;
+            qmin = get_double_data(data[i],"0.0"); i++;
+            qmax = get_double_data(data[i],"0.0"); i++;
+            tfv = get_double_data(data[i],"0.0"); i++;
+            tp = get_double_data(data[i],"0.0"); i++;
+            kqi = get_double_data(data[i],"0.0"); i++;
+            vmin = get_double_data(data[i],"0.0"); i++;
+            vmax = get_double_data(data[i],"0.0"); i++;
+            kqv = get_double_data(data[i],"0.0"); i++;
+            eqmin = get_double_data(data[i],"0.0"); i++;
+            eqmax = get_double_data(data[i],"0.0"); i++;
+            tspeed = get_double_data(data[i],"0.0"); i++;
+            kpp = get_double_data(data[i],"0.0"); i++;
+            kip = get_double_data(data[i],"0.0"); i++;
+            kvi = get_double_data(data[i],"0.0"); i++;
+            tvi = get_double_data(data[i],"0.0"); i++;
+            kdroop = get_double_data(data[i],"0.0"); i++;
+            tdroop = get_double_data(data[i],"0.0"); i++;
+            flower = get_double_data(data[i],"0.0"); i++;
+            fupper = get_double_data(data[i],"0.0"); i++;
+            kint = get_double_data(data[i],"0.0"); i++;
+            rpmin = get_double_data(data[i],"0.0"); i++;
+            rpmax = get_double_data(data[i],"0.0"); i++;
+            tfp = get_double_data(data[i],"0.0"); i++;
+            pmin = get_double_data(data[i],"0.0"); i++;
+            pmax = get_double_data(data[i],"0.0"); i++;
+            ipmax = get_double_data(data[i],"0.0");
+
+            set_bus_to_regulate(bus);
+            PE_VAR_CONTROL_MODE mode;
+            switch(var_control_flag)
+            {
+                case 0:
+                {
+                    mode = CONSTANT_VAR_MODE;
+                    break;
+                }
+                case 1:
+                {
+                    mode = CONSTANT_VOLTAGE_MODE;
+                    break;
+                }
+                case -1:
+                {
+                    mode = CONSTANT_POWER_FACTOR_MODE;
+                    break;
+                }
+                default:
+                {
+                    mode = CONSTANT_VAR_MODE;
+                    break;
+                }
+            }
+
+            set_var_control_mode(mode);
+            set_Xcomp_in_pu(xc);
+            set_TRV_in_s(trv);
+            set_Fn(fn);
+            set_KPV(kpv);
+            set_TV_in_s(tv);
+            set_KIV(kiv);
+            set_Qmin_in_pu(qmin);
+            set_Qmax_in_pu(qmax);
+            set_TFV_in_s(tfv);
+            set_TP_in_s(tp);
+            set_KQI(kqi);
+            set_Vmin_in_pu(vmin);
+            set_Vmax_in_pu(vmax);
+
+            if(voltage_flag>2)
+                voltage_flag = 2;
+            set_voltage_flag(voltage_flag);
+            set_KQV(kqv);
+            set_EQmin_in_pu(eqmin);
+            set_EQmax_in_pu(eqmax);
+            set_Tspeed_in_s(tspeed);
+            set_KPP(kpp);
+            set_KIP(kip);
+            set_Kvi(kvi);
+            set_Tvi_in_s(tvi);
+            set_Kdroop(kdroop);
+            set_Tdroop_in_s(tdroop);
+            set_frequency_deviation_lower_deadband_in_pu(flower);
+            set_frequency_deviation_upper_deadband_in_pu(fupper);
+            set_Kfint(kint);
+            set_rPmin_in_pu(rpmin);
+            set_rPmax_in_pu(rpmax);
+            set_TFP_in_s(tfp);
+            set_Pmin_in_pu(pmin);
+            set_Pmax_in_pu(pmax);
+            set_IPmax_in_pu(ipmax);
+
+            is_successful = true;
+
+            return is_successful;
         }
+        else
+            return is_successful;
     }
-
-    set_var_control_mode(mode);
-    set_Xcomp_in_pu(xc);
-    set_TRV_in_s(trv);
-    set_Fn(fn);
-    set_KPV(kpv);
-    set_TV_in_s(tv);
-    set_KIV(kiv);
-    set_Qmin_in_pu(qmin);
-    set_Qmax_in_pu(qmax);
-    set_TFV_in_s(tfv);
-    set_TP_in_s(tp);
-    set_KQI(kqi);
-    set_Vmin_in_pu(vmin);
-    set_Vmax_in_pu(vmax);
-
-    if(voltage_flag>2)
-        voltage_flag = 2;
-    set_voltage_flag(voltage_flag);
-    set_KQV(kqv);
-    set_EQmin_in_pu(eqmin);
-    set_EQmax_in_pu(eqmax);
-    set_Tspeed_in_s(tspeed);
-    set_KPP(kpp);
-    set_KIP(kip);
-    set_Kvi(kvi);
-    set_Tvi_in_s(tvi);
-    set_Kdroop(kdroop);
-    set_Tdroop_in_s(tdroop);
-    set_frequency_deviation_lower_deadband_in_pu(flower);
-    set_frequency_deviation_upper_deadband_in_pu(fupper);
-    set_Kfint(kint);
-    set_rPmin_in_pu(rpmin);
-    set_rPmax_in_pu(rpmax);
-    set_TFP_in_s(tfp);
-    set_Pmin_in_pu(pmin);
-    set_Pmax_in_pu(pmax);
-    set_IPmax_in_pu(ipmax);
-
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool WT3E0::setup_model_with_psse_string(string data)
@@ -612,219 +616,219 @@ void WT3E0::set_block_toolkit()
 void WT3E0::initialize()
 {
     ostringstream osstream;
-    if(is_model_initialized())
-        return;
-
-    WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return;
-
-    WT_GENERATOR_MODEL* wtgenmodel = wt_generator->get_wt_generator_model();
-    if(wtgenmodel==NULL)
-        return;
-
-    if(not wtgenmodel->is_model_initialized())
-        wtgenmodel->initialize();
-
-    WT_AERODYNAMIC_MODEL* aerdmodel = wt_generator->get_wt_aerodynamic_model();
-    if(aerdmodel==NULL)
-        return;
-
-    if(not aerdmodel->is_model_initialized())
-        aerdmodel->initialize();
-
-    WT_TURBINE_MODEL* turbine_model = wt_generator->get_wt_turbine_model();
-    if(turbine_model==NULL)
-        return;
-
-    if(not turbine_model->is_model_initialized())
-        turbine_model->initialize();
-
-    set_block_toolkit();
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    double vterm = get_terminal_bus_voltage_in_pu();
-    double iterm = get_wt_generator_terminal_current_in_pu();
-    double freq = get_terminal_bus_frequency_deviation_in_pu();
-    //double mbase = get_mbase_in_MVA();
-    complex<double> selec = get_wt_generator_terminal_generation_in_pu_based_on_mbase();
-    double pelec = selec.real();
-    double qelec = selec.imag();
-    double speed = get_wt_generator_speed_in_pu();
-
-    double ipcmd = wtgenmodel->get_initial_active_current_command_in_pu_based_on_mbase();
-    double ipmax = get_IPmax_in_pu();
-    if(ipcmd>ipmax)
-    {
-        osstream<<"Initialization error. IPcmd (Active current command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"IPcmd is "<<ipcmd<<", and IPmax is "<<ipmax<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    double porder = ipcmd*vterm;
-    double pmax = get_Pmax_in_pu();
-    double pmin = get_Pmin_in_pu();
-    power_order_integrator.set_output(porder);
-    if(porder>pmax)
+    if(not is_model_initialized())
     {
-        osstream<<"Initialization error. Porder (Active power order) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"Porder is "<<porder<<", and Pmax is "<<pmax<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    if(porder<pmin)
-    {
-        osstream<<"Initialization error. Porder (Active power order) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-          <<"Porder is "<<porder<<", and Pmin is "<<pmin<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    power_order_integrator.initialize();
-
-    double torque =  porder/speed;
-    torque_PI_regulator.set_output(torque);
-    torque_PI_regulator.initialize();
-
-    virtual_inertia_emulator.set_input(0.0);
-    virtual_inertia_emulator.initialize();
-
-    frequency_droop_controller.set_output(0.0);
-    frequency_droop_controller.initialize();
-
-    frequency_integral_controller.set_output(0.0);
-    frequency_integral_controller.initialize();
-
-    set_frequency_reference_in_pu(freq);
-
-    double speedref = get_wt_generator_speed_referance_in_pu();
-    //set_speed_reference_bias_in_pu(speedref-speed);
-    wind_turbine_speed_reference_sensor.set_output(speedref);
-    wind_turbine_speed_reference_sensor.initialize();
-
-
-    double iqcmd = wtgenmodel->get_initial_reactive_current_command_in_pu_based_on_mbase();
-    double xsource = get_source_impedance_in_pu_based_on_mbase().imag();
-    double eqcmd = iqcmd*(-xsource);
-
-    double verror = 0.0;
-    size_t vflag = get_voltage_flag();
-    if(vflag == 0)
-    {
-        V_error_integrator.set_output(0.0);
-        V_error_integrator.initialize();
-
-        verror = eqcmd;
-    }
-    else
-    {
-        if(vflag == 1)
-        {
-            V_error_integrator.set_upper_limit(vterm+get_EQmax_in_pu());
-            V_error_integrator.set_lower_limit(vterm+get_EQmin_in_pu());
-        }
-        else
-        {
-            V_error_integrator.set_upper_limit(get_EQmax_in_pu());
-            V_error_integrator.set_lower_limit(get_EQmin_in_pu());
-        }
-        double vmax = V_error_integrator.get_upper_limit();
-        double vmin = V_error_integrator.get_lower_limit();
-
-        V_error_integrator.set_output(eqcmd);
-        if(eqcmd>vmax)
-        {
-            osstream<<"Initialization error. Eqcmd (reactive voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-              <<"Eqcmd is "<<eqcmd<<", and Vmax is "<<vmax<<" for voltage flag = "<<vflag;
-            toolkit.show_information_with_leading_time_stamp(osstream);
-        }
-        if(eqcmd<vmin)
+        WT_GENERATOR* wt_generator = get_wt_generator_pointer();
+        if(wt_generator!=NULL)
         {
-            osstream<<"Initialization error. Eqcmd (reactive voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-              <<"Eqcmd is "<<eqcmd<<", and Vmin is "<<vmin<<" for voltage flag = "<<vflag;
-            toolkit.show_information_with_leading_time_stamp(osstream);
+            WT_GENERATOR_MODEL* wtgenmodel = wt_generator->get_wt_generator_model();
+            if(wtgenmodel!=NULL)
+            {
+                if(not wtgenmodel->is_model_initialized())
+                    wtgenmodel->initialize();
+
+                WT_AERODYNAMIC_MODEL* aerdmodel = wt_generator->get_wt_aerodynamic_model();
+                if(aerdmodel!=NULL)
+                {
+                    if(not aerdmodel->is_model_initialized())
+                        aerdmodel->initialize();
+
+                    WT_TURBINE_MODEL* turbine_model = wt_generator->get_wt_turbine_model();
+                    if(turbine_model!=NULL)
+                    {
+                        if(not turbine_model->is_model_initialized())
+                            turbine_model->initialize();
+
+                        set_block_toolkit();
+
+                        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+
+                        double vterm = get_terminal_bus_voltage_in_pu();
+                        double iterm = get_wt_generator_terminal_current_in_pu();
+                        double freq = get_terminal_bus_frequency_deviation_in_pu();
+                        //double mbase = get_mbase_in_MVA();
+                        complex<double> selec = get_wt_generator_terminal_generation_in_pu_based_on_mbase();
+                        double pelec = selec.real();
+                        double qelec = selec.imag();
+                        double speed = get_wt_generator_speed_in_pu();
+
+                        double ipcmd = wtgenmodel->get_initial_active_current_command_in_pu_based_on_mbase();
+                        double ipmax = get_IPmax_in_pu();
+                        if(ipcmd>ipmax)
+                        {
+                            osstream<<"Initialization error. IPcmd (Active current command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                              <<"IPcmd is "<<ipcmd<<", and IPmax is "<<ipmax<<".";
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                        double porder = ipcmd*vterm;
+                        double pmax = get_Pmax_in_pu();
+                        double pmin = get_Pmin_in_pu();
+                        power_order_integrator.set_output(porder);
+                        if(porder>pmax)
+                        {
+                            osstream<<"Initialization error. Porder (Active power order) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                              <<"Porder is "<<porder<<", and Pmax is "<<pmax<<".";
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                        if(porder<pmin)
+                        {
+                            osstream<<"Initialization error. Porder (Active power order) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                              <<"Porder is "<<porder<<", and Pmin is "<<pmin<<".";
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                        power_order_integrator.initialize();
+
+                        double torque =  porder/speed;
+                        torque_PI_regulator.set_output(torque);
+                        torque_PI_regulator.initialize();
+
+                        virtual_inertia_emulator.set_input(0.0);
+                        virtual_inertia_emulator.initialize();
+
+                        frequency_droop_controller.set_output(0.0);
+                        frequency_droop_controller.initialize();
+
+                        frequency_integral_controller.set_output(0.0);
+                        frequency_integral_controller.initialize();
+
+                        set_frequency_reference_in_pu(freq);
+
+                        double speedref = get_wt_generator_speed_referance_in_pu();
+                        //set_speed_reference_bias_in_pu(speedref-speed);
+                        wind_turbine_speed_reference_sensor.set_output(speedref);
+                        wind_turbine_speed_reference_sensor.initialize();
+
+
+                        double iqcmd = wtgenmodel->get_initial_reactive_current_command_in_pu_based_on_mbase();
+                        double xsource = get_source_impedance_in_pu_based_on_mbase().imag();
+                        double eqcmd = iqcmd*(-xsource);
+
+                        double verror = 0.0;
+                        size_t vflag = get_voltage_flag();
+                        if(vflag == 0)
+                        {
+                            V_error_integrator.set_output(0.0);
+                            V_error_integrator.initialize();
+
+                            verror = eqcmd;
+                        }
+                        else
+                        {
+                            if(vflag == 1)
+                            {
+                                V_error_integrator.set_upper_limit(vterm+get_EQmax_in_pu());
+                                V_error_integrator.set_lower_limit(vterm+get_EQmin_in_pu());
+                            }
+                            else
+                            {
+                                V_error_integrator.set_upper_limit(get_EQmax_in_pu());
+                                V_error_integrator.set_lower_limit(get_EQmin_in_pu());
+                            }
+                            double vmax = V_error_integrator.get_upper_limit();
+                            double vmin = V_error_integrator.get_lower_limit();
+
+                            V_error_integrator.set_output(eqcmd);
+                            if(eqcmd>vmax)
+                            {
+                                osstream<<"Initialization error. Eqcmd (reactive voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                                  <<"Eqcmd is "<<eqcmd<<", and Vmax is "<<vmax<<" for voltage flag = "<<vflag;
+                                toolkit.show_information_with_leading_time_stamp(osstream);
+                            }
+                            if(eqcmd<vmin)
+                            {
+                                osstream<<"Initialization error. Eqcmd (reactive voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                                  <<"Eqcmd is "<<eqcmd<<", and Vmin is "<<vmin<<" for voltage flag = "<<vflag;
+                                toolkit.show_information_with_leading_time_stamp(osstream);
+                            }
+                            V_error_integrator.initialize();
+                            verror = 0.0;
+                        }
+
+                        double vcmd = verror+vterm;
+                        double vmax = get_Vmax_in_pu();
+                        double vmin = get_Vmin_in_pu();
+                        Q_error_integrator.set_output(vcmd);
+                        if(vcmd>vmax)
+                        {
+                            osstream<<"Initialization error. Vcmd (voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                              <<"Vcmd is "<<vcmd<<", and Vmax is "<<vmax<<".";
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                        if(vcmd<vmin)
+                        {
+                            osstream<<"Initialization error. Vcmd (voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                              <<"Vcmd is "<<vcmd<<", and Vmin is "<<vmin<<".";
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                        Q_error_integrator.initialize();
+
+                        double qcmd = qelec;
+                        double qmax = get_Qmax_in_pu();
+                        double qmin = get_Qmin_in_pu();
+                        if(qcmd>qmax)
+                        {
+                            osstream<<"Initialization error. Qcmd (reactive power command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                                    <<"Qcmd is "<<qcmd<<", and Qmax is "<<qmax<<".";
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                        if(qcmd<qmin)
+                        {
+                            osstream<<"Initialization error. Qcmd (reactive power command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                                    <<"Qcmd is "<<qcmd<<", and Qmin is "<<qmin<<".";
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+
+                        set_reactive_power_reference_in_pu(qcmd);
+
+                        active_power_sensor.set_output(pelec);
+                        active_power_sensor.initialize();
+
+                        double smag = steps_fast_complex_abs(selec);
+                        double pf = fabs(pelec) / smag;
+                        pf = (qelec/pelec>0? pf:-pf);
+                        set_power_factor_reference_in_pu(pf);
+
+                        voltage_regulator_filter.set_output(qcmd);
+                        voltage_regulator_filter.initialize();
+
+                        voltage_regulator_integrator.set_output(qcmd);
+                        voltage_regulator_integrator.initialize();
+
+                        voltage_regulator_first_order_block.set_output(0.0);
+                        voltage_regulator_first_order_block.initialize();
+
+                        double xcomp = get_Xcomp_in_pu();
+                        double vref = vterm+iterm*xcomp;
+
+                        voltage_sensor.set_output(vref);
+                        voltage_sensor.initialize();
+
+                        set_voltage_reference_in_pu(vref);
+                        //show_information_with_leading_time_stamp(osstream);
+
+                        set_flag_model_initialized_as_true();
+                        osstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
+                                <<"(1) voltage sensor state: "<<voltage_sensor.get_state()<<endl
+                                <<"(2) voltage reference: "<< get_voltage_reference_in_pu()<<endl
+                                <<"(3) voltage regulator integrator state: "<<voltage_regulator_integrator.get_state()<<endl
+                                <<"(4) voltage regulator first order block state: "<<voltage_regulator_first_order_block.get_state()<<endl
+                                <<"(5) voltage regulator filter state: "<<voltage_regulator_filter.get_state()<<endl
+                                <<"(6) active power sensor state: "<<active_power_sensor.get_state()<<endl
+                                <<"(7) reactive power error integrator state: "<<Q_error_integrator.get_state()<<endl
+                                <<"(8) voltage error integrator state: "<<V_error_integrator.get_state()<<endl
+                                <<"(9) reference speed sensor state: "<<wind_turbine_speed_reference_sensor.get_state()<<endl
+                                <<"(10) torque PI regulator state: "<<torque_PI_regulator.get_state()<<endl
+                                <<"(11) virtual inertia regulator state: "<<virtual_inertia_emulator.get_state()<<endl
+                                <<"(12) frequency droop regulator state: "<<frequency_droop_controller.get_state()<<endl
+                                <<"(13) reactive voltage command: "<<get_reactive_voltage_command_in_pu()<<endl
+                                <<"(14) active current command: "<<get_active_current_command_in_pu_based_on_mbase()<<endl
+                                <<"(15) reactive current command: "<<get_reactive_current_command_in_pu_based_on_mbase();
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                    }
+                }
+            }
         }
-        V_error_integrator.initialize();
-        verror = 0.0;
     }
-
-    double vcmd = verror+vterm;
-    double vmax = get_Vmax_in_pu();
-    double vmin = get_Vmin_in_pu();
-    Q_error_integrator.set_output(vcmd);
-    if(vcmd>vmax)
-    {
-        osstream<<"Initialization error. Vcmd (voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"Vcmd is "<<vcmd<<", and Vmax is "<<vmax<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    if(vcmd<vmin)
-    {
-        osstream<<"Initialization error. Vcmd (voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-          <<"Vcmd is "<<vcmd<<", and Vmin is "<<vmin<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    Q_error_integrator.initialize();
-
-    double qcmd = qelec;
-    double qmax = get_Qmax_in_pu();
-    double qmin = get_Qmin_in_pu();
-    if(qcmd>qmax)
-    {
-        osstream<<"Initialization error. Qcmd (reactive power command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-                <<"Qcmd is "<<qcmd<<", and Qmax is "<<qmax<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    if(qcmd<qmin)
-    {
-        osstream<<"Initialization error. Qcmd (reactive power command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-                <<"Qcmd is "<<qcmd<<", and Qmin is "<<qmin<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-
-    set_reactive_power_reference_in_pu(qcmd);
-
-    active_power_sensor.set_output(pelec);
-    active_power_sensor.initialize();
-
-	double smag = steps_fast_complex_abs(selec);
-	double pf = fabs(pelec) / smag;
-    pf = (qelec/pelec>0? pf:-pf);
-    set_power_factor_reference_in_pu(pf);
-
-    voltage_regulator_filter.set_output(qcmd);
-    voltage_regulator_filter.initialize();
-
-    voltage_regulator_integrator.set_output(qcmd);
-    voltage_regulator_integrator.initialize();
-
-    voltage_regulator_first_order_block.set_output(0.0);
-    voltage_regulator_first_order_block.initialize();
-
-    double xcomp = get_Xcomp_in_pu();
-    double vref = vterm+iterm*xcomp;
-
-    voltage_sensor.set_output(vref);
-    voltage_sensor.initialize();
-
-    set_voltage_reference_in_pu(vref);
-    //show_information_with_leading_time_stamp(osstream);
-
-    set_flag_model_initialized_as_true();
-    osstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
-            <<"(1) voltage sensor state: "<<voltage_sensor.get_state()<<endl
-            <<"(2) voltage reference: "<< get_voltage_reference_in_pu()<<endl
-            <<"(3) voltage regulator integrator state: "<<voltage_regulator_integrator.get_state()<<endl
-            <<"(4) voltage regulator first order block state: "<<voltage_regulator_first_order_block.get_state()<<endl
-            <<"(5) voltage regulator filter state: "<<voltage_regulator_filter.get_state()<<endl
-            <<"(6) active power sensor state: "<<active_power_sensor.get_state()<<endl
-            <<"(7) reactive power error integrator state: "<<Q_error_integrator.get_state()<<endl
-            <<"(8) voltage error integrator state: "<<V_error_integrator.get_state()<<endl
-            <<"(9) reference speed sensor state: "<<wind_turbine_speed_reference_sensor.get_state()<<endl
-            <<"(10) torque PI regulator state: "<<torque_PI_regulator.get_state()<<endl
-            <<"(11) virtual inertia regulator state: "<<virtual_inertia_emulator.get_state()<<endl
-            <<"(12) frequency droop regulator state: "<<frequency_droop_controller.get_state()<<endl
-            <<"(13) reactive voltage command: "<<get_reactive_voltage_command_in_pu()<<endl
-            <<"(14) active current command: "<<get_active_current_command_in_pu_based_on_mbase()<<endl
-            <<"(15) reactive current command: "<<get_reactive_current_command_in_pu_based_on_mbase();
-    toolkit.show_information_with_leading_time_stamp(osstream);
 }
 
 void WT3E0::run(DYNAMIC_MODE mode)
@@ -832,181 +836,186 @@ void WT3E0::run(DYNAMIC_MODE mode)
     ostringstream osstream;
 
     WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return;
-
-    WT_GENERATOR_MODEL* wtgenmodel = wt_generator->get_wt_generator_model();
-    if(wtgenmodel==NULL)
-        return;
-
-    double vterm = get_terminal_bus_voltage_in_pu();
-    double iterm = get_wt_generator_terminal_current_in_pu();
-    double freq = get_terminal_bus_frequency_deviation_in_pu();
-    //double mbase = get_mbase_in_MVA();
-    complex<double> selec = get_wt_generator_terminal_generation_in_pu_based_on_mbase();
-    double pelec = selec.real();
-    double qelec = selec.imag();
-
-    double speed     = get_wt_generator_speed_in_pu();
-    double speed_ref = get_wt_generator_speed_referance_in_pu();
-    //double speedref_bias = get_speed_reference_bias_in_pu();
-
-    wind_turbine_speed_reference_sensor.set_input(speed_ref);
-    wind_turbine_speed_reference_sensor.run(mode);
-    //osstream<<"wind_turbine_speed_reference_sensor input = "<<speed_ref<<", output = "<<wind_turbine_speed_reference_sensor.get_output()<<endl;
-
-    //double input = speed + speedref_bias - wind_turbine_speed_reference_sensor.get_output();
-    double input = speed - wind_turbine_speed_reference_sensor.get_output();
-	//osstream << "at time " << toolkit.get_dynamic_simulation_time_in_s()<< "s, speed error is: " << input << endl;
-	//show_information_with_leading_time_stamp(osstream);
-
-    torque_PI_regulator.set_input(input);
-    torque_PI_regulator.run(mode);
-	//osstream << "at time " << toolkit.get_dynamic_simulation_time_in_s()<< "s, speed error PI regulator is: " << torque_PI_regulator.get_output() << endl;
-	//show_information_with_leading_time_stamp(osstream);
-	//osstream<<"torque_PI_regulator input = "<<input<<", output = "<<torque_PI_regulator.get_output()<<endl;
-
-    virtual_inertia_emulator.set_input(-freq);
-    virtual_inertia_emulator.run(mode);
-    //osstream<<"virtual_inertia_emulator input = "<<-freq<<", output = "<<virtual_inertia_emulator.get_output()<<endl;
-
-    frequency_droop_controller.set_input(-freq);
-    frequency_droop_controller.run(mode);
-    //osstream<<"frequency_droop_controller input = "<<-freq<<", output = "<<frequency_droop_controller.get_output()<<endl;
-
-    double fupper = get_frequency_deviation_upper_deadband_in_pu();
-    double flower = get_frequency_deviation_lower_deadband_in_pu();
-    double f_int =  freq;
-    if(freq>fupper)
-        f_int = freq - fupper;
-    if(freq<flower)
-        f_int = freq - flower;
-    frequency_integral_controller.set_input(-f_int);
-    frequency_integral_controller.run(mode);
-
-    //osstream<<"speed = "<<speed<<endl;
-/*    if(mode==UPDATE_MODE and is_frequency_regulation_enabled())
+    if(wt_generator!=NULL)
     {
-        WT_AERODYNAMIC_MODEL* aerd = wt_generator->get_wt_aerodynamic_model();
-        double wmin = aerd->get_min_steady_state_turbine_speed_in_pu();
-        double wmax = aerd->get_max_steady_state_turbine_speed_in_pu();
-        WT_TURBINE_MODEL* turb = wt_generator->get_wt_turbine_model();
-        double w = turb->get_generator_speed_in_pu();
-        if(w<wmin or w>wmax*1.1)
+        WT_GENERATOR_MODEL* wtgenmodel = wt_generator->get_wt_generator_model();
+        if(wtgenmodel!=NULL)
         {
-            osstream<<"Frequency regulation logic of "<<get_device_name()<<" is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<"s due to ";
-            if(w<wmin)
-                osstream<<"rotor w<wmin: "<<w<<"<"<<wmin<<" pu";
+            double vterm = get_terminal_bus_voltage_in_pu();
+            double iterm = get_wt_generator_terminal_current_in_pu();
+            double freq = get_terminal_bus_frequency_deviation_in_pu();
+            //double mbase = get_mbase_in_MVA();
+            complex<double> selec = get_wt_generator_terminal_generation_in_pu_based_on_mbase();
+            double pelec = selec.real();
+            double qelec = selec.imag();
+
+            double speed     = get_wt_generator_speed_in_pu();
+            double speed_ref = get_wt_generator_speed_referance_in_pu();
+            //double speedref_bias = get_speed_reference_bias_in_pu();
+
+            wind_turbine_speed_reference_sensor.set_input(speed_ref);
+            wind_turbine_speed_reference_sensor.run(mode);
+            //osstream<<"wind_turbine_speed_reference_sensor input = "<<speed_ref<<", output = "<<wind_turbine_speed_reference_sensor.get_output()<<endl;
+
+            //double input = speed + speedref_bias - wind_turbine_speed_reference_sensor.get_output();
+            double input = speed - wind_turbine_speed_reference_sensor.get_output();
+            //osstream << "at time " << toolkit.get_dynamic_simulation_time_in_s()<< "s, speed error is: " << input << endl;
+            //show_information_with_leading_time_stamp(osstream);
+
+            torque_PI_regulator.set_input(input);
+            torque_PI_regulator.run(mode);
+            //osstream << "at time " << toolkit.get_dynamic_simulation_time_in_s()<< "s, speed error PI regulator is: " << torque_PI_regulator.get_output() << endl;
+            //show_information_with_leading_time_stamp(osstream);
+            //osstream<<"torque_PI_regulator input = "<<input<<", output = "<<torque_PI_regulator.get_output()<<endl;
+
+            virtual_inertia_emulator.set_input(-freq);
+            virtual_inertia_emulator.run(mode);
+            //osstream<<"virtual_inertia_emulator input = "<<-freq<<", output = "<<virtual_inertia_emulator.get_output()<<endl;
+
+            frequency_droop_controller.set_input(-freq);
+            frequency_droop_controller.run(mode);
+            //osstream<<"frequency_droop_controller input = "<<-freq<<", output = "<<frequency_droop_controller.get_output()<<endl;
+
+            double fupper = get_frequency_deviation_upper_deadband_in_pu();
+            double flower = get_frequency_deviation_lower_deadband_in_pu();
+            double f_int =  freq;
+            if(freq>=flower and freq<=fupper)
+                ;
             else
-                osstream<<"rotor w>wmax*1.1: "<<w<<">"<<wmax*1.1<<" pu";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            trip_frequency_regulation();
-        }
-    }*/
-    if(is_frequency_regulation_enabled())
-    {
-        input = torque_PI_regulator.get_output()*speed
-                +virtual_inertia_emulator.get_output()
-                +frequency_droop_controller.get_output()
-                +frequency_integral_controller.get_output()
-                -power_order_integrator.get_output();
-    }
-    else
-    {
-        input = torque_PI_regulator.get_output()*speed
-                -power_order_integrator.get_output();
-    }
-	//osstream << "at time " << toolkit.get_dynamic_simulation_time_in_s()<< "s, active power rate is: " << input << endl;
-	//show_information_with_leading_time_stamp(osstream);
-    if(input>get_rPmax_in_pu())
-        input = get_rPmax_in_pu();
-    if(input<get_rPmin_in_pu())
-        input = get_rPmin_in_pu();
+            {
+                if(freq>fupper)
+                    f_int = freq - fupper;
+                else
+                    f_int = freq - flower;
+            }
+            frequency_integral_controller.set_input(-f_int);
+            frequency_integral_controller.run(mode);
 
-    //osstream<<"At time "<<toolkit.get_dynamic_simulation_time_in_s()<<", WT3E0 power_order_integrator input is "<<input;
-    //show_information_with_leading_time_stamp(osstream);
-    power_order_integrator.set_input(input);
-    power_order_integrator.run(mode);
-	//osstream << "at time " << toolkit.get_dynamic_simulation_time_in_s()<< "s, active power order is: " << power_order_integrator.get_output() << endl;
-	//show_information_with_leading_time_stamp(osstream);
-	//osstream<<"power_order_integrator input = "<<input<<", output = "<<power_order_integrator.get_output()<<endl;
-
-    active_power_sensor.set_input(pelec);
-    active_power_sensor.run(mode);
-    //osstream<<"active_power_sensor input = "<<pelec<<", output = "<<active_power_sensor.get_output()<<endl;
-
-    double xcomp = get_Xcomp_in_pu();
-    input = vterm+iterm*xcomp;
-    voltage_sensor.set_input(input);
-    voltage_sensor.run(mode);
-    //osstream<<"At time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s"<<endl;
-    //osstream<<"voltage_sensor input = "<<setw(20)<<setprecision(19)<<fixed<<input<<", output = "<<voltage_sensor.get_output()<<endl;
-
-    input = get_voltage_reference_in_pu()-voltage_sensor.get_output();
-    //osstream<<"input = "<<input<<endl;
-    input /= get_Fn();
-
-    voltage_regulator_integrator.set_input(input);
-    voltage_regulator_integrator.run(mode);
-    //osstream<<"voltage regulator integrator input = "<<input<<", output = "<<voltage_regulator_integrator.get_output()<<endl;
-
-    voltage_regulator_first_order_block.set_input(input);
-    voltage_regulator_first_order_block.run(mode);
-    //osstream<<"voltage regulator first order block input = "<<input<<", output = "<<voltage_regulator_first_order_block.get_output()<<endl;
-
-    input = voltage_regulator_integrator.get_output() + voltage_regulator_first_order_block.get_output();
-    //osstream<<"voltage_regulator_filter input = "<<input<<", output = "<<voltage_regulator_filter.get_output()<<endl;
-    voltage_regulator_filter.set_input(input);
-    voltage_regulator_filter.run(mode);
-    //osstream<<"voltage_regulator_filter input = "<<input<<", output = "<<voltage_regulator_filter.get_output()<<endl;
-
-    PE_VAR_CONTROL_MODE var_mode = get_var_control_mode();
-    double qcmd = 0.0;
-    if(var_mode==CONSTANT_VAR_MODE)
-        qcmd = get_reactive_power_reference_in_pu();
-    else
-    {
-        if(var_mode==CONSTANT_POWER_FACTOR_MODE)
-        {
-            double pf = get_power_factor_reference_in_pu();
-            qcmd = sqrt(1.0-pf*pf)/pf*active_power_sensor.get_output();
-        }
-        else
-            qcmd = voltage_regulator_filter.get_output();
-    }
-    if(qcmd>get_Qmax_in_pu())
-        qcmd = get_Qmax_in_pu();
-    if(qcmd<get_Qmin_in_pu())
-        qcmd = get_Qmin_in_pu();
-    //osstream<<"Q command = "<<qcmd<<endl;
-
-    input = qcmd - qelec;
-    Q_error_integrator.set_input(input);
-    Q_error_integrator.run(mode);
-    //osstream<<"Q_error_integrator input = "<<input<<", output = "<<Q_error_integrator.get_output()<<endl;
-
-    size_t vflag = get_voltage_flag();
-    if(vflag == 1 or vflag == 2)
-    {
-        if(vflag == 1)
-        {
-            V_error_integrator.set_upper_limit(vterm+get_EQmax_in_pu());
-            V_error_integrator.set_lower_limit(vterm+get_EQmin_in_pu());
-        }
-        else //vflag == 2
-        {
-            V_error_integrator.set_upper_limit(get_EQmax_in_pu());
-            V_error_integrator.set_lower_limit(get_EQmin_in_pu());
+            //osstream<<"speed = "<<speed<<endl;
+        /*    if(mode==UPDATE_MODE and is_frequency_regulation_enabled())
+            {
+                WT_AERODYNAMIC_MODEL* aerd = wt_generator->get_wt_aerodynamic_model();
+                double wmin = aerd->get_min_steady_state_turbine_speed_in_pu();
+                double wmax = aerd->get_max_steady_state_turbine_speed_in_pu();
+                WT_TURBINE_MODEL* turb = wt_generator->get_wt_turbine_model();
+                double w = turb->get_generator_speed_in_pu();
+                if(w<wmin or w>wmax*1.1)
+                {
+                    osstream<<"Frequency regulation logic of "<<get_device_name()<<" is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<"s due to ";
+                    if(w<wmin)
+                        osstream<<"rotor w<wmin: "<<w<<"<"<<wmin<<" pu";
+                    else
+                        osstream<<"rotor w>wmax*1.1: "<<w<<">"<<wmax*1.1<<" pu";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    trip_frequency_regulation();
+                }
+            }*/
+            if(is_frequency_regulation_enabled())
+            {
+                input = torque_PI_regulator.get_output()*speed
+                        +virtual_inertia_emulator.get_output()
+                        +frequency_droop_controller.get_output()
+                        +frequency_integral_controller.get_output()
+                        -power_order_integrator.get_output();
+            }
+            else
+            {
+                input = torque_PI_regulator.get_output()*speed
+                        -power_order_integrator.get_output();
+            }
+            //osstream << "at time " << toolkit.get_dynamic_simulation_time_in_s()<< "s, active power rate is: " << input << endl;
+            //show_information_with_leading_time_stamp(osstream);
+            if(input>get_rPmax_in_pu())
+                input = get_rPmax_in_pu();
+            if(input<get_rPmin_in_pu())
+                input = get_rPmin_in_pu();
+
+            //osstream<<"At time "<<toolkit.get_dynamic_simulation_time_in_s()<<", WT3E0 power_order_integrator input is "<<input;
+            //show_information_with_leading_time_stamp(osstream);
+            power_order_integrator.set_input(input);
+            power_order_integrator.run(mode);
+            //osstream << "at time " << toolkit.get_dynamic_simulation_time_in_s()<< "s, active power order is: " << power_order_integrator.get_output() << endl;
+            //show_information_with_leading_time_stamp(osstream);
+            //osstream<<"power_order_integrator input = "<<input<<", output = "<<power_order_integrator.get_output()<<endl;
+
+            active_power_sensor.set_input(pelec);
+            active_power_sensor.run(mode);
+            //osstream<<"active_power_sensor input = "<<pelec<<", output = "<<active_power_sensor.get_output()<<endl;
+
+            double xcomp = get_Xcomp_in_pu();
+            input = vterm+iterm*xcomp;
+            voltage_sensor.set_input(input);
+            voltage_sensor.run(mode);
+            //osstream<<"At time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s"<<endl;
+            //osstream<<"voltage_sensor input = "<<setw(20)<<setprecision(19)<<fixed<<input<<", output = "<<voltage_sensor.get_output()<<endl;
+
+            input = get_voltage_reference_in_pu()-voltage_sensor.get_output();
+            //osstream<<"input = "<<input<<endl;
+            input /= get_Fn();
+
+            voltage_regulator_integrator.set_input(input);
+            voltage_regulator_integrator.run(mode);
+            //osstream<<"voltage regulator integrator input = "<<input<<", output = "<<voltage_regulator_integrator.get_output()<<endl;
+
+            voltage_regulator_first_order_block.set_input(input);
+            voltage_regulator_first_order_block.run(mode);
+            //osstream<<"voltage regulator first order block input = "<<input<<", output = "<<voltage_regulator_first_order_block.get_output()<<endl;
+
+            input = voltage_regulator_integrator.get_output() + voltage_regulator_first_order_block.get_output();
+            //osstream<<"voltage_regulator_filter input = "<<input<<", output = "<<voltage_regulator_filter.get_output()<<endl;
+            voltage_regulator_filter.set_input(input);
+            voltage_regulator_filter.run(mode);
+            //osstream<<"voltage_regulator_filter input = "<<input<<", output = "<<voltage_regulator_filter.get_output()<<endl;
+
+            PE_VAR_CONTROL_MODE var_mode = get_var_control_mode();
+            double qcmd = 0.0;
+            if(var_mode==CONSTANT_VAR_MODE)
+                qcmd = get_reactive_power_reference_in_pu();
+            else
+            {
+                if(var_mode==CONSTANT_POWER_FACTOR_MODE)
+                {
+                    double pf = get_power_factor_reference_in_pu();
+                    qcmd = sqrt(1.0-pf*pf)/pf*active_power_sensor.get_output();
+                }
+                else
+                    qcmd = voltage_regulator_filter.get_output();
+            }
+            if(qcmd>get_Qmax_in_pu())
+                qcmd = get_Qmax_in_pu();
+            if(qcmd<get_Qmin_in_pu())
+                qcmd = get_Qmin_in_pu();
+            //osstream<<"Q command = "<<qcmd<<endl;
+
+            input = qcmd - qelec;
+            Q_error_integrator.set_input(input);
+            Q_error_integrator.run(mode);
+            //osstream<<"Q_error_integrator input = "<<input<<", output = "<<Q_error_integrator.get_output()<<endl;
+
+            size_t vflag = get_voltage_flag();
+            if(vflag == 1 or vflag == 2)
+            {
+                if(vflag == 1)
+                {
+                    V_error_integrator.set_upper_limit(vterm+get_EQmax_in_pu());
+                    V_error_integrator.set_lower_limit(vterm+get_EQmin_in_pu());
+                }
+                else //vflag == 2
+                {
+                    V_error_integrator.set_upper_limit(get_EQmax_in_pu());
+                    V_error_integrator.set_lower_limit(get_EQmin_in_pu());
+                }
+                input = Q_error_integrator.get_output()-vterm;
+                V_error_integrator.set_input(input);
+                V_error_integrator.run(mode);
+                //osstream<<"V_error_integrator input = "<<input<<", output = "<<V_error_integrator.get_output()<<endl;
+            }
+            //show_information_with_leading_time_stamp(osstream);
+
+            if(mode == UPDATE_MODE)
+                set_flag_model_updated_as_true();
         }
-        input = Q_error_integrator.get_output()-vterm;
-        V_error_integrator.set_input(input);
-        V_error_integrator.run(mode);
-        //osstream<<"V_error_integrator input = "<<input<<", output = "<<V_error_integrator.get_output()<<endl;
     }
-    //show_information_with_leading_time_stamp(osstream);
-
-    if(mode == UPDATE_MODE)
-        set_flag_model_updated_as_true();
 }
 
 
@@ -1033,14 +1042,16 @@ double WT3E0::get_reactive_current_command_in_pu_based_on_mbase() const
 {
     return 0.0;
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return 0.0;
-
-    double xeq = gen->get_source_impedance_in_pu().imag();
+    if(gen!=NULL)
+    {
+        double xeq = gen->get_source_impedance_in_pu().imag();
 
-    double eqcmd = get_reactive_voltage_command_in_pu();
+        double eqcmd = get_reactive_voltage_command_in_pu();
 
-    return eqcmd/(-xeq);
+        return eqcmd/(-xeq);
+    }
+    else
+        return 0.0;
 }
 
 double WT3E0::get_reactive_power_command_in_pu_based_on_mbase() const
diff --git a/code/source/model/wtg_models/wt_electrical_model/wt3e1.cpp b/code/source/model/wtg_models/wt_electrical_model/wt3e1.cpp
index f7fe2189..e536b188 100644
--- a/code/source/model/wtg_models/wt_electrical_model/wt3e1.cpp
+++ b/code/source/model/wtg_models/wt_electrical_model/wt3e1.cpp
@@ -72,49 +72,53 @@ string WT3E1::get_model_name() const
 double WT3E1::get_active_power_current_command_in_pu()
 {
     WT_GENERATOR* source = get_wt_generator_pointer();
-    if(source==NULL)
-        return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(source!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    size_t bus = source->get_source_bus();
-    double vterm = psdb.get_bus_voltage_in_pu(bus);
+        size_t bus = source->get_source_bus();
+        double vterm = psdb.get_bus_voltage_in_pu(bus);
 
-    double IPcmd = power_order_integrator.get_output()/vterm;
+        double IPcmd = power_order_integrator.get_output()/vterm;
 
-    double IPmax = get_IPmax_in_pu();
-    if(IPcmd>IPmax)
-        IPcmd = IPmax;
-    return IPcmd;
+        double IPmax = get_IPmax_in_pu();
+        if(IPcmd>IPmax)
+            IPcmd = IPmax;
+        return IPcmd;
+    }
+    else
+        return 0.0;
 }
 
 double WT3E1::get_reactive_power_current_command_in_pu()
 {
     WT_GENERATOR* source = get_wt_generator_pointer();
-    if(source==NULL)
-        return 0.0;
+    if(source!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        double EQcmd = 0.0;
+        if(get_voltage_flag()==0)
+        {
+            size_t bus = source->get_source_bus();
+            double vterm = psdb.get_bus_voltage_in_pu(bus);
 
-    double EQcmd = 0.0;
-    if(get_voltage_flag()==0)
-    {
-        size_t bus = source->get_source_bus();
-        double vterm = psdb.get_bus_voltage_in_pu(bus);
+            EQcmd = Q_error_integrator.get_output()-vterm;
+        }
+        else
+        {
+            EQcmd = V_error_integrator.get_output();
+        }
 
-        EQcmd = Q_error_integrator.get_output()-vterm;
+        double Xsource = source->get_source_impedance_in_pu().imag();
+
+        double IQcmd = -EQcmd/Xsource;
+        return IQcmd;
     }
     else
-    {
-        EQcmd = V_error_integrator.get_output();
-    }
-
-    double Xsource = source->get_source_impedance_in_pu().imag();
-
-    double IQcmd = -EQcmd/Xsource;
-    return IQcmd;
+        return 0.0;
 }
 
 void WT3E1::set_transformer_from_bus(size_t bus)
@@ -421,130 +425,134 @@ double WT3E1::get_IPmax_in_pu() const
 bool WT3E1::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<40)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    size_t bus, var_control_flag, voltage_flag, trans_from_bus, trans_to_bus;
-    string trans_id;
-
-    double tfv, kpv, kiv, xc, tfp, kpp, kip, pmax, pmin, qmax, qmin,
-           ipmax, trv, rpmax, rpmin, tspeed, kqi, vmax, vmin,
-           kqv, eqmax, eqmin, tv, tp, fn,
-           wmin, wp20, wp40, wp60, pmin_at_wmin, wp100;
-
-    size_t i=3;
-    bus = get_integer_data(data[i],"0"); i++;
-    var_control_flag = get_integer_data(data[i],"0"); i++;
-    voltage_flag = get_integer_data(data[i],"0"); i++;
-    trans_from_bus = get_integer_data(data[i],"0"); i++;
-    trans_to_bus = get_integer_data(data[i],"0"); i++;
-    trans_id = get_string_data(data[i],""); i++;
-    tfv = get_double_data(data[i],"0.0"); i++;
-    kpv = get_double_data(data[i],"0.0"); i++;
-    kiv = get_double_data(data[i],"0.0"); i++;
-    xc = get_double_data(data[i],"0.0"); i++;
-    tfp = get_double_data(data[i],"0.0"); i++;
-    kpp = get_double_data(data[i],"0.0"); i++;
-    kip = get_double_data(data[i],"0.0"); i++;
-    pmax = get_double_data(data[i],"0.0"); i++;
-    pmin = get_double_data(data[i],"0.0"); i++;
-    qmax = get_double_data(data[i],"0.0"); i++;
-    qmin = get_double_data(data[i],"0.0"); i++;
-    ipmax = get_double_data(data[i],"0.0"); i++;
-    trv = get_double_data(data[i],"0.0"); i++;
-    rpmax = get_double_data(data[i],"0.0"); i++;
-    rpmin = get_double_data(data[i],"0.0"); i++;
-    tspeed = get_double_data(data[i],"0.0"); i++;
-    kqi = get_double_data(data[i],"0.0"); i++;
-    vmax = get_double_data(data[i],"0.0"); i++;
-    vmin = get_double_data(data[i],"0.0"); i++;
-    kqv = get_double_data(data[i],"0.0"); i++;
-    eqmin = get_double_data(data[i],"0.0"); i++;
-    eqmax = get_double_data(data[i],"0.0"); i++;
-    tv = get_double_data(data[i],"0.0"); i++;
-    tp = get_double_data(data[i],"0.0"); i++;
-    fn = get_double_data(data[i],"0.0"); i++;
-    wmin = get_double_data(data[i],"0.0"); i++;
-    wp20 = get_double_data(data[i],"0.0"); i++;
-    wp40 = get_double_data(data[i],"0.0"); i++;
-    wp60 = get_double_data(data[i],"0.0"); i++;
-    pmin_at_wmin = get_double_data(data[i],"0.0"); i++;
-    wp100 = get_double_data(data[i],"0.0");
-
-    set_bus_to_regulate(bus);
-    PE_VAR_CONTROL_MODE mode;
-    switch(var_control_flag)
+    if(data.size()>=40)
     {
-        case 0:
-        {
-            mode = CONSTANT_VAR_MODE;
-            break;
-        }
-        case 1:
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
         {
-            mode = CONSTANT_POWER_FACTOR_MODE;
-            break;
-        }
-        case 2:
-        {
-            mode = CONSTANT_VOLTAGE_MODE;
-            break;
-        }
-        default:
-        {
-            mode = CONSTANT_VAR_MODE;
-            break;
+            size_t bus, var_control_flag, voltage_flag, trans_from_bus, trans_to_bus;
+            string trans_id;
+
+            double tfv, kpv, kiv, xc, tfp, kpp, kip, pmax, pmin, qmax, qmin,
+                   ipmax, trv, rpmax, rpmin, tspeed, kqi, vmax, vmin,
+                   kqv, eqmax, eqmin, tv, tp, fn,
+                   wmin, wp20, wp40, wp60, pmin_at_wmin, wp100;
+
+            size_t i=3;
+            bus = get_integer_data(data[i],"0"); i++;
+            var_control_flag = get_integer_data(data[i],"0"); i++;
+            voltage_flag = get_integer_data(data[i],"0"); i++;
+            trans_from_bus = get_integer_data(data[i],"0"); i++;
+            trans_to_bus = get_integer_data(data[i],"0"); i++;
+            trans_id = get_string_data(data[i],""); i++;
+            tfv = get_double_data(data[i],"0.0"); i++;
+            kpv = get_double_data(data[i],"0.0"); i++;
+            kiv = get_double_data(data[i],"0.0"); i++;
+            xc = get_double_data(data[i],"0.0"); i++;
+            tfp = get_double_data(data[i],"0.0"); i++;
+            kpp = get_double_data(data[i],"0.0"); i++;
+            kip = get_double_data(data[i],"0.0"); i++;
+            pmax = get_double_data(data[i],"0.0"); i++;
+            pmin = get_double_data(data[i],"0.0"); i++;
+            qmax = get_double_data(data[i],"0.0"); i++;
+            qmin = get_double_data(data[i],"0.0"); i++;
+            ipmax = get_double_data(data[i],"0.0"); i++;
+            trv = get_double_data(data[i],"0.0"); i++;
+            rpmax = get_double_data(data[i],"0.0"); i++;
+            rpmin = get_double_data(data[i],"0.0"); i++;
+            tspeed = get_double_data(data[i],"0.0"); i++;
+            kqi = get_double_data(data[i],"0.0"); i++;
+            vmax = get_double_data(data[i],"0.0"); i++;
+            vmin = get_double_data(data[i],"0.0"); i++;
+            kqv = get_double_data(data[i],"0.0"); i++;
+            eqmin = get_double_data(data[i],"0.0"); i++;
+            eqmax = get_double_data(data[i],"0.0"); i++;
+            tv = get_double_data(data[i],"0.0"); i++;
+            tp = get_double_data(data[i],"0.0"); i++;
+            fn = get_double_data(data[i],"0.0"); i++;
+            wmin = get_double_data(data[i],"0.0"); i++;
+            wp20 = get_double_data(data[i],"0.0"); i++;
+            wp40 = get_double_data(data[i],"0.0"); i++;
+            wp60 = get_double_data(data[i],"0.0"); i++;
+            pmin_at_wmin = get_double_data(data[i],"0.0"); i++;
+            wp100 = get_double_data(data[i],"0.0");
+
+            set_bus_to_regulate(bus);
+            PE_VAR_CONTROL_MODE mode;
+            switch(var_control_flag)
+            {
+                case 0:
+                {
+                    mode = CONSTANT_VAR_MODE;
+                    break;
+                }
+                case 1:
+                {
+                    mode = CONSTANT_POWER_FACTOR_MODE;
+                    break;
+                }
+                case 2:
+                {
+                    mode = CONSTANT_VOLTAGE_MODE;
+                    break;
+                }
+                default:
+                {
+                    mode = CONSTANT_VAR_MODE;
+                    break;
+                }
+            }
+            set_var_control_mode(mode);
+            set_transformer_from_bus(trans_from_bus);
+            set_transformer_to_bus(trans_to_bus);
+            set_transformer_id(trans_id);
+            set_Xcomp_in_pu(xc);
+            set_TRV_in_s(trv);
+            set_Fn(fn);
+            set_KIV(kiv);
+            set_Qmax_in_pu(qmax);
+            set_Qmin_in_pu(qmin);
+            set_KPV(kpv);
+            set_TV_in_s(tv);
+            set_TFV_in_s(tfv);
+            set_TP_in_s(tp);
+            set_KQI(kqi);
+            set_Vmax_in_pu(vmax);
+            set_Vmin_in_pu(vmin);
+
+            if(voltage_flag>2)
+                voltage_flag = 2;
+            set_voltage_flag(voltage_flag);
+            set_KQV(kqv);
+            set_EQmax_in_pu(eqmax);
+            set_EQmin_in_pu(eqmin);
+            set_Tspeed_in_s(tspeed);
+            set_KPP(kpp);
+            set_KIP(kip);
+            set_rPmax_in_pu(rpmax);
+            set_rPmin_in_pu(rpmin);
+            set_TFP_in_s(tfp);
+            set_Pmax_in_pu(pmax);
+            set_Pmin_in_pu(pmin);
+            set_IPmax_in_pu(ipmax);
+
+            WIND_TURBINE_POWER_SPEED_LOOKUP_TABLE table;
+            table.add_wind_turbine_power_and_speed_pair_in_pu(wmin, pmin_at_wmin);
+            table.add_wind_turbine_power_and_speed_pair_in_pu(wp20, 0.2);
+            table.add_wind_turbine_power_and_speed_pair_in_pu(wp40, 0.4);
+            table.add_wind_turbine_power_and_speed_pair_in_pu(wp60, 0.6);
+            table.add_wind_turbine_power_and_speed_pair_in_pu(wp100, 1.0);
+            set_wind_turbine_power_speed_lookup_table(table);
+
+            is_successful = true;
+
+            return is_successful;
         }
+        else
+            return is_successful;
     }
-    set_var_control_mode(mode);
-    set_transformer_from_bus(trans_from_bus);
-    set_transformer_to_bus(trans_to_bus);
-    set_transformer_id(trans_id);
-    set_Xcomp_in_pu(xc);
-    set_TRV_in_s(trv);
-    set_Fn(fn);
-    set_KIV(kiv);
-    set_Qmax_in_pu(qmax);
-    set_Qmin_in_pu(qmin);
-    set_KPV(kpv);
-    set_TV_in_s(tv);
-    set_TFV_in_s(tfv);
-    set_TP_in_s(tp);
-    set_KQI(kqi);
-    set_Vmax_in_pu(vmax);
-    set_Vmin_in_pu(vmin);
-
-    if(voltage_flag>2)
-        voltage_flag = 2;
-    set_voltage_flag(voltage_flag);
-    set_KQV(kqv);
-    set_EQmax_in_pu(eqmax);
-    set_EQmin_in_pu(eqmin);
-    set_Tspeed_in_s(tspeed);
-    set_KPP(kpp);
-    set_KIP(kip);
-    set_rPmax_in_pu(rpmax);
-    set_rPmin_in_pu(rpmin);
-    set_TFP_in_s(tfp);
-    set_Pmax_in_pu(pmax);
-    set_Pmin_in_pu(pmin);
-    set_IPmax_in_pu(ipmax);
-
-    WIND_TURBINE_POWER_SPEED_LOOKUP_TABLE table;
-    table.add_wind_turbine_power_and_speed_pair_in_pu(wmin, pmin_at_wmin);
-    table.add_wind_turbine_power_and_speed_pair_in_pu(wp20, 0.2);
-    table.add_wind_turbine_power_and_speed_pair_in_pu(wp40, 0.4);
-    table.add_wind_turbine_power_and_speed_pair_in_pu(wp60, 0.6);
-    table.add_wind_turbine_power_and_speed_pair_in_pu(wp100, 1.0);
-    set_wind_turbine_power_speed_lookup_table(table);
-
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool WT3E1::setup_model_with_psse_string(string data)
@@ -581,288 +589,284 @@ void WT3E1::set_block_toolkit()
 void WT3E1::initialize()
 {
     ostringstream osstream;
-    if(is_model_initialized())
-        return;
-
-    WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return;
-
-    WT_GENERATOR_MODEL* gen_model = wt_generator->get_wt_generator_model();
-    if(gen_model==NULL)
-        return;
-
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
-
-    set_block_toolkit();
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    double vterm = get_terminal_bus_voltage_in_pu();
-    double iterm = gen_model->get_terminal_current_in_pu_based_on_mbase();
-    //double freq = get_terminal_bus_frequency_deviation_in_pu();
-    //double mbase = wt_generator->get_mbase_in_MVA();
-    complex<double> selec = get_wt_generator_terminal_generation_in_pu_based_on_mbase();
-    double pelec = selec.real();
-    double qelec = selec.imag();
-    double speed = get_wind_turbine_reference_speed_with_power_in_pu(pelec);
-
-    double ipcmd = gen_model->get_active_current_command_in_pu_based_on_mbase();
-    double ipmax = get_IPmax_in_pu();
-    if(ipcmd>ipmax)
-    {
-        osstream<<"Initialization error. IPcmd (Active current command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"IPcmd is "<<ipcmd<<", and IPmax is "<<ipmax<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    double porder = ipcmd*vterm;
-    double pmax = get_Pmax_in_pu();
-    double pmin = get_Pmin_in_pu();
-    power_order_integrator.set_output(porder);
-    if(porder>pmax)
+    if(not is_model_initialized())
     {
-        osstream<<"Initialization error. Porder (Active power order) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"Porder is "<<porder<<", and Pmax is "<<pmax<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    if(porder<pmin)
-    {
-        osstream<<"Initialization error. Porder (Active power order) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-          <<"Porder is "<<porder<<", and Pmin is "<<pmin<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    power_order_integrator.initialize();
-
-    double torque =  porder/(1.0+speed);
-    torque_PI_regulator.set_output(torque);
-    torque_PI_regulator.initialize();
-
-    wind_turbine_speed_reference_sensor.set_output(speed);
-    wind_turbine_speed_reference_sensor.initialize();
-
-
-    double iqcmd = gen_model->get_reactive_current_command_in_pu_based_on_mbase();
-    double xsource = wt_generator->get_source_impedance_in_pu().imag();
-    double eqcmd = iqcmd*(-xsource);
-
-    double verror = 0.0;
-    size_t vflag = get_voltage_flag();
-    if(vflag == 0)
-    {
-        V_error_integrator.set_output(0.0);
-        V_error_integrator.initialize();
-
-        verror = eqcmd;
-    }
-    else
-    {
-        if(vflag == 1)
-        {
-            V_error_integrator.set_upper_limit(vterm+get_EQmax_in_pu());
-            V_error_integrator.set_lower_limit(vterm+get_EQmin_in_pu());
-        }
-        else
+        WT_GENERATOR* wt_generator = get_wt_generator_pointer();
+        if(wt_generator!=NULL)
         {
-            V_error_integrator.set_upper_limit(get_EQmax_in_pu());
-            V_error_integrator.set_lower_limit(get_EQmin_in_pu());
-        }
-        double vmax = V_error_integrator.get_upper_limit();
-        double vmin = V_error_integrator.get_lower_limit();
-
-        V_error_integrator.set_output(eqcmd);
-        if(eqcmd>vmax)
-        {
-            osstream<<"Initialization error. Eqcmd (reactive voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-              <<"Eqcmd is "<<eqcmd<<", and Vmax is "<<vmax<<".";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-        }
-        if(eqcmd<vmin)
-        {
-            osstream<<"Initialization error. Eqcmd (reactive voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-              <<"Eqcmd is "<<eqcmd<<", and Vmin is "<<vmin<<".";
-            toolkit.show_information_with_leading_time_stamp(osstream);
+            WT_GENERATOR_MODEL* gen_model = wt_generator->get_wt_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(not gen_model->is_model_initialized())
+                    gen_model->initialize();
+
+                set_block_toolkit();
+
+                STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+
+                double vterm = get_terminal_bus_voltage_in_pu();
+                double iterm = gen_model->get_terminal_current_in_pu_based_on_mbase();
+                //double freq = get_terminal_bus_frequency_deviation_in_pu();
+                //double mbase = wt_generator->get_mbase_in_MVA();
+                complex<double> selec = get_wt_generator_terminal_generation_in_pu_based_on_mbase();
+                double pelec = selec.real();
+                double qelec = selec.imag();
+                double speed = get_wind_turbine_reference_speed_with_power_in_pu(pelec);
+
+                double ipcmd = gen_model->get_active_current_command_in_pu_based_on_mbase();
+                double ipmax = get_IPmax_in_pu();
+                if(ipcmd>ipmax)
+                {
+                    osstream<<"Initialization error. IPcmd (Active current command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                      <<"IPcmd is "<<ipcmd<<", and IPmax is "<<ipmax<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                double porder = ipcmd*vterm;
+                double pmax = get_Pmax_in_pu();
+                double pmin = get_Pmin_in_pu();
+                power_order_integrator.set_output(porder);
+                if(porder>pmax)
+                {
+                    osstream<<"Initialization error. Porder (Active power order) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                      <<"Porder is "<<porder<<", and Pmax is "<<pmax<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                if(porder<pmin)
+                {
+                    osstream<<"Initialization error. Porder (Active power order) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                      <<"Porder is "<<porder<<", and Pmin is "<<pmin<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                power_order_integrator.initialize();
+
+                double torque =  porder/(1.0+speed);
+                torque_PI_regulator.set_output(torque);
+                torque_PI_regulator.initialize();
+
+                wind_turbine_speed_reference_sensor.set_output(speed);
+                wind_turbine_speed_reference_sensor.initialize();
+
+
+                double iqcmd = gen_model->get_reactive_current_command_in_pu_based_on_mbase();
+                double xsource = wt_generator->get_source_impedance_in_pu().imag();
+                double eqcmd = iqcmd*(-xsource);
+
+                double verror = 0.0;
+                size_t vflag = get_voltage_flag();
+                if(vflag == 0)
+                {
+                    V_error_integrator.set_output(0.0);
+                    V_error_integrator.initialize();
+
+                    verror = eqcmd;
+                }
+                else
+                {
+                    if(vflag == 1)
+                    {
+                        V_error_integrator.set_upper_limit(vterm+get_EQmax_in_pu());
+                        V_error_integrator.set_lower_limit(vterm+get_EQmin_in_pu());
+                    }
+                    else
+                    {
+                        V_error_integrator.set_upper_limit(get_EQmax_in_pu());
+                        V_error_integrator.set_lower_limit(get_EQmin_in_pu());
+                    }
+                    double vmax = V_error_integrator.get_upper_limit();
+                    double vmin = V_error_integrator.get_lower_limit();
+
+                    V_error_integrator.set_output(eqcmd);
+                    if(eqcmd>vmax)
+                    {
+                        osstream<<"Initialization error. Eqcmd (reactive voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                          <<"Eqcmd is "<<eqcmd<<", and Vmax is "<<vmax<<".";
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                    }
+                    if(eqcmd<vmin)
+                    {
+                        osstream<<"Initialization error. Eqcmd (reactive voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                          <<"Eqcmd is "<<eqcmd<<", and Vmin is "<<vmin<<".";
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                    }
+                    V_error_integrator.initialize();
+                    verror = 0.0;
+                }
+
+                double vcmd = verror+vterm;
+                double vmax = get_Vmax_in_pu();
+                double vmin = get_Vmin_in_pu();
+                Q_error_integrator.set_output(vcmd);
+                if(vcmd>vmax)
+                {
+                    osstream<<"Initialization error. Vcmd (voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                      <<"Vcmd is "<<vcmd<<", and Vmax is "<<vmax<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                if(vcmd<vmin)
+                {
+                    osstream<<"Initialization error. Vcmd (voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                      <<"Vcmd is "<<vcmd<<", and Vmin is "<<vmin<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                Q_error_integrator.initialize();
+
+                double qcmd = qelec;
+                double qmax = get_Qmax_in_pu();
+                double qmin = get_Qmin_in_pu();
+                if(qcmd>qmax)
+                {
+                    osstream<<"Initialization error. Qcmd (reactive power command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                      <<"Qcmd is "<<qcmd<<", and Qmax is "<<qmax<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                if(qcmd<qmin)
+                {
+                    osstream<<"Initialization error. Qcmd (reactive power command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                      <<"Qcmd is "<<qcmd<<", and Qmin is "<<qmin<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+
+                set_reactive_power_reference_in_pu(qcmd);
+
+                active_power_sensor.set_output(pelec);
+                active_power_sensor.initialize();
+
+                double smag = steps_fast_complex_abs(selec);
+                double pf = fabs(pelec)/smag;
+                pf = (qelec/pelec>0? pf:-pf);
+                set_power_factor_reference_in_pu(pf);
+
+                voltage_regulator_filter.set_output(qcmd);
+                voltage_regulator_filter.initialize();
+
+                voltage_regulator_integrator.set_output(qcmd);
+                voltage_regulator_integrator.initialize();
+
+                voltage_regulator_first_order_block.set_output(0.0);
+                voltage_regulator_first_order_block.initialize();
+
+                double xcomp = get_Xcomp_in_pu();
+                double vref = vterm+iterm*xcomp;
+
+                voltage_sensor.set_output(vref);
+                voltage_sensor.initialize();
+
+                set_voltage_reference_in_pu(vref);
+
+                set_flag_model_initialized_as_true();
+            }
         }
-        V_error_integrator.initialize();
-        verror = 0.0;
-    }
-
-    double vcmd = verror+vterm;
-    double vmax = get_Vmax_in_pu();
-    double vmin = get_Vmin_in_pu();
-    Q_error_integrator.set_output(vcmd);
-    if(vcmd>vmax)
-    {
-        osstream<<"Initialization error. Vcmd (voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"Vcmd is "<<vcmd<<", and Vmax is "<<vmax<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    if(vcmd<vmin)
-    {
-        osstream<<"Initialization error. Vcmd (voltage command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-          <<"Vcmd is "<<vcmd<<", and Vmin is "<<vmin<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    Q_error_integrator.initialize();
-
-    double qcmd = qelec;
-    double qmax = get_Qmax_in_pu();
-    double qmin = get_Qmin_in_pu();
-    if(qcmd>qmax)
-    {
-        osstream<<"Initialization error. Qcmd (reactive power command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"Qcmd is "<<qcmd<<", and Qmax is "<<qmax<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    if(qcmd<qmin)
-    {
-        osstream<<"Initialization error. Qcmd (reactive power command) of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-          <<"Qcmd is "<<qcmd<<", and Qmin is "<<qmin<<".";
-        toolkit.show_information_with_leading_time_stamp(osstream);
     }
-
-    set_reactive_power_reference_in_pu(qcmd);
-
-    active_power_sensor.set_output(pelec);
-    active_power_sensor.initialize();
-
-	double smag = steps_fast_complex_abs(selec);
-    double pf = fabs(pelec)/smag;
-    pf = (qelec/pelec>0? pf:-pf);
-    set_power_factor_reference_in_pu(pf);
-
-    voltage_regulator_filter.set_output(qcmd);
-    voltage_regulator_filter.initialize();
-
-    voltage_regulator_integrator.set_output(qcmd);
-    voltage_regulator_integrator.initialize();
-
-    voltage_regulator_first_order_block.set_output(0.0);
-    voltage_regulator_first_order_block.initialize();
-
-    double xcomp = get_Xcomp_in_pu();
-    double vref = vterm+iterm*xcomp;
-
-    voltage_sensor.set_output(vref);
-    voltage_sensor.initialize();
-
-    set_voltage_reference_in_pu(vref);
-
-    set_flag_model_initialized_as_true();
 }
 
 void WT3E1::run(DYNAMIC_MODE mode)
 {
     ostringstream osstream;
-    if(is_model_initialized())
-        return;
-
     WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return;
-
-    WT_GENERATOR_MODEL* source_model = wt_generator->get_wt_generator_model();
-    if(source_model==NULL)
-        return;
-
-
-    double vterm = get_terminal_bus_voltage_in_pu();
-    double iterm = source_model->get_terminal_current_in_pu_based_on_mbase();
-    //double freq = get_terminal_bus_frequency_deviation_in_pu();
-    //double mbase = wt_generator->get_mbase_in_MVA();
-    complex<double> selec = get_wt_generator_terminal_generation_in_pu_based_on_mbase();
-    double pelec = selec.real();
-    double qelec = selec.imag();
+    if(wt_generator!=NULL)
+    {
+        WT_GENERATOR_MODEL* source_model = wt_generator->get_wt_generator_model();
+        if(source_model!=NULL)
+        {
+            double vterm = get_terminal_bus_voltage_in_pu();
+            double iterm = source_model->get_terminal_current_in_pu_based_on_mbase();
+            //double freq = get_terminal_bus_frequency_deviation_in_pu();
+            //double mbase = wt_generator->get_mbase_in_MVA();
+            complex<double> selec = get_wt_generator_terminal_generation_in_pu_based_on_mbase();
+            double pelec = selec.real();
+            double qelec = selec.imag();
 
-    double speed_ref = get_wind_turbine_reference_speed_with_power_in_pu(pelec);
-    double speed = speed_ref;
+            double speed_ref = get_wind_turbine_reference_speed_with_power_in_pu(pelec);
+            double speed = speed_ref;
 
 
-    wind_turbine_speed_reference_sensor.set_input(speed_ref);
-    wind_turbine_speed_reference_sensor.run(mode);
+            wind_turbine_speed_reference_sensor.set_input(speed_ref);
+            wind_turbine_speed_reference_sensor.run(mode);
 
-    double input = speed - wind_turbine_speed_reference_sensor.get_output();
+            double input = speed - wind_turbine_speed_reference_sensor.get_output();
 
-    torque_PI_regulator.set_input(input);
-    torque_PI_regulator.run(mode);
+            torque_PI_regulator.set_input(input);
+            torque_PI_regulator.run(mode);
 
-    input = torque_PI_regulator.get_output()*(1.0+speed)-power_order_integrator.get_output();
-    if(input>get_rPmax_in_pu())
-        input = get_rPmax_in_pu();
-    if(input<get_rPmin_in_pu())
-        input = get_rPmin_in_pu();
+            input = torque_PI_regulator.get_output()*(1.0+speed)-power_order_integrator.get_output();
+            if(input>get_rPmax_in_pu())
+                input = get_rPmax_in_pu();
+            if(input<get_rPmin_in_pu())
+                input = get_rPmin_in_pu();
 
-    power_order_integrator.set_input(input);
-    power_order_integrator.run(mode);
+            power_order_integrator.set_input(input);
+            power_order_integrator.run(mode);
 
 
-    active_power_sensor.set_input(pelec);
-    active_power_sensor.run(mode);
+            active_power_sensor.set_input(pelec);
+            active_power_sensor.run(mode);
 
-    double xcomp = get_Xcomp_in_pu();
-    input = vterm+iterm*xcomp;
-    voltage_sensor.set_input(input);
-    voltage_sensor.run(mode);
+            double xcomp = get_Xcomp_in_pu();
+            input = vterm+iterm*xcomp;
+            voltage_sensor.set_input(input);
+            voltage_sensor.run(mode);
 
-    input = get_voltage_reference_in_pu()-voltage_sensor.get_output();
-    input /= get_Fn();
+            input = get_voltage_reference_in_pu()-voltage_sensor.get_output();
+            input /= get_Fn();
 
-    voltage_regulator_integrator.set_input(input);
-    voltage_regulator_integrator.run(mode);
+            voltage_regulator_integrator.set_input(input);
+            voltage_regulator_integrator.run(mode);
 
-    voltage_regulator_first_order_block.set_input(input);
-    voltage_regulator_first_order_block.run(mode);
+            voltage_regulator_first_order_block.set_input(input);
+            voltage_regulator_first_order_block.run(mode);
 
-    input = voltage_regulator_integrator.get_output() + voltage_regulator_first_order_block.get_output();
-    voltage_regulator_filter.set_input(input);
-    voltage_regulator_filter.run(mode);
+            input = voltage_regulator_integrator.get_output() + voltage_regulator_first_order_block.get_output();
+            voltage_regulator_filter.set_input(input);
+            voltage_regulator_filter.run(mode);
 
-    PE_VAR_CONTROL_MODE var_mode = get_var_control_mode();
-    double qcmd = 0.0;
-    if(var_mode==CONSTANT_VAR_MODE)
-        qcmd = get_reactive_power_reference_in_pu();
-    else
-    {
-        if(var_mode==CONSTANT_POWER_FACTOR_MODE)
-        {
-            double pf = get_power_factor_reference_in_pu();
-            qcmd = sqrt(1.0-pf*pf)/pf*active_power_sensor.get_output();
-        }
-        else
-            qcmd = voltage_regulator_filter.get_output();
-    }
-    if(qcmd>get_Qmax_in_pu())
-        qcmd = get_Qmax_in_pu();
-    if(qcmd<get_Qmin_in_pu())
-        qcmd = get_Qmin_in_pu();
+            PE_VAR_CONTROL_MODE var_mode = get_var_control_mode();
+            double qcmd = 0.0;
+            if(var_mode==CONSTANT_VAR_MODE)
+                qcmd = get_reactive_power_reference_in_pu();
+            else
+            {
+                if(var_mode==CONSTANT_POWER_FACTOR_MODE)
+                {
+                    double pf = get_power_factor_reference_in_pu();
+                    qcmd = sqrt(1.0-pf*pf)/pf*active_power_sensor.get_output();
+                }
+                else
+                    qcmd = voltage_regulator_filter.get_output();
+            }
+            if(qcmd>get_Qmax_in_pu())
+                qcmd = get_Qmax_in_pu();
+            if(qcmd<get_Qmin_in_pu())
+                qcmd = get_Qmin_in_pu();
 
-    input = qcmd - qelec;
-    Q_error_integrator.set_input(input);
-    Q_error_integrator.run(mode);
+            input = qcmd - qelec;
+            Q_error_integrator.set_input(input);
+            Q_error_integrator.run(mode);
 
-    size_t vflag = get_voltage_flag();
-    if(vflag == 1 or vflag == 2)
-    {
-        if(vflag == 1)
-        {
-            V_error_integrator.set_upper_limit(vterm+get_EQmax_in_pu());
-            V_error_integrator.set_lower_limit(vterm+get_EQmin_in_pu());
-        }
-        else
-        {
-            if(vflag == 2)
+            size_t vflag = get_voltage_flag();
+            if(vflag == 1 or vflag == 2)
             {
-                V_error_integrator.set_upper_limit(get_EQmax_in_pu());
-                V_error_integrator.set_lower_limit(get_EQmin_in_pu());
+                if(vflag == 1)
+                {
+                    V_error_integrator.set_upper_limit(vterm+get_EQmax_in_pu());
+                    V_error_integrator.set_lower_limit(vterm+get_EQmin_in_pu());
+                }
+                else
+                {
+                    if(vflag == 2)
+                    {
+                        V_error_integrator.set_upper_limit(get_EQmax_in_pu());
+                        V_error_integrator.set_lower_limit(get_EQmin_in_pu());
+                    }
+                }
+                input = Q_error_integrator.get_output()-vterm;
+                V_error_integrator.set_input(input);
+                V_error_integrator.run(mode);
             }
+
+            if(mode == UPDATE_MODE)
+                set_flag_model_updated_as_true();
         }
-        input = Q_error_integrator.get_output()-vterm;
-        V_error_integrator.set_input(input);
-        V_error_integrator.run(mode);
     }
-
-    if(mode == UPDATE_MODE)
-        set_flag_model_updated_as_true();
 }
 void WT3E1::check()
 {
diff --git a/code/source/model/wtg_models/wt_electrical_model/wt_electrical_model.cpp b/code/source/model/wtg_models/wt_electrical_model/wt_electrical_model.cpp
index a52ec4db..74950797 100644
--- a/code/source/model/wtg_models/wt_electrical_model/wt_electrical_model.cpp
+++ b/code/source/model/wtg_models/wt_electrical_model/wt_electrical_model.cpp
@@ -21,15 +21,21 @@ string WT_ELECTRICAL_MODEL::get_model_type() const
 complex<double> WT_ELECTRICAL_MODEL::get_wt_generator_terminal_generation_in_MVA() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return 0.0;
-    WT_GENERATOR_MODEL* genmodel = gen->get_wt_generator_model();
-    if(genmodel==NULL)
-        return 0.0;
-    if(not genmodel->is_model_initialized())
-        genmodel->initialize();
-
-    return genmodel->get_terminal_complex_power_in_MVA();
+    if(gen!=NULL)
+    {
+        WT_GENERATOR_MODEL* genmodel = gen->get_wt_generator_model();
+        if(genmodel!=NULL)
+        {
+            if(not genmodel->is_model_initialized())
+                genmodel->initialize();
+
+            return genmodel->get_terminal_complex_power_in_MVA();
+        }
+        else
+            return 0.0;
+    }
+    else
+        return 0.0;
 }
 
 complex<double> WT_ELECTRICAL_MODEL::get_wt_generator_terminal_generation_in_pu_based_on_mbase() const
@@ -40,14 +46,16 @@ complex<double> WT_ELECTRICAL_MODEL::get_wt_generator_terminal_generation_in_pu_
 complex<double> WT_ELECTRICAL_MODEL::get_terminal_bus_complex_voltage_in_pu() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
+    if(gen!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+
+        size_t bus = gen->get_generator_bus();
+        return psdb.get_bus_complex_voltage_in_pu(bus);
+    }
+    else
         return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    size_t bus = gen->get_generator_bus();
-    return psdb.get_bus_complex_voltage_in_pu(bus);
 }
 
 double WT_ELECTRICAL_MODEL::get_terminal_bus_voltage_in_pu() const
@@ -65,25 +73,29 @@ double WT_ELECTRICAL_MODEL::get_terminal_bus_frequency_in_pu() const
 double WT_ELECTRICAL_MODEL::get_terminal_bus_frequency_deviation_in_pu() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
+    if(gen!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+
+        size_t bus = gen->get_generator_bus();
+        return psdb.get_bus_frequency_deviation_in_pu(bus);
+    }
+    else
         return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    size_t bus = gen->get_generator_bus();
-    return psdb.get_bus_frequency_deviation_in_pu(bus);
 }
 
 complex<double> WT_ELECTRICAL_MODEL::get_wt_generator_terminal_complex_current_in_pu() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return 0.0;
-
-    WT_GENERATOR_MODEL* model = gen->get_wt_generator_model();
-    if(model!=NULL and model->is_model_initialized())
-        return model->get_terminal_complex_current_in_pu_in_xy_axis_based_on_mbase();
+    if(gen!=NULL)
+    {
+        WT_GENERATOR_MODEL* model = gen->get_wt_generator_model();
+        if(model!=NULL and model->is_model_initialized())
+            return model->get_terminal_complex_current_in_pu_in_xy_axis_based_on_mbase();
+        else
+            return 0.0;
+    }
     else
         return 0.0;
 }
@@ -114,17 +126,19 @@ void WT_ELECTRICAL_MODEL::set_voltage_reference_in_pu(double vref)
 void WT_ELECTRICAL_MODEL::set_voltage_reference_in_pu_with_bus_to_regulate()
 {
     WT_GENERATOR* source = get_wt_generator_pointer();
-    if(source==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    size_t bus = get_bus_to_regulate();
-    if(bus==0)
-        bus = source->get_source_bus();
-
-    return set_voltage_reference_in_pu(psdb.get_bus_voltage_in_pu(bus));
+    if(source!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+
+        size_t bus = get_bus_to_regulate();
+        if(bus!=0)
+            ;
+        else
+            bus = source->get_source_bus();
+
+        return set_voltage_reference_in_pu(psdb.get_bus_voltage_in_pu(bus));
+    }
 }
 
 double WT_ELECTRICAL_MODEL::get_voltage_reference_in_pu() const
@@ -185,44 +199,48 @@ PE_VAR_CONTROL_MODE WT_ELECTRICAL_MODEL::get_var_control_mode() const
 double WT_ELECTRICAL_MODEL::get_wt_generator_speed_in_pu() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen == NULL)
-        return 0.0;
-
-    WT_TURBINE_MODEL* turbinemodel = gen->get_wt_turbine_model();
-    if(turbinemodel != NULL and turbinemodel->is_model_initialized())
-        return turbinemodel->get_turbine_speed_in_pu();
+    if(gen != NULL)
+    {
+        WT_TURBINE_MODEL* turbinemodel = gen->get_wt_turbine_model();
+        if(turbinemodel != NULL and turbinemodel->is_model_initialized())
+            return turbinemodel->get_turbine_speed_in_pu();
+        else
+            return 1.0;
+    }
     else
-        return 1.0;
+        return 0.0;
 }
 
 double WT_ELECTRICAL_MODEL::get_wt_generator_speed_referance_in_pu() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen == NULL)  return 0.0;
-
-
-	WT_PITCH_MODEL* pitch_model = gen->get_wt_pitch_model();
-	if (pitch_model != NULL)
-	{
-		if (not pitch_model->is_model_initialized())
-			pitch_model->initialize();
-		if (pitch_model->get_hold_wtg_speed_flag() == true)
-			return pitch_model->get_const_wtg_speed_reference_in_pu();
-		else
-			return pitch_model->get_wt_generator_reference_speed_in_pu();
-	}
-	else
-	{
-		WT_AERODYNAMIC_MODEL* aero_model = gen->get_wt_aerodynamic_model();
-		if (aero_model != NULL)
-		{
-			if (not aero_model->is_model_initialized())
-				aero_model->initialize();
-			return aero_model->get_turbine_reference_speed_in_pu();
-		}
-		else
-			return 0.0;
-	}
+    if(gen != NULL)
+    {
+        WT_PITCH_MODEL* pitch_model = gen->get_wt_pitch_model();
+        if (pitch_model != NULL)
+        {
+            if (not pitch_model->is_model_initialized())
+                pitch_model->initialize();
+            if (pitch_model->get_hold_wtg_speed_flag() == true)
+                return pitch_model->get_const_wtg_speed_reference_in_pu();
+            else
+                return pitch_model->get_wt_generator_reference_speed_in_pu();
+        }
+        else
+        {
+            WT_AERODYNAMIC_MODEL* aero_model = gen->get_wt_aerodynamic_model();
+            if (aero_model != NULL)
+            {
+                if (not aero_model->is_model_initialized())
+                    aero_model->initialize();
+                return aero_model->get_turbine_reference_speed_in_pu();
+            }
+            else
+                return 0.0;
+        }
+    }
+    else
+        return 0.0;
 }
 
 void WT_ELECTRICAL_MODEL::set_wind_turbine_power_speed_lookup_table(WIND_TURBINE_POWER_SPEED_LOOKUP_TABLE table)
diff --git a/code/source/model/wtg_models/wt_generator_model/lvpl.cpp b/code/source/model/wtg_models/wt_generator_model/lvpl.cpp
index 89238646..adc696c3 100644
--- a/code/source/model/wtg_models/wt_generator_model/lvpl.cpp
+++ b/code/source/model/wtg_models/wt_generator_model/lvpl.cpp
@@ -78,30 +78,32 @@ double LVPL::get_LVPL_order(double v) const
         v2 = v;
     }
 
-    if(v1==0.0 and v2==0.0)
-        return INFINITE_THRESHOLD;
-
-    if(fabs(v1-v2)<FLOAT_EPSILON)
-    {
-        if(v<v1)
-            return 0.0;
-        else
-            return INFINITE_THRESHOLD;
-    }
-    else
+    if(v1!=0.0 or v2!=0.0)
     {
-        if(v<=v1)
-            return 0.0;
-        else
+        if(fabs(v1-v2)>FLOAT_EPSILON)
         {
-            if(v>=v2)
-                return INFINITE_THRESHOLD;
-            else
+            if(v>v1 and v<v2)
             {
                 double slope = g/(v2-v1);
                 double order = v1+(v-v1)*slope;
                 return order;
             }
+            else
+            {
+                if(v<=v1)
+                    return 0.0;
+                else
+                    return INFINITE_THRESHOLD;
+            }
+        }
+        else
+        {
+            if(v<v1)
+                return 0.0;
+            else
+                return INFINITE_THRESHOLD;
         }
     }
+    else
+        return INFINITE_THRESHOLD;
 }
diff --git a/code/source/model/wtg_models/wt_generator_model/wt3g0.cpp b/code/source/model/wtg_models/wt_generator_model/wt3g0.cpp
index 56342b52..b85c5389 100644
--- a/code/source/model/wtg_models/wt_generator_model/wt3g0.cpp
+++ b/code/source/model/wtg_models/wt_generator_model/wt3g0.cpp
@@ -191,74 +191,80 @@ bool WT3G0::setup_model_with_steps_string_vector(vector<string>& data)
 
     bool is_successful = false;
 
-    if(data.size()<18)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    size_t ibus;
-    string id;
-    size_t n_lumped_turbine;
-    double t_EQcmd, t_IPcmd, kpll, kipll, pllmax, pllmin, prate, lvpl_v1, lvpl_v2, lvpl_g,
-           hvrc_v, hvrc_i, lvpl_rate, t_lvpl;
-
-    ibus = size_t(get_integer_data(data[1],"0"));
-    id = get_string_data(data[2],"");
-
-    size_t i=3;
-    n_lumped_turbine = size_t(get_integer_data(data[i],"1")); i++;
-    prate = get_double_data(data[i],"0.0"); i++;
-    t_IPcmd = get_double_data(data[i],"0.0"); i++;
-    lvpl_rate = get_double_data(data[i],"0.0"); i++;
-    t_lvpl = get_double_data(data[i],"0.0"); i++;
-    lvpl_v1 = get_double_data(data[i],"0.0"); i++;
-    lvpl_v2 = get_double_data(data[i],"0.0"); i++;
-    lvpl_g = get_double_data(data[i],"0.0"); i++;
-    t_EQcmd = get_double_data(data[i],"0.0"); i++;
-    hvrc_v = get_double_data(data[i],"0.0"); i++;
-    hvrc_i = get_double_data(data[i],"0.0"); i++;
-    kpll = get_double_data(data[i],"0.0"); i++;
-    kipll = get_double_data(data[i],"0.0"); i++;
-    pllmax = get_double_data(data[i],"0.0"); i++;
-    pllmin = get_double_data(data[i],"0.0");
-
-    DEVICE_ID did = get_wt_generator_device_id(ibus, id);
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    WT_GENERATOR* gen = psdb.get_wt_generator(did);
-    if(gen==NULL)
+    if(data.size()>=18)
     {
-        osstream<<"Error when loading data to build "<<get_model_name()<<" model for "<<did.get_device_name()<<endl
-               <<"No such wt generator exists in the power system database.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return is_successful;
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t ibus;
+            string id;
+            size_t n_lumped_turbine;
+            double t_EQcmd, t_IPcmd, kpll, kipll, pllmax, pllmin, prate, lvpl_v1, lvpl_v2, lvpl_g,
+                   hvrc_v, hvrc_i, lvpl_rate, t_lvpl;
+
+            ibus = size_t(get_integer_data(data[1],"0"));
+            id = get_string_data(data[2],"");
+
+            size_t i=3;
+            n_lumped_turbine = size_t(get_integer_data(data[i],"1")); i++;
+            prate = get_double_data(data[i],"0.0"); i++;
+            t_IPcmd = get_double_data(data[i],"0.0"); i++;
+            lvpl_rate = get_double_data(data[i],"0.0"); i++;
+            t_lvpl = get_double_data(data[i],"0.0"); i++;
+            lvpl_v1 = get_double_data(data[i],"0.0"); i++;
+            lvpl_v2 = get_double_data(data[i],"0.0"); i++;
+            lvpl_g = get_double_data(data[i],"0.0"); i++;
+            t_EQcmd = get_double_data(data[i],"0.0"); i++;
+            hvrc_v = get_double_data(data[i],"0.0"); i++;
+            hvrc_i = get_double_data(data[i],"0.0"); i++;
+            kpll = get_double_data(data[i],"0.0"); i++;
+            kipll = get_double_data(data[i],"0.0"); i++;
+            pllmax = get_double_data(data[i],"0.0"); i++;
+            pllmin = get_double_data(data[i],"0.0");
+
+            DEVICE_ID did = get_wt_generator_device_id(ibus, id);
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            WT_GENERATOR* gen = psdb.get_wt_generator(did);
+            if(gen!=NULL)
+            {
+                gen->set_number_of_lumped_wt_generators(n_lumped_turbine);
+                gen->set_rated_power_per_wt_generator_in_MW(prate);
+
+                set_converter_activer_current_command_T_in_s(t_IPcmd);
+                set_LVPL_max_rate_of_active_current_change(lvpl_rate);
+                set_LVPL_voltage_sensor_T_in_s(t_lvpl);
+                LVPL lvpl;
+                lvpl.set_low_voltage_in_pu(lvpl_v1);
+                lvpl.set_high_voltage_in_pu(lvpl_v2);
+                lvpl.set_gain_at_high_voltage(lvpl_g);
+                set_LVPL(lvpl);
+
+                set_converter_reactiver_voltage_command_T_in_s(t_EQcmd);
+                set_HVRC_voltage_in_pu(hvrc_v);
+                set_HVRC_current_in_pu(hvrc_i);
+                set_KPLL(kpll);
+                set_KIPLL(kipll);
+                set_PLLmax(pllmax);
+                set_PLLmin(pllmin);
+
+                is_successful = true;
+
+                return is_successful;
+            }
+            else
+            {
+                osstream<<"Error when loading data to build "<<get_model_name()<<" model for "<<did.get_device_name()<<endl
+                       <<"No such wt generator exists in the power system database.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                return is_successful;
+            }
+        }
+        else
+            return is_successful;
     }
-
-    gen->set_number_of_lumped_wt_generators(n_lumped_turbine);
-    gen->set_rated_power_per_wt_generator_in_MW(prate);
-
-    set_converter_activer_current_command_T_in_s(t_IPcmd);
-    set_LVPL_max_rate_of_active_current_change(lvpl_rate);
-    set_LVPL_voltage_sensor_T_in_s(t_lvpl);
-    LVPL lvpl;
-    lvpl.set_low_voltage_in_pu(lvpl_v1);
-    lvpl.set_high_voltage_in_pu(lvpl_v2);
-    lvpl.set_gain_at_high_voltage(lvpl_g);
-    set_LVPL(lvpl);
-
-    set_converter_reactiver_voltage_command_T_in_s(t_EQcmd);
-    set_HVRC_voltage_in_pu(hvrc_v);
-    set_HVRC_current_in_pu(hvrc_i);
-    set_KPLL(kpll);
-    set_KIPLL(kipll);
-    set_PLLmax(pllmax);
-    set_PLLmin(pllmin);
-
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool WT3G0::setup_model_with_psse_string(string data)
@@ -290,164 +296,170 @@ void WT3G0::set_block_toolkit()
 void WT3G0::initialize()
 {
     ostringstream oosstream;
-    if(is_model_initialized())
-        return;
-
-    WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return;
-    set_block_toolkit();
-
-    size_t n_lumped = get_number_of_lumped_wt_generators();
-    double fbase = get_bus_base_frequency_in_Hz();
-    double wbase = 2.0*PI*fbase;
-
-    double kipll = get_KIPLL();
-    if(kipll!=0.0)
+    if(not is_model_initialized())
     {
-        PLL_frequency_integrator.set_T_in_s(1.0/kipll);
-        double pllmax = get_PLLmax();
-        PLL_frequency_integrator.set_upper_limit(pllmax);
-        PLL_frequency_integrator.set_lower_limit(-pllmax);
+        WT_GENERATOR* wt_generator = get_wt_generator_pointer();
+        if(wt_generator!=NULL)
+        {
+            set_block_toolkit();
+
+            size_t n_lumped = get_number_of_lumped_wt_generators();
+            double fbase = get_bus_base_frequency_in_Hz();
+            double wbase = 2.0*PI*fbase;
+
+            double kipll = get_KIPLL();
+            if(kipll!=0.0)
+            {
+                PLL_frequency_integrator.set_T_in_s(1.0/kipll);
+                double pllmax = get_PLLmax();
+                PLL_frequency_integrator.set_upper_limit(pllmax);
+                PLL_frequency_integrator.set_lower_limit(-pllmax);
+            }
+
+            PLL_angle_integrator.set_T_in_s(1.0/wbase);
+
+            double mbase = get_mbase_in_MVA();
+            mbase /= n_lumped;
+
+            complex<double> Zsource = get_source_impedance_in_pu_based_on_mbase();
+            double xeq = Zsource.imag();
+
+            double P = wt_generator->get_p_generation_in_MW()/n_lumped;
+            double Q = wt_generator->get_q_generation_in_MVar()/n_lumped;
+            complex<double> S(P/mbase,Q/mbase);
+
+
+            complex<double> Vxy = get_terminal_complex_voltage_in_pu();
+            double V = steps_fast_complex_abs(Vxy);
+            double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
+            // ignore voltage angle
+            complex<double> Ixy = conj(S/Vxy);
+            double Ix = Ixy.real();
+            double Iy = Ixy.imag();
+
+            double IP = Ix*cos(angle_in_rad) + Iy*sin(angle_in_rad);
+            double IQ =-Ix*sin(angle_in_rad) + Iy*cos(angle_in_rad);
+
+            double EQ = IQ*(-xeq);
+
+            active_current_commander.set_output(IP);
+            active_current_commander.initialize();
+            set_initial_active_current_command_in_pu_based_on_mbase(IP);
+
+            reactive_voltage_commander.set_output(EQ);
+            reactive_voltage_commander.initialize();
+            set_initial_reactive_voltage_command_in_pu(EQ);
+            set_initial_reactive_current_command_in_pu_based_on_mbase(IQ);
+
+            if(kipll!=0.0)
+            {
+                PLL_frequency_integrator.set_output(0.0);
+                PLL_frequency_integrator.initialize();
+            }
+
+            PLL_angle_integrator.set_output(angle_in_rad);
+            PLL_angle_integrator.initialize();
+
+            LVPL_voltage_sensor.set_output(V);
+            LVPL_voltage_sensor.initialize();
+
+            set_flag_model_initialized_as_true();
+
+            oosstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
+                    <<"(1) Initial active current command = "<<get_initial_active_current_command_in_pu_based_on_mbase()<<endl
+                    <<"(2) Initial reactive current command = "<<get_initial_reactive_current_command_in_pu_based_on_mbase()<<endl
+                    <<"(3) Initial reactive voltage command = "<<get_initial_reactive_voltage_command_in_pu()<<endl
+                    <<"(4) States of blocks"<<endl
+                    <<"    active_current_commander block state: "<<active_current_commander.get_state()<<endl
+                    <<"    reactive_voltage_commander block state: "<<reactive_voltage_commander.get_state()<<endl
+                    <<"    PLL_frequency_integrator block state: "<<PLL_frequency_integrator.get_state()<<endl
+                    <<"    PLL_angle_integrator block state: "<<PLL_angle_integrator.get_state()<<endl
+                    <<"    LVPL_voltage_sensor block state: "<<LVPL_voltage_sensor.get_state()<<endl
+                    <<"(5) active power generation :"<<get_terminal_active_power_in_MW()<<"MW"<<endl
+                    <<"(6) reactive power generation :"<<get_terminal_reactive_power_in_MVar()<<"MVar"<<endl
+                    <<"(7) terminal current :"<<get_terminal_current_in_pu_based_on_mbase()<<"pu";
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            toolkit.show_information_with_leading_time_stamp(oosstream);
+        }
     }
-
-    PLL_angle_integrator.set_T_in_s(1.0/wbase);
-
-    double mbase = get_mbase_in_MVA();
-    mbase /= n_lumped;
-
-    complex<double> Zsource = get_source_impedance_in_pu_based_on_mbase();
-    double xeq = Zsource.imag();
-
-    double P = wt_generator->get_p_generation_in_MW()/n_lumped;
-    double Q = wt_generator->get_q_generation_in_MVar()/n_lumped;
-    complex<double> S(P/mbase,Q/mbase);
-
-
-    complex<double> Vxy = get_terminal_complex_voltage_in_pu();
-    double V = steps_fast_complex_abs(Vxy);
-    double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
-    // ignore voltage angle
-    complex<double> Ixy = conj(S/Vxy);
-    double Ix = Ixy.real();
-    double Iy = Ixy.imag();
-
-    double IP = Ix*cos(angle_in_rad) + Iy*sin(angle_in_rad);
-    double IQ =-Ix*sin(angle_in_rad) + Iy*cos(angle_in_rad);
-
-    double EQ = IQ*(-xeq);
-
-    active_current_commander.set_output(IP);
-    active_current_commander.initialize();
-    set_initial_active_current_command_in_pu_based_on_mbase(IP);
-
-    reactive_voltage_commander.set_output(EQ);
-    reactive_voltage_commander.initialize();
-    set_initial_reactive_voltage_command_in_pu(EQ);
-    set_initial_reactive_current_command_in_pu_based_on_mbase(IQ);
-
-    if(kipll!=0.0)
-    {
-        PLL_frequency_integrator.set_output(0.0);
-        PLL_frequency_integrator.initialize();
-    }
-
-    PLL_angle_integrator.set_output(angle_in_rad);
-    PLL_angle_integrator.initialize();
-
-    LVPL_voltage_sensor.set_output(V);
-    LVPL_voltage_sensor.initialize();
-
-    set_flag_model_initialized_as_true();
-
-    oosstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
-            <<"(1) Initial active current command = "<<get_initial_active_current_command_in_pu_based_on_mbase()<<endl
-            <<"(2) Initial reactive current command = "<<get_initial_reactive_current_command_in_pu_based_on_mbase()<<endl
-            <<"(3) Initial reactive voltage command = "<<get_initial_reactive_voltage_command_in_pu()<<endl
-            <<"(4) States of blocks"<<endl
-            <<"    active_current_commander block state: "<<active_current_commander.get_state()<<endl
-            <<"    reactive_voltage_commander block state: "<<reactive_voltage_commander.get_state()<<endl
-            <<"    PLL_frequency_integrator block state: "<<PLL_frequency_integrator.get_state()<<endl
-            <<"    PLL_angle_integrator block state: "<<PLL_angle_integrator.get_state()<<endl
-            <<"    LVPL_voltage_sensor block state: "<<LVPL_voltage_sensor.get_state()<<endl
-            <<"(5) active power generation :"<<get_terminal_active_power_in_MW()<<"MW"<<endl
-            <<"(6) reactive power generation :"<<get_terminal_reactive_power_in_MVar()<<"MVar"<<endl
-            <<"(7) terminal current :"<<get_terminal_current_in_pu_based_on_mbase()<<"pu";
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    toolkit.show_information_with_leading_time_stamp(oosstream);
 }
 
 void WT3G0::run(DYNAMIC_MODE mode)
 {
     WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return;
-
-    double fbase = get_bus_base_frequency_in_Hz();
-    double wbase = 2.0*PI*fbase;
-
-    complex<double> Vxy = get_terminal_complex_voltage_in_pu();
-    double V = steps_fast_complex_abs(Vxy);
-    double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
-    double angle_in_deg = rad2deg(angle_in_rad);
-
-    LVPL_voltage_sensor.set_input(V);
-    LVPL_voltage_sensor.run(mode);
-
-    double lvpl_order = lvpl.get_LVPL_order(LVPL_voltage_sensor.get_output());
-
-    double IP = get_active_current_command_in_pu_based_on_mbase();
-
-    double input = active_current_commander.get_output();
-    if(input>lvpl_order)
-        input = lvpl_order;
-
-    input = IP - input;
-    double lvpl_rate_max = get_LVPL_max_rate_of_active_current_change();
-    if(input>lvpl_rate_max)
-        input = lvpl_rate_max;
-
-    active_current_commander.set_input(input);
-    active_current_commander.run(mode);
-
-    double EQ = get_reactive_voltage_command_in_pu();
-
-    reactive_voltage_commander.set_input(EQ);
-    reactive_voltage_commander.run(mode);
-
-    double kpll = get_KPLL();
-    double kipll = get_KIPLL();
-    if(kpll==0.0 and kipll==0.0)
+    if(wt_generator!=NULL)
     {
-        set_pll_angle_in_deg(angle_in_deg);
-    }
-    else
-    {
-        double Vr = Vxy.real();
-        double Vi = Vxy.imag();
-
-        double angle = get_pll_angle_in_rad();
-        double Vy = -Vr*sin(angle)+Vi*cos(angle);
-
-        input = Vy*kpll/wbase;
-        PLL_frequency_integrator.set_input(input);
-        PLL_frequency_integrator.run(mode);
-
-        double output = PLL_frequency_integrator.get_output();
-        input += output;
-
-        double pllmax = get_PLLmax();
-        if(input>pllmax)
-            input = pllmax;
-        if(input<-pllmax)
-            input = -pllmax;
+        double fbase = get_bus_base_frequency_in_Hz();
+        double wbase = 2.0*PI*fbase;
 
-        PLL_angle_integrator.set_input(input);
-        PLL_angle_integrator.run(mode);
+        complex<double> Vxy = get_terminal_complex_voltage_in_pu();
+        double V = steps_fast_complex_abs(Vxy);
+        double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
+        double angle_in_deg = rad2deg(angle_in_rad);
+
+        LVPL_voltage_sensor.set_input(V);
+        LVPL_voltage_sensor.run(mode);
+
+        double lvpl_order = lvpl.get_LVPL_order(LVPL_voltage_sensor.get_output());
+
+        double IP = get_active_current_command_in_pu_based_on_mbase();
+
+        double input = active_current_commander.get_output();
+        if(input>lvpl_order)
+            input = lvpl_order;
+
+        input = IP - input;
+        double lvpl_rate_max = get_LVPL_max_rate_of_active_current_change();
+        if(input>lvpl_rate_max)
+            input = lvpl_rate_max;
+
+        active_current_commander.set_input(input);
+        active_current_commander.run(mode);
+
+        double EQ = get_reactive_voltage_command_in_pu();
+
+        reactive_voltage_commander.set_input(EQ);
+        reactive_voltage_commander.run(mode);
+
+        double kpll = get_KPLL();
+        double kipll = get_KIPLL();
+        if(kpll!=0.0 or kipll!=0.0)
+        {
+            double Vr = Vxy.real();
+            double Vi = Vxy.imag();
+
+            double angle = get_pll_angle_in_rad();
+            double Vy = -Vr*sin(angle)+Vi*cos(angle);
+
+            input = Vy*kpll/wbase;
+            PLL_frequency_integrator.set_input(input);
+            PLL_frequency_integrator.run(mode);
+
+            double output = PLL_frequency_integrator.get_output();
+            input += output;
+
+            double pllmax = get_PLLmax();
+            if(input<=-pllmax or input>=pllmax)
+                ;
+            else
+            {
+                if(input>pllmax)
+                    input = pllmax;
+                else
+                    input = -pllmax;
+            }
+
+            PLL_angle_integrator.set_input(input);
+            PLL_angle_integrator.run(mode);
+        }
+        else
+        {
+            set_pll_angle_in_deg(angle_in_deg);
+        }
+
+        if(mode==UPDATE_MODE)
+            set_flag_model_updated_as_true();
     }
-
-    if(mode==UPDATE_MODE)
-        set_flag_model_updated_as_true();
 }
 
 complex<double> WT3G0::get_source_Norton_equivalent_complex_current_in_pu_in_xy_axis_based_on_sbase()
@@ -692,14 +704,14 @@ double WT3G0::get_pll_angle_in_rad()
 {
     double kpll = get_KPLL();
     double kipll = get_KIPLL();
-    if(kpll==0.0 and kipll==0.0)
+    if(kpll!=0.0 or kipll!=0.0)
+        return PLL_angle_integrator.get_output();
+    else
     {
         complex<double> Vxy = get_terminal_complex_voltage_in_pu();
         double angle = atan2(Vxy.imag(), Vxy.real());
         return angle;
     }
-    else
-        return PLL_angle_integrator.get_output();
 }
 
 double WT3G0::get_pll_angle_in_deg()
@@ -716,9 +728,7 @@ double WT3G0::get_pll_frequency_deviation_in_pu()
 
     double kpll = get_KPLL();
     double kipll = get_KIPLL();
-    if(kpll==0.0 and kipll==0.0)
-        return 0.0;
-    else
+    if(kpll!=0.0 or kipll!=0.0)
     {
         double Vr = Vxy.real();
         double Vi = Vxy.imag();
@@ -732,6 +742,8 @@ double WT3G0::get_pll_frequency_deviation_in_pu()
 
         return input+output;
     }
+    else
+        return 0.0;
 }
 
 double WT3G0::get_pll_frequency_deviation_in_Hz()
diff --git a/code/source/model/wtg_models/wt_generator_model/wt3g1.cpp b/code/source/model/wtg_models/wt_generator_model/wt3g1.cpp
index 58d16275..9c4896ec 100644
--- a/code/source/model/wtg_models/wt_generator_model/wt3g1.cpp
+++ b/code/source/model/wtg_models/wt_generator_model/wt3g1.cpp
@@ -112,73 +112,77 @@ bool WT3G1::setup_model_with_steps_string_vector(vector<string>& data)
     ostringstream osstream;
 
     bool is_successful = false;
-    if(data.size()<8)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    size_t ibus;
-    string id;
-    size_t n_lumped_turbine;
-    double xeq, kpll, kipll, pllmax, prate;
-
-    ibus = size_t(get_integer_data(data[1],"0"));
-    id = get_string_data(data[2],"");
-
-    size_t i=3;
-    xeq = get_double_data(data[i],"0.0"); i++;
-    kpll = get_double_data(data[i],"0.0"); i++;
-    kipll = get_double_data(data[i],"0.0"); i++;
-    pllmax = get_double_data(data[i],"0.0"); i++;
-    prate = get_double_data(data[i],"0.0");
-
-    DEVICE_ID did = get_wt_generator_device_id(ibus, id);
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    WT_GENERATOR* gen = psdb.get_wt_generator(did);
-    if(gen==NULL)
+    if(data.size()>=8)
     {
-        osstream<<"Error when loading data to build "<<get_model_name()<<" model for "<<did.get_device_name()<<endl
-               <<"No such wt generator exists in the power system database.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return is_successful;
-    }
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t ibus;
+            string id;
+            size_t n_lumped_turbine;
+            double xeq, kpll, kipll, pllmax, prate;
+
+            ibus = size_t(get_integer_data(data[1],"0"));
+            id = get_string_data(data[2],"");
+
+            size_t i=3;
+            xeq = get_double_data(data[i],"0.0"); i++;
+            kpll = get_double_data(data[i],"0.0"); i++;
+            kipll = get_double_data(data[i],"0.0"); i++;
+            pllmax = get_double_data(data[i],"0.0"); i++;
+            prate = get_double_data(data[i],"0.0");
+
+            DEVICE_ID did = get_wt_generator_device_id(ibus, id);
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            WT_GENERATOR* gen = psdb.get_wt_generator(did);
+            if(gen==NULL)
+            {
+                osstream<<"Error when loading data to build "<<get_model_name()<<" model for "<<did.get_device_name()<<endl
+                       <<"No such wt generator exists in the power system database.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                return is_successful;
+            }
 
-    double mbase = gen->get_mbase_in_MVA();
-    n_lumped_turbine = round(mbase/prate);
-    if(fabs(mbase-n_lumped_turbine*prate)>1e-2)
-    {
-        osstream<<"Warning. The MBASE of "<<did.get_device_name()<<" is far way from n times of the Prate of "<<get_model_name()<<" model."<<endl
-               <<"MBASE = "<<mbase<<" MVA and Prate = "<<prate<<" MW."<<endl
-               <<"Machine MBASE will be updated as "<<n_lumped_turbine*prate<<" MVA.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        gen->set_mbase_in_MVA(n_lumped_turbine*prate);
-    }
-
-    gen->set_number_of_lumped_wt_generators(n_lumped_turbine);
-    gen->set_rated_power_per_wt_generator_in_MW(prate);
-
-    set_Xeq_in_pu(xeq);
-    set_KPLL(kpll);
-    set_KIPLL(kipll);
-    set_PLLmax(pllmax);
+            double mbase = gen->get_mbase_in_MVA();
+            n_lumped_turbine = round(mbase/prate);
+            if(fabs(mbase-n_lumped_turbine*prate)>1e-2)
+            {
+                osstream<<"Warning. The MBASE of "<<did.get_device_name()<<" is far way from n times of the Prate of "<<get_model_name()<<" model."<<endl
+                       <<"MBASE = "<<mbase<<" MVA and Prate = "<<prate<<" MW."<<endl
+                       <<"Machine MBASE will be updated as "<<n_lumped_turbine*prate<<" MVA.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                gen->set_mbase_in_MVA(n_lumped_turbine*prate);
+            }
+
+            gen->set_number_of_lumped_wt_generators(n_lumped_turbine);
+            gen->set_rated_power_per_wt_generator_in_MW(prate);
+
+            set_Xeq_in_pu(xeq);
+            set_KPLL(kpll);
+            set_KIPLL(kipll);
+            set_PLLmax(pllmax);
 
-    complex<double> Z = gen->get_source_impedance_in_pu();
-    if(fabs(Z.imag()-xeq)>FLOAT_EPSILON)
-    {
-        osstream<<"Warning. The Xeq of "<<get_model_name()<<" model is different from imaginary part of ZSOURCE of "<<did.get_device_name()<<endl
-               <<"Xeq = "<<xeq<<" and XSource = "<<Z.imag()<<endl
-               <<"XSource will be updated as "<<xeq;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        Z = complex<double>(Z.real(), xeq);
-        gen->set_source_impedance_in_pu(Z);
+            complex<double> Z = gen->get_source_impedance_in_pu();
+            if(fabs(Z.imag()-xeq)>FLOAT_EPSILON)
+            {
+                osstream<<"Warning. The Xeq of "<<get_model_name()<<" model is different from imaginary part of ZSOURCE of "<<did.get_device_name()<<endl
+                       <<"Xeq = "<<xeq<<" and XSource = "<<Z.imag()<<endl
+                       <<"XSource will be updated as "<<xeq;
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                Z = complex<double>(Z.real(), xeq);
+                gen->set_source_impedance_in_pu(Z);
+            }
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
     }
-
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool WT3G1::setup_model_with_psse_string(string data)
@@ -209,146 +213,151 @@ void WT3G1::set_block_toolkit()
 void WT3G1::initialize()
 {
     ostringstream oosstream;
-    if(is_model_initialized())
-        return;
-
-    WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return;
-
-    set_block_toolkit();
-
-    size_t n_lumped = get_number_of_lumped_wt_generators();
-    double fbase = get_bus_base_frequency_in_Hz();
-    double wbase = 2.0*PI*fbase;
-
-    double kipll = get_KIPLL();
-    if(kipll!=0.0)
-    {
-        PLL_frequency_integrator.set_T_in_s(1.0/kipll);
-        double pllmax = get_PLLmax();
-        PLL_frequency_integrator.set_upper_limit(pllmax);
-        PLL_frequency_integrator.set_lower_limit(-pllmax);
-    }
-
-    PLL_angle_integrator.set_T_in_s(1.0/wbase);
-
-    double mbase = get_mbase_in_MVA();
-    mbase /= n_lumped;
-
-    double xeq = get_Xeq_in_pu();
-    complex<double>Zsource(0.0, xeq);
-
-    double P = wt_generator->get_p_generation_in_MW()/n_lumped;
-    double Q = wt_generator->get_q_generation_in_MVar()/n_lumped;
-    complex<double> S(P/mbase,Q/mbase);
-
-
-    complex<double> Vxy = get_terminal_complex_voltage_in_pu();
-    double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
-    // ignore voltage angle
-    complex<double> Ixy = conj(S/Vxy);
-    complex<double> Isource = Ixy + Vxy/Zsource;
-
-    double Ix = Isource.real();
-    double Iy = Isource.imag();
-
-    double IP = Ix*cos(angle_in_rad) + Iy*sin(angle_in_rad);
-    double IQ =-Ix*sin(angle_in_rad) + Iy*cos(angle_in_rad);
-
-    double EQ = IQ*(-xeq);
-
-    active_current_commander.set_output(IP);
-    active_current_commander.initialize();
-
-    reactive_voltage_commander.set_output(EQ);
-    reactive_voltage_commander.initialize();
-
-    if(kipll!=0.0)
+    if(not is_model_initialized())
     {
-        PLL_frequency_integrator.set_output(0.0);
-        PLL_frequency_integrator.initialize();
+        WT_GENERATOR* wt_generator = get_wt_generator_pointer();
+        if(wt_generator!=NULL)
+        {
+            set_block_toolkit();
+
+            size_t n_lumped = get_number_of_lumped_wt_generators();
+            double fbase = get_bus_base_frequency_in_Hz();
+            double wbase = 2.0*PI*fbase;
+
+            double kipll = get_KIPLL();
+            if(kipll!=0.0)
+            {
+                PLL_frequency_integrator.set_T_in_s(1.0/kipll);
+                double pllmax = get_PLLmax();
+                PLL_frequency_integrator.set_upper_limit(pllmax);
+                PLL_frequency_integrator.set_lower_limit(-pllmax);
+            }
+
+            PLL_angle_integrator.set_T_in_s(1.0/wbase);
+
+            double mbase = get_mbase_in_MVA();
+            mbase /= n_lumped;
+
+            double xeq = get_Xeq_in_pu();
+            complex<double>Zsource(0.0, xeq);
+
+            double P = wt_generator->get_p_generation_in_MW()/n_lumped;
+            double Q = wt_generator->get_q_generation_in_MVar()/n_lumped;
+            complex<double> S(P/mbase,Q/mbase);
+
+
+            complex<double> Vxy = get_terminal_complex_voltage_in_pu();
+            double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
+            // ignore voltage angle
+            complex<double> Ixy = conj(S/Vxy);
+            complex<double> Isource = Ixy + Vxy/Zsource;
+
+            double Ix = Isource.real();
+            double Iy = Isource.imag();
+
+            double IP = Ix*cos(angle_in_rad) + Iy*sin(angle_in_rad);
+            double IQ =-Ix*sin(angle_in_rad) + Iy*cos(angle_in_rad);
+
+            double EQ = IQ*(-xeq);
+
+            active_current_commander.set_output(IP);
+            active_current_commander.initialize();
+
+            reactive_voltage_commander.set_output(EQ);
+            reactive_voltage_commander.initialize();
+
+            if(kipll!=0.0)
+            {
+                PLL_frequency_integrator.set_output(0.0);
+                PLL_frequency_integrator.initialize();
+            }
+
+            PLL_angle_integrator.set_output(angle_in_rad);
+            PLL_angle_integrator.initialize();
+
+            set_initial_active_current_command_in_pu_based_on_mbase(IP);
+            set_initial_reactive_current_command_in_pu_based_on_mbase(IQ);
+            set_initial_reactive_voltage_command_in_pu(EQ);
+
+            set_flag_model_initialized_as_true();
+
+            oosstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
+                    <<"(1) Initial active current command = "<<get_initial_active_current_command_in_pu_based_on_mbase()<<endl
+                    <<"(2) Initial reactive current command = "<<get_initial_reactive_current_command_in_pu_based_on_mbase()<<endl
+                    <<"(3) States of blocks"<<endl
+                    <<"    active_current_commander block state: "<<active_current_commander.get_state()<<endl
+                    <<"    reactive_voltage_commander block state: "<<reactive_voltage_commander.get_state()<<endl
+                    <<"    PLL_frequency_integrator block state: "<<PLL_frequency_integrator.get_state()<<endl
+                    <<"    PLL_angle_integrator block state: "<<PLL_angle_integrator.get_state()<<endl
+                    <<"(4) active power generation :"<<get_terminal_active_power_in_MW()<<"MW"<<endl
+                    <<"(5) reactive power generation :"<<get_terminal_reactive_power_in_MVar()<<"MVar"<<endl
+                    <<"(6) terminal current :"<<get_terminal_current_in_pu_based_on_mbase()<<"pu";
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            toolkit.show_information_with_leading_time_stamp(oosstream);
+        }
     }
-
-    PLL_angle_integrator.set_output(angle_in_rad);
-    PLL_angle_integrator.initialize();
-
-    set_initial_active_current_command_in_pu_based_on_mbase(IP);
-    set_initial_reactive_current_command_in_pu_based_on_mbase(IQ);
-    set_initial_reactive_voltage_command_in_pu(EQ);
-
-    set_flag_model_initialized_as_true();
-
-    oosstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
-            <<"(1) Initial active current command = "<<get_initial_active_current_command_in_pu_based_on_mbase()<<endl
-            <<"(2) Initial reactive current command = "<<get_initial_reactive_current_command_in_pu_based_on_mbase()<<endl
-            <<"(3) States of blocks"<<endl
-            <<"    active_current_commander block state: "<<active_current_commander.get_state()<<endl
-            <<"    reactive_voltage_commander block state: "<<reactive_voltage_commander.get_state()<<endl
-            <<"    PLL_frequency_integrator block state: "<<PLL_frequency_integrator.get_state()<<endl
-            <<"    PLL_angle_integrator block state: "<<PLL_angle_integrator.get_state()<<endl
-            <<"(4) active power generation :"<<get_terminal_active_power_in_MW()<<"MW"<<endl
-            <<"(5) reactive power generation :"<<get_terminal_reactive_power_in_MVar()<<"MVar"<<endl
-            <<"(6) terminal current :"<<get_terminal_current_in_pu_based_on_mbase()<<"pu";
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    toolkit.show_information_with_leading_time_stamp(oosstream);
 }
 
 void WT3G1::run(DYNAMIC_MODE mode)
 {
     WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return;
-
-    double fbase = get_bus_base_frequency_in_Hz();
-    double wbase = 2.0*PI*fbase;
-
-    complex<double> Vxy = get_terminal_complex_voltage_in_pu();
-    double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
-    double angle_in_deg = rad2deg(angle_in_rad);
-
-    double IP = get_active_current_command_in_pu_based_on_mbase();
-
-    active_current_commander.set_input(IP);
-    active_current_commander.run(mode);
-
-    double EQ = get_reactive_voltage_command_in_pu();
-
-    reactive_voltage_commander.set_input(EQ);
-    reactive_voltage_commander.run(mode);
-
-    double kpll = get_KPLL();
-    double kipll = get_KIPLL();
-    if(kpll==0.0 and kipll==0.0)
+    if(wt_generator!=NULL)
     {
-        set_pll_angle_in_deg(angle_in_deg);
-    }
-    else
-    {
-        double Vr = Vxy.real();
-        double Vi = Vxy.imag();
-
-        double angle = get_pll_angle_in_rad();
-        double Vy = -Vr*sin(angle)+Vi*cos(angle);
-
-        double input = Vy*kpll/wbase;
-        PLL_frequency_integrator.set_input(input);
-        PLL_frequency_integrator.run(mode);
-
-        double output = PLL_frequency_integrator.get_output();
-        input += output;
+        double fbase = get_bus_base_frequency_in_Hz();
+        double wbase = 2.0*PI*fbase;
 
-        double pllmax = get_PLLmax();
-        if(input>pllmax)
-            input = pllmax;
-        if(input<-pllmax)
-            input = -pllmax;
-
-        PLL_angle_integrator.set_input(input);
-        PLL_angle_integrator.run(mode);
+        complex<double> Vxy = get_terminal_complex_voltage_in_pu();
+        double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
+        double angle_in_deg = rad2deg(angle_in_rad);
+
+        double IP = get_active_current_command_in_pu_based_on_mbase();
+
+        active_current_commander.set_input(IP);
+        active_current_commander.run(mode);
+
+        double EQ = get_reactive_voltage_command_in_pu();
+
+        reactive_voltage_commander.set_input(EQ);
+        reactive_voltage_commander.run(mode);
+
+        double kpll = get_KPLL();
+        double kipll = get_KIPLL();
+        if(kpll!=0.0 or kipll!=0.0)
+        {
+            double Vr = Vxy.real();
+            double Vi = Vxy.imag();
+
+            double angle = get_pll_angle_in_rad();
+            double Vy = -Vr*sin(angle)+Vi*cos(angle);
+
+            double input = Vy*kpll/wbase;
+            PLL_frequency_integrator.set_input(input);
+            PLL_frequency_integrator.run(mode);
+
+            double output = PLL_frequency_integrator.get_output();
+            input += output;
+
+            double pllmax = get_PLLmax();
+            if(input>=-pllmax and input<=pllmax)
+                ;
+            else
+            {
+                if(input>pllmax)
+                    input = pllmax;
+                else
+                    input = -pllmax;
+            }
+
+            PLL_angle_integrator.set_input(input);
+            PLL_angle_integrator.run(mode);
+        }
+        else
+        {
+            set_pll_angle_in_deg(angle_in_deg);
+        }
+        if(mode==UPDATE_MODE)
+            set_flag_model_updated_as_true();
     }
-    if(mode==UPDATE_MODE)
-        set_flag_model_updated_as_true();
 }
 
 complex<double> WT3G1::get_source_Norton_equivalent_complex_current_in_pu_in_xy_axis_based_on_sbase()
@@ -557,14 +566,14 @@ double WT3G1::get_pll_angle_in_rad()
 {
     double kpll = get_KPLL();
     double kipll = get_KIPLL();
-    if(kpll==0.0 and kipll==0.0)
+    if(kpll!=0.0 or kipll!=0.0)
+        return PLL_angle_integrator.get_output();
+    else
     {
         complex<double> Vxy = get_terminal_complex_voltage_in_pu();
         double angle = atan2(Vxy.imag(), Vxy.real());
         return angle;
     }
-    else
-        return PLL_angle_integrator.get_output();
 }
 
 double WT3G1::get_pll_angle_in_deg()
@@ -581,9 +590,7 @@ double WT3G1::get_pll_frequency_deviation_in_pu()
 
     double kpll = get_KPLL();
     double kipll = get_KIPLL();
-    if(kpll==0.0 and kipll==0.0)
-        return 0.0;
-    else
+    if(kpll!=0.0 or kipll!=0.0)
     {
         double Vr = Vxy.real();
         double Vi = Vxy.imag();
@@ -597,6 +604,8 @@ double WT3G1::get_pll_frequency_deviation_in_pu()
 
         return input+output;
     }
+    else
+        return 0.0;
 }
 
 double WT3G1::get_pll_frequency_deviation_in_Hz()
diff --git a/code/source/model/wtg_models/wt_generator_model/wt3g2.cpp b/code/source/model/wtg_models/wt_generator_model/wt3g2.cpp
index 580a4663..b857fac0 100644
--- a/code/source/model/wtg_models/wt_generator_model/wt3g2.cpp
+++ b/code/source/model/wtg_models/wt_generator_model/wt3g2.cpp
@@ -181,82 +181,88 @@ bool WT3G2::setup_model_with_steps_string_vector(vector<string>& data)
 
     bool is_successful = false;
 
-    if(data.size()<16)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    size_t ibus;
-    string id;
-    size_t n_lumped_turbine;
-    double t_EQcmd, t_IPcmd, kpll, kipll, pllmax, prate, lvpl_v1, lvpl_v2, lvpl_g,
-           hvrc_v, hvrc_i, lvpl_rate, t_lvpl;
-
-    ibus = size_t(get_integer_data(data[1],"0"));
-    id = get_string_data(data[2],"");
-
-    size_t i=3;
-    t_EQcmd = get_double_data(data[i],"0.0"); i++;
-    t_IPcmd = get_double_data(data[i],"0.0"); i++;
-    kpll = get_double_data(data[i],"0.0"); i++;
-    kipll = get_double_data(data[i],"0.0"); i++;
-    pllmax = get_double_data(data[i],"0.0"); i++;
-    prate = get_double_data(data[i],"0.0"); i++;
-    lvpl_v1 = get_double_data(data[i],"0.0"); i++;
-    lvpl_v2 = get_double_data(data[i],"0.0"); i++;
-    lvpl_g = get_double_data(data[i],"0.0"); i++;
-    hvrc_v = get_double_data(data[i],"0.0"); i++;
-    hvrc_i = get_double_data(data[i],"0.0"); i++;
-    lvpl_rate = get_double_data(data[i],"0.0"); i++;
-    t_lvpl = get_double_data(data[i],"0.0");
-
-    DEVICE_ID did = get_wt_generator_device_id(ibus, id);
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    WT_GENERATOR* gen = psdb.get_wt_generator(did);
-    if(gen==NULL)
+    if(data.size()>=16)
     {
-        osstream<<"Error when loading data to build "<<get_model_name()<<" model for "<<did.get_device_name()<<endl
-               <<"No such wt generator exists in the power system database.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return is_successful;
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t ibus;
+            string id;
+            size_t n_lumped_turbine;
+            double t_EQcmd, t_IPcmd, kpll, kipll, pllmax, prate, lvpl_v1, lvpl_v2, lvpl_g,
+                   hvrc_v, hvrc_i, lvpl_rate, t_lvpl;
+
+            ibus = size_t(get_integer_data(data[1],"0"));
+            id = get_string_data(data[2],"");
+
+            size_t i=3;
+            t_EQcmd = get_double_data(data[i],"0.0"); i++;
+            t_IPcmd = get_double_data(data[i],"0.0"); i++;
+            kpll = get_double_data(data[i],"0.0"); i++;
+            kipll = get_double_data(data[i],"0.0"); i++;
+            pllmax = get_double_data(data[i],"0.0"); i++;
+            prate = get_double_data(data[i],"0.0"); i++;
+            lvpl_v1 = get_double_data(data[i],"0.0"); i++;
+            lvpl_v2 = get_double_data(data[i],"0.0"); i++;
+            lvpl_g = get_double_data(data[i],"0.0"); i++;
+            hvrc_v = get_double_data(data[i],"0.0"); i++;
+            hvrc_i = get_double_data(data[i],"0.0"); i++;
+            lvpl_rate = get_double_data(data[i],"0.0"); i++;
+            t_lvpl = get_double_data(data[i],"0.0");
+
+            DEVICE_ID did = get_wt_generator_device_id(ibus, id);
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            WT_GENERATOR* gen = psdb.get_wt_generator(did);
+            if(gen!=NULL)
+            {
+                double mbase = gen->get_mbase_in_MVA();
+                n_lumped_turbine = round(mbase/prate);
+                if(fabs(mbase-n_lumped_turbine*prate)>1e-2)
+                {
+                    osstream<<"Warning. The MBASE of "<<did.get_device_name()<<" is far way from n times of the Prate of "<<get_model_name()<<" model."<<endl
+                           <<"MBASE = "<<mbase<<" MVA and Prate = "<<prate<<" MW."<<endl
+                           <<"Machine MBASE will be updated as "<<n_lumped_turbine*prate<<" MVA.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    gen->set_mbase_in_MVA(n_lumped_turbine*prate);
+                }
+
+                gen->set_number_of_lumped_wt_generators(n_lumped_turbine);
+                gen->set_rated_power_per_wt_generator_in_MW(prate);
+
+                set_converter_activer_current_command_T_in_s(t_IPcmd);
+                set_LVPL_max_rate_of_active_current_change(lvpl_rate);
+                set_LVPL_voltage_sensor_T_in_s(t_lvpl);
+                LVPL lvpl;
+                lvpl.set_low_voltage_in_pu(lvpl_v1);
+                lvpl.set_high_voltage_in_pu(lvpl_v2);
+                lvpl.set_gain_at_high_voltage(lvpl_g);
+                set_LVPL(lvpl);
+
+                set_converter_reactiver_voltage_command_T_in_s(t_EQcmd);
+                set_HVRC_voltage_in_pu(hvrc_v);
+                set_HVRC_current_in_pu(hvrc_i);
+                set_KPLL(kpll);
+                set_KIPLL(kipll);
+                set_PLLmax(pllmax);
+
+                is_successful = true;
+
+                return is_successful;
+            }
+            else
+            {
+                osstream<<"Error when loading data to build "<<get_model_name()<<" model for "<<did.get_device_name()<<endl
+                       <<"No such wt generator exists in the power system database.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                return is_successful;
+            }
+        }
+        else
+            return is_successful;
     }
-
-    double mbase = gen->get_mbase_in_MVA();
-    n_lumped_turbine = round(mbase/prate);
-    if(fabs(mbase-n_lumped_turbine*prate)>1e-2)
-    {
-        osstream<<"Warning. The MBASE of "<<did.get_device_name()<<" is far way from n times of the Prate of "<<get_model_name()<<" model."<<endl
-               <<"MBASE = "<<mbase<<" MVA and Prate = "<<prate<<" MW."<<endl
-               <<"Machine MBASE will be updated as "<<n_lumped_turbine*prate<<" MVA.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        gen->set_mbase_in_MVA(n_lumped_turbine*prate);
-    }
-
-    gen->set_number_of_lumped_wt_generators(n_lumped_turbine);
-    gen->set_rated_power_per_wt_generator_in_MW(prate);
-
-    set_converter_activer_current_command_T_in_s(t_IPcmd);
-    set_LVPL_max_rate_of_active_current_change(lvpl_rate);
-    set_LVPL_voltage_sensor_T_in_s(t_lvpl);
-    LVPL lvpl;
-    lvpl.set_low_voltage_in_pu(lvpl_v1);
-    lvpl.set_high_voltage_in_pu(lvpl_v2);
-    lvpl.set_gain_at_high_voltage(lvpl_g);
-    set_LVPL(lvpl);
-
-    set_converter_reactiver_voltage_command_T_in_s(t_EQcmd);
-    set_HVRC_voltage_in_pu(hvrc_v);
-    set_HVRC_current_in_pu(hvrc_i);
-    set_KPLL(kpll);
-    set_KIPLL(kipll);
-    set_PLLmax(pllmax);
-
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool WT3G2::setup_model_with_psse_string(string data)
@@ -288,165 +294,170 @@ void WT3G2::set_block_toolkit()
 void WT3G2::initialize()
 {
     ostringstream oosstream;
-    if(is_model_initialized())
-        return;
-
-    WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return;
-
-    set_block_toolkit();
-
-    size_t n_lumped = get_number_of_lumped_wt_generators();
-    double fbase = get_bus_base_frequency_in_Hz();
-    double wbase = 2.0*PI*fbase;
-
-    double kipll = get_KIPLL();
-    if(kipll!=0.0)
-    {
-        PLL_frequency_integrator.set_T_in_s(1.0/kipll);
-        double pllmax = get_PLLmax();
-        PLL_frequency_integrator.set_upper_limit(pllmax);
-        PLL_frequency_integrator.set_lower_limit(-pllmax);
-    }
-
-    PLL_angle_integrator.set_T_in_s(1.0/wbase);
-
-    double mbase = get_mbase_in_MVA();
-    mbase /= n_lumped;
-
-    complex<double> Zsource = get_source_impedance_in_pu_based_on_mbase();
-    double xeq = Zsource.imag();
-
-    double P = wt_generator->get_p_generation_in_MW()/n_lumped;
-    double Q = wt_generator->get_q_generation_in_MVar()/n_lumped;
-    complex<double> S(P/mbase,Q/mbase);
-
-
-    complex<double> Vxy = get_terminal_complex_voltage_in_pu();
-    double V = steps_fast_complex_abs(Vxy);
-    double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
-    // ignore voltage angle
-    complex<double> Ixy = conj(S/Vxy);
-    double Ix = Ixy.real();
-    double Iy = Ixy.imag();
-
-    double IP = Ix*cos(angle_in_rad) + Iy*sin(angle_in_rad);
-    double IQ =-Ix*sin(angle_in_rad) + Iy*cos(angle_in_rad);
-
-    double EQ = IQ*(-xeq);
-
-    active_current_commander.set_output(IP);
-    active_current_commander.initialize();
-    set_initial_active_current_command_in_pu_based_on_mbase(IP);
-
-    reactive_voltage_commander.set_output(EQ);
-    reactive_voltage_commander.initialize();
-    set_initial_reactive_voltage_command_in_pu(EQ);
-    set_initial_reactive_current_command_in_pu_based_on_mbase(IQ);
-
-    if(kipll!=0.0)
+    if(not is_model_initialized())
     {
-        PLL_frequency_integrator.set_output(0.0);
-        PLL_frequency_integrator.initialize();
+        WT_GENERATOR* wt_generator = get_wt_generator_pointer();
+        if(wt_generator!=NULL)
+        {
+            set_block_toolkit();
+
+            size_t n_lumped = get_number_of_lumped_wt_generators();
+            double fbase = get_bus_base_frequency_in_Hz();
+            double wbase = 2.0*PI*fbase;
+
+            double kipll = get_KIPLL();
+            if(kipll!=0.0)
+            {
+                PLL_frequency_integrator.set_T_in_s(1.0/kipll);
+                double pllmax = get_PLLmax();
+                PLL_frequency_integrator.set_upper_limit(pllmax);
+                PLL_frequency_integrator.set_lower_limit(-pllmax);
+            }
+
+            PLL_angle_integrator.set_T_in_s(1.0/wbase);
+
+            double mbase = get_mbase_in_MVA();
+            mbase /= n_lumped;
+
+            complex<double> Zsource = get_source_impedance_in_pu_based_on_mbase();
+            double xeq = Zsource.imag();
+
+            double P = wt_generator->get_p_generation_in_MW()/n_lumped;
+            double Q = wt_generator->get_q_generation_in_MVar()/n_lumped;
+            complex<double> S(P/mbase,Q/mbase);
+
+
+            complex<double> Vxy = get_terminal_complex_voltage_in_pu();
+            double V = steps_fast_complex_abs(Vxy);
+            double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
+            // ignore voltage angle
+            complex<double> Ixy = conj(S/Vxy);
+            double Ix = Ixy.real();
+            double Iy = Ixy.imag();
+
+            double IP = Ix*cos(angle_in_rad) + Iy*sin(angle_in_rad);
+            double IQ =-Ix*sin(angle_in_rad) + Iy*cos(angle_in_rad);
+
+            double EQ = IQ*(-xeq);
+
+            active_current_commander.set_output(IP);
+            active_current_commander.initialize();
+            set_initial_active_current_command_in_pu_based_on_mbase(IP);
+
+            reactive_voltage_commander.set_output(EQ);
+            reactive_voltage_commander.initialize();
+            set_initial_reactive_voltage_command_in_pu(EQ);
+            set_initial_reactive_current_command_in_pu_based_on_mbase(IQ);
+
+            if(kipll!=0.0)
+            {
+                PLL_frequency_integrator.set_output(0.0);
+                PLL_frequency_integrator.initialize();
+            }
+
+            PLL_angle_integrator.set_output(angle_in_rad);
+            PLL_angle_integrator.initialize();
+
+            LVPL_voltage_sensor.set_output(V);
+            LVPL_voltage_sensor.initialize();
+
+            set_flag_model_initialized_as_true();
+
+            oosstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
+                    <<"(1) Initial active current command = "<<get_initial_active_current_command_in_pu_based_on_mbase()<<endl
+                    <<"(2) Initial reactive current command = "<<get_initial_reactive_current_command_in_pu_based_on_mbase()<<endl
+                    <<"(3) Initial reactive voltage command = "<<get_initial_reactive_voltage_command_in_pu()<<endl
+                    <<"(4) States of blocks"<<endl
+                    <<"    active_current_commander block state: "<<active_current_commander.get_state()<<endl
+                    <<"    reactive_voltage_commander block state: "<<reactive_voltage_commander.get_state()<<endl
+                    <<"    PLL_frequency_integrator block state: "<<PLL_frequency_integrator.get_state()<<endl
+                    <<"    PLL_angle_integrator block state: "<<PLL_angle_integrator.get_state()<<endl
+                    <<"    LVPL_voltage_sensor block state: "<<LVPL_voltage_sensor.get_state()<<endl
+                    <<"(5) active power generation :"<<get_terminal_active_power_in_MW()<<"MW"<<endl
+                    <<"(6) reactive power generation :"<<get_terminal_reactive_power_in_MVar()<<"MVar"<<endl
+                    <<"(7) terminal current :"<<get_terminal_current_in_pu_based_on_mbase()<<"pu";
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            toolkit.show_information_with_leading_time_stamp(oosstream);
+        }
     }
-
-    PLL_angle_integrator.set_output(angle_in_rad);
-    PLL_angle_integrator.initialize();
-
-    LVPL_voltage_sensor.set_output(V);
-    LVPL_voltage_sensor.initialize();
-
-    set_flag_model_initialized_as_true();
-
-    oosstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
-            <<"(1) Initial active current command = "<<get_initial_active_current_command_in_pu_based_on_mbase()<<endl
-            <<"(2) Initial reactive current command = "<<get_initial_reactive_current_command_in_pu_based_on_mbase()<<endl
-            <<"(3) Initial reactive voltage command = "<<get_initial_reactive_voltage_command_in_pu()<<endl
-            <<"(4) States of blocks"<<endl
-            <<"    active_current_commander block state: "<<active_current_commander.get_state()<<endl
-            <<"    reactive_voltage_commander block state: "<<reactive_voltage_commander.get_state()<<endl
-            <<"    PLL_frequency_integrator block state: "<<PLL_frequency_integrator.get_state()<<endl
-            <<"    PLL_angle_integrator block state: "<<PLL_angle_integrator.get_state()<<endl
-            <<"    LVPL_voltage_sensor block state: "<<LVPL_voltage_sensor.get_state()<<endl
-            <<"(5) active power generation :"<<get_terminal_active_power_in_MW()<<"MW"<<endl
-            <<"(6) reactive power generation :"<<get_terminal_reactive_power_in_MVar()<<"MVar"<<endl
-            <<"(7) terminal current :"<<get_terminal_current_in_pu_based_on_mbase()<<"pu";
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    toolkit.show_information_with_leading_time_stamp(oosstream);
 }
 
 void WT3G2::run(DYNAMIC_MODE mode)
 {
     WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return;
-
-    double fbase = get_bus_base_frequency_in_Hz();
-    double wbase = 2.0*PI*fbase;
-
-    complex<double> Vxy = get_terminal_complex_voltage_in_pu();
-    double V = steps_fast_complex_abs(Vxy);
-    double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
-    double angle_in_deg = rad2deg(angle_in_rad);
-
-    LVPL_voltage_sensor.set_input(V);
-    LVPL_voltage_sensor.run(mode);
-
-    double lvpl_order = lvpl.get_LVPL_order(LVPL_voltage_sensor.get_output());
-
-    double IP = get_active_current_command_in_pu_based_on_mbase();
-
-    double input = active_current_commander.get_output();
-    if(input>lvpl_order)
-        input = lvpl_order;
-
-    input = IP - input;
-    double lvpl_rate_max = get_LVPL_max_rate_of_active_current_change();
-    if(input>lvpl_rate_max)
-        input = lvpl_rate_max;
-
-    active_current_commander.set_input(input);
-    active_current_commander.run(mode);
-
-    double EQ = get_reactive_voltage_command_in_pu();
-
-    reactive_voltage_commander.set_input(EQ);
-    reactive_voltage_commander.run(mode);
-
-    double kpll = get_KPLL();
-    double kipll = get_KIPLL();
-    if(kpll==0.0 and kipll==0.0)
+    if(wt_generator!=NULL)
     {
-        set_pll_angle_in_deg(angle_in_deg);
-    }
-    else
-    {
-        double Vr = Vxy.real();
-        double Vi = Vxy.imag();
-
-        double angle = get_pll_angle_in_rad();
-        double Vy = -Vr*sin(angle)+Vi*cos(angle);
-
-        input = Vy*kpll/wbase;
-        PLL_frequency_integrator.set_input(input);
-        PLL_frequency_integrator.run(mode);
-
-        double output = PLL_frequency_integrator.get_output();
-        input += output;
-
-        double pllmax = get_PLLmax();
-        if(input>pllmax)
-            input = pllmax;
-        if(input<-pllmax)
-            input = -pllmax;
+        double fbase = get_bus_base_frequency_in_Hz();
+        double wbase = 2.0*PI*fbase;
 
-        PLL_angle_integrator.set_input(input);
-        PLL_angle_integrator.run(mode);
+        complex<double> Vxy = get_terminal_complex_voltage_in_pu();
+        double V = steps_fast_complex_abs(Vxy);
+        double angle_in_rad = atan2(Vxy.imag(), Vxy.real());
+        double angle_in_deg = rad2deg(angle_in_rad);
+
+        LVPL_voltage_sensor.set_input(V);
+        LVPL_voltage_sensor.run(mode);
+
+        double lvpl_order = lvpl.get_LVPL_order(LVPL_voltage_sensor.get_output());
+
+        double IP = get_active_current_command_in_pu_based_on_mbase();
+
+        double input = active_current_commander.get_output();
+        if(input>lvpl_order)
+            input = lvpl_order;
+
+        input = IP - input;
+        double lvpl_rate_max = get_LVPL_max_rate_of_active_current_change();
+        if(input>lvpl_rate_max)
+            input = lvpl_rate_max;
+
+        active_current_commander.set_input(input);
+        active_current_commander.run(mode);
+
+        double EQ = get_reactive_voltage_command_in_pu();
+
+        reactive_voltage_commander.set_input(EQ);
+        reactive_voltage_commander.run(mode);
+
+        double kpll = get_KPLL();
+        double kipll = get_KIPLL();
+        if(kpll!=0.0 or kipll!=0.0)
+        {
+            double Vr = Vxy.real();
+            double Vi = Vxy.imag();
+
+            double angle = get_pll_angle_in_rad();
+            double Vy = -Vr*sin(angle)+Vi*cos(angle);
+
+            input = Vy*kpll/wbase;
+            PLL_frequency_integrator.set_input(input);
+            PLL_frequency_integrator.run(mode);
+
+            double output = PLL_frequency_integrator.get_output();
+            input += output;
+
+            double pllmax = get_PLLmax();
+            if(input>=-pllmax and input<=pllmax)
+                ;
+            else
+            {
+                if(input>pllmax)
+                    input = pllmax;
+                else
+                    input = -pllmax;
+            }
+
+            PLL_angle_integrator.set_input(input);
+            PLL_angle_integrator.run(mode);
+        }
+        else
+        {
+            set_pll_angle_in_deg(angle_in_deg);
+        }
+
+        if(mode==UPDATE_MODE)
+            set_flag_model_updated_as_true();
     }
-
-    if(mode==UPDATE_MODE)
-        set_flag_model_updated_as_true();
 }
 
 complex<double> WT3G2::get_source_Norton_equivalent_complex_current_in_pu_in_xy_axis_based_on_sbase()
@@ -685,14 +696,14 @@ double WT3G2::get_pll_angle_in_rad()
 {
     double kpll = get_KPLL();
     double kipll = get_KIPLL();
-    if(kpll==0.0 and kipll==0.0)
+    if(kpll!=0.0 or kipll!=0.0)
+        return PLL_angle_integrator.get_output();
+    else
     {
         complex<double> Vxy = get_terminal_complex_voltage_in_pu();
         double angle = atan2(Vxy.imag(), Vxy.real());
         return angle;
     }
-    else
-        return PLL_angle_integrator.get_output();
 }
 
 double WT3G2::get_pll_angle_in_deg()
@@ -709,9 +720,7 @@ double WT3G2::get_pll_frequency_deviation_in_pu()
 
     double kpll = get_KPLL();
     double kipll = get_KIPLL();
-    if(kpll==0.0 and kipll==0.0)
-        return 0.0;
-    else
+    if(kpll!=0.0 or kipll!=0.0)
     {
         double Vr = Vxy.real();
         double Vi = Vxy.imag();
@@ -725,6 +734,8 @@ double WT3G2::get_pll_frequency_deviation_in_pu()
 
         return input+output;
     }
+    else
+        return 0.0;
 }
 
 double WT3G2::get_pll_frequency_deviation_in_Hz()
diff --git a/code/source/model/wtg_models/wt_generator_model/wt_generator_model.cpp b/code/source/model/wtg_models/wt_generator_model/wt_generator_model.cpp
index 8d6ad76f..0566f310 100644
--- a/code/source/model/wtg_models/wt_generator_model/wt_generator_model.cpp
+++ b/code/source/model/wtg_models/wt_generator_model/wt_generator_model.cpp
@@ -45,7 +45,7 @@ bool WT_GENERATOR_MODEL::is_current_source() const
 
 bool WT_GENERATOR_MODEL::is_voltage_source() const
 {
-    return !current_source_flag;
+    return not is_current_source();
 }
 
 void WT_GENERATOR_MODEL::set_initial_active_current_command_in_pu_based_on_mbase(double ip_command)
@@ -81,38 +81,44 @@ double WT_GENERATOR_MODEL::get_initial_reactive_voltage_command_in_pu() const
 double WT_GENERATOR_MODEL::get_active_current_command_in_pu_based_on_mbase() const
 {
     WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return 0.0;
-
-    WT_ELECTRICAL_MODEL* model = wt_generator->get_wt_electrical_model();
-    if(model!=NULL and model->is_model_initialized())
-        return model->get_active_current_command_in_pu_based_on_mbase();
+    if(wt_generator!=NULL)
+    {
+        WT_ELECTRICAL_MODEL* model = wt_generator->get_wt_electrical_model();
+        if(model!=NULL and model->is_model_initialized())
+            return model->get_active_current_command_in_pu_based_on_mbase();
+        else
+            return get_initial_active_current_command_in_pu_based_on_mbase();
+    }
     else
-        return get_initial_active_current_command_in_pu_based_on_mbase();
+        return 0.0;
 }
 
 double WT_GENERATOR_MODEL::get_reactive_current_command_in_pu_based_on_mbase() const
 {
     WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return 0.0;
-
-    WT_ELECTRICAL_MODEL* model = wt_generator->get_wt_electrical_model();
-    if(model!=NULL and model->is_model_initialized())
-        return model->get_reactive_current_command_in_pu_based_on_mbase();
+    if(wt_generator!=NULL)
+    {
+        WT_ELECTRICAL_MODEL* model = wt_generator->get_wt_electrical_model();
+        if(model!=NULL and model->is_model_initialized())
+            return model->get_reactive_current_command_in_pu_based_on_mbase();
+        else
+            return get_initial_reactive_current_command_in_pu_based_on_mbase();
+    }
     else
-        return get_initial_reactive_current_command_in_pu_based_on_mbase();
+        return 0.0;
 }
 
 double WT_GENERATOR_MODEL::get_reactive_voltage_command_in_pu() const
 {
     WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return 0.0;
-
-    WT_ELECTRICAL_MODEL* model = wt_generator->get_wt_electrical_model();
-    if(model!=NULL and model->is_model_initialized())
-        return model->get_reactive_voltage_command_in_pu();
+    if(wt_generator!=NULL)
+    {
+        WT_ELECTRICAL_MODEL* model = wt_generator->get_wt_electrical_model();
+        if(model!=NULL and model->is_model_initialized())
+            return model->get_reactive_voltage_command_in_pu();
+        else
+            return get_initial_reactive_voltage_command_in_pu();
+    }
     else
-        return get_initial_reactive_voltage_command_in_pu();
+        return 0.0;
 }
diff --git a/code/source/model/wtg_models/wt_pitch_model/wt3p0.cpp b/code/source/model/wtg_models/wt_pitch_model/wt3p0.cpp
index 1dbb9644..5431dfab 100644
--- a/code/source/model/wtg_models/wt_pitch_model/wt3p0.cpp
+++ b/code/source/model/wtg_models/wt_pitch_model/wt3p0.cpp
@@ -205,56 +205,60 @@ double WT3P0::get_Tp_in_s() const
 bool WT3P0::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<18)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
-
-    int hold_speed_flag = 0;
-    double tp, kps, kis, tf, fup, flow, kpf, kif, kdf, tdf, rpmax, pmax, pmin, tspeed;
-
-    size_t i=3;
-    hold_speed_flag = get_integer_data(data[i],"0"); i++;
-    tspeed = get_double_data(data[i],"0.0"); i++;
-    kps = get_double_data(data[i],"0.0"); i++;
-    kis = get_double_data(data[i],"0.0"); i++;
-    tf = get_double_data(data[i],"0.0"); i++;
-    flow = get_double_data(data[i],"1.0"); i++;
-    fup = get_double_data(data[i],"1.0"); i++;
-    kpf = get_double_data(data[i],"0.0"); i++;
-    kif = get_double_data(data[i],"0.0"); i++;
-    kdf = get_double_data(data[i],"0.0"); i++;
-    tdf = get_double_data(data[i],"0.0"); i++;
-    rpmax = get_double_data(data[i],"0.0"); i++;
-    pmin = get_double_data(data[i],"0.0"); i++;
-    pmax = get_double_data(data[i],"0.0"); i++;
-    tp = get_double_data(data[i],"0.0");
+    if(data.size()>=18)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            int hold_speed_flag = 0;
+            double tp, kps, kis, tf, fup, flow, kpf, kif, kdf, tdf, rpmax, pmax, pmin, tspeed;
+
+            size_t i=3;
+            hold_speed_flag = get_integer_data(data[i],"0"); i++;
+            tspeed = get_double_data(data[i],"0.0"); i++;
+            kps = get_double_data(data[i],"0.0"); i++;
+            kis = get_double_data(data[i],"0.0"); i++;
+            tf = get_double_data(data[i],"0.0"); i++;
+            flow = get_double_data(data[i],"1.0"); i++;
+            fup = get_double_data(data[i],"1.0"); i++;
+            kpf = get_double_data(data[i],"0.0"); i++;
+            kif = get_double_data(data[i],"0.0"); i++;
+            kdf = get_double_data(data[i],"0.0"); i++;
+            tdf = get_double_data(data[i],"0.0"); i++;
+            rpmax = get_double_data(data[i],"0.0"); i++;
+            pmin = get_double_data(data[i],"0.0"); i++;
+            pmax = get_double_data(data[i],"0.0"); i++;
+            tp = get_double_data(data[i],"0.0");
 
-    if(hold_speed_flag==0)
-        set_hold_wtg_speed_flag(false);
-    else
-        set_hold_wtg_speed_flag(true);
+            if(hold_speed_flag==0)
+                set_hold_wtg_speed_flag(false);
+            else
+                set_hold_wtg_speed_flag(true);
 
-    set_Tspeed_in_s(tspeed);
-    set_Kp_speed_controller(kps);
-    set_Ki_speed_controller(kis);
-    set_Tfrequency_in_s(tf);
-    set_frequency_upper_deadband_in_pu(fup);
-    set_frequency_lower_deadband_in_pu(flow);
-    set_Kp_frequency_controller(kpf);
-    set_Ki_frequency_controller(kif);
-    set_Kd_frequency_controller(kdf);
-    set_Td_frequency_controller_in_s(tdf);
-    set_ratePitchmax_in_deg_per_s(rpmax);
-    set_Pitchmin_in_deg(pmin);
-    set_Pitchmax_in_deg(pmax);
-    set_Tp_in_s(tp);
-
-    is_successful = true;
-
-    return is_successful;
+            set_Tspeed_in_s(tspeed);
+            set_Kp_speed_controller(kps);
+            set_Ki_speed_controller(kis);
+            set_Tfrequency_in_s(tf);
+            set_frequency_upper_deadband_in_pu(fup);
+            set_frequency_lower_deadband_in_pu(flow);
+            set_Kp_frequency_controller(kpf);
+            set_Ki_frequency_controller(kif);
+            set_Kd_frequency_controller(kdf);
+            set_Td_frequency_controller_in_s(tdf);
+            set_ratePitchmax_in_deg_per_s(rpmax);
+            set_Pitchmin_in_deg(pmin);
+            set_Pitchmax_in_deg(pmax);
+            set_Tp_in_s(tp);
+
+            is_successful = true;
+
+            return is_successful;
+        }
+        else
+            return is_successful;
+    }
+    else
+        return is_successful;
 }
 
 bool WT3P0::setup_model_with_psse_string(string data)
@@ -287,63 +291,63 @@ void WT3P0::initialize()
 {
     ostringstream osstream;
     WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return;
-
-    WT_AERODYNAMIC_MODEL* aerdmodel = wt_generator->get_wt_aerodynamic_model();
-    if(aerdmodel==NULL)
-        return;
-
-    if(not aerdmodel->is_model_initialized())
-        aerdmodel->initialize();
-
-    set_block_toolkit();
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    double pitch0 = get_initial_pitch_angle_in_deg_from_wt_aerodynamic_model();
-
-    pitch_integrator.set_output(pitch0);
-    pitch_integrator.initialize();
-
-    double pmax = get_Pitchmax_in_deg();
-    double pmin = get_Pitchmin_in_deg();
-    if(pitch0>pmax)
-    {
-        osstream<<"Initialization error. Pitch of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
-          <<"Pitch angle is "<<pitch0<<" deg, and Pitchmax is "<<pmax<<" deg.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-    if(pitch0<pmin)
+    if(wt_generator!=NULL)
     {
-        osstream<<"Initialization error. Pitch of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
-          <<"Pitch angle is "<<pitch0<<" deg, and Pitchmin is "<<pmin<<" deg.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-    }
+        WT_AERODYNAMIC_MODEL* aerdmodel = wt_generator->get_wt_aerodynamic_model();
+        if(aerdmodel!=NULL)
+        {
+            if(not aerdmodel->is_model_initialized())
+                aerdmodel->initialize();
 
-    speed_controller.set_output(pitch0);
-    speed_controller.initialize();
+            set_block_toolkit();
 
-    double speed_ref = get_wt_generator_reference_speed_in_pu();
-    speed_reference_sensor.set_output(speed_ref);
-    speed_reference_sensor.initialize();
-    if(get_hold_wtg_speed_flag()==true)
-        set_const_wtg_speed_reference_in_pu(speed_ref);
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+
+            double pitch0 = get_initial_pitch_angle_in_deg_from_wt_aerodynamic_model();
+
+            pitch_integrator.set_output(pitch0);
+            pitch_integrator.initialize();
+
+            double pmax = get_Pitchmax_in_deg();
+            double pmin = get_Pitchmin_in_deg();
+            if(pitch0>pmax)
+            {
+                osstream<<"Initialization error. Pitch of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds upper limit."
+                  <<"Pitch angle is "<<pitch0<<" deg, and Pitchmax is "<<pmax<<" deg.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+            if(pitch0<pmin)
+            {
+                osstream<<"Initialization error. Pitch of '"<<get_model_name()<<"' model of "<<get_device_name()<<" exceeds lower limit."
+                  <<"Pitch angle is "<<pitch0<<" deg, and Pitchmin is "<<pmin<<" deg.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+
+            speed_controller.set_output(pitch0);
+            speed_controller.initialize();
+
+            double speed_ref = get_wt_generator_reference_speed_in_pu();
+            speed_reference_sensor.set_output(speed_ref);
+            speed_reference_sensor.initialize();
+            if(get_hold_wtg_speed_flag()==true)
+                set_const_wtg_speed_reference_in_pu(speed_ref);
 
-    frequency_sensor.set_output(0.0);
-    frequency_sensor.initialize();
+            frequency_sensor.set_output(0.0);
+            frequency_sensor.initialize();
 
-    frequency_controller.set_output(0.0);
-    frequency_controller.initialize();
+            frequency_controller.set_output(0.0);
+            frequency_controller.initialize();
 
-    set_flag_model_initialized_as_true();
+            set_flag_model_initialized_as_true();
 
-    osstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
-            <<"(1) speed regulator state: "<<speed_controller.get_state()<<endl
-            <<"(2) frequency regulator state: "<<frequency_controller.get_state()<<endl
-            <<"(3) pitch integrator state: "<<pitch_integrator.get_state()<<endl
-            <<"(4) pitch angle is "<<get_pitch_angle_in_deg()<<" deg";
-    toolkit.show_information_with_leading_time_stamp(osstream);
+            osstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
+                    <<"(1) speed regulator state: "<<speed_controller.get_state()<<endl
+                    <<"(2) frequency regulator state: "<<frequency_controller.get_state()<<endl
+                    <<"(3) pitch integrator state: "<<pitch_integrator.get_state()<<endl
+                    <<"(4) pitch angle is "<<get_pitch_angle_in_deg()<<" deg";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
+    }
 }
 
 void WT3P0::run(DYNAMIC_MODE mode)
@@ -369,15 +373,15 @@ void WT3P0::run(DYNAMIC_MODE mode)
     freq = frequency_sensor.get_output();
 
     double fup = get_frequency_upper_deadband_in_pu();
-    double flow = get_frequency_lower_deadband_in_pu();
-    if(freq>fup)
-        freq -= fup;
+    double flow = get_frequency_lower_deadband_in_pu();
+    if(freq>=flow and freq<=fup)
+        freq = 0.0;
     else
-    {
-        if(freq<flow)
-            freq -= flow;
+    {
+        if(freq>fup)
+            freq -= fup;
         else
-            freq = 0.0;
+            freq -= flow;
     }
 
     frequency_controller.set_input(freq);
@@ -387,10 +391,15 @@ void WT3P0::run(DYNAMIC_MODE mode)
     rate -= pitch_integrator.get_output();
 
     double ratemax = get_ratePitchmax_in_deg_per_s();
-    if(rate>ratemax)
-        rate = ratemax;
-    if(rate<-ratemax)
-        rate = -ratemax;
+    if(rate<=ratemax and rate>-ratemax)
+        ;
+    else
+    {
+        if(rate>ratemax)
+            rate = ratemax;
+        else
+            rate = -ratemax;
+    }
 
     pitch_integrator.set_input(rate);
     pitch_integrator.run(mode);
diff --git a/code/source/model/wtg_models/wt_pitch_model/wt_pitch_model.cpp b/code/source/model/wtg_models/wt_pitch_model/wt_pitch_model.cpp
index 77af66bc..ce914d90 100644
--- a/code/source/model/wtg_models/wt_pitch_model/wt_pitch_model.cpp
+++ b/code/source/model/wtg_models/wt_pitch_model/wt_pitch_model.cpp
@@ -32,12 +32,14 @@ string WT_PITCH_MODEL::get_model_type() const
 double WT_PITCH_MODEL::get_wt_generator_speed_in_pu() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return 0.0;
-
-    WT_TURBINE_MODEL* turbine = gen->get_wt_turbine_model();
-    if(turbine!=NULL and turbine->is_model_initialized())
-        return turbine->get_turbine_speed_in_pu();
+    if(gen!=NULL)
+    {
+        WT_TURBINE_MODEL* turbine = gen->get_wt_turbine_model();
+        if(turbine!=NULL and turbine->is_model_initialized())
+            return turbine->get_turbine_speed_in_pu();
+        else
+            return 0.0;
+    }
     else
         return 0.0;
 }
@@ -45,55 +47,66 @@ double WT_PITCH_MODEL::get_wt_generator_speed_in_pu() const
 double WT_PITCH_MODEL::get_wt_generator_reference_speed_in_pu() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL) return 0.0;
-	WT_AERODYNAMIC_MODEL* aerd = gen->get_wt_aerodynamic_model();
-	if (aerd != NULL and aerd->is_model_initialized())
-		return aerd->get_turbine_reference_speed_in_pu();
-	else
-		return 0.0;
+    if(gen!=NULL)
+    {
+        WT_AERODYNAMIC_MODEL* aerd = gen->get_wt_aerodynamic_model();
+        if (aerd != NULL and aerd->is_model_initialized())
+            return aerd->get_turbine_reference_speed_in_pu();
+        else
+            return 0.0;
+    }
+    else
+        return 0.0;
 }
 
 double WT_PITCH_MODEL::get_bus_frequency_in_pu() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return 1.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(gen!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    size_t bus = gen->get_generator_bus();
-    return psdb.get_bus_frequency_in_pu(bus);
+        size_t bus = gen->get_generator_bus();
+        return psdb.get_bus_frequency_in_pu(bus);
+    }
+    else
+        return 1.0;
 }
 
 double WT_PITCH_MODEL::get_bus_frequency_deviation_in_pu() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return 1.0;
+    if(gen!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-
-    size_t bus = gen->get_generator_bus();
-    return psdb.get_bus_frequency_deviation_in_pu(bus);
+        size_t bus = gen->get_generator_bus();
+        return psdb.get_bus_frequency_deviation_in_pu(bus);
+    }
+    else
+        return 1.0;
 }
 
 double WT_PITCH_MODEL::get_initial_pitch_angle_in_deg_from_wt_aerodynamic_model() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
+    if(gen!=NULL)
+    {
+        WT_AERODYNAMIC_MODEL* aerd = gen->get_wt_aerodynamic_model();
+        if(aerd!=NULL)
+        {
+            if(not aerd->is_model_initialized())
+                aerd->initialize();
+            return aerd->get_initial_pitch_angle_in_deg();
+        }
+        else
+            return 0.0;
+    }
+    else
         return 0.0;
 
-    WT_AERODYNAMIC_MODEL* aerd = gen->get_wt_aerodynamic_model();
-    if(aerd!=NULL)
-    {
-        if(not aerd->is_model_initialized())
-            aerd->initialize();
-        return aerd->get_initial_pitch_angle_in_deg();
-    }
-    else
-        return 0.0;
 }
 
 void WT_PITCH_MODEL::set_frequency_upper_deadband_in_pu(double freq)
diff --git a/code/source/model/wtg_models/wt_relay_model/wt_relay_model.cpp b/code/source/model/wtg_models/wt_relay_model/wt_relay_model.cpp
index 429eb07a..a4d8b37c 100644
--- a/code/source/model/wtg_models/wt_relay_model/wt_relay_model.cpp
+++ b/code/source/model/wtg_models/wt_relay_model/wt_relay_model.cpp
@@ -27,59 +27,78 @@ string WT_RELAY_MODEL::get_model_type() const
 double WT_RELAY_MODEL::get_wind_speed_in_pu() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen == NULL)
+    if(gen != NULL)
+    {
+        WIND_SPEED_MODEL* windmodel = gen->get_wind_speed_model();
+        if(windmodel != NULL)
+        {
+            if(not windmodel->is_model_initialized())
+                windmodel->initialize();
+
+            return windmodel->get_wind_speed_in_pu();
+        }
+        else
+            return 0.0;
+    }
+    else
         return 0.0;
-
-    WIND_SPEED_MODEL* windmodel = gen->get_wind_speed_model();
-    if(windmodel == NULL)
-        return 0.0;
-
-    if(not windmodel->is_model_initialized())
-        windmodel->initialize();
-
-    return windmodel->get_wind_speed_in_pu();
 }
 
 double WT_RELAY_MODEL::get_wt_generator_rotor_speed_in_pu() const
 {
     WT_GENERATOR* generator = get_wt_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-
-    WT_TURBINE_MODEL* turbine_model = generator->get_wt_turbine_model();
-    if(turbine_model==NULL)
+    if(generator!=NULL)
+    {
+        WT_TURBINE_MODEL* turbine_model = generator->get_wt_turbine_model();
+        if(turbine_model!=NULL)
+        {
+            if(not turbine_model->is_model_initialized())
+                turbine_model->initialize();
+
+            return turbine_model->get_generator_speed_in_pu();
+        }
+        else
+            return 0.0;
+    }
+    else
         return 0.0;
-
-    if(not turbine_model->is_model_initialized())
-        turbine_model->initialize();
-
-    return turbine_model->get_generator_speed_in_pu();
 }
 
 double WT_RELAY_MODEL::get_bus_frequency_in_pu() const
 {
     WT_GENERATOR* generator = get_wt_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-    size_t bus = generator->get_source_bus();
-    if(bus==0)
+    if(generator!=NULL)
+    {
+        size_t bus = generator->get_source_bus();
+        if(bus!=0)
+        {
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            return psdb.get_bus_frequency_in_pu(bus);
+        }
+        else
+            return 0.0;
+    }
+    else
         return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    return psdb.get_bus_frequency_in_pu(bus);
 }
 
 double WT_RELAY_MODEL::get_bus_voltage_in_pu() const
 {
     WT_GENERATOR* generator = get_wt_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-    size_t bus = generator->get_source_bus();
-    if(bus==0)
+    if(generator!=NULL)
+    {
+        size_t bus = generator->get_source_bus();
+        if(bus!=0)
+        {
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+            return psdb.get_bus_voltage_in_pu(bus);
+        }
+        else
+            return 0.0;
+    }
+    else
         return 0.0;
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    return psdb.get_bus_voltage_in_pu(bus);
 }
diff --git a/code/source/model/wtg_models/wt_relay_model/wtrly0.cpp b/code/source/model/wtg_models/wt_relay_model/wtrly0.cpp
index 2acc52ff..6eebffbd 100644
--- a/code/source/model/wtg_models/wt_relay_model/wtrly0.cpp
+++ b/code/source/model/wtg_models/wt_relay_model/wtrly0.cpp
@@ -63,7 +63,12 @@ string WTRLY0::get_model_name() const
 
 void WTRLY0::set_wind_spped_relay_pair_in_pu_s(size_t index, double vwind, double tdelay)
 {
-    if(index>=MAX_RELAY_COUNT)
+    if(index<MAX_RELAY_COUNT)
+    {
+        vwind_th[index] = vwind;
+        vwind_relay_timer[index].set_timer_interval_in_s(tdelay);
+    }
+    else
     {
         /*ostringstream osstream;
         osstream<<"Warning. Index exceeds "<<MAX_RELAY_COUNT<<" when setting up "<<get_model_name()<<" of "<<get_device_name()<<endl
@@ -71,13 +76,16 @@ void WTRLY0::set_wind_spped_relay_pair_in_pu_s(size_t index, double vwind, doubl
         toolkit.show_information_with_leading_time_stamp(osstream);*/
         return;
     }
-    vwind_th[index] = vwind;
-    vwind_relay_timer[index].set_timer_interval_in_s(tdelay);
 }
 
 void WTRLY0::set_rotor_speed_relay_pair_in_pu_s(size_t index, double speed, double tdelay)
 {
-    if(index>=MAX_RELAY_COUNT)
+    if(index<MAX_RELAY_COUNT)
+    {
+        speed_th[index] = speed;
+        speed_relay_timer[index].set_timer_interval_in_s(tdelay);
+    }
+    else
     {
         /*ostringstream osstream;
         osstream<<"Warning. Index exceeds "<<MAX_RELAY_COUNT<<" when setting up "<<get_model_name()<<" of "<<get_device_name()<<endl
@@ -85,13 +93,16 @@ void WTRLY0::set_rotor_speed_relay_pair_in_pu_s(size_t index, double speed, doub
         toolkit.show_information_with_leading_time_stamp(osstream);*/
         return;
     }
-    speed_th[index] = speed;
-    speed_relay_timer[index].set_timer_interval_in_s(tdelay);
 }
 
 void WTRLY0::set_bus_frequency_relay_pair_in_pu_s(size_t index, double freq, double tdelay)
 {
-    if(index>=MAX_RELAY_COUNT)
+    if(index<MAX_RELAY_COUNT)
+    {
+        freq_th[index] = freq;
+        freq_relay_timer[index].set_timer_interval_in_s(tdelay);
+    }
+    else
     {
         /*ostringstream osstream;
         osstream<<"Warning. Index exceeds "<<MAX_RELAY_COUNT<<" when setting up "<<get_model_name()<<" of "<<get_device_name()<<endl
@@ -99,13 +110,16 @@ void WTRLY0::set_bus_frequency_relay_pair_in_pu_s(size_t index, double freq, dou
         toolkit.show_information_with_leading_time_stamp(osstream);*/
         return;
     }
-    freq_th[index] = freq;
-    freq_relay_timer[index].set_timer_interval_in_s(tdelay);
 }
 
 void WTRLY0::set_bus_voltage_relay_pair_in_pu_s(size_t index, double volt, double tdelay)
 {
-    if(index>=MAX_RELAY_COUNT)
+    if(index<MAX_RELAY_COUNT)
+    {
+        volt_th[index] = volt;
+        volt_relay_timer[index].set_timer_interval_in_s(tdelay);
+    }
+    else
     {
         /*ostringstream osstream;
         osstream<<"Warning. Index exceeds "<<MAX_RELAY_COUNT<<" when setting up "<<get_model_name()<<" of "<<get_device_name()<<endl
@@ -113,8 +127,6 @@ void WTRLY0::set_bus_voltage_relay_pair_in_pu_s(size_t index, double volt, doubl
         toolkit.show_information_with_leading_time_stamp(osstream);*/
         return;
     }
-    volt_th[index] = volt;
-    volt_relay_timer[index].set_timer_interval_in_s(tdelay);
 }
 
 double WTRLY0::get_wind_speed_relay_threshold_in_pu(size_t index) const
@@ -190,56 +202,60 @@ bool WTRLY0::setup_model_with_steps_string_vector(vector<string>& data)
               nvolt  v1  t1  v2  t2  vn  tn /
     */
     bool is_successful = false;
-    if(data.size()<7)
-        return is_successful;
+    if(data.size()>=7)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            size_t n;
+            double v, s, f, t;
 
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
+            size_t i=3;
+            n = get_integer_data(data[i], "0"); ++i;
+            for(size_t k=0; k<n; ++k)
+            {
+                v = get_double_data(data[i], "0.0"); ++i;
+                t = get_double_data(data[i], "0.0"); ++i;
+                set_wind_spped_relay_pair_in_pu_s(k, v, t);
+                //cout<<"wind speed relay pair: "<<k<<", "<<v<<", "<<t<<endl;
+            }
 
-    size_t n;
-    double v, s, f, t;
+            n = get_integer_data(data[i], "0"); ++i;
+            for(size_t k=0; k<n; ++k)
+            {
+                s = get_double_data(data[i], "0.0"); ++i;
+                t = get_double_data(data[i], "0.0"); ++i;
+                set_rotor_speed_relay_pair_in_pu_s(k, s, t);
+                //cout<<"rotor speed relay pair: "<<k<<", "<<s<<", "<<t<<endl;
+            }
 
-    size_t i=3;
-    n = get_integer_data(data[i], "0"); ++i;
-    for(size_t k=0; k<n; ++k)
-    {
-        v = get_double_data(data[i], "0.0"); ++i;
-        t = get_double_data(data[i], "0.0"); ++i;
-        set_wind_spped_relay_pair_in_pu_s(k, v, t);
-        //cout<<"wind speed relay pair: "<<k<<", "<<v<<", "<<t<<endl;
-    }
+            n = get_integer_data(data[i], "0"); ++i;
+            for(size_t k=0; k<n; ++k)
+            {
+                f = get_double_data(data[i], "0.0"); ++i;
+                t = get_double_data(data[i], "0.0"); ++i;
+                set_bus_frequency_relay_pair_in_pu_s(k, f, t);
+                //cout<<"bus frequency relay pair: "<<k<<", "<<f<<", "<<t<<endl;
+            }
 
-    n = get_integer_data(data[i], "0"); ++i;
-    for(size_t k=0; k<n; ++k)
-    {
-        s = get_double_data(data[i], "0.0"); ++i;
-        t = get_double_data(data[i], "0.0"); ++i;
-        set_rotor_speed_relay_pair_in_pu_s(k, s, t);
-        //cout<<"rotor speed relay pair: "<<k<<", "<<s<<", "<<t<<endl;
-    }
+            n = get_integer_data(data[i], "0"); ++i;
+            for(size_t k=0; k<n; ++k)
+            {
+                v = get_double_data(data[i], "0.0"); ++i;
+                t = get_double_data(data[i], "0.0"); ++i;
+                set_bus_voltage_relay_pair_in_pu_s(k, v, t);
+                //cout<<"bus voltage relay pair: "<<k<<", "<<v<<", "<<t<<endl;
+            }
 
-    n = get_integer_data(data[i], "0"); ++i;
-    for(size_t k=0; k<n; ++k)
-    {
-        f = get_double_data(data[i], "0.0"); ++i;
-        t = get_double_data(data[i], "0.0"); ++i;
-        set_bus_frequency_relay_pair_in_pu_s(k, f, t);
-        //cout<<"bus frequency relay pair: "<<k<<", "<<f<<", "<<t<<endl;
-    }
+            is_successful = true;
 
-    n = get_integer_data(data[i], "0"); ++i;
-    for(size_t k=0; k<n; ++k)
-    {
-        v = get_double_data(data[i], "0.0"); ++i;
-        t = get_double_data(data[i], "0.0"); ++i;
-        set_bus_voltage_relay_pair_in_pu_s(k, v, t);
-        //cout<<"bus voltage relay pair: "<<k<<", "<<v<<", "<<t<<endl;
+            return is_successful;
+        }
+        else
+            return is_successful;
     }
-
-    is_successful = true;
-
-    return is_successful;
+    else
+        return is_successful;
 }
 
 bool WTRLY0::setup_model_with_psse_string(string data)
@@ -273,34 +289,36 @@ void WTRLY0::set_block_toolkit()
 void WTRLY0::initialize()
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return;
-
-    WT_GENERATOR_MODEL* gen_model = gen->get_wt_generator_model();
-    if(gen_model==NULL)
-        return;
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
+    if(gen!=NULL)
+    {
+        WT_GENERATOR_MODEL* gen_model = gen->get_wt_generator_model();
+        if(gen_model!=NULL)
+        {
+            if(not gen_model->is_model_initialized())
+                gen_model->initialize();
 
-    WT_AERODYNAMIC_MODEL* aero_model = gen->get_wt_aerodynamic_model();
-    if(aero_model==NULL)
-        return;
-    if(not aero_model->is_model_initialized())
-        aero_model->initialize();
+            WT_AERODYNAMIC_MODEL* aero_model = gen->get_wt_aerodynamic_model();
+            if(aero_model!=NULL)
+            {
+                if(not aero_model->is_model_initialized())
+                    aero_model->initialize();
 
-    set_block_toolkit();
+                set_block_toolkit();
 
-    for(size_t i=0; i<MAX_RELAY_COUNT; ++i)
-    {
-        vwind_relay_timer[i].set_attached_device(get_wt_generator_pointer());
-        speed_relay_timer[i].set_attached_device(get_wt_generator_pointer());
-        freq_relay_timer[i].set_attached_device(get_wt_generator_pointer());
-        volt_relay_timer[i].set_attached_device(get_wt_generator_pointer());
-
-        vwind_relay_timer[i].reset();
-        speed_relay_timer[i].reset();
-        freq_relay_timer[i].reset();
-        volt_relay_timer[i].reset();
+                for(size_t i=0; i<MAX_RELAY_COUNT; ++i)
+                {
+                    vwind_relay_timer[i].set_attached_device(get_wt_generator_pointer());
+                    speed_relay_timer[i].set_attached_device(get_wt_generator_pointer());
+                    freq_relay_timer[i].set_attached_device(get_wt_generator_pointer());
+                    volt_relay_timer[i].set_attached_device(get_wt_generator_pointer());
+
+                    vwind_relay_timer[i].reset();
+                    speed_relay_timer[i].reset();
+                    freq_relay_timer[i].reset();
+                    volt_relay_timer[i].reset();
+                }
+            }
+        }
     }
 }
 
@@ -318,73 +336,73 @@ void WTRLY0::run(DYNAMIC_MODE mode)
 
 void WTRLY0::check_wind_speed_relay()
 {
-    ostringstream osstream;
-
     WT_GENERATOR* wtgen = (WT_GENERATOR*) get_device_pointer();
-    bool status = wtgen->get_status();
-    if(status==false)
-        return;
-
-    DEVICE_ID did = get_device_id();
+    if(wtgen->get_status()==true)
+    {
+        ostringstream osstream;
+        DEVICE_ID did = get_device_id();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    DYNAMICS_SIMULATOR& sim = toolkit.get_dynamic_simulator();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        DYNAMICS_SIMULATOR& sim = toolkit.get_dynamic_simulator();
 
-    double vwind = get_wind_speed_in_pu();
+        double vwind = get_wind_speed_in_pu();
 
-    for(size_t i=0; i<MAX_RELAY_COUNT; ++i)
-    {
-        if(fabs(vwind_th[i])>FLOAT_EPSILON and fabs(vwind_th[i]-1.0)>FLOAT_EPSILON)
+        for(size_t i=0; i<MAX_RELAY_COUNT; ++i)
         {
-            if(not vwind_relay_timer[i].is_started())
+            if(fabs(vwind_th[i])>FLOAT_EPSILON and fabs(vwind_th[i]-1.0)>FLOAT_EPSILON)
             {
-                if(vwind_th[i]>1.0 and vwind>vwind_th[i])
-                {
-                    vwind_relay_timer[i].start();
-                    osstream<<"Wind speed relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
-                            <<"s due to wind speed exceeding over wind speed threshold: "<<vwind<<" > "<<vwind_th[i]<<endl;
-                    toolkit.show_information_with_leading_time_stamp(osstream);
-                }
-                else
+                if(not vwind_relay_timer[i].is_started())
                 {
-                    if(vwind_th[i]<1.0 and vwind<vwind_th[i])
+                    if(vwind_th[i]>1.0 and vwind>vwind_th[i])
                     {
                         vwind_relay_timer[i].start();
                         osstream<<"Wind speed relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
-                                <<"s due to wind speed exceeding under wind speed threshold: "<<vwind<<" < "<<vwind_th[i]<<endl;
+                                <<"s due to wind speed exceeding over wind speed threshold: "<<vwind<<" > "<<vwind_th[i]<<endl;
                         toolkit.show_information_with_leading_time_stamp(osstream);
                     }
+                    else
+                    {
+                        if(vwind_th[i]<1.0 and vwind<vwind_th[i])
+                        {
+                            vwind_relay_timer[i].start();
+                            osstream<<"Wind speed relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
+                                    <<"s due to wind speed exceeding under wind speed threshold: "<<vwind<<" < "<<vwind_th[i]<<endl;
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                    }
                 }
-            }
-
-            if(vwind_relay_timer[i].is_started())
-            {
-                if(vwind_relay_timer[i].is_timed_out())
-                {
 
-                    osstream<<"Wind speed relay timer of "<<get_device_name()<<" is timed out at "<<toolkit.get_dynamic_simulation_time_in_s()<<" s"<<endl;
-                    toolkit.show_information_with_leading_time_stamp(osstream);
-                    sim.trip_wt_generator(did, INFINITE_THRESHOLD);
-                    sim.enable_relay_action_flag();
-                }
+                if(not vwind_relay_timer[i].is_started())
+                    ;
                 else
                 {
-                    if(vwind_th[i]>1.0 and vwind<vwind_th[i])
-                    {
-                        vwind_relay_timer[i].reset();
-                        osstream<<"Wind speed relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
-                                <<"s due to wind speed less than over wind speed threshold: "<<vwind<<" < "<<vwind_th[i]<<endl;
-                        toolkit.show_information_with_leading_time_stamp(osstream);
-                    }
-                    else
+                    if(not vwind_relay_timer[i].is_timed_out())
                     {
-                        if(vwind_th[i]<1.0 and vwind>vwind_th[i])
+                        if(vwind_th[i]>1.0 and vwind<vwind_th[i])
                         {
                             vwind_relay_timer[i].reset();
                             osstream<<"Wind speed relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
-                                    <<"s due to wind speed greater than under wind speed threshold: "<<vwind<<" > "<<vwind_th[i]<<endl;
+                                    <<"s due to wind speed less than over wind speed threshold: "<<vwind<<" < "<<vwind_th[i]<<endl;
                             toolkit.show_information_with_leading_time_stamp(osstream);
                         }
+                        else
+                        {
+                            if(vwind_th[i]<1.0 and vwind>vwind_th[i])
+                            {
+                                vwind_relay_timer[i].reset();
+                                osstream<<"Wind speed relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
+                                        <<"s due to wind speed greater than under wind speed threshold: "<<vwind<<" > "<<vwind_th[i]<<endl;
+                                toolkit.show_information_with_leading_time_stamp(osstream);
+                            }
+                        }
+                    }
+                    else
+                    {
+
+                        osstream<<"Wind speed relay timer of "<<get_device_name()<<" is timed out at "<<toolkit.get_dynamic_simulation_time_in_s()<<" s"<<endl;
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                        sim.trip_wt_generator(did, INFINITE_THRESHOLD);
+                        sim.enable_relay_action_flag();
                     }
                 }
             }
@@ -394,73 +412,73 @@ void WTRLY0::check_wind_speed_relay()
 
 void WTRLY0::check_rotor_speed_relay()
 {
-    ostringstream osstream;
-
     WT_GENERATOR* wtgen = (WT_GENERATOR*) get_device_pointer();
-    bool status = wtgen->get_status();
-    if(status==false)
-        return;
-
-    DEVICE_ID did = get_device_id();
+    if(wtgen->get_status()==true)
+    {
+        ostringstream osstream;
+        DEVICE_ID did = get_device_id();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    DYNAMICS_SIMULATOR& sim = toolkit.get_dynamic_simulator();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        DYNAMICS_SIMULATOR& sim = toolkit.get_dynamic_simulator();
 
-    double speed = get_wt_generator_rotor_speed_in_pu();
+        double speed = get_wt_generator_rotor_speed_in_pu();
 
-    for(size_t i=0; i<MAX_RELAY_COUNT; ++i)
-    {
-        if(fabs(speed_th[i])>FLOAT_EPSILON and fabs(speed_th[i]-1.0)>FLOAT_EPSILON)
+        for(size_t i=0; i<MAX_RELAY_COUNT; ++i)
         {
-            if(not speed_relay_timer[i].is_started())
+            if(fabs(speed_th[i])>FLOAT_EPSILON and fabs(speed_th[i]-1.0)>FLOAT_EPSILON)
             {
-                if(speed_th[i]>1.0 and speed>speed_th[i])
-                {
-                    speed_relay_timer[i].start();
-                    osstream<<"Rotor speed relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
-                            <<"s due to rotor speed exceeding over rotor speed threshold: "<<speed<<" > "<<speed_th[i]<<endl;
-                    toolkit.show_information_with_leading_time_stamp(osstream);
-                }
-                else
+                if(not speed_relay_timer[i].is_started())
                 {
-                    if(speed_th[i]<1.0 and speed<speed_th[i])
+                    if(speed_th[i]>1.0 and speed>speed_th[i])
                     {
                         speed_relay_timer[i].start();
                         osstream<<"Rotor speed relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
-                                <<"s due to rotor speed exceeding under rotor speed threshold: "<<speed<<" < "<<speed_th[i]<<endl;
+                                <<"s due to rotor speed exceeding over rotor speed threshold: "<<speed<<" > "<<speed_th[i]<<endl;
                         toolkit.show_information_with_leading_time_stamp(osstream);
                     }
+                    else
+                    {
+                        if(speed_th[i]<1.0 and speed<speed_th[i])
+                        {
+                            speed_relay_timer[i].start();
+                            osstream<<"Rotor speed relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
+                                    <<"s due to rotor speed exceeding under rotor speed threshold: "<<speed<<" < "<<speed_th[i]<<endl;
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                    }
                 }
-            }
 
-            if(speed_relay_timer[i].is_started())
-            {
-                if(speed_relay_timer[i].is_timed_out())
-                {
-
-                    osstream<<"Rotor speed relay timer of "<<get_device_name()<<" is timed out at "<<toolkit.get_dynamic_simulation_time_in_s()<<" s"<<endl;
-                    toolkit.show_information_with_leading_time_stamp(osstream);
-                    sim.trip_wt_generator(did, INFINITE_THRESHOLD);
-                    sim.enable_relay_action_flag();
-                }
+                if(not speed_relay_timer[i].is_started())
+                    ;
                 else
                 {
-                    if(speed_th[i]>1.0 and speed<speed_th[i])
-                    {
-                        speed_relay_timer[i].reset();
-                        osstream<<"Rotor speed relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
-                                <<"s due to rotor speed less than over rotor speed threshold: "<<speed<<" < "<<speed_th[i]<<endl;
-                        toolkit.show_information_with_leading_time_stamp(osstream);
-                    }
-                    else
+                    if(not speed_relay_timer[i].is_timed_out())
                     {
-                        if(speed_th[i]<1.0 and speed>speed_th[i])
+                        if(speed_th[i]>1.0 and speed<speed_th[i])
                         {
                             speed_relay_timer[i].reset();
                             osstream<<"Rotor speed relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
-                                    <<"s due to rotor speed greater than under rotor speed threshold: "<<speed<<" > "<<speed_th[i]<<endl;
+                                    <<"s due to rotor speed less than over rotor speed threshold: "<<speed<<" < "<<speed_th[i]<<endl;
                             toolkit.show_information_with_leading_time_stamp(osstream);
                         }
+                        else
+                        {
+                            if(speed_th[i]<1.0 and speed>speed_th[i])
+                            {
+                                speed_relay_timer[i].reset();
+                                osstream<<"Rotor speed relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
+                                        <<"s due to rotor speed greater than under rotor speed threshold: "<<speed<<" > "<<speed_th[i]<<endl;
+                                toolkit.show_information_with_leading_time_stamp(osstream);
+                            }
+                        }
+                    }
+                    else
+                    {
+
+                        osstream<<"Rotor speed relay timer of "<<get_device_name()<<" is timed out at "<<toolkit.get_dynamic_simulation_time_in_s()<<" s"<<endl;
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                        sim.trip_wt_generator(did, INFINITE_THRESHOLD);
+                        sim.enable_relay_action_flag();
                     }
                 }
             }
@@ -470,73 +488,73 @@ void WTRLY0::check_rotor_speed_relay()
 
 void WTRLY0::check_bus_frequency_relay()
 {
-    ostringstream osstream;
-
     WT_GENERATOR* wtgen = (WT_GENERATOR*) get_device_pointer();
-    bool status = wtgen->get_status();
-    if(status==false)
-        return;
-
-    DEVICE_ID did = get_device_id();
+    if(wtgen->get_status()==true)
+    {
+        ostringstream osstream;
+        DEVICE_ID did = get_device_id();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    DYNAMICS_SIMULATOR& sim = toolkit.get_dynamic_simulator();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        DYNAMICS_SIMULATOR& sim = toolkit.get_dynamic_simulator();
 
-    double freq = get_bus_frequency_in_pu();
+        double freq = get_bus_frequency_in_pu();
 
-    for(size_t i=0; i<MAX_RELAY_COUNT; ++i)
-    {
-        if(fabs(freq_th[i])>FLOAT_EPSILON and fabs(freq_th[i]-1.0)>FLOAT_EPSILON)
+        for(size_t i=0; i<MAX_RELAY_COUNT; ++i)
         {
-            if(not freq_relay_timer[i].is_started())
+            if(fabs(freq_th[i])>FLOAT_EPSILON and fabs(freq_th[i]-1.0)>FLOAT_EPSILON)
             {
-                if(freq_th[i]>1.0 and freq>freq_th[i])
+                if(not freq_relay_timer[i].is_started())
                 {
-                    freq_relay_timer[i].start();
-                    osstream<<"Bus frequency relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
-                            <<"s due to bus frequency exceeding over bus frequency threshold: "<<freq<<" > "<<freq_th[i]<<endl;
-                    toolkit.show_information_with_leading_time_stamp(osstream);
-                }
-                else
-                {
-                    if(freq_th[i]<1.0 and freq<freq_th[i])
+                    if(freq_th[i]>1.0 and freq>freq_th[i])
                     {
                         freq_relay_timer[i].start();
                         osstream<<"Bus frequency relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
-                                <<"s due to bus frequency exceeding under bus frequency threshold: "<<freq<<" < "<<freq_th[i]<<endl;
+                                <<"s due to bus frequency exceeding over bus frequency threshold: "<<freq<<" > "<<freq_th[i]<<endl;
                         toolkit.show_information_with_leading_time_stamp(osstream);
                     }
+                    else
+                    {
+                        if(freq_th[i]<1.0 and freq<freq_th[i])
+                        {
+                            freq_relay_timer[i].start();
+                            osstream<<"Bus frequency relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
+                                    <<"s due to bus frequency exceeding under bus frequency threshold: "<<freq<<" < "<<freq_th[i]<<endl;
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                    }
                 }
-            }
-
-            if(freq_relay_timer[i].is_started())
-            {
-                if(freq_relay_timer[i].is_timed_out())
-                {
 
-                    osstream<<"Bus frequency relay timer of "<<get_device_name()<<" is timed out at "<<toolkit.get_dynamic_simulation_time_in_s()<<" s"<<endl;
-                    toolkit.show_information_with_leading_time_stamp(osstream);
-                    sim.trip_wt_generator(did, INFINITE_THRESHOLD);
-                    sim.enable_relay_action_flag();
-                }
+                if(not freq_relay_timer[i].is_started())
+                    ;
                 else
                 {
-                    if(freq_th[i]>1.0 and freq<freq_th[i])
-                    {
-                        freq_relay_timer[i].reset();
-                        osstream<<"Bus frequency relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
-                                <<"s due to bus frequency less than over bus frequency threshold: "<<freq<<" < "<<freq_th[i]<<endl;
-                        toolkit.show_information_with_leading_time_stamp(osstream);
-                    }
-                    else
+                    if(not freq_relay_timer[i].is_timed_out())
                     {
-                        if(freq_th[i]<1.0 and freq>freq_th[i])
+                        if(freq_th[i]>1.0 and freq<freq_th[i])
                         {
                             freq_relay_timer[i].reset();
                             osstream<<"Bus frequency relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
-                                    <<"s due to bus frequency greater than under bus frequency threshold: "<<freq<<" > "<<freq_th[i]<<endl;
+                                    <<"s due to bus frequency less than over bus frequency threshold: "<<freq<<" < "<<freq_th[i]<<endl;
                             toolkit.show_information_with_leading_time_stamp(osstream);
                         }
+                        else
+                        {
+                            if(freq_th[i]<1.0 and freq>freq_th[i])
+                            {
+                                freq_relay_timer[i].reset();
+                                osstream<<"Bus frequency relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
+                                        <<"s due to bus frequency greater than under bus frequency threshold: "<<freq<<" > "<<freq_th[i]<<endl;
+                                toolkit.show_information_with_leading_time_stamp(osstream);
+                            }
+                        }
+                    }
+                    else
+                    {
+
+                        osstream<<"Bus frequency relay timer of "<<get_device_name()<<" is timed out at "<<toolkit.get_dynamic_simulation_time_in_s()<<" s"<<endl;
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                        sim.trip_wt_generator(did, INFINITE_THRESHOLD);
+                        sim.enable_relay_action_flag();
                     }
                 }
             }
@@ -546,74 +564,73 @@ void WTRLY0::check_bus_frequency_relay()
 
 void WTRLY0::check_bus_voltage_relay()
 {
-    ostringstream osstream;
-
     WT_GENERATOR* wtgen = (WT_GENERATOR*) get_device_pointer();
-    bool status = wtgen->get_status();
-    if(status==false)
-        return;
-
-    DEVICE_ID did = get_device_id();
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    DYNAMICS_SIMULATOR& sim = toolkit.get_dynamic_simulator();
+    if(wtgen->get_status()==true)
+    {
+        ostringstream osstream;
+        DEVICE_ID did = get_device_id();
 
-    double volt = get_bus_voltage_in_pu();
-    if(volt>2.0)
-        return;
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        DYNAMICS_SIMULATOR& sim = toolkit.get_dynamic_simulator();
 
-    for(size_t i=0; i<MAX_RELAY_COUNT; ++i)
-    {
-        if(fabs(volt_th[i])>FLOAT_EPSILON and fabs(volt_th[i]-1.0)>FLOAT_EPSILON)
+        double volt = get_bus_voltage_in_pu();
+        if(volt<=2.0)
         {
-            if(not volt_relay_timer[i].is_started())
+            for(size_t i=0; i<MAX_RELAY_COUNT; ++i)
             {
-                if(volt_th[i]>1.0 and volt>volt_th[i])
-                {
-                    volt_relay_timer[i].start();
-                    osstream<<"Bus voltage relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
-                            <<"s due to bus voltage exceeding over bus voltage threshold: "<<volt<<" > "<<volt_th[i]<<endl;
-                    toolkit.show_information_with_leading_time_stamp(osstream);
-                }
-                else
+                if(fabs(volt_th[i])>FLOAT_EPSILON and fabs(volt_th[i]-1.0)>FLOAT_EPSILON)
                 {
-                    if(volt_th[i]<1.0 and volt<volt_th[i])
+                    if(not volt_relay_timer[i].is_started())
                     {
-                        volt_relay_timer[i].start();
-                        osstream<<"Bus voltage relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
-                                <<"s due to bus voltage exceeding under bus voltage threshold: "<<volt<<" < "<<volt_th[i]<<endl;
-                        toolkit.show_information_with_leading_time_stamp(osstream);
+                        if(volt_th[i]>1.0 and volt>volt_th[i])
+                        {
+                            volt_relay_timer[i].start();
+                            osstream<<"Bus voltage relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
+                                    <<"s due to bus voltage exceeding over bus voltage threshold: "<<volt<<" > "<<volt_th[i]<<endl;
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                        else
+                        {
+                            if(volt_th[i]<1.0 and volt<volt_th[i])
+                            {
+                                volt_relay_timer[i].start();
+                                osstream<<"Bus voltage relay timer of "<<get_device_name()<<" is started at "<<toolkit.get_dynamic_simulation_time_in_s()
+                                        <<"s due to bus voltage exceeding under bus voltage threshold: "<<volt<<" < "<<volt_th[i]<<endl;
+                                toolkit.show_information_with_leading_time_stamp(osstream);
+                            }
+                        }
                     }
-                }
-            }
 
-            if(volt_relay_timer[i].is_started())
-            {
-                if(volt_relay_timer[i].is_timed_out())
-                {
-
-                    osstream<<"Bus voltage relay timer of "<<get_device_name()<<" is timed out at "<<toolkit.get_dynamic_simulation_time_in_s()<<" s"<<endl;
-                    toolkit.show_information_with_leading_time_stamp(osstream);
-                    sim.trip_wt_generator(did, INFINITE_THRESHOLD);
-                    sim.enable_relay_action_flag();
-                }
-                else
-                {
-                    if(volt_th[i]>1.0 and volt<volt_th[i])
-                    {
-                        volt_relay_timer[i].reset();
-                        osstream<<"Bus voltage relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
-                                <<"s due to bus voltage less than over bus voltage threshold: "<<volt<<" < "<<volt_th[i]<<endl;
-                        toolkit.show_information_with_leading_time_stamp(osstream);
-                    }
+                    if(not volt_relay_timer[i].is_started())
+                        ;
                     else
                     {
-                        if(volt_th[i]<1.0 and volt>volt_th[i])
+                        if(not volt_relay_timer[i].is_timed_out())
+                        {
+                            if(volt_th[i]>1.0 and volt<volt_th[i])
+                            {
+                                volt_relay_timer[i].reset();
+                                osstream<<"Bus voltage relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
+                                        <<"s due to bus voltage less than over bus voltage threshold: "<<volt<<" < "<<volt_th[i]<<endl;
+                                toolkit.show_information_with_leading_time_stamp(osstream);
+                            }
+                            else
+                            {
+                                if(volt_th[i]<1.0 and volt>volt_th[i])
+                                {
+                                    volt_relay_timer[i].reset();
+                                    osstream<<"Bus voltage relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
+                                            <<"s due to bus voltage greater than under bus voltage threshold: "<<volt<<" > "<<volt_th[i]<<endl;
+                                    toolkit.show_information_with_leading_time_stamp(osstream);
+                                }
+                            }
+                        }
+                        else
                         {
-                            volt_relay_timer[i].reset();
-                            osstream<<"Bus voltage relay timer of "<<get_device_name()<<" is reset at "<<toolkit.get_dynamic_simulation_time_in_s()
-                                    <<"s due to bus voltage greater than under bus voltage threshold: "<<volt<<" > "<<volt_th[i]<<endl;
+                            osstream<<"Bus voltage relay timer of "<<get_device_name()<<" is timed out at "<<toolkit.get_dynamic_simulation_time_in_s()<<" s"<<endl;
                             toolkit.show_information_with_leading_time_stamp(osstream);
+                            sim.trip_wt_generator(did, INFINITE_THRESHOLD);
+                            sim.enable_relay_action_flag();
                         }
                     }
                 }
diff --git a/code/source/model/wtg_models/wt_turbine_model/wt3t0.cpp b/code/source/model/wtg_models/wt_turbine_model/wt3t0.cpp
index e7e77252..b7359eab 100644
--- a/code/source/model/wtg_models/wt_turbine_model/wt3t0.cpp
+++ b/code/source/model/wtg_models/wt_turbine_model/wt3t0.cpp
@@ -93,31 +93,36 @@ double WT3T0::get_Dshaft_in_pu() const
 bool WT3T0::setup_model_with_steps_string_vector(vector<string>& data)
 {
     bool is_successful = false;
-    if(data.size()<8)
-        return is_successful;
-
-    string model_name = get_string_data(data[0],"");
-    if(model_name!=get_model_name())
-        return is_successful;
+    if(data.size()>=8)
+    {
+        string model_name = get_string_data(data[0],"");
+        if(model_name==get_model_name())
+        {
+            double ht, hg, damp, kshaft, dshaft;
 
-    double ht, hg, damp, kshaft, dshaft;
+            size_t i=3;
+            ht = get_double_data(data[i],"0.0"); i++;
+            hg = get_double_data(data[i],"0.0"); i++;
+            kshaft = get_double_data(data[i],"0.0"); i++;
+            dshaft = get_double_data(data[i],"0.0"); i++;
+            damp = get_double_data(data[i],"0.0");
 
-    size_t i=3;
-    ht = get_double_data(data[i],"0.0"); i++;
-    hg = get_double_data(data[i],"0.0"); i++;
-    kshaft = get_double_data(data[i],"0.0"); i++;
-    dshaft = get_double_data(data[i],"0.0"); i++;
-    damp = get_double_data(data[i],"0.0");
+            set_Hturbine_in_s(ht);
+            set_Hgenerator_in_s(hg);
+            set_Kshaft_in_pu(kshaft);
+            set_Dshaft_in_pu(dshaft);
+            set_damping_in_pu(damp);
 
-    set_Hturbine_in_s(ht);
-    set_Hgenerator_in_s(hg);
-    set_Kshaft_in_pu(kshaft);
-    set_Dshaft_in_pu(dshaft);
-    set_damping_in_pu(damp);
+            is_successful = true;
 
-    is_successful = true;
+            return is_successful;
+        }
+        else
+            return is_successful;
 
-    return is_successful;
+    }
+    else
+        return is_successful;
 }
 
 bool WT3T0::setup_model_with_psse_string(string data)
@@ -148,62 +153,64 @@ void WT3T0::set_block_toolkit()
 void WT3T0::initialize()
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(gen!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    WT_GENERATOR_MODEL* gen_model = gen->get_wt_generator_model();
-    if(gen_model==NULL)
-        return;
-    if(not gen_model->is_model_initialized())
-        gen_model->initialize();
+        WT_GENERATOR_MODEL* gen_model = gen->get_wt_generator_model();
+        if(gen_model!=NULL)
+        {
+            if(not gen_model->is_model_initialized())
+                gen_model->initialize();
 
-    WT_AERODYNAMIC_MODEL* aero_model = gen->get_wt_aerodynamic_model();
-    if(aero_model==NULL)
-        return;
-    if(not aero_model->is_model_initialized())
-        aero_model->initialize();
+            WT_AERODYNAMIC_MODEL* aero_model = gen->get_wt_aerodynamic_model();
+            if(aero_model!=NULL)
+            {
+                if(not aero_model->is_model_initialized())
+                    aero_model->initialize();
 
-    set_block_toolkit();
+                set_block_toolkit();
 
-    size_t bus = gen->get_generator_bus();
+                size_t bus = gen->get_generator_bus();
 
-    double fbase = get_bus_base_frequency_in_Hz();
-    double wbase = 2.0*PI*fbase;
+                double fbase = get_bus_base_frequency_in_Hz();
+                double wbase = 2.0*PI*fbase;
 
-    generator_rotor_angle_block.set_T_in_s(1.0/wbase);
-    generator_rotor_angle_block.set_output(psdb.get_bus_angle_in_rad(bus));
-    generator_rotor_angle_block.initialize();
+                generator_rotor_angle_block.set_T_in_s(1.0/wbase);
+                generator_rotor_angle_block.set_output(psdb.get_bus_angle_in_rad(bus));
+                generator_rotor_angle_block.initialize();
 
-    double speed = get_initial_wind_turbine_speed_in_pu_from_wt_areodynamic_model();
-    double dspeed = speed-1.0;
+                double speed = get_initial_wind_turbine_speed_in_pu_from_wt_areodynamic_model();
+                double dspeed = speed-1.0;
 
-    generator_inertia_block.set_output(dspeed);
-    generator_inertia_block.initialize();
+                generator_inertia_block.set_output(dspeed);
+                generator_inertia_block.initialize();
 
-    turbine_inertia_block.set_output(dspeed);
-    double hturbine = get_Hturbine_in_s();
-    if(fabs(hturbine)>FLOAT_EPSILON)
-        turbine_inertia_block.initialize();
+                turbine_inertia_block.set_output(dspeed);
+                double hturbine = get_Hturbine_in_s();
+                if(fabs(hturbine)>FLOAT_EPSILON)
+                    turbine_inertia_block.initialize();
 
-    double pelec = gen_model->get_active_power_generation_including_stator_loss_in_pu_based_on_mbase();
-    double telec = pelec/speed;
-    double tmech = get_damping_in_pu()*dspeed+telec;
+                double pelec = gen_model->get_active_power_generation_including_stator_loss_in_pu_based_on_mbase();
+                double telec = pelec/speed;
+                double tmech = get_damping_in_pu()*dspeed+telec;
 
-    shaft_twist_block.set_output(tmech);
-    shaft_twist_block.initialize();
+                shaft_twist_block.set_output(tmech);
+                shaft_twist_block.initialize();
 
-    set_flag_model_initialized_as_true();
+                set_flag_model_initialized_as_true();
 
-    ostringstream oosstream;
-    oosstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
-            <<"(1) Turbine speed is "<<get_turbine_speed_in_pu()<<" pu"<<endl
-            <<"(2) Generator speed is "<<get_generator_speed_in_pu()<<" pu"<<endl
-            <<"(3) Generator rotor angle is "<<get_rotor_angle_in_deg()<<" deg"<<endl
-            <<"(4) Shaft block state is "<<shaft_twist_block.get_state();
-    toolkit.show_information_with_leading_time_stamp(oosstream);
+                ostringstream oosstream;
+                oosstream<<get_model_name()<<" model of "<<get_device_name()<<" is initialized."<<endl
+                        <<"(1) Turbine speed is "<<get_turbine_speed_in_pu()<<" pu"<<endl
+                        <<"(2) Generator speed is "<<get_generator_speed_in_pu()<<" pu"<<endl
+                        <<"(3) Generator rotor angle is "<<get_rotor_angle_in_deg()<<" deg"<<endl
+                        <<"(4) Shaft block state is "<<shaft_twist_block.get_state();
+                toolkit.show_information_with_leading_time_stamp(oosstream);
+            }
+        }
+    }
 }
 
 void WT3T0::run(DYNAMIC_MODE mode)
diff --git a/code/source/model/wtg_models/wt_turbine_model/wt_turbine_model.cpp b/code/source/model/wtg_models/wt_turbine_model/wt_turbine_model.cpp
index 12c6901e..d2890dee 100644
--- a/code/source/model/wtg_models/wt_turbine_model/wt_turbine_model.cpp
+++ b/code/source/model/wtg_models/wt_turbine_model/wt_turbine_model.cpp
@@ -38,46 +38,60 @@ double WT_TURBINE_MODEL::get_damping_in_pu() const
 double WT_TURBINE_MODEL::get_wt_generator_active_power_generation_in_MW() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen == NULL)
-        return 0.0;
+    if(gen != NULL)
+    {
+        WT_GENERATOR_MODEL* genmodel = gen->get_wt_generator_model();
+        if(genmodel != NULL)
+        {
+            if(not genmodel->is_model_initialized())
+                genmodel->initialize();
 
-    WT_GENERATOR_MODEL* genmodel = gen->get_wt_generator_model();
-    if(genmodel == NULL)
+            return genmodel->get_terminal_active_power_in_MW();
+        }
+        else
+            return 0.0;
+    }
+    else
         return 0.0;
-
-    if(not genmodel->is_model_initialized())
-        genmodel->initialize();
-
-    return genmodel->get_terminal_active_power_in_MW();
 }
 
 double WT_TURBINE_MODEL::get_initial_wind_turbine_speed_in_pu_from_wt_areodynamic_model() const
 {
     WT_GENERATOR* generator = get_wt_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-    WT_AERODYNAMIC_MODEL* aero_model = generator->get_wt_aerodynamic_model();
-    if(aero_model==NULL)
-        return 0.0;
-
-    if(not aero_model->is_model_initialized())
-        aero_model->initialize();
-
-    return aero_model->get_initial_turbine_speed_in_pu();
+    if(generator!=NULL)
+    {
+        WT_AERODYNAMIC_MODEL* aero_model = generator->get_wt_aerodynamic_model();
+        if(aero_model!=NULL)
+        {
+            if(not aero_model->is_model_initialized())
+                aero_model->initialize();
+
+            return aero_model->get_initial_turbine_speed_in_pu();
+        }
+        else
+            return 0.0;
+    }
+    else
+        return 0.0;
 }
 
 double WT_TURBINE_MODEL::get_mechanical_power_in_pu_from_wt_aerodynamic_model() const
 {
     WT_GENERATOR* generator = get_wt_generator_pointer();
-    if(generator==NULL)
-        return 0.0;
-    WT_AERODYNAMIC_MODEL* aero_model = generator->get_wt_aerodynamic_model();
-    if(aero_model==NULL)
-        return 0.0;
-
-    if(not aero_model->is_model_initialized())
-        aero_model->initialize();
-
-    double mbase = get_mbase_in_MVA();
-    return aero_model->get_turbine_mechanical_power_in_MW()/mbase;
+    if(generator!=NULL)
+    {
+        WT_AERODYNAMIC_MODEL* aero_model = generator->get_wt_aerodynamic_model();
+        if(aero_model!=NULL)
+        {
+            if(not aero_model->is_model_initialized())
+                aero_model->initialize();
+
+            double mbase = get_mbase_in_MVA();
+            return aero_model->get_turbine_mechanical_power_in_MW()/mbase;
+        }
+        else
+            return 0.0;
+    }
+    else
+        return 0.0;
 }
diff --git a/code/source/model/wtg_models/wtg_model.cpp b/code/source/model/wtg_models/wtg_model.cpp
index 73f0bb33..ed44e64e 100644
--- a/code/source/model/wtg_models/wtg_model.cpp
+++ b/code/source/model/wtg_models/wtg_model.cpp
@@ -29,50 +29,56 @@ double WTG_MODEL::get_mbase_in_MVA() const
 complex<double> WTG_MODEL::get_terminal_complex_voltage_in_pu() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(gen!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    size_t bus = gen->get_generator_bus();
-    complex<double> Vxy = psdb.get_bus_complex_voltage_in_pu(bus);
-    return Vxy;
+        size_t bus = gen->get_generator_bus();
+        complex<double> Vxy = psdb.get_bus_complex_voltage_in_pu(bus);
+        return Vxy;
+    }
+    else
+        return 0.0;
 }
 
 size_t WTG_MODEL::get_number_of_lumped_wt_generators() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
+    if(gen!=NULL)
+        return gen->get_number_of_lumped_wt_generators();
+    else
         return 0;
-    return gen->get_number_of_lumped_wt_generators();
 }
 
 double WTG_MODEL::get_rated_power_per_wt_generator_in_MW() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
+    if(gen!=NULL)
+        return gen->get_rated_power_per_wt_generator_in_MW();
+    else
         return 0.0;
-    return gen->get_rated_power_per_wt_generator_in_MW();
 }
 
 double WTG_MODEL::get_bus_base_frequency_in_Hz() const
 {
     WT_GENERATOR* gen = get_wt_generator_pointer();
-    if(gen==NULL)
-        return 0.0;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+    if(gen!=NULL)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    return psdb.get_bus_base_frequency_in_Hz(gen->get_generator_bus());
+        return psdb.get_bus_base_frequency_in_Hz(gen->get_generator_bus());
+    }
+    else
+        return 0.0;
 }
 
 complex<double> WTG_MODEL::get_source_impedance_in_pu_based_on_mbase() const
 {
     WT_GENERATOR* wt_generator = get_wt_generator_pointer();
-    if(wt_generator==NULL)
-        return 0.0;
-    else
+    if(wt_generator!=NULL)
         return wt_generator->get_source_impedance_in_pu();
+    else
+        return 0.0;
 }
diff --git a/code/source/network/jacobian_builder.cpp b/code/source/network/jacobian_builder.cpp
index 8f723991..7e9bd6eb 100644
--- a/code/source/network/jacobian_builder.cpp
+++ b/code/source/network/jacobian_builder.cpp
@@ -52,136 +52,149 @@ bool JACOBIAN_BUILDER::is_network_matrix_set() const
 
 void JACOBIAN_BUILDER::build_seprate_jacobians()
 {
-    if(not is_network_matrix_set())
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-
-    jacobian_delta_p_over_angle.clear();
-    jacobian_delta_p_over_voltage.clear();
-    jacobian_delta_q_over_angle.clear();
-    jacobian_delta_q_over_voltage.clear();
+    if(is_network_matrix_set())
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    double der;
+        jacobian_delta_p_over_angle.clear();
+        jacobian_delta_p_over_voltage.clear();
+        jacobian_delta_q_over_angle.clear();
+        jacobian_delta_q_over_voltage.clear();
 
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
+        double der;
 
-    int n = Y.get_matrix_entry_count();
-    int row, column;
-    size_t ibus, jbus;
-    ostringstream osstream;
-    for(int k=0; k!=n; ++k)
-    {
-        row = Y.get_row_number_of_entry_index(k);
-        column = Y.get_column_number_of_entry_index(k);
-        ibus = nw_db->get_physical_bus_number_of_internal_bus(row);
-        jbus = nw_db->get_physical_bus_number_of_internal_bus(column);
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
 
-        der = get_jacobian_delta_p_over_angle_of_internal_bus(row,column);
-        if(isnan(der))
-        {
-            osstream<<"NAN is detected when building Jacobian matrix, dP/dA is NAN at row: "<<row<<"(bus "<<ibus<<"), col: "<<column<<"(bus "<<jbus<<")";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-        }
-        jacobian_delta_p_over_angle.add_entry(row,column, der);
-        der = get_jacobian_delta_p_over_voltage_of_internal_bus(row,column);
-        if(isnan(der))
-        {
-            osstream<<"NAN is detected when building Jacobian matrix, dP/dV is NAN at row: "<<row<<"(bus "<<ibus<<"), col: "<<column<<"(bus "<<jbus<<")";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-        }
-        jacobian_delta_p_over_voltage.add_entry(row,column, der);
-        der = get_jacobian_delta_q_over_angle_of_internal_bus(row,column);
-        if(isnan(der))
-        {
-            osstream<<"NAN is detected when building Jacobian matrix, dQ/dA is NAN at row: "<<row<<"(bus "<<ibus<<"), col: "<<column<<"(bus "<<jbus<<")";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-        }
-        jacobian_delta_q_over_angle.add_entry(row,column, der);
-        der = get_jacobian_delta_q_over_voltage_of_internal_bus(row,column);
-        if(isnan(der))
+        int n = Y.get_matrix_entry_count();
+        int row, column;
+        size_t ibus, jbus;
+        ostringstream osstream;
+        for(int k=0; k!=n; ++k)
         {
-            osstream<<"NAN is detected when building Jacobian matrix, dQ/dV is NAN at row: "<<row<<"(bus "<<ibus<<"), col: "<<column<<"(bus "<<jbus<<")";
-            toolkit.show_information_with_leading_time_stamp(osstream);
+            row = Y.get_row_number_of_entry_index(k);
+            column = Y.get_column_number_of_entry_index(k);
+            ibus = nw_db->get_physical_bus_number_of_internal_bus(row);
+            jbus = nw_db->get_physical_bus_number_of_internal_bus(column);
+
+            der = get_jacobian_delta_p_over_angle_of_internal_bus(row,column);
+            if(not isnan(der))
+                ;
+            else
+            {
+                osstream<<"NAN is detected when building Jacobian matrix, dP/dA is NAN at row: "<<row<<"(bus "<<ibus<<"), col: "<<column<<"(bus "<<jbus<<")";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+            jacobian_delta_p_over_angle.add_entry(row,column, der);
+            der = get_jacobian_delta_p_over_voltage_of_internal_bus(row,column);
+            if(not isnan(der))
+                ;
+            else
+            {
+                osstream<<"NAN is detected when building Jacobian matrix, dP/dV is NAN at row: "<<row<<"(bus "<<ibus<<"), col: "<<column<<"(bus "<<jbus<<")";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+            jacobian_delta_p_over_voltage.add_entry(row,column, der);
+            der = get_jacobian_delta_q_over_angle_of_internal_bus(row,column);
+            if(not isnan(der))
+                ;
+            else
+            {
+                osstream<<"NAN is detected when building Jacobian matrix, dQ/dA is NAN at row: "<<row<<"(bus "<<ibus<<"), col: "<<column<<"(bus "<<jbus<<")";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+            jacobian_delta_q_over_angle.add_entry(row,column, der);
+            der = get_jacobian_delta_q_over_voltage_of_internal_bus(row,column);
+            if(not isnan(der))
+                ;
+            else
+            {
+                osstream<<"NAN is detected when building Jacobian matrix, dQ/dV is NAN at row: "<<row<<"(bus "<<ibus<<"), col: "<<column<<"(bus "<<jbus<<")";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+            jacobian_delta_q_over_voltage.add_entry(row,column, der);
         }
-        jacobian_delta_q_over_voltage.add_entry(row,column, der);
-    }
-    jacobian_delta_p_over_angle.compress_and_merge_duplicate_entries();
-    jacobian_delta_p_over_voltage.compress_and_merge_duplicate_entries();
-    jacobian_delta_q_over_angle.compress_and_merge_duplicate_entries();
-    jacobian_delta_q_over_voltage.compress_and_merge_duplicate_entries();
+        jacobian_delta_p_over_angle.compress_and_merge_duplicate_entries();
+        jacobian_delta_p_over_voltage.compress_and_merge_duplicate_entries();
+        jacobian_delta_q_over_angle.compress_and_merge_duplicate_entries();
+        jacobian_delta_q_over_voltage.compress_and_merge_duplicate_entries();
 
-    osstream<<"Done building separate jacobian matrix.";
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    return;
+        osstream<<"Done building separate jacobian matrix.";
+        toolkit.show_information_with_leading_time_stamp(osstream);
+    }
 }
 
 void JACOBIAN_BUILDER::update_seprate_jacobians()
 {
-    if(not is_network_matrix_set())
-        return;
-
-    update_jacobian_delta_p_over_angle();
-    update_jacobian_delta_p_over_voltage();
-    update_jacobian_delta_q_over_angle();
-    update_jacobian_delta_q_over_voltage();
+    if(is_network_matrix_set())
+    {
+        update_jacobian_delta_p_over_angle();
+        update_jacobian_delta_p_over_voltage();
+        update_jacobian_delta_q_over_angle();
+        update_jacobian_delta_q_over_voltage();
+    }
 }
 
 void JACOBIAN_BUILDER::update_jacobian_delta_p_over_angle()
 {
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
-
-    size_t nbus = psdb.get_in_service_bus_count();
-    double der;
-    complex<double> y;
-    int k_start, k_end;
-    k_start = 0;
-    size_t ibus;
-    for(size_t jbus = 0; jbus!=nbus; ++jbus)
+    if(is_network_matrix_set())
     {
-        k_end = Y.get_starting_index_of_column(jbus+1);
-        for(int k=k_start; k!=k_end; ++k)
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
+
+        size_t nbus = psdb.get_in_service_bus_count();
+        double der;
+        complex<double> y;
+        int k_start, k_end;
+        k_start = 0;
+        size_t ibus;
+        for(size_t jbus = 0; jbus!=nbus; ++jbus)
         {
-            ibus = Y.get_row_number_of_entry_index(k);
-            if(ibus>jbus)
-                break;
-            if(ibus==jbus)
+            k_end = Y.get_starting_index_of_column(jbus+1);
+            for(int k=k_start; k!=k_end; ++k)
             {
-                der = get_jacobian_delta_p_over_angle_of_internal_bus(jbus,jbus);
-                jacobian_delta_p_over_angle.change_entry_value(jbus,jbus, der);
-            }
-            else
-            {
-                der = get_jacobian_delta_p_over_angle_of_internal_bus(ibus,jbus);
-                jacobian_delta_p_over_angle.change_entry_value(ibus,jbus, der);
-                der = get_jacobian_delta_p_over_angle_of_internal_bus(jbus,ibus);
-                jacobian_delta_p_over_angle.change_entry_value(jbus,ibus, der);
+                ibus = Y.get_row_number_of_entry_index(k);
+                if(ibus<=jbus)
+                {
+                    if(ibus<jbus)
+                    {
+                        der = get_jacobian_delta_p_over_angle_of_internal_bus(ibus,jbus);
+                        jacobian_delta_p_over_angle.change_entry_value(ibus,jbus, der);
+                        der = get_jacobian_delta_p_over_angle_of_internal_bus(jbus,ibus);
+                        jacobian_delta_p_over_angle.change_entry_value(jbus,ibus, der);
+                    }
+                    else
+                    {
+                        der = get_jacobian_delta_p_over_angle_of_internal_bus(jbus,jbus);
+                        jacobian_delta_p_over_angle.change_entry_value(jbus,jbus, der);
+                    }
+                }
+                else
+                    break;
             }
+            k_start = k_end;
         }
-        k_start = k_end;
-    }
-    return;
+        return;
 
-    for(size_t i=0; i!=nbus; ++i)
-    {
-        for(size_t j=0; j!=nbus; ++j)
+        for(size_t i=0; i!=nbus; ++i)
         {
-            if(i==j)
-            {
-                der = get_jacobian_delta_p_over_angle_of_internal_bus(i,i);
-                jacobian_delta_p_over_angle.change_entry_value(i,i, der);
-            }
-            else
+            for(size_t j=0; j!=nbus; ++j)
             {
-                y = Y.get_entry_value(i,j);
-                if(y!=0.0)
+                if(i!=j)
                 {
-                    der = get_jacobian_delta_p_over_angle_of_internal_bus(i,j);
-                    jacobian_delta_p_over_angle.change_entry_value(i,j,der);
+                    y = Y.get_entry_value(i,j);
+                    if(y!=0.0)
+                    {
+                        der = get_jacobian_delta_p_over_angle_of_internal_bus(i,j);
+                        jacobian_delta_p_over_angle.change_entry_value(i,j,der);
+                    }
+                }
+                else
+                {
+                    der = get_jacobian_delta_p_over_angle_of_internal_bus(i,i);
+                    jacobian_delta_p_over_angle.change_entry_value(i,i, der);
                 }
             }
         }
@@ -190,59 +203,65 @@ void JACOBIAN_BUILDER::update_jacobian_delta_p_over_angle()
 
 void JACOBIAN_BUILDER::update_jacobian_delta_p_over_voltage()
 {
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
-
-    size_t nbus = psdb.get_in_service_bus_count();
-    double der;
-    complex<double> y;
-    int k_start, k_end;
-    k_start = 0;
-    size_t ibus;
-    for(size_t jbus = 0; jbus!=nbus; ++jbus)
+    if(is_network_matrix_set())
     {
-        k_end = Y.get_starting_index_of_column(jbus+1);
-        for(int k=k_start; k!=k_end; ++k)
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
+
+        size_t nbus = psdb.get_in_service_bus_count();
+        double der;
+        complex<double> y;
+        int k_start, k_end;
+        k_start = 0;
+        size_t ibus;
+        for(size_t jbus = 0; jbus!=nbus; ++jbus)
         {
-            ibus = Y.get_row_number_of_entry_index(k);
-            if(ibus>jbus)
-                break;
-            if(ibus==jbus)
-            {
-                der = get_jacobian_delta_p_over_voltage_of_internal_bus(jbus,jbus);
-                jacobian_delta_p_over_voltage.change_entry_value(jbus,jbus, der);
-            }
-            else
+            k_end = Y.get_starting_index_of_column(jbus+1);
+            for(int k=k_start; k!=k_end; ++k)
             {
-                der = get_jacobian_delta_p_over_voltage_of_internal_bus(ibus,jbus);
-                jacobian_delta_p_over_voltage.change_entry_value(ibus,jbus, der);
-                der = get_jacobian_delta_p_over_voltage_of_internal_bus(jbus,ibus);
-                jacobian_delta_p_over_voltage.change_entry_value(jbus,ibus, der);
+                ibus = Y.get_row_number_of_entry_index(k);
+                if(ibus<=jbus)
+                {
+                    if(ibus<jbus)
+                    {
+                        der = get_jacobian_delta_p_over_voltage_of_internal_bus(ibus,jbus);
+                        jacobian_delta_p_over_voltage.change_entry_value(ibus,jbus, der);
+                        der = get_jacobian_delta_p_over_voltage_of_internal_bus(jbus,ibus);
+                        jacobian_delta_p_over_voltage.change_entry_value(jbus,ibus, der);
+                    }
+                    else
+                    {
+                        der = get_jacobian_delta_p_over_voltage_of_internal_bus(jbus,jbus);
+                        jacobian_delta_p_over_voltage.change_entry_value(jbus,jbus, der);
+                    }
+                }
+                else
+                    break;
             }
+            k_start = k_end;
         }
-        k_start = k_end;
-    }
-    return;
+        return;
 
 
-    for(size_t i=0; i!=nbus; ++i)
-    {
-        for(size_t j=0; j!=nbus; ++j)
+        for(size_t i=0; i!=nbus; ++i)
         {
-            if(i==j)
+            for(size_t j=0; j!=nbus; ++j)
             {
-                der = get_jacobian_delta_p_over_voltage_of_internal_bus(i,i);
-                jacobian_delta_p_over_voltage.change_entry_value(i,i, der);
-            }
-            else
-            {
-                y = Y.get_entry_value(i,j);
-                if(y!=0.0)
+                if(i!=j)
+                {
+                    y = Y.get_entry_value(i,j);
+                    if(y!=0.0)
+                    {
+                        der = get_jacobian_delta_p_over_voltage_of_internal_bus(i,j);
+                        jacobian_delta_p_over_voltage.change_entry_value(i,j, der);
+                    }
+                }
+                else
                 {
-                    der = get_jacobian_delta_p_over_voltage_of_internal_bus(i,j);
-                    jacobian_delta_p_over_voltage.change_entry_value(i,j, der);
+                    der = get_jacobian_delta_p_over_voltage_of_internal_bus(i,i);
+                    jacobian_delta_p_over_voltage.change_entry_value(i,i, der);
                 }
             }
         }
@@ -251,59 +270,65 @@ void JACOBIAN_BUILDER::update_jacobian_delta_p_over_voltage()
 
 void JACOBIAN_BUILDER::update_jacobian_delta_q_over_angle()
 {
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
+    if(is_network_matrix_set())
+    {
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
 
-    size_t nbus = psdb.get_in_service_bus_count();
-    double der;
-    complex<double> y;
+        size_t nbus = psdb.get_in_service_bus_count();
+        double der;
+        complex<double> y;
 
-    int k_start, k_end;
-    k_start = 0;
-    size_t ibus;
-    for(size_t jbus = 0; jbus!=nbus; ++jbus)
-    {
-        k_end = Y.get_starting_index_of_column(jbus+1);
-        for(int k=k_start; k!=k_end; ++k)
+        int k_start, k_end;
+        k_start = 0;
+        size_t ibus;
+        for(size_t jbus = 0; jbus!=nbus; ++jbus)
         {
-            ibus = Y.get_row_number_of_entry_index(k);
-            if(ibus>jbus)
-                break;
-            if(ibus==jbus)
+            k_end = Y.get_starting_index_of_column(jbus+1);
+            for(int k=k_start; k!=k_end; ++k)
             {
-                der = get_jacobian_delta_q_over_angle_of_internal_bus(jbus,jbus);
-                jacobian_delta_q_over_angle.change_entry_value(jbus,jbus, der);
-            }
-            else
-            {
-                der = get_jacobian_delta_q_over_angle_of_internal_bus(ibus,jbus);
-                jacobian_delta_q_over_angle.change_entry_value(ibus,jbus, der);
-                der = get_jacobian_delta_q_over_angle_of_internal_bus(jbus,ibus);
-                jacobian_delta_q_over_angle.change_entry_value(jbus,ibus, der);
+                ibus = Y.get_row_number_of_entry_index(k);
+                if(ibus<=jbus)
+                {
+                    if(ibus<jbus)
+                    {
+                        der = get_jacobian_delta_q_over_angle_of_internal_bus(ibus,jbus);
+                        jacobian_delta_q_over_angle.change_entry_value(ibus,jbus, der);
+                        der = get_jacobian_delta_q_over_angle_of_internal_bus(jbus,ibus);
+                        jacobian_delta_q_over_angle.change_entry_value(jbus,ibus, der);
+                    }
+                    else
+                    {
+                        der = get_jacobian_delta_q_over_angle_of_internal_bus(jbus,jbus);
+                        jacobian_delta_q_over_angle.change_entry_value(jbus,jbus, der);
+                    }
+                }
+                else//>
+                    break;
             }
+            k_start = k_end;
         }
-        k_start = k_end;
-    }
-    return;
+        return;
 
-    for(size_t i=0; i!=nbus; ++i)
-    {
-        for(size_t j=0; j!=nbus; ++j)
+        for(size_t i=0; i!=nbus; ++i)
         {
-            if(i==j)
-            {
-                der = get_jacobian_delta_q_over_angle_of_internal_bus(i,i);
-                jacobian_delta_q_over_angle.change_entry_value(i,i, der);
-            }
-            else
+            for(size_t j=0; j!=nbus; ++j)
             {
-                y = Y.get_entry_value(i,j);
-                if(y!=0.0)
+                if(i!=j)
                 {
-                    der = get_jacobian_delta_q_over_angle_of_internal_bus(i,j);
-                    jacobian_delta_q_over_angle.change_entry_value(i,j, der);
+                    y = Y.get_entry_value(i,j);
+                    if(y!=0.0)
+                    {
+                        der = get_jacobian_delta_q_over_angle_of_internal_bus(i,j);
+                        jacobian_delta_q_over_angle.change_entry_value(i,j, der);
+                    }
+                }
+                else
+                {
+                    der = get_jacobian_delta_q_over_angle_of_internal_bus(i,i);
+                    jacobian_delta_q_over_angle.change_entry_value(i,i, der);
                 }
             }
         }
@@ -312,60 +337,65 @@ void JACOBIAN_BUILDER::update_jacobian_delta_q_over_angle()
 
 void JACOBIAN_BUILDER::update_jacobian_delta_q_over_voltage()
 {
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
-
-    size_t nbus = psdb.get_in_service_bus_count();
-    double der;
-    complex<double> y;
+    if(is_network_matrix_set())
+    {
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
 
+        size_t nbus = psdb.get_in_service_bus_count();
+        double der;
+        complex<double> y;
 
-    int k_start, k_end;
-    k_start = 0;
-    size_t ibus;
-    for(size_t jbus = 0; jbus!=nbus; ++jbus)
-    {
-        k_end = Y.get_starting_index_of_column(jbus+1);
-        for(int k=k_start; k!=k_end; ++k)
+        int k_start, k_end;
+        k_start = 0;
+        size_t ibus;
+        for(size_t jbus = 0; jbus!=nbus; ++jbus)
         {
-            ibus = Y.get_row_number_of_entry_index(k);
-            if(ibus>jbus)
-                break;
-            if(ibus==jbus)
+            k_end = Y.get_starting_index_of_column(jbus+1);
+            for(int k=k_start; k!=k_end; ++k)
             {
-                der = get_jacobian_delta_q_over_voltage_of_internal_bus(jbus,jbus);
-                jacobian_delta_q_over_voltage.change_entry_value(jbus,jbus, der);
-            }
-            else
-            {
-                der = get_jacobian_delta_q_over_voltage_of_internal_bus(ibus,jbus);
-                jacobian_delta_q_over_voltage.change_entry_value(ibus,jbus, der);
-                der = get_jacobian_delta_q_over_voltage_of_internal_bus(jbus,ibus);
-                jacobian_delta_q_over_voltage.change_entry_value(jbus,ibus, der);
+                ibus = Y.get_row_number_of_entry_index(k);
+                if(ibus<=jbus)
+                {
+                    if(ibus<jbus)
+                    {
+                        der = get_jacobian_delta_q_over_voltage_of_internal_bus(ibus,jbus);
+                        jacobian_delta_q_over_voltage.change_entry_value(ibus,jbus, der);
+                        der = get_jacobian_delta_q_over_voltage_of_internal_bus(jbus,ibus);
+                        jacobian_delta_q_over_voltage.change_entry_value(jbus,ibus, der);
+                    }
+                    else
+                    {
+                        der = get_jacobian_delta_q_over_voltage_of_internal_bus(jbus,jbus);
+                        jacobian_delta_q_over_voltage.change_entry_value(jbus,jbus, der);
+                    }
+                }
+                else//>
+                    break;
             }
+            k_start = k_end;
         }
-        k_start = k_end;
-    }
-    return;
+        return;
 
-    for(size_t i=0; i!=nbus; ++i)
-    {
-        for(size_t j=0; j!=nbus; ++j)
+        for(size_t i=0; i!=nbus; ++i)
         {
-            if(i==j)
+            for(size_t j=0; j!=nbus; ++j)
             {
-                der = get_jacobian_delta_q_over_voltage_of_internal_bus(i,i);
-                jacobian_delta_q_over_voltage.change_entry_value(i,i, der);
-            }
-            else
-            {
-                y = Y.get_entry_value(i,j);
-                if(y!=0.0)
+                if(i!=j)
+                {
+                    y = Y.get_entry_value(i,j);
+                    if(y!=0.0)
+                    {
+                        der = get_jacobian_delta_q_over_voltage_of_internal_bus(i,j);
+                        jacobian_delta_q_over_voltage.change_entry_value(i,j, der);
+                    }
+                }
+                else
                 {
-                    der = get_jacobian_delta_q_over_voltage_of_internal_bus(i,j);
-                    jacobian_delta_q_over_voltage.change_entry_value(i,j, der);
+                    der = get_jacobian_delta_q_over_voltage_of_internal_bus(i,i);
+                    jacobian_delta_q_over_voltage.change_entry_value(i,i, der);
                 }
             }
         }
@@ -374,370 +404,380 @@ void JACOBIAN_BUILDER::update_jacobian_delta_q_over_voltage()
 
 double JACOBIAN_BUILDER::get_jacobian_delta_p_over_angle_of_internal_bus(size_t ibus, size_t jbus)
 {
-    if(not is_network_matrix_set())
-        return 0.0;
-
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
+    if(is_network_matrix_set())
+    {
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    size_t IBUS = nw_db->get_physical_bus_number_of_internal_bus(ibus), JBUS;
-    complex<double> Vi = psdb.get_bus_complex_voltage_in_pu(IBUS), Vj;
-    complex<double> y;
-    double g, b;
-    double Vim, Vjm, anglei, anglej, dangle;
+        size_t IBUS = nw_db->get_physical_bus_number_of_internal_bus(ibus), JBUS;
+        complex<double> Vi = psdb.get_bus_complex_voltage_in_pu(IBUS), Vj;
+        complex<double> y;
+        double g, b;
+        double Vim, Vjm, anglei, anglej, dangle;
 
-    Vim = steps_fast_complex_abs(Vi);
-    anglei = steps_fast_complex_arg(Vi);
+        Vim = steps_fast_complex_abs(Vi);
+        anglei = steps_fast_complex_arg(Vi);
 
-    double der = 0.0;
+        double der = 0.0;
 
-    if(ibus!=jbus)
-    {
-        y = Y.get_entry_value(ibus, jbus);
-        if(y!=0.0)
+        if(ibus!=jbus)
         {
-            JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
-            Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
-            Vjm = steps_fast_complex_abs(Vj);
-            anglej = steps_fast_complex_arg(Vj);
-            g = y.real();
-            b = y.imag();
-            dangle = anglei - anglej;
-            der = -Vim*Vjm*(g*sin(dangle)-b*cos(dangle));
+            y = Y.get_entry_value(ibus, jbus);
+            if(y!=0.0)
+            {
+                JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
+                Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
+                Vjm = steps_fast_complex_abs(Vj);
+                anglej = steps_fast_complex_arg(Vj);
+                g = y.real();
+                b = y.imag();
+                dangle = anglei - anglej;
+                der = -Vim*Vjm*(g*sin(dangle)-b*cos(dangle));
+            }
         }
-    }
-    else
-    {
-        int k_start = Y.get_starting_index_of_column(ibus);
-        int k_end = Y.get_starting_index_of_column(ibus+1);
-        for(int k=k_start; k!=k_end; ++k)
+        else
         {
-            jbus = Y.get_row_number_of_entry_index(k);
+            int k_start = Y.get_starting_index_of_column(ibus);
+            int k_end = Y.get_starting_index_of_column(ibus+1);
+            for(int k=k_start; k!=k_end; ++k)
+            {
+                jbus = Y.get_row_number_of_entry_index(k);
 
-            y = Y.get_entry_value(ibus, jbus);
-            if(y==0.0)
-                continue;
-
-            if(ibus == jbus)
-                continue;
-
-            JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
-            Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
-            Vjm = steps_fast_complex_abs(Vj);
-            anglej = steps_fast_complex_arg(Vj);
-            g = y.real();
-            b = y.imag();
-            dangle = anglei - anglej;
-            der += Vjm*(g*sin(dangle)-b*cos(dangle));
+                y = Y.get_entry_value(ibus, jbus);
+                if(y!=0.0 and ibus != jbus)
+                {
+                    JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
+                    Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
+                    Vjm = steps_fast_complex_abs(Vj);
+                    anglej = steps_fast_complex_arg(Vj);
+                    g = y.real();
+                    b = y.imag();
+                    dangle = anglei - anglej;
+                    der += Vjm*(g*sin(dangle)-b*cos(dangle));
+                }
+            }
+            der *= Vim;
         }
-        der *= Vim;
+        return der;
     }
-    return der;
+    else
+        return 0.0;
 }
 
 double JACOBIAN_BUILDER::get_jacobian_delta_p_over_voltage_of_internal_bus(size_t ibus, size_t jbus)
 {
-    if(not is_network_matrix_set())
-        return 0.0;
-
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
+    if(is_network_matrix_set())
+    {
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    size_t IBUS = nw_db->get_physical_bus_number_of_internal_bus(ibus), JBUS;
-    complex<double> Vi = psdb.get_bus_complex_voltage_in_pu(IBUS), Vj;
-    complex<double> y;
-    double g, b;
-    double Vim, Vjm, anglei, anglej, dangle;
+        size_t IBUS = nw_db->get_physical_bus_number_of_internal_bus(ibus), JBUS;
+        complex<double> Vi = psdb.get_bus_complex_voltage_in_pu(IBUS), Vj;
+        complex<double> y;
+        double g, b;
+        double Vim, Vjm, anglei, anglej, dangle;
 
-    Vim = steps_fast_complex_abs(Vi);
-    anglei = steps_fast_complex_arg(Vi);
+        Vim = steps_fast_complex_abs(Vi);
+        anglei = steps_fast_complex_arg(Vi);
 
-    double der = 0.0;
+        double der = 0.0;
 
-    if(ibus!=jbus)
-    {
-        y = Y.get_entry_value(ibus, jbus);
-        if(y!=0.0)
+        if(ibus!=jbus)
         {
-            JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
-            Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
-            Vjm = steps_fast_complex_abs(Vj);
-            anglej = steps_fast_complex_arg(Vj);
-            g = y.real();
-            b = y.imag();
-            dangle = anglei - anglej;
-            der = -Vim*(g*cos(dangle)+b*sin(dangle));
+            y = Y.get_entry_value(ibus, jbus);
+            if(y!=0.0)
+            {
+                JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
+                Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
+                Vjm = steps_fast_complex_abs(Vj);
+                anglej = steps_fast_complex_arg(Vj);
+                g = y.real();
+                b = y.imag();
+                dangle = anglei - anglej;
+                der = -Vim*(g*cos(dangle)+b*sin(dangle));
+            }
         }
-    }
-    else
-    {
-        int k_start = Y.get_starting_index_of_column(ibus);
-        int k_end = Y.get_starting_index_of_column(ibus+1);
-        for(int k=k_start; k!=k_end; ++k)
+        else
         {
-            jbus = Y.get_row_number_of_entry_index(k);
+            int k_start = Y.get_starting_index_of_column(ibus);
+            int k_end = Y.get_starting_index_of_column(ibus+1);
+            for(int k=k_start; k!=k_end; ++k)
+            {
+                jbus = Y.get_row_number_of_entry_index(k);
 
-            y = Y.get_entry_value(ibus, jbus);
-            if(y==0.0)
-                continue;
-
-            JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
-            Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
-            Vjm = steps_fast_complex_abs(Vj);
-            anglej = steps_fast_complex_arg(Vj);
-            g = y.real();
-            b = y.imag();
-            dangle = anglei - anglej;
-
-            if(ibus == jbus)
-                der -= 2.0*Vim*g;
-            else
-                der -= Vjm*(g*cos(dangle)+b*sin(dangle));
+                y = Y.get_entry_value(ibus, jbus);
+                if(y!=0.0)
+                {
+                    JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
+                    Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
+                    Vjm = steps_fast_complex_abs(Vj);
+                    anglej = steps_fast_complex_arg(Vj);
+                    g = y.real();
+                    b = y.imag();
+                    dangle = anglei - anglej;
+
+                    if(ibus != jbus)
+                        der -= Vjm*(g*cos(dangle)+b*sin(dangle));
+                    else
+                        der -= 2.0*Vim*g;
+                }
+            }
         }
+        return der;
     }
-    return der;
+    else
+        return 0.0;
 }
 
 double JACOBIAN_BUILDER::get_jacobian_delta_q_over_angle_of_internal_bus(size_t ibus, size_t jbus)
 {
-    if(not is_network_matrix_set())
-        return 0.0;
-
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
+    if(is_network_matrix_set())
+    {
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    size_t IBUS = nw_db->get_physical_bus_number_of_internal_bus(ibus), JBUS;
-    complex<double> Vi = psdb.get_bus_complex_voltage_in_pu(IBUS), Vj;
-    complex<double> y;
-    double g, b;
-    double Vim, Vjm, anglei, anglej, dangle;
+        size_t IBUS = nw_db->get_physical_bus_number_of_internal_bus(ibus), JBUS;
+        complex<double> Vi = psdb.get_bus_complex_voltage_in_pu(IBUS), Vj;
+        complex<double> y;
+        double g, b;
+        double Vim, Vjm, anglei, anglej, dangle;
 
-    Vim = steps_fast_complex_abs(Vi);
-    anglei = steps_fast_complex_arg(Vi);
+        Vim = steps_fast_complex_abs(Vi);
+        anglei = steps_fast_complex_arg(Vi);
 
-    double der = 0.0;
+        double der = 0.0;
 
-    if(ibus!=jbus)
-    {
-        y = Y.get_entry_value(ibus, jbus);
-        if(y!=0.0)
+        if(ibus!=jbus)
         {
-            JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
-            Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
-            Vjm = steps_fast_complex_abs(Vj);
-            anglej = steps_fast_complex_arg(Vj);
-            g = y.real();
-            b = y.imag();
-            dangle = anglei - anglej;
-            der = Vim*Vjm*(g*cos(dangle)+b*sin(dangle));
+            y = Y.get_entry_value(ibus, jbus);
+            if(y!=0.0)
+            {
+                JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
+                Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
+                Vjm = steps_fast_complex_abs(Vj);
+                anglej = steps_fast_complex_arg(Vj);
+                g = y.real();
+                b = y.imag();
+                dangle = anglei - anglej;
+                der = Vim*Vjm*(g*cos(dangle)+b*sin(dangle));
+            }
         }
-    }
-    else
-    {
-        int k_start = Y.get_starting_index_of_column(ibus);
-        int k_end = Y.get_starting_index_of_column(ibus+1);
-        for(int k=k_start; k!=k_end; ++k)
+        else
         {
-            jbus = Y.get_row_number_of_entry_index(k);
+            int k_start = Y.get_starting_index_of_column(ibus);
+            int k_end = Y.get_starting_index_of_column(ibus+1);
+            for(int k=k_start; k!=k_end; ++k)
+            {
+                jbus = Y.get_row_number_of_entry_index(k);
 
-            y = Y.get_entry_value(ibus, jbus);
-            if(y==0.0)
-                continue;
-
-            if(ibus == jbus)
-                continue;
-
-            JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
-            Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
-            Vjm = steps_fast_complex_abs(Vj);
-            anglej = steps_fast_complex_arg(Vj);
-            g = y.real();
-            b = y.imag();
-            dangle = anglei - anglej;
-            der -= Vjm*(g*cos(dangle)+b*sin(dangle));
+                y = Y.get_entry_value(ibus, jbus);
+                if(y!=0.0 and ibus != jbus)
+                {
+                    JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
+                    Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
+                    Vjm = steps_fast_complex_abs(Vj);
+                    anglej = steps_fast_complex_arg(Vj);
+                    g = y.real();
+                    b = y.imag();
+                    dangle = anglei - anglej;
+                    der -= Vjm*(g*cos(dangle)+b*sin(dangle));
+                }
+            }
+            der *= Vim;
         }
-        der *= Vim;
+        return der;
     }
-    return der;
+    else
+        return 0.0;
 }
 
 double JACOBIAN_BUILDER::get_jacobian_delta_q_over_voltage_of_internal_bus(size_t ibus, size_t jbus)
 {
-    if(not is_network_matrix_set())
-        return 0.0;
-
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
+    if(is_network_matrix_set())
+    {
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        const STEPS_SPARSE_MATRIX& Y = nw_db->get_network_matrix();
 
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    size_t IBUS = nw_db->get_physical_bus_number_of_internal_bus(ibus), JBUS;
-    complex<double> Vi = psdb.get_bus_complex_voltage_in_pu(IBUS), Vj;
-    complex<double> y;
-    double g, b;
-    double Vim, Vjm, anglei, anglej, dangle;
+        size_t IBUS = nw_db->get_physical_bus_number_of_internal_bus(ibus), JBUS;
+        complex<double> Vi = psdb.get_bus_complex_voltage_in_pu(IBUS), Vj;
+        complex<double> y;
+        double g, b;
+        double Vim, Vjm, anglei, anglej, dangle;
 
-    Vim = steps_fast_complex_abs(Vi);
-    anglei = steps_fast_complex_arg(Vi);
+        Vim = steps_fast_complex_abs(Vi);
+        anglei = steps_fast_complex_arg(Vi);
 
-    double der = 0.0;
+        double der = 0.0;
 
-    if(ibus!=jbus)
-    {
-        y = Y.get_entry_value(ibus, jbus);
-        if(y!=0.0)
+        if(ibus!=jbus)
         {
-            JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
-            Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
-            Vjm = steps_fast_complex_abs(Vj);
-            anglej = steps_fast_complex_arg(Vj);
-            g = y.real();
-            b = y.imag();
-            dangle = anglei - anglej;
-            der = -Vim*(g*sin(dangle)-b*cos(dangle));
+            y = Y.get_entry_value(ibus, jbus);
+            if(y!=0.0)
+            {
+                JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
+                Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
+                Vjm = steps_fast_complex_abs(Vj);
+                anglej = steps_fast_complex_arg(Vj);
+                g = y.real();
+                b = y.imag();
+                dangle = anglei - anglej;
+                der = -Vim*(g*sin(dangle)-b*cos(dangle));
+            }
         }
-    }
-    else
-    {
-        int k_start = Y.get_starting_index_of_column(ibus);
-        int k_end = Y.get_starting_index_of_column(ibus+1);
-        for(int k=k_start; k!=k_end; ++k)
+        else
         {
-            jbus = Y.get_row_number_of_entry_index(k);
+            int k_start = Y.get_starting_index_of_column(ibus);
+            int k_end = Y.get_starting_index_of_column(ibus+1);
+            for(int k=k_start; k!=k_end; ++k)
+            {
+                jbus = Y.get_row_number_of_entry_index(k);
 
-            y = Y.get_entry_value(ibus, jbus);
-            if(y==0.0)
-                continue;
-
-            JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
-            Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
-            Vjm = steps_fast_complex_abs(Vj);
-            anglej = steps_fast_complex_arg(Vj);
-            g = y.real();
-            b = y.imag();
-            dangle = anglei - anglej;
-
-            if(ibus == jbus)
-                der += 2.0*Vim*b;
-            else
-                der -= Vjm*(g*sin(dangle)-b*cos(dangle));
+                y = Y.get_entry_value(ibus, jbus);
+                if(y!=0.0)
+                {
+                    JBUS = nw_db->get_physical_bus_number_of_internal_bus(jbus);
+                    Vj = psdb.get_bus_complex_voltage_in_pu(JBUS);
+                    Vjm = steps_fast_complex_abs(Vj);
+                    anglej = steps_fast_complex_arg(Vj);
+                    g = y.real();
+                    b = y.imag();
+                    dangle = anglei - anglej;
+
+                    if(ibus != jbus)
+                        der -= Vjm*(g*sin(dangle)-b*cos(dangle));
+                    else
+                        der += 2.0*Vim*b;
+                }
+            }
         }
+        return der;
     }
-    return der;
+    else
+        return 0.0;
 }
 
 double JACOBIAN_BUILDER::get_jacobian_delta_p_over_angle_of_physical_bus(size_t ibus, size_t jbus)
 {
-    if(not is_network_matrix_set())
-        return 0.0;
+    if(is_network_matrix_set())
+    {
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        if(psdb.is_bus_exist(ibus) and psdb.is_bus_exist(jbus))
+        {
+            size_t ibus_internal = nw_db->get_internal_bus_number_of_physical_bus(ibus);
+            size_t jbus_internal = nw_db->get_internal_bus_number_of_physical_bus(jbus);
 
-    if(psdb.is_bus_exist(ibus) and psdb.is_bus_exist(jbus))
-    {
-        size_t ibus_internal = nw_db->get_internal_bus_number_of_physical_bus(ibus);
-        size_t jbus_internal = nw_db->get_internal_bus_number_of_physical_bus(jbus);
+            return get_jacobian_delta_p_over_angle_of_internal_bus(ibus_internal, jbus_internal);
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Either physical bus "<<ibus<<" or "<<jbus<<" doesn't exist when getting jacobian of delta P over bus angle.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
 
-        return get_jacobian_delta_p_over_angle_of_internal_bus(ibus_internal, jbus_internal);
+            return 0.0;
+        }
     }
     else
-    {
-        ostringstream osstream;
-        osstream<<"Either physical bus "<<ibus<<" or "<<jbus<<" doesn't exist when getting jacobian of delta P over bus angle.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-
         return 0.0;
-    }
 }
 
 double JACOBIAN_BUILDER::get_jacobian_delta_p_over_voltage_of_physical_bus(size_t ibus, size_t jbus)
 {
-    if(not is_network_matrix_set())
-        return 0.0;
+    if(is_network_matrix_set())
+    {
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        if(psdb.is_bus_exist(ibus) and psdb.is_bus_exist(jbus))
+        {
+            size_t ibus_internal = nw_db->get_internal_bus_number_of_physical_bus(ibus);
+            size_t jbus_internal = nw_db->get_internal_bus_number_of_physical_bus(jbus);
 
-    if(psdb.is_bus_exist(ibus) and psdb.is_bus_exist(jbus))
-    {
-        size_t ibus_internal = nw_db->get_internal_bus_number_of_physical_bus(ibus);
-        size_t jbus_internal = nw_db->get_internal_bus_number_of_physical_bus(jbus);
+            return get_jacobian_delta_p_over_voltage_of_internal_bus(ibus_internal, jbus_internal);
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Either physical bus "<<ibus<<" or "<<jbus<<" doesn't exist when getting jacobian of delta P over bus voltage.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
 
-        return get_jacobian_delta_p_over_voltage_of_internal_bus(ibus_internal, jbus_internal);
+            return 0.0;
+        }
     }
     else
-    {
-        ostringstream osstream;
-        osstream<<"Either physical bus "<<ibus<<" or "<<jbus<<" doesn't exist when getting jacobian of delta P over bus voltage.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-
         return 0.0;
-    }
 }
 
 double JACOBIAN_BUILDER::get_jacobian_delta_q_over_angle_of_physical_bus(size_t ibus, size_t jbus)
 {
-    if(not is_network_matrix_set())
-        return 0.0;
+    if(is_network_matrix_set())
+    {
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        if(psdb.is_bus_exist(ibus) and psdb.is_bus_exist(jbus))
+        {
+            size_t ibus_internal = nw_db->get_internal_bus_number_of_physical_bus(ibus);
+            size_t jbus_internal = nw_db->get_internal_bus_number_of_physical_bus(jbus);
 
-    if(psdb.is_bus_exist(ibus) and psdb.is_bus_exist(jbus))
-    {
-        size_t ibus_internal = nw_db->get_internal_bus_number_of_physical_bus(ibus);
-        size_t jbus_internal = nw_db->get_internal_bus_number_of_physical_bus(jbus);
+            return get_jacobian_delta_q_over_angle_of_internal_bus(ibus_internal, jbus_internal);
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Either physical bus "<<ibus<<" or "<<jbus<<" doesn't exist when getting jacobian of delta Q over bus angle.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
 
-        return get_jacobian_delta_q_over_angle_of_internal_bus(ibus_internal, jbus_internal);
+            return 0.0;
+        }
     }
     else
-    {
-        ostringstream osstream;
-        osstream<<"Either physical bus "<<ibus<<" or "<<jbus<<" doesn't exist when getting jacobian of delta Q over bus angle.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-
         return 0.0;
-    }
 }
 
 double JACOBIAN_BUILDER::get_jacobian_delta_q_over_voltage_of_physical_bus(size_t ibus, size_t jbus)
 {
-    if(not is_network_matrix_set())
-        return 0.0;
+    if(is_network_matrix_set())
+    {
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        if(psdb.is_bus_exist(ibus) and psdb.is_bus_exist(jbus))
+        {
+            size_t ibus_internal = nw_db->get_internal_bus_number_of_physical_bus(ibus);
+            size_t jbus_internal = nw_db->get_internal_bus_number_of_physical_bus(jbus);
 
-    if(psdb.is_bus_exist(ibus) and psdb.is_bus_exist(jbus))
-    {
-        size_t ibus_internal = nw_db->get_internal_bus_number_of_physical_bus(ibus);
-        size_t jbus_internal = nw_db->get_internal_bus_number_of_physical_bus(jbus);
+            return get_jacobian_delta_q_over_voltage_of_internal_bus(ibus_internal, jbus_internal);
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Either physical bus "<<ibus<<" or "<<jbus<<" doesn't exist when getting jacobian of delta Q over bus voltage.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
 
-        return get_jacobian_delta_q_over_voltage_of_internal_bus(ibus_internal, jbus_internal);
+            return 0.0;
+        }
     }
     else
-    {
-        ostringstream osstream;
-        osstream<<"Either physical bus "<<ibus<<" or "<<jbus<<" doesn't exist when getting jacobian of delta Q over bus voltage.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-
         return 0.0;
-    }
 }
 
 STEPS_SPARSE_MATRIX& JACOBIAN_BUILDER::get_full_coupled_jacobian_with_P_and_Q_equation_internal_buses(
@@ -1067,243 +1107,246 @@ STEPS_SPARSE_MATRIX& JACOBIAN_BUILDER::get_decoupled_B_jacobian_with_Q_equation_
 
 void JACOBIAN_BUILDER::show_seprate_jacobians()
 {
-    if(not is_network_matrix_set())
-        return;
-
-    NETWORK_MATRIX* nw_db = get_network_matrix();
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+    if(is_network_matrix_set())
+    {
+        NETWORK_MATRIX* nw_db = get_network_matrix();
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    size_t MAX_ENTRIES_TO_SHOW = 50;
+        size_t MAX_ENTRIES_TO_SHOW = 50;
 
-    ostringstream osstream;
-    int row, col;
-    size_t row_bus, col_bus;
-    complex<double> cvalue;
-    double rvalue;
+        ostringstream osstream;
+        int row, col;
+        size_t row_bus, col_bus;
+        complex<double> cvalue;
+        double rvalue;
+
+        int nentry = jacobian_delta_p_over_angle.get_matrix_entry_count();
+        size_t entries_to_show = MAX_ENTRIES_TO_SHOW;
+        if(entries_to_show > size_t(nentry))
+            entries_to_show = size_t(nentry);
+        if(entries_to_show == 1)
+            entries_to_show = 0;
+
+        osstream<<"The first "<<entries_to_show<<" JACOBIAN_BUILDER entries of P over angle are:"<<endl
+          <<"row      row_bus  column   col_bus  value";
+        toolkit.show_information_with_leading_time_stamp(osstream);
 
-    int nentry = jacobian_delta_p_over_angle.get_matrix_entry_count();
-    size_t entries_to_show = MAX_ENTRIES_TO_SHOW;
-    if(entries_to_show > size_t(nentry))
-        entries_to_show = size_t(nentry);
-    if(entries_to_show == 1)
-        entries_to_show = 0;
+        for(size_t k=0; k!=entries_to_show; ++k)
+        {
+            row = jacobian_delta_p_over_angle.get_row_number_of_entry_index(k);
+            col = jacobian_delta_p_over_angle.get_column_number_of_entry_index(k);
 
-    osstream<<"The first "<<entries_to_show<<" JACOBIAN_BUILDER entries of P over angle are:"<<endl
-      <<"row      row_bus  column   col_bus  value";
-    toolkit.show_information_with_leading_time_stamp(osstream);
+            row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
+            col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
 
-    for(size_t k=0; k!=entries_to_show; ++k)
-    {
-        row = jacobian_delta_p_over_angle.get_row_number_of_entry_index(k);
-        col = jacobian_delta_p_over_angle.get_column_number_of_entry_index(k);
+            cvalue = jacobian_delta_p_over_angle.get_entry_value(k);
+            rvalue = cvalue.real();
 
-        row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
-        col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
+            osstream<<setw(8)<<row<<" "
+              <<setw(8)<<row_bus<<" "
+              <<setw(8)<<col<<" "
+              <<setw(8)<<col_bus<<" "
+              <<setw(10)<<setprecision(6)<<fixed<<rvalue;
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
 
-        cvalue = jacobian_delta_p_over_angle.get_entry_value(k);
-        rvalue = cvalue.real();
+        nentry = jacobian_delta_p_over_voltage.get_matrix_entry_count();
+        entries_to_show = MAX_ENTRIES_TO_SHOW;
+        if(entries_to_show > size_t(nentry))
+            entries_to_show = size_t(nentry);
+        if(entries_to_show == 1)
+            entries_to_show = 0;
 
-        osstream<<setw(8)<<row<<" "
-          <<setw(8)<<row_bus<<" "
-          <<setw(8)<<col<<" "
-          <<setw(8)<<col_bus<<" "
-          <<setw(10)<<setprecision(6)<<fixed<<rvalue;
+        osstream<<"The first "<<entries_to_show<<" JACOBIAN_BUILDER entries of P over voltage are:"<<endl
+          <<"row      row_bus  column   col_bus  value";
         toolkit.show_information_with_leading_time_stamp(osstream);
-    }
 
-    nentry = jacobian_delta_p_over_voltage.get_matrix_entry_count();
-    entries_to_show = MAX_ENTRIES_TO_SHOW;
-    if(entries_to_show > size_t(nentry))
-        entries_to_show = size_t(nentry);
-    if(entries_to_show == 1)
-        entries_to_show = 0;
+        for(size_t k=0; k!=entries_to_show; ++k)
+        {
+            row = jacobian_delta_p_over_voltage.get_row_number_of_entry_index(k);
+            col = jacobian_delta_p_over_voltage.get_column_number_of_entry_index(k);
 
-    osstream<<"The first "<<entries_to_show<<" JACOBIAN_BUILDER entries of P over voltage are:"<<endl
-      <<"row      row_bus  column   col_bus  value";
-    toolkit.show_information_with_leading_time_stamp(osstream);
+            row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
+            col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
 
-    for(size_t k=0; k!=entries_to_show; ++k)
-    {
-        row = jacobian_delta_p_over_voltage.get_row_number_of_entry_index(k);
-        col = jacobian_delta_p_over_voltage.get_column_number_of_entry_index(k);
+            cvalue = jacobian_delta_p_over_voltage.get_entry_value(k);
+            rvalue = cvalue.real();
 
-        row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
-        col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
+            osstream<<setw(8)<<row<<" "
+              <<setw(8)<<row_bus<<" "
+              <<setw(8)<<col<<" "
+              <<setw(8)<<col_bus<<" "
+              <<setw(10)<<setprecision(6)<<fixed<<rvalue;
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
 
-        cvalue = jacobian_delta_p_over_voltage.get_entry_value(k);
-        rvalue = cvalue.real();
+        nentry = jacobian_delta_q_over_angle.get_matrix_entry_count();
+        entries_to_show = MAX_ENTRIES_TO_SHOW;
+        if(entries_to_show > size_t(nentry))
+            entries_to_show = size_t(nentry);
+        if(entries_to_show == 1)
+            entries_to_show = 0;
 
-        osstream<<setw(8)<<row<<" "
-          <<setw(8)<<row_bus<<" "
-          <<setw(8)<<col<<" "
-          <<setw(8)<<col_bus<<" "
-          <<setw(10)<<setprecision(6)<<fixed<<rvalue;
+        osstream<<"The first "<<entries_to_show<<" JACOBIAN_BUILDER entries of Q over angle are:"<<endl
+          <<"row      row_bus  column   col_bus  value";
         toolkit.show_information_with_leading_time_stamp(osstream);
-    }
 
-    nentry = jacobian_delta_q_over_angle.get_matrix_entry_count();
-    entries_to_show = MAX_ENTRIES_TO_SHOW;
-    if(entries_to_show > size_t(nentry))
-        entries_to_show = size_t(nentry);
-    if(entries_to_show == 1)
-        entries_to_show = 0;
+        for(size_t k=0; k!=entries_to_show; ++k)
+        {
+            row = jacobian_delta_q_over_angle.get_row_number_of_entry_index(k);
+            col = jacobian_delta_q_over_angle.get_column_number_of_entry_index(k);
 
-    osstream<<"The first "<<entries_to_show<<" JACOBIAN_BUILDER entries of Q over angle are:"<<endl
-      <<"row      row_bus  column   col_bus  value";
-    toolkit.show_information_with_leading_time_stamp(osstream);
+            row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
+            col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
 
-    for(size_t k=0; k!=entries_to_show; ++k)
-    {
-        row = jacobian_delta_q_over_angle.get_row_number_of_entry_index(k);
-        col = jacobian_delta_q_over_angle.get_column_number_of_entry_index(k);
+            cvalue = jacobian_delta_q_over_angle.get_entry_value(k);
+            rvalue = cvalue.real();
 
-        row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
-        col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
+            osstream<<setw(8)<<row<<" "
+              <<setw(8)<<row_bus<<" "
+              <<setw(8)<<col<<" "
+              <<setw(8)<<col_bus<<" "
+              <<setw(10)<<setprecision(6)<<fixed<<rvalue;
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
 
-        cvalue = jacobian_delta_q_over_angle.get_entry_value(k);
-        rvalue = cvalue.real();
+        nentry = jacobian_delta_q_over_voltage.get_matrix_entry_count();
+        entries_to_show = MAX_ENTRIES_TO_SHOW;
+        if(entries_to_show > size_t(nentry))
+            entries_to_show = size_t(nentry);
+        if(entries_to_show == 1)
+            entries_to_show = 0;
 
-        osstream<<setw(8)<<row<<" "
-          <<setw(8)<<row_bus<<" "
-          <<setw(8)<<col<<" "
-          <<setw(8)<<col_bus<<" "
-          <<setw(10)<<setprecision(6)<<fixed<<rvalue;
+        osstream<<"The first "<<entries_to_show<<" JACOBIAN_BUILDER entries of Q over voltage are:"<<endl
+          <<"row      row_bus  column   col_bus  value";
         toolkit.show_information_with_leading_time_stamp(osstream);
-    }
-
-    nentry = jacobian_delta_q_over_voltage.get_matrix_entry_count();
-    entries_to_show = MAX_ENTRIES_TO_SHOW;
-    if(entries_to_show > size_t(nentry))
-        entries_to_show = size_t(nentry);
-    if(entries_to_show == 1)
-        entries_to_show = 0;
-
-    osstream<<"The first "<<entries_to_show<<" JACOBIAN_BUILDER entries of Q over voltage are:"<<endl
-      <<"row      row_bus  column   col_bus  value";
-    toolkit.show_information_with_leading_time_stamp(osstream);
 
-    for(size_t k=0; k!=entries_to_show; ++k)
-    {
-        row = jacobian_delta_q_over_voltage.get_row_number_of_entry_index(k);
-        col = jacobian_delta_q_over_voltage.get_column_number_of_entry_index(k);
+        for(size_t k=0; k!=entries_to_show; ++k)
+        {
+            row = jacobian_delta_q_over_voltage.get_row_number_of_entry_index(k);
+            col = jacobian_delta_q_over_voltage.get_column_number_of_entry_index(k);
 
-        row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
-        col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
+            row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
+            col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
 
-        cvalue = jacobian_delta_q_over_voltage.get_entry_value(k);
-        rvalue = cvalue.real();
+            cvalue = jacobian_delta_q_over_voltage.get_entry_value(k);
+            rvalue = cvalue.real();
 
-        osstream<<setw(8)<<row<<" "
-          <<setw(8)<<row_bus<<" "
-          <<setw(8)<<col<<" "
-          <<setw(8)<<col_bus<<" "
-          <<setw(10)<<setprecision(6)<<fixed<<rvalue;
-        toolkit.show_information_with_leading_time_stamp(osstream);
+            osstream<<setw(8)<<row<<" "
+              <<setw(8)<<row_bus<<" "
+              <<setw(8)<<col<<" "
+              <<setw(8)<<col_bus<<" "
+              <<setw(10)<<setprecision(6)<<fixed<<rvalue;
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
 }
 
 void JACOBIAN_BUILDER::save_jacobian_matrix_to_file(string filename) const
 {
-    if(not is_network_matrix_set())
-        return;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+    if(is_network_matrix_set())
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
 
-    ofstream file;
-    ostringstream osstream;
+        ofstream file;
+        ostringstream osstream;
 
-    file.open(filename);
-    if(not file.is_open())
-    {
-        osstream<<"File '"<<filename<<"' cannot be opened for saving jacobian matrix."<<endl
-          <<"No jacobian matrix will be exported.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    char buffer[1000];
+        file.open(filename);
+        if(file.is_open())
+        {
+            char buffer[1000];
 
-    file<<"ROW_TYPE,COLUMN_TYPE,ROW,ROW_BUS,COLUMN,COLUMN_BUS,VALUE"<<endl;
+            file<<"ROW_TYPE,COLUMN_TYPE,ROW,ROW_BUS,COLUMN,COLUMN_BUS,VALUE"<<endl;
 
-    NETWORK_MATRIX* nw_db = get_network_matrix();
+            NETWORK_MATRIX* nw_db = get_network_matrix();
 
-    int row, col;
-    size_t row_bus, col_bus;
-    complex<double> cvalue;
-    double rvalue;
+            int row, col;
+            size_t row_bus, col_bus;
+            complex<double> cvalue;
+            double rvalue;
 
-    size_t nentry;
-    nentry = (size_t) jacobian_delta_p_over_angle.get_matrix_entry_count();
-    for(size_t k=0; k!=nentry; ++k)
-    {
-        row = jacobian_delta_p_over_angle.get_row_number_of_entry_index(k);
-        col = jacobian_delta_p_over_angle.get_column_number_of_entry_index(k);
+            size_t nentry;
+            nentry = (size_t) jacobian_delta_p_over_angle.get_matrix_entry_count();
+            for(size_t k=0; k!=nentry; ++k)
+            {
+                row = jacobian_delta_p_over_angle.get_row_number_of_entry_index(k);
+                col = jacobian_delta_p_over_angle.get_column_number_of_entry_index(k);
 
-        row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
-        col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
+                row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
+                col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
 
-        cvalue = jacobian_delta_p_over_angle.get_entry_value(k);
-        rvalue = cvalue.real();
+                cvalue = jacobian_delta_p_over_angle.get_entry_value(k);
+                rvalue = cvalue.real();
 
-        /*file<<"P,A,"<<row<<","<<row_bus<<","<<col<<","<<col_bus<<","
-            <<setprecision(6)<<fixed<<rvalue<<endl;*/
-        snprintf(buffer, 1000, "P,A,%d,%lu,%d,%lu,%.6f",row, row_bus, col, col_bus, rvalue);
-        file<<buffer<<endl;
-    }
+                /*file<<"P,A,"<<row<<","<<row_bus<<","<<col<<","<<col_bus<<","
+                    <<setprecision(6)<<fixed<<rvalue<<endl;*/
+                snprintf(buffer, 1000, "P,A,%d,%lu,%d,%lu,%.6f",row, row_bus, col, col_bus, rvalue);
+                file<<buffer<<endl;
+            }
 
-    nentry = (size_t) jacobian_delta_p_over_voltage.get_matrix_entry_count();
-    for(size_t k=0; k!=nentry; ++k)
-    {
-        row = jacobian_delta_p_over_voltage.get_row_number_of_entry_index(k);
-        col = jacobian_delta_p_over_voltage.get_column_number_of_entry_index(k);
+            nentry = (size_t) jacobian_delta_p_over_voltage.get_matrix_entry_count();
+            for(size_t k=0; k!=nentry; ++k)
+            {
+                row = jacobian_delta_p_over_voltage.get_row_number_of_entry_index(k);
+                col = jacobian_delta_p_over_voltage.get_column_number_of_entry_index(k);
 
-        row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
-        col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
+                row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
+                col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
 
-        cvalue = jacobian_delta_p_over_voltage.get_entry_value(k);
-        rvalue = cvalue.real();
+                cvalue = jacobian_delta_p_over_voltage.get_entry_value(k);
+                rvalue = cvalue.real();
 
-        /*file<<"P,V,"<<row<<","<<row_bus<<","<<col<<","<<col_bus<<","
-            <<setprecision(6)<<fixed<<rvalue<<endl;*/
-        snprintf(buffer, 1000, "P,V,%d,%lu,%d,%lu,%.6f",row, row_bus, col, col_bus, rvalue);
-        file<<buffer<<endl;
-    }
+                /*file<<"P,V,"<<row<<","<<row_bus<<","<<col<<","<<col_bus<<","
+                    <<setprecision(6)<<fixed<<rvalue<<endl;*/
+                snprintf(buffer, 1000, "P,V,%d,%lu,%d,%lu,%.6f",row, row_bus, col, col_bus, rvalue);
+                file<<buffer<<endl;
+            }
 
-    nentry = (size_t) jacobian_delta_q_over_angle.get_matrix_entry_count();
-    for(size_t k=0; k!=nentry; ++k)
-    {
-        row = jacobian_delta_q_over_angle.get_row_number_of_entry_index(k);
-        col = jacobian_delta_q_over_angle.get_column_number_of_entry_index(k);
+            nentry = (size_t) jacobian_delta_q_over_angle.get_matrix_entry_count();
+            for(size_t k=0; k!=nentry; ++k)
+            {
+                row = jacobian_delta_q_over_angle.get_row_number_of_entry_index(k);
+                col = jacobian_delta_q_over_angle.get_column_number_of_entry_index(k);
 
-        row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
-        col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
+                row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
+                col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
 
-        cvalue = jacobian_delta_q_over_angle.get_entry_value(k);
-        rvalue = cvalue.real();
+                cvalue = jacobian_delta_q_over_angle.get_entry_value(k);
+                rvalue = cvalue.real();
 
-        /*file<<"Q,A,"<<row<<","<<row_bus<<","<<col<<","<<col_bus<<","
-            <<setprecision(6)<<fixed<<rvalue<<endl;*/
-        snprintf(buffer, 1000, "Q,A,%d,%lu,%d,%lu,%.6f",row, row_bus, col, col_bus, rvalue);
-        file<<buffer<<endl;
-    }
+                /*file<<"Q,A,"<<row<<","<<row_bus<<","<<col<<","<<col_bus<<","
+                    <<setprecision(6)<<fixed<<rvalue<<endl;*/
+                snprintf(buffer, 1000, "Q,A,%d,%lu,%d,%lu,%.6f",row, row_bus, col, col_bus, rvalue);
+                file<<buffer<<endl;
+            }
 
-    nentry = (size_t) jacobian_delta_q_over_voltage.get_matrix_entry_count();
-    for(size_t k=0; k!=nentry; ++k)
-    {
-        row = jacobian_delta_q_over_voltage.get_row_number_of_entry_index(k);
-        col = jacobian_delta_q_over_voltage.get_column_number_of_entry_index(k);
+            nentry = (size_t) jacobian_delta_q_over_voltage.get_matrix_entry_count();
+            for(size_t k=0; k!=nentry; ++k)
+            {
+                row = jacobian_delta_q_over_voltage.get_row_number_of_entry_index(k);
+                col = jacobian_delta_q_over_voltage.get_column_number_of_entry_index(k);
 
-        row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
-        col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
+                row_bus = nw_db->get_physical_bus_number_of_internal_bus(row);
+                col_bus = nw_db->get_physical_bus_number_of_internal_bus(col);
 
-        cvalue = jacobian_delta_q_over_voltage.get_entry_value(k);
-        rvalue = cvalue.real();
+                cvalue = jacobian_delta_q_over_voltage.get_entry_value(k);
+                rvalue = cvalue.real();
 
-        /*file<<"Q,V,"<<row<<","<<row_bus<<","<<col<<","<<col_bus<<","
-            <<setprecision(6)<<fixed<<rvalue<<endl;*/
-        snprintf(buffer, 1000, "Q,V,%d,%lu,%d,%lu,%.6f",row, row_bus, col, col_bus, rvalue);
-        file<<buffer<<endl;
+                /*file<<"Q,V,"<<row<<","<<row_bus<<","<<col<<","<<col_bus<<","
+                    <<setprecision(6)<<fixed<<rvalue<<endl;*/
+                snprintf(buffer, 1000, "Q,V,%d,%lu,%d,%lu,%.6f",row, row_bus, col, col_bus, rvalue);
+                file<<buffer<<endl;
+            }
+            file.close();
+        }
+        else
+        {
+            osstream<<"File '"<<filename<<"' cannot be opened for saving jacobian matrix."<<endl
+              <<"No jacobian matrix will be exported.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            return;
+        }
     }
-    file.close();
 }
 
 bool JACOBIAN_BUILDER::is_valid() const
diff --git a/code/source/network/network_matrix.cpp b/code/source/network/network_matrix.cpp
index 78e1b167..08ae1dad 100644
--- a/code/source/network/network_matrix.cpp
+++ b/code/source/network/network_matrix.cpp
@@ -155,55 +155,55 @@ void NETWORK_MATRIX::add_lines_to_network()
 
 void NETWORK_MATRIX::add_line_to_network(const LINE& line)
 {
-    if(line.get_sending_side_breaker_status()==false and line.get_receiving_side_breaker_status()==false)
-        return;
-
-    /*ostringstream osstream;
-    osstream<<"Adding line '%s' connecting to bus %u and %u to network Y matrix.", (line.get_identifier()).c_str(),
-                  line.get_sending_side_bus(), line.get_receiving_side_bus());
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    */
+    if(line.get_sending_side_breaker_status()==true or line.get_receiving_side_breaker_status()==true)
+    {
+        /*ostringstream osstream;
+        osstream<<"Adding line '%s' connecting to bus %u and %u to network Y matrix.", (line.get_identifier()).c_str(),
+                      line.get_sending_side_bus(), line.get_receiving_side_bus());
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        */
 
-    size_t sending_bus = line.get_sending_side_bus();
-    size_t receiving_bus = line.get_receiving_side_bus();
+        size_t sending_bus = line.get_sending_side_bus();
+        size_t receiving_bus = line.get_receiving_side_bus();
 
-    size_t i = inphno.get_internal_bus_number_of_physical_bus_number(sending_bus);
-    size_t j = inphno.get_internal_bus_number_of_physical_bus_number(receiving_bus);
+        size_t i = inphno.get_internal_bus_number_of_physical_bus_number(sending_bus);
+        size_t j = inphno.get_internal_bus_number_of_physical_bus_number(receiving_bus);
 
-    complex<double> Zline = line.get_line_positive_sequence_z_in_pu();
-    complex<double> Yline = line.get_line_positive_sequence_y_in_pu();
-    complex<double> Yshunt_sending = line.get_shunt_positive_sequence_y_at_sending_side_in_pu();
-    complex<double> Yshunt_receiving = line.get_shunt_positive_sequence_y_at_receiving_side_in_pu();
+        complex<double> Zline = line.get_line_positive_sequence_z_in_pu();
+        complex<double> Yline = line.get_line_positive_sequence_y_in_pu();
+        complex<double> Yshunt_sending = line.get_shunt_positive_sequence_y_at_sending_side_in_pu();
+        complex<double> Yshunt_receiving = line.get_shunt_positive_sequence_y_at_receiving_side_in_pu();
 
-    complex<double> Y, Z;
-    if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==true)
-    {
-        Y = 1.0/Zline;
+        complex<double> Y, Z;
+        if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==true)
+        {
+            Y = 1.0/Zline;
 
-        network_Y_matrix.add_entry(i,j, -Y);
-        network_Y_matrix.add_entry(j,i, -Y);
-        network_Y_matrix.add_entry(i,i, Y+0.5*Yline+Yshunt_sending);
-        network_Y_matrix.add_entry(j,j, Y+0.5*Yline+Yshunt_receiving);
+            network_Y_matrix.add_entry(i,j, -Y);
+            network_Y_matrix.add_entry(j,i, -Y);
+            network_Y_matrix.add_entry(i,i, Y+0.5*Yline+Yshunt_sending);
+            network_Y_matrix.add_entry(j,j, Y+0.5*Yline+Yshunt_receiving);
 
-        return;
-    }
+            return;
+        }
 
-    if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==false)
-    {
-        Y = 0.5*Yline+Yshunt_receiving;
-        Z = Zline + 1.0/Y;
-        Y = 1.0/Z + 0.5*Yline+Yshunt_sending;
-        network_Y_matrix.add_entry(i,i, Y);
-        return;
-    }
+        if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==false)
+        {
+            Y = 0.5*Yline+Yshunt_receiving;
+            Z = Zline + 1.0/Y;
+            Y = 1.0/Z + 0.5*Yline+Yshunt_sending;
+            network_Y_matrix.add_entry(i,i, Y);
+            return;
+        }
 
-    if(line.get_sending_side_breaker_status()==false and line.get_receiving_side_breaker_status()==true)
-    {
-        Y = 0.5*Yline+Yshunt_sending;
-        Z = Zline + 1.0/Y;
-        Y = 1.0/Z + 0.5*Yline+Yshunt_receiving;
-        network_Y_matrix.add_entry(j,j, Y);
-        return;
+        if(line.get_sending_side_breaker_status()==false and line.get_receiving_side_breaker_status()==true)
+        {
+            Y = 0.5*Yline+Yshunt_sending;
+            Z = Zline + 1.0/Y;
+            Y = 1.0/Z + 0.5*Yline+Yshunt_receiving;
+            network_Y_matrix.add_entry(j,j, Y);
+            return;
+        }
     }
 }
 
@@ -229,598 +229,598 @@ void NETWORK_MATRIX::add_transformer_to_network(const TRANSFORMER& trans)
 
 void NETWORK_MATRIX::add_two_winding_transformer_to_network(const TRANSFORMER& trans)
 {
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and trans.get_winding_breaker_status(SECONDARY_SIDE)==false)
-        return;
-
-    /*ostringstream osstream;
-    osstream<<"Adding two-winding transformer '%s' connecting to bus %u and %u to network Y matrix.", (trans.get_identifier()).c_str(),
-                  trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE));
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    */
+    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true or trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
+    {
+        /*ostringstream osstream;
+        osstream<<"Adding two-winding transformer '%s' connecting to bus %u and %u to network Y matrix.", (trans.get_identifier()).c_str(),
+                      trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE));
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        */
 
-    size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
-    size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
+        size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
+        size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
 
-    size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
-    size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
+        size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
+        size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
 
-    complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
-    complex<double> Ym = trans.get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
+        complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+        complex<double> Ym = trans.get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
 
-    complex<double> Zp, Zs;
-    Zp = 0.5*Zps; Zs = Zp;
+        complex<double> Zp, Zs;
+        Zp = 0.5*Zps; Zs = Zp;
 
-    double tap_primary = trans.get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE);
-    double angle_primary = trans.get_winding_angle_shift_in_deg(PRIMARY_SIDE);
-    angle_primary = deg2rad(angle_primary);
-    double tap_secondary = trans.get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE);
-    double angle_secondary = trans.get_winding_angle_shift_in_deg(SECONDARY_SIDE);
-    angle_secondary = deg2rad(angle_secondary);
+        double tap_primary = trans.get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE);
+        double angle_primary = trans.get_winding_angle_shift_in_deg(PRIMARY_SIDE);
+        angle_primary = deg2rad(angle_primary);
+        double tap_secondary = trans.get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE);
+        double angle_secondary = trans.get_winding_angle_shift_in_deg(SECONDARY_SIDE);
+        angle_secondary = deg2rad(angle_secondary);
 
-    complex<double> kp(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary)),
-                    ks(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
+        complex<double> kp(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary)),
+                        ks(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
 
 
-    complex<double> V, I, Vstar;
-    complex<double> ypp, yps, ysp, yss, Yeq, Zeq;
+        complex<double> V, I, Vstar;
+        complex<double> ypp, yps, ysp, yss, Yeq, Zeq;
 
-    complex<double> kp_store, ks_store, Ym_store;
-    kp_store = kp;
-    ks_store = ks;
-    Ym_store = Ym;
+        complex<double> kp_store, ks_store, Ym_store;
+        kp_store = kp;
+        ks_store = ks;
+        Ym_store = Ym;
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
-    {
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zs;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        ysp = I;
-
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zp;
-        Zeq = Zs + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        yps = I;
-
-        network_Y_matrix.add_entry(p,p,ypp);
-        network_Y_matrix.add_entry(p,s,yps);
-        network_Y_matrix.add_entry(s,p,ysp);
-        network_Y_matrix.add_entry(s,s,yss);
-
-
-        kp = kp/ steps_fast_complex_abs(kp);
-        ks = ks/ steps_fast_complex_abs(ks);
-        Ym = 0.0;
-
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zs;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        ysp = I;
-
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zp;
-        Zeq = Zs + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        yps = I;
-
-        network_BP_matrix.add_entry(p,p,ypp);
-        network_BP_matrix.add_entry(p,s,yps);
-        network_BP_matrix.add_entry(s,p,ysp);
-        network_BP_matrix.add_entry(s,s,yss);
-
-
-        kp = kp_store;
-        ks = ks_store;
-
-        kp = steps_fast_complex_abs(kp);
-        ks = steps_fast_complex_abs(ks);
-        Ym = Ym_store;
-
-        Zp = complex<double>(0.0, Zp.imag());
-        Zs = complex<double>(0.0, Zs.imag());
-        Ym = complex<double>(0.0, Ym.imag());
-
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zs;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        ysp = I;
-
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zp;
-        Zeq = Zs + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        yps = I;
-
-        network_BQ_matrix.add_entry(p,p,ypp);
-        network_BQ_matrix.add_entry(p,s,yps);
-        network_BQ_matrix.add_entry(s,p,ysp);
-        network_BQ_matrix.add_entry(s,s,yss);
-
-
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
+        {
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zs;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            ysp = I;
+
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zp;
+            Zeq = Zs + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            yps = I;
+
+            network_Y_matrix.add_entry(p,p,ypp);
+            network_Y_matrix.add_entry(p,s,yps);
+            network_Y_matrix.add_entry(s,p,ysp);
+            network_Y_matrix.add_entry(s,s,yss);
+
+
+            kp = kp/ steps_fast_complex_abs(kp);
+            ks = ks/ steps_fast_complex_abs(ks);
+            Ym = 0.0;
+
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zs;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            ysp = I;
+
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zp;
+            Zeq = Zs + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            yps = I;
+
+            network_BP_matrix.add_entry(p,p,ypp);
+            network_BP_matrix.add_entry(p,s,yps);
+            network_BP_matrix.add_entry(s,p,ysp);
+            network_BP_matrix.add_entry(s,s,yss);
+
+
+            kp = kp_store;
+            ks = ks_store;
+
+            kp = steps_fast_complex_abs(kp);
+            ks = steps_fast_complex_abs(ks);
+            Ym = Ym_store;
+
+            Zp = complex<double>(0.0, Zp.imag());
+            Zs = complex<double>(0.0, Zs.imag());
+            Ym = complex<double>(0.0, Ym.imag());
+
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zs;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            ysp = I;
+
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zp;
+            Zeq = Zs + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            yps = I;
+
+            network_BQ_matrix.add_entry(p,p,ypp);
+            network_BQ_matrix.add_entry(p,s,yps);
+            network_BQ_matrix.add_entry(s,p,ysp);
+            network_BQ_matrix.add_entry(s,s,yss);
+
+
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==false)
-    {
-        V = 1.0;
-        V = V/kp;
-        Zeq = Zp + 1.0/Ym;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==false)
+        {
+            V = 1.0;
+            V = V/kp;
+            Zeq = Zp + 1.0/Ym;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
 
-        network_Y_matrix.add_entry(p,p,ypp);
+            network_Y_matrix.add_entry(p,p,ypp);
 
-        network_BP_matrix.add_entry(p,p,0.0);
+            network_BP_matrix.add_entry(p,p,0.0);
 
-        kp = steps_fast_complex_abs(kp);
+            kp = steps_fast_complex_abs(kp);
 
-        Zp = complex<double>(0.0, Zp.imag());
-        Zs = complex<double>(0.0, Zs.imag());
-        Ym = complex<double>(0.0, Ym.imag());
+            Zp = complex<double>(0.0, Zp.imag());
+            Zs = complex<double>(0.0, Zs.imag());
+            Ym = complex<double>(0.0, Ym.imag());
 
-        V = 1.0;
-        V = V/kp;
-        Zeq = Zp + 1.0/Ym;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
+            V = 1.0;
+            V = V/kp;
+            Zeq = Zp + 1.0/Ym;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
 
-        network_BQ_matrix.add_entry(p,p,ypp);
-        return;
-    }
+            network_BQ_matrix.add_entry(p,p,ypp);
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
-    {
-        V = 1.0;
-        V = V/ks;
-        Zeq = Zs + 1.0/Ym;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
+        {
+            V = 1.0;
+            V = V/ks;
+            Zeq = Zs + 1.0/Ym;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
 
-        network_Y_matrix.add_entry(s,s,yss);
+            network_Y_matrix.add_entry(s,s,yss);
 
-        network_BP_matrix.add_entry(s,s,0.0);
+            network_BP_matrix.add_entry(s,s,0.0);
 
-        ks = steps_fast_complex_abs(ks);
+            ks = steps_fast_complex_abs(ks);
 
-        Zp = complex<double>(0.0, Zp.imag());
-        Zs = complex<double>(0.0, Zs.imag());
-        Ym = complex<double>(0.0, Ym.imag());
+            Zp = complex<double>(0.0, Zp.imag());
+            Zs = complex<double>(0.0, Zs.imag());
+            Ym = complex<double>(0.0, Ym.imag());
 
-        V = 1.0;
-        V = V/ks;
-        Zeq = Zs + 1.0/Ym;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
+            V = 1.0;
+            V = V/ks;
+            Zeq = Zs + 1.0/Ym;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
 
-        network_BQ_matrix.add_entry(s,s,yss);
-        return;
+            network_BQ_matrix.add_entry(s,s,yss);
+            return;
+        }
     }
 }
 
 void NETWORK_MATRIX::add_three_winding_transformer_to_network(const TRANSFORMER& trans)
 {
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
-        return;
-
-    /*ostringstream osstream;
-    osstream<<"Adding three-winding transformer '%s' connecting to bus %u, %u, and %u to network Y matrix.", (trans.get_identifier()).c_str(),
-                  trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE), trans.get_winding_bus(TERTIARY_SIDE));
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    */
-
-    size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
-    size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
-    size_t tertiary_bus = trans.get_winding_bus(TERTIARY_SIDE);
-
-    size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
-    size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
-    size_t t = inphno.get_internal_bus_number_of_physical_bus_number(tertiary_bus);
-
-    complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
-    complex<double> Zst = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
-    complex<double> Zpt = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
-    complex<double> Ym = trans.get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
-
-    complex<double> Zp = 0.5*(Zps+Zpt-Zst),
-                    Zs = 0.5*(Zps+Zst-Zpt),
-                    Zt = 0.5*(Zpt+Zst-Zps);
-
-    double tap_primary = trans.get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE);
-    double angle_primary = trans.get_winding_angle_shift_in_deg(PRIMARY_SIDE);
-    angle_primary = deg2rad(angle_primary);
-    double tap_secondary = trans.get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE);
-    double angle_secondary = trans.get_winding_angle_shift_in_deg(SECONDARY_SIDE);
-    angle_secondary = deg2rad(angle_secondary);
-    double tap_tertiary = trans.get_winding_off_nominal_turn_ratio_in_pu(TERTIARY_SIDE);
-    double angle_tertiary = trans.get_winding_angle_shift_in_deg(TERTIARY_SIDE);
-    angle_tertiary = deg2rad(angle_tertiary);
-
-    complex<double> kp(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary)),
-                    ks(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary)),
-                    kt(tap_tertiary*cos(angle_tertiary),tap_tertiary*sin(angle_tertiary));
-
-    complex<double> V, I, Vstar;
-    complex<double> ypp, yps, ypt, ysp, yss, yst, ytp, yts, ytt, Yeq, Zeq;
-
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true or
+       trans.get_winding_breaker_status(SECONDARY_SIDE)==true or
        trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
     {
-        // voltage at primary side.
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zs + 1.0/Zt;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        ysp = I;
-
-        I = -Vstar/Zt;
-        I /= conj(kt);
-        ytp = I;
-
-        // voltage at secondary side
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zp + 1.0/Zt;
-        Zeq = Zs + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        yps = I;
-
-        I = -Vstar/Zt;
-        I /= conj(kt);
-        yts = I;
-
-        // voltage at tertiary side
-        V = 1.0;
-        V = V/kt;
-        Yeq = Ym + 1.0/Zp + 1.0/Zs;
-        Zeq = Zt + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kt);
-        ytt = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        ypt = I;
-
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        yst = I;
-
-        network_Y_matrix.add_entry(p,p,ypp);
-        network_Y_matrix.add_entry(p,s,yps);
-        network_Y_matrix.add_entry(p,t,ypt);
-        network_Y_matrix.add_entry(s,p,ysp);
-        network_Y_matrix.add_entry(s,s,yss);
-        network_Y_matrix.add_entry(s,t,yst);
-        network_Y_matrix.add_entry(t,p,ytp);
-        network_Y_matrix.add_entry(t,s,yts);
-        network_Y_matrix.add_entry(t,t,ytt);
-        return;
-    }
+        /*ostringstream osstream;
+        osstream<<"Adding three-winding transformer '%s' connecting to bus %u, %u, and %u to network Y matrix.", (trans.get_identifier()).c_str(),
+                      trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE), trans.get_winding_bus(TERTIARY_SIDE));
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        */
+
+        size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
+        size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
+        size_t tertiary_bus = trans.get_winding_bus(TERTIARY_SIDE);
+
+        size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
+        size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
+        size_t t = inphno.get_internal_bus_number_of_physical_bus_number(tertiary_bus);
+
+        complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+        complex<double> Zst = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
+        complex<double> Zpt = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
+        complex<double> Ym = trans.get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
+
+        complex<double> Zp = 0.5*(Zps+Zpt-Zst),
+                        Zs = 0.5*(Zps+Zst-Zpt),
+                        Zt = 0.5*(Zpt+Zst-Zps);
+
+        double tap_primary = trans.get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE);
+        double angle_primary = trans.get_winding_angle_shift_in_deg(PRIMARY_SIDE);
+        angle_primary = deg2rad(angle_primary);
+        double tap_secondary = trans.get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE);
+        double angle_secondary = trans.get_winding_angle_shift_in_deg(SECONDARY_SIDE);
+        angle_secondary = deg2rad(angle_secondary);
+        double tap_tertiary = trans.get_winding_off_nominal_turn_ratio_in_pu(TERTIARY_SIDE);
+        double angle_tertiary = trans.get_winding_angle_shift_in_deg(TERTIARY_SIDE);
+        angle_tertiary = deg2rad(angle_tertiary);
+
+        complex<double> kp(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary)),
+                        ks(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary)),
+                        kt(tap_tertiary*cos(angle_tertiary),tap_tertiary*sin(angle_tertiary));
+
+        complex<double> V, I, Vstar;
+        complex<double> ypp, yps, ypt, ysp, yss, yst, ytp, yts, ytt, Yeq, Zeq;
+
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
+        {
+            // voltage at primary side.
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zs + 1.0/Zt;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            ysp = I;
+
+            I = -Vstar/Zt;
+            I /= conj(kt);
+            ytp = I;
+
+            // voltage at secondary side
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zp + 1.0/Zt;
+            Zeq = Zs + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            yps = I;
+
+            I = -Vstar/Zt;
+            I /= conj(kt);
+            yts = I;
+
+            // voltage at tertiary side
+            V = 1.0;
+            V = V/kt;
+            Yeq = Ym + 1.0/Zp + 1.0/Zs;
+            Zeq = Zt + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kt);
+            ytt = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            ypt = I;
+
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            yst = I;
+
+            network_Y_matrix.add_entry(p,p,ypp);
+            network_Y_matrix.add_entry(p,s,yps);
+            network_Y_matrix.add_entry(p,t,ypt);
+            network_Y_matrix.add_entry(s,p,ysp);
+            network_Y_matrix.add_entry(s,s,yss);
+            network_Y_matrix.add_entry(s,t,yst);
+            network_Y_matrix.add_entry(t,p,ytp);
+            network_Y_matrix.add_entry(t,s,yts);
+            network_Y_matrix.add_entry(t,t,ytt);
+            return;
+        }
 
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
-    {
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zs;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        ysp = I;
-
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zp;
-        Zeq = Zs + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        yps = I;
-
-        network_Y_matrix.add_entry(p,p,ypp);
-        network_Y_matrix.add_entry(p,s,yps);
-        network_Y_matrix.add_entry(s,p,ysp);
-        network_Y_matrix.add_entry(s,s,yss);
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
+        {
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zs;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            ysp = I;
+
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zp;
+            Zeq = Zs + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            yps = I;
+
+            network_Y_matrix.add_entry(p,p,ypp);
+            network_Y_matrix.add_entry(p,s,yps);
+            network_Y_matrix.add_entry(s,p,ysp);
+            network_Y_matrix.add_entry(s,s,yss);
+            return;
+        }
 
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
-    {
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zt;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zt;
-        I /= conj(kt);
-        ytp = I;
-
-        V = 1.0;
-        V = V/kt;
-        Yeq = Ym + 1.0/Zp;
-        Zeq = Zt + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kt);
-        ytt = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        ypt = I;
-
-        network_Y_matrix.add_entry(p,p,ypp);
-        network_Y_matrix.add_entry(p,t,ypt);
-        network_Y_matrix.add_entry(t,p,ytp);
-        network_Y_matrix.add_entry(t,t,ytt);
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
+        {
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zt;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zt;
+            I /= conj(kt);
+            ytp = I;
+
+            V = 1.0;
+            V = V/kt;
+            Yeq = Ym + 1.0/Zp;
+            Zeq = Zt + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kt);
+            ytt = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            ypt = I;
+
+            network_Y_matrix.add_entry(p,p,ypp);
+            network_Y_matrix.add_entry(p,t,ypt);
+            network_Y_matrix.add_entry(t,p,ytp);
+            network_Y_matrix.add_entry(t,t,ytt);
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
-    {
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zt;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zt;
-        I /= conj(kt);
-        yts = I;
-
-        V = 1.0;
-        V = V/kt;
-        Yeq = Ym + 1.0/Zs;
-        Zeq = Zt + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kt);
-        ytt = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        yst = I;
-
-        network_Y_matrix.add_entry(s,s,yss);
-        network_Y_matrix.add_entry(s,t,yst);
-        network_Y_matrix.add_entry(t,s,yts);
-        network_Y_matrix.add_entry(t,t,ytt);
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
+        {
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zt;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zt;
+            I /= conj(kt);
+            yts = I;
+
+            V = 1.0;
+            V = V/kt;
+            Yeq = Ym + 1.0/Zs;
+            Zeq = Zt + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kt);
+            ytt = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            yst = I;
+
+            network_Y_matrix.add_entry(s,s,yss);
+            network_Y_matrix.add_entry(s,t,yst);
+            network_Y_matrix.add_entry(t,s,yts);
+            network_Y_matrix.add_entry(t,t,ytt);
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
-    {
-        V = 1.0;
-        V = V/kp;
-        Zeq = Zp + 1.0/Ym;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        network_Y_matrix.add_entry(p,p,ypp);
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
+        {
+            V = 1.0;
+            V = V/kp;
+            Zeq = Zp + 1.0/Ym;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            network_Y_matrix.add_entry(p,p,ypp);
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
-    {
-        V = 1.0;
-        V = V/ks;
-        Zeq = Zs + 1.0/Ym;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        network_Y_matrix.add_entry(s,s,yss);
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
+        {
+            V = 1.0;
+            V = V/ks;
+            Zeq = Zs + 1.0/Ym;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            network_Y_matrix.add_entry(s,s,yss);
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
-    {
-        V = 1.0;
-        V = V/kt;
-        Zeq = Zt + 1.0/Ym;
-        I = V/Zeq;
-        I /= conj(kt);
-        ytt = I;
-
-        network_Y_matrix.add_entry(t,t,ytt);
-        return;
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
+        {
+            V = 1.0;
+            V = V/kt;
+            Zeq = Zt + 1.0/Ym;
+            I = V/Zeq;
+            I /= conj(kt);
+            ytt = I;
+
+            network_Y_matrix.add_entry(t,t,ytt);
+            return;
+        }
     }
 }
 
 void NETWORK_MATRIX::add_two_winding_transformer_to_network_v2(const TRANSFORMER& trans)
 {
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and trans.get_winding_breaker_status(SECONDARY_SIDE)==false)
-        return;
-
-    /*ostringstream osstream;
-    osstream<<"Adding two-winding transformer '%s' connecting to bus %u and %u to network Y matrix.", (trans.get_identifier()).c_str(),
-                  trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE));
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    */
+    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true or trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
+    {
+        /*ostringstream osstream;
+        osstream<<"Adding two-winding transformer '%s' connecting to bus %u and %u to network Y matrix.", (trans.get_identifier()).c_str(),
+                      trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE));
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        */
 
-    size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
-    size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
+        size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
+        size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
 
-    size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
-    size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
+        size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
+        size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
 
-    complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
-    complex<double> Ym = trans.get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
+        complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+        complex<double> Ym = trans.get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
 
-    complex<double> Zp, Zs;
-    Zp = 0.5*Zps; Zs = Zp;
+        complex<double> Zp, Zs;
+        Zp = 0.5*Zps; Zs = Zp;
 
-    double tap_primary = trans.get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE);
-    double angle_primary = trans.get_winding_angle_shift_in_deg(PRIMARY_SIDE);
-    angle_primary = deg2rad(angle_primary);
-    double tap_secondary = trans.get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE);
-    double angle_secondary = trans.get_winding_angle_shift_in_deg(SECONDARY_SIDE);
-    angle_secondary = deg2rad(angle_secondary);
+        double tap_primary = trans.get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE);
+        double angle_primary = trans.get_winding_angle_shift_in_deg(PRIMARY_SIDE);
+        angle_primary = deg2rad(angle_primary);
+        double tap_secondary = trans.get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE);
+        double angle_secondary = trans.get_winding_angle_shift_in_deg(SECONDARY_SIDE);
+        angle_secondary = deg2rad(angle_secondary);
 
-    complex<double> kp(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary)),
-                    ks(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
+        complex<double> kp(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary)),
+                        ks(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
 
 
-    complex<double> V, I, Vstar;
-    complex<double> ypp, yps, ysp, yss, Yeq, Zeq;
+        complex<double> V, I, Vstar;
+        complex<double> ypp, yps, ysp, yss, Yeq, Zeq;
 
-    complex<double> kp_store, ks_store, Ym_store;
-    kp_store = kp;
-    ks_store = ks;
-    Ym_store = Ym;
+        complex<double> kp_store, ks_store, Ym_store;
+        kp_store = kp;
+        ks_store = ks;
+        Ym_store = Ym;
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
-    {
-        Ym = 0.0;
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zs;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        ysp = I;
-
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zp;
-        Zeq = Zs + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        yps = I;
-
-        network_Y_matrix.add_entry(p,p,ypp);
-        network_Y_matrix.add_entry(p,s,yps);
-        network_Y_matrix.add_entry(s,p,ysp);
-        network_Y_matrix.add_entry(s,s,yss);
-
-        Ym = Ym_store;
-        network_Y_matrix.add_entry(p,p,Ym);
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
+        {
+            Ym = 0.0;
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zs;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            ysp = I;
+
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zp;
+            Zeq = Zs + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            yps = I;
+
+            network_Y_matrix.add_entry(p,p,ypp);
+            network_Y_matrix.add_entry(p,s,yps);
+            network_Y_matrix.add_entry(s,p,ysp);
+            network_Y_matrix.add_entry(s,s,yss);
+
+            Ym = Ym_store;
+            network_Y_matrix.add_entry(p,p,Ym);
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==false)
-    {
-        network_Y_matrix.add_entry(p,p,Ym);
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==false)
+        {
+            network_Y_matrix.add_entry(p,p,Ym);
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
-    {
-        V = 1.0;
-        V = V/ks;
-        Ym = trans.get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
-        Zeq = Zps + 1.0/Ym;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        network_Y_matrix.add_entry(s,s,yss);
-        return;
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
+        {
+            V = 1.0;
+            V = V/ks;
+            Ym = trans.get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
+            Zeq = Zps + 1.0/Ym;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            network_Y_matrix.add_entry(s,s,yss);
+            return;
+        }
     }
 }
 
@@ -839,23 +839,22 @@ void NETWORK_MATRIX::add_fixed_shunts_to_network()
 
 void NETWORK_MATRIX::add_fixed_shunt_to_network(const FIXED_SHUNT& shunt)
 {
-    if(shunt.get_status()==false)
-        return;
-
-    /*ostringstream osstream;
-    osstream<<"Adding fixed shunt '%s' at bus %u to network Y matrix.", (shunt.get_identifier()).c_str(),
-                  shunt.get_shunt_bus());
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    */
+    if(shunt.get_status()==true)
+    {
+        /*ostringstream osstream;
+        osstream<<"Adding fixed shunt '%s' at bus %u to network Y matrix.", (shunt.get_identifier()).c_str(),
+                      shunt.get_shunt_bus());
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        */
 
-    size_t bus = shunt.get_shunt_bus();
+        size_t bus = shunt.get_shunt_bus();
 
-    size_t i = inphno.get_internal_bus_number_of_physical_bus_number(bus);
+        size_t i = inphno.get_internal_bus_number_of_physical_bus_number(bus);
 
-    complex<double> Yshunt = shunt.get_nominal_admittance_shunt_in_pu();
+        complex<double> Yshunt = shunt.get_nominal_admittance_shunt_in_pu();
 
-    network_Y_matrix.add_entry(i,i, Yshunt);
-    return;
+        network_Y_matrix.add_entry(i,i, Yshunt);
+    }
 }
 
 void NETWORK_MATRIX::add_lines_to_decoupled_network()
@@ -872,83 +871,83 @@ void NETWORK_MATRIX::add_lines_to_decoupled_network()
 
 void NETWORK_MATRIX::add_line_to_decoupled_network(const LINE& line)
 {
-    if(line.get_sending_side_breaker_status()==false and line.get_receiving_side_breaker_status()==false)
-        return;
-
-    /*ostringstream osstream;
-    osstream<<"Adding line '%s' connecting to bus %u and %u to network Y matrix.", (line.get_identifier()).c_str(),
-                  line.get_sending_side_bus(), line.get_receiving_side_bus());
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    */
+    if(line.get_sending_side_breaker_status()==true or line.get_receiving_side_breaker_status()==true)
+    {
+        /*ostringstream osstream;
+        osstream<<"Adding line '%s' connecting to bus %u and %u to network Y matrix.", (line.get_identifier()).c_str(),
+                      line.get_sending_side_bus(), line.get_receiving_side_bus());
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        */
 
-    size_t sending_bus = line.get_sending_side_bus();
-    size_t receiving_bus = line.get_receiving_side_bus();
+        size_t sending_bus = line.get_sending_side_bus();
+        size_t receiving_bus = line.get_receiving_side_bus();
 
-    size_t i = inphno.get_internal_bus_number_of_physical_bus_number(sending_bus);
-    size_t j = inphno.get_internal_bus_number_of_physical_bus_number(receiving_bus);
+        size_t i = inphno.get_internal_bus_number_of_physical_bus_number(sending_bus);
+        size_t j = inphno.get_internal_bus_number_of_physical_bus_number(receiving_bus);
 
-    complex<double> Zline = line.get_line_positive_sequence_z_in_pu();
-    complex<double> Yline = line.get_line_positive_sequence_y_in_pu();
-    complex<double> Yshunt_sending = line.get_shunt_positive_sequence_y_at_sending_side_in_pu();
-    complex<double> Yshunt_receiving = line.get_shunt_positive_sequence_y_at_receiving_side_in_pu();
+        complex<double> Zline = line.get_line_positive_sequence_z_in_pu();
+        complex<double> Yline = line.get_line_positive_sequence_y_in_pu();
+        complex<double> Yshunt_sending = line.get_shunt_positive_sequence_y_at_sending_side_in_pu();
+        complex<double> Yshunt_receiving = line.get_shunt_positive_sequence_y_at_receiving_side_in_pu();
 
-    complex<double> Y, Z;
-    if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==true)
-    {
-        Y = 1.0/Zline;
+        complex<double> Y, Z;
+        if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==true)
+        {
+            Y = 1.0/Zline;
 
-        network_BP_matrix.add_entry(i,j, -Y);
-        network_BP_matrix.add_entry(j,i, -Y);
-        network_BP_matrix.add_entry(i,i, Y);
-        network_BP_matrix.add_entry(j,j, Y);
+            network_BP_matrix.add_entry(i,j, -Y);
+            network_BP_matrix.add_entry(j,i, -Y);
+            network_BP_matrix.add_entry(i,i, Y);
+            network_BP_matrix.add_entry(j,j, Y);
 
-        Zline = complex<double>(0.0, Zline.imag());
-        Y = 1.0/Zline;
-        Yline = complex<double>(0.0, Yline.imag());
-        Yshunt_sending = complex<double>(0.0, Yshunt_sending.imag());
-        Yshunt_receiving = complex<double>(0.0, Yshunt_receiving.imag());
+            Zline = complex<double>(0.0, Zline.imag());
+            Y = 1.0/Zline;
+            Yline = complex<double>(0.0, Yline.imag());
+            Yshunt_sending = complex<double>(0.0, Yshunt_sending.imag());
+            Yshunt_receiving = complex<double>(0.0, Yshunt_receiving.imag());
 
-        network_BQ_matrix.add_entry(i,j, -Y);
-        network_BQ_matrix.add_entry(j,i, -Y);
-        network_BQ_matrix.add_entry(i,i, Y+0.5*Yline+Yshunt_sending);
-        network_BQ_matrix.add_entry(j,j, Y+0.5*Yline+Yshunt_receiving);
+            network_BQ_matrix.add_entry(i,j, -Y);
+            network_BQ_matrix.add_entry(j,i, -Y);
+            network_BQ_matrix.add_entry(i,i, Y+0.5*Yline+Yshunt_sending);
+            network_BQ_matrix.add_entry(j,j, Y+0.5*Yline+Yshunt_receiving);
 
-        return;
-    }
+            return;
+        }
 
-    if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==false)
-    {
-        network_BP_matrix.add_entry(i,i, 0.0);
+        if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==false)
+        {
+            network_BP_matrix.add_entry(i,i, 0.0);
 
-        Zline = complex<double>(0.0, Zline.imag());
-        Yline = complex<double>(0.0, Yline.imag());
-        Yshunt_sending = complex<double>(0.0, Yshunt_sending.imag());
-        Yshunt_receiving = complex<double>(0.0, Yshunt_receiving.imag());
+            Zline = complex<double>(0.0, Zline.imag());
+            Yline = complex<double>(0.0, Yline.imag());
+            Yshunt_sending = complex<double>(0.0, Yshunt_sending.imag());
+            Yshunt_receiving = complex<double>(0.0, Yshunt_receiving.imag());
 
-        Y = 0.5*Yline+Yshunt_receiving;
-        Z = Zline + 1.0/Y;
-        Y = 1.0/Z + 0.5*Yline+Yshunt_sending;
+            Y = 0.5*Yline+Yshunt_receiving;
+            Z = Zline + 1.0/Y;
+            Y = 1.0/Z + 0.5*Yline+Yshunt_sending;
 
-        network_BQ_matrix.add_entry(i,i, Y);
-        return;
-    }
+            network_BQ_matrix.add_entry(i,i, Y);
+            return;
+        }
 
-    if(line.get_sending_side_breaker_status()==false and line.get_receiving_side_breaker_status()==true)
-    {
-        network_BP_matrix.add_entry(j,j, 0.0);
+        if(line.get_sending_side_breaker_status()==false and line.get_receiving_side_breaker_status()==true)
+        {
+            network_BP_matrix.add_entry(j,j, 0.0);
 
-        Zline = complex<double>(0.0, Zline.imag());
-        Yline = complex<double>(0.0, Yline.imag());
-        Yshunt_sending = complex<double>(0.0, Yshunt_sending.imag());
-        Yshunt_receiving = complex<double>(0.0, Yshunt_receiving.imag());
+            Zline = complex<double>(0.0, Zline.imag());
+            Yline = complex<double>(0.0, Yline.imag());
+            Yshunt_sending = complex<double>(0.0, Yshunt_sending.imag());
+            Yshunt_receiving = complex<double>(0.0, Yshunt_receiving.imag());
 
-        Y = 0.5*Yline+Yshunt_sending;
-        Z = Zline + 1.0/Y;
-        Y = 1.0/Z + 0.5*Yline+Yshunt_receiving;
-        network_Y_matrix.add_entry(j,j, Y);
+            Y = 0.5*Yline+Yshunt_sending;
+            Z = Zline + 1.0/Y;
+            Y = 1.0/Z + 0.5*Yline+Yshunt_receiving;
+            network_Y_matrix.add_entry(j,j, Y);
 
-        network_BQ_matrix.add_entry(j,j, Y);
-        return;
+            network_BQ_matrix.add_entry(j,j, Y);
+            return;
+        }
     }
 }
 
@@ -975,714 +974,714 @@ void NETWORK_MATRIX::add_transformer_to_decoupled_network(const TRANSFORMER& tra
 
 void NETWORK_MATRIX::add_three_winding_transformer_to_decoupled_network(const TRANSFORMER& trans)
 {
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
-        return;
-
-    /*ostringstream osstream;
-    osstream<<"Adding three-winding transformer '%s' connecting to bus %u, %u, and %u to network Y matrix.", (trans.get_identifier()).c_str(),
-                  trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE), trans.get_winding_bus(TERTIARY_SIDE));
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    */
+    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true or
+       trans.get_winding_breaker_status(SECONDARY_SIDE)==true or
+       trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
+    {
+        /*ostringstream osstream;
+        osstream<<"Adding three-winding transformer '%s' connecting to bus %u, %u, and %u to network Y matrix.", (trans.get_identifier()).c_str(),
+                      trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE), trans.get_winding_bus(TERTIARY_SIDE));
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        */
 
-    size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
-    size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
-    size_t tertiary_bus = trans.get_winding_bus(TERTIARY_SIDE);
+        size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
+        size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
+        size_t tertiary_bus = trans.get_winding_bus(TERTIARY_SIDE);
 
-    size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
-    size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
-    size_t t = inphno.get_internal_bus_number_of_physical_bus_number(tertiary_bus);
+        size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
+        size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
+        size_t t = inphno.get_internal_bus_number_of_physical_bus_number(tertiary_bus);
 
-    complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
-    complex<double> Zst = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
-    complex<double> Zpt = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
-    complex<double> Ym = trans.get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
+        complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+        complex<double> Zst = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
+        complex<double> Zpt = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
+        complex<double> Ym = trans.get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
 
-    complex<double> Zp = 0.5*(Zps+Zpt-Zst),
-                    Zs = 0.5*(Zps+Zst-Zpt),
-                    Zt = 0.5*(Zpt+Zst-Zps);
+        complex<double> Zp = 0.5*(Zps+Zpt-Zst),
+                        Zs = 0.5*(Zps+Zst-Zpt),
+                        Zt = 0.5*(Zpt+Zst-Zps);
 
-    double tap_primary = trans.get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE);
-    double angle_primary = trans.get_winding_angle_shift_in_deg(PRIMARY_SIDE);
-    angle_primary = deg2rad(angle_primary);
-    double tap_secondary = trans.get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE);
-    double angle_secondary = trans.get_winding_angle_shift_in_deg(SECONDARY_SIDE);
-    angle_secondary = deg2rad(angle_secondary);
-    double tap_tertiary = trans.get_winding_off_nominal_turn_ratio_in_pu(TERTIARY_SIDE);
-    double angle_tertiary = trans.get_winding_angle_shift_in_deg(TERTIARY_SIDE);
-    angle_tertiary = deg2rad(angle_tertiary);
+        double tap_primary = trans.get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE);
+        double angle_primary = trans.get_winding_angle_shift_in_deg(PRIMARY_SIDE);
+        angle_primary = deg2rad(angle_primary);
+        double tap_secondary = trans.get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE);
+        double angle_secondary = trans.get_winding_angle_shift_in_deg(SECONDARY_SIDE);
+        angle_secondary = deg2rad(angle_secondary);
+        double tap_tertiary = trans.get_winding_off_nominal_turn_ratio_in_pu(TERTIARY_SIDE);
+        double angle_tertiary = trans.get_winding_angle_shift_in_deg(TERTIARY_SIDE);
+        angle_tertiary = deg2rad(angle_tertiary);
 
-    complex<double> kp(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary)),
-                    ks(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary)),
-                    kt(tap_tertiary*cos(angle_tertiary),tap_tertiary*sin(angle_tertiary));
+        complex<double> kp(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary)),
+                        ks(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary)),
+                        kt(tap_tertiary*cos(angle_tertiary),tap_tertiary*sin(angle_tertiary));
 
-    complex<double> V, I, Vstar;
-    complex<double> ypp, yps, ypt, ysp, yss, yst, ytp, yts, ytt, Yeq, Zeq;
+        complex<double> V, I, Vstar;
+        complex<double> ypp, yps, ypt, ysp, yss, yst, ytp, yts, ytt, Yeq, Zeq;
 
 
-    complex<double> kp_store = kp, ks_store = ks, kt_store = kt;
-    complex<double> Ym_store = Ym;
+        complex<double> kp_store = kp, ks_store = ks, kt_store = kt;
+        complex<double> Ym_store = Ym;
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
-    {
-        // voltage at primary side.
-        kp = kp/ steps_fast_complex_abs(kp);
-        ks = ks/ steps_fast_complex_abs(ks);
-        kt = kt/ steps_fast_complex_abs(kt);
-
-        Ym = 0.0;
-
-        // voltage at primary side.
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zs + 1.0/Zt;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        ysp = I;
-
-        I = -Vstar/Zt;
-        I /= conj(kt);
-        ytp = I;
-
-        // voltage at secondary side
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zp + 1.0/Zt;
-        Zeq = Zs + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        yps = I;
-
-        I = -Vstar/Zt;
-        I /= conj(kt);
-        yts = I;
-
-        // voltage at tertiary side
-        V = 1.0;
-        V = V/kt;
-        Yeq = Ym + 1.0/Zp + 1.0/Zs;
-        Zeq = Zt + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kt);
-        ytt = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        ypt = I;
-
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        yst = I;
-
-        network_BP_matrix.add_entry(p,p,ypp);
-        network_BP_matrix.add_entry(p,s,yps);
-        network_BP_matrix.add_entry(p,t,ypt);
-        network_BP_matrix.add_entry(s,p,ysp);
-        network_BP_matrix.add_entry(s,s,yss);
-        network_BP_matrix.add_entry(s,t,yst);
-        network_BP_matrix.add_entry(t,p,ytp);
-        network_BP_matrix.add_entry(t,s,yts);
-        network_BP_matrix.add_entry(t,t,ytt);
-
-        kp = steps_fast_complex_abs(kp_store);
-        ks = steps_fast_complex_abs(ks_store);
-        kt = steps_fast_complex_abs(kt_store);
-
-        Ym = Ym_store;
-
-        Zp = complex<double>(0.0, Zp.imag());
-        Zs = complex<double>(0.0, Zs.imag());
-        Zt = complex<double>(0.0, Zt.imag());
-        Ym = complex<double>(0.0, Ym.imag());
-
-        // voltage at primary side.
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zs + 1.0/Zt;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        ysp = I;
-
-        I = -Vstar/Zt;
-        I /= conj(kt);
-        ytp = I;
-
-        // voltage at secondary side
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zp + 1.0/Zt;
-        Zeq = Zs + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        yps = I;
-
-        I = -Vstar/Zt;
-        I /= conj(kt);
-        yts = I;
-
-        // voltage at tertiary side
-        V = 1.0;
-        V = V/kt;
-        Yeq = Ym + 1.0/Zp + 1.0/Zs;
-        Zeq = Zt + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kt);
-        ytt = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        ypt = I;
-
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        yst = I;
-
-        network_BQ_matrix.add_entry(p,p,ypp);
-        network_BQ_matrix.add_entry(p,s,yps);
-        network_BQ_matrix.add_entry(p,t,ypt);
-        network_BQ_matrix.add_entry(s,p,ysp);
-        network_BQ_matrix.add_entry(s,s,yss);
-        network_BQ_matrix.add_entry(s,t,yst);
-        network_BQ_matrix.add_entry(t,p,ytp);
-        network_BQ_matrix.add_entry(t,s,yts);
-        network_BQ_matrix.add_entry(t,t,ytt);
-
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
+        {
+            // voltage at primary side.
+            kp = kp/ steps_fast_complex_abs(kp);
+            ks = ks/ steps_fast_complex_abs(ks);
+            kt = kt/ steps_fast_complex_abs(kt);
+
+            Ym = 0.0;
+
+            // voltage at primary side.
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zs + 1.0/Zt;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            ysp = I;
+
+            I = -Vstar/Zt;
+            I /= conj(kt);
+            ytp = I;
+
+            // voltage at secondary side
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zp + 1.0/Zt;
+            Zeq = Zs + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            yps = I;
+
+            I = -Vstar/Zt;
+            I /= conj(kt);
+            yts = I;
+
+            // voltage at tertiary side
+            V = 1.0;
+            V = V/kt;
+            Yeq = Ym + 1.0/Zp + 1.0/Zs;
+            Zeq = Zt + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kt);
+            ytt = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            ypt = I;
+
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            yst = I;
+
+            network_BP_matrix.add_entry(p,p,ypp);
+            network_BP_matrix.add_entry(p,s,yps);
+            network_BP_matrix.add_entry(p,t,ypt);
+            network_BP_matrix.add_entry(s,p,ysp);
+            network_BP_matrix.add_entry(s,s,yss);
+            network_BP_matrix.add_entry(s,t,yst);
+            network_BP_matrix.add_entry(t,p,ytp);
+            network_BP_matrix.add_entry(t,s,yts);
+            network_BP_matrix.add_entry(t,t,ytt);
+
+            kp = steps_fast_complex_abs(kp_store);
+            ks = steps_fast_complex_abs(ks_store);
+            kt = steps_fast_complex_abs(kt_store);
+
+            Ym = Ym_store;
+
+            Zp = complex<double>(0.0, Zp.imag());
+            Zs = complex<double>(0.0, Zs.imag());
+            Zt = complex<double>(0.0, Zt.imag());
+            Ym = complex<double>(0.0, Ym.imag());
+
+            // voltage at primary side.
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zs + 1.0/Zt;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            ysp = I;
+
+            I = -Vstar/Zt;
+            I /= conj(kt);
+            ytp = I;
+
+            // voltage at secondary side
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zp + 1.0/Zt;
+            Zeq = Zs + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            yps = I;
+
+            I = -Vstar/Zt;
+            I /= conj(kt);
+            yts = I;
+
+            // voltage at tertiary side
+            V = 1.0;
+            V = V/kt;
+            Yeq = Ym + 1.0/Zp + 1.0/Zs;
+            Zeq = Zt + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kt);
+            ytt = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            ypt = I;
+
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            yst = I;
+
+            network_BQ_matrix.add_entry(p,p,ypp);
+            network_BQ_matrix.add_entry(p,s,yps);
+            network_BQ_matrix.add_entry(p,t,ypt);
+            network_BQ_matrix.add_entry(s,p,ysp);
+            network_BQ_matrix.add_entry(s,s,yss);
+            network_BQ_matrix.add_entry(s,t,yst);
+            network_BQ_matrix.add_entry(t,p,ytp);
+            network_BQ_matrix.add_entry(t,s,yts);
+            network_BQ_matrix.add_entry(t,t,ytt);
+
+            return;
+        }
 
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
-    {
-        kp = kp/ steps_fast_complex_abs(kp);
-        ks = ks/ steps_fast_complex_abs(ks);
-        kt = kt/ steps_fast_complex_abs(kt);
-
-        Ym = 0.0;
-
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zs;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        ysp = I;
-
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zp;
-        Zeq = Zs + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        yps = I;
-
-        network_BP_matrix.add_entry(p,p,ypp);
-        network_BP_matrix.add_entry(p,s,yps);
-        network_BP_matrix.add_entry(s,p,ysp);
-        network_BP_matrix.add_entry(s,s,yss);
-
-
-        kp = steps_fast_complex_abs(kp_store);
-        ks = steps_fast_complex_abs(ks_store);
-        kt = steps_fast_complex_abs(kt_store);
-
-        Ym = Ym_store;
-
-        Zp = complex<double>(0.0, Zp.imag());
-        Zs = complex<double>(0.0, Zs.imag());
-        Zt = complex<double>(0.0, Zt.imag());
-        Ym = complex<double>(0.0, Ym.imag());
-
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zs;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        ysp = I;
-
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zp;
-        Zeq = Zs + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        yps = I;
-
-        network_BQ_matrix.add_entry(p,p,ypp);
-        network_BQ_matrix.add_entry(p,s,yps);
-        network_BQ_matrix.add_entry(s,p,ysp);
-        network_BQ_matrix.add_entry(s,s,yss);
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
+        {
+            kp = kp/ steps_fast_complex_abs(kp);
+            ks = ks/ steps_fast_complex_abs(ks);
+            kt = kt/ steps_fast_complex_abs(kt);
+
+            Ym = 0.0;
+
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zs;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            ysp = I;
+
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zp;
+            Zeq = Zs + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            yps = I;
+
+            network_BP_matrix.add_entry(p,p,ypp);
+            network_BP_matrix.add_entry(p,s,yps);
+            network_BP_matrix.add_entry(s,p,ysp);
+            network_BP_matrix.add_entry(s,s,yss);
+
+
+            kp = steps_fast_complex_abs(kp_store);
+            ks = steps_fast_complex_abs(ks_store);
+            kt = steps_fast_complex_abs(kt_store);
+
+            Ym = Ym_store;
+
+            Zp = complex<double>(0.0, Zp.imag());
+            Zs = complex<double>(0.0, Zs.imag());
+            Zt = complex<double>(0.0, Zt.imag());
+            Ym = complex<double>(0.0, Ym.imag());
+
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zs;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            ysp = I;
+
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zp;
+            Zeq = Zs + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            yps = I;
+
+            network_BQ_matrix.add_entry(p,p,ypp);
+            network_BQ_matrix.add_entry(p,s,yps);
+            network_BQ_matrix.add_entry(s,p,ysp);
+            network_BQ_matrix.add_entry(s,s,yss);
+            return;
+        }
 
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
-    {
-        kp = kp/ steps_fast_complex_abs(kp);
-        ks = ks/ steps_fast_complex_abs(ks);
-        kt = kt/ steps_fast_complex_abs(kt);
-
-        Ym = 0.0;
-
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zt;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zt;
-        I /= conj(kt);
-        ytp = I;
-
-        V = 1.0;
-        V = V/kt;
-        Yeq = Ym + 1.0/Zp;
-        Zeq = Zt + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kt);
-        ytt = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        ypt = I;
-
-        network_BP_matrix.add_entry(p,p,ypp);
-        network_BP_matrix.add_entry(p,t,ypt);
-        network_BP_matrix.add_entry(t,p,ytp);
-        network_BP_matrix.add_entry(t,t,ytt);
-
-
-        kp = steps_fast_complex_abs(kp_store);
-        ks = steps_fast_complex_abs(ks_store);
-        kt = steps_fast_complex_abs(kt_store);
-
-        Ym = Ym_store;
-
-        Zp = complex<double>(0.0, Zp.imag());
-        Zs = complex<double>(0.0, Zs.imag());
-        Zt = complex<double>(0.0, Zt.imag());
-        Ym = complex<double>(0.0, Ym.imag());
-
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zt;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zt;
-        I /= conj(kt);
-        ytp = I;
-
-        V = 1.0;
-        V = V/kt;
-        Yeq = Ym + 1.0/Zp;
-        Zeq = Zt + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kt);
-        ytt = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        ypt = I;
-
-        network_BQ_matrix.add_entry(p,p,ypp);
-        network_BQ_matrix.add_entry(p,t,ypt);
-        network_BQ_matrix.add_entry(t,p,ytp);
-        network_BQ_matrix.add_entry(t,t,ytt);
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
+        {
+            kp = kp/ steps_fast_complex_abs(kp);
+            ks = ks/ steps_fast_complex_abs(ks);
+            kt = kt/ steps_fast_complex_abs(kt);
+
+            Ym = 0.0;
+
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zt;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zt;
+            I /= conj(kt);
+            ytp = I;
+
+            V = 1.0;
+            V = V/kt;
+            Yeq = Ym + 1.0/Zp;
+            Zeq = Zt + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kt);
+            ytt = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            ypt = I;
+
+            network_BP_matrix.add_entry(p,p,ypp);
+            network_BP_matrix.add_entry(p,t,ypt);
+            network_BP_matrix.add_entry(t,p,ytp);
+            network_BP_matrix.add_entry(t,t,ytt);
+
+
+            kp = steps_fast_complex_abs(kp_store);
+            ks = steps_fast_complex_abs(ks_store);
+            kt = steps_fast_complex_abs(kt_store);
+
+            Ym = Ym_store;
+
+            Zp = complex<double>(0.0, Zp.imag());
+            Zs = complex<double>(0.0, Zs.imag());
+            Zt = complex<double>(0.0, Zt.imag());
+            Ym = complex<double>(0.0, Ym.imag());
+
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zt;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zt;
+            I /= conj(kt);
+            ytp = I;
+
+            V = 1.0;
+            V = V/kt;
+            Yeq = Ym + 1.0/Zp;
+            Zeq = Zt + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kt);
+            ytt = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            ypt = I;
+
+            network_BQ_matrix.add_entry(p,p,ypp);
+            network_BQ_matrix.add_entry(p,t,ypt);
+            network_BQ_matrix.add_entry(t,p,ytp);
+            network_BQ_matrix.add_entry(t,t,ytt);
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
-    {
-        kp = kp/ steps_fast_complex_abs(kp);
-        ks = ks/ steps_fast_complex_abs(ks);
-        kt = kt/ steps_fast_complex_abs(kt);
-
-        Ym = 0.0;
-
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zt;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zt;
-        I /= conj(kt);
-        yts = I;
-
-        V = 1.0;
-        V = V/kt;
-        Yeq = Ym + 1.0/Zs;
-        Zeq = Zt + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kt);
-        ytt = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        yst = I;
-
-        network_BP_matrix.add_entry(s,s,yss);
-        network_BP_matrix.add_entry(s,t,yst);
-        network_BP_matrix.add_entry(t,s,yts);
-        network_BP_matrix.add_entry(t,t,ytt);
-
-
-        kp = steps_fast_complex_abs(kp_store);
-        ks = steps_fast_complex_abs(ks_store);
-        kt = steps_fast_complex_abs(kt_store);
-
-        Ym = Ym_store;
-
-        Zp = complex<double>(0.0, Zp.imag());
-        Zs = complex<double>(0.0, Zs.imag());
-        Zt = complex<double>(0.0, Zt.imag());
-        Ym = complex<double>(0.0, Ym.imag());
-
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zt;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zt;
-        I /= conj(kt);
-        yts = I;
-
-        V = 1.0;
-        V = V/kt;
-        Yeq = Ym + 1.0/Zs;
-        Zeq = Zt + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kt);
-        ytt = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        yst = I;
-
-        network_BQ_matrix.add_entry(s,s,yss);
-        network_BQ_matrix.add_entry(s,t,yst);
-        network_BQ_matrix.add_entry(t,s,yts);
-        network_BQ_matrix.add_entry(t,t,ytt);
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
+        {
+            kp = kp/ steps_fast_complex_abs(kp);
+            ks = ks/ steps_fast_complex_abs(ks);
+            kt = kt/ steps_fast_complex_abs(kt);
+
+            Ym = 0.0;
+
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zt;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zt;
+            I /= conj(kt);
+            yts = I;
+
+            V = 1.0;
+            V = V/kt;
+            Yeq = Ym + 1.0/Zs;
+            Zeq = Zt + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kt);
+            ytt = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            yst = I;
+
+            network_BP_matrix.add_entry(s,s,yss);
+            network_BP_matrix.add_entry(s,t,yst);
+            network_BP_matrix.add_entry(t,s,yts);
+            network_BP_matrix.add_entry(t,t,ytt);
+
+
+            kp = steps_fast_complex_abs(kp_store);
+            ks = steps_fast_complex_abs(ks_store);
+            kt = steps_fast_complex_abs(kt_store);
+
+            Ym = Ym_store;
+
+            Zp = complex<double>(0.0, Zp.imag());
+            Zs = complex<double>(0.0, Zs.imag());
+            Zt = complex<double>(0.0, Zt.imag());
+            Ym = complex<double>(0.0, Ym.imag());
+
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zt;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zt;
+            I /= conj(kt);
+            yts = I;
+
+            V = 1.0;
+            V = V/kt;
+            Yeq = Ym + 1.0/Zs;
+            Zeq = Zt + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kt);
+            ytt = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            yst = I;
+
+            network_BQ_matrix.add_entry(s,s,yss);
+            network_BQ_matrix.add_entry(s,t,yst);
+            network_BQ_matrix.add_entry(t,s,yts);
+            network_BQ_matrix.add_entry(t,t,ytt);
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
-    {
-        network_BP_matrix.add_entry(p,p,0.0);
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
+        {
+            network_BP_matrix.add_entry(p,p,0.0);
 
-        kp = steps_fast_complex_abs(kp_store);
-        ks = steps_fast_complex_abs(ks_store);
-        kt = steps_fast_complex_abs(kt_store);
+            kp = steps_fast_complex_abs(kp_store);
+            ks = steps_fast_complex_abs(ks_store);
+            kt = steps_fast_complex_abs(kt_store);
 
-        Ym = Ym_store;
+            Ym = Ym_store;
 
-        Zp = complex<double>(0.0, Zp.imag());
-        Zs = complex<double>(0.0, Zs.imag());
-        Zt = complex<double>(0.0, Zt.imag());
-        Ym = complex<double>(0.0, Ym.imag());
+            Zp = complex<double>(0.0, Zp.imag());
+            Zs = complex<double>(0.0, Zs.imag());
+            Zt = complex<double>(0.0, Zt.imag());
+            Ym = complex<double>(0.0, Ym.imag());
 
-        V = 1.0;
-        V = V/kp;
-        Zeq = Zp + 1.0/Ym;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
+            V = 1.0;
+            V = V/kp;
+            Zeq = Zp + 1.0/Ym;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
 
-        network_BQ_matrix.add_entry(p,p,ypp);
+            network_BQ_matrix.add_entry(p,p,ypp);
 
 
-        return;
-    }
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
-    {
-        network_BP_matrix.add_entry(s,s,0.0);
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
+        {
+            network_BP_matrix.add_entry(s,s,0.0);
 
 
-        kp = steps_fast_complex_abs(kp_store);
-        ks = steps_fast_complex_abs(ks_store);
-        kt = steps_fast_complex_abs(kt_store);
+            kp = steps_fast_complex_abs(kp_store);
+            ks = steps_fast_complex_abs(ks_store);
+            kt = steps_fast_complex_abs(kt_store);
 
-        Ym = Ym_store;
+            Ym = Ym_store;
 
-        Zp = complex<double>(0.0, Zp.imag());
-        Zs = complex<double>(0.0, Zs.imag());
-        Zt = complex<double>(0.0, Zt.imag());
-        Ym = complex<double>(0.0, Ym.imag());
+            Zp = complex<double>(0.0, Zp.imag());
+            Zs = complex<double>(0.0, Zs.imag());
+            Zt = complex<double>(0.0, Zt.imag());
+            Ym = complex<double>(0.0, Ym.imag());
 
-        V = 1.0;
-        V = V/ks;
-        Zeq = Zs + 1.0/Ym;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
+            V = 1.0;
+            V = V/ks;
+            Zeq = Zs + 1.0/Ym;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
 
-        network_BQ_matrix.add_entry(s,s,yss);
+            network_BQ_matrix.add_entry(s,s,yss);
 
-        return;
-    }
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
-    {
-        network_BP_matrix.add_entry(t,t,0.0);
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
+        {
+            network_BP_matrix.add_entry(t,t,0.0);
 
 
-        kp = steps_fast_complex_abs(kp_store);
-        ks = steps_fast_complex_abs(ks_store);
-        kt = steps_fast_complex_abs(kt_store);
+            kp = steps_fast_complex_abs(kp_store);
+            ks = steps_fast_complex_abs(ks_store);
+            kt = steps_fast_complex_abs(kt_store);
 
-        Ym = Ym_store;
+            Ym = Ym_store;
 
-        Zp = complex<double>(0.0, Zp.imag());
-        Zs = complex<double>(0.0, Zs.imag());
-        Zt = complex<double>(0.0, Zt.imag());
-        Ym = complex<double>(0.0, Ym.imag());
+            Zp = complex<double>(0.0, Zp.imag());
+            Zs = complex<double>(0.0, Zs.imag());
+            Zt = complex<double>(0.0, Zt.imag());
+            Ym = complex<double>(0.0, Ym.imag());
 
-        V = 1.0;
-        V = V/kt;
-        Zeq = Zt + 1.0/Ym;
-        I = V/Zeq;
-        I /= conj(kt);
-        ytt = I;
+            V = 1.0;
+            V = V/kt;
+            Zeq = Zt + 1.0/Ym;
+            I = V/Zeq;
+            I /= conj(kt);
+            ytt = I;
 
-        network_BQ_matrix.add_entry(t,t,ytt);
-        return;
+            network_BQ_matrix.add_entry(t,t,ytt);
+            return;
+        }
     }
 }
 
 void NETWORK_MATRIX::add_two_winding_transformer_to_decoupled_network_v2(const TRANSFORMER& trans)
 {
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and trans.get_winding_breaker_status(SECONDARY_SIDE)==false)
-        return;
-
-    /*ostringstream osstream;
-    osstream<<"Adding two-winding transformer '%s' connecting to bus %u and %u to network Y matrix.", (trans.get_identifier()).c_str(),
-                  trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE));
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    */
+    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true or trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
+    {
+        /*ostringstream osstream;
+        osstream<<"Adding two-winding transformer '%s' connecting to bus %u and %u to network Y matrix.", (trans.get_identifier()).c_str(),
+                      trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE));
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        */
 
-    size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
-    size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
+        size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
+        size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
 
-    size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
-    size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
+        size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
+        size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
 
-    complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
-    complex<double> Ym = trans.get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
+        complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+        complex<double> Ym = trans.get_magnetizing_admittance_based_on_winding_norminal_voltage_and_system_base_power_in_pu();
 
-    complex<double> Zp, Zs;
-    Zp = 0.5*Zps; Zs = Zp;
+        complex<double> Zp, Zs;
+        Zp = 0.5*Zps; Zs = Zp;
 
-    double tap_primary = trans.get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE);
-    double angle_primary = trans.get_winding_angle_shift_in_deg(PRIMARY_SIDE);
-    angle_primary = deg2rad(angle_primary);
-    double tap_secondary = trans.get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE);
-    double angle_secondary = trans.get_winding_angle_shift_in_deg(SECONDARY_SIDE);
-    angle_secondary = deg2rad(angle_secondary);
+        double tap_primary = trans.get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE);
+        double angle_primary = trans.get_winding_angle_shift_in_deg(PRIMARY_SIDE);
+        angle_primary = deg2rad(angle_primary);
+        double tap_secondary = trans.get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE);
+        double angle_secondary = trans.get_winding_angle_shift_in_deg(SECONDARY_SIDE);
+        angle_secondary = deg2rad(angle_secondary);
 
-    complex<double> kp(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary)),
-                    ks(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
+        complex<double> kp(tap_primary*cos(angle_primary),tap_primary*sin(angle_primary)),
+                        ks(tap_secondary*cos(angle_secondary),tap_secondary*sin(angle_secondary));
 
 
-    complex<double> V, I, Vstar;
-    complex<double> ypp, yps, ysp, yss, Yeq, Zeq;
+        complex<double> V, I, Vstar;
+        complex<double> ypp, yps, ysp, yss, Yeq, Zeq;
 
-    complex<double> kp_store, ks_store, Ym_store;
-    kp_store = kp;
-    ks_store = ks;
-    Ym_store = Ym;
+        complex<double> kp_store, ks_store, Ym_store;
+        kp_store = kp;
+        ks_store = ks;
+        Ym_store = Ym;
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
-    {
-        kp = kp/steps_fast_complex_abs(kp);
-        ks = ks/steps_fast_complex_abs(ks);
-        Ym = 0.0;
-
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zs;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        ysp = I;
-
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zp;
-        Zeq = Zs + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        yps = I;
-
-        network_BP_matrix.add_entry(p,p,ypp);
-        network_BP_matrix.add_entry(p,s,yps);
-        network_BP_matrix.add_entry(s,p,ysp);
-        network_BP_matrix.add_entry(s,s,yss);
-
-
-        kp = kp_store;
-        ks = ks_store;
-
-        kp = steps_fast_complex_abs(kp);
-        ks = steps_fast_complex_abs(ks);
-
-        Zp = complex<double>(0.0, Zp.imag());
-        Zs = complex<double>(0.0, Zs.imag());
-
-        Ym = 0.0;
-        V = 1.0;
-        V = V/kp;
-        Yeq = Ym + 1.0/Zs;
-        Zeq = Zp + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(kp);
-        ypp = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zs;
-        I /= conj(ks);
-        ysp = I;
-
-        V = 1.0;
-        V = V/ks;
-        Yeq = Ym + 1.0/Zp;
-        Zeq = Zs + 1.0/Yeq;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
-
-        Vstar = V*(1.0/Yeq)/Zeq;
-        I = -Vstar/Zp;
-        I /= conj(kp);
-        yps = I;
-
-        network_BQ_matrix.add_entry(p,p,ypp);
-        network_BQ_matrix.add_entry(p,s,yps);
-        network_BQ_matrix.add_entry(s,p,ysp);
-        network_BQ_matrix.add_entry(s,s,yss);
-
-        Ym = Ym_store;
-        Ym = complex<double>(0.0, Ym.imag());
-        network_BQ_matrix.add_entry(p,p,Ym);
-
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
+        {
+            kp = kp/steps_fast_complex_abs(kp);
+            ks = ks/steps_fast_complex_abs(ks);
+            Ym = 0.0;
+
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zs;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            ysp = I;
+
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zp;
+            Zeq = Zs + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            yps = I;
+
+            network_BP_matrix.add_entry(p,p,ypp);
+            network_BP_matrix.add_entry(p,s,yps);
+            network_BP_matrix.add_entry(s,p,ysp);
+            network_BP_matrix.add_entry(s,s,yss);
+
+
+            kp = kp_store;
+            ks = ks_store;
+
+            kp = steps_fast_complex_abs(kp);
+            ks = steps_fast_complex_abs(ks);
+
+            Zp = complex<double>(0.0, Zp.imag());
+            Zs = complex<double>(0.0, Zs.imag());
+
+            Ym = 0.0;
+            V = 1.0;
+            V = V/kp;
+            Yeq = Ym + 1.0/Zs;
+            Zeq = Zp + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(kp);
+            ypp = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zs;
+            I /= conj(ks);
+            ysp = I;
+
+            V = 1.0;
+            V = V/ks;
+            Yeq = Ym + 1.0/Zp;
+            Zeq = Zs + 1.0/Yeq;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
+
+            Vstar = V*(1.0/Yeq)/Zeq;
+            I = -Vstar/Zp;
+            I /= conj(kp);
+            yps = I;
+
+            network_BQ_matrix.add_entry(p,p,ypp);
+            network_BQ_matrix.add_entry(p,s,yps);
+            network_BQ_matrix.add_entry(s,p,ysp);
+            network_BQ_matrix.add_entry(s,s,yss);
+
+            Ym = Ym_store;
+            Ym = complex<double>(0.0, Ym.imag());
+            network_BQ_matrix.add_entry(p,p,Ym);
+
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==false)
-    {
-        network_BP_matrix.add_entry(p,p,0.0);
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==false)
+        {
+            network_BP_matrix.add_entry(p,p,0.0);
 
-        Ym = complex<double>(0.0, Ym.imag());
+            Ym = complex<double>(0.0, Ym.imag());
 
-        network_BQ_matrix.add_entry(p,p,Ym);
-        return;
-    }
+            network_BQ_matrix.add_entry(p,p,Ym);
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
-    {
-        network_BP_matrix.add_entry(s,s,0.0);
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
+        {
+            network_BP_matrix.add_entry(s,s,0.0);
 
-        ks = steps_fast_complex_abs(ks);
+            ks = steps_fast_complex_abs(ks);
 
-        Zps = complex<double>(0.0, Zps.imag());
-        Ym = complex<double>(0.0, Ym.imag());
+            Zps = complex<double>(0.0, Zps.imag());
+            Ym = complex<double>(0.0, Ym.imag());
 
-        V = 1.0;
-        V = V/ks;
-        Zeq = Zps + 1.0/Ym;
-        I = V/Zeq;
-        I /= conj(ks);
-        yss = I;
+            V = 1.0;
+            V = V/ks;
+            Zeq = Zps + 1.0/Ym;
+            I = V/Zeq;
+            I /= conj(ks);
+            yss = I;
 
-        network_BQ_matrix.add_entry(s,s,yss);
-        return;
+            network_BQ_matrix.add_entry(s,s,yss);
+            return;
+        }
     }
 }
 
@@ -1701,24 +1700,23 @@ void NETWORK_MATRIX::add_fixed_shunts_to_decoupled_network()
 
 void NETWORK_MATRIX::add_fixed_shunt_to_decoupled_network(const FIXED_SHUNT& shunt)
 {
-    if(shunt.get_status()==false)
-        return;
-
-    /*ostringstream osstream;
-    osstream<<"Adding fixed shunt '%s' at bus %u to network Y matrix.", (shunt.get_identifier()).c_str(),
-                  shunt.get_shunt_bus());
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    */
+    if(shunt.get_status()==true)
+    {
+        /*ostringstream osstream;
+        osstream<<"Adding fixed shunt '%s' at bus %u to network Y matrix.", (shunt.get_identifier()).c_str(),
+                      shunt.get_shunt_bus());
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        */
 
-    size_t bus = shunt.get_shunt_bus();
+        size_t bus = shunt.get_shunt_bus();
 
-    size_t i = inphno.get_internal_bus_number_of_physical_bus_number(bus);
+        size_t i = inphno.get_internal_bus_number_of_physical_bus_number(bus);
 
-    complex<double> Yshunt = shunt.get_nominal_admittance_shunt_in_pu();
+        complex<double> Yshunt = shunt.get_nominal_admittance_shunt_in_pu();
 
-    network_BP_matrix.add_entry(i,i, 0.0);
-    network_BQ_matrix.add_entry(i,i, Yshunt);
-    return;
+        network_BP_matrix.add_entry(i,i, 0.0);
+        network_BQ_matrix.add_entry(i,i, Yshunt);
+    }
 }
 
 
@@ -1737,31 +1735,31 @@ void NETWORK_MATRIX::add_lines_to_dc_network()
 
 void NETWORK_MATRIX::add_line_to_dc_network(const LINE& line)
 {
-    if(line.get_sending_side_breaker_status()==false and line.get_receiving_side_breaker_status()==false)
-        return;
-
-    /*ostringstream osstream;
-    osstream<<"Adding line '%s' connecting to bus %u and %u to network Y matrix.", (line.get_identifier()).c_str(),
-                  line.get_sending_side_bus(), line.get_receiving_side_bus());
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    */
+    if(line.get_sending_side_breaker_status()==true or line.get_receiving_side_breaker_status()==true)
+    {
+        /*ostringstream osstream;
+        osstream<<"Adding line '%s' connecting to bus %u and %u to network Y matrix.", (line.get_identifier()).c_str(),
+                      line.get_sending_side_bus(), line.get_receiving_side_bus());
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        */
 
-    size_t sending_bus = line.get_sending_side_bus();
-    size_t receiving_bus = line.get_receiving_side_bus();
+        size_t sending_bus = line.get_sending_side_bus();
+        size_t receiving_bus = line.get_receiving_side_bus();
 
-    size_t i = inphno.get_internal_bus_number_of_physical_bus_number(sending_bus);
-    size_t j = inphno.get_internal_bus_number_of_physical_bus_number(receiving_bus);
+        size_t i = inphno.get_internal_bus_number_of_physical_bus_number(sending_bus);
+        size_t j = inphno.get_internal_bus_number_of_physical_bus_number(receiving_bus);
 
-    complex<double> Zline = line.get_line_positive_sequence_z_in_pu();
-    Zline = complex<double>(0.0, Zline.imag());
-    complex<double> Yline = 1.0/Zline;
-    if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==true)
-    {
-        network_DC_B_matrix.add_entry(i,j, -Yline);
-        network_DC_B_matrix.add_entry(j,i, -Yline);
-        network_DC_B_matrix.add_entry(i,i, Yline);
-        network_DC_B_matrix.add_entry(j,j, Yline);
-        return;
+        complex<double> Zline = line.get_line_positive_sequence_z_in_pu();
+        Zline = complex<double>(0.0, Zline.imag());
+        complex<double> Yline = 1.0/Zline;
+        if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==true)
+        {
+            network_DC_B_matrix.add_entry(i,j, -Yline);
+            network_DC_B_matrix.add_entry(j,i, -Yline);
+            network_DC_B_matrix.add_entry(i,i, Yline);
+            network_DC_B_matrix.add_entry(j,j, Yline);
+            return;
+        }
     }
 }
 
@@ -1788,136 +1786,135 @@ void NETWORK_MATRIX::add_transformer_to_dc_network(const TRANSFORMER& trans)
 
 void NETWORK_MATRIX::add_three_winding_transformer_to_dc_network(const TRANSFORMER& trans)
 {
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
-        return;
-
-    /*ostringstream osstream;
-    osstream<<"Adding three-winding transformer '%s' connecting to bus %u, %u, and %u to network Y matrix.", (trans.get_identifier()).c_str(),
-                  trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE), trans.get_winding_bus(TERTIARY_SIDE));
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    */
-
-    size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
-    size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
-    size_t tertiary_bus = trans.get_winding_bus(TERTIARY_SIDE);
-
-    size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
-    size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
-    size_t t = inphno.get_internal_bus_number_of_physical_bus_number(tertiary_bus);
-
-    complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
-    complex<double> Zst = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
-    complex<double> Zpt = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
-
-    complex<double> Zp = 0.5*(Zps+Zpt-Zst),
-                     Zs = 0.5*(Zps+Zst-Zpt),
-                     Zt = 0.5*(Zpt+Zst-Zps);
-    double Xp = Zp.imag();
-    double Xs = Zs.imag();
-    double Xt = Zt.imag();
-
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true or
+       trans.get_winding_breaker_status(SECONDARY_SIDE)==true or
        trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
     {
-        double Xsigma = Xp*Xs+Xs*Xt+Xt*Xp;
-        double Xps = Xsigma/Xt;
-        double Xst = Xsigma/Xp;
-        double Xtp = Xsigma/Xs;
-
-        complex<double> Yps(0.0, -1.0/Xps);
-        complex<double> Yst(0.0, -1.0/Xst);
-        complex<double> Ytp(0.0, -1.0/Xtp);
-
-        network_DC_B_matrix.add_entry(p,p,Yps+Ytp);
-        network_DC_B_matrix.add_entry(p,s,-Yps);
-        network_DC_B_matrix.add_entry(p,t,-Ytp);
-        network_DC_B_matrix.add_entry(s,p,-Yps);
-        network_DC_B_matrix.add_entry(s,s,Yps+Yst);
-        network_DC_B_matrix.add_entry(s,t,-Yst);
-        network_DC_B_matrix.add_entry(t,p,-Ytp);
-        network_DC_B_matrix.add_entry(t,s,-Yst);
-        network_DC_B_matrix.add_entry(t,t,Yst+Ytp);
-        return;
-    }
-
+        /*ostringstream osstream;
+        osstream<<"Adding three-winding transformer '%s' connecting to bus %u, %u, and %u to network Y matrix.", (trans.get_identifier()).c_str(),
+                      trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE), trans.get_winding_bus(TERTIARY_SIDE));
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        */
+
+        size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
+        size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
+        size_t tertiary_bus = trans.get_winding_bus(TERTIARY_SIDE);
+
+        size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
+        size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
+        size_t t = inphno.get_internal_bus_number_of_physical_bus_number(tertiary_bus);
+
+        complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+        complex<double> Zst = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(SECONDARY_SIDE, TERTIARY_SIDE);
+        complex<double> Zpt = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, TERTIARY_SIDE);
+
+        complex<double> Zp = 0.5*(Zps+Zpt-Zst),
+                         Zs = 0.5*(Zps+Zst-Zpt),
+                         Zt = 0.5*(Zpt+Zst-Zps);
+        double Xp = Zp.imag();
+        double Xs = Zs.imag();
+        double Xt = Zt.imag();
+
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
+        {
+            double Xsigma = Xp*Xs+Xs*Xt+Xt*Xp;
+            double Xps = Xsigma/Xt;
+            double Xst = Xsigma/Xp;
+            double Xtp = Xsigma/Xs;
+
+            complex<double> Yps(0.0, -1.0/Xps);
+            complex<double> Yst(0.0, -1.0/Xst);
+            complex<double> Ytp(0.0, -1.0/Xtp);
+
+            network_DC_B_matrix.add_entry(p,p,Yps+Ytp);
+            network_DC_B_matrix.add_entry(p,s,-Yps);
+            network_DC_B_matrix.add_entry(p,t,-Ytp);
+            network_DC_B_matrix.add_entry(s,p,-Yps);
+            network_DC_B_matrix.add_entry(s,s,Yps+Yst);
+            network_DC_B_matrix.add_entry(s,t,-Yst);
+            network_DC_B_matrix.add_entry(t,p,-Ytp);
+            network_DC_B_matrix.add_entry(t,s,-Yst);
+            network_DC_B_matrix.add_entry(t,t,Yst+Ytp);
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
-    {
-        double Xps = Zps.imag();
-        complex<double> Yps(0.0, -1.0/Xps);
 
-        network_DC_B_matrix.add_entry(p,p,Yps);
-        network_DC_B_matrix.add_entry(p,s,-Yps);
-        network_DC_B_matrix.add_entry(s,p,-Yps);
-        network_DC_B_matrix.add_entry(s,s,Yps);
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==false)
+        {
+            double Xps = Zps.imag();
+            complex<double> Yps(0.0, -1.0/Xps);
+
+            network_DC_B_matrix.add_entry(p,p,Yps);
+            network_DC_B_matrix.add_entry(p,s,-Yps);
+            network_DC_B_matrix.add_entry(s,p,-Yps);
+            network_DC_B_matrix.add_entry(s,s,Yps);
+            return;
+        }
 
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
-    {
-        double Xpt = Zpt.imag();
-        complex<double> Ypt(0.0, -1.0/Xpt);
-
-        network_DC_B_matrix.add_entry(p,p,Ypt);
-        network_DC_B_matrix.add_entry(p,t,-Ypt);
-        network_DC_B_matrix.add_entry(t,p,-Ypt);
-        network_DC_B_matrix.add_entry(t,t,Ypt);
-        return;
-    }
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==false and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
+        {
+            double Xpt = Zpt.imag();
+            complex<double> Ypt(0.0, -1.0/Xpt);
+
+            network_DC_B_matrix.add_entry(p,p,Ypt);
+            network_DC_B_matrix.add_entry(p,t,-Ypt);
+            network_DC_B_matrix.add_entry(t,p,-Ypt);
+            network_DC_B_matrix.add_entry(t,t,Ypt);
+            return;
+        }
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
-       trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
-       trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
-    {
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and
+           trans.get_winding_breaker_status(SECONDARY_SIDE)==true and
+           trans.get_winding_breaker_status(TERTIARY_SIDE)==true)
+        {
 
-        double Xst = Zst.imag();
-        complex<double> Yst(0.0, -1.0/Xst);
+            double Xst = Zst.imag();
+            complex<double> Yst(0.0, -1.0/Xst);
 
-        network_DC_B_matrix.add_entry(s,s,Yst);
-        network_DC_B_matrix.add_entry(s,t,-Yst);
-        network_DC_B_matrix.add_entry(t,s,-Yst);
-        network_DC_B_matrix.add_entry(t,t,Yst);
-        return;
+            network_DC_B_matrix.add_entry(s,s,Yst);
+            network_DC_B_matrix.add_entry(s,t,-Yst);
+            network_DC_B_matrix.add_entry(t,s,-Yst);
+            network_DC_B_matrix.add_entry(t,t,Yst);
+            return;
+        }
     }
 }
 
 void NETWORK_MATRIX::add_two_winding_transformer_to_dc_network(const TRANSFORMER& trans)
 {
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==false and trans.get_winding_breaker_status(SECONDARY_SIDE)==false)
-        return;
-
-    /*ostringstream osstream;
-    osstream<<"Adding two-winding transformer '%s' connecting to bus %u and %u to network Y matrix.", (trans.get_identifier()).c_str(),
-                  trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE));
-    toolkit.show_information_with_leading_time_stamp(osstream);
-    */
+    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true or trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
+    {
+        /*ostringstream osstream;
+        osstream<<"Adding two-winding transformer '%s' connecting to bus %u and %u to network Y matrix.", (trans.get_identifier()).c_str(),
+                      trans.get_winding_bus(PRIMARY_SIDE), trans.get_winding_bus(SECONDARY_SIDE));
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        */
 
-    size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
-    size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
+        size_t primary_bus = trans.get_winding_bus(PRIMARY_SIDE);
+        size_t secondary_bus = trans.get_winding_bus(SECONDARY_SIDE);
 
-    size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
-    size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
+        size_t p = inphno.get_internal_bus_number_of_physical_bus_number(primary_bus);
+        size_t s = inphno.get_internal_bus_number_of_physical_bus_number(secondary_bus);
 
-    complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
+        complex<double> Zps = trans.get_leakage_impedance_between_windings_based_on_system_base_power_in_pu(PRIMARY_SIDE, SECONDARY_SIDE);
 
-    double Xps = Zps.imag();
-    complex<double> Yps(0.0, -1.0/Xps);
+        double Xps = Zps.imag();
+        complex<double> Yps(0.0, -1.0/Xps);
 
-    if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
-    {
-        network_DC_B_matrix.add_entry(p,p,Yps);
-        network_DC_B_matrix.add_entry(p,s,-Yps);
-        network_DC_B_matrix.add_entry(s,p,-Yps);
-        network_DC_B_matrix.add_entry(s,s,Yps);
-        return;
+        if(trans.get_winding_breaker_status(PRIMARY_SIDE)==true and trans.get_winding_breaker_status(SECONDARY_SIDE)==true)
+        {
+            network_DC_B_matrix.add_entry(p,p,Yps);
+            network_DC_B_matrix.add_entry(p,s,-Yps);
+            network_DC_B_matrix.add_entry(s,p,-Yps);
+            network_DC_B_matrix.add_entry(s,s,Yps);
+        }
     }
 }
 
@@ -1935,15 +1932,17 @@ void NETWORK_MATRIX::add_bus_fault_to_dynamic_network()
     for(size_t i = 0; i!=n; ++i)
     {
         bus = buses[i];
-        if(bus->get_bus_type()==OUT_OF_SERVICE)
-            continue;
-
-        if(bus->is_faulted())
+        if(bus->get_bus_type()!=OUT_OF_SERVICE)
         {
-            FAULT fault = bus->get_fault();
-            complex<double> y = fault.get_fault_shunt_in_pu();
-            size_t j = inphno.get_internal_bus_number_of_physical_bus_number(bus->get_bus_number());
-            network_Y_matrix.add_entry(j,j, y);
+            if(not bus->is_faulted())
+                continue;
+            else
+            {
+                FAULT fault = bus->get_fault();
+                complex<double> y = fault.get_fault_shunt_in_pu();
+                size_t j = inphno.get_internal_bus_number_of_physical_bus_number(bus->get_bus_number());
+                network_Y_matrix.add_entry(j,j, y);
+            }
         }
     }
 }
@@ -1968,187 +1967,185 @@ void NETWORK_MATRIX::add_lines_to_dynamic_network()
 
 void NETWORK_MATRIX::add_faulted_line_to_dynamic_network(const LINE& line)
 {
-    if(line.get_sending_side_breaker_status()==false and line.get_receiving_side_breaker_status()==false)
-        return;
-
-    if(not line.is_faulted())
+    if(line.get_sending_side_breaker_status()==true or line.get_receiving_side_breaker_status()==true)
     {
-        add_line_to_network(line);
-        return;
-    }
-
-    /*ostringstream osstream;
-    osstream<<"Adding line '%s' connecting to bus %u and %u to network Y matrix.", (line.get_identifier()).c_str(),
-                  line.get_sending_side_bus(), line.get_receiving_side_bus());
-    toolkit.show_information_with_leading_time_stamp(osstream);*/
-
-    size_t sending_bus = line.get_sending_side_bus();
-    size_t receiving_bus = line.get_receiving_side_bus();
-
-    size_t i = inphno.get_internal_bus_number_of_physical_bus_number(sending_bus);
-    size_t j = inphno.get_internal_bus_number_of_physical_bus_number(receiving_bus);
+        if(line.is_faulted())
+        {
+            /*ostringstream osstream;
+            osstream<<"Adding line '%s' connecting to bus %u and %u to network Y matrix.", (line.get_identifier()).c_str(),
+                          line.get_sending_side_bus(), line.get_receiving_side_bus());
+            toolkit.show_information_with_leading_time_stamp(osstream);*/
 
-    complex<double> Zline = line.get_line_positive_sequence_z_in_pu();
-    complex<double> Yline = line.get_line_positive_sequence_y_in_pu();
-    complex<double> Yshunt_sending = line.get_shunt_positive_sequence_y_at_sending_side_in_pu();
-    complex<double> Yshunt_receiving = line.get_shunt_positive_sequence_y_at_receiving_side_in_pu();
+            size_t sending_bus = line.get_sending_side_bus();
+            size_t receiving_bus = line.get_receiving_side_bus();
 
-    size_t nfault = line.get_fault_count();
-    // take care of fault at two ends
-    FAULT fault = line.get_fault_at_location(line.get_sending_side_bus(), 0.0);
-    Yshunt_sending += fault.get_fault_shunt_in_pu();
+            size_t i = inphno.get_internal_bus_number_of_physical_bus_number(sending_bus);
+            size_t j = inphno.get_internal_bus_number_of_physical_bus_number(receiving_bus);
 
-    fault = line.get_fault_at_location(line.get_sending_side_bus(), 1.0);
-    Yshunt_receiving += fault.get_fault_shunt_in_pu();
+            complex<double> Zline = line.get_line_positive_sequence_z_in_pu();
+            complex<double> Yline = line.get_line_positive_sequence_y_in_pu();
+            complex<double> Yshunt_sending = line.get_shunt_positive_sequence_y_at_sending_side_in_pu();
+            complex<double> Yshunt_receiving = line.get_shunt_positive_sequence_y_at_receiving_side_in_pu();
 
-    vector<SUBLINE> sublines;
+            size_t nfault = line.get_fault_count();
+            // take care of fault at two ends
+            FAULT fault = line.get_fault_at_location(line.get_sending_side_bus(), 0.0);
+            Yshunt_sending += fault.get_fault_shunt_in_pu();
 
-    double starting_fault_location;
-    size_t n;
+            fault = line.get_fault_at_location(line.get_sending_side_bus(), 1.0);
+            Yshunt_receiving += fault.get_fault_shunt_in_pu();
 
-    for(size_t k=0; k!=nfault; ++k)
-    {
-        double this_fault_location = line.get_fault_location_of_fault(k);
-        if(this_fault_location == 0.0 or this_fault_location == 1.0)
-            continue;
+            vector<SUBLINE> sublines;
 
-        n = sublines.size();
-        if(n==0)
-            starting_fault_location = 0.0;
-        else
-            starting_fault_location = sublines[n-1].to_loc;
+            double starting_fault_location;
+            size_t n;
 
-        SUBLINE sl;
-        sl.from_loc = starting_fault_location;
-        sl.to_loc = this_fault_location;
-        sublines.push_back(sl);
-    }
-    n = sublines.size();
-    if(n==0)
-        starting_fault_location = 0.0;
-    else
-        starting_fault_location = sublines[n-1].to_loc;
+            for(size_t k=0; k!=nfault; ++k)
+            {
+                double this_fault_location = line.get_fault_location_of_fault(k);
+                if(this_fault_location != 0.0 and this_fault_location != 1.0)
+                {
+                    n = sublines.size();
+                    if(n==0)
+                        starting_fault_location = 0.0;
+                    else
+                        starting_fault_location = sublines[n-1].to_loc;
+
+                    SUBLINE sl;
+                    sl.from_loc = starting_fault_location;
+                    sl.to_loc = this_fault_location;
+                    sublines.push_back(sl);
+                }
+            }
+            n = sublines.size();
+            if(n==0)
+                starting_fault_location = 0.0;
+            else
+                starting_fault_location = sublines[n-1].to_loc;
 
-    SUBLINE sl;
-    sl.from_loc = starting_fault_location;
-    sl.to_loc = 1.0;
-    sublines.push_back(sl);
+            SUBLINE sl;
+            sl.from_loc = starting_fault_location;
+            sl.to_loc = 1.0;
+            sublines.push_back(sl);
 
-    complex<double> V, Y, Z, y, z, I;
-    if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==true)
-    {
-        V = 1.0; // source at sending side, receiving side shorted
-        Y = 0.0; Z = 0;
-        n = sublines.size();
-        double line_length = sublines[n-1].to_loc - sublines[n-1].from_loc;
-        y = Yline*line_length; z = Zline*line_length;
-        Z = z; Y = 1.0/Z+y*0.5;
-        for(int k=n-2; k>=0; --k)
-        {
-            double fault_location = sublines[k].to_loc;
-            line_length = sublines[k].to_loc - sublines[k].from_loc;
-            fault = line.get_fault_at_location(line.get_sending_side_bus(), fault_location);
-            complex<double> yfault = fault.get_fault_shunt_in_pu();
-            y = Yline*line_length; z = Zline*line_length;
-            Y = Y+y*0.5+yfault; Z = z+1.0/Y;
-            Y = 1.0/Z+y*0.5;
-        }
-        Y = Y+Yshunt_sending;
-        I = V*Y;
-        network_Y_matrix.add_entry(i,i, I);
-        Y = Yshunt_sending;
-        I = I-V*Y;
-        for(size_t k=0; k!=n; ++k)
-        {
-            double fault_location = sublines[k].to_loc;
-            line_length = sublines[k].to_loc - sublines[k].from_loc;
-            y = Yline*line_length; z = Zline*line_length;
-            I = I-V*y*0.5;
-            V = V-I*z;
-            if(fault_location!=1.0)
+            complex<double> V, Y, Z, y, z, I;
+            if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==true)
             {
-                I = I - V*y*0.5;
-                fault = line.get_fault_at_location(line.get_sending_side_bus(), fault_location);
-                complex<double> yfault = fault.get_fault_shunt_in_pu();
-                I = I - V*yfault;
-            }
-        }
-        network_Y_matrix.add_entry(j,i, -I);
-        network_Y_matrix.add_entry(i,j, -I);
+                V = 1.0; // source at sending side, receiving side shorted
+                Y = 0.0; Z = 0;
+                n = sublines.size();
+                double line_length = sublines[n-1].to_loc - sublines[n-1].from_loc;
+                y = Yline*line_length; z = Zline*line_length;
+                Z = z; Y = 1.0/Z+y*0.5;
+                for(int k=n-2; k>=0; --k)
+                {
+                    double fault_location = sublines[k].to_loc;
+                    line_length = sublines[k].to_loc - sublines[k].from_loc;
+                    fault = line.get_fault_at_location(line.get_sending_side_bus(), fault_location);
+                    complex<double> yfault = fault.get_fault_shunt_in_pu();
+                    y = Yline*line_length; z = Zline*line_length;
+                    Y = Y+y*0.5+yfault; Z = z+1.0/Y;
+                    Y = 1.0/Z+y*0.5;
+                }
+                Y = Y+Yshunt_sending;
+                I = V*Y;
+                network_Y_matrix.add_entry(i,i, I);
+                Y = Yshunt_sending;
+                I = I-V*Y;
+                for(size_t k=0; k!=n; ++k)
+                {
+                    double fault_location = sublines[k].to_loc;
+                    line_length = sublines[k].to_loc - sublines[k].from_loc;
+                    y = Yline*line_length; z = Zline*line_length;
+                    I = I-V*y*0.5;
+                    V = V-I*z;
+                    if(fault_location!=1.0)
+                    {
+                        I = I - V*y*0.5;
+                        fault = line.get_fault_at_location(line.get_sending_side_bus(), fault_location);
+                        complex<double> yfault = fault.get_fault_shunt_in_pu();
+                        I = I - V*yfault;
+                    }
+                }
+                network_Y_matrix.add_entry(j,i, -I);
+                network_Y_matrix.add_entry(i,j, -I);
 
-        V = 1.0; // source at receiving side, sending side shorted
+                V = 1.0; // source at receiving side, sending side shorted
 
-        n = sublines.size();
-        line_length = sublines[0].to_loc - sublines[0].from_loc;
-        y = Yline*line_length; z = Zline*line_length;
-        Z = z; Y = 1.0/Z+y*0.5;
-        for(size_t k=1; k!=n; ++k)
-        {
-            double fault_location = sublines[k].from_loc;
-            line_length = sublines[k].to_loc - sublines[k].from_loc;
-            y = Yline*line_length; z = Zline*line_length;
-            fault = line.get_fault_at_location(line.get_sending_side_bus(), fault_location);
-            complex<double> yfault = fault.get_fault_shunt_in_pu();
-            Y = Y+y*0.5+yfault; Z = z+1.0/Y;
-            Y = 1.0/Z+y*0.5;
-        }
-        Y = Y+Yshunt_receiving;
-        I = V*Y;
-        network_Y_matrix.add_entry(j,j, I);
-        return;
-    }
+                n = sublines.size();
+                line_length = sublines[0].to_loc - sublines[0].from_loc;
+                y = Yline*line_length; z = Zline*line_length;
+                Z = z; Y = 1.0/Z+y*0.5;
+                for(size_t k=1; k!=n; ++k)
+                {
+                    double fault_location = sublines[k].from_loc;
+                    line_length = sublines[k].to_loc - sublines[k].from_loc;
+                    y = Yline*line_length; z = Zline*line_length;
+                    fault = line.get_fault_at_location(line.get_sending_side_bus(), fault_location);
+                    complex<double> yfault = fault.get_fault_shunt_in_pu();
+                    Y = Y+y*0.5+yfault; Z = z+1.0/Y;
+                    Y = 1.0/Z+y*0.5;
+                }
+                Y = Y+Yshunt_receiving;
+                I = V*Y;
+                network_Y_matrix.add_entry(j,j, I);
+                return;
+            }
 
-    if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==false)
-    {
-        V = 1.0; // source at sending side
-        Y = Yshunt_receiving; Z = 0;
-        n = sublines.size();
-        for(int k=n-1; k>=0; --k)
-        {
-            double fault_location = sublines[k].from_loc;
-            double line_length = sublines[k].to_loc - sublines[k].from_loc;
-            complex<double> yfault = 0.0;
-            if(fault_location!=0.0)
+            if(line.get_sending_side_breaker_status()==true and line.get_receiving_side_breaker_status()==false)
             {
-                fault = line.get_fault_at_location(line.get_sending_side_bus(), fault_location);
-                yfault = fault.get_fault_shunt_in_pu();
+                V = 1.0; // source at sending side
+                Y = Yshunt_receiving; Z = 0;
+                n = sublines.size();
+                for(int k=n-1; k>=0; --k)
+                {
+                    double fault_location = sublines[k].from_loc;
+                    double line_length = sublines[k].to_loc - sublines[k].from_loc;
+                    complex<double> yfault = 0.0;
+                    if(fault_location!=0.0)
+                    {
+                        fault = line.get_fault_at_location(line.get_sending_side_bus(), fault_location);
+                        yfault = fault.get_fault_shunt_in_pu();
+                    }
+                    y = Yline*line_length; z = Zline*line_length;
+                    Y = Y+y*0.5; Z = z+1.0/Y;
+                    Y = 1.0/Z+y*0.5+yfault;
+                }
+                Y = Y+Yshunt_sending;
+                I = V*Y;
+                network_Y_matrix.add_entry(i,i, I);
+                return;
             }
-            y = Yline*line_length; z = Zline*line_length;
-            Y = Y+y*0.5; Z = z+1.0/Y;
-            Y = 1.0/Z+y*0.5+yfault;
-        }
-        Y = Y+Yshunt_sending;
-        I = V*Y;
-        network_Y_matrix.add_entry(i,i, I);
-        return;
-    }
 
-    if(line.get_sending_side_breaker_status()==false and line.get_receiving_side_breaker_status()==true)
-    {
-        V = 1.0; // source at receiving side
-        Y = Yshunt_sending; Z = 0;
-        n = sublines.size();
-        int nint = int(n);
-        for(int k=0; k!=nint; ++k)
-        {
-            double fault_location = sublines[k].to_loc;
-            double line_length = sublines[k].to_loc - sublines[k].from_loc;
-            complex<double> yfault = 0.0;
-            if(fault_location!=1.0)
+            if(line.get_sending_side_breaker_status()==false and line.get_receiving_side_breaker_status()==true)
             {
-                fault = line.get_fault_at_location(line.get_sending_side_bus(), fault_location);
-                yfault = fault.get_fault_shunt_in_pu();
+                V = 1.0; // source at receiving side
+                Y = Yshunt_sending; Z = 0;
+                n = sublines.size();
+                int nint = int(n);
+                for(int k=0; k!=nint; ++k)
+                {
+                    double fault_location = sublines[k].to_loc;
+                    double line_length = sublines[k].to_loc - sublines[k].from_loc;
+                    complex<double> yfault = 0.0;
+                    if(fault_location!=1.0)
+                    {
+                        fault = line.get_fault_at_location(line.get_sending_side_bus(), fault_location);
+                        yfault = fault.get_fault_shunt_in_pu();
+                    }
+                    y = Yline*line_length; z = Zline*line_length;
+                    Y = Y+y*0.5; Z = z+1.0/Y;
+                    Y = 1.0/Z+y*0.5+yfault;
+                }
+                Y = Y+Yshunt_receiving;
+                I = V*Y;
+                network_Y_matrix.add_entry(j,j, I);
+                return;
             }
-            y = Yline*line_length; z = Zline*line_length;
-            Y = Y+y*0.5; Z = z+1.0/Y;
-            Y = 1.0/Z+y*0.5+yfault;
         }
-        Y = Y+Yshunt_receiving;
-        I = V*Y;
-        network_Y_matrix.add_entry(j,j, I);
-        return;
+        else // line is not faulted
+            add_line_to_network(line);
     }
-
 }
 
 void NETWORK_MATRIX::add_generators_to_dynamic_network()
@@ -2165,19 +2162,19 @@ void NETWORK_MATRIX::add_generators_to_dynamic_network()
 
 void NETWORK_MATRIX::add_generator_to_dynamic_network(const GENERATOR& gen)
 {
-    if(gen.get_status()==false)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    complex<double> Z = gen.get_source_impedance_in_pu();
-    double mbase = gen.get_mbase_in_MVA();
-    double mvabase = psdb.get_system_base_power_in_MVA();
-    Z = Z/mbase*mvabase;
+    if(gen.get_status()==true)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        complex<double> Z = gen.get_source_impedance_in_pu();
+        double mbase = gen.get_mbase_in_MVA();
+        double mvabase = psdb.get_system_base_power_in_MVA();
+        Z = Z/mbase*mvabase;
 
-    size_t bus = gen.get_generator_bus();
-    size_t i = inphno.get_internal_bus_number_of_physical_bus_number(bus);
-    network_Y_matrix.add_entry(i,i,1.0/Z);
+        size_t bus = gen.get_generator_bus();
+        size_t i = inphno.get_internal_bus_number_of_physical_bus_number(bus);
+        network_Y_matrix.add_entry(i,i,1.0/Z);
+    }
 }
 
 void NETWORK_MATRIX::add_wt_generators_to_dynamic_network()
@@ -2194,31 +2191,35 @@ void NETWORK_MATRIX::add_wt_generators_to_dynamic_network()
 
 void NETWORK_MATRIX::add_wt_generator_to_dynamic_network(WT_GENERATOR& gen)
 {
-    if(gen.get_status()==false)
-        return;
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    WT_GENERATOR_MODEL* genmodel = gen.get_wt_generator_model();
-    if(genmodel==NULL)
-    {
-        ostringstream osstream;
-        osstream<<"Error. No WT_GENERATOR_MODEL is provided for "<<gen.get_device_name()<<endl
-                <<"Its source impedance will not be added to network matrix.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-    if(genmodel->is_current_source())
-        return;
-    else // is voltage source
-    {
-        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-        complex<double> Z = gen.get_source_impedance_in_pu();
-        double mbase = gen.get_mbase_in_MVA();
-        double mvabase = psdb.get_system_base_power_in_MVA();
-        Z = Z/mbase*mvabase;
-
-        size_t bus = gen.get_generator_bus();
-        size_t i = inphno.get_internal_bus_number_of_physical_bus_number(bus);
-        network_Y_matrix.add_entry(i,i,1.0/Z);
+    if(gen.get_status()==true)
+    {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        WT_GENERATOR_MODEL* genmodel = gen.get_wt_generator_model();
+        if(genmodel!=NULL)
+        {
+            if(genmodel->is_voltage_source())
+            {
+                POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+                complex<double> Z = gen.get_source_impedance_in_pu();
+                double mbase = gen.get_mbase_in_MVA();
+                double mvabase = psdb.get_system_base_power_in_MVA();
+                Z = Z/mbase*mvabase;
+
+                size_t bus = gen.get_generator_bus();
+                size_t i = inphno.get_internal_bus_number_of_physical_bus_number(bus);
+                network_Y_matrix.add_entry(i,i,1.0/Z);
+            }
+            //else // is current source
+            //    return;
+        }
+        else
+        {
+            ostringstream osstream;
+            osstream<<"Error. No WT_GENERATOR_MODEL is provided for "<<gen.get_device_name()<<endl
+                    <<"Its source impedance will not be added to network matrix.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+            return;
+        }
     }
 }
 
@@ -2243,20 +2244,21 @@ void NETWORK_MATRIX::initialize_physical_internal_bus_pair()
 
     size_t nbus = buses.size();
 
-    if(nbus==0)
-        return;
-
-    inphno.clear();
-
-    size_t bus_number;
-    size_t internal_bus_number = 0;
-    for(size_t i=0; i!=nbus; ++i)
+    if(nbus!=0)
     {
-        if(buses[i]->get_bus_type()==OUT_OF_SERVICE)
-            continue;
-        bus_number = buses[i]->get_bus_number();
-        inphno.set_physical_internal_bus_number_pair(bus_number, internal_bus_number);
-        internal_bus_number ++;
+        inphno.clear();
+
+        size_t bus_number;
+        size_t internal_bus_number = 0;
+        for(size_t i=0; i!=nbus; ++i)
+        {
+            if(buses[i]->get_bus_type()!=OUT_OF_SERVICE)
+            {
+                bus_number = buses[i]->get_bus_number();
+                inphno.set_physical_internal_bus_number_pair(bus_number, internal_bus_number);
+                internal_bus_number ++;
+            }
+        }
     }
 }
 
@@ -2326,16 +2328,16 @@ void NETWORK_MATRIX::check_newtork_connectivity()
         {
             physical_bus = islands[i][j];
             bus = psdb.get_bus(physical_bus);
-            if(bus->get_bus_type()==SLACK_TYPE)
+            if(bus->get_bus_type()!=SLACK_TYPE)
             {
-                osstream<<physical_bus<<" (Slack bus)";
+                osstream<<physical_bus;
                 toolkit.show_information_with_leading_time_stamp(osstream);
-                there_is_slack_bus_in_island = true;
             }
             else
             {
-                osstream<<physical_bus;
+                osstream<<physical_bus<<" (Slack bus)";
                 toolkit.show_information_with_leading_time_stamp(osstream);
+                there_is_slack_bus_in_island = true;
             }
         }
         if(not there_is_slack_bus_in_island)
@@ -2387,40 +2389,41 @@ vector< vector<size_t> > NETWORK_MATRIX::get_islands_with_internal_bus_number()
                 break;
             }
         }
-        if(new_island_found==false)
-            break;
-
-        vector<size_t> this_island;
-        this_island.reserve(nbus);
+        if(new_island_found==true)
+        {
+            vector<size_t> this_island;
+            this_island.reserve(nbus);
 
-        this_island.push_back(first_bus_in_new_island);
-        bus_searched_flag[first_bus_in_new_island] = true;
+            this_island.push_back(first_bus_in_new_island);
+            bus_searched_flag[first_bus_in_new_island] = true;
 
-        int searching_bus=0;
-        size_t nbus_in_island = this_island.size();
-        for(size_t i=0; i!=nbus_in_island; ++i)
-        {
-            searching_bus = this_island[i];
-            int k_start = network_Y_matrix.get_starting_index_of_column(searching_bus);
-            int k_end = network_Y_matrix.get_starting_index_of_column(searching_bus+1);
-            int row_bus;
-            for(int k=k_start; k!=k_end; ++k)
+            int searching_bus=0;
+            size_t nbus_in_island = this_island.size();
+            for(size_t i=0; i!=nbus_in_island; ++i)
             {
-                row_bus = network_Y_matrix.get_row_number_of_entry_index(k);
-                if(row_bus!=searching_bus)
+                searching_bus = this_island[i];
+                int k_start = network_Y_matrix.get_starting_index_of_column(searching_bus);
+                int k_end = network_Y_matrix.get_starting_index_of_column(searching_bus+1);
+                int row_bus;
+                for(int k=k_start; k!=k_end; ++k)
                 {
-                    if(bus_searched_flag[row_bus]==false)
+                    row_bus = network_Y_matrix.get_row_number_of_entry_index(k);
+                    if(row_bus!=searching_bus)
                     {
-                        this_island.push_back(row_bus);
-                        nbus_in_island = this_island.size();
-                        bus_searched_flag[row_bus] = true;
+                        if(bus_searched_flag[row_bus]==false)
+                        {
+                            this_island.push_back(row_bus);
+                            nbus_in_island = this_island.size();
+                            bus_searched_flag[row_bus] = true;
+                        }
                     }
                 }
             }
+            islands.push_back(this_island);
         }
-        islands.push_back(this_island);
+        else
+            break;
     }
-
     return islands;
 }
 
@@ -2605,16 +2608,17 @@ void NETWORK_MATRIX::save_network_matrix_to_file(string filename) const
 
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     ofstream file(filename);
-    if(not file.is_open())
+    if(file.is_open())
+    {
+        save_network_matrix_common(file);
+        file.close();
+    }
+    else
     {
         osstream<<"File '"<<filename<<"' cannot be opened for saving network matrix to file."<<endl
           <<"No network matrix will be exported.";
         toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
     }
-
-    save_network_matrix_common(file);
-    file.close();
 }
 
 
@@ -2624,42 +2628,43 @@ void NETWORK_MATRIX::save_decoupled_network_matrix_to_file(string filename) cons
     ostringstream osstream;
 
     ofstream file(filename);
-    if(not file.is_open())
-    {
-        osstream<<"File '"<<filename<<"' cannot be opened for saving decoupled network matrix to file."<<endl
-          <<"No decoupled network matrix will be exported.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    file<<"ROW,ROW_BUS,COLUMN,COLUMN_BUS,BP,BQ"<<endl;
-
-    size_t i, ibus, jbus;
-    size_t n = network_BP_matrix.get_matrix_size();
-    int k_starting, k_ending;
-    k_starting = 0;
-    complex<double> yp, yq;
-    char buffer[1000];
-    for(size_t j=0; j!=n; ++j)
+    if(file.is_open())
     {
-        k_ending = network_BP_matrix.get_starting_index_of_column(j+1);
-        for(int k=k_starting; k!=k_ending; ++k)
+        file<<"ROW,ROW_BUS,COLUMN,COLUMN_BUS,BP,BQ"<<endl;
+
+        size_t i, ibus, jbus;
+        size_t n = network_BP_matrix.get_matrix_size();
+        int k_starting, k_ending;
+        k_starting = 0;
+        complex<double> yp, yq;
+        char buffer[1000];
+        for(size_t j=0; j!=n; ++j)
         {
-            yp = network_BP_matrix.get_entry_value(k);
-            yq = network_BQ_matrix.get_entry_value(k);
-            i = network_BP_matrix.get_row_number_of_entry_index(k);
-            ibus = get_physical_bus_number_of_internal_bus(i);
-            jbus = get_physical_bus_number_of_internal_bus(j);
+            k_ending = network_BP_matrix.get_starting_index_of_column(j+1);
+            for(int k=k_starting; k!=k_ending; ++k)
+            {
+                yp = network_BP_matrix.get_entry_value(k);
+                yq = network_BQ_matrix.get_entry_value(k);
+                i = network_BP_matrix.get_row_number_of_entry_index(k);
+                ibus = get_physical_bus_number_of_internal_bus(i);
+                jbus = get_physical_bus_number_of_internal_bus(j);
 
-            snprintf(buffer, 1000, "%lu,%lu,%lu,%lu,%.14f,%.14f",i, ibus, j, jbus, yp.imag(), yq.imag());
-            file<<buffer<<endl;
-            /*file<<i<<","<<ibus<<","<<j<<","<<jbus<<","
-                <<setprecision(14)<<fixed<<yp.imag()<<","
-                <<setprecision(14)<<fixed<<yq.imag()<<endl;*/
+                snprintf(buffer, 1000, "%lu,%lu,%lu,%lu,%.14f,%.14f",i, ibus, j, jbus, yp.imag(), yq.imag());
+                file<<buffer<<endl;
+                /*file<<i<<","<<ibus<<","<<j<<","<<jbus<<","
+                    <<setprecision(14)<<fixed<<yp.imag()<<","
+                    <<setprecision(14)<<fixed<<yq.imag()<<endl;*/
+            }
+            k_starting = k_ending;
         }
-        k_starting = k_ending;
+        file.close();
+    }
+    else
+    {
+        osstream<<"File '"<<filename<<"' cannot be opened for saving decoupled network matrix to file."<<endl
+          <<"No decoupled network matrix will be exported.";
+        toolkit.show_information_with_leading_time_stamp(osstream);
     }
-    file.close();
 }
 
 void NETWORK_MATRIX::save_dc_network_matrix_to_file(string filename) const
@@ -2668,40 +2673,41 @@ void NETWORK_MATRIX::save_dc_network_matrix_to_file(string filename) const
     ostringstream osstream;
 
     ofstream file(filename);
-    if(not file.is_open())
+    if(file.is_open())
+    {
+        file<<"ROW,ROW_BUS,COLUMN,COLUMN_BUS,B"<<endl;
+
+        size_t i, ibus, jbus;
+        size_t n = network_DC_B_matrix.get_matrix_size();
+        int k_starting, k_ending;
+        k_starting = 0;
+        complex<double> y;
+        char buffer[1000];
+        for(size_t j=0; j!=n; ++j)
+        {
+            k_ending = network_DC_B_matrix.get_starting_index_of_column(j+1);
+            for(int k=k_starting; k!=k_ending; ++k)
+            {
+                y = network_DC_B_matrix.get_entry_value(k);
+                i = network_DC_B_matrix.get_row_number_of_entry_index(k);
+                ibus = get_physical_bus_number_of_internal_bus(i);
+                jbus = get_physical_bus_number_of_internal_bus(j);
+
+                snprintf(buffer, 1000, "%lu,%lu,%lu,%lu,%.14f",i, ibus, j, jbus, y.imag());
+                file<<buffer<<endl;
+                /*file<<i<<","<<ibus<<","<<j<<","<<jbus<<","
+                    <<setprecision(14)<<fixed<<y.imag()<<endl;*/
+            }
+            k_starting = k_ending;
+        }
+        file.close();
+    }
+    else
     {
         osstream<<"File '"<<filename<<"' cannot be opened for saving DC network matrix to file."<<endl
           <<"No DC network matrix will be exported.";
         toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    file<<"ROW,ROW_BUS,COLUMN,COLUMN_BUS,B"<<endl;
-
-    size_t i, ibus, jbus;
-    size_t n = network_DC_B_matrix.get_matrix_size();
-    int k_starting, k_ending;
-    k_starting = 0;
-    complex<double> y;
-    char buffer[1000];
-    for(size_t j=0; j!=n; ++j)
-    {
-        k_ending = network_DC_B_matrix.get_starting_index_of_column(j+1);
-        for(int k=k_starting; k!=k_ending; ++k)
-        {
-            y = network_DC_B_matrix.get_entry_value(k);
-            i = network_DC_B_matrix.get_row_number_of_entry_index(k);
-            ibus = get_physical_bus_number_of_internal_bus(i);
-            jbus = get_physical_bus_number_of_internal_bus(j);
-
-            snprintf(buffer, 1000, "%lu,%lu,%lu,%lu,%.14f",i, ibus, j, jbus, y.imag());
-            file<<buffer<<endl;
-            /*file<<i<<","<<ibus<<","<<j<<","<<jbus<<","
-                <<setprecision(14)<<fixed<<y.imag()<<endl;*/
-        }
-        k_starting = k_ending;
     }
-    file.close();
 }
 
 void NETWORK_MATRIX::save_dynamic_network_matrix_to_file(string filename) const
@@ -2710,15 +2716,17 @@ void NETWORK_MATRIX::save_dynamic_network_matrix_to_file(string filename) const
     ostringstream osstream;
 
     ofstream file(filename);
-    if(not file.is_open())
+    if(file.is_open())
+    {
+        save_network_matrix_common(file);
+        file.close();
+    }
+    else
     {
         osstream<<"File '"<<filename<<"' cannot be opened for saving dynamic network matrix to file."<<endl
           <<"No dynamic network matrix will be exported.";
         toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
     }
-    save_network_matrix_common(file);
-    file.close();
 }
 
 
diff --git a/code/source/power_system_database.cpp b/code/source/power_system_database.cpp
index 95f31f34..691982ad 100644
--- a/code/source/power_system_database.cpp
+++ b/code/source/power_system_database.cpp
@@ -69,7 +69,6 @@ void POWER_SYSTEM_DATABASE::set_database_capacity()
         Document document;
         document.Parse(str.c_str());
 
-
         if(document.HasMember("bus") and document["bus"].IsInt())
             bus_capacity = size_t(document["bus"].GetInt());
 
@@ -116,7 +115,7 @@ void POWER_SYSTEM_DATABASE::set_database_capacity()
     {
         STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
         ostringstream osstream;
-        osstream<<"No valid steps_config.json found. Use default power system database capacity.";
+        osstream<<"No configuration file <steps_config.json> is found. Use default power system database capacity.";
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 
@@ -413,9 +412,6 @@ void POWER_SYSTEM_DATABASE::append_generator(GENERATOR& generator)
 
     ostringstream osstream;
 
-    //if(generator.toolkit.get_power_system_database()==NULL)
-    //    generator.set_power_system_database(this);
-
     if(not generator.is_valid())
     {
         osstream<<"Warning. Failed to append invalid generator to power system database '"<<get_system_name()<<"'.";
@@ -469,9 +465,6 @@ void POWER_SYSTEM_DATABASE::append_wt_generator(WT_GENERATOR& wt_generator)
 
     ostringstream osstream;
 
-    //if(wt_generator.toolkit.get_power_system_database()==NULL)
-    //    wt_generator.set_power_system_database(this);
-
     if(not wt_generator.is_valid())
     {
         osstream<<"Warning. Failed to append invalid wt generator to power system database '"<<get_system_name()<<"'.";
@@ -479,7 +472,6 @@ void POWER_SYSTEM_DATABASE::append_wt_generator(WT_GENERATOR& wt_generator)
         return;
     }
 
-
     size_t wt_generator_bus = wt_generator.get_source_bus();
 
     if(not this->is_bus_in_allowed_range(wt_generator_bus))
@@ -526,9 +518,6 @@ void POWER_SYSTEM_DATABASE::append_pv_unit(PV_UNIT& pv_unit)
 
     ostringstream osstream;
 
-    //if(pv_unit.toolkit.get_power_system_database()==NULL)
-    //    pv_unit.set_power_system_database(this);
-
     if(not pv_unit.is_valid())
     {
         osstream<<"Warning. Failed to append invalid pv unit to power system database '"<<get_system_name()<<"'.";
@@ -536,7 +525,6 @@ void POWER_SYSTEM_DATABASE::append_pv_unit(PV_UNIT& pv_unit)
         return;
     }
 
-
     size_t pv_unit_bus = pv_unit.get_unit_bus();
 
     if(not this->is_bus_in_allowed_range(pv_unit_bus))
@@ -583,9 +571,6 @@ void POWER_SYSTEM_DATABASE::append_energy_storage(ENERGY_STORAGE& estorage)
 
     ostringstream osstream;
 
-    //if(estorage.toolkit.get_power_system_database()==NULL)
-    //    estorage.set_power_system_database(this);
-
     if(not estorage.is_valid())
     {
         osstream<<"Warning. Failed to append invalid energy storage to power system database '"<<get_system_name()<<"'.";
@@ -639,9 +624,6 @@ void POWER_SYSTEM_DATABASE::append_load(LOAD& load)
 
     ostringstream osstream;
 
-    //if(load.toolkit.get_power_system_database()==NULL)
-    //    load.set_power_system_database(this);
-
     if(not load.is_valid())
     {
         osstream<<"Warning. Failed to append invalid load to power system database '"<<get_system_name()<<"'.";
@@ -695,9 +677,6 @@ void POWER_SYSTEM_DATABASE::append_line(LINE& line)
 
     ostringstream osstream;
 
-    //if(line.toolkit.get_power_system_database()==NULL)
-    //    line.set_power_system_database(this);
-
     if(not line.is_valid())
     {
         osstream<<"Warning. Failed to append invalid line to power system database '"<<get_system_name()<<"'.";
@@ -759,9 +738,6 @@ void POWER_SYSTEM_DATABASE::append_transformer(TRANSFORMER& transformer)
     transformer.set_toolkit(toolkit);
     ostringstream osstream;
 
-    //if(transformer.toolkit.get_power_system_database()==NULL)
-    //    transformer.set_power_system_database(this);
-
     if(not transformer.is_valid())
     {
         osstream<<"Warning. Failed to append invalid transformer to power system database '"<<get_system_name()<<"'.";
@@ -833,9 +809,6 @@ void POWER_SYSTEM_DATABASE::append_fixed_shunt(FIXED_SHUNT& shunt)
 
     ostringstream osstream;
 
-    //if(shunt.toolkit.get_power_system_database()==NULL)
-    //    shunt.set_power_system_database(this);
-
     if(not shunt.is_valid())
     {
         osstream<<"Warning. Failed to append invalid fixed shunt to power system database '"<<get_system_name()<<"'.";
@@ -889,9 +862,6 @@ void POWER_SYSTEM_DATABASE::append_hvdc(HVDC& hvdc)
 
     ostringstream osstream;
 
-    //if(hvdc.toolkit.get_power_system_database()==NULL)
-    //    hvdc.set_power_system_database(this);
-
     if(not hvdc.is_valid())
     {
         osstream<<"Warning. Failed to append invalid hvdc to power system database '"<<get_system_name()<<"'.";
@@ -954,9 +924,6 @@ void POWER_SYSTEM_DATABASE::append_equivalent_device(EQUIVALENT_DEVICE& edevice)
 
     ostringstream osstream;
 
-    //if(edevice.toolkit.get_power_system_database()==NULL)
-    //    edevice.set_power_system_database(this);
-
     if(not edevice.is_valid())
     {
         osstream<<"Warning. Failed to append invalid equivalent device to power system database '"<<get_system_name()<<"'.";
@@ -1008,37 +975,27 @@ void POWER_SYSTEM_DATABASE::append_area(AREA& area)
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     area.set_toolkit(toolkit);
 
-    ostringstream osstream;
-
-    //if(area.toolkit.get_power_system_database()==NULL)
-    //    area.set_power_system_database(this);
-
-    if(not area.is_valid())
+    if(area.is_valid() and
+       (not this->is_area_exist(area.get_area_number())) and
+       Area.capacity()>Area.size())
     {
-        osstream<<"Warning. Failed to append invalid area to power system database '"<<get_system_name()<<"'.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    if(this->is_area_exist(area.get_area_number()))
-    {
-        osstream<<"Warning. Area "<<area.get_area_number()<<" already exists in power system database '"<<get_system_name()<<"': Area."<<endl
-          <<"Duplicate copy is not allowed.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
+        size_t area_count = get_area_count();
+        Area.push_back(area);
+        area_index[area.get_area_number()]= area_count;
     }
-
-    if(Area.capacity()==Area.size())
+    else
     {
-        osstream<<"Warning. Capacity limit ("<<Area.capacity()<<") reached when appending area to power system database '"<<get_system_name()<<"'."<<endl
-          <<"Increase capacity by modified steps_config.json.";
+        ostringstream osstream;
+        if(not area.is_valid())
+            osstream<<"Warning. Failed to append invalid area to power system database '"<<get_system_name()<<"'.";
+        if(this->is_area_exist(area.get_area_number()))
+            osstream<<"Warning. Area "<<area.get_area_number()<<" already exists in power system database '"<<get_system_name()<<"': Area."<<endl
+              <<"Duplicate copy is not allowed.";
+        if(Area.capacity()==Area.size())
+            osstream<<"Warning. Capacity limit ("<<Area.capacity()<<") reached when appending area to power system database '"<<get_system_name()<<"'."<<endl
+              <<"Increase capacity by modified steps_config.json.";
         toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
     }
-
-    size_t area_count = get_area_count();
-    Area.push_back(area);
-    area_index[area.get_area_number()]= area_count;
 }
 
 void POWER_SYSTEM_DATABASE::append_zone(ZONE& zone)
@@ -1046,33 +1003,27 @@ void POWER_SYSTEM_DATABASE::append_zone(ZONE& zone)
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     zone.set_toolkit(toolkit);
 
-    ostringstream osstream;
-    if(not zone.is_valid())
-    {
-        osstream<<"Warning. Failed to append invalid zone to power system database '"<<get_system_name()<<"'.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    if(this->is_zone_exist(zone.get_zone_number()))
+    if(zone.is_valid() and
+       (not this->is_zone_exist(zone.get_zone_number())) and
+       Zone.capacity()>Zone.size())
     {
-        osstream<<"Warning. Zone "<<zone.get_zone_number()<<" already exists in power system database '"<<get_system_name()<<"': Zone."<<endl
-          <<"Duplicate copy is not allowed.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
+        size_t zone_count = get_zone_count();
+        Zone.push_back(zone);
+        zone_index[zone.get_zone_number()]= zone_count;
     }
-
-    if(Zone.capacity()==Zone.size())
+    else
     {
-        osstream<<"Warning. Capacity limit ("<<Zone.capacity()<<") reached when appending zone to power system database '"<<get_system_name()<<"'."<<endl
-          <<"Increase capacity by modified steps_config.json.";
+        ostringstream osstream;
+        if(not zone.is_valid())
+            osstream<<"Warning. Failed to append invalid zone to power system database '"<<get_system_name()<<"'.";
+        if(this->is_zone_exist(zone.get_zone_number()))
+            osstream<<"Warning. Zone "<<zone.get_zone_number()<<" already exists in power system database '"<<get_system_name()<<"': Zone."<<endl
+              <<"Duplicate copy is not allowed.";
+        if(Zone.capacity()==Zone.size())
+            osstream<<"Warning. Capacity limit ("<<Zone.capacity()<<") reached when appending zone to power system database '"<<get_system_name()<<"'."<<endl
+              <<"Increase capacity by modified steps_config.json.";
         toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
     }
-
-    size_t zone_count = get_zone_count();
-    Zone.push_back(zone);
-    zone_index[zone.get_zone_number()]= zone_count;
 }
 
 void POWER_SYSTEM_DATABASE::append_owner(OWNER& owner)
@@ -1080,165 +1031,159 @@ void POWER_SYSTEM_DATABASE::append_owner(OWNER& owner)
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     owner.set_toolkit(toolkit);
 
-    ostringstream osstream;
-
-    if(not owner.is_valid())
-    {
-        osstream<<"Warning. Failed to append invalid owner to power system database '"<<get_system_name()<<"'.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    if(this->is_owner_exist(owner.get_owner_number()))
+    if(owner.is_valid() and
+       (not this->is_owner_exist(owner.get_owner_number())) and
+       Owner.capacity()>Owner.size())
     {
-        osstream<<"Warning. Owner "<<owner.get_owner_number()<<" already exists in power system database '"<<get_system_name()<<"': Owner."<<endl
-          <<"Duplicate copy is not allowed.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
+        size_t owner_count = get_owner_count();
+        Owner.push_back(owner);
+        owner_index[owner.get_owner_number()]= owner_count;
     }
-
-    if(Owner.capacity()==Owner.size())
+    else
     {
-        osstream<<"Warning. Capacity limit ("<<Owner.capacity()<<") reached when appending owner to power system database '"<<get_system_name()<<"'."<<endl
-          <<"Increase capacity by modified steps_config.json.";
+        ostringstream osstream;
+        if(not owner.is_valid())
+            osstream<<"Warning. Failed to append invalid owner to power system database '"<<get_system_name()<<"'.";
+        if(this->is_owner_exist(owner.get_owner_number()))
+            osstream<<"Warning. Owner "<<owner.get_owner_number()<<" already exists in power system database '"<<get_system_name()<<"': Owner."<<endl
+              <<"Duplicate copy is not allowed.";
+        if(Owner.capacity()==Owner.size())
+            osstream<<"Warning. Capacity limit ("<<Owner.capacity()<<") reached when appending owner to power system database '"<<get_system_name()<<"'."<<endl
+              <<"Increase capacity by modified steps_config.json.";
         toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
     }
-
-    size_t owner_count = get_owner_count();
-    Owner.push_back(owner);
-    owner_index[owner.get_owner_number()]= owner_count;
 }
 
 void POWER_SYSTEM_DATABASE::append_dynamic_model(const DEVICE_ID& did, const MODEL* model)
 {
-    if(did.get_device_type() != model->get_allowed_device_type())
-        return;
-    if(did.get_device_type()=="LOAD")
-    {
-        append_load_related_model(did, model);
-        return;
-    }
-    if(did.get_device_type()=="GENERATOR")
-    {
-        append_generator_related_model(did, model);
-        return;
-    }
-    if(did.get_device_type()=="WT GENERATOR")
-    {
-        append_wt_generator_related_model(did, model);
-        return;
-    }
-    if(did.get_device_type()=="PV UNIT")
-    {
-        append_pv_unit_related_model(did, model);
-        return;
-    }
-    if(did.get_device_type()=="ENERGY STORAGE")
-    {
-        append_energy_storage_related_model(did, model);
-        return;
-    }
-    if(did.get_device_type()=="HVDC")
-    {
-        append_hvdc_related_model(did, model);
-        return;
+    if(did.get_device_type() == model->get_allowed_device_type())
+    {
+        if(did.get_device_type()=="LOAD")
+        {
+            append_load_related_model(did, model);
+            return;
+        }
+        if(did.get_device_type()=="GENERATOR")
+        {
+            append_generator_related_model(did, model);
+            return;
+        }
+        if(did.get_device_type()=="WT GENERATOR")
+        {
+            append_wt_generator_related_model(did, model);
+            return;
+        }
+        if(did.get_device_type()=="PV UNIT")
+        {
+            append_pv_unit_related_model(did, model);
+            return;
+        }
+        if(did.get_device_type()=="ENERGY STORAGE")
+        {
+            append_energy_storage_related_model(did, model);
+            return;
+        }
+        if(did.get_device_type()=="HVDC")
+        {
+            append_hvdc_related_model(did, model);
+            return;
+        }
     }
-    return;
 }
 
 
 void POWER_SYSTEM_DATABASE::append_load_related_model(const DEVICE_ID& did, const MODEL* model)
 {
-    if(did.get_device_type() != model->get_allowed_device_type())
-        return;
-    if(did.get_device_type()=="LOAD")
-    {
-        LOAD* ptr = get_load(did);
-        if(ptr!=NULL)
-            ptr->set_model(model);
-        return;
+    if(did.get_device_type() == model->get_allowed_device_type())
+    {
+        if(did.get_device_type()=="LOAD")
+        {
+            LOAD* ptr = get_load(did);
+            if(ptr!=NULL)
+                ptr->set_model(model);
+        }
     }
 }
 
 void POWER_SYSTEM_DATABASE::append_generator_related_model(const DEVICE_ID& did, const MODEL* model)
 {
-    if(did.get_device_type() != model->get_allowed_device_type())
-        return;
-    if(did.get_device_type()=="GENERATOR")
-    {
-        GENERATOR* ptr = get_generator(did);
-        if(ptr!=NULL)
-            ptr->set_model(model);
-        return;
+    if(did.get_device_type() == model->get_allowed_device_type())
+    {
+        if(did.get_device_type()=="GENERATOR")
+        {
+            GENERATOR* ptr = get_generator(did);
+            if(ptr!=NULL)
+                ptr->set_model(model);
+        }
     }
 }
 
 void POWER_SYSTEM_DATABASE::append_wt_generator_related_model(const DEVICE_ID& did, const MODEL* model)
 {
-    if(did.get_device_type() != model->get_allowed_device_type())
-        return;
-    if(did.get_device_type()=="WT GENERATOR")
-    {
-        WT_GENERATOR* ptr = get_wt_generator(did);
-        if(ptr!=NULL)
-            ptr->set_model(model);
-        return;
+    if(did.get_device_type() == model->get_allowed_device_type())
+    {
+        if(did.get_device_type()=="WT GENERATOR")
+        {
+            WT_GENERATOR* ptr = get_wt_generator(did);
+            if(ptr!=NULL)
+                ptr->set_model(model);
+        }
     }
 }
 
 void POWER_SYSTEM_DATABASE::append_pv_unit_related_model(const DEVICE_ID& did, const MODEL* model)
 {
-    if(did.get_device_type() != model->get_allowed_device_type())
-        return;
-    if(did.get_device_type()=="PV UNIT")
-    {
-        PV_UNIT* ptr = get_pv_unit(did);
-        if(ptr!=NULL)
-            ptr->set_model(model);
-        return;
+    if(did.get_device_type() == model->get_allowed_device_type())
+    {
+        if(did.get_device_type()=="PV UNIT")
+        {
+            PV_UNIT* ptr = get_pv_unit(did);
+            if(ptr!=NULL)
+                ptr->set_model(model);
+        }
     }
 }
 
 void POWER_SYSTEM_DATABASE::append_energy_storage_related_model(const DEVICE_ID& did, const MODEL* model)
 {
-    if(did.get_device_type() != model->get_allowed_device_type())
-        return;
-    if(did.get_device_type()=="ENERGY STORAGE")
-    {
-        ENERGY_STORAGE* ptr = get_energy_storage(did);
-        if(ptr!=NULL)
-            ptr->set_model(model);
-        return;
+    if(did.get_device_type() == model->get_allowed_device_type())
+    {
+        if(did.get_device_type()=="ENERGY STORAGE")
+        {
+            ENERGY_STORAGE* ptr = get_energy_storage(did);
+            if(ptr!=NULL)
+                ptr->set_model(model);
+        }
     }
 }
 void POWER_SYSTEM_DATABASE::append_hvdc_related_model(const DEVICE_ID& did, const MODEL* model)
 {
-    if(did.get_device_type() != model->get_allowed_device_type())
-        return;
-    if(did.get_device_type()=="HVDC")
-    {
-        HVDC* ptr = get_hvdc(did);
-        if(ptr!=NULL)
-            ptr->set_model(model);
-        return;
+    if(did.get_device_type() == model->get_allowed_device_type())
+    {
+        if(did.get_device_type()=="HVDC")
+        {
+            HVDC* ptr = get_hvdc(did);
+            if(ptr!=NULL)
+                ptr->set_model(model);
+        }
     }
 }
 
 void POWER_SYSTEM_DATABASE::update_all_bus_base_frequency(double fbase_Hz)
 {
     size_t n = Bus.size();
-    for(size_t i=0; i<n; ++i)
+    for(size_t i=0; i!=n; ++i)
         Bus[i].set_base_frequency_in_Hz(fbase_Hz);
 }
 
 bool POWER_SYSTEM_DATABASE::is_bus_exist(size_t bus) const
 {
-    if(bus == 0) return false;
-
-    size_t index = this->get_bus_index(bus);
-    if(index != INDEX_NOT_EXIST)
-        return true;
+    if(bus != 0)
+    {
+        size_t index = this->get_bus_index(bus);
+        if(index!=INDEX_NOT_EXIST) return true;
+        else                       return false;
+    }
     else
         return false;
 }
@@ -1246,308 +1191,306 @@ bool POWER_SYSTEM_DATABASE::is_bus_exist(size_t bus) const
 bool POWER_SYSTEM_DATABASE::is_generator_exist(const DEVICE_ID& device_id) const
 {
     size_t index = get_generator_index(device_id);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 bool POWER_SYSTEM_DATABASE::is_wt_generator_exist(const DEVICE_ID& device_id) const
 {
     size_t index = get_wt_generator_index(device_id);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 bool POWER_SYSTEM_DATABASE::is_pv_unit_exist(const DEVICE_ID& device_id) const
 {
     size_t index = get_pv_unit_index(device_id);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 bool POWER_SYSTEM_DATABASE::is_load_exist(const DEVICE_ID& device_id) const
 {
     size_t index = get_load_index(device_id);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 bool POWER_SYSTEM_DATABASE::is_line_exist(const DEVICE_ID& device_id) const
 {
     size_t index = get_line_index(device_id);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 bool POWER_SYSTEM_DATABASE::is_transformer_exist(const DEVICE_ID& device_id) const
 {
     size_t index = get_transformer_index(device_id);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 bool POWER_SYSTEM_DATABASE::is_fixed_shunt_exist(const DEVICE_ID& device_id) const
 {
     size_t index = get_fixed_shunt_index(device_id);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 bool POWER_SYSTEM_DATABASE::is_hvdc_exist(const DEVICE_ID& device_id) const
 {
     size_t index = get_hvdc_index(device_id);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 bool POWER_SYSTEM_DATABASE::is_equivalent_device_exist(const DEVICE_ID& device_id) const
 {
     size_t index = get_equivalent_device_index(device_id);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 bool POWER_SYSTEM_DATABASE::is_energy_storage_exist(const DEVICE_ID& device_id) const
 {
     size_t index = get_energy_storage_index(device_id);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 bool POWER_SYSTEM_DATABASE::is_area_exist(const size_t no) const
 {
     size_t index = get_area_index(no);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 bool POWER_SYSTEM_DATABASE::is_zone_exist(const size_t no) const
 {
     size_t index = get_zone_index(no);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 bool POWER_SYSTEM_DATABASE::is_owner_exist(const size_t no) const
 {
     size_t index = get_owner_index(no);
-    if(index==INDEX_NOT_EXIST) return false;
-    else return true;
+    if(index!=INDEX_NOT_EXIST) return true;
+    else                       return false;
 }
 
 void POWER_SYSTEM_DATABASE::change_bus_number(size_t original_bus_number, size_t new_bus_number)
 {
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     ostringstream osstream;
-    if(not is_bus_exist(original_bus_number))
-    {
-        osstream<<"Warning. The original bus number to change ("<<original_bus_number<<") does not exist in the power system database. No bus number will be changed.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-    if(is_bus_exist(new_bus_number))
-    {
-        osstream<<"Warning. The new bus number to change ("<<new_bus_number<<") already exists in the power system database. No bus number will be changed.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-    if(not is_bus_in_allowed_range(new_bus_number))
-    {
-        osstream<<"Warning. The new bus number to change ("<<new_bus_number<<") exceeds the allowed maximum bus number range [1, "<<get_allowed_max_bus_number()<<"] in the power system database. No bus number will be changed.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-
-    BUS* bus = get_bus(original_bus_number);
-
-    bus->set_bus_number(new_bus_number);
 
-    bus_index.set_bus_with_index(new_bus_number, get_bus_index(original_bus_number));
-    bus_index.set_bus_with_index(original_bus_number, INDEX_NOT_EXIST);
-
-    vector<GENERATOR*> gens = get_generators_connecting_to_bus(original_bus_number);
-    size_t ngens = gens.size();
-    for(size_t i=0; i!=ngens; ++i)
+    if(is_bus_exist(original_bus_number) and
+       (not is_bus_exist(new_bus_number)) and
+       is_bus_in_allowed_range(new_bus_number))
     {
-        GENERATOR* gen = gens[i];
-        DEVICE_ID old_did = gen->get_device_id();
-        size_t index = get_generator_index(old_did);
-        generator_index.set_device_index(old_did, INDEX_NOT_EXIST);
+        BUS* bus = get_bus(original_bus_number);
 
-        gen->set_generator_bus(new_bus_number);
-        DEVICE_ID new_did = gen->get_device_id();
-        generator_index.set_device_index(new_did, index);
-    }
+        bus->set_bus_number(new_bus_number);
 
-    vector<WT_GENERATOR*> wt_generators = get_wt_generators_connecting_to_bus(original_bus_number);
-    size_t nwt_generator = wt_generators.size();
-    for(size_t i=0; i!=nwt_generator; ++i)
-    {
-        WT_GENERATOR* wt_generator = wt_generators[i];
-        DEVICE_ID old_did = wt_generator->get_device_id();
-        size_t index = get_wt_generator_index(old_did);
-        wt_generator_index.set_device_index(old_did, INDEX_NOT_EXIST);
+        bus_index.set_bus_with_index(new_bus_number, get_bus_index(original_bus_number));
+        bus_index.set_bus_with_index(original_bus_number, INDEX_NOT_EXIST);
 
-        wt_generator->set_source_bus(new_bus_number);
-        DEVICE_ID new_did = wt_generator->get_device_id();
-        wt_generator_index.set_device_index(new_did, index);
-    }
+        vector<GENERATOR*> gens = get_generators_connecting_to_bus(original_bus_number);
+        size_t ngens = gens.size();
+        for(size_t i=0; i!=ngens; ++i)
+        {
+            GENERATOR* gen = gens[i];
+            DEVICE_ID old_did = gen->get_device_id();
+            size_t index = get_generator_index(old_did);
+            generator_index.set_device_index(old_did, INDEX_NOT_EXIST);
+
+            gen->set_generator_bus(new_bus_number);
+            DEVICE_ID new_did = gen->get_device_id();
+            generator_index.set_device_index(new_did, index);
+        }
 
-    vector<PV_UNIT*> pv_units = get_pv_units_connecting_to_bus(original_bus_number);
-    size_t npv_unit = pv_units.size();
-    for(size_t i=0; i!=npv_unit; ++i)
-    {
-        PV_UNIT* pv_unit = pv_units[i];
-        DEVICE_ID old_did = pv_unit->get_device_id();
-        size_t index = get_pv_unit_index(old_did);
-        pv_unit_index.set_device_index(old_did, INDEX_NOT_EXIST);
+        vector<WT_GENERATOR*> wt_generators = get_wt_generators_connecting_to_bus(original_bus_number);
+        size_t nwt_generator = wt_generators.size();
+        for(size_t i=0; i!=nwt_generator; ++i)
+        {
+            WT_GENERATOR* wt_generator = wt_generators[i];
+            DEVICE_ID old_did = wt_generator->get_device_id();
+            size_t index = get_wt_generator_index(old_did);
+            wt_generator_index.set_device_index(old_did, INDEX_NOT_EXIST);
+
+            wt_generator->set_source_bus(new_bus_number);
+            DEVICE_ID new_did = wt_generator->get_device_id();
+            wt_generator_index.set_device_index(new_did, index);
+        }
 
-        pv_unit->set_unit_bus(new_bus_number);
-        DEVICE_ID new_did = pv_unit->get_device_id();
-        pv_unit_index.set_device_index(new_did, index);
-    }
+        vector<PV_UNIT*> pv_units = get_pv_units_connecting_to_bus(original_bus_number);
+        size_t npv_unit = pv_units.size();
+        for(size_t i=0; i!=npv_unit; ++i)
+        {
+            PV_UNIT* pv_unit = pv_units[i];
+            DEVICE_ID old_did = pv_unit->get_device_id();
+            size_t index = get_pv_unit_index(old_did);
+            pv_unit_index.set_device_index(old_did, INDEX_NOT_EXIST);
+
+            pv_unit->set_unit_bus(new_bus_number);
+            DEVICE_ID new_did = pv_unit->get_device_id();
+            pv_unit_index.set_device_index(new_did, index);
+        }
 
-    vector<ENERGY_STORAGE*> estorages = get_energy_storages_connecting_to_bus(original_bus_number);
-    size_t nestorage = estorages.size();
-    for(size_t i=0; i!=nestorage; ++i)
-    {
-        ENERGY_STORAGE* estorage = estorages[i];
-        DEVICE_ID old_did = estorage->get_device_id();
-        size_t index = get_energy_storage_index(old_did);
-        energy_storage_index.set_device_index(old_did, INDEX_NOT_EXIST);
+        vector<ENERGY_STORAGE*> estorages = get_energy_storages_connecting_to_bus(original_bus_number);
+        size_t nestorage = estorages.size();
+        for(size_t i=0; i!=nestorage; ++i)
+        {
+            ENERGY_STORAGE* estorage = estorages[i];
+            DEVICE_ID old_did = estorage->get_device_id();
+            size_t index = get_energy_storage_index(old_did);
+            energy_storage_index.set_device_index(old_did, INDEX_NOT_EXIST);
+
+            estorage->set_energy_storage_bus(new_bus_number);
+            DEVICE_ID new_did = estorage->get_device_id();
+            energy_storage_index.set_device_index(new_did, index);
+        }
 
-        estorage->set_energy_storage_bus(new_bus_number);
-        DEVICE_ID new_did = estorage->get_device_id();
-        energy_storage_index.set_device_index(new_did, index);
-    }
+        vector<LOAD*> loads = get_loads_connecting_to_bus(original_bus_number);
+        size_t nload = loads.size();
+        for(size_t i=0; i!=nload; ++i)
+        {
+            LOAD* load = loads[i];
+            DEVICE_ID old_did = load->get_device_id();
+            size_t index = get_load_index(old_did);
+            load_index.set_device_index(old_did, INDEX_NOT_EXIST);
+
+            load->set_load_bus(new_bus_number);
+            DEVICE_ID new_did = load->get_device_id();
+            load_index.set_device_index(new_did, index);
+        }
 
-    vector<LOAD*> loads = get_loads_connecting_to_bus(original_bus_number);
-    size_t nload = loads.size();
-    for(size_t i=0; i!=nload; ++i)
-    {
-        LOAD* load = loads[i];
-        DEVICE_ID old_did = load->get_device_id();
-        size_t index = get_load_index(old_did);
-        load_index.set_device_index(old_did, INDEX_NOT_EXIST);
+        vector<FIXED_SHUNT*> fshunts = get_fixed_shunts_connecting_to_bus(original_bus_number);
+        size_t nfshunt = fshunts.size();
+        for(size_t i=0; i!=nfshunt; ++i)
+        {
+            FIXED_SHUNT* fshunt = fshunts[i];
+            DEVICE_ID old_did = fshunt->get_device_id();
+            size_t index = get_fixed_shunt_index(old_did);
+            fixed_shunt_index.set_device_index(old_did, INDEX_NOT_EXIST);
+
+            fshunt->set_shunt_bus(new_bus_number);
+            DEVICE_ID new_did = fshunt->get_device_id();
+            fixed_shunt_index.set_device_index(new_did, index);
+        }
 
-        load->set_load_bus(new_bus_number);
-        DEVICE_ID new_did = load->get_device_id();
-        load_index.set_device_index(new_did, index);
-    }
+        vector<LINE*> lines = get_lines_connecting_to_bus(original_bus_number);
+        size_t nline = lines.size();
+        for(size_t i=0; i!=nline; ++i)
+        {
+            LINE* line = lines[i];
+            DEVICE_ID old_did = line->get_device_id();
+            size_t index = get_line_index(old_did);
+            line_index.set_device_index(old_did, INDEX_NOT_EXIST);
 
-    vector<FIXED_SHUNT*> fshunts = get_fixed_shunts_connecting_to_bus(original_bus_number);
-    size_t nfshunt = fshunts.size();
-    for(size_t i=0; i!=nfshunt; ++i)
-    {
-        FIXED_SHUNT* fshunt = fshunts[i];
-        DEVICE_ID old_did = fshunt->get_device_id();
-        size_t index = get_fixed_shunt_index(old_did);
-        fixed_shunt_index.set_device_index(old_did, INDEX_NOT_EXIST);
+            if(line->get_sending_side_bus()==original_bus_number)
+                line->set_sending_side_bus(new_bus_number);
+            else
+                line->set_receiving_side_bus(new_bus_number);
 
-        fshunt->set_shunt_bus(new_bus_number);
-        DEVICE_ID new_did = fshunt->get_device_id();
-        fixed_shunt_index.set_device_index(new_did, index);
-    }
+            DEVICE_ID new_did = line->get_device_id();
+            line_index.set_device_index(new_did, index);
 
-    vector<LINE*> lines = get_lines_connecting_to_bus(original_bus_number);
-    size_t nline = lines.size();
-    for(size_t i=0; i!=nline; ++i)
-    {
-        LINE* line = lines[i];
-        DEVICE_ID old_did = line->get_device_id();
-        size_t index = get_line_index(old_did);
-        line_index.set_device_index(old_did, INDEX_NOT_EXIST);
+        }
 
-        if(line->get_sending_side_bus()==original_bus_number)
-            line->set_sending_side_bus(new_bus_number);
-        else
-            line->set_receiving_side_bus(new_bus_number);
+        vector<HVDC*> hvdcs = get_hvdcs_connecting_to_bus(original_bus_number);
+        size_t nhvdc = hvdcs.size();
+        for(size_t i=0; i!=nhvdc; ++i)
+        {
+            HVDC* hvdc = hvdcs[i];
+            DEVICE_ID old_did = hvdc->get_device_id();
+            size_t index = get_hvdc_index(old_did);
+            hvdc_index.set_device_index(old_did, INDEX_NOT_EXIST);
 
-        DEVICE_ID new_did = line->get_device_id();
-        line_index.set_device_index(new_did, index);
+            if(hvdc->get_converter_bus(RECTIFIER)==original_bus_number)
+                hvdc->set_converter_bus(RECTIFIER, new_bus_number);
+            else
+                hvdc->set_converter_bus(INVERTER, new_bus_number);
 
-    }
+            DEVICE_ID new_did = hvdc->get_device_id();
+            hvdc_index.set_device_index(new_did, index);
+        }
 
-    vector<HVDC*> hvdcs = get_hvdcs_connecting_to_bus(original_bus_number);
-    size_t nhvdc = hvdcs.size();
-    for(size_t i=0; i!=nhvdc; ++i)
-    {
-        HVDC* hvdc = hvdcs[i];
-        DEVICE_ID old_did = hvdc->get_device_id();
-        size_t index = get_hvdc_index(old_did);
-        hvdc_index.set_device_index(old_did, INDEX_NOT_EXIST);
+        vector<TRANSFORMER*> transformers = get_transformers_connecting_to_bus(original_bus_number);
+        size_t ntrans = transformers.size();
+        for(size_t i=0; i!=ntrans; ++i)
+        {
+            TRANSFORMER* trans = transformers[i];
+            DEVICE_ID old_did = trans->get_device_id();
+            size_t index = get_transformer_index(old_did);
+            transformer_index.set_device_index(old_did, INDEX_NOT_EXIST);
 
-        if(hvdc->get_converter_bus(RECTIFIER)==original_bus_number)
-            hvdc->set_converter_bus(RECTIFIER, new_bus_number);
-        else
-            hvdc->set_converter_bus(INVERTER, new_bus_number);
+            if(trans->get_winding_bus(PRIMARY_SIDE)==original_bus_number)
+                trans->set_winding_bus(PRIMARY_SIDE, new_bus_number);
+            else
+            {
+                if(trans->get_winding_bus(SECONDARY_SIDE)==original_bus_number)
+                    trans->set_winding_bus(SECONDARY_SIDE, new_bus_number);
+                else
+                    trans->set_winding_bus(TERTIARY_SIDE, new_bus_number);
+            }
 
-        DEVICE_ID new_did = hvdc->get_device_id();
-        hvdc_index.set_device_index(new_did, index);
+            DEVICE_ID new_did = trans->get_device_id();
+            transformer_index.set_device_index(new_did, index);
+        }
     }
-
-    vector<TRANSFORMER*> transformers = get_transformers_connecting_to_bus(original_bus_number);
-    size_t ntrans = transformers.size();
-    for(size_t i=0; i!=ntrans; ++i)
+    else
     {
-        TRANSFORMER* trans = transformers[i];
-        DEVICE_ID old_did = trans->get_device_id();
-        size_t index = get_transformer_index(old_did);
-        transformer_index.set_device_index(old_did, INDEX_NOT_EXIST);
-
-        if(trans->get_winding_bus(PRIMARY_SIDE)==original_bus_number)
-            trans->set_winding_bus(PRIMARY_SIDE, new_bus_number);
-        else
-        {
-            if(trans->get_winding_bus(SECONDARY_SIDE)==original_bus_number)
-                trans->set_winding_bus(SECONDARY_SIDE, new_bus_number);
-            else
-                trans->set_winding_bus(TERTIARY_SIDE, new_bus_number);
-        }
-
-        DEVICE_ID new_did = trans->get_device_id();
-        transformer_index.set_device_index(new_did, index);
+        if(not is_bus_exist(original_bus_number))
+            osstream<<"Warning. The original bus number to change ("<<original_bus_number<<") does not exist in the power system database. No bus number will be changed.";
+        if(is_bus_exist(new_bus_number))
+            osstream<<"Warning. The new bus number to change ("<<new_bus_number<<") already exists in the power system database. No bus number will be changed.";
+        if(not is_bus_in_allowed_range(new_bus_number))
+            osstream<<"Warning. The new bus number to change ("<<new_bus_number<<") exceeds the allowed maximum bus number range [1, "<<get_allowed_max_bus_number()<<"] in the power system database. No bus number will be changed.";
+        toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
 
 DEVICE* POWER_SYSTEM_DATABASE::get_device(const DEVICE_ID& device_id)
 {
     // this function is not tested
-    if(not device_id.is_valid())
-        return NULL;
-
-    string dtype = device_id.get_device_type();
-    if(dtype=="BUS")
-        return (DEVICE*) get_bus(device_id);
+    if(device_id.is_valid())
+    {
+        string dtype = device_id.get_device_type();
+        if(dtype=="BUS")
+            return (DEVICE*) get_bus(device_id);
 
-    if(dtype=="GENERATOR")
-        return (DEVICE*) get_generator(device_id);
+        if(dtype=="GENERATOR")
+            return (DEVICE*) get_generator(device_id);
 
-    if(dtype=="WT GENERATOR")
-        return (DEVICE*) get_wt_generator(device_id);
+        if(dtype=="WT GENERATOR")
+            return (DEVICE*) get_wt_generator(device_id);
 
-    if(dtype=="PV UNIT")
-        return (DEVICE*) get_pv_unit(device_id);
+        if(dtype=="PV UNIT")
+            return (DEVICE*) get_pv_unit(device_id);
 
-    if(dtype=="LOAD")
-        return (DEVICE*) get_load(device_id);
+        if(dtype=="LOAD")
+            return (DEVICE*) get_load(device_id);
 
-    if(dtype=="FIXED SHUNT")
-        return (DEVICE*) get_fixed_shunt(device_id);
+        if(dtype=="FIXED SHUNT")
+            return (DEVICE*) get_fixed_shunt(device_id);
 
-    if(dtype=="LINE")
-        return (DEVICE*) get_line(device_id);
+        if(dtype=="LINE")
+            return (DEVICE*) get_line(device_id);
 
-    if(dtype=="HVDC")
-        return (DEVICE*) get_hvdc(device_id);
+        if(dtype=="HVDC")
+            return (DEVICE*) get_hvdc(device_id);
 
-    if(dtype=="TRANSFORMER")
-        return (DEVICE*) get_transformer(device_id);
+        if(dtype=="TRANSFORMER")
+            return (DEVICE*) get_transformer(device_id);
 
-    if(dtype=="EQUIVALENT DEVICE")
-        return (DEVICE*) get_equivalent_device(device_id);
+        if(dtype=="EQUIVALENT DEVICE")
+            return (DEVICE*) get_equivalent_device(device_id);
 
-    return NULL;
+        return NULL;
+    }
+    else
+        return NULL;
 }
 
 BUS* POWER_SYSTEM_DATABASE::get_bus(size_t bus)
@@ -1769,7 +1712,9 @@ vector<GENERATOR*> POWER_SYSTEM_DATABASE::get_generators_connecting_to_bus(const
     size_t n = get_generator_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Generator[i].is_connected_to_bus(bus))
+        if(not Generator[i].is_connected_to_bus(bus))
+            continue;
+        else
             device.push_back(&(Generator[i]));
     }
     return device;
@@ -1783,7 +1728,9 @@ vector<WT_GENERATOR*> POWER_SYSTEM_DATABASE::get_wt_generators_connecting_to_bus
     size_t n = get_wt_generator_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(WT_Generator[i].is_connected_to_bus(bus))
+        if(not WT_Generator[i].is_connected_to_bus(bus))
+            continue;
+        else
             device.push_back(&(WT_Generator[i]));
     }
     return device;
@@ -1798,7 +1745,9 @@ vector<PV_UNIT*> POWER_SYSTEM_DATABASE::get_pv_units_connecting_to_bus(const siz
     size_t n = get_pv_unit_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(PV_Unit[i].is_connected_to_bus(bus))
+        if(not PV_Unit[i].is_connected_to_bus(bus))
+            continue;
+        else
             device.push_back(&(PV_Unit[i]));
     }
     return device;
@@ -1844,7 +1793,9 @@ vector<LOAD*> POWER_SYSTEM_DATABASE::get_loads_connecting_to_bus(const size_t bu
     size_t n = get_load_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Load[i].is_connected_to_bus(bus))
+        if(not Load[i].is_connected_to_bus(bus))
+            continue;
+        else
             device.push_back(&(Load[i]));
     }
     return device;
@@ -1858,7 +1809,9 @@ vector<LINE*> POWER_SYSTEM_DATABASE::get_lines_connecting_to_bus(const size_t bu
     size_t n = get_line_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Line[i].is_connected_to_bus(bus))
+        if(not Line[i].is_connected_to_bus(bus))
+            continue;
+        else
             device.push_back(&(Line[i]));
     }
     return device;
@@ -1872,7 +1825,9 @@ vector<TRANSFORMER*> POWER_SYSTEM_DATABASE::get_transformers_connecting_to_bus(c
     size_t n = get_transformer_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Transformer[i].is_connected_to_bus(bus))
+        if(not Transformer[i].is_connected_to_bus(bus))
+            continue;
+        else
             device.push_back(&(Transformer[i]));
     }
     return device;
@@ -1886,7 +1841,9 @@ vector<FIXED_SHUNT*> POWER_SYSTEM_DATABASE::get_fixed_shunts_connecting_to_bus(c
     size_t n = get_fixed_shunt_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Fixed_shunt[i].is_connected_to_bus(bus))
+        if(not Fixed_shunt[i].is_connected_to_bus(bus))
+            continue;
+        else
             device.push_back(&(Fixed_shunt[i]));
     }
     return device;
@@ -1900,7 +1857,9 @@ vector<HVDC*> POWER_SYSTEM_DATABASE::get_hvdcs_connecting_to_bus(const size_t bu
     size_t n = get_hvdc_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Hvdc[i].is_connected_to_bus(bus))
+        if(not Hvdc[i].is_connected_to_bus(bus))
+            continue;
+        else
             device.push_back(&(Hvdc[i]));
     }
     return device;
@@ -1914,7 +1873,9 @@ vector<EQUIVALENT_DEVICE*> POWER_SYSTEM_DATABASE::get_equivalent_devices_connect
     size_t n = get_equivalent_device_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Equivalent_device[i].is_connected_to_bus(bus))
+        if(not Equivalent_device[i].is_connected_to_bus(bus))
+            continue;
+        else
             device.push_back(&(Equivalent_device[i]));
     }
     return device;
@@ -1928,7 +1889,9 @@ vector<ENERGY_STORAGE*> POWER_SYSTEM_DATABASE::get_energy_storages_connecting_to
     size_t n = get_energy_storage_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Energy_storage[i].is_connected_to_bus(bus))
+        if(not Energy_storage[i].is_connected_to_bus(bus))
+            continue;
+        else
             device.push_back(&(Energy_storage[i]));
     }
     return device;
@@ -2136,7 +2099,9 @@ vector<BUS*> POWER_SYSTEM_DATABASE::get_buses_in_area(const size_t area)
     size_t n = get_bus_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Bus[i].is_in_area(area))
+        if(not Bus[i].is_in_area(area))
+            continue;
+        else
             device.push_back(&(Bus[i]));
     }
     return device;
@@ -2150,7 +2115,9 @@ vector<GENERATOR*> POWER_SYSTEM_DATABASE::get_generators_in_area(const size_t ar
     size_t n = get_generator_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Generator[i].is_in_area(area))
+        if(not Generator[i].is_in_area(area))
+            continue;
+        else
             device.push_back(&(Generator[i]));
     }
     return device;
@@ -2164,7 +2131,9 @@ vector<WT_GENERATOR*> POWER_SYSTEM_DATABASE::get_wt_generators_in_area(const siz
     size_t n = get_wt_generator_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(WT_Generator[i].is_in_area(area))
+        if(not WT_Generator[i].is_in_area(area))
+            continue;
+        else
             device.push_back(&(WT_Generator[i]));
     }
     return device;
@@ -2179,7 +2148,9 @@ vector<PV_UNIT*> POWER_SYSTEM_DATABASE::get_pv_units_in_area(const size_t area)
     size_t n = get_pv_unit_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(PV_Unit[i].is_in_area(area))
+        if(not PV_Unit[i].is_in_area(area))
+            continue;
+        else
             device.push_back(&(PV_Unit[i]));
     }
     return device;
@@ -2225,7 +2196,9 @@ vector<LOAD*> POWER_SYSTEM_DATABASE::get_loads_in_area(const size_t area)
     size_t n = get_load_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Load[i].is_in_area(area))
+        if(not Load[i].is_in_area(area))
+            continue;
+        else
             device.push_back(&(Load[i]));
     }
     return device;
@@ -2239,7 +2212,9 @@ vector<LINE*> POWER_SYSTEM_DATABASE::get_lines_in_area(const size_t area)
     size_t n = get_line_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Line[i].is_in_area(area))
+        if(not Line[i].is_in_area(area))
+            continue;
+        else
             device.push_back(&(Line[i]));
     }
     return device;
@@ -2253,7 +2228,9 @@ vector<TRANSFORMER*> POWER_SYSTEM_DATABASE::get_transformers_in_area(const size_
     size_t n = get_transformer_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Transformer[i].is_in_area(area))
+        if(not Transformer[i].is_in_area(area))
+            continue;
+        else
             device.push_back(&(Transformer[i]));
     }
     return device;
@@ -2267,7 +2244,9 @@ vector<FIXED_SHUNT*> POWER_SYSTEM_DATABASE::get_fixed_shunts_in_area(const size_
     size_t n = get_fixed_shunt_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Fixed_shunt[i].is_in_area(area))
+        if(not Fixed_shunt[i].is_in_area(area))
+            continue;
+        else
             device.push_back(&(Fixed_shunt[i]));
     }
     return device;
@@ -2281,7 +2260,9 @@ vector<HVDC*> POWER_SYSTEM_DATABASE::get_hvdcs_in_area(const size_t area)
     size_t n = get_hvdc_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Hvdc[i].is_in_area(area))
+        if(not Hvdc[i].is_in_area(area))
+            continue;
+        else
             device.push_back(&(Hvdc[i]));
     }
     return device;
@@ -2295,7 +2276,9 @@ vector<EQUIVALENT_DEVICE*> POWER_SYSTEM_DATABASE::get_equivalent_devices_in_area
     size_t n = get_equivalent_device_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Equivalent_device[i].is_in_area(area))
+        if(not Equivalent_device[i].is_in_area(area))
+            continue;
+        else
             device.push_back(&(Equivalent_device[i]));
     }
     return device;
@@ -2309,7 +2292,9 @@ vector<ENERGY_STORAGE*> POWER_SYSTEM_DATABASE::get_energy_storages_in_area(const
     size_t n = get_energy_storage_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Energy_storage[i].is_in_area(area))
+        if(not Energy_storage[i].is_in_area(area))
+            continue;
+        else
             device.push_back(&(Energy_storage[i]));
     }
     return device;
@@ -2529,7 +2514,9 @@ vector<BUS*> POWER_SYSTEM_DATABASE::get_buses_in_zone(const size_t zone)
     size_t n = get_bus_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Bus[i].is_in_zone(zone))
+        if(not Bus[i].is_in_zone(zone))
+            continue;
+        else
             device.push_back(&(Bus[i]));
     }
     return device;
@@ -2543,7 +2530,9 @@ vector<GENERATOR*> POWER_SYSTEM_DATABASE::get_generators_in_zone(const size_t zo
     size_t n = get_generator_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Generator[i].is_in_zone(zone))
+        if(not Generator[i].is_in_zone(zone))
+            continue;
+        else
             device.push_back(&(Generator[i]));
     }
     return device;
@@ -2557,7 +2546,9 @@ vector<WT_GENERATOR*> POWER_SYSTEM_DATABASE::get_wt_generators_in_zone(const siz
     size_t n = get_wt_generator_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(WT_Generator[i].is_in_zone(zone))
+        if(not WT_Generator[i].is_in_zone(zone))
+            continue;
+        else
             device.push_back(&(WT_Generator[i]));
     }
     return device;
@@ -2571,7 +2562,9 @@ vector<PV_UNIT*> POWER_SYSTEM_DATABASE::get_pv_units_in_zone(const size_t zone)
     size_t n = get_pv_unit_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(PV_Unit[i].is_in_zone(zone))
+        if(not PV_Unit[i].is_in_zone(zone))
+            continue;
+        else
             device.push_back(&(PV_Unit[i]));
     }
     return device;
@@ -2617,7 +2610,9 @@ vector<LOAD*> POWER_SYSTEM_DATABASE::get_loads_in_zone(const size_t zone)
     size_t n = get_load_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Load[i].is_in_zone(zone))
+        if(not Load[i].is_in_zone(zone))
+            continue;
+        else
             device.push_back(&(Load[i]));
     }
     return device;
@@ -2631,7 +2626,9 @@ vector<LINE*> POWER_SYSTEM_DATABASE::get_lines_in_zone(const size_t zone)
     size_t n = get_line_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Line[i].is_in_zone(zone))
+        if(not Line[i].is_in_zone(zone))
+            continue;
+        else
             device.push_back(&(Line[i]));
     }
     return device;
@@ -2645,7 +2642,9 @@ vector<TRANSFORMER*> POWER_SYSTEM_DATABASE::get_transformers_in_zone(const size_
     size_t n = get_transformer_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Transformer[i].is_in_zone(zone))
+        if(not Transformer[i].is_in_zone(zone))
+            continue;
+        else
             device.push_back(&(Transformer[i]));
     }
     return device;
@@ -2659,7 +2658,9 @@ vector<FIXED_SHUNT*> POWER_SYSTEM_DATABASE::get_fixed_shunts_in_zone(const size_
     size_t n = get_fixed_shunt_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Fixed_shunt[i].is_in_zone(zone))
+        if(not Fixed_shunt[i].is_in_zone(zone))
+            continue;
+        else
             device.push_back(&(Fixed_shunt[i]));
     }
     return device;
@@ -2673,8 +2674,10 @@ vector<HVDC*> POWER_SYSTEM_DATABASE::get_hvdcs_in_zone(const size_t zone)
     size_t n = get_hvdc_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Hvdc[i].is_in_zone(zone))
-            device.push_back(&(Hvdc[i]));
+        if(not Hvdc[i].is_in_zone(zone))
+            continue;
+        else
+            device.push_back(&(Hvdc[i]));
     }
     return device;
 }
@@ -2687,7 +2690,9 @@ vector<EQUIVALENT_DEVICE*> POWER_SYSTEM_DATABASE::get_equivalent_devices_in_zone
     size_t n = get_equivalent_device_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Equivalent_device[i].is_in_zone(zone))
+        if(not Equivalent_device[i].is_in_zone(zone))
+            continue;
+        else
             device.push_back(&(Equivalent_device[i]));
     }
     return device;
@@ -2701,7 +2706,9 @@ vector<ENERGY_STORAGE*> POWER_SYSTEM_DATABASE::get_energy_storages_in_zone(const
     size_t n = get_energy_storage_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Energy_storage[i].is_in_zone(zone))
+        if(not Energy_storage[i].is_in_zone(zone))
+            continue;
+        else
             device.push_back(&(Energy_storage[i]));
     }
     return device;
@@ -2938,11 +2945,9 @@ vector<BUS*> POWER_SYSTEM_DATABASE::get_buses_with_constraints(double vbase_kV_m
         this_zone = Bus[i].get_zone_number();
         this_owner = Bus[i].get_owner_number();
 
-        if(area!=0 and this_area!=area)
-            continue;
-        if(zone!=0 and this_zone!=zone)
-            continue;
-        if(owner!=0 and this_owner!=owner)
+        if((area!=0 and this_area!=area) or
+           (zone!=0 and this_zone!=zone) or
+           (owner!=0 and this_owner!=owner))
             continue;
         if(vbase>=vbase_kV_min and vbase<=vbase_kV_max and v>=v_pu_min and v<=v_pu_max)
             device.push_back(&(Bus[i]));
@@ -3156,11 +3161,9 @@ vector<size_t> POWER_SYSTEM_DATABASE::get_buses_number_with_constraints(double v
         this_zone = Bus[i].get_zone_number();
         this_owner = Bus[i].get_owner_number();
 
-        if(area!=0 and this_area!=area)
-            continue;
-        if(zone!=0 and this_zone!=zone)
-            continue;
-        if(owner!=0 and this_owner!=owner)
+        if((area!=0 and this_area!=area) or
+           (zone!=0 and this_zone!=zone) or
+           (owner!=0 and this_owner!=owner))
             continue;
         if(vbase>=vbase_kV_min and vbase<=vbase_kV_max and v>=v_pu_min and v<=v_pu_max)
             buses_number.push_back(Bus[i].get_bus_number());
@@ -3177,6 +3180,8 @@ vector<size_t> POWER_SYSTEM_DATABASE::get_all_in_service_buses_number()
     {
         if(Bus[i].get_bus_type()!=OUT_OF_SERVICE)
             buses_number.push_back(Bus[i].get_bus_number());
+        else
+            continue;
     }
     return buses_number;
 }
@@ -3351,7 +3356,9 @@ void POWER_SYSTEM_DATABASE::update_in_service_bus_count()
     size_t n_out_of_service = 0;
     for(size_t i=0; i!=n; ++i)
     {
-        if(Bus[i].get_bus_type()==OUT_OF_SERVICE)
+        if(Bus[i].get_bus_type()!=OUT_OF_SERVICE)
+            continue;
+        else
 			++n_out_of_service;
     }
 
@@ -3381,13 +3388,13 @@ void POWER_SYSTEM_DATABASE::update_overshadowed_bus_count()
         bool new_bus_is_overshadowed = false;
         for(size_t i=0; i!=n; ++i)
         {
-            if(Line[i].is_zero_impedance_line())
+            if(not Line[i].is_zero_impedance_line())
+                continue;
+            else
             {
                 bool istatus = Line[i].get_sending_side_breaker_status();
                 bool jstatus = Line[i].get_receiving_side_breaker_status();
-                if(istatus==false or jstatus==false)
-                    continue;
-                else
+                if(istatus!=false and jstatus!=false)
                 {
                     size_t ibus = Line[i].get_sending_side_bus();
                     size_t jbus = Line[i].get_receiving_side_bus();
@@ -3418,6 +3425,8 @@ void POWER_SYSTEM_DATABASE::update_overshadowed_bus_count()
                             new_bus_is_overshadowed = true;
                     }
                 }
+                else
+                    continue;
             }
         }
         if(new_bus_is_overshadowed==false)
@@ -3427,7 +3436,9 @@ void POWER_SYSTEM_DATABASE::update_overshadowed_bus_count()
     n = Bus.size();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Bus[i].is_bus_overshadowed())
+        if(not Bus[i].is_bus_overshadowed())
+            continue;
+        else
             ++overshadowed_bus_count;
     }
 }
@@ -3575,24 +3586,24 @@ size_t POWER_SYSTEM_DATABASE::get_area_index(const size_t no) const
 {
     map<size_t, size_t>::const_iterator iter = area_index.begin();
     iter = area_index.find(no);
-    if(iter==area_index.end()) return INDEX_NOT_EXIST;
-    else                       return iter->second;
+    if(iter!=area_index.end()) return iter->second;
+    else                       return INDEX_NOT_EXIST;
 }
 
 size_t POWER_SYSTEM_DATABASE::get_zone_index(const size_t no) const
 {
     map<size_t, size_t>::const_iterator iter = zone_index.begin();
     iter = zone_index.find(no);
-    if(iter==zone_index.end()) return INDEX_NOT_EXIST;
-    else                       return iter->second;
+    if(iter!=zone_index.end()) return iter->second;
+    else                       return INDEX_NOT_EXIST;
 }
 
 size_t POWER_SYSTEM_DATABASE::get_owner_index(const size_t no) const
 {
     map<size_t, size_t>::const_iterator iter = owner_index.begin();
     iter = owner_index.find(no);
-    if(iter==owner_index.end()) return INDEX_NOT_EXIST;
-    else                        return iter->second;
+    if(iter!=owner_index.end()) return iter->second;
+    else                        return INDEX_NOT_EXIST;
 }
 
 size_t POWER_SYSTEM_DATABASE::bus_name2bus_number(const string&name) const
@@ -3601,7 +3612,9 @@ size_t POWER_SYSTEM_DATABASE::bus_name2bus_number(const string&name) const
     size_t n = get_bus_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Bus[i].get_bus_name()==trimmed_name)
+        if(Bus[i].get_bus_name()!=trimmed_name)
+            continue;
+        else
             return Bus[i].get_bus_number();
     }
     return 0;
@@ -3613,7 +3626,9 @@ size_t POWER_SYSTEM_DATABASE::area_name2area_number(const string& name) const
     size_t n = get_area_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Area[i].get_area_name()==trimmed_name)
+        if(Area[i].get_area_name()!=trimmed_name)
+            continue;
+        else
             return Area[i].get_area_number();
     }
     return 0;
@@ -3625,7 +3640,9 @@ size_t POWER_SYSTEM_DATABASE::zone_name2zone_number(const string& name) const
     size_t n = get_zone_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Zone[i].get_zone_name()==trimmed_name)
+        if(Zone[i].get_zone_name()!=trimmed_name)
+            continue;
+        else
             return Zone[i].get_zone_number();
     }
     return 0;
@@ -3637,7 +3654,9 @@ size_t POWER_SYSTEM_DATABASE::owner_name2owner_number(const string& name) const
     size_t n = get_owner_count();
     for(size_t i=0; i!=n; ++i)
     {
-        if(Owner[i].get_owner_name()==trimmed_name)
+        if(Owner[i].get_owner_name()!=trimmed_name)
+            continue;
+        else
             return Owner[i].get_owner_number();
     }
     return 0;
@@ -3645,42 +3664,44 @@ size_t POWER_SYSTEM_DATABASE::owner_name2owner_number(const string& name) const
 
 string POWER_SYSTEM_DATABASE::bus_number2bus_name(size_t number)
 {
-    if(not is_bus_in_allowed_range(number))
-        return "";
-
-    BUS* bus = get_bus(number);
-    if(bus==NULL)
-        return "";
+    if(is_bus_in_allowed_range(number))
+    {
+        BUS* bus = get_bus(number);
+        if(bus!=NULL)
+            return bus->get_bus_name();
+        else
+            return "";
+    }
     else
-        return bus->get_bus_name();
+        return "";
 }
 
 
 string POWER_SYSTEM_DATABASE::area_number2area_name(size_t number)
 {
     AREA* area = get_area(number);
-    if(area==NULL)
-        return "";
-    else
+    if(area!=NULL)
         return area->get_area_name();
+    else
+        return "";
 }
 
 string POWER_SYSTEM_DATABASE::zone_number2zone_name(size_t number)
 {
     ZONE* zone = get_zone(number);
-    if(zone==NULL)
-        return "";
-    else
+    if(zone!=NULL)
         return zone->get_zone_name();
+    else
+        return "";
 }
 
 string POWER_SYSTEM_DATABASE::owner_number2owner_name(size_t number)
 {
     OWNER* owner = get_owner(number);
-    if(owner==NULL)
-        return "";
-    else
+    if(owner!=NULL)
         return owner->get_owner_name();
+    else
+        return "";
 }
 
 void POWER_SYSTEM_DATABASE::check()
@@ -4230,33 +4251,34 @@ void POWER_SYSTEM_DATABASE::scale_energy_storages_power_in_zone(size_t zone_numb
 
 void POWER_SYSTEM_DATABASE::clear_bus(size_t bus)
 {
-    if(not is_bus_exist(bus)) return;
-
-    clear_sources_connecting_to_bus(bus);
-    clear_loads_connecting_to_bus(bus);
-    clear_lines_connecting_to_bus(bus);
-    clear_transformers_connecting_to_bus(bus);
-    clear_fixed_shunts_connecting_to_bus(bus);
-    clear_hvdcs_connecting_to_bus(bus);
-    clear_equivalent_devices_connecting_to_bus(bus);
+    if(is_bus_exist(bus))
+    {
+        clear_sources_connecting_to_bus(bus);
+        clear_loads_connecting_to_bus(bus);
+        clear_lines_connecting_to_bus(bus);
+        clear_transformers_connecting_to_bus(bus);
+        clear_fixed_shunts_connecting_to_bus(bus);
+        clear_hvdcs_connecting_to_bus(bus);
+        clear_equivalent_devices_connecting_to_bus(bus);
 
-    size_t current_index = get_bus_index(bus);
+        size_t current_index = get_bus_index(bus);
 
-    vector<BUS>::iterator iter = Bus.begin();
-    std::advance(iter, current_index);
-    Bus.erase(iter);
-    bus_index.set_bus_with_index(bus, INDEX_NOT_EXIST);
+        vector<BUS>::iterator iter = Bus.begin();
+        std::advance(iter, current_index);
+        Bus.erase(iter);
+        bus_index.set_bus_with_index(bus, INDEX_NOT_EXIST);
 
-    size_t max_bus_number = bus_index.get_max_bus_number();
+        size_t max_bus_number = bus_index.get_max_bus_number();
 
-    size_t max_bus_number_plus_1 = max_bus_number+1;
-    for(size_t i=1; i!=max_bus_number_plus_1; ++i)
-    {
-        size_t index = bus_index.get_index_of_bus(i);
-        if(index!= INDEX_NOT_EXIST and index>current_index)
-            bus_index.set_bus_with_index(i, index-1);
+        size_t max_bus_number_plus_1 = max_bus_number+1;
+        for(size_t i=1; i!=max_bus_number_plus_1; ++i)
+        {
+            size_t index = bus_index.get_index_of_bus(i);
+            if(index!= INDEX_NOT_EXIST and index>current_index)
+                bus_index.set_bus_with_index(i, index-1);
+        }
+        update_in_service_bus_count();
     }
-    update_in_service_bus_count();
 }
 
 void POWER_SYSTEM_DATABASE::clear_all_buses()
@@ -4280,17 +4302,18 @@ void POWER_SYSTEM_DATABASE::clear_all_buses()
 
 void POWER_SYSTEM_DATABASE::clear_generator(const DEVICE_ID& device_id)
 {
-    if(not is_generator_exist(device_id)) return;
-
-    size_t current_index = get_generator_index(device_id);
+    if(is_generator_exist(device_id))
+    {
+        size_t current_index = get_generator_index(device_id);
 
-    vector<GENERATOR>::iterator iter_generator = Generator.begin();
+        vector<GENERATOR>::iterator iter_generator = Generator.begin();
 
-    std::advance(iter_generator, current_index);
-    Generator.erase(iter_generator);
-    generator_index.set_device_index(device_id, INDEX_NOT_EXIST);
+        std::advance(iter_generator, current_index);
+        Generator.erase(iter_generator);
+        generator_index.set_device_index(device_id, INDEX_NOT_EXIST);
 
-    generator_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+        generator_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+    }
 }
 
 void POWER_SYSTEM_DATABASE::clear_generators_connecting_to_bus(const size_t bus)
@@ -4301,14 +4324,16 @@ void POWER_SYSTEM_DATABASE::clear_generators_connecting_to_bus(const size_t bus)
     while(true)
     {
         vector<GENERATOR*> generator = get_generators_connecting_to_bus(bus);
-        if(generator.size()==0)
+        if(generator.size()!=0)
+        {
+            terminal.clear();
+            terminal.append_bus(bus);
+            device_id.set_device_terminal(terminal);
+            device_id.set_device_identifier(generator[0]->get_identifier());
+            clear_generator(device_id);
+        }
+        else
             break;
-
-        terminal.clear();
-        terminal.append_bus(bus);
-        device_id.set_device_terminal(terminal);
-        device_id.set_device_identifier(generator[0]->get_identifier());
-        clear_generator(device_id);
     }
 }
 
@@ -4321,17 +4346,18 @@ void POWER_SYSTEM_DATABASE::clear_all_generators()
 
 void POWER_SYSTEM_DATABASE::clear_wt_generator(const DEVICE_ID& device_id)
 {
-    if(not is_wt_generator_exist(device_id)) return;
-
-    size_t current_index = get_wt_generator_index(device_id);
+    if(is_wt_generator_exist(device_id))
+    {
+        size_t current_index = get_wt_generator_index(device_id);
 
-    vector<WT_GENERATOR>::iterator iter_wt_generator = WT_Generator.begin();
+        vector<WT_GENERATOR>::iterator iter_wt_generator = WT_Generator.begin();
 
-    std::advance(iter_wt_generator, current_index);
-    WT_Generator.erase(iter_wt_generator);
-    wt_generator_index.set_device_index(device_id, INDEX_NOT_EXIST);
+        std::advance(iter_wt_generator, current_index);
+        WT_Generator.erase(iter_wt_generator);
+        wt_generator_index.set_device_index(device_id, INDEX_NOT_EXIST);
 
-    wt_generator_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+        wt_generator_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+    }
 }
 
 void POWER_SYSTEM_DATABASE::clear_wt_generators_connecting_to_bus(const size_t bus)
@@ -4342,13 +4368,16 @@ void POWER_SYSTEM_DATABASE::clear_wt_generators_connecting_to_bus(const size_t b
     while(true)
     {
         vector<WT_GENERATOR*> wt_generator = get_wt_generators_connecting_to_bus(bus);
-        if(wt_generator.size()==0)
+        if(wt_generator.size()!=0)
+        {
+            terminal.clear();
+            terminal.append_bus(bus);
+            device_id.set_device_terminal(terminal);
+            device_id.set_device_identifier(wt_generator[0]->get_identifier());
+            clear_wt_generator(device_id);
+        }
+        else
             break;
-        terminal.clear();
-        terminal.append_bus(bus);
-        device_id.set_device_terminal(terminal);
-        device_id.set_device_identifier(wt_generator[0]->get_identifier());
-        clear_wt_generator(device_id);
     }
 }
 
@@ -4360,17 +4389,18 @@ void POWER_SYSTEM_DATABASE::clear_all_wt_generators()
 
 void POWER_SYSTEM_DATABASE::clear_pv_unit(const DEVICE_ID& device_id)
 {
-    if(not is_pv_unit_exist(device_id)) return;
-
-    size_t current_index = get_pv_unit_index(device_id);
+    if(is_pv_unit_exist(device_id))
+    {
+        size_t current_index = get_pv_unit_index(device_id);
 
-    vector<PV_UNIT>::iterator iter_pv_unit = PV_Unit.begin();
+        vector<PV_UNIT>::iterator iter_pv_unit = PV_Unit.begin();
 
-    std::advance(iter_pv_unit, current_index);
-    PV_Unit.erase(iter_pv_unit);
-    pv_unit_index.set_device_index(device_id, INDEX_NOT_EXIST);
+        std::advance(iter_pv_unit, current_index);
+        PV_Unit.erase(iter_pv_unit);
+        pv_unit_index.set_device_index(device_id, INDEX_NOT_EXIST);
 
-    pv_unit_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+        pv_unit_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+    }
 }
 
 
@@ -4382,13 +4412,16 @@ void POWER_SYSTEM_DATABASE::clear_pv_units_connecting_to_bus(const size_t bus)
     while(true)
     {
         vector<PV_UNIT*> pv_unit = get_pv_units_connecting_to_bus(bus);
-        if(pv_unit.size()==0)
+        if(pv_unit.size()!=0)
+        {
+            terminal.clear();
+            terminal.append_bus(bus);
+            device_id.set_device_terminal(terminal);
+            device_id.set_device_identifier(pv_unit[0]->get_identifier());
+            clear_pv_unit(device_id);
+        }
+        else
             break;
-        terminal.clear();
-        terminal.append_bus(bus);
-        device_id.set_device_terminal(terminal);
-        device_id.set_device_identifier(pv_unit[0]->get_identifier());
-        clear_pv_unit(device_id);
     }
 }
 
@@ -4416,18 +4449,19 @@ void POWER_SYSTEM_DATABASE::clear_all_sources()
 
 void POWER_SYSTEM_DATABASE::clear_load(const DEVICE_ID& device_id)
 {
-    if(not is_load_exist(device_id)) return;
-
-    size_t current_index = get_load_index(device_id);
+    if(is_load_exist(device_id))
+    {
+        size_t current_index = get_load_index(device_id);
 
-    vector<LOAD>::iterator iter_load = Load.begin();
+        vector<LOAD>::iterator iter_load = Load.begin();
 
 
-    std::advance(iter_load, current_index);
-    Load.erase(iter_load);
-    load_index.set_device_index(device_id, INDEX_NOT_EXIST);
+        std::advance(iter_load, current_index);
+        Load.erase(iter_load);
+        load_index.set_device_index(device_id, INDEX_NOT_EXIST);
 
-    load_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+        load_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+    }
 }
 
 void POWER_SYSTEM_DATABASE::clear_loads_connecting_to_bus(const size_t bus)
@@ -4438,14 +4472,17 @@ void POWER_SYSTEM_DATABASE::clear_loads_connecting_to_bus(const size_t bus)
     while(true)
     {
         vector<LOAD*> load = get_loads_connecting_to_bus(bus);
-        if(load.size()==0)
+        if(load.size()!=0)
+        {
+            terminal.clear();
+            terminal.append_bus(bus);
+            device_id.set_device_terminal(terminal);
+            device_id.set_device_identifier(load[0]->get_identifier());
+            clear_load(device_id);
+        }
+        else
             break;
 
-        terminal.clear();
-        terminal.append_bus(bus);
-        device_id.set_device_terminal(terminal);
-        device_id.set_device_identifier(load[0]->get_identifier());
-        clear_load(device_id);
     }
 }
 
@@ -4458,18 +4495,19 @@ void POWER_SYSTEM_DATABASE::clear_all_loads()
 
 void POWER_SYSTEM_DATABASE::clear_line(const DEVICE_ID& device_id)
 {
-    if(not is_line_exist(device_id)) return;
-
-    size_t current_index = get_line_index(device_id);
+    if(is_line_exist(device_id))
+    {
+        size_t current_index = get_line_index(device_id);
 
-    vector<LINE>::iterator iter_line = Line.begin();
+        vector<LINE>::iterator iter_line = Line.begin();
 
 
-    std::advance(iter_line, current_index);
-    Line.erase(iter_line);
-    line_index.set_device_index(device_id, INDEX_NOT_EXIST);
+        std::advance(iter_line, current_index);
+        Line.erase(iter_line);
+        line_index.set_device_index(device_id, INDEX_NOT_EXIST);
 
-    line_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+        line_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+    }
 }
 
 void POWER_SYSTEM_DATABASE::clear_lines_connecting_to_bus(const size_t bus)
@@ -4480,15 +4518,18 @@ void POWER_SYSTEM_DATABASE::clear_lines_connecting_to_bus(const size_t bus)
     while(true)
     {
         vector<LINE*> line = get_lines_connecting_to_bus(bus);
-        if(line.size()==0)
+        if(line.size()!=0)
+        {
+            terminal.clear();
+            terminal.append_bus(line[0]->get_sending_side_bus());
+            terminal.append_bus(line[0]->get_receiving_side_bus());
+            device_id.set_device_terminal(terminal);
+            device_id.set_device_identifier(line[0]->get_identifier());
+            clear_line(device_id);
+        }
+        else
             break;
 
-        terminal.clear();
-        terminal.append_bus(line[0]->get_sending_side_bus());
-        terminal.append_bus(line[0]->get_receiving_side_bus());
-        device_id.set_device_terminal(terminal);
-        device_id.set_device_identifier(line[0]->get_identifier());
-        clear_line(device_id);
     }
 }
 
@@ -4500,17 +4541,18 @@ void POWER_SYSTEM_DATABASE::clear_all_lines()
 
 void POWER_SYSTEM_DATABASE::clear_transformer(const DEVICE_ID& device_id)
 {
-    if(not is_transformer_exist(device_id)) return;
-
-    size_t current_index = get_transformer_index(device_id);
+    if(is_transformer_exist(device_id))
+    {
+        size_t current_index = get_transformer_index(device_id);
 
-    vector<TRANSFORMER>::iterator iter_transformer = Transformer.begin();
+        vector<TRANSFORMER>::iterator iter_transformer = Transformer.begin();
 
-    std::advance(iter_transformer, current_index);
-    Transformer.erase(iter_transformer);
-    transformer_index.set_device_index(device_id, INDEX_NOT_EXIST);
+        std::advance(iter_transformer, current_index);
+        Transformer.erase(iter_transformer);
+        transformer_index.set_device_index(device_id, INDEX_NOT_EXIST);
 
-    transformer_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+        transformer_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+    }
 }
 
 void POWER_SYSTEM_DATABASE::clear_transformers_connecting_to_bus(const size_t bus)
@@ -4522,16 +4564,18 @@ void POWER_SYSTEM_DATABASE::clear_transformers_connecting_to_bus(const size_t bu
     {
         vector<TRANSFORMER*> transformer = get_transformers_connecting_to_bus(bus);
 
-        if(transformer.size()==0)
+        if(transformer.size()!=0)
+        {
+            terminal.clear();
+            terminal.append_bus(transformer[0]->get_winding_bus(PRIMARY_SIDE));
+            terminal.append_bus(transformer[0]->get_winding_bus(SECONDARY_SIDE));
+            terminal.append_bus(transformer[0]->get_winding_bus(TERTIARY_SIDE));
+            device_id.set_device_terminal(terminal);
+            device_id.set_device_identifier(transformer[0]->get_identifier());
+            clear_transformer(device_id);
+        }
+        else
             break;
-
-        terminal.clear();
-        terminal.append_bus(transformer[0]->get_winding_bus(PRIMARY_SIDE));
-        terminal.append_bus(transformer[0]->get_winding_bus(SECONDARY_SIDE));
-        terminal.append_bus(transformer[0]->get_winding_bus(TERTIARY_SIDE));
-        device_id.set_device_terminal(terminal);
-        device_id.set_device_identifier(transformer[0]->get_identifier());
-        clear_transformer(device_id);
     }
 }
 
@@ -4544,22 +4588,35 @@ void POWER_SYSTEM_DATABASE::clear_all_transformers()
 
 void POWER_SYSTEM_DATABASE::clear_fixed_shunt(const DEVICE_ID& device_id)
 {
-    if(not is_fixed_shunt_exist(device_id))
-        return;
+    if(is_fixed_shunt_exist(device_id))
+    {
+        size_t current_index = get_fixed_shunt_index(device_id);
 
-    size_t current_index = get_fixed_shunt_index(device_id);
+        vector<FIXED_SHUNT>::iterator iter_fs = Fixed_shunt.begin();
 
-    vector<FIXED_SHUNT> fs;
-    size_t nfshunt = get_fixed_shunt_count();
-    for(size_t i=0; i!=nfshunt; ++i)
-        if(i!=current_index) fs.push_back(Fixed_shunt[i]);
 
-    Fixed_shunt.clear();
-    Fixed_shunt = fs;
+        std::advance(iter_fs, current_index);
+        Fixed_shunt.erase(iter_fs);
+        fixed_shunt_index.set_device_index(device_id, INDEX_NOT_EXIST);
+
+        fixed_shunt_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+
+        /*
+        size_t current_index = get_fixed_shunt_index(device_id);
 
-    fixed_shunt_index.set_device_index(device_id, INDEX_NOT_EXIST);
+        vector<FIXED_SHUNT> fs;
+        size_t nfshunt = get_fixed_shunt_count();
+        for(size_t i=0; i!=nfshunt; ++i)
+            if(i!=current_index) fs.push_back(Fixed_shunt[i]);
 
-    fixed_shunt_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+        Fixed_shunt.clear();
+        Fixed_shunt = fs;
+
+        fixed_shunt_index.set_device_index(device_id, INDEX_NOT_EXIST);
+
+        fixed_shunt_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+        */
+    }
 }
 
 
@@ -4573,12 +4630,14 @@ void POWER_SYSTEM_DATABASE::clear_fixed_shunts_connecting_to_bus(const size_t bu
     while(true)
     {
         vector<FIXED_SHUNT*> fixed_shunt = get_fixed_shunts_connecting_to_bus(bus);
-        if(fixed_shunt.size()==0)
+        if(fixed_shunt.size()!=0)
+        {
+            device_id.set_device_identifier(fixed_shunt[0]->get_identifier());
+            clear_fixed_shunt(device_id);
+            fixed_shunt.clear();
+        }
+        else
             break;
-
-        device_id.set_device_identifier(fixed_shunt[0]->get_identifier());
-        clear_fixed_shunt(device_id);
-        fixed_shunt.clear();
     }
 }
 
@@ -4590,18 +4649,19 @@ void POWER_SYSTEM_DATABASE::clear_all_fixed_shunts()
 
 void POWER_SYSTEM_DATABASE::clear_hvdc(const DEVICE_ID& device_id)
 {
-    if(not is_hvdc_exist(device_id)) return;
-
-    size_t current_index = get_hvdc_index(device_id);
+    if(is_hvdc_exist(device_id))
+    {
+        size_t current_index = get_hvdc_index(device_id);
 
-    vector<HVDC>::iterator iter_hvdc = Hvdc.begin();
+        vector<HVDC>::iterator iter_hvdc = Hvdc.begin();
 
 
-    std::advance(iter_hvdc, current_index);
-    Hvdc.erase(iter_hvdc);
-    hvdc_index.set_device_index(device_id, INDEX_NOT_EXIST);
+        std::advance(iter_hvdc, current_index);
+        Hvdc.erase(iter_hvdc);
+        hvdc_index.set_device_index(device_id, INDEX_NOT_EXIST);
 
-    hvdc_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+        hvdc_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+    }
 }
 
 void POWER_SYSTEM_DATABASE::clear_hvdcs_connecting_to_bus(const size_t bus)
@@ -4612,15 +4672,17 @@ void POWER_SYSTEM_DATABASE::clear_hvdcs_connecting_to_bus(const size_t bus)
     while(true)
     {
         vector<HVDC*> hvdc = get_hvdcs_connecting_to_bus(bus);
-        if(hvdc.size()==0)
+        if(hvdc.size()!=0)
+        {
+            terminal.clear();
+            terminal.append_bus(hvdc[0]->get_converter_bus(RECTIFIER));
+            terminal.append_bus(hvdc[0]->get_converter_bus(INVERTER));
+            device_id.set_device_terminal(terminal);
+            device_id.set_device_identifier(hvdc[0]->get_identifier());
+            clear_hvdc(device_id);
+        }
+        else
             break;
-
-        terminal.clear();
-        terminal.append_bus(hvdc[0]->get_converter_bus(RECTIFIER));
-        terminal.append_bus(hvdc[0]->get_converter_bus(INVERTER));
-        device_id.set_device_terminal(terminal);
-        device_id.set_device_identifier(hvdc[0]->get_identifier());
-        clear_hvdc(device_id);
     }
 }
 
@@ -4632,18 +4694,19 @@ void POWER_SYSTEM_DATABASE::clear_all_hvdcs()
 
 void POWER_SYSTEM_DATABASE::clear_equivalent_device(const DEVICE_ID& device_id)
 {
-    if(not is_equivalent_device_exist(device_id)) return;
-
-    size_t current_index = get_equivalent_device_index(device_id);
+    if(is_equivalent_device_exist(device_id))
+    {
+        size_t current_index = get_equivalent_device_index(device_id);
 
-    vector<EQUIVALENT_DEVICE>::iterator iter_edevice = Equivalent_device.begin();
+        vector<EQUIVALENT_DEVICE>::iterator iter_edevice = Equivalent_device.begin();
 
 
-    std::advance(iter_edevice, current_index);
-    Equivalent_device.erase(iter_edevice);
-    equivalent_device_index.set_device_index(device_id, INDEX_NOT_EXIST);
+        std::advance(iter_edevice, current_index);
+        Equivalent_device.erase(iter_edevice);
+        equivalent_device_index.set_device_index(device_id, INDEX_NOT_EXIST);
 
-    equivalent_device_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+        equivalent_device_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+    }
 }
 
 void POWER_SYSTEM_DATABASE::clear_equivalent_devices_connecting_to_bus(const size_t bus)
@@ -4654,14 +4717,16 @@ void POWER_SYSTEM_DATABASE::clear_equivalent_devices_connecting_to_bus(const siz
     while(true)
     {
         vector<EQUIVALENT_DEVICE*> edevice = get_equivalent_devices_connecting_to_bus(bus);
-        if(edevice.size()==0)
+        if(edevice.size()!=0)
+        {
+            terminal.clear();
+            terminal.append_bus(edevice[0]->get_equivalent_device_bus());
+            device_id.set_device_terminal(terminal);
+            device_id.set_device_identifier(edevice[0]->get_identifier());
+            clear_equivalent_device(device_id);
+        }
+        else
             break;
-
-        terminal.clear();
-        terminal.append_bus(edevice[0]->get_equivalent_device_bus());
-        device_id.set_device_terminal(terminal);
-        device_id.set_device_identifier(edevice[0]->get_identifier());
-        clear_equivalent_device(device_id);
     }
 }
 
@@ -4674,18 +4739,19 @@ void POWER_SYSTEM_DATABASE::clear_all_equivalent_devices()
 
 void POWER_SYSTEM_DATABASE::clear_energy_storage(const DEVICE_ID& device_id)
 {
-    if(not is_energy_storage_exist(device_id)) return;
-
-    size_t current_index = get_energy_storage_index(device_id);
+    if(is_energy_storage_exist(device_id))
+    {
+        size_t current_index = get_energy_storage_index(device_id);
 
-    vector<ENERGY_STORAGE>::iterator iter_edevice = Energy_storage.begin();
+        vector<ENERGY_STORAGE>::iterator iter_edevice = Energy_storage.begin();
 
 
-    std::advance(iter_edevice, current_index);
-    Energy_storage.erase(iter_edevice);
-    energy_storage_index.set_device_index(device_id, INDEX_NOT_EXIST);
+        std::advance(iter_edevice, current_index);
+        Energy_storage.erase(iter_edevice);
+        energy_storage_index.set_device_index(device_id, INDEX_NOT_EXIST);
 
-    energy_storage_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+        energy_storage_index.decrease_index_by_1_for_device_with_index_greater_than(current_index);
+    }
 }
 
 void POWER_SYSTEM_DATABASE::clear_energy_storages_connecting_to_bus(const size_t bus)
@@ -4696,14 +4762,16 @@ void POWER_SYSTEM_DATABASE::clear_energy_storages_connecting_to_bus(const size_t
     while(true)
     {
         vector<ENERGY_STORAGE*> estorage = get_energy_storages_connecting_to_bus(bus);
-        if(estorage.size()==0)
+        if(estorage.size()!=0)
+        {
+            terminal.clear();
+            terminal.append_bus(estorage[0]->get_energy_storage_bus());
+            device_id.set_device_terminal(terminal);
+            device_id.set_device_identifier(estorage[0]->get_identifier());
+            clear_energy_storage(device_id);
+        }
+        else
             break;
-
-        terminal.clear();
-        terminal.append_bus(estorage[0]->get_energy_storage_bus());
-        device_id.set_device_terminal(terminal);
-        device_id.set_device_identifier(estorage[0]->get_identifier());
-        clear_energy_storage(device_id);
     }
 }
 
@@ -4749,140 +4817,143 @@ void POWER_SYSTEM_DATABASE::clear_all_owners()
 
 void POWER_SYSTEM_DATABASE::trip_bus(size_t bus)
 {
-    if(not is_bus_exist(bus)) return;
+    if(is_bus_exist(bus))
+    {
+        size_t index = get_bus_index(bus);
+        if(Bus[index].get_bus_type()!=OUT_OF_SERVICE)
+        {
+            ostringstream osstream;
 
-    size_t index = get_bus_index(bus);
-    if(Bus[index].get_bus_type()==OUT_OF_SERVICE)
-        return;
+            osstream<<"The following devices are tripped before bus "<<bus<<" is tripped."<<endl;
 
-    ostringstream osstream;
+            size_t n = 0;
 
-    osstream<<"The following devices are tripped before bus "<<bus<<" is tripped."<<endl;
+            vector<GENERATOR*> gens = get_generators_connecting_to_bus(bus);
+            n=gens.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(gens[i]->get_status()==true)
+                {
+                    gens[i]->set_status(false);
+                    osstream<<gens[i]->get_device_name()<<endl;
+                }
+            }
 
-    size_t n = 0;
+            vector<WT_GENERATOR*> wts = get_wt_generators_connecting_to_bus(bus);
+            n=wts.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(wts[i]->get_status()==true)
+                {
+                    wts[i]->set_status(false);
+                    osstream<<wts[i]->get_device_name()<<endl;
+                }
+            }
 
-    vector<GENERATOR*> gens = get_generators_connecting_to_bus(bus);
-    n=gens.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        if(gens[i]->get_status()==true)
-        {
-            gens[i]->set_status(false);
-            osstream<<gens[i]->get_device_name()<<endl;
-        }
-    }
+            vector<PV_UNIT*> pvs = get_pv_units_connecting_to_bus(bus);
+            n=pvs.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(pvs[i]->get_status()==true)
+                {
+                    pvs[i]->set_status(false);
+                    osstream<<pvs[i]->get_device_name()<<endl;
+                }
+            }
 
-    vector<WT_GENERATOR*> wts = get_wt_generators_connecting_to_bus(bus);
-    n=wts.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        if(wts[i]->get_status()==true)
-        {
-            wts[i]->set_status(false);
-            osstream<<wts[i]->get_device_name()<<endl;
-        }
-    }
+            vector<ENERGY_STORAGE*> ess = get_energy_storages_connecting_to_bus(bus);
+            n=ess.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(ess[i]->get_status()==true)
+                {
+                    ess[i]->set_status(false);
+                    osstream<<ess[i]->get_device_name()<<endl;
+                }
+            }
 
-    vector<PV_UNIT*> pvs = get_pv_units_connecting_to_bus(bus);
-    n=pvs.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        if(pvs[i]->get_status()==true)
-        {
-            pvs[i]->set_status(false);
-            osstream<<pvs[i]->get_device_name()<<endl;
-        }
-    }
+            vector<LOAD*> loads = get_loads_connecting_to_bus(bus);
+            n=loads.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(loads[i]->get_status()==true)
+                {
+                    loads[i]->set_status(false);
+                    osstream<<loads[i]->get_device_name()<<endl;
+                }
+            }
 
-    vector<ENERGY_STORAGE*> ess = get_energy_storages_connecting_to_bus(bus);
-    n=ess.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        if(ess[i]->get_status()==true)
-        {
-            ess[i]->set_status(false);
-            osstream<<ess[i]->get_device_name()<<endl;
-        }
-    }
+            vector<FIXED_SHUNT*> fshunts = get_fixed_shunts_connecting_to_bus(bus);
+            n=fshunts.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(fshunts[i]->get_status()==true)
+                {
+                    fshunts[i]->set_status(false);
+                    osstream<<fshunts[i]->get_device_name()<<endl;
+                }
+            }
 
-    vector<LOAD*> loads = get_loads_connecting_to_bus(bus);
-    n=loads.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        if(loads[i]->get_status()==true)
-        {
-            loads[i]->set_status(false);
-            osstream<<loads[i]->get_device_name()<<endl;
-        }
-    }
+            vector<LINE*> lines = get_lines_connecting_to_bus(bus);
+            n=lines.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(lines[i]->get_sending_side_breaker_status()==true or lines[i]->get_receiving_side_breaker_status()==true)
+                {
+                    lines[i]->set_sending_side_breaker_status(false);
+                    lines[i]->set_receiving_side_breaker_status(false);
+                    osstream<<lines[i]->get_device_name()<<endl;
+                }
+            }
 
-    vector<FIXED_SHUNT*> fshunts = get_fixed_shunts_connecting_to_bus(bus);
-    n=fshunts.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        if(fshunts[i]->get_status()==true)
-        {
-            fshunts[i]->set_status(false);
-            osstream<<fshunts[i]->get_device_name()<<endl;
-        }
-    }
+            vector<TRANSFORMER*> transes = get_transformers_connecting_to_bus(bus);
+            n=transes.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(transes[i]->get_winding_breaker_status(PRIMARY_SIDE)==true or transes[i]->get_winding_breaker_status(SECONDARY_SIDE)==true or
+                   (transes[i]->is_three_winding_transformer() and transes[i]->get_winding_breaker_status(TERTIARY_SIDE)==true) )
+                {
+                    transes[i]->set_winding_breaker_status(PRIMARY_SIDE, false);
+                    transes[i]->set_winding_breaker_status(SECONDARY_SIDE, false);
+                    if(transes[i]->is_two_winding_transformer())
+                        continue;
+                    else
+                        transes[i]->set_winding_breaker_status(TERTIARY_SIDE, false);
 
-    vector<LINE*> lines = get_lines_connecting_to_bus(bus);
-    n=lines.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        if(lines[i]->get_sending_side_breaker_status()==true or lines[i]->get_receiving_side_breaker_status()==true)
-        {
-            lines[i]->set_sending_side_breaker_status(false);
-            lines[i]->set_receiving_side_breaker_status(false);
-            osstream<<lines[i]->get_device_name()<<endl;
-        }
-    }
+                    osstream<<transes[i]->get_device_name()<<endl;
+                }
+            }
 
-    vector<TRANSFORMER*> transes = get_transformers_connecting_to_bus(bus);
-    n=transes.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        if(transes[i]->get_winding_breaker_status(PRIMARY_SIDE)==true or transes[i]->get_winding_breaker_status(SECONDARY_SIDE)==true or
-           (transes[i]->is_three_winding_transformer() and transes[i]->get_winding_breaker_status(TERTIARY_SIDE)==true) )
-        {
-            transes[i]->set_winding_breaker_status(PRIMARY_SIDE, false);
-            transes[i]->set_winding_breaker_status(SECONDARY_SIDE, false);
-            if(transes[i]->is_three_winding_transformer())
-                transes[i]->set_winding_breaker_status(TERTIARY_SIDE, false);
+            vector<HVDC*> hvdcs = get_hvdcs_connecting_to_bus(bus);
+            n=hvdcs.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(hvdcs[i]->get_status()==true)
+                {
+                    hvdcs[i]->set_status(false);
+                    osstream<<hvdcs[i]->get_device_name()<<endl;
+                }
+            }
 
-            osstream<<transes[i]->get_device_name()<<endl;
-        }
-    }
+            vector<EQUIVALENT_DEVICE*> edevices = get_equivalent_devices_connecting_to_bus(bus);
+            n=edevices.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(edevices[i]->get_status()==true)
+                {
+                    edevices[i]->set_status(false);
+                    osstream<<edevices[i]->get_device_name()<<endl;
+                }
+            }
 
-    vector<HVDC*> hvdcs = get_hvdcs_connecting_to_bus(bus);
-    n=hvdcs.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        if(hvdcs[i]->get_status()==true)
-        {
-            hvdcs[i]->set_status(false);
-            osstream<<hvdcs[i]->get_device_name()<<endl;
-        }
-    }
+            Bus[index].set_bus_type(OUT_OF_SERVICE);
+            osstream<<"Bus "<<bus<<" is tripped.";
+            STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+            toolkit.show_information_with_leading_time_stamp(osstream);
 
-    vector<EQUIVALENT_DEVICE*> edevices = get_equivalent_devices_connecting_to_bus(bus);
-    n=edevices.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        if(edevices[i]->get_status()==true)
-        {
-            edevices[i]->set_status(false);
-            osstream<<edevices[i]->get_device_name()<<endl;
+            update_in_service_bus_count();
         }
     }
-
-    Bus[index].set_bus_type(OUT_OF_SERVICE);
-    osstream<<"Bus "<<bus<<" is tripped.";
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    toolkit.show_information_with_leading_time_stamp(osstream);
-
-    update_in_service_bus_count();
 }
 
 void POWER_SYSTEM_DATABASE::check_device_status_for_out_of_service_buses()
@@ -4893,7 +4964,9 @@ void POWER_SYSTEM_DATABASE::check_device_status_for_out_of_service_buses()
     for(size_t i=0; i!=nbus; ++i)
     {
         bus = buses[i];
-        if(bus->get_bus_type()==OUT_OF_SERVICE)
+        if(bus->get_bus_type()!=OUT_OF_SERVICE)
+            continue;
+        else
         {
             size_t bus_number = bus->get_bus_number();
             check_source_status_for_out_of_service_bus(bus_number);
@@ -5167,165 +5240,177 @@ double POWER_SYSTEM_DATABASE::get_voltage_to_regulate_of_physical_bus_in_pu(size
 
 double POWER_SYSTEM_DATABASE::get_regulatable_p_max_at_physical_bus_in_MW(size_t bus)
 {
-    if(not is_bus_exist(bus))
-        return 0.0;
-
-    BUS* busptr = get_bus(bus);
-    BUS_TYPE btype = busptr->get_bus_type();
-    if(btype!=SLACK_TYPE)
-        return 0.0;
-    else
-    {
-        double total_p_max_in_MW = 0.0;
+    if(is_bus_exist(bus))
+    {
+        BUS* busptr = get_bus(bus);
+        BUS_TYPE btype = busptr->get_bus_type();
+        if(btype==SLACK_TYPE)
+        {
+            double total_p_max_in_MW = 0.0;
 
-        vector<SOURCE*> sources = get_sources_connecting_to_bus(bus);
+            vector<SOURCE*> sources = get_sources_connecting_to_bus(bus);
 
-        size_t n = sources.size();
-        for(size_t i=0; i!=n; ++i)
-        {
-            if(sources[i]->get_status() == false)
-                continue;
-            total_p_max_in_MW += sources[i]->get_p_max_in_MW();
-        }
-        return total_p_max_in_MW;
+            size_t n = sources.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(sources[i]->get_status() == false)
+                    continue;
+                total_p_max_in_MW += sources[i]->get_p_max_in_MW();
+            }
+            return total_p_max_in_MW;
+        }
+        else
+            return 0.0;
     }
+    else
+        return 0.0;
 }
 
 double POWER_SYSTEM_DATABASE::get_regulatable_p_min_at_physical_bus_in_MW(size_t bus)
 {
-    if(not is_bus_exist(bus))
-        return 0.0;
-
-    BUS* busptr = get_bus(bus);
-    BUS_TYPE btype = busptr->get_bus_type();
-    if(btype!=SLACK_TYPE)
-        return 0.0;
-    else
-    {
-        double total_p_min_in_MW = 0.0;
+    if(is_bus_exist(bus))
+    {
+        BUS* busptr = get_bus(bus);
+        BUS_TYPE btype = busptr->get_bus_type();
+        if(btype==SLACK_TYPE)
+        {
+            double total_p_min_in_MW = 0.0;
 
-        vector<SOURCE*> sources = get_sources_connecting_to_bus(bus);
+            vector<SOURCE*> sources = get_sources_connecting_to_bus(bus);
 
-        size_t n = sources.size();
-        for(size_t i=0; i!=n; ++i)
-        {
-            if(sources[i]->get_status() == false)
-                continue;
-            total_p_min_in_MW += sources[i]->get_p_min_in_MW();
-        }
-        return total_p_min_in_MW;
+            size_t n = sources.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(sources[i]->get_status() == false)
+                    continue;
+                total_p_min_in_MW += sources[i]->get_p_min_in_MW();
+            }
+            return total_p_min_in_MW;
+        }
+        else
+            return 0.0;
     }
+    else
+        return 0.0;
 }
 
 double POWER_SYSTEM_DATABASE::get_regulatable_q_max_at_physical_bus_in_MVar(size_t bus)
 {
-    if(not is_bus_exist(bus))
-        return 0.0;
-
-    BUS* busptr = get_bus(bus);
-    BUS_TYPE btype = busptr->get_bus_type();
-    if(btype!=SLACK_TYPE and btype!=PV_TYPE
-       and btype!=PV_TO_PQ_TYPE_1 and btype!=PV_TO_PQ_TYPE_2
-       and btype!=PV_TO_PQ_TYPE_3 and btype!=PV_TO_PQ_TYPE_4)
-        return 0.0;
-    else
-    {
-        double total_q_max_in_MVar = 0.0;
+    if(is_bus_exist(bus))
+    {
+        BUS* busptr = get_bus(bus);
+        BUS_TYPE btype = busptr->get_bus_type();
+        if(btype==PV_TYPE or
+           btype==PV_TO_PQ_TYPE_1 or btype==PV_TO_PQ_TYPE_2 or
+           btype==PV_TO_PQ_TYPE_3 or btype==PV_TO_PQ_TYPE_4 or
+           btype==SLACK_TYPE)
+        {
+            double total_q_max_in_MVar = 0.0;
 
-        vector<SOURCE*> sources = get_sources_connecting_to_bus(bus);
+            vector<SOURCE*> sources = get_sources_connecting_to_bus(bus);
 
-        size_t n = sources.size();
-        for(size_t i=0; i!=n; ++i)
-        {
-            if(sources[i]->get_status() == false)
-                continue;
-            total_q_max_in_MVar += sources[i]->get_q_max_in_MVar();
+            size_t n = sources.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(sources[i]->get_status() == false)
+                    continue;
+                total_q_max_in_MVar += sources[i]->get_q_max_in_MVar();
+            }
+            return total_q_max_in_MVar;
         }
-        return total_q_max_in_MVar;
+        else
+            return 0.0;
     }
+    else
+        return 0.0;
 }
 
 double POWER_SYSTEM_DATABASE::get_regulatable_q_min_at_physical_bus_in_MVar(size_t bus)
 {
-    if(not is_bus_exist(bus))
-        return 0.0;
-
-    BUS* busptr = get_bus(bus);
-    BUS_TYPE btype = busptr->get_bus_type();
-    if(btype!=SLACK_TYPE and btype!=PV_TYPE
-       and btype!=PV_TO_PQ_TYPE_1 and btype!=PV_TO_PQ_TYPE_2
-       and btype!=PV_TO_PQ_TYPE_3 and btype!=PV_TO_PQ_TYPE_4)
-        return 0.0;
-    else
-    {
-        double total_q_min_in_MVar = 0.0;
+    if(is_bus_exist(bus))
+    {
+        BUS* busptr = get_bus(bus);
+        BUS_TYPE btype = busptr->get_bus_type();
+        if(btype==PV_TYPE or
+           btype==PV_TO_PQ_TYPE_1 or btype==PV_TO_PQ_TYPE_2 or
+           btype==PV_TO_PQ_TYPE_3 or btype==PV_TO_PQ_TYPE_4 or
+           btype==SLACK_TYPE )
+        {
+            double total_q_min_in_MVar = 0.0;
 
-        vector<SOURCE*> sources = get_sources_connecting_to_bus(bus);
+            vector<SOURCE*> sources = get_sources_connecting_to_bus(bus);
 
-        size_t n = sources.size();
-        for(size_t i=0; i!=n; ++i)
-        {
-            if(sources[i]->get_status() == false)
-                continue;
-            total_q_min_in_MVar += sources[i]->get_q_min_in_MVar();
-        }
-        return total_q_min_in_MVar;
+            size_t n = sources.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(sources[i]->get_status() == true)
+                    total_q_min_in_MVar += sources[i]->get_q_min_in_MVar();
+            }
+            return total_q_min_in_MVar;
+        }
+        else
+            return 0.0;
     }
+    else
+        return 0.0;
 }
 
 double POWER_SYSTEM_DATABASE::get_total_regulating_p_generation_at_physical_bus_in_MW(size_t bus)
 {
-    if(not is_bus_exist(bus))
-        return 0.0;
-
-    BUS* busptr = get_bus(bus);
-    BUS_TYPE btype = busptr->get_bus_type();
-    if(btype!=SLACK_TYPE)
-        return 0.0;
-    else
-    {
-        double total_p_in_MW = 0.0;
+    if(is_bus_exist(bus))
+    {
+        BUS* busptr = get_bus(bus);
+        BUS_TYPE btype = busptr->get_bus_type();
+        if(btype==SLACK_TYPE)
+        {
+            double total_p_in_MW = 0.0;
 
-        vector<SOURCE*> sources = get_sources_connecting_to_bus(bus);
+            vector<SOURCE*> sources = get_sources_connecting_to_bus(bus);
 
-        size_t n = sources.size();
-        for(size_t i=0; i!=n; ++i)
-        {
-            if(sources[i]->get_status() == false)
-                continue;
-            total_p_in_MW += sources[i]->get_p_generation_in_MW();
-        }
-        return total_p_in_MW;
+            size_t n = sources.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(sources[i]->get_status() == true)
+                    total_p_in_MW += sources[i]->get_p_generation_in_MW();
+            }
+            return total_p_in_MW;
+        }
+        else
+            return 0.0;
     }
+    else
+        return 0.0;
 }
 
 double POWER_SYSTEM_DATABASE::get_total_regulating_q_generation_at_physical_bus_in_MVar(size_t bus)
 {
 
-    if(not is_bus_exist(bus))
-        return 0.0;
-
-    BUS* busptr = get_bus(bus);
-    BUS_TYPE btype = busptr->get_bus_type();
-    if(btype!=SLACK_TYPE and btype!=PV_TYPE
-       and btype!=PV_TO_PQ_TYPE_1 and btype!=PV_TO_PQ_TYPE_2
-       and btype!=PV_TO_PQ_TYPE_3 and btype!=PV_TO_PQ_TYPE_4)
-        return 0.0;
-    else
-    {
-        double total_q_in_MVar = 0.0;
+    if(is_bus_exist(bus))
+    {
+        BUS* busptr = get_bus(bus);
+        BUS_TYPE btype = busptr->get_bus_type();
+        if(btype==PV_TYPE or
+           btype==PV_TO_PQ_TYPE_1 or btype==PV_TO_PQ_TYPE_2 or
+           btype==PV_TO_PQ_TYPE_3 or btype==PV_TO_PQ_TYPE_4 or
+           btype==SLACK_TYPE)
+        {
+            double total_q_in_MVar = 0.0;
 
-        vector<SOURCE*> sources = get_sources_connecting_to_bus(bus);
+            vector<SOURCE*> sources = get_sources_connecting_to_bus(bus);
 
-        size_t n = sources.size();
-        for(size_t i=0; i!=n; ++i)
-        {
-            if(sources[i]->get_status() == false)
-                continue;
-            total_q_in_MVar += sources[i]->get_q_generation_in_MVar();
+            size_t n = sources.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                if(sources[i]->get_status() == true)
+                    total_q_in_MVar += sources[i]->get_q_generation_in_MVar();
+            }
+            return total_q_in_MVar;
         }
-        return total_q_in_MVar;
+        else
+            return 0.0;
     }
+    else
+        return 0.0;
 }
 
 double POWER_SYSTEM_DATABASE::get_total_p_generation_at_physical_bus_in_MW(size_t bus)
@@ -5337,10 +5422,8 @@ double POWER_SYSTEM_DATABASE::get_total_p_generation_at_physical_bus_in_MW(size_
     size_t n = sources.size();
     for(size_t i=0; i!=n; ++i)
     {
-        if(sources[i]->get_status() == false)
-            continue;
-
-        total_p_in_MW += sources[i]->get_p_generation_in_MW();
+        if(sources[i]->get_status() == true)
+            total_p_in_MW += sources[i]->get_p_generation_in_MW();
     }
     return total_p_in_MW;
 }
@@ -5354,10 +5437,8 @@ double POWER_SYSTEM_DATABASE::get_total_q_generation_at_physical_bus_in_MVar(siz
     size_t n = sources.size();
     for(size_t i=0; i!=n; ++i)
     {
-        if(sources[i]->get_status() == false)
-            continue;
-
-        total_q_in_MVar += sources[i]->get_q_generation_in_MVar();
+        if(sources[i]->get_status() == true)
+            total_q_in_MVar += sources[i]->get_q_generation_in_MVar();
     }
     return total_q_in_MVar;
 }
diff --git a/code/source/power_system_database_test.cpp b/code/source/power_system_database_test.cpp
index 16546a78..42a7a2e4 100644
--- a/code/source/power_system_database_test.cpp
+++ b/code/source/power_system_database_test.cpp
@@ -8192,9 +8192,9 @@ void POWER_SYSTEM_DATABASE_TEST::test_clear_fixed_shunt()
 
     POWER_SYSTEM_DATABASE& psdb = default_toolkit.get_power_system_database();
 
-    ostringstream osstream;
+    /*ostringstream osstream;
     osstream<<"ALEEEEEEEEEEERT! clear_fixed_shunt is not functioning if using the vector::erase function.";
-    default_toolkit.show_information_with_leading_time_stamp(osstream);
+    default_toolkit.show_information_with_leading_time_stamp(osstream);*/
 
     prepare_database_for_test();
 
diff --git a/code/source/toolkit/contingency_screener/contingency_screener.cpp b/code/source/toolkit/contingency_screener/contingency_screener.cpp
index c498092a..b6c1b846 100644
--- a/code/source/toolkit/contingency_screener/contingency_screener.cpp
+++ b/code/source/toolkit/contingency_screener/contingency_screener.cpp
@@ -393,9 +393,7 @@ bool CONTINGENCY_SCREENER::perform_simulation_with_clearing_time(double clearing
 
     set_meters(simulator);
 
-    string filename = "";
-    if(filename != "")
-        filename += "_cleared_after_"+num2str(clearing_time)+"s";
+    string filename = "cs_cleared_after_"+num2str(clearing_time)+"s";
     simulator.set_output_file(filename);
 
     simulator.start();
@@ -419,7 +417,9 @@ bool CONTINGENCY_SCREENER::perform_simulation_with_clearing_time(double clearing
         simulator.run_a_step();
         TIME = toolkit.get_dynamic_simulation_time_in_s();
         is_stable = check_if_system_is_stable(simulator);
-        if(not is_stable)
+        if(is_stable)
+            continue;
+        else
             break;
     }
 
@@ -499,10 +499,12 @@ bool CONTINGENCY_SCREENER::check_if_system_is_stable(DYNAMICS_SIMULATOR& simulat
         }
     }
     double angle_difference = angle_max - angle_min;
-    while(angle_difference>180.0)
+    while(angle_difference>360.0)
+        angle_difference -= 360.0;
+    /*while(angle_difference>180.0)
         angle_difference -= 360.0;
     while(angle_difference<-180.0)
-        angle_difference += 360.0;
+        angle_difference += 360.0;*/
     if(fabs(angle_difference)>get_angle_difference_threshold_in_deg())
         return false;
     else
diff --git a/code/source/toolkit/dynamic_simulator/dynamic_simulator.cpp b/code/source/toolkit/dynamic_simulator/dynamic_simulator.cpp
index 5fb38db6..010ed6d0 100644
--- a/code/source/toolkit/dynamic_simulator/dynamic_simulator.cpp
+++ b/code/source/toolkit/dynamic_simulator/dynamic_simulator.cpp
@@ -16,6 +16,7 @@ DYNAMICS_SIMULATOR::DYNAMICS_SIMULATOR()
 {
     DELT = 0.01;
     clear();
+    check_NAN = false;
 }
 
 DYNAMICS_SIMULATOR::~DYNAMICS_SIMULATOR()
@@ -623,35 +624,36 @@ void DYNAMICS_SIMULATOR::prepare_bus_related_meter(size_t bus, string meter_type
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    if(not psdb.is_bus_exist(bus))
+    if(psdb.is_bus_exist(bus))
     {
-        osstream<<"Warning. Meter of bus "<<bus<<" cannot be set since the given bus does not exist in the power system database";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
+        METER_SETTER setter;
+        setter.set_toolkit(toolkit);
 
-    METER_SETTER setter;
-    setter.set_toolkit(toolkit);
+        METER meter;
+        meter.set_toolkit(toolkit);
 
-    METER meter;
-    meter.set_toolkit(toolkit);
+        meter_type = string2upper(meter_type);
 
-    meter_type = string2upper(meter_type);
+        if(meter_type=="VOLTAGE IN PU")
+            meter = setter.prepare_bus_voltage_in_pu_meter(bus);
+        if(meter_type=="ANGLE IN DEG")
+            meter = setter.prepare_bus_angle_in_deg_meter(bus);
+        if(meter_type=="FREQUENCY DEVIATION IN PU")
+            meter = setter.prepare_bus_frequency_deviation_in_pu_meter(bus);
+        if(meter_type=="FREQUENCY IN HZ")
+            meter = setter.prepare_bus_frequency_in_Hz_meter(bus);
 
-    if(meter_type=="VOLTAGE IN PU")
-        meter = setter.prepare_bus_voltage_in_pu_meter(bus);
-    if(meter_type=="ANGLE IN DEG")
-        meter = setter.prepare_bus_angle_in_deg_meter(bus);
-    if(meter_type=="FREQUENCY DEVIATION IN PU")
-        meter = setter.prepare_bus_frequency_deviation_in_pu_meter(bus);
-    if(meter_type=="FREQUENCY IN HZ")
-        meter = setter.prepare_bus_frequency_in_Hz_meter(bus);
-
-    if(meter.is_valid())
-        append_meter(meter);
+        if(meter.is_valid())
+            append_meter(meter);
+        else
+        {
+            osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for bus "<<bus;
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
+    }
     else
     {
-        osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for bus "<<bus;
+        osstream<<"Warning. Meter of bus "<<bus<<" cannot be set since the given bus does not exist in the power system database";
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -662,56 +664,58 @@ void DYNAMICS_SIMULATOR::prepare_generator_related_meter(const DEVICE_ID& did, s
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    if(did.get_device_type()!="GENERATOR")
-    {
-        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not GENERATOR when setting up meter with "<<__FUNCTION__;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    if(not psdb.is_generator_exist(did))
-    {
-        osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
+    if(did.get_device_type()=="GENERATOR")
+    {
+        if(psdb.is_generator_exist(did))
+        {
+            METER_SETTER setter;
+            setter.set_toolkit(toolkit);
+
+            METER meter;
+            meter.set_toolkit(toolkit);
+
+            meter_type = string2upper(meter_type);
+
+            if(meter_type=="ROTOR ANGLE IN DEG")
+                meter = setter.prepare_generator_rotor_angle_in_deg_meter(did);
+            if(meter_type=="ROTOR SPEED DEVIATION IN PU")
+                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=="MECHANICAL POWER IN MW")
+                meter = setter.prepare_generator_mechanical_power_in_MW_meter(did);
+            if(meter_type=="TERMINAL ACTIVE POWER IN MW")
+                meter = setter.prepare_generator_terminal_active_power_in_MW_meter(did);
+            if(meter_type=="TERMINAL REACTIVE POWER IN MVAR")
+                meter = setter.prepare_generator_terminal_reactive_power_in_MVar_meter(did);
+            if(meter_type=="SYNC GENERATOR MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_generator_sync_generator_model_internal_variable_meter(did, var_name);
+            if(meter_type=="COMPENSATOR MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_generator_compensator_model_internal_variable_meter(did, var_name);
+            if(meter_type=="EXCITER MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_generator_exciter_model_internal_variable_meter(did, var_name);
+            if(meter_type=="STABILIZER MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_generator_stabilizer_model_internal_variable_meter(did, var_name);
+            if(meter_type=="TURBINE GOVERNOR MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_generator_turbine_governor_model_internal_variable_meter(did, var_name);
+
+            if(meter.is_valid())
+                append_meter(meter);
+            else
+            {
+                osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
-
-    METER_SETTER setter;
-    setter.set_toolkit(toolkit);
-
-    METER meter;
-    meter.set_toolkit(toolkit);
-
-    meter_type = string2upper(meter_type);
-
-    if(meter_type=="ROTOR ANGLE IN DEG")
-        meter = setter.prepare_generator_rotor_angle_in_deg_meter(did);
-    if(meter_type=="ROTOR SPEED DEVIATION IN PU")
-        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=="MECHANICAL POWER IN MW")
-        meter = setter.prepare_generator_mechanical_power_in_MW_meter(did);
-    if(meter_type=="TERMINAL ACTIVE POWER IN MW")
-        meter = setter.prepare_generator_terminal_active_power_in_MW_meter(did);
-    if(meter_type=="TERMINAL REACTIVE POWER IN MVAR")
-        meter = setter.prepare_generator_terminal_reactive_power_in_MVar_meter(did);
-    if(meter_type=="SYNC GENERATOR MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_generator_sync_generator_model_internal_variable_meter(did, var_name);
-    if(meter_type=="COMPENSATOR MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_generator_compensator_model_internal_variable_meter(did, var_name);
-    if(meter_type=="EXCITER MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_generator_exciter_model_internal_variable_meter(did, var_name);
-    if(meter_type=="STABILIZER MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_generator_stabilizer_model_internal_variable_meter(did, var_name);
-    if(meter_type=="TURBINE GOVERNOR MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_generator_turbine_governor_model_internal_variable_meter(did, var_name);
-
-    if(meter.is_valid())
-        append_meter(meter);
     else
     {
-        osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not GENERATOR when setting up meter with "<<__FUNCTION__;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -722,80 +726,82 @@ void DYNAMICS_SIMULATOR::prepare_wt_generator_related_meter(const DEVICE_ID& did
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    if(did.get_device_type()!="WT GENERATOR")
-    {
-        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not WT GENERATOR when setting up meter with "<<__FUNCTION__;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    if(not psdb.is_wt_generator_exist(did))
-    {
-        osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
+    if(did.get_device_type()=="WT GENERATOR")
+    {
+        if(psdb.is_wt_generator_exist(did))
+        {
+            METER_SETTER setter;
+            setter.set_toolkit(toolkit);
+
+            METER meter;
+            meter.set_toolkit(toolkit);
+
+            meter_type = string2upper(meter_type);
+
+            if(meter_type=="TERMINAL CURRENT IN KA")
+                meter = setter.prepare_wt_generator_terminal_current_in_kA_meter(did);
+            if(meter_type=="TERMINAL ACTIVE POWER IN MW")
+                meter = setter.prepare_wt_generator_terminal_active_power_in_MW_meter(did);
+            if(meter_type=="TERMINAL REACTIVE POWER IN MVAR")
+                meter = setter.prepare_wt_generator_terminal_reactive_power_in_MVar_meter(did);
+            if(meter_type=="MECHANICAL POWER IN MW")
+                meter = setter.prepare_wt_generator_mechanical_power_in_MW_meter(did);
+            if(meter_type=="MAX AVAILABLE MECHANICAL POWER IN MW")
+                meter = setter.prepare_wt_generator_max_available_mechanical_power_in_MW_meter(did);
+            if(meter_type=="SPEED REFERENCE IN PU")
+                meter = setter.prepare_wt_generator_speed_reference_in_pu_meter(did);
+            if(meter_type=="TURBINE SPEED IN PU")
+                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=="ROTOR ANGLE IN DEG")
+                meter = setter.prepare_wt_generator_rotor_angle_in_deg_meter(did);
+            if(meter_type=="ACTIVE CURRENT COMMAND IN PU")
+                meter = setter.prepare_wt_generator_active_current_command_in_pu_meter(did);
+            if(meter_type=="REACTIVE CURRENT COMMAND IN PU")
+                meter = setter.prepare_wt_generator_reactive_current_command_in_pu_meter(did);
+            if(meter_type=="ACTIVE POWER COMMAND IN PU")
+                meter = setter.prepare_wt_generator_active_power_command_in_pu_meter(did);
+            if(meter_type=="REACTIVE POWER COMMAND IN PU")
+                meter = setter.prepare_wt_generator_reactive_power_command_in_pu_meter(did);
+            if(meter_type=="REACTIVE VOLTAGE COMMAND IN PU")
+                meter = setter.prepare_wt_generator_reactive_voltage_command_in_pu_meter(did);
+            if(meter_type=="PITCH ANGLE IN DEG")
+                meter = setter.prepare_wt_generator_pitch_angle_in_deg_meter(did);
+            if(meter_type=="WIND SPEED IN PU")
+                meter = setter.prepare_wt_generator_wind_speed_in_pu_meter(did);
+            if(meter_type=="WIND SPEED IN MPS")
+                meter = setter.prepare_wt_generator_wind_speed_in_mps_meter(did);
+            if(meter_type=="WT GENERATOR MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_generator_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WT AERODYNAMIC MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_aerodynamic_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WT TURBINE MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_turbine_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WT ELECTRICAL MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_electrical_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WT PITCH MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_pitch_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WIND SPEED MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wind_speed_model_internal_variable_meter(did, var_name);
+
+            if(meter.is_valid())
+                append_meter(meter);
+            else
+            {
+                osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
-
-    METER_SETTER setter;
-    setter.set_toolkit(toolkit);
-
-    METER meter;
-    meter.set_toolkit(toolkit);
-
-    meter_type = string2upper(meter_type);
-
-    if(meter_type=="TERMINAL CURRENT IN KA")
-        meter = setter.prepare_wt_generator_terminal_current_in_kA_meter(did);
-    if(meter_type=="TERMINAL ACTIVE POWER IN MW")
-        meter = setter.prepare_wt_generator_terminal_active_power_in_MW_meter(did);
-    if(meter_type=="TERMINAL REACTIVE POWER IN MVAR")
-        meter = setter.prepare_wt_generator_terminal_reactive_power_in_MVar_meter(did);
-    if(meter_type=="MECHANICAL POWER IN MW")
-        meter = setter.prepare_wt_generator_mechanical_power_in_MW_meter(did);
-    if(meter_type=="MAX AVAILABLE MECHANICAL POWER IN MW")
-        meter = setter.prepare_wt_generator_max_available_mechanical_power_in_MW_meter(did);
-    if(meter_type=="SPEED REFERENCE IN PU")
-        meter = setter.prepare_wt_generator_speed_reference_in_pu_meter(did);
-    if(meter_type=="TURBINE SPEED IN PU")
-        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=="ROTOR ANGLE IN DEG")
-        meter = setter.prepare_wt_generator_rotor_angle_in_deg_meter(did);
-    if(meter_type=="ACTIVE CURRENT COMMAND IN PU")
-        meter = setter.prepare_wt_generator_active_current_command_in_pu_meter(did);
-    if(meter_type=="REACTIVE CURRENT COMMAND IN PU")
-        meter = setter.prepare_wt_generator_reactive_current_command_in_pu_meter(did);
-    if(meter_type=="ACTIVE POWER COMMAND IN PU")
-        meter = setter.prepare_wt_generator_active_power_command_in_pu_meter(did);
-    if(meter_type=="REACTIVE POWER COMMAND IN PU")
-        meter = setter.prepare_wt_generator_reactive_power_command_in_pu_meter(did);
-    if(meter_type=="REACTIVE VOLTAGE COMMAND IN PU")
-        meter = setter.prepare_wt_generator_reactive_voltage_command_in_pu_meter(did);
-    if(meter_type=="PITCH ANGLE IN DEG")
-        meter = setter.prepare_wt_generator_pitch_angle_in_deg_meter(did);
-    if(meter_type=="WIND SPEED IN PU")
-        meter = setter.prepare_wt_generator_wind_speed_in_pu_meter(did);
-    if(meter_type=="WIND SPEED IN MPS")
-        meter = setter.prepare_wt_generator_wind_speed_in_mps_meter(did);
-    if(meter_type=="WT GENERATOR MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_generator_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WT AERODYNAMIC MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_aerodynamic_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WT TURBINE MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_turbine_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WT ELECTRICAL MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_electrical_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WT PITCH MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_pitch_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WIND SPEED MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wind_speed_model_internal_variable_meter(did, var_name);
-
-    if(meter.is_valid())
-        append_meter(meter);
     else
     {
-        osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not WT GENERATOR when setting up meter with "<<__FUNCTION__;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -806,80 +812,82 @@ void DYNAMICS_SIMULATOR::prepare_pv_unit_related_meter(const DEVICE_ID& did, str
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    if(did.get_device_type()!="PV UNIT")
-    {
-        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not PV UNIT when setting up meter with "<<__FUNCTION__;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    if(not psdb.is_pv_unit_exist(did))
-    {
-        osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
+    if(did.get_device_type()=="PV UNIT")
+    {
+        if(psdb.is_pv_unit_exist(did))
+        {
+            METER_SETTER setter;
+            setter.set_toolkit(toolkit);
+
+            METER meter;
+            meter.set_toolkit(toolkit);
+
+            meter_type = string2upper(meter_type);
+
+            if(meter_type=="TERMINAL CURRENT IN KA")
+                meter = setter.prepare_wt_generator_terminal_current_in_kA_meter(did);
+            if(meter_type=="TERMINAL ACTIVE POWER IN MW")
+                meter = setter.prepare_wt_generator_terminal_active_power_in_MW_meter(did);
+            if(meter_type=="TERMINAL REACTIVE POWER IN MVAR")
+                meter = setter.prepare_wt_generator_terminal_reactive_power_in_MVar_meter(did);
+            if(meter_type=="MECHANICAL POWER IN MW")
+                meter = setter.prepare_wt_generator_mechanical_power_in_MW_meter(did);
+            if(meter_type=="MAX AVAILABLE MECHANICAL POWER IN MW")
+                meter = setter.prepare_wt_generator_max_available_mechanical_power_in_MW_meter(did);
+            if(meter_type=="SPEED REFERENCE IN PU")
+                meter = setter.prepare_wt_generator_speed_reference_in_pu_meter(did);
+            if(meter_type=="TURBINE SPEED IN PU")
+                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=="ROTOR ANGLE IN DEG")
+                meter = setter.prepare_wt_generator_rotor_angle_in_deg_meter(did);
+            if(meter_type=="ACTIVE CURRENT COMMAND IN PU")
+                meter = setter.prepare_wt_generator_active_current_command_in_pu_meter(did);
+            if(meter_type=="REACTIVE CURRENT COMMAND IN PU")
+                meter = setter.prepare_wt_generator_reactive_current_command_in_pu_meter(did);
+            if(meter_type=="ACTIVE POWER COMMAND IN PU")
+                meter = setter.prepare_wt_generator_active_power_command_in_pu_meter(did);
+            if(meter_type=="REACTIVE POWER COMMAND IN PU")
+                meter = setter.prepare_wt_generator_reactive_power_command_in_pu_meter(did);
+            if(meter_type=="REACTIVE VOLTAGE COMMAND IN PU")
+                meter = setter.prepare_wt_generator_reactive_voltage_command_in_pu_meter(did);
+            if(meter_type=="PITCH ANGLE IN DEG")
+                meter = setter.prepare_wt_generator_pitch_angle_in_deg_meter(did);
+            if(meter_type=="WIND SPEED IN PU")
+                meter = setter.prepare_wt_generator_wind_speed_in_pu_meter(did);
+            if(meter_type=="WIND SPEED IN MPS")
+                meter = setter.prepare_wt_generator_wind_speed_in_mps_meter(did);
+            if(meter_type=="WT GENERATOR MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_generator_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WT AERODYNAMIC MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_aerodynamic_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WT TURBINE MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_turbine_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WT ELECTRICAL MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_electrical_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WT PITCH MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_pitch_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WIND SPEED MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wind_speed_model_internal_variable_meter(did, var_name);
+
+            if(meter.is_valid())
+                append_meter(meter);
+            else
+            {
+                osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
-
-    METER_SETTER setter;
-    setter.set_toolkit(toolkit);
-
-    METER meter;
-    meter.set_toolkit(toolkit);
-
-    meter_type = string2upper(meter_type);
-
-    if(meter_type=="TERMINAL CURRENT IN KA")
-        meter = setter.prepare_wt_generator_terminal_current_in_kA_meter(did);
-    if(meter_type=="TERMINAL ACTIVE POWER IN MW")
-        meter = setter.prepare_wt_generator_terminal_active_power_in_MW_meter(did);
-    if(meter_type=="TERMINAL REACTIVE POWER IN MVAR")
-        meter = setter.prepare_wt_generator_terminal_reactive_power_in_MVar_meter(did);
-    if(meter_type=="MECHANICAL POWER IN MW")
-        meter = setter.prepare_wt_generator_mechanical_power_in_MW_meter(did);
-    if(meter_type=="MAX AVAILABLE MECHANICAL POWER IN MW")
-        meter = setter.prepare_wt_generator_max_available_mechanical_power_in_MW_meter(did);
-    if(meter_type=="SPEED REFERENCE IN PU")
-        meter = setter.prepare_wt_generator_speed_reference_in_pu_meter(did);
-    if(meter_type=="TURBINE SPEED IN PU")
-        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=="ROTOR ANGLE IN DEG")
-        meter = setter.prepare_wt_generator_rotor_angle_in_deg_meter(did);
-    if(meter_type=="ACTIVE CURRENT COMMAND IN PU")
-        meter = setter.prepare_wt_generator_active_current_command_in_pu_meter(did);
-    if(meter_type=="REACTIVE CURRENT COMMAND IN PU")
-        meter = setter.prepare_wt_generator_reactive_current_command_in_pu_meter(did);
-    if(meter_type=="ACTIVE POWER COMMAND IN PU")
-        meter = setter.prepare_wt_generator_active_power_command_in_pu_meter(did);
-    if(meter_type=="REACTIVE POWER COMMAND IN PU")
-        meter = setter.prepare_wt_generator_reactive_power_command_in_pu_meter(did);
-    if(meter_type=="REACTIVE VOLTAGE COMMAND IN PU")
-        meter = setter.prepare_wt_generator_reactive_voltage_command_in_pu_meter(did);
-    if(meter_type=="PITCH ANGLE IN DEG")
-        meter = setter.prepare_wt_generator_pitch_angle_in_deg_meter(did);
-    if(meter_type=="WIND SPEED IN PU")
-        meter = setter.prepare_wt_generator_wind_speed_in_pu_meter(did);
-    if(meter_type=="WIND SPEED IN MPS")
-        meter = setter.prepare_wt_generator_wind_speed_in_mps_meter(did);
-    if(meter_type=="WT GENERATOR MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_generator_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WT AERODYNAMIC MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_aerodynamic_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WT TURBINE MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_turbine_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WT ELECTRICAL MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_electrical_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WT PITCH MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_pitch_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WIND SPEED MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wind_speed_model_internal_variable_meter(did, var_name);
-
-    if(meter.is_valid())
-        append_meter(meter);
     else
     {
-        osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not PV UNIT when setting up meter with "<<__FUNCTION__;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -890,82 +898,84 @@ void DYNAMICS_SIMULATOR::prepare_energy_storage_related_meter(const DEVICE_ID& d
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    if(did.get_device_type()!="PV UNIT")
-    {
-        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not PV UNIT when setting up meter with "<<__FUNCTION__;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    if(not psdb.is_pv_unit_exist(did))
-    {
-        osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
+    if(did.get_device_type()=="ENERGY STORAGE")
+    {
+        if(psdb.is_pv_unit_exist(did))
+        {
+            METER_SETTER setter;
+            setter.set_toolkit(toolkit);
+
+            METER meter;
+            meter.set_toolkit(toolkit);
+
+            meter.set_toolkit(toolkit);
+
+            meter_type = string2upper(meter_type);
+
+            if(meter_type=="TERMINAL CURRENT IN KA")
+                meter = setter.prepare_wt_generator_terminal_current_in_kA_meter(did);
+            if(meter_type=="TERMINAL ACTIVE POWER IN MW")
+                meter = setter.prepare_wt_generator_terminal_active_power_in_MW_meter(did);
+            if(meter_type=="TERMINAL REACTIVE POWER IN MVAR")
+                meter = setter.prepare_wt_generator_terminal_reactive_power_in_MVar_meter(did);
+            if(meter_type=="MECHANICAL POWER IN MW")
+                meter = setter.prepare_wt_generator_mechanical_power_in_MW_meter(did);
+            if(meter_type=="MAX AVAILABLE MECHANICAL POWER IN MW")
+                meter = setter.prepare_wt_generator_max_available_mechanical_power_in_MW_meter(did);
+            if(meter_type=="SPEED REFERENCE IN PU")
+                meter = setter.prepare_wt_generator_speed_reference_in_pu_meter(did);
+            if(meter_type=="TURBINE SPEED IN PU")
+                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=="ROTOR ANGLE IN DEG")
+                meter = setter.prepare_wt_generator_rotor_angle_in_deg_meter(did);
+            if(meter_type=="ACTIVE CURRENT COMMAND IN PU")
+                meter = setter.prepare_wt_generator_active_current_command_in_pu_meter(did);
+            if(meter_type=="REACTIVE CURRENT COMMAND IN PU")
+                meter = setter.prepare_wt_generator_reactive_current_command_in_pu_meter(did);
+            if(meter_type=="ACTIVE POWER COMMAND IN PU")
+                meter = setter.prepare_wt_generator_active_power_command_in_pu_meter(did);
+            if(meter_type=="REACTIVE POWER COMMAND IN PU")
+                meter = setter.prepare_wt_generator_reactive_power_command_in_pu_meter(did);
+            if(meter_type=="REACTIVE VOLTAGE COMMAND IN PU")
+                meter = setter.prepare_wt_generator_reactive_voltage_command_in_pu_meter(did);
+            if(meter_type=="PITCH ANGLE IN DEG")
+                meter = setter.prepare_wt_generator_pitch_angle_in_deg_meter(did);
+            if(meter_type=="WIND SPEED IN PU")
+                meter = setter.prepare_wt_generator_wind_speed_in_pu_meter(did);
+            if(meter_type=="WIND SPEED IN MPS")
+                meter = setter.prepare_wt_generator_wind_speed_in_mps_meter(did);
+            if(meter_type=="WT GENERATOR MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_generator_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WT AERODYNAMIC MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_aerodynamic_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WT TURBINE MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_turbine_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WT ELECTRICAL MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_electrical_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WT PITCH MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wt_pitch_model_internal_variable_meter(did, var_name);
+            if(meter_type=="WIND SPEED MODEL INTERNAL VARIABLE")
+                meter = setter.prepare_wind_speed_model_internal_variable_meter(did, var_name);
+
+            if(meter.is_valid())
+                append_meter(meter);
+            else
+            {
+                osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
-
-    METER_SETTER setter;
-    setter.set_toolkit(toolkit);
-
-    METER meter;
-    meter.set_toolkit(toolkit);
-
-    meter.set_toolkit(toolkit);
-
-    meter_type = string2upper(meter_type);
-
-    if(meter_type=="TERMINAL CURRENT IN KA")
-        meter = setter.prepare_wt_generator_terminal_current_in_kA_meter(did);
-    if(meter_type=="TERMINAL ACTIVE POWER IN MW")
-        meter = setter.prepare_wt_generator_terminal_active_power_in_MW_meter(did);
-    if(meter_type=="TERMINAL REACTIVE POWER IN MVAR")
-        meter = setter.prepare_wt_generator_terminal_reactive_power_in_MVar_meter(did);
-    if(meter_type=="MECHANICAL POWER IN MW")
-        meter = setter.prepare_wt_generator_mechanical_power_in_MW_meter(did);
-    if(meter_type=="MAX AVAILABLE MECHANICAL POWER IN MW")
-        meter = setter.prepare_wt_generator_max_available_mechanical_power_in_MW_meter(did);
-    if(meter_type=="SPEED REFERENCE IN PU")
-        meter = setter.prepare_wt_generator_speed_reference_in_pu_meter(did);
-    if(meter_type=="TURBINE SPEED IN PU")
-        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=="ROTOR ANGLE IN DEG")
-        meter = setter.prepare_wt_generator_rotor_angle_in_deg_meter(did);
-    if(meter_type=="ACTIVE CURRENT COMMAND IN PU")
-        meter = setter.prepare_wt_generator_active_current_command_in_pu_meter(did);
-    if(meter_type=="REACTIVE CURRENT COMMAND IN PU")
-        meter = setter.prepare_wt_generator_reactive_current_command_in_pu_meter(did);
-    if(meter_type=="ACTIVE POWER COMMAND IN PU")
-        meter = setter.prepare_wt_generator_active_power_command_in_pu_meter(did);
-    if(meter_type=="REACTIVE POWER COMMAND IN PU")
-        meter = setter.prepare_wt_generator_reactive_power_command_in_pu_meter(did);
-    if(meter_type=="REACTIVE VOLTAGE COMMAND IN PU")
-        meter = setter.prepare_wt_generator_reactive_voltage_command_in_pu_meter(did);
-    if(meter_type=="PITCH ANGLE IN DEG")
-        meter = setter.prepare_wt_generator_pitch_angle_in_deg_meter(did);
-    if(meter_type=="WIND SPEED IN PU")
-        meter = setter.prepare_wt_generator_wind_speed_in_pu_meter(did);
-    if(meter_type=="WIND SPEED IN MPS")
-        meter = setter.prepare_wt_generator_wind_speed_in_mps_meter(did);
-    if(meter_type=="WT GENERATOR MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_generator_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WT AERODYNAMIC MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_aerodynamic_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WT TURBINE MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_turbine_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WT ELECTRICAL MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_electrical_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WT PITCH MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wt_pitch_model_internal_variable_meter(did, var_name);
-    if(meter_type=="WIND SPEED MODEL INTERNAL VARIABLE")
-        meter = setter.prepare_wind_speed_model_internal_variable_meter(did, var_name);
-
-    if(meter.is_valid())
-        append_meter(meter);
     else
     {
-        osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not ENERGY STORAGE when setting up meter with "<<__FUNCTION__;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -976,44 +986,46 @@ void DYNAMICS_SIMULATOR::prepare_load_related_meter(const DEVICE_ID& did, string
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    if(did.get_device_type()!="LOAD")
+    if(did.get_device_type()=="LOAD")
     {
-        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not LOAD when setting up meter with "<<__FUNCTION__;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    if(not psdb.is_load_exist(did))
-    {
-        osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    METER_SETTER setter;
-    setter.set_toolkit(toolkit);
+        if(psdb.is_load_exist(did))
+        {
+            METER_SETTER setter;
+            setter.set_toolkit(toolkit);
 
-    METER meter;
-    meter.set_toolkit(toolkit);
+            METER meter;
+            meter.set_toolkit(toolkit);
 
-    meter_type = string2upper(meter_type);
+            meter_type = string2upper(meter_type);
 
-    if(meter_type=="ACTIVE POWER IN MW")
-        meter = setter.prepare_load_active_power_in_MW_meter(did);
-    if(meter_type=="REACTIVE POWER IN MVAR")
-        meter = setter.prepare_load_reactive_power_in_MVar_meter(did);
-    if(meter_type=="TOTAL SCALE IN PU")
-        meter = setter.prepare_load_total_scale_in_pu_meter(did);
-    if(meter_type=="MANUALLY SCALE IN PU")
-        meter = setter.prepare_load_manually_scale_in_pu_meter(did);
-    if(meter_type=="RELAY SHED SCALE IN PU")
-        meter = setter.prepare_load_relay_shed_scale_in_pu_meter(did);
+            if(meter_type=="ACTIVE POWER IN MW")
+                meter = setter.prepare_load_active_power_in_MW_meter(did);
+            if(meter_type=="REACTIVE POWER IN MVAR")
+                meter = setter.prepare_load_reactive_power_in_MVar_meter(did);
+            if(meter_type=="TOTAL SCALE IN PU")
+                meter = setter.prepare_load_total_scale_in_pu_meter(did);
+            if(meter_type=="MANUALLY SCALE IN PU")
+                meter = setter.prepare_load_manually_scale_in_pu_meter(did);
+            if(meter_type=="RELAY SHED SCALE IN PU")
+                meter = setter.prepare_load_relay_shed_scale_in_pu_meter(did);
 
-    if(meter.is_valid())
-        append_meter(meter);
+            if(meter.is_valid())
+                append_meter(meter);
+            else
+            {
+                osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
+    }
     else
     {
-        osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not LOAD when setting up meter with "<<__FUNCTION__;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -1024,49 +1036,52 @@ void DYNAMICS_SIMULATOR::prepare_line_related_meter(const DEVICE_ID& did, string
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    if(did.get_device_type()!="LINE")
-    {
-        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not LINE when setting up meter with "<<__FUNCTION__;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    if(not psdb.is_line_exist(did))
+    if(did.get_device_type()=="LINE")
     {
-        osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    METER_SETTER setter;
-    setter.set_toolkit(toolkit);
+        if(psdb.is_line_exist(did))
+        {
+            METER_SETTER setter;
+            setter.set_toolkit(toolkit);
 
-    METER meter;
-    meter.set_toolkit(toolkit);
+            METER meter;
+            meter.set_toolkit(toolkit);
 
-    meter_type = string2upper(meter_type);
-    side = string2upper(side);
+            meter_type = string2upper(meter_type);
+            side = string2upper(side);
 
-    LINE* line = psdb.get_line(did);
-    size_t bus = 0;
-    if(side=="SENDING" or side=="S")
-        bus = line->get_sending_side_bus();
-    if(side=="RECEIVING" or side=="R")
-        bus = line->get_receiving_side_bus();
+            LINE* line = psdb.get_line(did);
+            size_t bus = 0;
+            if(side=="SENDING" or side=="S")
+                bus = line->get_sending_side_bus();
+            if(side=="RECEIVING" or side=="R")
+                bus = line->get_receiving_side_bus();
 
-    if(meter_type=="ACTIVE POWER IN MW")
-        meter = setter.prepare_line_active_power_in_MW_meter(did, bus);
-    if(meter_type=="REACTIVE POWER IN MVAR")
-        meter = setter.prepare_line_reactive_power_in_MVar_meter(did, bus);
-    if(meter_type=="CURRENT IN KA")
-        meter = setter.prepare_line_current_in_kA_meter(did, bus);
+            if(meter_type=="ACTIVE POWER IN MW")
+                meter = setter.prepare_line_active_power_in_MW_meter(did, bus);
+            if(meter_type=="REACTIVE POWER IN MVAR")
+                meter = setter.prepare_line_reactive_power_in_MVar_meter(did, bus);
+            if(meter_type=="CURRENT IN KA")
+                meter = setter.prepare_line_current_in_kA_meter(did, bus);
 
-    if(meter.is_valid())
-        append_meter(meter);
+            if(meter.is_valid())
+                append_meter(meter);
+            else
+            {
+                osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
+    }
     else
     {
-        osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not LINE when setting up meter with "<<__FUNCTION__;
         toolkit.show_information_with_leading_time_stamp(osstream);
+        return;
     }
 }
 
@@ -1077,78 +1092,79 @@ void DYNAMICS_SIMULATOR::prepare_hvdc_related_meter(const DEVICE_ID& did, string
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    if(did.get_device_type()!="HVDC")
+    if(did.get_device_type()=="HVDC")
     {
-        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not HVDC when setting up meter with "<<__FUNCTION__;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
+        if(psdb.is_hvdc_exist(did))
+        {
+            METER_SETTER setter;
+            setter.set_toolkit(toolkit);
 
-    if(not psdb.is_hvdc_exist(did))
-    {
-        osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
+            METER meter;
+            meter.set_toolkit(toolkit);
 
-    METER_SETTER setter;
-    setter.set_toolkit(toolkit);
+            meter_type = string2upper(meter_type);
+            side = string2upper(side);
 
-    METER meter;
-    meter.set_toolkit(toolkit);
-
-    meter_type = string2upper(meter_type);
-    side = string2upper(side);
-
-    if(side=="RECTIFIER" or side=="R")
-    {
-        if(meter_type=="AC VOLTAGE IN PU")
-            meter = setter.prepare_hvdc_rectifier_ac_voltage_in_pu_meter(did);
-        if(meter_type=="DC VOLTAGE IN KV")
-            meter = setter.prepare_hvdc_rectifier_dc_voltage_in_kV_meter(did);
-        if(meter_type=="DC CURRENT IN KA")
-            meter = setter.prepare_hvdc_rectifier_dc_current_in_kA_meter(did);
-        if(meter_type=="ALPHA IN DEG")
-            meter = setter.prepare_hvdc_rectifier_alpha_in_deg_meter(did);
-        if(meter_type=="MU IN DEG")
-            meter = setter.prepare_hvdc_rectifier_mu_in_deg_meter(did);
-        if(meter_type=="DC POWER IN MW")
-            meter = setter.prepare_hvdc_rectifier_dc_power_in_MW_meter(did);
-        if(meter_type=="AC ACTIVE POWER IN MW")
-            meter = setter.prepare_hvdc_rectifier_ac_active_power_in_MW_meter(did);
-        if(meter_type=="AC REACTIVE POWER IN MVAR")
-            meter = setter.prepare_hvdc_rectifier_ac_reactive_power_in_MVar_meter(did);
-        if(meter_type=="AC CURRENT IN KA")
-            meter = setter.prepare_hvdc_rectifier_ac_current_in_kA_meter(did);
-    }
-
-    if(side=="INVERTER" or side=="I")
-    {
-        if(meter_type=="AC VOLTAGE IN PU")
-            meter = setter.prepare_hvdc_inverter_ac_voltage_in_pu_meter(did);
-        if(meter_type=="DC VOLTAGE IN KV")
-            meter = setter.prepare_hvdc_inverter_dc_voltage_in_kV_meter(did);
-        if(meter_type=="DC CURRENT IN KA")
-            meter = setter.prepare_hvdc_inverter_dc_current_in_kA_meter(did);
-        if(meter_type=="GAMMA IN DEG")
-            meter = setter.prepare_hvdc_inverter_gamma_in_deg_meter(did);
-        if(meter_type=="MU IN DEG")
-            meter = setter.prepare_hvdc_inverter_mu_in_deg_meter(did);
-        if(meter_type=="DC POWER IN MW")
-            meter = setter.prepare_hvdc_inverter_dc_power_in_MW_meter(did);
-        if(meter_type=="AC ACTIVE POWER IN MW")
-            meter = setter.prepare_hvdc_inverter_ac_active_power_in_MW_meter(did);
-        if(meter_type=="AC REACTIVE POWER IN MVAR")
-            meter = setter.prepare_hvdc_inverter_ac_reactive_power_in_MVar_meter(did);
-        if(meter_type=="AC CURRENT IN KA")
-            meter = setter.prepare_hvdc_inverter_ac_current_in_kA_meter(did);
-    }
+            if(side=="RECTIFIER" or side=="R")
+            {
+                if(meter_type=="AC VOLTAGE IN PU")
+                    meter = setter.prepare_hvdc_rectifier_ac_voltage_in_pu_meter(did);
+                if(meter_type=="DC VOLTAGE IN KV")
+                    meter = setter.prepare_hvdc_rectifier_dc_voltage_in_kV_meter(did);
+                if(meter_type=="DC CURRENT IN KA")
+                    meter = setter.prepare_hvdc_rectifier_dc_current_in_kA_meter(did);
+                if(meter_type=="ALPHA IN DEG")
+                    meter = setter.prepare_hvdc_rectifier_alpha_in_deg_meter(did);
+                if(meter_type=="MU IN DEG")
+                    meter = setter.prepare_hvdc_rectifier_mu_in_deg_meter(did);
+                if(meter_type=="DC POWER IN MW")
+                    meter = setter.prepare_hvdc_rectifier_dc_power_in_MW_meter(did);
+                if(meter_type=="AC ACTIVE POWER IN MW")
+                    meter = setter.prepare_hvdc_rectifier_ac_active_power_in_MW_meter(did);
+                if(meter_type=="AC REACTIVE POWER IN MVAR")
+                    meter = setter.prepare_hvdc_rectifier_ac_reactive_power_in_MVar_meter(did);
+                if(meter_type=="AC CURRENT IN KA")
+                    meter = setter.prepare_hvdc_rectifier_ac_current_in_kA_meter(did);
+            }
 
-    if(meter.is_valid())
-        append_meter(meter);
+            if(side=="INVERTER" or side=="I")
+            {
+                if(meter_type=="AC VOLTAGE IN PU")
+                    meter = setter.prepare_hvdc_inverter_ac_voltage_in_pu_meter(did);
+                if(meter_type=="DC VOLTAGE IN KV")
+                    meter = setter.prepare_hvdc_inverter_dc_voltage_in_kV_meter(did);
+                if(meter_type=="DC CURRENT IN KA")
+                    meter = setter.prepare_hvdc_inverter_dc_current_in_kA_meter(did);
+                if(meter_type=="GAMMA IN DEG")
+                    meter = setter.prepare_hvdc_inverter_gamma_in_deg_meter(did);
+                if(meter_type=="MU IN DEG")
+                    meter = setter.prepare_hvdc_inverter_mu_in_deg_meter(did);
+                if(meter_type=="DC POWER IN MW")
+                    meter = setter.prepare_hvdc_inverter_dc_power_in_MW_meter(did);
+                if(meter_type=="AC ACTIVE POWER IN MW")
+                    meter = setter.prepare_hvdc_inverter_ac_active_power_in_MW_meter(did);
+                if(meter_type=="AC REACTIVE POWER IN MVAR")
+                    meter = setter.prepare_hvdc_inverter_ac_reactive_power_in_MVar_meter(did);
+                if(meter_type=="AC CURRENT IN KA")
+                    meter = setter.prepare_hvdc_inverter_ac_current_in_kA_meter(did);
+            }
+            if(meter.is_valid())
+                append_meter(meter);
+            else
+            {
+                osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
+    }
     else
     {
-        osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not HVDC when setting up meter with "<<__FUNCTION__;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -1159,46 +1175,48 @@ void DYNAMICS_SIMULATOR::prepare_equivalent_device_related_meter(const DEVICE_ID
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    if(did.get_device_type()!="EQUIVALENT DEVICE")
+    if(did.get_device_type()=="EQUIVALENT DEVICE")
     {
-        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not EQUIVALENT DEVICE when setting up meter with "<<__FUNCTION__;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    if(not psdb.is_equivalent_device_exist(did))
-    {
-        osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    METER_SETTER setter;
-    setter.set_toolkit(toolkit);
+        if(psdb.is_equivalent_device_exist(did))
+        {
+            METER_SETTER setter;
+            setter.set_toolkit(toolkit);
 
-    METER meter;
-    meter.set_toolkit(toolkit);
+            METER meter;
+            meter.set_toolkit(toolkit);
 
-    meter_type = string2upper(meter_type);
+            meter_type = string2upper(meter_type);
 
-    if(meter_type=="ACTIVE POWER GENERATION IN MW")
-        meter = setter.prepare_equivalent_device_active_power_generation_in_MW_meter(did);
-    if(meter_type=="REACTIVE POWER GENERATION IN MVAR")
-        meter = setter.prepare_equivalent_device_reactive_power_generation_in_MVar_meter(did);
-    if(meter_type=="ACTIVE POWER LOAD IN MW")
-        meter = setter.prepare_equivalent_device_active_power_load_in_MW_meter(did);
-    if(meter_type=="REACTIVE POWER LOAD IN MVAR")
-        meter = setter.prepare_equivalent_device_reactive_power_load_in_MVar_meter(did);
-    if(meter_type=="ACTIVE POWER NET LOAD IN MW")
-        meter = setter.prepare_equivalent_device_active_power_net_load_in_MW_meter(did);
-    if(meter_type=="REACTIVE POWER NET LOAD IN MVAR")
-        meter = setter.prepare_equivalent_device_reactive_power_net_load_in_MVar_meter(did);
+            if(meter_type=="ACTIVE POWER GENERATION IN MW")
+                meter = setter.prepare_equivalent_device_active_power_generation_in_MW_meter(did);
+            if(meter_type=="REACTIVE POWER GENERATION IN MVAR")
+                meter = setter.prepare_equivalent_device_reactive_power_generation_in_MVar_meter(did);
+            if(meter_type=="ACTIVE POWER LOAD IN MW")
+                meter = setter.prepare_equivalent_device_active_power_load_in_MW_meter(did);
+            if(meter_type=="REACTIVE POWER LOAD IN MVAR")
+                meter = setter.prepare_equivalent_device_reactive_power_load_in_MVar_meter(did);
+            if(meter_type=="ACTIVE POWER NET LOAD IN MW")
+                meter = setter.prepare_equivalent_device_active_power_net_load_in_MW_meter(did);
+            if(meter_type=="REACTIVE POWER NET LOAD IN MVAR")
+                meter = setter.prepare_equivalent_device_reactive_power_net_load_in_MVar_meter(did);
 
-    if(meter.is_valid())
-        append_meter(meter);
+            if(meter.is_valid())
+                append_meter(meter);
+            else
+            {
+                osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. Meter of "<<did.get_device_name()<<" cannot be set since the given device does not exist in the power system database";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
+    }
     else
     {
-        osstream<<"Warning. Invalid meter type ("<<meter_type<<") is given to set up meter for "<<did.get_device_name();
+        osstream<<"Warning. The device type of "<<did.get_device_name()<<" is not EQUIVALENT DEVICE when setting up meter with "<<__FUNCTION__;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -1214,29 +1232,37 @@ METER DYNAMICS_SIMULATOR::get_meter(size_t i)
     METER voidmeter;
     voidmeter.set_toolkit(get_toolkit(__PRETTY_FUNCTION__));
 
-
-    if(meters.size()==0)
-        return voidmeter;
-    else
+    if(meters.size()!=0)
     {
         if(i<meters.size())
             return meters[i];
         else
             return voidmeter;
     }
+    else
+        return voidmeter;
 }
 
 void DYNAMICS_SIMULATOR::update_all_meters_value()
 {
     size_t n = meters.size();
-    if(n==0)
-        return;
-
-    if(meter_values.size()!=n)
-        meter_values.resize(n,0.0);
+    if(n!=0)
+    {
+        if(meter_values.size()!=n)
+            meter_values.resize(n,0.0);
 
-    for(size_t i=0; i!=n; ++i)
-        meter_values[i]=meters[i].get_meter_value();
+        for(size_t i=0; i!=n; ++i)
+            meter_values[i]=meters[i].get_meter_value();
+        /*
+        if(meter_values.size()==n)
+        {
+            for(size_t i=0; i!=n; ++i)
+                meter_values[i]=meters[i].get_meter_value();
+        }
+        else
+            meter_values.resize(n,0.0);
+        */
+    }
 }
 
 vector<double> DYNAMICS_SIMULATOR::get_all_meters_value()
@@ -1284,7 +1310,42 @@ void DYNAMICS_SIMULATOR::open_meter_output_files()
 
     //osstream<<"output file name is : "<<output_filename<<endl;
     //toolkit.show_information_with_leading_time_stamp(osstream);
-    if(output_filename=="")
+    if(output_filename!="")
+    {
+        if(is_bin_file_export_enabled())
+        {
+            string bin_filename = output_filename+".bin";
+            bin_output_file.open(bin_filename, ios::binary);
+            if(not bin_output_file.is_open())
+            {
+                osstream<<"BIN meter output file "<<bin_filename<<" cannot be opened for exporting dynamic simulation meter values.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+
+        if(is_csv_file_export_enabled())
+        {
+            string csv_filename = output_filename+".csv";
+            csv_output_file.open(csv_filename);
+            if(not csv_output_file.is_open())
+            {
+                osstream<<"CSV meter output file "<<csv_filename<<" cannot be opened for exporting dynamic simulation meter values.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+
+        if(is_json_file_export_enabled())
+        {
+            string json_filename = output_filename+".json";
+            json_output_file.open(json_filename);
+            if(not json_output_file.is_open())
+            {
+                osstream<<"JSON meter output file "<<json_filename<<" cannot be opened for exporting dynamic simulation meter values.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+    }
+    else
     {
         return;
 
@@ -1300,40 +1361,6 @@ void DYNAMICS_SIMULATOR::open_meter_output_files()
           <<output_filename;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
-
-
-    if(is_csv_file_export_enabled())
-    {
-        string csv_filename = output_filename+".csv";
-        csv_output_file.open(csv_filename);
-        if(not csv_output_file.is_open())
-        {
-            osstream<<"CSV meter output file "<<csv_filename<<" cannot be opened for exporting dynamic simulation meter values.";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-        }
-    }
-
-    if(is_json_file_export_enabled())
-    {
-        string json_filename = output_filename+".json";
-        json_output_file.open(json_filename);
-        if(not json_output_file.is_open())
-        {
-            osstream<<"JSON meter output file "<<json_filename<<" cannot be opened for exporting dynamic simulation meter values.";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-        }
-    }
-
-    if(is_bin_file_export_enabled())
-    {
-        string bin_filename = output_filename+".bin";
-        bin_output_file.open(bin_filename, ios::binary);
-        if(not bin_output_file.is_open())
-        {
-            osstream<<"BIN meter output file "<<bin_filename<<" cannot be opened for exporting dynamic simulation meter values.";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-        }
-    }
 }
 
 void DYNAMICS_SIMULATOR::close_meter_output_files()
@@ -1381,93 +1408,93 @@ void DYNAMICS_SIMULATOR::save_meter_information()
     size_t n = meters.size();
     //osstream<<"save meter information: "<<n<<" meters were set. output file name is: "<<output_filename;
     //toolkit.show_information_with_leading_time_stamp(osstream);
-    if(n==0)
-        return;
-
-    open_meter_output_files();
-
-    if(not csv_output_file.is_open() and not json_output_file.is_open() and not bin_output_file.is_open())
-        return;
-
-    // save header to csv file
-    if(is_csv_file_export_enabled() and csv_output_file.is_open())
-    {
-        //csv_output_file<<"TIME,ITERATION,MISMATCH IN MVA";
-        //for(size_t i=0; i!=n; ++i)
-        //    csv_output_file<<","<<meters[i].get_meter_type();
-        //csv_output_file<<endl;
-
-        csv_output_file<<"TIME,DAE INTEGRATION,NETWORK ITERATION,MISMATCH IN MVA";
-
-        for(size_t i=0; i!=n; ++i)
-            csv_output_file<<","<<meters[i].get_meter_name();
-        csv_output_file<<"\n";
-    }
-
-    // save header to json file
-    if(is_json_file_export_enabled() and json_output_file.is_open())
+    if(n!=0)
     {
-        json_output_file<<"{"<<"\n";
-
-        //json_output_file<<"    \"meter_type\" : [\"TIME\", \"ITERATION\", \"MISMATCH IN MVA\"";
-        //for(size_t i=0; i!=n; ++i)
-        //    json_output_file<<", \""<<meters[i].get_meter_type()<<"\"";
-        //json_output_file<<"],"<<endl<<endl;
+        open_meter_output_files();
 
-        json_output_file<<"    \"meter_name\" : [\"TIME\", \"DAE INTEGRATION\", \"NETWORK ITERATION\", \"MISMATCH IN MVA\"";
-        for(size_t i=0; i!=n; ++i)
-            json_output_file<<", \""<<meters[i].get_meter_name()<<"\"";
-        json_output_file<<"],"<<"\n\n";
-        json_output_file<<"    \"meter_value\" : ["<<"\n";
-    }
-
-    // save header to bin file
-
-    if(is_bin_file_export_enabled() and bin_output_file.is_open())
-    {
-        size_t bin_version=0;
-        bin_output_file.write((char *)(&bin_version), sizeof(bin_version));
+        if(csv_output_file.is_open() or json_output_file.is_open() or bin_output_file.is_open())
+        {
+            // save header to csv file
+            if(is_csv_file_export_enabled() and csv_output_file.is_open())
+            {
+                //csv_output_file<<"TIME,ITERATION,MISMATCH IN MVA";
+                //for(size_t i=0; i!=n; ++i)
+                //    csv_output_file<<","<<meters[i].get_meter_type();
+                //csv_output_file<<endl;
 
-        time_t tt = time(NULL);
-        tm* local_time= localtime(&tt);
+                csv_output_file<<"TIME,DAE INTEGRATION,NETWORK ITERATION,MISMATCH IN MVA";
 
-        size_t year = local_time->tm_year + 1900;
-        size_t month = local_time->tm_mon + 1;
-        size_t day = local_time->tm_mday;
-        size_t hour = local_time->tm_hour;
-        size_t minute = local_time->tm_min;
-        size_t second = local_time->tm_sec;
-
-        bin_output_file.write((char *)(&year), sizeof(year));
-        bin_output_file.write((char *)(&month), sizeof(month));
-        bin_output_file.write((char *)(&day), sizeof(day));
-        bin_output_file.write((char *)(&hour), sizeof(hour));
-        bin_output_file.write((char *)(&minute), sizeof(minute));
-        bin_output_file.write((char *)(&second), sizeof(second));
-
-        size_t float_size=sizeof(float);
-        bin_output_file.write((char *)(&float_size), sizeof(float_size));
-
-        size_t m = 4+n;
-        bin_output_file.write((char *)(&m), sizeof(m));
-        string meter_names ="";
-
-        meter_names += "TIME\n";
-        meter_names += "DAE INTEGRATION\n";
-        meter_names += "NETWORK INTEGRATION\n";
-        meter_names += "MISMATCH IN MVA\n";
-        for(size_t i=0; i!=n; ++i)
-            meter_names += (meters[i].get_meter_name()+"\n");
+                for(size_t i=0; i!=n; ++i)
+                    csv_output_file<<","<<meters[i].get_meter_name();
+                csv_output_file<<"\n";
+            }
 
-        size_t n_meter_string_size = strlen(meter_names.c_str());
-        bin_output_file.write((char *)(&n_meter_string_size), sizeof(n_meter_string_size));
+            // save header to json file
+            if(is_json_file_export_enabled() and json_output_file.is_open())
+            {
+                json_output_file<<"{"<<"\n";
+
+                //json_output_file<<"    \"meter_type\" : [\"TIME\", \"ITERATION\", \"MISMATCH IN MVA\"";
+                //for(size_t i=0; i!=n; ++i)
+                //    json_output_file<<", \""<<meters[i].get_meter_type()<<"\"";
+                //json_output_file<<"],"<<endl<<endl;
+
+                json_output_file<<"    \"meter_name\" : [\"TIME\", \"DAE INTEGRATION\", \"NETWORK ITERATION\", \"MISMATCH IN MVA\"";
+                for(size_t i=0; i!=n; ++i)
+                    json_output_file<<", \""<<meters[i].get_meter_name()<<"\"";
+                json_output_file<<"],"<<"\n\n";
+                json_output_file<<"    \"meter_value\" : ["<<"\n";
+            }
 
-        char * pmeter_name = new char[n_meter_string_size+1];
-        sprintf(pmeter_name, meter_names.c_str());
-        pmeter_name[n_meter_string_size]='\0';
+            // save header to bin file
 
-        bin_output_file.write((char *)(pmeter_name), strlen(pmeter_name));
-        delete [] pmeter_name;
+            if(is_bin_file_export_enabled() and bin_output_file.is_open())
+            {
+                size_t bin_version=0;
+                bin_output_file.write((char *)(&bin_version), sizeof(bin_version));
+
+                time_t tt = time(NULL);
+                tm* local_time= localtime(&tt);
+
+                size_t year = local_time->tm_year + 1900;
+                size_t month = local_time->tm_mon + 1;
+                size_t day = local_time->tm_mday;
+                size_t hour = local_time->tm_hour;
+                size_t minute = local_time->tm_min;
+                size_t second = local_time->tm_sec;
+
+                bin_output_file.write((char *)(&year), sizeof(year));
+                bin_output_file.write((char *)(&month), sizeof(month));
+                bin_output_file.write((char *)(&day), sizeof(day));
+                bin_output_file.write((char *)(&hour), sizeof(hour));
+                bin_output_file.write((char *)(&minute), sizeof(minute));
+                bin_output_file.write((char *)(&second), sizeof(second));
+
+                size_t float_size=sizeof(float);
+                bin_output_file.write((char *)(&float_size), sizeof(float_size));
+
+                size_t m = 4+n;
+                bin_output_file.write((char *)(&m), sizeof(m));
+                string meter_names ="";
+
+                meter_names += "TIME\n";
+                meter_names += "DAE INTEGRATION\n";
+                meter_names += "NETWORK INTEGRATION\n";
+                meter_names += "MISMATCH IN MVA\n";
+                for(size_t i=0; i!=n; ++i)
+                    meter_names += (meters[i].get_meter_name()+"\n");
+
+                size_t n_meter_string_size = strlen(meter_names.c_str());
+                bin_output_file.write((char *)(&n_meter_string_size), sizeof(n_meter_string_size));
+
+                char * pmeter_name = new char[n_meter_string_size+1];
+                sprintf(pmeter_name, meter_names.c_str());
+                pmeter_name[n_meter_string_size]='\0';
+
+                bin_output_file.write((char *)(pmeter_name), strlen(pmeter_name));
+                delete [] pmeter_name;
+            }
+        }
     }
 }
 
@@ -1475,72 +1502,70 @@ void DYNAMICS_SIMULATOR::save_meter_values()
 {
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     size_t n = meters.size();
-    if(n==0)
-        return;
-
-    if(not csv_output_file.is_open() and not json_output_file.is_open() and not bin_output_file.is_open())
-        return;
+    if(n!=0 and (csv_output_file.is_open() or json_output_file.is_open() or bin_output_file.is_open()))
+    {
+        get_bus_current_mismatch();
+        get_bus_power_mismatch_in_MVA();
+        double smax = get_max_power_mismatch_in_MVA();
 
-    get_bus_current_mismatch();
-    get_bus_power_mismatch_in_MVA();
-    double smax = get_max_power_mismatch_in_MVA();
+        update_all_meters_value();
 
-    update_all_meters_value();
+        if(is_bin_file_export_enabled() and bin_output_file.is_open())
+        {
+            float fvalue=0.0;
 
-    if(is_csv_file_export_enabled() or is_json_file_export_enabled())
-    {
-        ostringstream osstream;
-        //osstream<<setw(8)<<setprecision(4)<<fixed<<toolkit.get_dynamic_simulation_time_in_s()<<","
-        //  <<setw(3)<<ITER_DAE<<","<<setw(3)<<ITER_NET<<","
-        //  <<setw(6)<<setprecision(3)<<fixed<<smax;
-
-        char temp_buffer[50];
-        string temp_str = "";
-        snprintf(temp_buffer, 50, "%8.4f",toolkit.get_dynamic_simulation_time_in_s());
-        temp_str += temp_buffer;
-        snprintf(temp_buffer, 50, ",%3lu",ITER_DAE);
-        temp_str += temp_buffer;
-        snprintf(temp_buffer, 50, ",%3lu",ITER_NET);
-        temp_str += temp_buffer;
-        snprintf(temp_buffer, 50, ",%6.3f",smax);
-        temp_str += temp_buffer;
-        for (size_t i = 0; i != n; ++i)
-        {
-            snprintf(temp_buffer, 50, ",%16.12f", meter_values[i]);
-            temp_str += temp_buffer;
-        }
-        osstream << temp_str;
+            fvalue = toolkit.get_dynamic_simulation_time_in_s();
+            bin_output_file.write((char *)(&fvalue), sizeof(fvalue));
 
-        /*for(size_t i=0; i!=n; ++i)
-            osstream<<","<<setw(16)<<setprecision(12)<<fixed<<meter_values[i];*/
+            fvalue = float(ITER_DAE);
+            bin_output_file.write((char *)(&fvalue), sizeof(fvalue));
 
-        if(is_csv_file_export_enabled() and csv_output_file.is_open())
-            csv_output_file<<osstream.str()<<endl;
+            fvalue = float(ITER_NET);
+            bin_output_file.write((char *)(&fvalue), sizeof(fvalue));
 
-        if(is_json_file_export_enabled() and json_output_file.is_open())
-            json_output_file<<","<<endl
-                            <<"                       ["<<osstream.str()<<"]";
-    }
-    if(is_bin_file_export_enabled() and bin_output_file.is_open())
-    {
-        float fvalue=0.0;
+            fvalue = smax;
+            bin_output_file.write((char *)(&fvalue), sizeof(fvalue));
+
+            for (size_t i = 0; i != n; ++i)
+            {
+                fvalue = meter_values[i];
+                bin_output_file.write((char *)(&fvalue), sizeof(fvalue));
+            }
+        }
 
-        fvalue = toolkit.get_dynamic_simulation_time_in_s();
-        bin_output_file.write((char *)(&fvalue), sizeof(fvalue));
+        if(is_csv_file_export_enabled() or is_json_file_export_enabled())
+        {
+            ostringstream osstream;
+            //osstream<<setw(8)<<setprecision(4)<<fixed<<toolkit.get_dynamic_simulation_time_in_s()<<","
+            //  <<setw(3)<<ITER_DAE<<","<<setw(3)<<ITER_NET<<","
+            //  <<setw(6)<<setprecision(3)<<fixed<<smax;
 
-        fvalue = float(ITER_DAE);
-        bin_output_file.write((char *)(&fvalue), sizeof(fvalue));
+            char temp_buffer[50];
+            string temp_str = "";
+            snprintf(temp_buffer, 50, "%8.4f",toolkit.get_dynamic_simulation_time_in_s());
+            temp_str += temp_buffer;
+            snprintf(temp_buffer, 50, ",%3lu",ITER_DAE);
+            temp_str += temp_buffer;
+            snprintf(temp_buffer, 50, ",%3lu",ITER_NET);
+            temp_str += temp_buffer;
+            snprintf(temp_buffer, 50, ",%6.3f",smax);
+            temp_str += temp_buffer;
+            for (size_t i = 0; i != n; ++i)
+            {
+                snprintf(temp_buffer, 50, ",%16.12f", meter_values[i]);
+                temp_str += temp_buffer;
+            }
+            osstream << temp_str;
 
-        fvalue = float(ITER_NET);
-        bin_output_file.write((char *)(&fvalue), sizeof(fvalue));
+            /*for(size_t i=0; i!=n; ++i)
+                osstream<<","<<setw(16)<<setprecision(12)<<fixed<<meter_values[i];*/
 
-        fvalue = smax;
-        bin_output_file.write((char *)(&fvalue), sizeof(fvalue));
+            if(is_csv_file_export_enabled() and csv_output_file.is_open())
+                csv_output_file<<osstream.str()<<endl;
 
-        for (size_t i = 0; i != n; ++i)
-        {
-            fvalue = meter_values[i];
-            bin_output_file.write((char *)(&fvalue), sizeof(fvalue));
+            if(is_json_file_export_enabled() and json_output_file.is_open())
+                json_output_file<<","<<endl
+                                <<"                       ["<<osstream.str()<<"]";
         }
     }
 }
@@ -1661,15 +1686,22 @@ void DYNAMICS_SIMULATOR::run_to(double time)
 {
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     update_with_event();
-    while(toolkit.get_dynamic_simulation_time_in_s()<=time-FLOAT_EPSILON)
+    if(get_rotor_angle_stability_survilliance_flag()==false)
     {
-        run_a_step();
-
-        if(get_rotor_angle_stability_survilliance_flag()==true)
+        while(toolkit.get_dynamic_simulation_time_in_s()<=time-FLOAT_EPSILON)
+            run_a_step();
+    }
+    else
+    {
+        while(toolkit.get_dynamic_simulation_time_in_s()<=time-FLOAT_EPSILON)
         {
+            run_a_step();
+
             update_generators_in_islands();
             bool stable = is_system_angular_stable();
-            if(stable==false)
+            if(stable==true)
+                ;
+            else
             {
                 ostringstream osstream;
                 osstream<<"At time "<<toolkit.get_dynamic_simulation_time_in_s()<<"s, "
@@ -1710,7 +1742,32 @@ void DYNAMICS_SIMULATOR::run_a_step()
             toolkit.show_information_with_leading_time_stamp(osstream);
         }
 
-        if(ITER_DAE>max_DAE_iteration)
+        if(ITER_DAE<=max_DAE_iteration)
+        {
+            integrate();
+            bool network_converged = solve_network();
+            ITER_NET += network_iteration_count;
+
+            double max_angle_difference_new = get_system_max_angle_difference_in_deg();
+            if(toolkit.is_detailed_log_enabled())
+            {
+                osstream<<"maximum angle difference with iteration "<<ITER_DAE<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" is "<<max_angle_difference_new;
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+
+            if(toolkit.is_detailed_log_enabled() and (not network_converged))
+            {
+                osstream<<"Failed to solve network in "<<max_network_iteration<<" iterations during DAE iteration "<<ITER_DAE<<" when integrating at time "<<TIME<<" s."
+                        <<"New max angle difference is "<<max_angle_difference_new<<" deg while old is "<<max_angle_difference_old<<" deg (difference is "<<max_angle_difference_new-max_angle_difference_old<<" deg)";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+            if(fabs(max_angle_difference_new-max_angle_difference_old)>1e-8) // DAE solution not converged
+                max_angle_difference_old = max_angle_difference_new;
+            else//converged
+                break;
+
+        }
+        else
         {
             if(max_DAE_iteration!=2)
             {
@@ -1722,27 +1779,6 @@ void DYNAMICS_SIMULATOR::run_a_step()
             --ITER_DAE;
             break;
         }
-        integrate();
-        bool network_converged = solve_network();
-        ITER_NET += network_iteration_count;
-
-        double max_angle_difference_new = get_system_max_angle_difference_in_deg();
-        if(toolkit.is_detailed_log_enabled())
-        {
-            osstream<<"maximum angle difference with iteration "<<ITER_DAE<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" is "<<max_angle_difference_new;
-            toolkit.show_information_with_leading_time_stamp(osstream);
-        }
-
-        if(toolkit.is_detailed_log_enabled() and (not network_converged))
-        {
-            osstream<<"Failed to solve network in "<<max_network_iteration<<" iterations during DAE iteration "<<ITER_DAE<<" when integrating at time "<<TIME<<" s."
-                    <<"New max angle difference is "<<max_angle_difference_new<<" deg while old is "<<max_angle_difference_old<<" deg (difference is "<<max_angle_difference_new-max_angle_difference_old<<" deg)";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-        }
-        if(fabs(max_angle_difference_new-max_angle_difference_old)<1e-8) // DAE solution converged
-            break;
-        else
-            max_angle_difference_old = max_angle_difference_new;
     }
     update();
     update_relay_models();
@@ -1768,7 +1804,9 @@ void DYNAMICS_SIMULATOR::update_with_event()
         ITER_NET += network_iteration_count;
         if(not network_converged)
         {
-            if(iter>update_event_iter_max)
+            if(iter<=update_event_iter_max)
+                continue;
+            else
             {
                 char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
                 snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Failed to solve network in %lu iterations when updating with event at time %f s.",
@@ -1776,8 +1814,6 @@ void DYNAMICS_SIMULATOR::update_with_event()
                 toolkit.show_information_with_leading_time_stamp(buffer);
                 break;
             }
-            else
-                continue;
         }
         else
             break;
@@ -1840,56 +1876,55 @@ void DYNAMICS_SIMULATOR::run_all_models(DYNAMIC_MODE mode)
     vector<GENERATOR*> generators = psdb.get_all_generators();
     GENERATOR* generator;
     //#pragma omp parallel for
-    for(size_t i=0; i<n; ++i)
+    for(size_t i=0; i!=n; ++i)
     {
         generator = generators[i];
-        if(generator->get_status()==false)
-            continue;
-        generator->run(mode);
+        if(generator->get_status()==true)
+            generator->run(mode);
     }
 
     n = psdb.get_wt_generator_count();
     vector<WT_GENERATOR*> wtgens = psdb.get_all_wt_generators();
     WT_GENERATOR* wtgen;
     //#pragma omp parallel for
-    for(size_t i=0; i<n; ++i)
+    for(size_t i=0; i!=n; ++i)
     {
         wtgen = wtgens[i];
-        if(wtgen->get_status()==false)
-            continue;
-        wtgen->run(mode);
+        if(wtgen->get_status()==true)
+            wtgen->run(mode);
     }
 
     n = psdb.get_load_count();
     vector<LOAD*> loads = psdb.get_all_loads();
     LOAD* load;
     //#pragma omp parallel for
-    for(size_t i=0; i<n; ++i)
+    for(size_t i=0; i!=n; ++i)
     {
         load = loads[i];
-        if(load->get_status()==false)
-            continue;
-        load->run(mode);
+        if(load->get_status()==true)
+            load->run(mode);
     }
 
     n = psdb.get_hvdc_count();
     vector<HVDC*> hvdcs = psdb.get_all_hvdcs();
     HVDC* hvdc;
     //#pragma omp parallel for
-    for(size_t i=0; i<n; ++i)
+    for(size_t i=0; i!=n; ++i)
     {
         hvdc = hvdcs[i];
-        hvdc->run(mode);
+        if(hvdc->get_status()==true)
+            hvdc->run(mode);
     }
 
     n = psdb.get_equivalent_device_count();
     vector<EQUIVALENT_DEVICE*> edevices = psdb.get_all_equivalent_devices();
     EQUIVALENT_DEVICE* edevice;
     //#pragma omp parallel for
-    for(size_t i=0; i<n; ++i)
+    for(size_t i=0; i!=n; ++i)
     {
         edevice = edevices[i];
-        edevice->run(mode);
+        if(edevice->get_status()==true)
+            edevice->run(mode);
     }
 
     if(mode==INITIALIZE_MODE or mode==INTEGRATE_MODE or mode==UPDATE_MODE)
@@ -1930,10 +1965,11 @@ void DYNAMICS_SIMULATOR::update_bus_frequency_blocks()
     for(size_t i=0; i!=n; ++i)
     {
         bus = buses[i];
-        if(bus->get_bus_type()==OUT_OF_SERVICE)
-            continue;
-        BUS_FREQUENCY_MODEL* model = bus->get_bus_frequency_model();
-        model->update_for_applying_event();
+        if(bus->get_bus_type()!=OUT_OF_SERVICE)
+        {
+            BUS_FREQUENCY_MODEL* model = bus->get_bus_frequency_model();
+            model->update_for_applying_event();
+        }
     }
 }
 
@@ -2010,22 +2046,25 @@ bool DYNAMICS_SIMULATOR::solve_network()
     while(true)
     {
         ++network_iter_count;
-        if(network_iter_count>network_iter_max)
-        {
-            --network_iter_count;
-            break;
-        }
-        solve_hvdcs_without_integration();
-        get_bus_current_mismatch();
-        if(not is_converged())
+        if(network_iter_count<=network_iter_max)
         {
-            build_bus_current_mismatch_vector();
-            delta_V = I_vec/jacobian;
-            update_bus_voltage();
+            solve_hvdcs_without_integration();
+            get_bus_current_mismatch();
+            if(not is_converged())
+            {
+                build_bus_current_mismatch_vector();
+                delta_V = I_vec/jacobian;
+                update_bus_voltage();
+            }
+            else
+            {
+                converged = true;
+                break;
+            }
         }
         else
         {
-            converged = true;
+            --network_iter_count;
             break;
         }
     }
@@ -2061,98 +2100,113 @@ void DYNAMICS_SIMULATOR::get_bus_current_mismatch()
         I_mismatch[i] = -I_mismatch[i];
 
     add_generators_to_bus_current_mismatch();
-    for(size_t i = 0; i<n; ++i)
+    if(check_NAN)
     {
-        if(isnan(I_mismatch[i].real()) or isnan(I_mismatch[i].imag()))
+        for(size_t i = 0; i<n; ++i)
         {
-            ostringstream osstream;
-            osstream<<"warning. NAN is detected when getting bus current mismatch after adding generators when calling DYNAMICS_SIMULATOR::"<<__FUNCTION__<<"():"<<endl;
-            for(size_t j = 0; j<n; ++j)
+            if(isnan(I_mismatch[i].real()) or isnan(I_mismatch[i].imag()))
             {
-                if(isnan(I_mismatch[j].real()) or isnan(I_mismatch[j].imag()))
+                ostringstream osstream;
+                osstream<<"warning. NAN is detected when getting bus current mismatch after adding generators when calling DYNAMICS_SIMULATOR::"<<__FUNCTION__<<"():"<<endl;
+                for(size_t j = 0; j<n; ++j)
                 {
-                    size_t ibus = net.get_physical_bus_number_of_internal_bus(j);
-                    osstream<<"Physical bus: "<<ibus<<", internal bus: "<<j<<", "<<I_mismatch[i].real()<<","<<I_mismatch[i].imag()<<endl;
+                    if(isnan(I_mismatch[j].real()) or isnan(I_mismatch[j].imag()))
+                    {
+                        size_t ibus = net.get_physical_bus_number_of_internal_bus(j);
+                        osstream<<"Physical bus: "<<ibus<<", internal bus: "<<j<<", "<<I_mismatch[i].real()<<","<<I_mismatch[i].imag()<<endl;
+                    }
                 }
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                break;
             }
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            break;
         }
     }
     add_wt_generators_to_bus_current_mismatch();
-    for(size_t i = 0; i<n; ++i)
+    if(check_NAN)
     {
-        if(isnan(I_mismatch[i].real()) or isnan(I_mismatch[i].imag()))
+        for(size_t i = 0; i<n; ++i)
         {
-            ostringstream osstream;
-            osstream<<"warning. NAN is detected when getting bus current mismatch after adding wt generators when calling DYNAMICS_SIMULATOR::"<<__FUNCTION__<<"():"<<endl;
-            for(size_t j = 0; j<n; ++j)
+            if(isnan(I_mismatch[i].real()) or isnan(I_mismatch[i].imag()))
             {
-                if(isnan(I_mismatch[j].real()) or isnan(I_mismatch[j].imag()))
+                ostringstream osstream;
+                osstream<<"warning. NAN is detected when getting bus current mismatch after adding wt generators when calling DYNAMICS_SIMULATOR::"<<__FUNCTION__<<"():"<<endl;
+                for(size_t j = 0; j<n; ++j)
                 {
-                    size_t ibus = net.get_physical_bus_number_of_internal_bus(j);
-                    osstream<<"Physical bus: "<<ibus<<", internal bus: "<<j<<", "<<I_mismatch[i].real()<<","<<I_mismatch[i].imag()<<endl;
+                    if(isnan(I_mismatch[j].real()) or isnan(I_mismatch[j].imag()))
+                    {
+                        size_t ibus = net.get_physical_bus_number_of_internal_bus(j);
+                        osstream<<"Physical bus: "<<ibus<<", internal bus: "<<j<<", "<<I_mismatch[i].real()<<","<<I_mismatch[i].imag()<<endl;
+                    }
                 }
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                break;
             }
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            break;
         }
     }
     add_loads_to_bus_current_mismatch();
-    for(size_t i = 0; i<n; ++i)
+    if(check_NAN)
     {
-        if(isnan(I_mismatch[i].real()) or isnan(I_mismatch[i].imag()))
+        for(size_t i = 0; i<n; ++i)
         {
-            ostringstream osstream;
-            osstream<<"warning. NAN is detected when getting bus current mismatch after adding loads when calling DYNAMICS_SIMULATOR::"<<__FUNCTION__<<"():"<<endl;
-            for(size_t j = 0; j<n; ++j)
+            if(isnan(I_mismatch[i].real()) or isnan(I_mismatch[i].imag()))
             {
-                if(isnan(I_mismatch[j].real()) or isnan(I_mismatch[j].imag()))
+                ostringstream osstream;
+                osstream<<"warning. NAN is detected when getting bus current mismatch after adding loads when calling DYNAMICS_SIMULATOR::"<<__FUNCTION__<<"():"<<endl;
+                for(size_t j = 0; j<n; ++j)
                 {
-                    size_t ibus = net.get_physical_bus_number_of_internal_bus(j);
-                    osstream<<"Physical bus: "<<ibus<<", internal bus: "<<j<<", "<<I_mismatch[i].real()<<","<<I_mismatch[i].imag()<<endl;
+                    if(isnan(I_mismatch[j].real()) or isnan(I_mismatch[j].imag()))
+                    {
+                        size_t ibus = net.get_physical_bus_number_of_internal_bus(j);
+                        osstream<<"Physical bus: "<<ibus<<", internal bus: "<<j<<", "<<I_mismatch[i].real()<<","<<I_mismatch[i].imag()<<endl;
+                    }
                 }
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                break;
             }
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            break;
         }
     }
     add_hvdcs_to_bus_current_mismatch();
-    for(size_t i = 0; i<n; ++i)
+    if(check_NAN)
     {
-        if(isnan(I_mismatch[i].real()) or isnan(I_mismatch[i].imag()))
+        for(size_t i = 0; i<n; ++i)
         {
-            ostringstream osstream;
-            osstream<<"warning. NAN is detected when getting bus current mismatch after adding hvdcs when calling DYNAMICS_SIMULATOR::"<<__FUNCTION__<<"():"<<endl;
-            for(size_t j = 0; j<n; ++j)
+            if(isnan(I_mismatch[i].real()) or isnan(I_mismatch[i].imag()))
             {
-                if(isnan(I_mismatch[j].real()) or isnan(I_mismatch[j].imag()))
+                ostringstream osstream;
+                osstream<<"warning. NAN is detected when getting bus current mismatch after adding hvdcs when calling DYNAMICS_SIMULATOR::"<<__FUNCTION__<<"():"<<endl;
+                for(size_t j = 0; j<n; ++j)
                 {
-                    size_t ibus = net.get_physical_bus_number_of_internal_bus(j);
-                    osstream<<"Physical bus: "<<ibus<<", internal bus: "<<j<<", "<<I_mismatch[j]<<endl;
+                    if(isnan(I_mismatch[j].real()) or isnan(I_mismatch[j].imag()))
+                    {
+                        size_t ibus = net.get_physical_bus_number_of_internal_bus(j);
+                        osstream<<"Physical bus: "<<ibus<<", internal bus: "<<j<<", "<<I_mismatch[j]<<endl;
+                    }
                 }
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                break;
             }
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            break;
         }
     }
     add_equivalent_devices_to_bus_current_mismatch();
-    for(size_t i = 0; i<n; ++i)
+    if(check_NAN)
     {
-        if(isnan(I_mismatch[i].real()) or isnan(I_mismatch[i].imag()))
+        for(size_t i = 0; i<n; ++i)
         {
-            ostringstream osstream;
-            osstream<<"warning. NAN is detected when getting bus current mismatch after adding equivalent devices when calling DYNAMICS_SIMULATOR::"<<__FUNCTION__<<"():"<<endl;
-            for(size_t j = 0; j<n; ++j)
+            if(isnan(I_mismatch[i].real()) or isnan(I_mismatch[i].imag()))
             {
-                if(isnan(I_mismatch[j].real()) or isnan(I_mismatch[j].imag()))
+                ostringstream osstream;
+                osstream<<"warning. NAN is detected when getting bus current mismatch after adding equivalent devices when calling DYNAMICS_SIMULATOR::"<<__FUNCTION__<<"():"<<endl;
+                for(size_t j = 0; j<n; ++j)
                 {
-                    size_t ibus = net.get_physical_bus_number_of_internal_bus(j);
-                    osstream<<"Physical bus: "<<ibus<<", internal bus: "<<j<<", "<<I_mismatch[i].real()<<","<<I_mismatch[i].imag()<<endl;
+                    if(isnan(I_mismatch[j].real()) or isnan(I_mismatch[j].imag()))
+                    {
+                        size_t ibus = net.get_physical_bus_number_of_internal_bus(j);
+                        osstream<<"Physical bus: "<<ibus<<", internal bus: "<<j<<", "<<I_mismatch[i].real()<<","<<I_mismatch[i].imag()<<endl;
+                    }
                 }
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                break;
             }
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            break;
         }
     }
     /*
@@ -2236,40 +2290,36 @@ void DYNAMICS_SIMULATOR::add_generators_to_bus_current_mismatch()
 
     vector<GENERATOR*> generators = psdb.get_all_generators();
 
-    GENERATOR* generator;
-    SYNC_GENERATOR_MODEL* gen_model;
-
     size_t ngen = generators.size();
 
     complex<double> E, V, Z, I;
 
     for(size_t i=0; i!=ngen; ++i)
     {
-        generator = generators[i];
-
-        if(generator->get_status() == false)
-            continue;
+        GENERATOR* generator = generators[i];
 
-        physical_bus = generator->get_generator_bus();
-
-        internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
-
-        gen_model = generator->get_sync_generator_model();
-        if(gen_model==NULL)
-            continue;
+        if(generator->get_status() == true)
+        {
+            physical_bus = generator->get_generator_bus();
 
-        //I = gen_model->get_terminal_complex_current_in_pu_in_xy_axis_based_on_sbase();
-        I = gen_model->get_source_Norton_equivalent_complex_current_in_pu_in_xy_axis_based_on_sbase();
+            internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
 
-        I_mismatch[internal_bus] += I;
+            SYNC_GENERATOR_MODEL* gen_model = generator->get_sync_generator_model();
+            if(gen_model!=NULL)
+            {
+                //I = gen_model->get_terminal_complex_current_in_pu_in_xy_axis_based_on_sbase();
+                I = gen_model->get_source_Norton_equivalent_complex_current_in_pu_in_xy_axis_based_on_sbase();
 
-        /*os<< "Generator %u source current: %f + j%f",physical_bus, I.real(), I.imag());
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        complex<double> Edq = gen_model->get_internal_voltage_in_pu_in_dq_axis();
-        complex<double> Exy = gen_model->get_internal_voltage_in_pu_in_xy_axis();
-        osstream<<"Generator %u internal voltage: %f + j%f (dq), %f + j%f (xy)",physical_bus, Edq.real(), Edq.imag(), Exy.real(), Exy.imag());
-        toolkit.show_information_with_leading_time_stamp(osstream);*/
+                I_mismatch[internal_bus] += I;
 
+                /*os<< "Generator %u source current: %f + j%f",physical_bus, I.real(), I.imag());
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                complex<double> Edq = gen_model->get_internal_voltage_in_pu_in_dq_axis();
+                complex<double> Exy = gen_model->get_internal_voltage_in_pu_in_xy_axis();
+                osstream<<"Generator %u internal voltage: %f + j%f (dq), %f + j%f (xy)",physical_bus, Edq.real(), Edq.imag(), Exy.real(), Exy.imag());
+                toolkit.show_information_with_leading_time_stamp(osstream);*/
+            }
+        }
     }
 }
 
@@ -2283,43 +2333,39 @@ void DYNAMICS_SIMULATOR::add_wt_generators_to_bus_current_mismatch()
 
     vector<WT_GENERATOR*> generators = psdb.get_all_wt_generators();
 
-    WT_GENERATOR* generator;
-    WT_GENERATOR_MODEL* gen_model;
-
     size_t ngen = generators.size();
 
     complex<double> E, V, Z, I;
 
     for(size_t i=0; i!=ngen; ++i)
     {
-        generator = generators[i];
-
-        if(generator->get_status() == false)
-            continue;
+        WT_GENERATOR* generator = generators[i];
 
-        physical_bus = generator->get_generator_bus();
-
-        internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
-
-        gen_model = generator->get_wt_generator_model();
-        if(gen_model==NULL)
-            continue;
+        if(generator->get_status() == true)
+        {
+            physical_bus = generator->get_generator_bus();
 
-        if(gen_model->is_current_source())
-            I = gen_model->get_terminal_complex_current_in_pu_in_xy_axis_based_on_sbase();
-        else
-            I = gen_model->get_source_Norton_equivalent_complex_current_in_pu_in_xy_axis_based_on_sbase();
-        //cout<<generator->get_device_name()<<" terminal or Norton current is: "<<I<<endl;
+            internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
 
-        I_mismatch[internal_bus] += I;
+            WT_GENERATOR_MODEL* gen_model = generator->get_wt_generator_model();
+            if(gen_model!=NULL)
+            {
+                if(gen_model->is_current_source())
+                    I = gen_model->get_terminal_complex_current_in_pu_in_xy_axis_based_on_sbase();
+                else
+                    I = gen_model->get_source_Norton_equivalent_complex_current_in_pu_in_xy_axis_based_on_sbase();
+                //cout<<generator->get_device_name()<<" terminal or Norton current is: "<<I<<endl;
 
-        /*os<< "Generator %u source current: %f + j%f",physical_bus, I.real(), I.imag());
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        complex<double> Edq = gen_model->get_internal_voltage_in_pu_in_dq_axis();
-        complex<double> Exy = gen_model->get_internal_voltage_in_pu_in_xy_axis();
-        osstream<<"Generator %u internal voltage: %f + j%f (dq), %f + j%f (xy)",physical_bus, Edq.real(), Edq.imag(), Exy.real(), Exy.imag());
-        toolkit.show_information_with_leading_time_stamp(osstream);*/
+                I_mismatch[internal_bus] += I;
 
+                /*os<< "Generator %u source current: %f + j%f",physical_bus, I.real(), I.imag());
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                complex<double> Edq = gen_model->get_internal_voltage_in_pu_in_dq_axis();
+                complex<double> Exy = gen_model->get_internal_voltage_in_pu_in_xy_axis();
+                osstream<<"Generator %u internal voltage: %f + j%f (dq), %f + j%f (xy)",physical_bus, Edq.real(), Edq.imag(), Exy.real(), Exy.imag());
+                toolkit.show_information_with_leading_time_stamp(osstream);*/
+            }
+        }
     }
 }
 
@@ -2337,17 +2383,17 @@ void DYNAMICS_SIMULATOR::add_loads_to_bus_current_mismatch()
     for(size_t i=0; i<nload; ++i)
     {
         LOAD* load = loads[i];
-        if(load->get_status()==false)
-            continue;
-
-        size_t physical_bus = load->get_load_bus();
+        if(load->get_status()==true)
+        {
+            size_t physical_bus = load->get_load_bus();
 
-        size_t internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
+            size_t internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
 
-        I_mismatch[internal_bus] -= load->get_dynamics_load_current_in_pu_based_on_system_base_power();
-        /*ostringstream osstream;
-        osstream<<load->get_device_name()<<" source current: "<<load->get_dynamics_load_current_in_pu_based_on_system_base_power()<<", voltage = "<<psdb.get_bus_voltage_in_pu(physical_bus);
-        toolkit.show_information_with_leading_time_stamp(osstream);*/
+            I_mismatch[internal_bus] -= load->get_dynamics_load_current_in_pu_based_on_system_base_power();
+            /*ostringstream osstream;
+            osstream<<load->get_device_name()<<" source current: "<<load->get_dynamics_load_current_in_pu_based_on_system_base_power()<<", voltage = "<<psdb.get_bus_voltage_in_pu(physical_bus);
+            toolkit.show_information_with_leading_time_stamp(osstream);*/
+        }
     }
 }
 void DYNAMICS_SIMULATOR::add_hvdcs_to_bus_current_mismatch()
@@ -2367,24 +2413,24 @@ void DYNAMICS_SIMULATOR::add_hvdcs_to_bus_current_mismatch()
     for(size_t i=0; i!=nhvdc; ++i)
     {
         HVDC* hvdc = hvdcs[i];
-        if(hvdc->get_status()==false)
-            continue;
-
-        physical_bus = hvdcs[i]->get_converter_bus(RECTIFIER);
+        if(hvdc->get_status()==true)
+        {
+            physical_bus = hvdcs[i]->get_converter_bus(RECTIFIER);
 
-        internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
+            internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
 
-        I = hvdcs[i]->get_converter_dynamic_current_in_pu_based_on_system_base_power(RECTIFIER);
+            I = hvdcs[i]->get_converter_dynamic_current_in_pu_based_on_system_base_power(RECTIFIER);
 
-        I_mismatch[internal_bus] -= I;
+            I_mismatch[internal_bus] -= I;
 
-        physical_bus = hvdcs[i]->get_converter_bus(INVERTER);
+            physical_bus = hvdcs[i]->get_converter_bus(INVERTER);
 
-        internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
+            internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
 
-        I = hvdcs[i]->get_converter_dynamic_current_in_pu_based_on_system_base_power(INVERTER);
+            I = hvdcs[i]->get_converter_dynamic_current_in_pu_based_on_system_base_power(INVERTER);
 
-        I_mismatch[internal_bus] -= I;
+            I_mismatch[internal_bus] -= I;
+        }
     }
 }
 
@@ -2406,18 +2452,18 @@ void DYNAMICS_SIMULATOR::add_equivalent_devices_to_bus_current_mismatch()
 
     for(size_t i=0; i!=nedevice; ++i)
     {
-        if(edevices[i]->get_status() == false)
-            continue;
-
-        physical_bus = edevices[i]->get_equivalent_device_bus();
+        if(edevices[i]->get_status() == true)
+        {
+            physical_bus = edevices[i]->get_equivalent_device_bus();
 
-        internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
+            internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
 
-        S = edevices[i]->get_total_equivalent_power_as_load_in_MVA()/sbase;
+            S = edevices[i]->get_total_equivalent_power_as_load_in_MVA()/sbase;
 
-        V = psdb.get_bus_complex_voltage_in_pu(physical_bus);
+            V = psdb.get_bus_complex_voltage_in_pu(physical_bus);
 
-        I_mismatch[internal_bus] -= conj(S/V);
+            I_mismatch[internal_bus] -= conj(S/V);
+        }
     }
 }
 
@@ -2432,10 +2478,7 @@ bool DYNAMICS_SIMULATOR::is_converged()
     //cout<<"maximum power mismatch at time "<<toolkit.get_dynamic_simulation_time_in_s()<<"s is "<<smax<<"MVA £¨"<<s_allowed<<")"<<endl;
 
     //cout<<"    time for getting maximum power mismatch: "<<double(clock()-start)/CLOCKS_PER_SEC*1000.0<<" ms"<<endl;
-    if(smax<s_allowed)
-        return true;
-    else
-        return false;
+    return (smax>s_allowed)? false : true;
 }
 
 void DYNAMICS_SIMULATOR:: get_bus_power_mismatch_in_MVA()
@@ -2653,105 +2696,84 @@ void DYNAMICS_SIMULATOR::guess_bus_voltage_with_bus_fault_cleared(size_t bus, FA
 
 void DYNAMICS_SIMULATOR::guess_bus_voltage_with_line_fault_set(const DEVICE_ID& did, size_t side_bus, double location, FAULT fault)
 {
-    if(location <0.0 or location >1.0)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    if(location>0.5)
+    if(location >=0.0 and location <= 1.0)
     {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
         LINE* line = psdb.get_line(did);
-        if(line!=NULL)
+        if(line!=NULL and line->is_connected_to_bus(side_bus))
         {
-            if(not line->is_connected_to_bus(side_bus))
-                return;
-
-            size_t ibus = line->get_sending_side_bus();
-            size_t jbus = line->get_receiving_side_bus();
-
-            location = 1.0-location;
+            if(location<=0.5)
+            {
+                size_t ibus = line->get_sending_side_bus();
+                size_t jbus = line->get_receiving_side_bus();
 
-            side_bus = (ibus==side_bus? ibus:jbus);
+                size_t this_bus = side_bus;
+                size_t other_bus = (ibus==side_bus? jbus:ibus);
 
-            guess_bus_voltage_with_line_fault_set(did, side_bus, location, fault);
-        }
-    }
-    else
-    {
-        LINE* line = psdb.get_line(did);
-        if(line!=NULL)
-        {
-            if(not line->is_connected_to_bus(side_bus))
-                return;
+                double this_location = location;
+                double other_location = 1.0-location;
 
-            size_t ibus = line->get_sending_side_bus();
-            size_t jbus = line->get_receiving_side_bus();
+                FAULT this_fault = fault;
+                this_fault.set_fault_shunt_in_pu(fault.get_fault_shunt_in_pu()/exp(this_location*2.0));
+                FAULT other_fault = fault;
+                other_fault.set_fault_shunt_in_pu(fault.get_fault_shunt_in_pu()/exp(other_location*2.0));
+                guess_bus_voltage_with_bus_fault_set(this_bus, this_fault);
+                guess_bus_voltage_with_bus_fault_set(other_bus, other_fault);
+            }
+            else
+            {
+                size_t ibus = line->get_sending_side_bus();
+                size_t jbus = line->get_receiving_side_bus();
 
-            size_t this_bus = side_bus;
-            size_t other_bus = (ibus==side_bus? jbus:ibus);
+                location = 1.0-location;
 
-            double this_location = location;
-            double other_location = 1.0-location;
+                side_bus = (ibus==side_bus? ibus:jbus);
 
-            FAULT this_fault = fault;
-            this_fault.set_fault_shunt_in_pu(fault.get_fault_shunt_in_pu()/exp(this_location*2.0));
-            FAULT other_fault = fault;
-            other_fault.set_fault_shunt_in_pu(fault.get_fault_shunt_in_pu()/exp(other_location*2.0));
-            guess_bus_voltage_with_bus_fault_set(this_bus, this_fault);
-            guess_bus_voltage_with_bus_fault_set(other_bus, other_fault);
+                guess_bus_voltage_with_line_fault_set(did, side_bus, location, fault);
+            }
         }
     }
 }
 
 void DYNAMICS_SIMULATOR::guess_bus_voltage_with_line_fault_cleared(const DEVICE_ID& did, size_t side_bus, double location, FAULT fault)
 {
-    if(location <0.0 or location >1.0)
-        return;
-
-    STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    if(location>0.5)
+    if(location >= 0.0 and location <= 1.0)
     {
+        STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
         LINE* line = psdb.get_line(did);
-        if(line!=NULL)
+        if(line!=NULL and line->is_connected_to_bus(side_bus))
         {
-            if(not line->is_connected_to_bus(side_bus))
-                return;
-
-            size_t ibus = line->get_sending_side_bus();
-            size_t jbus = line->get_receiving_side_bus();
-
-            location = 1.0-location;
-
-            side_bus = (ibus==side_bus? ibus:jbus);
+            if(location<=0.5)
+            {
+                size_t ibus = line->get_sending_side_bus();
+                size_t jbus = line->get_receiving_side_bus();
 
-            guess_bus_voltage_with_line_fault_cleared(did, side_bus, location, fault);
-        }
-    }
-    else
-    {
-        LINE* line = psdb.get_line(did);
-        if(line!=NULL)
-        {
-            if(not line->is_connected_to_bus(side_bus))
-                return;
+                size_t this_bus = side_bus;
+                size_t other_bus = (ibus==side_bus? jbus:ibus);
 
-            size_t ibus = line->get_sending_side_bus();
-            size_t jbus = line->get_receiving_side_bus();
+                double this_location = location;
+                double other_location = 1.0-location;
 
-            size_t this_bus = side_bus;
-            size_t other_bus = (ibus==side_bus? jbus:ibus);
+                FAULT this_fault = fault;
+                this_fault.set_fault_shunt_in_pu(fault.get_fault_shunt_in_pu()/exp(this_location*2.0));
+                FAULT other_fault = fault;
+                other_fault.set_fault_shunt_in_pu(fault.get_fault_shunt_in_pu()/exp(other_location*2.0));
+                guess_bus_voltage_with_bus_fault_cleared(this_bus, this_fault);
+                guess_bus_voltage_with_bus_fault_cleared(other_bus, other_fault);
+            }
+            else
+            {
+                size_t ibus = line->get_sending_side_bus();
+                size_t jbus = line->get_receiving_side_bus();
 
-            double this_location = location;
-            double other_location = 1.0-location;
+                location = 1.0-location;
 
-            FAULT this_fault = fault;
-            this_fault.set_fault_shunt_in_pu(fault.get_fault_shunt_in_pu()/exp(this_location*2.0));
-            FAULT other_fault = fault;
-            other_fault.set_fault_shunt_in_pu(fault.get_fault_shunt_in_pu()/exp(other_location*2.0));
-            guess_bus_voltage_with_bus_fault_cleared(this_bus, this_fault);
-            guess_bus_voltage_with_bus_fault_cleared(other_bus, other_fault);
+                side_bus = (ibus==side_bus? ibus:jbus);
 
+                guess_bus_voltage_with_line_fault_cleared(did, side_bus, location, fault);
+            }
         }
     }
 }
@@ -2819,7 +2841,7 @@ bool DYNAMICS_SIMULATOR::is_system_angular_stable() const
                 angles.push_back(genmodel->get_rotor_angle_in_deg());
             }
         }
-        double angle_max=0.0, angle_min = 0.0;
+        double angle_max = 0.0, angle_min = 0.0;
         size_t nangle = angles.size();
         if(nangle>0)
         {
@@ -2829,6 +2851,9 @@ bool DYNAMICS_SIMULATOR::is_system_angular_stable() const
             {
                 if(angles[i]>angle_max)
                     angle_max = angles[i];
+            }
+            for(size_t i=1; i!=nangle; ++i)
+            {
                 if(angles[i]<angle_min)
                     angle_min = angles[i];
             }
@@ -2874,27 +2899,28 @@ void DYNAMICS_SIMULATOR::set_bus_fault(size_t bus, complex<double> fault_shunt)
     BUS* busptr = psdb.get_bus(bus);
     if(busptr!=NULL)
     {
-        if(steps_fast_complex_abs(fault_shunt)<FLOAT_EPSILON)
+        if(steps_fast_complex_abs(fault_shunt)>FLOAT_EPSILON)
+        {
+            FAULT fault;
+            fault.set_fault_type(THREE_PHASES_FAULT);
+            fault.set_fault_shunt_in_pu(fault_shunt);
+
+            osstream<<fault.get_fault_type_string()<<" will be set for bus "<<bus<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl
+                   <<"Fault shunt is"<<fault_shunt<<" pu.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+
+            busptr->set_fault(fault);
+            guess_bus_voltage_with_bus_fault_set(bus, fault);
+
+            network_matrix.build_dynamic_network_matrix();
+            build_jacobian();
+        }
+        else
         {
             osstream<<"Zero fault shunt is given for bus "<<bus<<"."<<endl
                    <<"No fault will be set for bus "<<bus<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
             toolkit.show_information_with_leading_time_stamp(osstream);
-            return;
         }
-
-        FAULT fault;
-        fault.set_fault_type(THREE_PHASES_FAULT);
-        fault.set_fault_shunt_in_pu(fault_shunt);
-
-        osstream<<fault.get_fault_type_string()<<" will be set for bus "<<bus<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl
-               <<"Fault shunt is"<<fault_shunt<<" pu.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-
-        busptr->set_fault(fault);
-        guess_bus_voltage_with_bus_fault_set(bus, fault);
-
-        network_matrix.build_dynamic_network_matrix();
-        build_jacobian();
     }
     else
     {
@@ -2966,67 +2992,70 @@ void DYNAMICS_SIMULATOR::set_line_fault(const DEVICE_ID& line_id, size_t side_bu
 
     ostringstream osstream;
 
-    if(line_id.get_device_type()!="LINE")
+    if(line_id.get_device_type()=="LINE")
     {
-        osstream<<"The given device is not a LINE (it is a "<<line_id.get_device_type()<<") for setting line fault."<<endl
-               <<"No line fault will be set at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    LINE* lineptr = psdb.get_line(line_id);
-    if(lineptr!=NULL)
-    {
-        if(not lineptr->is_connected_to_bus(side_bus))
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        LINE* lineptr = psdb.get_line(line_id);
+        if(lineptr!=NULL)
         {
-            osstream<<lineptr->get_device_name()<<"is not connected to bus "<<side_bus<<endl
-                   <<"No fault will be set at location "<<location<<" to bus "<<side_bus<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            return;
+            if(lineptr->is_connected_to_bus(side_bus))
+            {
+                if(location>=0.0 and location<=1.0)
+                {
+                    if(steps_fast_complex_abs(fault_shunt)>FLOAT_EPSILON)
+                    {
+                        FAULT fault;
+                        fault.set_fault_type(THREE_PHASES_FAULT);
+                        fault.set_fault_shunt_in_pu(fault_shunt);
+
+                        osstream<<fault.get_fault_type_string()<<" will be set for "<<lineptr->get_device_name()<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl
+                               <<"Fault shunt is "<<fault_shunt<<" pu at location "<<location<<" to bus "<<side_bus;
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+
+
+                        lineptr->set_fault(side_bus,location, fault);
+                        guess_bus_voltage_with_line_fault_set(line_id, side_bus, location, fault);
+
+
+                        //network_matrix.save_network_matrix_to_file("dynamic_network_matrix_before_event.csv");
+                        //jacobian.save_matrix_to_file("dynamic_jacobian_with_fault_before_evnet.csv");
+                        network_matrix.build_dynamic_network_matrix();
+                        build_jacobian();
+                        //network_matrix.save_network_matrix_to_file("dynamic_network_matrix_after_event.csv");
+                        //jacobian.save_matrix_to_file("dynamic_jacobian_with_fault_after_event.csv");
+                    }
+                    else
+                    {
+                        osstream<<"Zero fault shunt is given for "<<lineptr->get_device_name()<<"."<<endl
+                               <<"No fault will be set for "<<lineptr->get_device_name()<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                    }
+                }
+                else
+                {
+                    osstream<<"Warning. Fault location ("<<location<<") is out of allowed range [0.0, 1.0] for "<<lineptr->get_device_name()<<"."<<endl
+                           <<"No fault will be set at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+            }
+            else
+            {
+                osstream<<lineptr->get_device_name()<<"is not connected to bus "<<side_bus<<endl
+                       <<"No fault will be set at location "<<location<<" to bus "<<side_bus<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
         }
-
-        if(location<0.0 or location>1.0)
+        else
         {
-            osstream<<"Warning. Fault location ("<<location<<") is out of allowed range [0.0, 1.0] for "<<lineptr->get_device_name()<<"."<<endl
+            osstream<<"Warning. "<<line_id.get_device_name()<<" does not exist in power system database."<<endl
                    <<"No fault will be set at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
             toolkit.show_information_with_leading_time_stamp(osstream);
-            return;
-        }
-
-        if(steps_fast_complex_abs(fault_shunt)<FLOAT_EPSILON)
-        {
-            osstream<<"Zero fault shunt is given for "<<lineptr->get_device_name()<<"."<<endl
-                   <<"No fault will be set for "<<lineptr->get_device_name()<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            return;
         }
-
-        FAULT fault;
-        fault.set_fault_type(THREE_PHASES_FAULT);
-        fault.set_fault_shunt_in_pu(fault_shunt);
-
-        osstream<<fault.get_fault_type_string()<<" will be set for "<<lineptr->get_device_name()<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl
-               <<"Fault shunt is "<<fault_shunt<<" pu at location "<<location<<" to bus "<<side_bus;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-
-
-        lineptr->set_fault(side_bus,location, fault);
-        guess_bus_voltage_with_line_fault_set(line_id, side_bus, location, fault);
-
-
-        //network_matrix.save_network_matrix_to_file("dynamic_network_matrix_before_event.csv");
-        //jacobian.save_matrix_to_file("dynamic_jacobian_with_fault_before_evnet.csv");
-        network_matrix.build_dynamic_network_matrix();
-        build_jacobian();
-        //network_matrix.save_network_matrix_to_file("dynamic_network_matrix_after_event.csv");
-        //jacobian.save_matrix_to_file("dynamic_jacobian_with_fault_after_event.csv");
-
     }
     else
     {
-        osstream<<"Warning. "<<line_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No fault will be set at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a LINE (it is a "<<line_id.get_device_type()<<") for setting line fault."<<endl
+               <<"No line fault will be set at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3038,51 +3067,55 @@ void DYNAMICS_SIMULATOR::clear_line_fault(const DEVICE_ID& line_id, size_t side_
 
     ostringstream osstream;
 
-    if(line_id.get_device_type()!="LINE")
-    {
-        osstream<<"The given device is not a LINE (it is a "<<line_id.get_device_type()<<") for clearing line fault."<<endl
-               <<"No line fault will be cleared at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    LINE* lineptr = psdb.get_line(line_id);
-    if(lineptr!=NULL)
+    if(line_id.get_device_type()=="LINE")
     {
-        if(not lineptr->is_connected_to_bus(side_bus))
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        LINE* lineptr = psdb.get_line(line_id);
+        if(lineptr!=NULL)
         {
-            osstream<<lineptr->get_device_name()<<"is not connected to bus "<<side_bus<<endl
-                   <<"No fault will be cleared at location "<<location<<" to bus "<<side_bus<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            return;
-        }
+            if(lineptr->is_connected_to_bus(side_bus))
+            {
+                if(location>=0.0 and location<=1.0)
+                {
+                    osstream<<"Fault at location "<<location<<" to bus "<<side_bus<<" will be cleared for "
+                           <<lineptr->get_device_name()<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
 
-        if(location<0.0 or location>1.0)
+                    FAULT fault = lineptr->get_fault_at_location(side_bus, location);
+                    lineptr->clear_fault_at_location(side_bus, location);
+                    guess_bus_voltage_with_line_fault_cleared(line_id, side_bus, location, fault);
+
+                    network_matrix.build_dynamic_network_matrix();
+                    build_jacobian();
+                    //const SPARSE_MATRIX& Y = network_matrix.get_dynamic_network_matrix();
+                    //Y.report_brief();
+                }
+                else
+                {
+                    osstream<<"Warning. Fault location ("<<location<<") is out of allowed range [0.0, 1.0] for "<<lineptr->get_device_name()<<"."<<endl
+                           <<"No fault will be cleared at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                    return;
+                }
+            }
+            else
+            {
+                osstream<<lineptr->get_device_name()<<"is not connected to bus "<<side_bus<<endl
+                       <<"No fault will be cleared at location "<<location<<" to bus "<<side_bus<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
         {
-            osstream<<"Warning. Fault location ("<<location<<") is out of allowed range [0.0, 1.0] for "<<lineptr->get_device_name()<<"."<<endl
+            osstream<<"Warning. "<<line_id.get_device_name()<<" does not exist in power system database."<<endl
                    <<"No fault will be cleared at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
             toolkit.show_information_with_leading_time_stamp(osstream);
-            return;
         }
-
-        osstream<<"Fault at location "<<location<<" to bus "<<side_bus<<" will be cleared for "
-               <<lineptr->get_device_name()<<" at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-
-        FAULT fault = lineptr->get_fault_at_location(side_bus, location);
-        lineptr->clear_fault_at_location(side_bus, location);
-        guess_bus_voltage_with_line_fault_cleared(line_id, side_bus, location, fault);
-
-        network_matrix.build_dynamic_network_matrix();
-        build_jacobian();
-        //const SPARSE_MATRIX& Y = network_matrix.get_dynamic_network_matrix();
-        //Y.report_brief();
     }
     else
     {
-        osstream<<"Warning. "<<line_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No fault will be cleared at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a LINE (it is a "<<line_id.get_device_type()<<") for clearing line fault."<<endl
+               <<"No line fault will be cleared at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3092,34 +3125,35 @@ void DYNAMICS_SIMULATOR::trip_line(const DEVICE_ID& line_id)
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     ostringstream osstream;
 
-    if(line_id.get_device_type()!="LINE")
-    {
-        osstream<<"The given device is not a LINE (it is a "<<line_id.get_device_type()<<") for tripping line."<<endl
-               <<"No line will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    LINE* lineptr = psdb.get_line(line_id);
-    if(lineptr!=NULL)
+    if(line_id.get_device_type()=="LINE")
     {
-        if(lineptr->get_sending_side_breaker_status()==true or lineptr->get_receiving_side_breaker_status()==true)
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        LINE* lineptr = psdb.get_line(line_id);
+        if(lineptr!=NULL)
         {
-            osstream<<lineptr->get_device_name()<<" is tripped by taking the following actions at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-            toolkit.show_information_with_leading_time_stamp(osstream);
+            if(lineptr->get_sending_side_breaker_status()==true or lineptr->get_receiving_side_breaker_status()==true)
+            {
+                osstream<<lineptr->get_device_name()<<" is tripped by taking the following actions at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
+                toolkit.show_information_with_leading_time_stamp(osstream);
 
-            if(lineptr->get_sending_side_breaker_status()==true)
-                trip_line_breaker(line_id, lineptr->get_sending_side_bus());
+                if(lineptr->get_sending_side_breaker_status()==true)
+                    trip_line_breaker(line_id, lineptr->get_sending_side_bus());
 
-            if(lineptr->get_receiving_side_breaker_status()==true)
-                trip_line_breaker(line_id, lineptr->get_receiving_side_bus());
+                if(lineptr->get_receiving_side_breaker_status()==true)
+                    trip_line_breaker(line_id, lineptr->get_receiving_side_bus());
+            }
+        }
+        else
+        {
+            osstream<<"Warning. "<<line_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No line will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<line_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No line will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a LINE (it is a "<<line_id.get_device_type()<<") for tripping line."<<endl
+               <<"No line will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3131,50 +3165,51 @@ void DYNAMICS_SIMULATOR::trip_line_breaker(const DEVICE_ID& line_id, size_t side
 
     ostringstream osstream;
 
-    if(line_id.get_device_type()!="LINE")
-    {
-        osstream<<"The given device is not a LINE (it is a "<<line_id.get_device_type()<<") for tripping line breaker."<<endl
-               <<"No line breaker will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    LINE* lineptr = psdb.get_line(line_id);
-    if(lineptr!=NULL)
+    if(line_id.get_device_type()=="LINE")
     {
-        if(lineptr->get_sending_side_bus()==side_bus)
-        {
-            if(lineptr->get_sending_side_breaker_status()==true)
-            {
-                lineptr->set_sending_side_breaker_status(false);
-                network_matrix.build_dynamic_network_matrix();
-                build_jacobian();
-
-                osstream<<lineptr->get_device_name()<<" breaker at sending side (bus "<<lineptr->get_sending_side_bus()<<") is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-            }
-        }
-        else
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        LINE* lineptr = psdb.get_line(line_id);
+        if(lineptr!=NULL)
         {
-            if(lineptr->get_receiving_side_bus()==side_bus)
+            if(lineptr->get_sending_side_bus()==side_bus)
             {
-                if(lineptr->get_receiving_side_breaker_status()==true)
+                if(lineptr->get_sending_side_breaker_status()==true)
                 {
-                    lineptr->set_receiving_side_breaker_status(false);
+                    lineptr->set_sending_side_breaker_status(false);
                     network_matrix.build_dynamic_network_matrix();
                     build_jacobian();
 
-                    osstream<<lineptr->get_device_name()<<" breaker at receiving side (bus "<<lineptr->get_receiving_side_bus()<<") is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                    osstream<<lineptr->get_device_name()<<" breaker at sending side (bus "<<lineptr->get_sending_side_bus()<<") is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
                     toolkit.show_information_with_leading_time_stamp(osstream);
                 }
             }
+            else
+            {
+                if(lineptr->get_receiving_side_bus()==side_bus)
+                {
+                    if(lineptr->get_receiving_side_breaker_status()==true)
+                    {
+                        lineptr->set_receiving_side_breaker_status(false);
+                        network_matrix.build_dynamic_network_matrix();
+                        build_jacobian();
+
+                        osstream<<lineptr->get_device_name()<<" breaker at receiving side (bus "<<lineptr->get_receiving_side_bus()<<") is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                    }
+                }
+            }
+        }
+        else
+        {
+            osstream<<"Warning. "<<line_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No line breaker will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<line_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No line breaker will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a LINE (it is a "<<line_id.get_device_type()<<") for tripping line breaker."<<endl
+               <<"No line breaker will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3184,34 +3219,35 @@ void DYNAMICS_SIMULATOR::close_line(const DEVICE_ID& line_id)
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     ostringstream osstream;
 
-    if(line_id.get_device_type()!="LINE")
-    {
-        osstream<<"The given device is not a LINE (it is a "<<line_id.get_device_type()<<") for closing line."<<endl
-               <<"No line will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    LINE* lineptr = psdb.get_line(line_id);
-    if(lineptr!=NULL)
+    if(line_id.get_device_type()=="LINE")
     {
-        if(lineptr->get_sending_side_breaker_status()==false or lineptr->get_receiving_side_breaker_status()==false)
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        LINE* lineptr = psdb.get_line(line_id);
+        if(lineptr!=NULL)
         {
-            osstream<<lineptr->get_device_name()<<" is closed by taking the following actions at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-            toolkit.show_information_with_leading_time_stamp(osstream);
+            if(lineptr->get_sending_side_breaker_status()==false or lineptr->get_receiving_side_breaker_status()==false)
+            {
+                osstream<<lineptr->get_device_name()<<" is closed by taking the following actions at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
+                toolkit.show_information_with_leading_time_stamp(osstream);
 
-            if(lineptr->get_sending_side_breaker_status()==false)
-                close_line_breaker(line_id, lineptr->get_sending_side_bus());
+                if(lineptr->get_sending_side_breaker_status()==false)
+                    close_line_breaker(line_id, lineptr->get_sending_side_bus());
 
-            if(lineptr->get_receiving_side_breaker_status()==false)
-                close_line_breaker(line_id, lineptr->get_receiving_side_bus());
+                if(lineptr->get_receiving_side_breaker_status()==false)
+                    close_line_breaker(line_id, lineptr->get_receiving_side_bus());
+            }
+        }
+        else
+        {
+            osstream<<"Warning. "<<line_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No line will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<line_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No line will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a LINE (it is a "<<line_id.get_device_type()<<") for closing line."<<endl
+               <<"No line will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3223,48 +3259,49 @@ void DYNAMICS_SIMULATOR::close_line_breaker(const DEVICE_ID& line_id, size_t sid
 
     ostringstream osstream;
 
-    if(line_id.get_device_type()!="LINE")
-    {
-        osstream<<"The given device is not a LINE (it is a "<<line_id.get_device_type()<<") for closing line breaker"<<endl
-               <<"No line breaker will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    LINE* lineptr = psdb.get_line(line_id);
-    if(lineptr!=NULL)
+    if(line_id.get_device_type()=="LINE")
     {
-        if(lineptr->get_sending_side_bus()==side_bus)
-        {
-            if(lineptr->get_sending_side_breaker_status()==false)
-            {
-                lineptr->set_sending_side_breaker_status(true);
-                network_matrix.build_dynamic_network_matrix();
-                build_jacobian();
-                osstream<<lineptr->get_device_name()<<" breaker at sending side (bus "<<lineptr->get_sending_side_bus()<<") is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-            }
-        }
-        else
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        LINE* lineptr = psdb.get_line(line_id);
+        if(lineptr!=NULL)
         {
-            if(lineptr->get_receiving_side_bus()==side_bus)
+            if(lineptr->get_sending_side_bus()==side_bus)
             {
-                if(lineptr->get_receiving_side_breaker_status()==false)
+                if(lineptr->get_sending_side_breaker_status()==false)
                 {
-                    lineptr->set_receiving_side_breaker_status(true);
+                    lineptr->set_sending_side_breaker_status(true);
                     network_matrix.build_dynamic_network_matrix();
                     build_jacobian();
-                    osstream<<lineptr->get_device_name()<<" breaker at receiving side (bus "<<lineptr->get_sending_side_bus()<<") is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                    osstream<<lineptr->get_device_name()<<" breaker at sending side (bus "<<lineptr->get_sending_side_bus()<<") is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
                     toolkit.show_information_with_leading_time_stamp(osstream);
                 }
             }
+            else
+            {
+                if(lineptr->get_receiving_side_bus()==side_bus)
+                {
+                    if(lineptr->get_receiving_side_breaker_status()==false)
+                    {
+                        lineptr->set_receiving_side_breaker_status(true);
+                        network_matrix.build_dynamic_network_matrix();
+                        build_jacobian();
+                        osstream<<lineptr->get_device_name()<<" breaker at receiving side (bus "<<lineptr->get_sending_side_bus()<<") is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                    }
+                }
+            }
+        }
+        else
+        {
+            osstream<<"Warning. "<<line_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No line breaker will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<line_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No line breaker will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a LINE (it is a "<<line_id.get_device_type()<<") for closing line breaker"<<endl
+               <<"No line breaker will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3274,38 +3311,39 @@ void DYNAMICS_SIMULATOR::trip_transformer(const DEVICE_ID& trans_id)
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     ostringstream osstream;
 
-    if(trans_id.get_device_type()!="TRANSFORMER")
-    {
-        osstream<<"The given device is not a TRANSFORMER (it is a "<<trans_id.get_device_type()<<") for tripping transformer."<<endl
-               <<"No transformer will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    TRANSFORMER* transptr = psdb.get_transformer(trans_id);
-    if(transptr!=NULL)
+    if(trans_id.get_device_type()=="TRANSFORMER")
     {
-        if(transptr->get_winding_breaker_status(PRIMARY_SIDE)==true or transptr->get_winding_breaker_status(SECONDARY_SIDE)==true or
-           (transptr->is_three_winding_transformer() and transptr->get_winding_breaker_status(TERTIARY_SIDE)==true) )
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        TRANSFORMER* transptr = psdb.get_transformer(trans_id);
+        if(transptr!=NULL)
         {
-            osstream<<transptr->get_device_name()<<" is tripped by taking the following actions at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-            toolkit.show_information_with_leading_time_stamp(osstream);
+            if(transptr->get_winding_breaker_status(PRIMARY_SIDE)==true or transptr->get_winding_breaker_status(SECONDARY_SIDE)==true or
+               (transptr->is_three_winding_transformer() and transptr->get_winding_breaker_status(TERTIARY_SIDE)==true) )
+            {
+                osstream<<transptr->get_device_name()<<" is tripped by taking the following actions at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
+                toolkit.show_information_with_leading_time_stamp(osstream);
 
-            if(transptr->get_winding_breaker_status(PRIMARY_SIDE)==true)
-                trip_transformer_breaker(trans_id, transptr->get_winding_bus(PRIMARY_SIDE));
+                if(transptr->get_winding_breaker_status(PRIMARY_SIDE)==true)
+                    trip_transformer_breaker(trans_id, transptr->get_winding_bus(PRIMARY_SIDE));
 
-            if(transptr->get_winding_breaker_status(SECONDARY_SIDE)==true)
-                trip_transformer_breaker(trans_id, transptr->get_winding_bus(SECONDARY_SIDE));
+                if(transptr->get_winding_breaker_status(SECONDARY_SIDE)==true)
+                    trip_transformer_breaker(trans_id, transptr->get_winding_bus(SECONDARY_SIDE));
 
-            if(transptr->is_three_winding_transformer() and transptr->get_winding_breaker_status(TERTIARY_SIDE)==true)
-                trip_transformer_breaker(trans_id, transptr->get_winding_bus(TERTIARY_SIDE));
+                if(transptr->is_three_winding_transformer() and transptr->get_winding_breaker_status(TERTIARY_SIDE)==true)
+                    trip_transformer_breaker(trans_id, transptr->get_winding_bus(TERTIARY_SIDE));
+            }
+        }
+        else
+        {
+            osstream<<"Warning. "<<trans_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No transformer will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<trans_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No transformer will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a TRANSFORMER (it is a "<<trans_id.get_device_type()<<") for tripping transformer."<<endl
+               <<"No transformer will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3317,67 +3355,69 @@ void DYNAMICS_SIMULATOR::trip_transformer_breaker(const DEVICE_ID& trans_id, siz
 
     ostringstream osstream;
 
-    if(trans_id.get_device_type()!="TRANSFORMER")
-    {
-        osstream<<"The given device is not a TRANSFORMER (it is a "<<trans_id.get_device_type()<<") for tripping transformer breaker."<<endl
-               <<"No transformer breaker will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    TRANSFORMER* transptr = psdb.get_transformer(trans_id);
-    if(transptr!=NULL)
+    if(trans_id.get_device_type()=="TRANSFORMER")
     {
-        if(transptr->get_winding_bus(PRIMARY_SIDE)==side_bus)
-        {
-            if(transptr->get_winding_breaker_status(PRIMARY_SIDE)==true)
-            {
-                transptr->set_winding_breaker_status(PRIMARY_SIDE, false);
-                network_matrix.build_dynamic_network_matrix();
-                build_jacobian();
-
-                osstream<<transptr->get_device_name()<<" breaker at primary side (bus "<<side_bus<<") is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-            }
-        }
-        else
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        TRANSFORMER* transptr = psdb.get_transformer(trans_id);
+        if(transptr!=NULL)
         {
-            if(transptr->get_winding_bus(SECONDARY_SIDE)==side_bus)
+            if(transptr->get_winding_bus(PRIMARY_SIDE)==side_bus)
             {
-                if(transptr->get_winding_breaker_status(SECONDARY_SIDE)==true)
+                if(transptr->get_winding_breaker_status(PRIMARY_SIDE)==true)
                 {
-                    transptr->set_winding_breaker_status(SECONDARY_SIDE, false);
+                    transptr->set_winding_breaker_status(PRIMARY_SIDE, false);
                     network_matrix.build_dynamic_network_matrix();
                     build_jacobian();
 
-                    osstream<<transptr->get_device_name()<<" breaker at secondary side (bus "<<side_bus<<") is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                    osstream<<transptr->get_device_name()<<" breaker at primary side (bus "<<side_bus<<") is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
                     toolkit.show_information_with_leading_time_stamp(osstream);
                 }
             }
             else
             {
-                if(transptr->is_three_winding_transformer() and transptr->get_winding_bus(TERTIARY_SIDE)==side_bus)
+                if(transptr->get_winding_bus(SECONDARY_SIDE)==side_bus)
                 {
-                    if(transptr->get_winding_breaker_status(TERTIARY_SIDE)==true)
+                    if(transptr->get_winding_breaker_status(SECONDARY_SIDE)==true)
                     {
-                        transptr->set_winding_breaker_status(TERTIARY_SIDE, false);
+                        transptr->set_winding_breaker_status(SECONDARY_SIDE, false);
                         network_matrix.build_dynamic_network_matrix();
                         build_jacobian();
 
-                        osstream<<transptr->get_device_name()<<" breaker at tertiary side (bus "<<side_bus<<") is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                        osstream<<transptr->get_device_name()<<" breaker at secondary side (bus "<<side_bus<<") is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
                         toolkit.show_information_with_leading_time_stamp(osstream);
                     }
                 }
+                else
+                {
+                    if(transptr->is_three_winding_transformer() and transptr->get_winding_bus(TERTIARY_SIDE)==side_bus)
+                    {
+                        if(transptr->get_winding_breaker_status(TERTIARY_SIDE)==true)
+                        {
+                            transptr->set_winding_breaker_status(TERTIARY_SIDE, false);
+                            network_matrix.build_dynamic_network_matrix();
+                            build_jacobian();
+
+                            osstream<<transptr->get_device_name()<<" breaker at tertiary side (bus "<<side_bus<<") is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                    }
 
+                }
             }
         }
+        else
+        {
+            osstream<<"Warning. "<<trans_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No transformer breaker will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
     else
     {
-        osstream<<"Warning. "<<trans_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No transformer breaker will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a TRANSFORMER (it is a "<<trans_id.get_device_type()<<") for tripping transformer breaker."<<endl
+               <<"No transformer breaker will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
+        return;
     }
 }
 
@@ -3386,38 +3426,39 @@ void DYNAMICS_SIMULATOR::close_transformer(const DEVICE_ID& trans_id)
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     ostringstream osstream;
 
-    if(trans_id.get_device_type()!="TRANSFORMER")
-    {
-        osstream<<"The given device is not a TRANSFORMER (it is a "<<trans_id.get_device_type()<<") for closing transformer."<<endl
-               <<"No transformer will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    TRANSFORMER* transptr = psdb.get_transformer(trans_id);
-    if(transptr!=NULL)
+    if(trans_id.get_device_type()=="TRANSFORMER")
     {
-        if(transptr->get_winding_breaker_status(PRIMARY_SIDE)==false or transptr->get_winding_breaker_status(SECONDARY_SIDE)==false or
-           (transptr->is_three_winding_transformer() and transptr->get_winding_breaker_status(TERTIARY_SIDE)==false))
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        TRANSFORMER* transptr = psdb.get_transformer(trans_id);
+        if(transptr!=NULL)
         {
-            osstream<<transptr->get_device_name()<<" is closed by taking the following actions at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-            toolkit.show_information_with_leading_time_stamp(osstream);
+            if(transptr->get_winding_breaker_status(PRIMARY_SIDE)==false or transptr->get_winding_breaker_status(SECONDARY_SIDE)==false or
+               (transptr->is_three_winding_transformer() and transptr->get_winding_breaker_status(TERTIARY_SIDE)==false))
+            {
+                osstream<<transptr->get_device_name()<<" is closed by taking the following actions at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
+                toolkit.show_information_with_leading_time_stamp(osstream);
 
-            if(transptr->get_winding_breaker_status(PRIMARY_SIDE)==false)
-                close_transformer_breaker(trans_id, transptr->get_winding_bus(PRIMARY_SIDE));
+                if(transptr->get_winding_breaker_status(PRIMARY_SIDE)==false)
+                    close_transformer_breaker(trans_id, transptr->get_winding_bus(PRIMARY_SIDE));
 
-            if(transptr->get_winding_breaker_status(SECONDARY_SIDE)==false)
-                close_transformer_breaker(trans_id, transptr->get_winding_bus(SECONDARY_SIDE));
+                if(transptr->get_winding_breaker_status(SECONDARY_SIDE)==false)
+                    close_transformer_breaker(trans_id, transptr->get_winding_bus(SECONDARY_SIDE));
 
-            if(transptr->is_three_winding_transformer() and transptr->get_winding_breaker_status(TERTIARY_SIDE)==false)
-                close_transformer_breaker(trans_id, transptr->get_winding_bus(TERTIARY_SIDE));
+                if(transptr->is_three_winding_transformer() and transptr->get_winding_breaker_status(TERTIARY_SIDE)==false)
+                    close_transformer_breaker(trans_id, transptr->get_winding_bus(TERTIARY_SIDE));
+            }
+        }
+        else
+        {
+            osstream<<"Warning. "<<trans_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No transformer will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<trans_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No transformer will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a TRANSFORMER (it is a "<<trans_id.get_device_type()<<") for closing transformer."<<endl
+               <<"No transformer will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3429,62 +3470,63 @@ void DYNAMICS_SIMULATOR::close_transformer_breaker(const DEVICE_ID& trans_id, si
 
     ostringstream osstream;
 
-    if(trans_id.get_device_type()!="TRANSFORMER")
-    {
-        osstream<<"The given device is not a TRANSFORMER (it is a "<<trans_id.get_device_type()<<") for closing transformer breaker"<<endl
-               <<"No transformer breaker will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    TRANSFORMER* transptr = psdb.get_transformer(trans_id);
-    if(transptr!=NULL)
+    if(trans_id.get_device_type()=="TRANSFORMER")
     {
-        if(transptr->get_winding_bus(PRIMARY_SIDE)==side_bus)
-        {
-            if(transptr->get_winding_breaker_status(PRIMARY_SIDE)==false)
-            {
-                transptr->set_winding_breaker_status(PRIMARY_SIDE, true);
-                network_matrix.build_dynamic_network_matrix();
-                build_jacobian();
-                osstream<<transptr->get_device_name()<<" breaker at primary side (bus "<<side_bus<<") is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-            }
-        }
-        else
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        TRANSFORMER* transptr = psdb.get_transformer(trans_id);
+        if(transptr!=NULL)
         {
-            if(transptr->get_winding_bus(SECONDARY_SIDE)==side_bus)
+            if(transptr->get_winding_bus(PRIMARY_SIDE)==side_bus)
             {
-                if(transptr->get_winding_breaker_status(SECONDARY_SIDE)==false)
+                if(transptr->get_winding_breaker_status(PRIMARY_SIDE)==false)
                 {
-                    transptr->set_winding_breaker_status(SECONDARY_SIDE, true);
+                    transptr->set_winding_breaker_status(PRIMARY_SIDE, true);
                     network_matrix.build_dynamic_network_matrix();
                     build_jacobian();
-                    osstream<<transptr->get_device_name()<<" breaker at secondary side (bus "<<side_bus<<") is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                    osstream<<transptr->get_device_name()<<" breaker at primary side (bus "<<side_bus<<") is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
                     toolkit.show_information_with_leading_time_stamp(osstream);
                 }
             }
             else
             {
-                if(transptr->is_three_winding_transformer() and transptr->get_winding_bus(TERTIARY_SIDE)==side_bus)
+                if(transptr->get_winding_bus(SECONDARY_SIDE)==side_bus)
                 {
-                    if(transptr->get_winding_breaker_status(TERTIARY_SIDE)==false)
+                    if(transptr->get_winding_breaker_status(SECONDARY_SIDE)==false)
                     {
-                        transptr->set_winding_breaker_status(TERTIARY_SIDE, true);
+                        transptr->set_winding_breaker_status(SECONDARY_SIDE, true);
                         network_matrix.build_dynamic_network_matrix();
                         build_jacobian();
                         osstream<<transptr->get_device_name()<<" breaker at secondary side (bus "<<side_bus<<") is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
                         toolkit.show_information_with_leading_time_stamp(osstream);
                     }
                 }
+                else
+                {
+                    if(transptr->is_three_winding_transformer() and transptr->get_winding_bus(TERTIARY_SIDE)==side_bus)
+                    {
+                        if(transptr->get_winding_breaker_status(TERTIARY_SIDE)==false)
+                        {
+                            transptr->set_winding_breaker_status(TERTIARY_SIDE, true);
+                            network_matrix.build_dynamic_network_matrix();
+                            build_jacobian();
+                            osstream<<transptr->get_device_name()<<" breaker at secondary side (bus "<<side_bus<<") is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                            toolkit.show_information_with_leading_time_stamp(osstream);
+                        }
+                    }
+                }
             }
         }
+        else
+        {
+            osstream<<"Warning. "<<trans_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No transformer breaker will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
+        }
     }
     else
     {
-        osstream<<"Warning. "<<trans_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No transformer breaker will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a TRANSFORMER (it is a "<<trans_id.get_device_type()<<") for closing transformer breaker"<<endl
+               <<"No transformer breaker will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3496,33 +3538,34 @@ void DYNAMICS_SIMULATOR::trip_generator(const DEVICE_ID& gen_id)
 
     ostringstream osstream;
 
-    if(gen_id.get_device_type()!="GENERATOR")
-    {
-        osstream<<"The given device is not a GENERATOR (it is a "<<gen_id.get_device_type()<<") for tripping generator."<<endl
-               <<"No generator will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    GENERATOR* generator = psdb.get_generator(gen_id);
-    if(generator!=NULL)
+    if(gen_id.get_device_type()=="GENERATOR")
     {
-        if(generator->get_status()==true)
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        GENERATOR* generator = psdb.get_generator(gen_id);
+        if(generator!=NULL)
         {
-            generator->set_status(false);
+            if(generator->get_status()==true)
+            {
+                generator->set_status(false);
 
-            network_matrix.build_dynamic_network_matrix();
-            build_jacobian();
+                network_matrix.build_dynamic_network_matrix();
+                build_jacobian();
 
-            osstream<<generator->get_device_name()<<" is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                osstream<<generator->get_device_name()<<" is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. "<<gen_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No generator will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
             toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<gen_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No generator will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a GENERATOR (it is a "<<gen_id.get_device_type()<<") for tripping generator."<<endl
+               <<"No generator will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3534,41 +3577,43 @@ void DYNAMICS_SIMULATOR::shed_generator(const DEVICE_ID& gen_id,double percent)
 
     ostringstream osstream;
 
-    if(gen_id.get_device_type()!="GENERATOR")
+    if(gen_id.get_device_type()=="GENERATOR")
     {
-        osstream<<"The given device is not a GENERATOR (it is a "<<gen_id.get_device_type()<<") for relay generator."<<endl
-               <<"No generator will be shed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        GENERATOR* generator = psdb.get_generator(gen_id);
+        if(generator!=NULL)
+        {
+            if(fabs(percent)>FLOAT_EPSILON)
+            {
+                double mbase = generator->get_mbase_in_MVA();
+                osstream<<generator->get_device_name()<<" is shed by "<<percent*100.0<<"% at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl
+                  <<"MBASE is changed from "<<mbase<<" MVA to ";
 
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    GENERATOR* generator = psdb.get_generator(gen_id);
-    if(generator!=NULL)
-    {
-        if(fabs(percent)<FLOAT_EPSILON)
+                generator->set_mbase_in_MVA(mbase*(1.0-percent));
+                osstream<<generator->get_mbase_in_MVA()<<" MVA.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+
+                network_matrix.build_dynamic_network_matrix();
+                build_jacobian();
+            }
+            else
+            {
+                osstream<<"Generator relay percent is 0.0 for "<<generator->get_device_name()<<endl
+                       <<"No generator will be shed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
         {
-            osstream<<"Generator relay percent is 0.0 for "<<generator->get_device_name()<<endl
-                   <<"No generator will be shed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
+            osstream<<"Warning. "<<gen_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No generator will be shed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
             toolkit.show_information_with_leading_time_stamp(osstream);
-            return;
         }
-
-        double mbase = generator->get_mbase_in_MVA();
-        osstream<<generator->get_device_name()<<" is shed by "<<percent*100.0<<"% at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl
-          <<"MBASE is changed from "<<mbase<<" MVA to ";
-
-        generator->set_mbase_in_MVA(mbase*(1.0-percent));
-        osstream<<generator->get_mbase_in_MVA()<<" MVA.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-
-        network_matrix.build_dynamic_network_matrix();
-        build_jacobian();
     }
     else
     {
-        osstream<<"Warning. "<<gen_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No generator will be shed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a GENERATOR (it is a "<<gen_id.get_device_type()<<") for relay generator."<<endl
+               <<"No generator will be shed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3581,52 +3626,55 @@ void DYNAMICS_SIMULATOR::trip_wt_generator(const DEVICE_ID& gen_id, size_t n)
 
     ostringstream osstream;
 
-    if(gen_id.get_device_type()!="WT GENERATOR")
-    {
-        osstream<<"The given device is not a WT GENERATOR (it is a "<<gen_id.get_device_type()<<") for tripping wt generator."<<endl
-               <<"No wt generator will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    WT_GENERATOR* generator = psdb.get_wt_generator(gen_id);
-    if(generator!=NULL)
+    if(gen_id.get_device_type()=="WT GENERATOR")
     {
-        if(generator->get_status()==true)
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        WT_GENERATOR* generator = psdb.get_wt_generator(gen_id);
+        if(generator!=NULL)
         {
-            if(n==0)
-            {
-                osstream<<n<<" = 0, and no individual generators of "<<generator->get_device_name()<<" will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-                return;
-            }
-            size_t N = generator->get_number_of_lumped_wt_generators();
-            if(n<N)
+            if(generator->get_status()==true)
             {
-                generator->set_number_of_lumped_wt_generators(N-n);
-                double mbase = generator->get_mbase_in_MVA();
-                generator->set_mbase_in_MVA(mbase/N*(N-n));
+                if(n!=0)
+                {
+                    size_t N = generator->get_number_of_lumped_wt_generators();
+                    if(n<N)
+                    {
+                        generator->set_number_of_lumped_wt_generators(N-n);
+                        double mbase = generator->get_mbase_in_MVA();
+                        generator->set_mbase_in_MVA(mbase/N*(N-n));
 
-                osstream<<n<<" individual generators of "<<generator->get_device_name()<<" are tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-            }
-            else
-            {
-                generator->set_status(false);
+                        osstream<<n<<" individual generators of "<<generator->get_device_name()<<" are tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                    }
+                    else
+                    {
+                        generator->set_status(false);
 
-                osstream<<"All individual generators of "<<generator->get_device_name()<<" are tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
-                toolkit.show_information_with_leading_time_stamp(osstream);
-            }
+                        osstream<<"All individual generators of "<<generator->get_device_name()<<" are tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                        toolkit.show_information_with_leading_time_stamp(osstream);
+                    }
 
-            network_matrix.build_dynamic_network_matrix();
-            build_jacobian();
+                    network_matrix.build_dynamic_network_matrix();
+                    build_jacobian();
+                }
+                else
+                {
+                    osstream<<n<<" = 0, and no individual generators of "<<generator->get_device_name()<<" will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+            }
+        }
+        else
+        {
+            osstream<<"Warning. "<<gen_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No wt generator will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+            toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<gen_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No wt generator will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a WT GENERATOR (it is a "<<gen_id.get_device_type()<<") for tripping wt generator."<<endl
+               <<"No wt generator will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3638,33 +3686,34 @@ void DYNAMICS_SIMULATOR::trip_load(const DEVICE_ID& load_id)
 
     ostringstream osstream;
 
-    if(load_id.get_device_type()!="LOAD")
-    {
-        osstream<<"The given device is not a LOAD (it is a "<<load_id.get_device_type()<<") for tripping load."<<endl
-               <<"No load will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    LOAD* load = psdb.get_load(load_id);
-    if(load!=NULL)
+    if(load_id.get_device_type()=="LOAD")
     {
-        if(load->get_status()==true)
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        LOAD* load = psdb.get_load(load_id);
+        if(load!=NULL)
         {
-            load->set_status(false);
+            if(load->get_status()==true)
+            {
+                load->set_status(false);
 
-            network_matrix.build_dynamic_network_matrix();
-            build_jacobian();
+                network_matrix.build_dynamic_network_matrix();
+                build_jacobian();
 
-            osstream<<load->get_device_name()<<" is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                osstream<<load->get_device_name()<<" is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. "<<load_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No load will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
             toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<load_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No load will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a LOAD (it is a "<<load_id.get_device_type()<<") for tripping load."<<endl
+               <<"No load will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3676,33 +3725,34 @@ void DYNAMICS_SIMULATOR::close_load(const DEVICE_ID& load_id)
 
     ostringstream osstream;
 
-    if(load_id.get_device_type()!="LOAD")
-    {
-        osstream<<"The given device is not a LOAD (it is a "<<load_id.get_device_type()<<") for closing load."<<endl
-               <<"No load will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    LOAD* load = psdb.get_load(load_id);
-    if(load!=NULL)
+    if(load_id.get_device_type()=="LOAD")
     {
-        if(load->get_status()==false)
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        LOAD* load = psdb.get_load(load_id);
+        if(load!=NULL)
         {
-            load->set_status(true);
+            if(load->get_status()==false)
+            {
+                load->set_status(true);
 
-            network_matrix.build_dynamic_network_matrix();
-            build_jacobian();
+                network_matrix.build_dynamic_network_matrix();
+                build_jacobian();
 
-            osstream<<load->get_device_name()<<" is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                osstream<<load->get_device_name()<<" is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. "<<load_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No load will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
             toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<load_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No load will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a LOAD (it is a "<<load_id.get_device_type()<<") for closing load."<<endl
+               <<"No load will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3712,44 +3762,47 @@ void DYNAMICS_SIMULATOR::scale_load(const DEVICE_ID& load_id, double percent)
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     ostringstream osstream;
 
-    if(load_id.get_device_type()!="LOAD")
+    if(load_id.get_device_type()=="LOAD")
     {
-        osstream<<"The given device is not a LOAD (it is a "<<load_id.get_device_type()<<") for scaling load."<<endl
-               <<"No single load will be scaled at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    LOAD* load = psdb.get_load(load_id);
-    if(load!=NULL)
-    {
-        if(fabs(percent)<FLOAT_EPSILON)
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        LOAD* load = psdb.get_load(load_id);
+        if(load!=NULL)
         {
-            osstream<<"Load scaling percent is 0.0 for "<<load->get_device_name()<<endl
-                   <<"No load will be scaled at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-            toolkit.show_information_with_leading_time_stamp(osstream);
-            return;
-        }
-
-        if(load->get_status()==true)
-        {
-            osstream<<load->get_device_name()<<" is manually scaled "<<(percent>0.0?"up":"down")<<" by "<<percent*100.0<<"% at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-            double scale = load->get_load_manually_scale_factor_in_pu();
-            load->set_load_manually_scale_factor_in_pu(scale+percent);
-            osstream<<"Load manual scale is changed from "<<scale<<" to "<<scale+percent<<".";
-            toolkit.show_information_with_leading_time_stamp(osstream);
+            if(fabs(percent)>FLOAT_EPSILON)
+            {
+                if(load->get_status()==true)
+                {
+                    osstream<<load->get_device_name()<<" is manually scaled "<<(percent>0.0?"up":"down")<<" by "<<percent*100.0<<"% at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
+                    double scale = load->get_load_manually_scale_factor_in_pu();
+                    load->set_load_manually_scale_factor_in_pu(scale+percent);
+                    osstream<<"Load manual scale is changed from "<<scale<<" to "<<scale+percent<<".";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+                else
+                {
+                    osstream<<load->get_device_name()<<" is out of service. No load scale action can be applied at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                    toolkit.show_information_with_leading_time_stamp(osstream);
+                }
+            }
+            else
+            {
+                osstream<<"Load scaling percent is 0.0 for "<<load->get_device_name()<<endl
+                       <<"No load will be scaled at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
+                toolkit.show_information_with_leading_time_stamp(osstream);
+                return;
+            }
         }
         else
         {
-            osstream<<load->get_device_name()<<" is out of service. No load scale action can be applied at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+            osstream<<"Warning. "<<load_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No load will be scaled at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
             toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<load_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No load will be scaled at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a LOAD (it is a "<<load_id.get_device_type()<<") for scaling load."<<endl
+               <<"No single load will be scaled at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3758,30 +3811,39 @@ void DYNAMICS_SIMULATOR::scale_all_load(double percent)
 {
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     ostringstream osstream;
-    if(fabs(percent)<FLOAT_EPSILON)
+    if(fabs(percent)>FLOAT_EPSILON)
     {
-        osstream<<"Load scaling percent is 0.0."<<endl
-               <<"No all load will be scaled at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        /*vector<DEVICE_ID> loads = psdb.get_all_loads_device_id();
+        DEVICE_ID load;
+        size_t n = loads.size();
+        for(size_t i=0; i!=n; ++i)
+        {
+            load = loads[i];
+            LOAD* loadptr = psdb.get_load(load);
+            if(loadptr==NULL)
+                continue;
 
-    vector<DEVICE_ID> loads = psdb.get_all_loads_device_id();
-    DEVICE_ID load;
-    size_t n = loads.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        load = loads[i];
-        LOAD* loadptr = psdb.get_load(load);
-        if(loadptr==NULL)
-            continue;
+            if(loadptr->get_status()==false)
+                continue;
 
-        if(loadptr->get_status()==false)
-            continue;
+            scale_load(load, percent);
+        }*/
+        vector<LOAD*> loads = psdb.get_all_loads();
+        size_t n = loads.size();
+        for(size_t i=0; i!=n; ++i)
+        {
+            if(loads[i]->get_status()==true)
+                scale_load(loads[i]->get_device_id(), percent);
+        }
 
-        scale_load(load, percent);
+    }
+    else
+    {
+        osstream<<"Load scaling percent is 0.0."<<endl
+               <<"No all load will be scaled at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
+        toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
 
@@ -3793,33 +3855,34 @@ void DYNAMICS_SIMULATOR::trip_fixed_shunt(const DEVICE_ID& shunt_id)
 
     ostringstream osstream;
 
-    if(shunt_id.get_device_type()!="FIXED SHUNT")
-    {
-        osstream<<"The given device is not a FIXED SHUNT (it is a "<<shunt_id.get_device_type()<<") for tripping fixed shunt."<<endl
-               <<"No fixed shunt will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    FIXED_SHUNT* shunt = psdb.get_fixed_shunt(shunt_id);
-    if(shunt!=NULL)
+    if(shunt_id.get_device_type()=="FIXED SHUNT")
     {
-        if(shunt->get_status()==true)
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        FIXED_SHUNT* shunt = psdb.get_fixed_shunt(shunt_id);
+        if(shunt!=NULL)
         {
-            shunt->set_status(false);
+            if(shunt->get_status()==true)
+            {
+                shunt->set_status(false);
 
-            network_matrix.build_dynamic_network_matrix();
-            build_jacobian();
+                network_matrix.build_dynamic_network_matrix();
+                build_jacobian();
 
-            osstream<<shunt->get_device_name()<<" is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                osstream<<shunt->get_device_name()<<" is tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. "<<shunt_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No fixed shunt will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
             toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<shunt_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No fixed shunt will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a FIXED SHUNT (it is a "<<shunt_id.get_device_type()<<") for tripping fixed shunt."<<endl
+               <<"No fixed shunt will be tripped at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3831,33 +3894,34 @@ void DYNAMICS_SIMULATOR::close_fixed_shunt(const DEVICE_ID& shunt_id)
 
     ostringstream osstream;
 
-    if(shunt_id.get_device_type()!="FIXED SHUNT")
-    {
-        osstream<<"The given device is not a FIXED SHUNT (it is a "<<shunt_id.get_device_type()<<") for closing fixed shunt."<<endl
-               <<"No fixed shunt will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    FIXED_SHUNT* shunt = psdb.get_fixed_shunt(shunt_id);
-    if(shunt!=NULL)
+    if(shunt_id.get_device_type()=="FIXED SHUNT")
     {
-        if(shunt->get_status()==false)
+        POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
+        FIXED_SHUNT* shunt = psdb.get_fixed_shunt(shunt_id);
+        if(shunt!=NULL)
         {
-            shunt->set_status(true);
+            if(shunt->get_status()==false)
+            {
+                shunt->set_status(true);
 
-            network_matrix.build_dynamic_network_matrix();
-            build_jacobian();
+                network_matrix.build_dynamic_network_matrix();
+                build_jacobian();
 
-            osstream<<shunt->get_device_name()<<" is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                osstream<<shunt->get_device_name()<<" is closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+                toolkit.show_information_with_leading_time_stamp(osstream);
+            }
+        }
+        else
+        {
+            osstream<<"Warning. "<<shunt_id.get_device_name()<<" does not exist in power system database."<<endl
+                   <<"No fixed shunt will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
             toolkit.show_information_with_leading_time_stamp(osstream);
         }
     }
     else
     {
-        osstream<<"Warning. "<<shunt_id.get_device_name()<<" does not exist in power system database."<<endl
-               <<"No fixed shunt will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s.";
+        osstream<<"The given device is not a FIXED SHUNT (it is a "<<shunt_id.get_device_type()<<") for closing fixed shunt."<<endl
+               <<"No fixed shunt will be closed at time "<<toolkit.get_dynamic_simulation_time_in_s()<<" s."<<endl;
         toolkit.show_information_with_leading_time_stamp(osstream);
     }
 }
@@ -3873,13 +3937,8 @@ void DYNAMICS_SIMULATOR::manual_bypass_hvdc(const DEVICE_ID& hvdc_id)
     if(hvdc!=NULL)
     {
         HVDC_MODEL* model = hvdc->get_hvdc_model();
-        if(model!=NULL)
-        {
-            if(not model->is_blocked() and not model->is_bypassed())
-            {
-                model->manual_bypass_hvdc();
-            }
-        }
+        if(model!=NULL and (not model->is_blocked() and not model->is_bypassed()) )
+            model->manual_bypass_hvdc();
     }
 }
 
@@ -3893,13 +3952,8 @@ void DYNAMICS_SIMULATOR::manual_unbypass_hvdc(const DEVICE_ID& hvdc_id)
     if(hvdc!=NULL)
     {
         HVDC_MODEL* model = hvdc->get_hvdc_model();
-        if(model!=NULL)
-        {
-            if(not model->is_blocked() and model->is_manual_bypassed())
-            {
-                model->manual_unbypass_hvdc();
-            }
-        }
+        if(model!=NULL and (not model->is_blocked() and model->is_manual_bypassed()))
+            model->manual_unbypass_hvdc();
     }
 }
 
@@ -3913,13 +3967,8 @@ void DYNAMICS_SIMULATOR::manual_block_hvdc(const DEVICE_ID& hvdc_id)
     if(hvdc!=NULL)
     {
         HVDC_MODEL* model = hvdc->get_hvdc_model();
-        if(model!=NULL)
-        {
-            if(not model->is_blocked())
-            {
-                model->manual_block_hvdc();
-            }
-        }
+        if(model!=NULL and (not model->is_blocked()))
+            model->manual_block_hvdc();
     }
 }
 
@@ -3933,13 +3982,8 @@ void DYNAMICS_SIMULATOR::manual_unblock_hvdc(const DEVICE_ID& hvdc_id)
     if(hvdc!=NULL)
     {
         HVDC_MODEL* model = hvdc->get_hvdc_model();
-        if(model!=NULL)
-        {
-            if(model->is_manual_blocked())
-            {
-                model->manual_unblock_hvdc();
-            }
-        }
+        if(model!=NULL and model->is_manual_blocked())
+            model->manual_unblock_hvdc();
     }
 }
 
diff --git a/code/source/toolkit/powerflow_case_generator/powerflow_case_generator.cpp b/code/source/toolkit/powerflow_case_generator/powerflow_case_generator.cpp
index d3f1b434..cfc7763d 100644
--- a/code/source/toolkit/powerflow_case_generator/powerflow_case_generator.cpp
+++ b/code/source/toolkit/powerflow_case_generator/powerflow_case_generator.cpp
@@ -160,15 +160,12 @@ void POWERFLOW_CASE_GENERATOR::generate_case_with_load_random(vector<double> loa
     // increase load
     vector<LOAD*> loads = psdb.get_all_loads();
     size_t nload = loads.size();
-    LOAD* load;
-    double scale;
     for(size_t i=0; i!=nload; ++i)
     {
-        load = loads[i];
-        if(load->get_status()==true)
+        if(loads[i]->get_status()==true)
         {
-            scale = load_randoms[i];
-            psdb.scale_load_power(load->get_device_id(), scale);
+            double scale = load_randoms[i];
+            psdb.scale_load_power(loads[i]->get_device_id(), scale);
         }
     }
 
@@ -178,7 +175,6 @@ void POWERFLOW_CASE_GENERATOR::generate_case_with_load_random(vector<double> loa
     double uniform_load_scale = get_uniform_load_scale();
     Ploss *= (1.0+uniform_load_scale);
 
-
     vector<GENERATOR*> generators = psdb.get_all_generators();
     size_t nsource = generators.size();
     GENERATOR* generator;
@@ -188,11 +184,8 @@ void POWERFLOW_CASE_GENERATOR::generate_case_with_load_random(vector<double> loa
 
     bool load_level_exceeds_max_generation = false;
 
-    while(true)
+    while(fabs(uniform_gen_scale)>1e-4)
     {
-        if(fabs(uniform_gen_scale)<1e-4)
-            break;
-
         for(size_t i=0; i!=nsource; ++i)
         {
             generator = generators[i];
@@ -236,8 +229,7 @@ void POWERFLOW_CASE_GENERATOR::generate_case_with_load_random(vector<double> loa
     string randoms_info = psdb.get_case_additional_information()+"  PS:LOAD RANDOMS ARE: ";
     for(size_t i=0; i!=nload; ++i)
     {
-        load = loads[i];
-        scale = load_randoms[i];
+        double scale = load_randoms[i];
         randoms_info += num2str(scale)+"  ";
     }
 
diff --git a/code/source/toolkit/powerflow_solver/powerflow_solver.cpp b/code/source/toolkit/powerflow_solver/powerflow_solver.cpp
index 86c681c7..d2d6757d 100644
--- a/code/source/toolkit/powerflow_solver/powerflow_solver.cpp
+++ b/code/source/toolkit/powerflow_solver/powerflow_solver.cpp
@@ -98,10 +98,10 @@ void POWERFLOW_SOLVER::set_transformer_tap_adjustment_logic(bool logic)
 
 void POWERFLOW_SOLVER::set_iteration_accelerator(double iter_alpha)
 {
-    if(iter_alpha<=0.0)
-        this->alpha = 1.0;
-    else
+    if(iter_alpha>0.0)
         this->alpha = iter_alpha;
+    else
+        this->alpha = 1.0;
 }
 
 void POWERFLOW_SOLVER::set_non_divergent_solution_logic(bool logic)
@@ -153,222 +153,222 @@ void POWERFLOW_SOLVER::solve_with_full_Newton_Raphson_solution()
 {
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    if(psdb.get_bus_count()==0)
-        return;
-
-    char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
-    snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Start solve powerflow with Full Newton Raphson solution.");
-    toolkit.show_information_with_leading_time_stamp(buffer);
+    if(psdb.get_bus_count()!=0)
+    {
+        char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
+        snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Start solve powerflow with Full Newton Raphson solution.");
+        toolkit.show_information_with_leading_time_stamp(buffer);
 
-    initialize_powerflow_solver();
+        initialize_powerflow_solver();
 
-    NETWORK_MATRIX& network_matrix = get_network_matrix();
+        NETWORK_MATRIX& network_matrix = get_network_matrix();
 
-    double max_P_mismatch_in_MW, max_Q_mismatch_in_MW;
-    vector<double> bus_power_mismatch, bus_delta_voltage_angle;
-/*    JACOBIAN_BUILDER jacobian_builder;
-    jacobian_builder.set_toolkit(toolkit);
+        double max_P_mismatch_in_MW, max_Q_mismatch_in_MW;
+        vector<double> bus_power_mismatch, bus_delta_voltage_angle;
+    /*    JACOBIAN_BUILDER jacobian_builder;
+        jacobian_builder.set_toolkit(toolkit);
 
-    jacobian_builder.set_network_matrix(network_matrix);
-*/
-    network_matrix.build_network_matrix();
-    //network_matrix.report_network_matrix();
+        jacobian_builder.set_network_matrix(network_matrix);
+    */
+        network_matrix.build_network_matrix();
+        //network_matrix.report_network_matrix();
 
-    update_P_and_Q_equation_internal_buses();
-    jacobian_builder.build_seprate_jacobians();
-    //jacobian_builder.show_seprate_jacobians();
+        update_P_and_Q_equation_internal_buses();
+        jacobian_builder.build_seprate_jacobians();
+        //jacobian_builder.show_seprate_jacobians();
 
-    while(true)
-    {
-        char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
-        snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Iteration %lu:",iteration_count);
-        toolkit.show_information_with_leading_time_stamp(buffer);
+        while(true)
+        {
+            char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
+            snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Iteration %lu:",iteration_count);
+            toolkit.show_information_with_leading_time_stamp(buffer);
 
-        try_to_solve_hvdc_steady_state();
+            try_to_solve_hvdc_steady_state();
 
-        calculate_raw_bus_power_mismatch();
+            calculate_raw_bus_power_mismatch();
 
-        max_P_mismatch_in_MW = get_maximum_active_power_mismatch_in_MW();
-        max_Q_mismatch_in_MW = get_maximum_reactive_power_mismatch_in_MVar();
+            max_P_mismatch_in_MW = get_maximum_active_power_mismatch_in_MW();
+            max_Q_mismatch_in_MW = get_maximum_reactive_power_mismatch_in_MVar();
 
 
-        bool bus_type_changed = check_bus_type_constraints();
+            bool bus_type_changed = check_bus_type_constraints();
 
-        if(bus_type_changed)
-        {
-            update_P_and_Q_equation_internal_buses();
+            if(bus_type_changed)
+            {
+                update_P_and_Q_equation_internal_buses();
 
-            calculate_raw_bus_power_mismatch();
+                calculate_raw_bus_power_mismatch();
 
-            max_P_mismatch_in_MW = get_maximum_active_power_mismatch_in_MW();
-            max_Q_mismatch_in_MW = get_maximum_reactive_power_mismatch_in_MVar();
-        }
-        if(max_P_mismatch_in_MW < get_allowed_max_active_power_imbalance_in_MW() and
-           max_Q_mismatch_in_MW < get_allowed_max_reactive_power_imbalance_in_MVar())
-        {
-            set_convergence_flag(true);
+                max_P_mismatch_in_MW = get_maximum_active_power_mismatch_in_MW();
+                max_Q_mismatch_in_MW = get_maximum_reactive_power_mismatch_in_MVar();
+            }
+            if(max_P_mismatch_in_MW < get_allowed_max_active_power_imbalance_in_MW() and
+               max_Q_mismatch_in_MW < get_allowed_max_reactive_power_imbalance_in_MVar())
+            {
+                set_convergence_flag(true);
 
-            snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Powerflow converged within %lu iterations.",iteration_count);
-            toolkit.show_information_with_leading_time_stamp(buffer);
-            break;
-        }
-        else
-            set_convergence_flag(false);
+                snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Powerflow converged within %lu iterations.",iteration_count);
+                toolkit.show_information_with_leading_time_stamp(buffer);
+                break;
+            }
+            else
+                set_convergence_flag(false);
 
-        if(get_iteration_count()>=get_max_iteration())
-        {
-            snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Powerflow failed to converge within %lu iterations.",get_max_iteration());
-            toolkit.show_information_with_leading_time_stamp(buffer);
-            break;
-        }
+            if(get_iteration_count()>=get_max_iteration())
+            {
+                snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Powerflow failed to converge within %lu iterations.",get_max_iteration());
+                toolkit.show_information_with_leading_time_stamp(buffer);
+                break;
+            }
 
-        bus_power_mismatch = get_bus_power_mismatch_vector_for_coupled_solution();
+            bus_power_mismatch = get_bus_power_mismatch_vector_for_coupled_solution();
 
-        jacobian_builder.update_seprate_jacobians();
+            jacobian_builder.update_seprate_jacobians();
 
-        jacobian = jacobian_builder.get_full_coupled_jacobian_with_P_and_Q_equation_internal_buses(internal_P_equation_buses,
-                                                                                                   internal_Q_equation_buses);
+            jacobian = jacobian_builder.get_full_coupled_jacobian_with_P_and_Q_equation_internal_buses(internal_P_equation_buses,
+                                                                                                       internal_Q_equation_buses);
 
-        if(get_export_jacobian_matrix_step_by_step_logic()==true)
-        {
-            jacobian.save_matrix_to_file("Jacobian-NR-Iter-"+num2str(get_iteration_count())+".csv");
-        }
-        bus_delta_voltage_angle = bus_power_mismatch/jacobian;
+            if(get_export_jacobian_matrix_step_by_step_logic()==true)
+            {
+                jacobian.save_matrix_to_file("Jacobian-NR-Iter-"+num2str(get_iteration_count())+".csv");
+            }
+            bus_delta_voltage_angle = bus_power_mismatch/jacobian;
 
-        update_bus_voltage_and_angle(bus_delta_voltage_angle);
+            update_bus_voltage_and_angle(bus_delta_voltage_angle);
 
-		++iteration_count;
-    }
-    show_powerflow_result();
+            ++iteration_count;
+        }
+        show_powerflow_result();
+    }
 }
 
 void POWERFLOW_SOLVER::solve_with_fast_decoupled_solution()
 {
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    if(psdb.get_bus_count()==0)
-        return;
-
-    char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
-    snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Start solve powerflow with Fast Decoupled solution.");
-    toolkit.show_information_with_leading_time_stamp(buffer);
-
-    initialize_powerflow_solver();
-
-    NETWORK_MATRIX& network_matrix = get_network_matrix();
+    if(psdb.get_bus_count()!=0)
+    {
+        char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
+        snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Start solve powerflow with Fast Decoupled solution.");
+        toolkit.show_information_with_leading_time_stamp(buffer);
 
-    double max_P_mismatch_in_MW, max_Q_mismatch_in_MW;
-    vector<double> P_power_mismatch, Q_power_mismatch, bus_delta_voltage, bus_delta_angle;
-/*    JACOBIAN_BUILDER jacobian_builder;
-    jacobian_builder.set_toolkit(toolkit);
+        initialize_powerflow_solver();
 
-    jacobian_builder.set_network_matrix(network_matrix);
-*/
-    network_matrix.build_network_matrix();
+        NETWORK_MATRIX& network_matrix = get_network_matrix();
 
-    network_matrix.build_decoupled_network_matrix();
-    //const SPARSE_MATRIX& Y = network_matrix.get_network_matrix();
-    //cout<<"Y matrix identity is: "<<get_sparse_matrix_identity(Y)<<endl;
+        double max_P_mismatch_in_MW, max_Q_mismatch_in_MW;
+        vector<double> P_power_mismatch, Q_power_mismatch, bus_delta_voltage, bus_delta_angle;
+    /*    JACOBIAN_BUILDER jacobian_builder;
+        jacobian_builder.set_toolkit(toolkit);
 
-    update_P_and_Q_equation_internal_buses();
-    BP = jacobian_builder.get_decoupled_B_jacobian_with_P_equation_internal_buses(internal_P_equation_buses);
-    BQ = jacobian_builder.get_decoupled_B_jacobian_with_Q_equation_internal_buses(internal_Q_equation_buses);
-    //BP.LU_factorization(1, 1e-6);
-    //BQ.LU_factorization(1, 1e-6);
-    //BP.report_brief();
-    //BQ.report_brief();
+        jacobian_builder.set_network_matrix(network_matrix);
+    */
+        network_matrix.build_network_matrix();
 
-    size_t physical_bus;
+        network_matrix.build_decoupled_network_matrix();
+        //const SPARSE_MATRIX& Y = network_matrix.get_network_matrix();
+        //cout<<"Y matrix identity is: "<<get_sparse_matrix_identity(Y)<<endl;
 
-    while(true)
-    {
+        update_P_and_Q_equation_internal_buses();
+        BP = jacobian_builder.get_decoupled_B_jacobian_with_P_equation_internal_buses(internal_P_equation_buses);
+        BQ = jacobian_builder.get_decoupled_B_jacobian_with_Q_equation_internal_buses(internal_Q_equation_buses);
+        //BP.LU_factorization(1, 1e-6);
+        //BQ.LU_factorization(1, 1e-6);
+        //BP.report_brief();
+        //BQ.report_brief();
 
-        char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
-        snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Iteration %lu:",iteration_count);
-        toolkit.show_information_with_leading_time_stamp(buffer);
+        size_t physical_bus;
 
-        try_to_solve_hvdc_steady_state();
+        while(true)
+        {
 
-        calculate_raw_bus_power_mismatch();
-        max_P_mismatch_in_MW = get_maximum_active_power_mismatch_in_MW();
-        max_Q_mismatch_in_MW = get_maximum_reactive_power_mismatch_in_MVar();
+            char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
+            snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Iteration %lu:",iteration_count);
+            toolkit.show_information_with_leading_time_stamp(buffer);
 
-        bool bus_type_changed = check_bus_type_constraints();
-        if(bus_type_changed)
-        {
-            update_P_and_Q_equation_internal_buses();
-            //BP = jacobian_builder.get_decoupled_B_jacobian_with_P_equation_internal_buses(internal_P_equation_buses);
-            BQ = jacobian_builder.get_decoupled_B_jacobian_with_Q_equation_internal_buses(internal_Q_equation_buses);
-            BQ.LU_factorization(1, 1e-6);
+            try_to_solve_hvdc_steady_state();
 
             calculate_raw_bus_power_mismatch();
             max_P_mismatch_in_MW = get_maximum_active_power_mismatch_in_MW();
             max_Q_mismatch_in_MW = get_maximum_reactive_power_mismatch_in_MVar();
-            //continue;
-        }
 
-        if(get_export_jacobian_matrix_step_by_step_logic()==true)
-        {
-            BP.save_matrix_to_file("Jacobian-BP-PQ-Iter-"+num2str(get_iteration_count())+".csv");
-            BQ.save_matrix_to_file("Jacobian-BQ-PQ-Iter-"+num2str(get_iteration_count())+".csv");
-        }
+            bool bus_type_changed = check_bus_type_constraints();
+            if(bus_type_changed)
+            {
+                update_P_and_Q_equation_internal_buses();
+                //BP = jacobian_builder.get_decoupled_B_jacobian_with_P_equation_internal_buses(internal_P_equation_buses);
+                BQ = jacobian_builder.get_decoupled_B_jacobian_with_Q_equation_internal_buses(internal_Q_equation_buses);
+                BQ.LU_factorization(1, 1e-6);
+
+                calculate_raw_bus_power_mismatch();
+                max_P_mismatch_in_MW = get_maximum_active_power_mismatch_in_MW();
+                max_Q_mismatch_in_MW = get_maximum_reactive_power_mismatch_in_MVar();
+                //continue;
+            }
 
-        if(max_P_mismatch_in_MW < get_allowed_max_active_power_imbalance_in_MW() and
-           max_Q_mismatch_in_MW < get_allowed_max_reactive_power_imbalance_in_MVar())
-        {
-            set_convergence_flag(true);
+            if(get_export_jacobian_matrix_step_by_step_logic()==true)
+            {
+                BP.save_matrix_to_file("Jacobian-BP-PQ-Iter-"+num2str(get_iteration_count())+".csv");
+                BQ.save_matrix_to_file("Jacobian-BQ-PQ-Iter-"+num2str(get_iteration_count())+".csv");
+            }
+
+            if(max_P_mismatch_in_MW < get_allowed_max_active_power_imbalance_in_MW() and
+               max_Q_mismatch_in_MW < get_allowed_max_reactive_power_imbalance_in_MVar())
+            {
+                set_convergence_flag(true);
 
-            snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Powerflow converged within %lu iterations.",iteration_count);
-            toolkit.show_information_with_leading_time_stamp(buffer);
-            break;
-        }
-        else
-            set_convergence_flag(false);
+                snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Powerflow converged within %lu iterations.",iteration_count);
+                toolkit.show_information_with_leading_time_stamp(buffer);
+                break;
+            }
+            else
+                set_convergence_flag(false);
 
-        if(get_iteration_count()>=get_max_iteration())
-        {
-            snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Powerflow failed to converge within %lu iterations.",get_max_iteration());
-            toolkit.show_information_with_leading_time_stamp(buffer);
-            break;
-        }
+            if(get_iteration_count()>=get_max_iteration())
+            {
+                snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Powerflow failed to converge within %lu iterations.",get_max_iteration());
+                toolkit.show_information_with_leading_time_stamp(buffer);
+                break;
+            }
 
-        P_power_mismatch = get_bus_P_power_mismatch_vector_for_decoupled_solution();
-        size_t n = internal_P_equation_buses.size();
-        for(size_t i=0; i!=n; ++i)
-        {
-            physical_bus = network_matrix.get_physical_bus_number_of_internal_bus(internal_P_equation_buses[i]);
-            P_power_mismatch[i] /= psdb.get_bus_voltage_in_pu(physical_bus);
-        }
-        bus_delta_angle = P_power_mismatch/BP;
-        //BP.report_brief();
-        //for(size_t i=0; i<P_power_mismatch.size(); i++)
-        //    cout<<i<<","<<P_power_mismatch[i]<<endl;
-        //for(size_t i=0; i<internal_P_equation_buses.size(); ++i)
-        //{
-        //    cout<<bus_delta_angle[i]<<endl;
-        //    //bus_delta_angle[i] /= abs(psdb.get_bus_complex_voltage_in_pu(network_matrix.get_physical_bus_number_of_internal_bus(internal_P_equation_buses[i])));
-        //}
-        update_bus_angle(bus_delta_angle);
-
-        calculate_raw_bus_power_mismatch();
-
-        max_P_mismatch_in_MW = get_maximum_active_power_mismatch_in_MW();
-        max_Q_mismatch_in_MW = get_maximum_reactive_power_mismatch_in_MVar();
-
-        Q_power_mismatch = get_bus_Q_power_mismatch_vector_for_decoupled_solution();
-        n = internal_Q_equation_buses.size();
-        for(size_t i=0; i!=n; ++i)
-        {
-            physical_bus = network_matrix.get_physical_bus_number_of_internal_bus(internal_Q_equation_buses[i]);
-            Q_power_mismatch[i] /= psdb.get_bus_voltage_in_pu(physical_bus);
-        }
-        bus_delta_voltage = Q_power_mismatch/BQ;
+            P_power_mismatch = get_bus_P_power_mismatch_vector_for_decoupled_solution();
+            size_t n = internal_P_equation_buses.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                physical_bus = network_matrix.get_physical_bus_number_of_internal_bus(internal_P_equation_buses[i]);
+                P_power_mismatch[i] /= psdb.get_bus_voltage_in_pu(physical_bus);
+            }
+            bus_delta_angle = P_power_mismatch/BP;
+            //BP.report_brief();
+            //for(size_t i=0; i<P_power_mismatch.size(); i++)
+            //    cout<<i<<","<<P_power_mismatch[i]<<endl;
+            //for(size_t i=0; i<internal_P_equation_buses.size(); ++i)
+            //{
+            //    cout<<bus_delta_angle[i]<<endl;
+            //    //bus_delta_angle[i] /= abs(psdb.get_bus_complex_voltage_in_pu(network_matrix.get_physical_bus_number_of_internal_bus(internal_P_equation_buses[i])));
+            //}
+            update_bus_angle(bus_delta_angle);
 
-        update_bus_voltage(bus_delta_voltage);
+            calculate_raw_bus_power_mismatch();
 
-        iteration_count ++;
-    }
-    show_powerflow_result();
+            max_P_mismatch_in_MW = get_maximum_active_power_mismatch_in_MW();
+            max_Q_mismatch_in_MW = get_maximum_reactive_power_mismatch_in_MVar();
+
+            Q_power_mismatch = get_bus_Q_power_mismatch_vector_for_decoupled_solution();
+            n = internal_Q_equation_buses.size();
+            for(size_t i=0; i!=n; ++i)
+            {
+                physical_bus = network_matrix.get_physical_bus_number_of_internal_bus(internal_Q_equation_buses[i]);
+                Q_power_mismatch[i] /= psdb.get_bus_voltage_in_pu(physical_bus);
+            }
+            bus_delta_voltage = Q_power_mismatch/BQ;
+
+            update_bus_voltage(bus_delta_voltage);
+
+            iteration_count ++;
+        }
+        show_powerflow_result();
+    }
 }
 
 void POWERFLOW_SOLVER::solve_with_modified_Gaussian_Seidel_solution()
@@ -409,27 +409,37 @@ void POWERFLOW_SOLVER::initialize_bus_type()
 {
     STEPS& toolkit = get_toolkit(__PRETTY_FUNCTION__);
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
-    bool flat_flag = get_flat_start_logic();
 
     vector<BUS*> buses = psdb.get_all_buses();
-
     size_t nbus = buses.size();
+
+    if(get_flat_start_logic()==true)
+    {
+        for(size_t i=0; i!=nbus; ++i)
+        {
+            BUS_TYPE btype = buses[i]->get_bus_type();
+            if(btype == PV_TO_PQ_TYPE_1 or btype == PV_TO_PQ_TYPE_2 or
+               btype == PV_TO_PQ_TYPE_3 or btype == PV_TO_PQ_TYPE_4)
+                buses[i]->set_bus_type(PV_TYPE);
+        }
+    }
+
     for(size_t i=0; i!=nbus; ++i)
     {
         BUS_TYPE btype = buses[i]->get_bus_type();
-        if(flat_flag==true)
-            if(btype == PV_TO_PQ_TYPE_1 or btype == PV_TO_PQ_TYPE_2 or
-               btype == PV_TO_PQ_TYPE_3 or btype == PV_TO_PQ_TYPE_4)
-                buses[i]->set_bus_type(PV_TYPE);
         if(btype==PV_TYPE)
         {
             vector<SOURCE*> sources = psdb.get_sources_connecting_to_bus(buses[i]->get_bus_number());
             size_t nsource = sources.size();
             size_t n_inservice = 0;
             for(size_t j=0; j!=nsource; ++j)
-                if(sources[j]->get_status()==true)
-                    n_inservice++;
-            if(n_inservice==0)
+            {
+                if(sources[j]->get_status()==true)
+                  ++n_inservice;
+            }
+            if(n_inservice!=0)
+                ;
+            else
                 buses[i]->set_bus_type(PQ_TYPE);
         }
     }
@@ -442,18 +452,18 @@ void POWERFLOW_SOLVER::initialize_bus_voltage_to_regulate()
     vector<SOURCE*> sources = psdb.get_all_sources();
     size_t nsource = sources.size();
     for(size_t i=0; i!=nsource; ++i)
-    {
-        if(sources[i]->get_status()==false)
-            continue;
-
-        double qmax = sources[i]->get_q_max_in_MVar();
-        double qmin = sources[i]->get_q_min_in_MVar();
-        if(qmax!=qmin)
-        {
-            size_t bus = sources[i]->get_bus_to_regulate();
-            double vreg = sources[i]->get_voltage_to_regulate_in_pu();
-            BUS* busptr = psdb.get_bus(bus);
-            busptr->set_voltage_to_regulate_in_pu(vreg);
+    {
+        if(sources[i]->get_status()==true)
+        {
+            double qmax = sources[i]->get_q_max_in_MVar();
+            double qmin = sources[i]->get_q_min_in_MVar();
+            if(qmax!=qmin)
+            {
+                size_t bus = sources[i]->get_bus_to_regulate();
+                double vreg = sources[i]->get_voltage_to_regulate_in_pu();
+                BUS* busptr = psdb.get_bus(bus);
+                busptr->set_voltage_to_regulate_in_pu(vreg);
+            }
         }
     }
     vector<BUS*> buses = psdb.get_all_buses();
@@ -461,7 +471,9 @@ void POWERFLOW_SOLVER::initialize_bus_voltage_to_regulate()
     for(size_t i=0; i!=nbus; ++i)
     {
         BUS_TYPE btype = buses[i]->get_bus_type();
-        if(btype!=PQ_TYPE and  btype!=OUT_OF_SERVICE)
+        if(btype==PQ_TYPE or btype==OUT_OF_SERVICE)
+            continue;
+        else // PV, SLACK
         {
             if(fabs(buses[i]->get_voltage_to_regulate_in_pu())<FLOAT_EPSILON)
                 buses[i]->set_voltage_to_regulate_in_pu(1.0);
@@ -481,17 +493,18 @@ void POWERFLOW_SOLVER::initialize_bus_voltage()
 
     if(get_flat_start_logic()==true)
     {
-        BUS_TYPE btype;
         for(size_t i=0; i!=nbus; ++i)
         {
-            btype = buses[i]->get_bus_type();
-            if(btype == OUT_OF_SERVICE)
-                continue;
-
-            if(btype==PQ_TYPE)
-                buses[i]->set_voltage_in_pu(1.0);
-            else
-                buses[i]->set_voltage_in_pu(buses[i]->get_voltage_to_regulate_in_pu());
+            switch(buses[i]->get_bus_type())
+            {
+                case PQ_TYPE:
+                    buses[i]->set_voltage_in_pu(1.0);
+                    break;
+                case OUT_OF_SERVICE:
+                    continue;
+                default:
+                    buses[i]->set_voltage_in_pu(buses[i]->get_voltage_to_regulate_in_pu());
+            }
 
             buses[i]->set_angle_in_rad(0.0);
         }
@@ -502,8 +515,7 @@ void POWERFLOW_SOLVER::initialize_bus_voltage()
     toolkit.show_information_with_leading_time_stamp(buffer);
     snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "bus      voltage(pu) angle(deg)");
     toolkit.show_information_with_leading_time_stamp(buffer);
-    if(nbus>200)
-        nbus = 200;
+    nbus = nbus>200 ? 200 : nbus;
     for(size_t i=0; i!=nbus; ++i)
     {
         snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "%8lu %10.6f %10.6f",
@@ -626,7 +638,7 @@ void POWERFLOW_SOLVER::try_to_solve_hvdc_steady_state()
     size_t nhvdc = hvdcs.size();
     for(size_t i=0; i!=nhvdc; ++i)
     {
-        if(hvdcs[i]->get_status() == true)
+        if(hvdcs[i]->get_status()==true)
         {
             hvdcs[i]->solve_steady_state();
             //hvdcs[i]->show_solved_hvdc_steady_state();
@@ -790,41 +802,34 @@ void POWERFLOW_SOLVER::add_source_to_bus_power_mismatch()
 
     double Sbase = psdb.get_system_base_power_in_MVA();
 
-    size_t physical_bus, internal_bus;
-
-    bool status;
-
-    BUS_TYPE btype;
-
-    complex<double> Sgen;
-
     vector<SOURCE*> sources = psdb.get_all_sources();
 
-    BUS* busptr;
-
     size_t nsource = sources.size();
 
     for(size_t i=0; i!=nsource; ++i)
     {
-        status = sources[i]->get_status();
-        if(status == false)
-            continue;
-
-        physical_bus = sources[i]->get_source_bus();
-
-        busptr = psdb.get_bus(physical_bus);
+        if(sources[i]->get_status() == true)
+        {
+            size_t physical_bus = sources[i]->get_source_bus();
 
-        btype = busptr->get_bus_type();
-        if(btype == OUT_OF_SERVICE or btype == SLACK_TYPE)
-            continue;
+            BUS* busptr = psdb.get_bus(physical_bus);
 
-        if(btype == PV_TYPE)
-            Sgen = complex<double>(sources[i]->get_p_generation_in_MW(), 0.0);
-        else// PQ, PV2PQ
-            Sgen = complex<double>(sources[i]->get_p_generation_in_MW(), sources[i]->get_q_generation_in_MVar());
-
-        internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
-        bus_power[internal_bus] += (Sgen/Sbase);
+            complex<double> Sgen;
+            switch(busptr->get_bus_type())
+            {
+                case PV_TYPE:
+                    Sgen = complex<double>(sources[i]->get_p_generation_in_MW(), 0.0);
+                    break;
+                case OUT_OF_SERVICE:
+                case SLACK_TYPE:
+                    continue;
+                default:// PQ, PV2PQ
+                    Sgen = complex<double>(sources[i]->get_p_generation_in_MW(), sources[i]->get_q_generation_in_MVar());
+                    break;
+            }
+            size_t internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
+            bus_power[internal_bus] += (Sgen/Sbase);
+        }
     }
 }
 
@@ -838,8 +843,6 @@ void POWERFLOW_SOLVER::add_load_to_bus_power_mismatch()
 
     size_t physical_bus, internal_bus;
 
-    bool status;
-
     vector<LOAD*> loads = psdb.get_all_loads();
 
     size_t nload = loads.size();
@@ -848,16 +851,15 @@ void POWERFLOW_SOLVER::add_load_to_bus_power_mismatch()
 
     for(size_t i=0; i!=nload; ++i)
     {
-        status = loads[i]->get_status();
-        if(status == false)
-            continue;
-
-        physical_bus = loads[i]->get_load_bus();
-        internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
+        if(loads[i]->get_status() == true)
+        {
+            physical_bus = loads[i]->get_load_bus();
+            internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
 
-        Sload = loads[i]->get_actual_total_load_in_MVA()/Sbase;
+            Sload = loads[i]->get_actual_total_load_in_MVA()/Sbase;
 
-        bus_power[internal_bus] -= Sload;
+            bus_power[internal_bus] -= Sload;
+        }
     }
 }
 
@@ -872,8 +874,6 @@ void POWERFLOW_SOLVER::add_hvdc_to_bus_power_mismatch()
     size_t physical_bus_rec, internal_bus_rec,
            physical_bus_inv, internal_bus_inv;
 
-    bool status;
-
     vector<HVDC*> hvdcs = psdb.get_all_hvdcs();
 
     size_t nhvdc = hvdcs.size();
@@ -882,28 +882,27 @@ void POWERFLOW_SOLVER::add_hvdc_to_bus_power_mismatch()
 
     for(size_t i=0; i!=nhvdc; ++i)
     {
-        status = hvdcs[i]->get_status();
-        if(status == false)
-            continue;
-
-        physical_bus_rec = hvdcs[i]->get_converter_bus(RECTIFIER);
-        internal_bus_rec = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus_rec);
+        if(hvdcs[i]->get_status() == true)
+        {
+            physical_bus_rec = hvdcs[i]->get_converter_bus(RECTIFIER);
+            internal_bus_rec = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus_rec);
 
-        physical_bus_inv = hvdcs[i]->get_converter_bus(INVERTER);
-        internal_bus_inv = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus_inv);
+            physical_bus_inv = hvdcs[i]->get_converter_bus(INVERTER);
+            internal_bus_inv = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus_inv);
 
-        //hvdcs[i]->solve_steady_state();
-        //hvdcs[i]->show_solved_hvdc_steady_state();
+            //hvdcs[i]->solve_steady_state();
+            //hvdcs[i]->show_solved_hvdc_steady_state();
 
-        S_rec = complex<double>(hvdcs[i]->get_converter_ac_active_power_in_MW(RECTIFIER), hvdcs[i]->get_converter_ac_reactive_power_in_MVar(RECTIFIER));
-        S_inv = complex<double>(hvdcs[i]->get_converter_ac_active_power_in_MW(INVERTER), -hvdcs[i]->get_converter_ac_reactive_power_in_MVar(INVERTER));
+            S_rec = complex<double>(hvdcs[i]->get_converter_ac_active_power_in_MW(RECTIFIER), hvdcs[i]->get_converter_ac_reactive_power_in_MVar(RECTIFIER));
+            S_inv = complex<double>(hvdcs[i]->get_converter_ac_active_power_in_MW(INVERTER), -hvdcs[i]->get_converter_ac_reactive_power_in_MVar(INVERTER));
 
-        //ostringstream osstream;
-        //osstream<<hvdcs[i]->get_device_name()<<": Srec = "<<S_rec<<" MVA, Sinv = "<<S_inv<<" MVA."<<endl;
-        //show_information_with_leading_time_stamp(osstream);
+            //ostringstream osstream;
+            //osstream<<hvdcs[i]->get_device_name()<<": Srec = "<<S_rec<<" MVA, Sinv = "<<S_inv<<" MVA."<<endl;
+            //show_information_with_leading_time_stamp(osstream);
 
-        bus_power[internal_bus_rec] -= S_rec/Sbase;
-        bus_power[internal_bus_inv] += S_inv/Sbase;
+            bus_power[internal_bus_rec] -= S_rec/Sbase;
+            bus_power[internal_bus_inv] += S_inv/Sbase;
+        }
     }
 }
 
@@ -921,7 +920,9 @@ double POWERFLOW_SOLVER::get_maximum_active_power_mismatch_in_MW() const
     for(size_t i=0; i!=nP; ++i)
     {
         internal_bus = internal_P_equation_buses[i];
-        if(fabs(bus_power[internal_bus].real()) > max_P_error_in_pu)
+        if(fabs(bus_power[internal_bus].real()) < max_P_error_in_pu)
+            continue;
+        else
         {
             physical_bus = network_matrix.get_physical_bus_number_of_internal_bus(internal_bus);
             max_P_error_in_pu = fabs(bus_power[internal_bus].real());
@@ -953,7 +954,9 @@ double POWERFLOW_SOLVER::get_maximum_reactive_power_mismatch_in_MVar() const
     for(size_t i=0; i!=nQ; ++i)
     {
         internal_bus = internal_Q_equation_buses[i];
-        if(fabs(bus_power[internal_bus].imag()) > max_Q_error_in_pu)
+        if(fabs(bus_power[internal_bus].imag()) < max_Q_error_in_pu)
+            continue;
+        else
         {
             physical_bus = network_matrix.get_physical_bus_number_of_internal_bus(internal_bus);
             max_Q_error_in_pu = fabs(bus_power[internal_bus].imag());
@@ -1028,40 +1031,40 @@ void POWERFLOW_SOLVER::check_SLACK_bus_constraint_of_physical_bus(size_t physica
 
     BUS* bus = psdb.get_bus(physical_bus);
 
-    if(bus->get_bus_type()!=SLACK_TYPE)
-        return;
+    if(bus->get_bus_type()==SLACK_TYPE)
+    {
+        size_t internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
 
-    size_t internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
+        double sbase = psdb.get_system_base_power_in_MVA();
+        double bus_P_mismatch_in_MW = -bus_power[internal_bus].real()*sbase;
+        double bus_Q_mismatch_in_MVar = -bus_power[internal_bus].imag()*sbase;
 
-    double sbase = psdb.get_system_base_power_in_MVA();
-    double bus_P_mismatch_in_MW = -bus_power[internal_bus].real()*sbase;
-    double bus_Q_mismatch_in_MVar = -bus_power[internal_bus].imag()*sbase;
+        double total_p_max_in_MW = psdb.get_regulatable_p_max_at_physical_bus_in_MW(physical_bus);
+        double total_p_min_in_MW = psdb.get_regulatable_p_min_at_physical_bus_in_MW(physical_bus);
+        double total_q_max_in_MVar = psdb.get_regulatable_q_max_at_physical_bus_in_MVar(physical_bus);
+        double total_q_min_in_MVar = psdb.get_regulatable_q_min_at_physical_bus_in_MVar(physical_bus);
 
-    double total_p_max_in_MW = psdb.get_regulatable_p_max_at_physical_bus_in_MW(physical_bus);
-    double total_p_min_in_MW = psdb.get_regulatable_p_min_at_physical_bus_in_MW(physical_bus);
-    double total_q_max_in_MVar = psdb.get_regulatable_q_max_at_physical_bus_in_MVar(physical_bus);
-    double total_q_min_in_MVar = psdb.get_regulatable_q_min_at_physical_bus_in_MVar(physical_bus);
+        double P_loading_percentage = (bus_P_mismatch_in_MW-total_p_min_in_MW);
+            P_loading_percentage /= (total_p_max_in_MW - total_p_min_in_MW);
+        double Q_loading_percentage = (bus_Q_mismatch_in_MVar-total_q_min_in_MVar);
+            Q_loading_percentage /= (total_q_max_in_MVar - total_q_min_in_MVar);
 
-    double P_loading_percentage = (bus_P_mismatch_in_MW-total_p_min_in_MW);
-        P_loading_percentage /= (total_p_max_in_MW - total_p_min_in_MW);
-    double Q_loading_percentage = (bus_Q_mismatch_in_MVar-total_q_min_in_MVar);
-        Q_loading_percentage /= (total_q_max_in_MVar - total_q_min_in_MVar);
-
-    vector<SOURCE*> sources = psdb.get_sources_connecting_to_bus(physical_bus);
-    size_t n;
-    n = sources.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        if(sources[i]->get_status() == false)
-            continue;
-
-        double P_loading_in_MW = sources[i]->get_p_max_in_MW() - sources[i]->get_p_min_in_MW();
-        P_loading_in_MW = P_loading_in_MW*P_loading_percentage + sources[i]->get_p_min_in_MW();
-        sources[i]->set_p_generation_in_MW(P_loading_in_MW);
+        vector<SOURCE*> sources = psdb.get_sources_connecting_to_bus(physical_bus);
+        size_t n;
+        n = sources.size();
+        for(size_t i=0; i!=n; ++i)
+        {
+            if(sources[i]->get_status() == true)
+            {
+                double P_loading_in_MW = sources[i]->get_p_max_in_MW() - sources[i]->get_p_min_in_MW();
+                P_loading_in_MW = P_loading_in_MW*P_loading_percentage + sources[i]->get_p_min_in_MW();
+                sources[i]->set_p_generation_in_MW(P_loading_in_MW);
 
-        double Q_loading_in_MVar = sources[i]->get_q_max_in_MVar() - sources[i]->get_q_min_in_MVar();
-        Q_loading_in_MVar = Q_loading_in_MVar*Q_loading_percentage + sources[i]->get_q_min_in_MVar();
-        sources[i]->set_q_generation_in_MVar(Q_loading_in_MVar);
+                double Q_loading_in_MVar = sources[i]->get_q_max_in_MVar() - sources[i]->get_q_min_in_MVar();
+                Q_loading_in_MVar = Q_loading_in_MVar*Q_loading_percentage + sources[i]->get_q_min_in_MVar();
+                sources[i]->set_q_generation_in_MVar(Q_loading_in_MVar);
+            }
+        }
     }
 }
 
@@ -1073,71 +1076,74 @@ bool POWERFLOW_SOLVER::check_PV_bus_constraint_of_physical_bus(size_t physical_b
 
     BUS* bus = psdb.get_bus(physical_bus);
 
-    if(bus->get_bus_type()!=PV_TYPE)
-        return false;
-
-    char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
+    if(bus->get_bus_type()==PV_TYPE)
+    {
+        char buffer[MAX_TEMP_CHAR_BUFFER_SIZE];
 
-    bool bus_type_changed = false;
-    size_t internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
+        bool bus_type_changed = false;
+        size_t internal_bus = network_matrix.get_internal_bus_number_of_physical_bus(physical_bus);
 
-    double bus_Q_mismatch_in_MVar = -bus_power[internal_bus].imag()*psdb.get_system_base_power_in_MVA();
+        double bus_Q_mismatch_in_MVar = -bus_power[internal_bus].imag()*psdb.get_system_base_power_in_MVA();
 
-    double total_q_max_in_MVar = psdb.get_regulatable_q_max_at_physical_bus_in_MVar(physical_bus);
-    double total_q_min_in_MVar = psdb.get_regulatable_q_min_at_physical_bus_in_MVar(physical_bus);
+        double total_q_max_in_MVar = psdb.get_regulatable_q_max_at_physical_bus_in_MVar(physical_bus);
+        double total_q_min_in_MVar = psdb.get_regulatable_q_min_at_physical_bus_in_MVar(physical_bus);
 
-    if(total_q_max_in_MVar==total_q_min_in_MVar)
-    {
-        bus->set_bus_type(PV_TO_PQ_TYPE_3);
-        bus_type_changed = true;
-        set_all_sources_at_physical_bus_to_q_max(physical_bus);
+        if(total_q_max_in_MVar==total_q_min_in_MVar)
+        {
+            bus->set_bus_type(PV_TO_PQ_TYPE_3);
+            bus_type_changed = true;
+            set_all_sources_at_physical_bus_to_q_max(physical_bus);
 
-        snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Bus %lu changed from PV_TYPE to PV_TO_PQ_TYPE_3 with sources q max reached.", physical_bus);
-        toolkit.show_information_with_leading_time_stamp(buffer);
+            snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Bus %lu changed from PV_TYPE to PV_TO_PQ_TYPE_3 with sources q max reached.", physical_bus);
+            toolkit.show_information_with_leading_time_stamp(buffer);
 
-        return bus_type_changed;
-    }
+            return bus_type_changed;
+        }
 
-    size_t n;
+        size_t n;
 
-    if(bus_Q_mismatch_in_MVar > total_q_max_in_MVar)
-    {
-        bus->set_bus_type(PV_TO_PQ_TYPE_3);
-        bus_type_changed = true;
+        if(bus_Q_mismatch_in_MVar > total_q_max_in_MVar)
+        {
+            bus->set_bus_type(PV_TO_PQ_TYPE_3);
+            bus_type_changed = true;
 
-        snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Bus %lu changed from PV_TYPE to PV_TO_PQ_TYPE_3 with sources q max reached.", physical_bus);
-        toolkit.show_information_with_leading_time_stamp(buffer);
+            snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Bus %lu changed from PV_TYPE to PV_TO_PQ_TYPE_3 with sources q max reached.", physical_bus);
+            toolkit.show_information_with_leading_time_stamp(buffer);
 
-        set_all_sources_at_physical_bus_to_q_max(physical_bus);
-        return bus_type_changed;
-    }
+            set_all_sources_at_physical_bus_to_q_max(physical_bus);
+            return bus_type_changed;
+        }
 
-    if(bus_Q_mismatch_in_MVar < total_q_min_in_MVar)
-    {
-        bus->set_bus_type(PV_TO_PQ_TYPE_3);
-        bus_type_changed = true;
+        if(bus_Q_mismatch_in_MVar < total_q_min_in_MVar)
+        {
+            bus->set_bus_type(PV_TO_PQ_TYPE_3);
+            bus_type_changed = true;
 
-        snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Bus %lu changed from PV_TYPE to PV_TO_PQ_TYPE_3 with sources q min reached.", physical_bus);
-        toolkit.show_information_with_leading_time_stamp(buffer);
+            snprintf(buffer, MAX_TEMP_CHAR_BUFFER_SIZE, "Bus %lu changed from PV_TYPE to PV_TO_PQ_TYPE_3 with sources q min reached.", physical_bus);
+            toolkit.show_information_with_leading_time_stamp(buffer);
 
-        set_all_sources_at_physical_bus_to_q_min(physical_bus);
-        return bus_type_changed;
-    }
+            set_all_sources_at_physical_bus_to_q_min(physical_bus);
+            return bus_type_changed;
+        }
 
-    double Q_loading_percentage = (bus_Q_mismatch_in_MVar-total_q_min_in_MVar);
-    Q_loading_percentage /= (total_q_max_in_MVar - total_q_min_in_MVar);
+        double Q_loading_percentage = (bus_Q_mismatch_in_MVar-total_q_min_in_MVar);
+        Q_loading_percentage /= (total_q_max_in_MVar - total_q_min_in_MVar);
 
-    vector<SOURCE*> sources = psdb.get_sources_connecting_to_bus(physical_bus);
-    n = sources.size();
-    for(size_t i=0; i!=n; ++i)
-    {
-        if(sources[i]->get_status() == false)
-            continue;
-        double Q_loading_in_MVar = sources[i]->get_q_max_in_MVar() - sources[i]->get_q_min_in_MVar();
-        Q_loading_in_MVar = Q_loading_in_MVar*Q_loading_percentage + sources[i]->get_q_min_in_MVar();
-        sources[i]->set_q_generation_in_MVar(Q_loading_in_MVar);
+        vector<SOURCE*> sources = psdb.get_sources_connecting_to_bus(physical_bus);
+        n = sources.size();
+        for(size_t i=0; i!=n; ++i)
+        {
+            if(sources[i]->get_status() == true)
+            {
+                double Q_loading_in_MVar = sources[i]->get_q_max_in_MVar() - sources[i]->get_q_min_in_MVar();
+                Q_loading_in_MVar = Q_loading_in_MVar*Q_loading_percentage + sources[i]->get_q_min_in_MVar();
+                sources[i]->set_q_generation_in_MVar(Q_loading_in_MVar);
+            }
+        }
+        return bus_type_changed;
     }
-    return bus_type_changed;
+    else
+        return false;
 }
 
 bool POWERFLOW_SOLVER::check_PV_TO_PQ_bus_constraint_of_physical_bus(size_t physical_bus)
@@ -1161,7 +1167,9 @@ bool POWERFLOW_SOLVER::check_PV_TO_PQ_bus_constraint_of_physical_bus(size_t phys
     double total_q_max_in_MVar = psdb.get_regulatable_q_max_at_physical_bus_in_MVar(physical_bus);
     double total_q_min_in_MVar = psdb.get_regulatable_q_min_at_physical_bus_in_MVar(physical_bus);
 
-    if(total_q_max_in_MVar == total_q_min_in_MVar)
+    if(fabs(total_q_max_in_MVar-total_q_min_in_MVar)>FLOAT_EPSILON)
+        ;
+    else
     {
         if(bus->get_bus_type()!=PV_TO_PQ_TYPE_3)
         {
@@ -1196,11 +1204,7 @@ bool POWERFLOW_SOLVER::check_PV_TO_PQ_bus_constraint_of_physical_bus(size_t phys
 
     if(bus_voltage>voltage_to_regulated)
     {
-        if(total_q_generation_in_MVar==total_q_min_in_MVar)
-        {
-            ;
-        }
-        else
+        if(total_q_generation_in_MVar>total_q_min_in_MVar)
         {
             switch(bus->get_bus_type())
             {
@@ -1233,11 +1237,7 @@ bool POWERFLOW_SOLVER::check_PV_TO_PQ_bus_constraint_of_physical_bus(size_t phys
     }
     else // bus_voltage<voltage_to_regulated
     {
-        if(total_q_generation_in_MVar==total_q_max_in_MVar)
-        {
-            ;
-        }
-        else
+        if(total_q_generation_in_MVar<total_q_max_in_MVar)
         {
             switch(bus->get_bus_type())
             {
@@ -1525,10 +1525,8 @@ void POWERFLOW_SOLVER::update_bus_voltage_and_angle(const vector<double>& update
             calculate_raw_bus_power_mismatch();
             double Perror = get_maximum_active_power_mismatch_in_MW();
             double Qerror = get_maximum_reactive_power_mismatch_in_MVar();
-            if((Perror<Perror0 or Perror<get_allowed_max_active_power_imbalance_in_MW())
-                and (Qerror<Qerror0 or Qerror<get_allowed_max_reactive_power_imbalance_in_MVar()))
-                break;
-            else
+            if((Perror>Perror0 and Perror>get_allowed_max_active_power_imbalance_in_MW())
+                or (Qerror>Qerror0 and Qerror>get_allowed_max_reactive_power_imbalance_in_MVar()))
             {
                 alpha *= 0.5;
                 for(size_t i=0; i!=nP; ++i)
@@ -1558,7 +1556,9 @@ void POWERFLOW_SOLVER::update_bus_voltage_and_angle(const vector<double>& update
 
                     bus->set_voltage_in_pu(current_voltage - alpha*delta_voltage);
                 }
-            }
+            }
+            else
+                break;
         }
     }
 }
@@ -1612,9 +1612,7 @@ void POWERFLOW_SOLVER::update_bus_voltage(const vector<double>& update)
         {
             calculate_raw_bus_power_mismatch();
             double Qerror = get_maximum_reactive_power_mismatch_in_MVar();
-            if(Qerror<Qerror0 or Qerror<get_allowed_max_reactive_power_imbalance_in_MVar())
-                break;
-            else
+            if(Qerror>Qerror0 and Qerror>get_allowed_max_reactive_power_imbalance_in_MVar())
             {
                 alpha *= 0.5;
                 max_delta_v *= 0.5;
@@ -1631,7 +1629,9 @@ void POWERFLOW_SOLVER::update_bus_voltage(const vector<double>& update)
 
                     bus->set_voltage_in_pu(current_voltage - alpha*delta_voltage);
                 }
-            }
+            }
+            else
+                break;
         }
     }
 
@@ -1692,9 +1692,7 @@ void POWERFLOW_SOLVER::update_bus_angle(const vector<double>& update)
         {
             calculate_raw_bus_power_mismatch();
             double Perror = get_maximum_active_power_mismatch_in_MW();
-            if(Perror<Perror0 or Perror<get_allowed_max_active_power_imbalance_in_MW())
-                break;
-            else
+            if(Perror>Perror0 and Perror>get_allowed_max_active_power_imbalance_in_MW())
             {
                 alpha *= 0.5;
                 max_delta_angle *=0.5;
@@ -1711,7 +1709,9 @@ void POWERFLOW_SOLVER::update_bus_angle(const vector<double>& update)
 
                     bus->set_angle_in_rad(current_angle - alpha*delta_angle);
                 }
-            }
+            }
+            else
+                break;
         }
     }
 
@@ -1782,221 +1782,223 @@ void POWERFLOW_SOLVER::save_powerflow_result_to_file(string filename) const
     ostringstream osstream;
 
     ofstream file(filename);
-    if(not file.is_open())
+    if(file.is_open())
     {
-        osstream<<"File '"<<filename<<"' cannot be opened for saving powerflow result to file."<<endl
-          <<"No powerflow result will be exported.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    time_t tt = time(NULL);
-    tm* local_time= localtime(&tt);
-
-    char time_stamp[40];
-    char buffer[1000];
-    snprintf(time_stamp,40, "%d-%02d-%02d %02d:%02d:%02d", local_time->tm_year + 1900, local_time->tm_mon + 1,
-            local_time->tm_mday, local_time->tm_hour, local_time->tm_min, local_time->tm_sec);
-
-    file<<"% Powerflow result exported at "<<time_stamp<<endl;
-    snprintf(buffer, 1000, "%s", (psdb.get_case_information()).c_str());
-    file<<"% "<<buffer<<endl;
-    snprintf(buffer, 1000, "%s", (psdb.get_case_additional_information()).c_str());
-    file<<"% "<<buffer<<endl;
-    vector<BUS*> buses = psdb.get_all_buses();
-    size_t nbus = buses.size();
-    if(nbus>0)
-    {
-        file<<"% Bus"<<endl;
-        file<<"BUS,NAME,VBASE/KV,VOLTAGE/PU,ANGLE/DEG,VOLTAGE/KV,ANGLE/RAD"<<endl;
-        for(size_t i=0; i!=nbus; ++i)
-        {
-            /*file<<buses[i]->get_bus_number()<<","
-                <<setprecision(6)<<fixed<<buses[i]->get_base_voltage_in_kV()<<","
-                <<setprecision(6)<<fixed<<buses[i]->get_voltage_in_pu()<<","
-                <<setprecision(6)<<fixed<<buses[i]->get_angle_in_deg()<<","
-                <<setprecision(6)<<fixed<<buses[i]->get_voltage_in_kV()<<","
-                <<setprecision(6)<<fixed<<buses[i]->get_angle_in_rad()<<endl;*/
-            snprintf(buffer, 1000, "%lu,\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f",
-                     buses[i]->get_bus_number(),(buses[i]->get_bus_name()).c_str(),
-                     buses[i]->get_base_voltage_in_kV(),
-                     buses[i]->get_voltage_in_pu(), buses[i]->get_angle_in_deg(),
-                     buses[i]->get_voltage_in_kV(), buses[i]->get_angle_in_rad());
-            file<<buffer<<endl;
+        time_t tt = time(NULL);
+        tm* local_time= localtime(&tt);
+
+        char time_stamp[40];
+        char buffer[1000];
+        snprintf(time_stamp,40, "%d-%02d-%02d %02d:%02d:%02d", local_time->tm_year + 1900, local_time->tm_mon + 1,
+                local_time->tm_mday, local_time->tm_hour, local_time->tm_min, local_time->tm_sec);
+
+        file<<"% Powerflow result exported at "<<time_stamp<<endl;
+        snprintf(buffer, 1000, "%s", (psdb.get_case_information()).c_str());
+        file<<"% "<<buffer<<endl;
+        snprintf(buffer, 1000, "%s", (psdb.get_case_additional_information()).c_str());
+        file<<"% "<<buffer<<endl;
+        vector<BUS*> buses = psdb.get_all_buses();
+        size_t nbus = buses.size();
+        if(nbus>0)
+        {
+            file<<"% Bus"<<endl;
+            file<<"BUS,NAME,VBASE/KV,VOLTAGE/PU,ANGLE/DEG,VOLTAGE/KV,ANGLE/RAD"<<endl;
+            for(size_t i=0; i!=nbus; ++i)
+            {
+                /*file<<buses[i]->get_bus_number()<<","
+                    <<setprecision(6)<<fixed<<buses[i]->get_base_voltage_in_kV()<<","
+                    <<setprecision(6)<<fixed<<buses[i]->get_voltage_in_pu()<<","
+                    <<setprecision(6)<<fixed<<buses[i]->get_angle_in_deg()<<","
+                    <<setprecision(6)<<fixed<<buses[i]->get_voltage_in_kV()<<","
+                    <<setprecision(6)<<fixed<<buses[i]->get_angle_in_rad()<<endl;*/
+                snprintf(buffer, 1000, "%lu,\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f",
+                         buses[i]->get_bus_number(),(buses[i]->get_bus_name()).c_str(),
+                         buses[i]->get_base_voltage_in_kV(),
+                         buses[i]->get_voltage_in_pu(), buses[i]->get_angle_in_deg(),
+                         buses[i]->get_voltage_in_kV(), buses[i]->get_angle_in_rad());
+                file<<buffer<<endl;
+            }
         }
-    }
 
-    vector<GENERATOR*> generators = psdb.get_all_generators();
-    size_t ngen = generators.size();
-    if(ngen>0)
-    {
-        file<<"% Generator"<<endl;
-        file<<"BUS,ID,P/MW,Q/MVAR,VOLTAGE/PU"<<endl;
-        for(size_t i=0; i!=ngen; ++i)
-        {
-            size_t bus = generators[i]->get_generator_bus();
-            /*file<<bus<<",\""<<generators[i]->get_identifier()<<"\","
-                <<setprecision(6)<<fixed<<generators[i]->get_p_generation_in_MW()<<","
-                <<setprecision(6)<<fixed<<generators[i]->get_q_generation_in_MVar()<<","
-                <<setprecision(6)<<db->get_bus_voltage_in_pu(bus)<<endl;*/
-            snprintf(buffer, 1000, "%lu,\"%s\",%.6f,%.6f,%.6f",
-                     generators[i]->get_generator_bus(),(generators[i]->get_identifier()).c_str(),
-                     generators[i]->get_p_generation_in_MW(), generators[i]->get_q_generation_in_MVar(),
-                     psdb.get_bus_voltage_in_pu(bus));
-            file<<buffer<<endl;
+        vector<GENERATOR*> generators = psdb.get_all_generators();
+        size_t ngen = generators.size();
+        if(ngen>0)
+        {
+            file<<"% Generator"<<endl;
+            file<<"BUS,ID,P/MW,Q/MVAR,VOLTAGE/PU"<<endl;
+            for(size_t i=0; i!=ngen; ++i)
+            {
+                size_t bus = generators[i]->get_generator_bus();
+                /*file<<bus<<",\""<<generators[i]->get_identifier()<<"\","
+                    <<setprecision(6)<<fixed<<generators[i]->get_p_generation_in_MW()<<","
+                    <<setprecision(6)<<fixed<<generators[i]->get_q_generation_in_MVar()<<","
+                    <<setprecision(6)<<db->get_bus_voltage_in_pu(bus)<<endl;*/
+                snprintf(buffer, 1000, "%lu,\"%s\",%.6f,%.6f,%.6f",
+                         generators[i]->get_generator_bus(),(generators[i]->get_identifier()).c_str(),
+                         generators[i]->get_p_generation_in_MW(), generators[i]->get_q_generation_in_MVar(),
+                         psdb.get_bus_voltage_in_pu(bus));
+                file<<buffer<<endl;
+            }
         }
-    }
 
-    vector<WT_GENERATOR*> wt_generators = psdb.get_all_wt_generators();
-    size_t nsource = wt_generators.size();
-    if(nsource>0)
-    {
-        file<<"% WT generator"<<endl;
-        file<<"BUS,ID,P/MW,Q/MVAR,VOLTAGE/PU"<<endl;
-        for(size_t i=0; i!=nsource; ++i)
-        {
-            size_t bus = wt_generators[i]->get_source_bus();
-            /*file<<bus<<",\""<<wt_generators[i]->get_identifier()<<"\","
-                <<setprecision(6)<<fixed<<wt_generators[i]->get_p_generation_in_MW()<<","
-                <<setprecision(6)<<fixed<<wt_generators[i]->get_q_generation_in_MVar()<<","
-                <<setprecision(6)<<db->get_bus_voltage_in_pu(bus)<<endl;*/
-            snprintf(buffer, 1000, "%lu,\"%s\",%.6f,%.6f,%.6f",
-                     wt_generators[i]->get_generator_bus(),(wt_generators[i]->get_identifier()).c_str(),
-                     wt_generators[i]->get_p_generation_in_MW(), wt_generators[i]->get_q_generation_in_MVar(),
-                     psdb.get_bus_voltage_in_pu(bus));
-            file<<buffer<<endl;
+        vector<WT_GENERATOR*> wt_generators = psdb.get_all_wt_generators();
+        size_t nsource = wt_generators.size();
+        if(nsource>0)
+        {
+            file<<"% WT generator"<<endl;
+            file<<"BUS,ID,P/MW,Q/MVAR,VOLTAGE/PU"<<endl;
+            for(size_t i=0; i!=nsource; ++i)
+            {
+                size_t bus = wt_generators[i]->get_source_bus();
+                /*file<<bus<<",\""<<wt_generators[i]->get_identifier()<<"\","
+                    <<setprecision(6)<<fixed<<wt_generators[i]->get_p_generation_in_MW()<<","
+                    <<setprecision(6)<<fixed<<wt_generators[i]->get_q_generation_in_MVar()<<","
+                    <<setprecision(6)<<db->get_bus_voltage_in_pu(bus)<<endl;*/
+                snprintf(buffer, 1000, "%lu,\"%s\",%.6f,%.6f,%.6f",
+                         wt_generators[i]->get_generator_bus(),(wt_generators[i]->get_identifier()).c_str(),
+                         wt_generators[i]->get_p_generation_in_MW(), wt_generators[i]->get_q_generation_in_MVar(),
+                         psdb.get_bus_voltage_in_pu(bus));
+                file<<buffer<<endl;
+            }
         }
-    }
 
-    vector<LOAD*> loads = psdb.get_all_loads();
-    size_t nload = loads.size();
-    if(nload>0)
-    {
-        file<<"% Load"<<endl;
-        file<<"BUS,ID,P/MW,Q/MVAR,VOLTAGE/PU"<<endl;
-        for(size_t i=0; i!=nload; ++i)
-        {
-            size_t bus = loads[i]->get_load_bus();
-            complex<double> s = loads[i]->get_actual_total_load_in_MVA();
-            /*file<<bus<<",\""<<loads[i]->get_identifier()<<"\","
-                <<setprecision(6)<<fixed<<s.real()<<","
-                <<setprecision(6)<<fixed<<s.imag()<<","
-                <<setprecision(6)<<db->get_bus_voltage_in_pu(bus)<<endl;*/
-            snprintf(buffer, 1000, "%lu,\"%s\",%.6f,%.6f,%.6f",
-                     loads[i]->get_load_bus(),(loads[i]->get_identifier()).c_str(),
-                     s.real(), s.imag(), psdb.get_bus_voltage_in_pu(bus));
-            file<<buffer<<endl;
+        vector<LOAD*> loads = psdb.get_all_loads();
+        size_t nload = loads.size();
+        if(nload>0)
+        {
+            file<<"% Load"<<endl;
+            file<<"BUS,ID,P/MW,Q/MVAR,VOLTAGE/PU"<<endl;
+            for(size_t i=0; i!=nload; ++i)
+            {
+                size_t bus = loads[i]->get_load_bus();
+                complex<double> s = loads[i]->get_actual_total_load_in_MVA();
+                /*file<<bus<<",\""<<loads[i]->get_identifier()<<"\","
+                    <<setprecision(6)<<fixed<<s.real()<<","
+                    <<setprecision(6)<<fixed<<s.imag()<<","
+                    <<setprecision(6)<<db->get_bus_voltage_in_pu(bus)<<endl;*/
+                snprintf(buffer, 1000, "%lu,\"%s\",%.6f,%.6f,%.6f",
+                         loads[i]->get_load_bus(),(loads[i]->get_identifier()).c_str(),
+                         s.real(), s.imag(), psdb.get_bus_voltage_in_pu(bus));
+                file<<buffer<<endl;
+            }
         }
-    }
 
-    vector<LINE*> lines = psdb.get_all_lines();
-    size_t nline = lines.size();
-    if(nline>0)
-    {
-        file<<"% Line"<<endl;
-        file<<"IBUS,JBUS,ID,PI/MW,QI/MVAR,PJ/MW,QJ/MVAR,II/KA,IJ/KA"<<endl;
-        for(size_t i=0; i!=nline; ++i)
-        {
-            complex<double> si = lines[i]->get_line_complex_power_at_sending_side_in_MVA();
-            complex<double> sj = lines[i]->get_line_complex_power_at_receiving_side_in_MVA();
-            /*file<<lines[i]->get_sending_side_bus()<<","<<lines[i]->get_receiving_side_bus()<<",\""<<lines[i]->get_identifier()<<"\","
-                <<setprecision(6)<<fixed<<si.real()<<","
-                <<setprecision(6)<<fixed<<si.imag()<<","
-                <<setprecision(6)<<fixed<<sj.real()<<","
-                <<setprecision(6)<<fixed<<sj.imag()<<","
-                <<setprecision(6)<<fixed<<steps_fast_complex_abs(lines[i]->get_line_complex_current_at_sending_side_in_kA())<<","
-                <<setprecision(6)<<fixed<<steps_fast_complex_abs(lines[i]->get_line_complex_current_at_receiving_side_in_kA())<<endl;*/
+        vector<LINE*> lines = psdb.get_all_lines();
+        size_t nline = lines.size();
+        if(nline>0)
+        {
+            file<<"% Line"<<endl;
+            file<<"IBUS,JBUS,ID,PI/MW,QI/MVAR,PJ/MW,QJ/MVAR,II/KA,IJ/KA"<<endl;
+            for(size_t i=0; i!=nline; ++i)
+            {
+                complex<double> si = lines[i]->get_line_complex_power_at_sending_side_in_MVA();
+                complex<double> sj = lines[i]->get_line_complex_power_at_receiving_side_in_MVA();
+                /*file<<lines[i]->get_sending_side_bus()<<","<<lines[i]->get_receiving_side_bus()<<",\""<<lines[i]->get_identifier()<<"\","
+                    <<setprecision(6)<<fixed<<si.real()<<","
+                    <<setprecision(6)<<fixed<<si.imag()<<","
+                    <<setprecision(6)<<fixed<<sj.real()<<","
+                    <<setprecision(6)<<fixed<<sj.imag()<<","
+                    <<setprecision(6)<<fixed<<steps_fast_complex_abs(lines[i]->get_line_complex_current_at_sending_side_in_kA())<<","
+                    <<setprecision(6)<<fixed<<steps_fast_complex_abs(lines[i]->get_line_complex_current_at_receiving_side_in_kA())<<endl;*/
 
-            snprintf(buffer, 1000, "%lu,%lu,\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f,%.6f",
-                     lines[i]->get_sending_side_bus(),lines[i]->get_receiving_side_bus(),(lines[i]->get_identifier()).c_str(),
-                     si.real(), si.imag(),sj.real(), sj.imag(),
-                     steps_fast_complex_abs(lines[i]->get_line_complex_current_at_sending_side_in_kA()),
-                     steps_fast_complex_abs(lines[i]->get_line_complex_current_at_receiving_side_in_kA()));
-            file<<buffer<<endl;
+                snprintf(buffer, 1000, "%lu,%lu,\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f,%.6f",
+                         lines[i]->get_sending_side_bus(),lines[i]->get_receiving_side_bus(),(lines[i]->get_identifier()).c_str(),
+                         si.real(), si.imag(),sj.real(), sj.imag(),
+                         steps_fast_complex_abs(lines[i]->get_line_complex_current_at_sending_side_in_kA()),
+                         steps_fast_complex_abs(lines[i]->get_line_complex_current_at_receiving_side_in_kA()));
+                file<<buffer<<endl;
+            }
         }
-    }
 
-    vector<TRANSFORMER*> transformers = psdb.get_all_transformers();
-    size_t ntrans = transformers.size();
-    if(ntrans>0)
-    {
-        file<<"% Transformer"<<endl;
-        file<<"IBUS,JBUS,KBUS,ID,PI/MW,QI/MVAR,PJ/MW,QJ/MVAR,PK/MW,QK/MVAR,KI/PU,KJ/PU,KK/PU"<<endl;
-        for(size_t i=0; i!=ntrans; ++i)
-        {
-            complex<double> sp = transformers[i]->get_winding_complex_power_in_MVA(PRIMARY_SIDE);
-            complex<double> ss = transformers[i]->get_winding_complex_power_in_MVA(SECONDARY_SIDE);
-            complex<double> st = transformers[i]->get_winding_complex_power_in_MVA(TERTIARY_SIDE);
-
-            /*file<<transformers[i]->get_winding_bus(PRIMARY_SIDE)<<","
-                <<transformers[i]->get_winding_bus(SECONDARY_SIDE)<<","
-                <<transformers[i]->get_winding_bus(TERTIARY_SIDE)<<",\""<<transformers[i]->get_identifier()<<"\","
-                <<setprecision(6)<<fixed<<sp.real()<<","
-                <<setprecision(6)<<fixed<<sp.imag()<<","
-                <<setprecision(6)<<fixed<<ss.real()<<","
-                <<setprecision(6)<<fixed<<ss.imag()<<","
-                <<setprecision(6)<<fixed<<st.real()<<","
-                <<setprecision(6)<<fixed<<st.imag()<<","
-                <<setprecision(6)<<fixed<<transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE)<<","
-                <<setprecision(6)<<fixed<<transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE)<<","
-                <<setprecision(6)<<fixed<<transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(TERTIARY_SIDE)<<endl;*/
+        vector<TRANSFORMER*> transformers = psdb.get_all_transformers();
+        size_t ntrans = transformers.size();
+        if(ntrans>0)
+        {
+            file<<"% Transformer"<<endl;
+            file<<"IBUS,JBUS,KBUS,ID,PI/MW,QI/MVAR,PJ/MW,QJ/MVAR,PK/MW,QK/MVAR,KI/PU,KJ/PU,KK/PU"<<endl;
+            for(size_t i=0; i!=ntrans; ++i)
+            {
+                complex<double> sp = transformers[i]->get_winding_complex_power_in_MVA(PRIMARY_SIDE);
+                complex<double> ss = transformers[i]->get_winding_complex_power_in_MVA(SECONDARY_SIDE);
+                complex<double> st = transformers[i]->get_winding_complex_power_in_MVA(TERTIARY_SIDE);
+
+                /*file<<transformers[i]->get_winding_bus(PRIMARY_SIDE)<<","
+                    <<transformers[i]->get_winding_bus(SECONDARY_SIDE)<<","
+                    <<transformers[i]->get_winding_bus(TERTIARY_SIDE)<<",\""<<transformers[i]->get_identifier()<<"\","
+                    <<setprecision(6)<<fixed<<sp.real()<<","
+                    <<setprecision(6)<<fixed<<sp.imag()<<","
+                    <<setprecision(6)<<fixed<<ss.real()<<","
+                    <<setprecision(6)<<fixed<<ss.imag()<<","
+                    <<setprecision(6)<<fixed<<st.real()<<","
+                    <<setprecision(6)<<fixed<<st.imag()<<","
+                    <<setprecision(6)<<fixed<<transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE)<<","
+                    <<setprecision(6)<<fixed<<transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE)<<","
+                    <<setprecision(6)<<fixed<<transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(TERTIARY_SIDE)<<endl;*/
 
 
-            snprintf(buffer, 1000, "%lu,%lu,%lu,\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f",
-                     transformers[i]->get_winding_bus(PRIMARY_SIDE),transformers[i]->get_winding_bus(SECONDARY_SIDE),
-                     transformers[i]->get_winding_bus(TERTIARY_SIDE), (transformers[i]->get_identifier()).c_str(),
-                     sp.real(), sp.imag(), ss.real(), ss.imag(), st.real(), st.imag(),
-                     transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE),
-                     transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE),
-                     transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(TERTIARY_SIDE));
-            file<<buffer<<endl;
+                snprintf(buffer, 1000, "%lu,%lu,%lu,\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f",
+                         transformers[i]->get_winding_bus(PRIMARY_SIDE),transformers[i]->get_winding_bus(SECONDARY_SIDE),
+                         transformers[i]->get_winding_bus(TERTIARY_SIDE), (transformers[i]->get_identifier()).c_str(),
+                         sp.real(), sp.imag(), ss.real(), ss.imag(), st.real(), st.imag(),
+                         transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE),
+                         transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE),
+                         transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(TERTIARY_SIDE));
+                file<<buffer<<endl;
+            }
         }
-    }
 
-    vector<HVDC*> hvdcs = psdb.get_all_hvdcs();
-    size_t nhvdc = hvdcs.size();
-    if(nhvdc>0)
-    {
-        file<<"% Hvdc"<<endl;
-        file<<"IBUS,JBUS,ID,PR/MW,QR/MVAR,PI/MW,QI/MVAR,ALPHA/DEG,GAMMA/DEG,VDCR/KV,VDCI/KV,IDC/KA,VACR/PU,VACI/PU,KR/PU,KI/PU"<<endl;
-        for(size_t i=0; i!=nhvdc; ++i)
-        {
-            size_t busr = hvdcs[i]->get_converter_bus(RECTIFIER);
-            size_t busi = hvdcs[i]->get_converter_bus(INVERTER);
-            /*file<<busr<<","<<busi<<",\""<<hvdcs[i]->get_identifier()<<"\","
-                <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_active_power_in_MW(RECTIFIER)<<","
-                <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_reactive_power_in_MVar(RECTIFIER)<<","
-                <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_active_power_in_MW(INVERTER)<<","
-                <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_reactive_power_in_MVar(INVERTER)<<","
-                <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_alpha_or_gamma_in_deg(RECTIFIER)<<","
-                <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_alpha_or_gamma_in_deg(INVERTER)<<","
-                <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_dc_voltage_in_kV(RECTIFIER)<<","
-                <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_dc_voltage_in_kV(INVERTER)<<","
-                <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_dc_current_in_kA(RECTIFIER)<<","
-                <<setprecision(6)<<fixed<<db->get_bus_voltage_in_pu(busr)<<","
-                <<setprecision(6)<<fixed<<db->get_bus_voltage_in_pu(busi)<<","
-                <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_transformer_tap_in_pu(RECTIFIER)<<","
-                <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_transformer_tap_in_pu(INVERTER)<<endl;*/
-            snprintf(buffer, 1000, "%lu,%lu,\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f",
-                     hvdcs[i]->get_converter_bus(RECTIFIER),hvdcs[i]->get_converter_bus(INVERTER),(hvdcs[i]->get_identifier()).c_str(),
-                     hvdcs[i]->get_converter_ac_active_power_in_MW(RECTIFIER),
-                     hvdcs[i]->get_converter_ac_reactive_power_in_MVar(RECTIFIER),
-                     hvdcs[i]->get_converter_ac_active_power_in_MW(INVERTER),
-                     hvdcs[i]->get_converter_ac_reactive_power_in_MVar(INVERTER),
-                     hvdcs[i]->get_converter_alpha_or_gamma_in_deg(RECTIFIER),
-                     hvdcs[i]->get_converter_alpha_or_gamma_in_deg(INVERTER),
-                     hvdcs[i]->get_converter_dc_voltage_in_kV(RECTIFIER),
-                     hvdcs[i]->get_converter_dc_voltage_in_kV(INVERTER),
-                     hvdcs[i]->get_converter_dc_current_in_kA(RECTIFIER),
-                     psdb.get_bus_voltage_in_pu(busr),
-                     psdb.get_bus_voltage_in_pu(busi),
-                     hvdcs[i]->get_converter_transformer_tap_in_pu(RECTIFIER),
-                     hvdcs[i]->get_converter_transformer_tap_in_pu(INVERTER));
-            file<<buffer<<endl;
+        vector<HVDC*> hvdcs = psdb.get_all_hvdcs();
+        size_t nhvdc = hvdcs.size();
+        if(nhvdc>0)
+        {
+            file<<"% Hvdc"<<endl;
+            file<<"IBUS,JBUS,ID,PR/MW,QR/MVAR,PI/MW,QI/MVAR,ALPHA/DEG,GAMMA/DEG,VDCR/KV,VDCI/KV,IDC/KA,VACR/PU,VACI/PU,KR/PU,KI/PU"<<endl;
+            for(size_t i=0; i!=nhvdc; ++i)
+            {
+                size_t busr = hvdcs[i]->get_converter_bus(RECTIFIER);
+                size_t busi = hvdcs[i]->get_converter_bus(INVERTER);
+                /*file<<busr<<","<<busi<<",\""<<hvdcs[i]->get_identifier()<<"\","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_active_power_in_MW(RECTIFIER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_reactive_power_in_MVar(RECTIFIER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_active_power_in_MW(INVERTER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_reactive_power_in_MVar(INVERTER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_alpha_or_gamma_in_deg(RECTIFIER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_alpha_or_gamma_in_deg(INVERTER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_dc_voltage_in_kV(RECTIFIER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_dc_voltage_in_kV(INVERTER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_dc_current_in_kA(RECTIFIER)<<","
+                    <<setprecision(6)<<fixed<<db->get_bus_voltage_in_pu(busr)<<","
+                    <<setprecision(6)<<fixed<<db->get_bus_voltage_in_pu(busi)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_transformer_tap_in_pu(RECTIFIER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_transformer_tap_in_pu(INVERTER)<<endl;*/
+                snprintf(buffer, 1000, "%lu,%lu,\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f",
+                         hvdcs[i]->get_converter_bus(RECTIFIER),hvdcs[i]->get_converter_bus(INVERTER),(hvdcs[i]->get_identifier()).c_str(),
+                         hvdcs[i]->get_converter_ac_active_power_in_MW(RECTIFIER),
+                         hvdcs[i]->get_converter_ac_reactive_power_in_MVar(RECTIFIER),
+                         hvdcs[i]->get_converter_ac_active_power_in_MW(INVERTER),
+                         hvdcs[i]->get_converter_ac_reactive_power_in_MVar(INVERTER),
+                         hvdcs[i]->get_converter_alpha_or_gamma_in_deg(RECTIFIER),
+                         hvdcs[i]->get_converter_alpha_or_gamma_in_deg(INVERTER),
+                         hvdcs[i]->get_converter_dc_voltage_in_kV(RECTIFIER),
+                         hvdcs[i]->get_converter_dc_voltage_in_kV(INVERTER),
+                         hvdcs[i]->get_converter_dc_current_in_kA(RECTIFIER),
+                         psdb.get_bus_voltage_in_pu(busr),
+                         psdb.get_bus_voltage_in_pu(busi),
+                         hvdcs[i]->get_converter_transformer_tap_in_pu(RECTIFIER),
+                         hvdcs[i]->get_converter_transformer_tap_in_pu(INVERTER));
+                file<<buffer<<endl;
+            }
         }
-    }
 
-    file.close();
+        file.close();
+    }
+    else
+    {
+        osstream<<"File '"<<filename<<"' cannot be opened for saving powerflow result to file."<<endl
+          <<"No powerflow result will be exported.";
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        return;
+    }
 }
 
 void POWERFLOW_SOLVER::save_extended_powerflow_result_to_file(string filename) const
@@ -2007,236 +2009,238 @@ void POWERFLOW_SOLVER::save_extended_powerflow_result_to_file(string filename) c
     ostringstream osstream;
 
     ofstream file(filename);
-    if(not file.is_open())
-    {
-        osstream<<"File '"<<filename<<"' cannot be opened for saving extended powerflow result to file."<<endl
-          <<"No powerflow result will be exported.";
-        toolkit.show_information_with_leading_time_stamp(osstream);
-        return;
-    }
-
-    time_t tt = time(NULL);
-    tm* local_time= localtime(&tt);
-
-    char time_stamp[40];
-    char buffer[1000];
-    snprintf(time_stamp,40, "%d-%02d-%02d %02d:%02d:%02d", local_time->tm_year + 1900, local_time->tm_mon + 1,
-            local_time->tm_mday, local_time->tm_hour, local_time->tm_min, local_time->tm_sec);
-
-    file<<"% Powerflow result exported at "<<time_stamp<<endl;
-    snprintf(buffer, 1000, "%s", (psdb.get_case_information()).c_str());
-    file<<"% "<<buffer<<endl;
-    snprintf(buffer, 1000, "%s", (psdb.get_case_additional_information()).c_str());
-    file<<"% "<<buffer<<endl;
-    vector<BUS*> buses = psdb.get_all_buses();
-    size_t nbus = buses.size();
-    if(nbus>0)
-    {
-        file<<"% Bus"<<endl;
-        file<<"BUS,NAME,VBASE/KV,VOLTAGE/PU,ANGLE/DEG,VOLTAGE/KV,ANGLE/RAD"<<endl;
-    }
-    for(size_t i=0; i!=nbus; ++i)
+    if(file.is_open())
     {
-        /*file<<buses[i]->get_bus_number()<<","
-            <<setprecision(6)<<fixed<<buses[i]->get_base_voltage_in_kV()<<","
-            <<setprecision(6)<<fixed<<buses[i]->get_voltage_in_pu()<<","
-            <<setprecision(6)<<fixed<<buses[i]->get_angle_in_deg()<<","
-            <<setprecision(6)<<fixed<<buses[i]->get_voltage_in_kV()<<","
-            <<setprecision(6)<<fixed<<buses[i]->get_angle_in_rad()<<endl;*/
-        snprintf(buffer, 1000, "%lu,\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f",
-                 buses[i]->get_bus_number(),(buses[i]->get_bus_name()).c_str(),
-                 buses[i]->get_base_voltage_in_kV(),
-                 buses[i]->get_voltage_in_pu(), buses[i]->get_angle_in_deg(),
-                 buses[i]->get_voltage_in_kV(), buses[i]->get_angle_in_rad());
-        file<<buffer<<endl;
-    }
+        time_t tt = time(NULL);
+        tm* local_time= localtime(&tt);
+
+        char time_stamp[40];
+        char buffer[1000];
+        snprintf(time_stamp,40, "%d-%02d-%02d %02d:%02d:%02d", local_time->tm_year + 1900, local_time->tm_mon + 1,
+                local_time->tm_mday, local_time->tm_hour, local_time->tm_min, local_time->tm_sec);
+
+        file<<"% Powerflow result exported at "<<time_stamp<<endl;
+        snprintf(buffer, 1000, "%s", (psdb.get_case_information()).c_str());
+        file<<"% "<<buffer<<endl;
+        snprintf(buffer, 1000, "%s", (psdb.get_case_additional_information()).c_str());
+        file<<"% "<<buffer<<endl;
+        vector<BUS*> buses = psdb.get_all_buses();
+        size_t nbus = buses.size();
+        if(nbus>0)
+        {
+            file<<"% Bus"<<endl;
+            file<<"BUS,NAME,VBASE/KV,VOLTAGE/PU,ANGLE/DEG,VOLTAGE/KV,ANGLE/RAD"<<endl;
+            for(size_t i=0; i!=nbus; ++i)
+            {
+                /*file<<buses[i]->get_bus_number()<<","
+                    <<setprecision(6)<<fixed<<buses[i]->get_base_voltage_in_kV()<<","
+                    <<setprecision(6)<<fixed<<buses[i]->get_voltage_in_pu()<<","
+                    <<setprecision(6)<<fixed<<buses[i]->get_angle_in_deg()<<","
+                    <<setprecision(6)<<fixed<<buses[i]->get_voltage_in_kV()<<","
+                    <<setprecision(6)<<fixed<<buses[i]->get_angle_in_rad()<<endl;*/
+                snprintf(buffer, 1000, "%lu,\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f",
+                         buses[i]->get_bus_number(),(buses[i]->get_bus_name()).c_str(),
+                         buses[i]->get_base_voltage_in_kV(),
+                         buses[i]->get_voltage_in_pu(), buses[i]->get_angle_in_deg(),
+                         buses[i]->get_voltage_in_kV(), buses[i]->get_angle_in_rad());
+                file<<buffer<<endl;
+            }
+        }
 
-    vector<GENERATOR*> generators = psdb.get_all_generators();
-    size_t ngen = generators.size();
-    if(ngen>0)
-    {
-        file<<"% Generator"<<endl;
-        file<<"BUS,NAME,ID,P/MW,Q/MVAR,VOLTAGE/PU"<<endl;
-    }
-    for(size_t i=0; i!=ngen; ++i)
-    {
-        size_t bus = generators[i]->get_generator_bus();
-        /*file<<bus<<",\""<<generators[i]->get_identifier()<<"\","
-            <<setprecision(6)<<fixed<<generators[i]->get_p_generation_in_MW()<<","
-            <<setprecision(6)<<fixed<<generators[i]->get_q_generation_in_MVar()<<","
-            <<setprecision(6)<<db->get_bus_voltage_in_pu(bus)<<endl;*/
-        snprintf(buffer, 1000, "%lu,\"%s\",\"%s\",%.6f,%.6f,%.6f",
-                 bus, psdb.bus_number2bus_name(bus).c_str(),
-                 (generators[i]->get_identifier()).c_str(),
-                 generators[i]->get_p_generation_in_MW(), generators[i]->get_q_generation_in_MVar(),
-                 psdb.get_bus_voltage_in_pu(bus));
-        file<<buffer<<endl;
-    }
+        vector<GENERATOR*> generators = psdb.get_all_generators();
+        size_t ngen = generators.size();
+        if(ngen>0)
+        {
+            file<<"% Generator"<<endl;
+            file<<"BUS,NAME,ID,P/MW,Q/MVAR,VOLTAGE/PU"<<endl;
+            for(size_t i=0; i!=ngen; ++i)
+            {
+                size_t bus = generators[i]->get_generator_bus();
+                /*file<<bus<<",\""<<generators[i]->get_identifier()<<"\","
+                    <<setprecision(6)<<fixed<<generators[i]->get_p_generation_in_MW()<<","
+                    <<setprecision(6)<<fixed<<generators[i]->get_q_generation_in_MVar()<<","
+                    <<setprecision(6)<<db->get_bus_voltage_in_pu(bus)<<endl;*/
+                snprintf(buffer, 1000, "%lu,\"%s\",\"%s\",%.6f,%.6f,%.6f",
+                         bus, psdb.bus_number2bus_name(bus).c_str(),
+                         (generators[i]->get_identifier()).c_str(),
+                         generators[i]->get_p_generation_in_MW(), generators[i]->get_q_generation_in_MVar(),
+                         psdb.get_bus_voltage_in_pu(bus));
+                file<<buffer<<endl;
+            }
+        }
 
-    vector<WT_GENERATOR*> wt_generators = psdb.get_all_wt_generators();
-    size_t nsource = wt_generators.size();
-    if(nsource>0)
-    {
-        file<<"% WT generator"<<endl;
-        file<<"BUS,NAME,ID,P/MW,Q/MVAR,VOLTAGE/PU"<<endl;
-    }
-    for(size_t i=0; i!=nsource; ++i)
-    {
-        size_t bus = wt_generators[i]->get_source_bus();
-        /*file<<bus<<",\""<<wt_generators[i]->get_identifier()<<"\","
-            <<setprecision(6)<<fixed<<wt_generators[i]->get_p_generation_in_MW()<<","
-            <<setprecision(6)<<fixed<<wt_generators[i]->get_q_generation_in_MVar()<<","
-            <<setprecision(6)<<db->get_bus_voltage_in_pu(bus)<<endl;*/
-        snprintf(buffer, 1000, "%lu,\"%s\",\"%s\",%.6f,%.6f,%.6f",
-                 bus, psdb.bus_number2bus_name(bus).c_str(),
-                 (wt_generators[i]->get_identifier()).c_str(),
-                 wt_generators[i]->get_p_generation_in_MW(), wt_generators[i]->get_q_generation_in_MVar(),
-                 psdb.get_bus_voltage_in_pu(bus));
-        file<<buffer<<endl;
-    }
+        vector<WT_GENERATOR*> wt_generators = psdb.get_all_wt_generators();
+        size_t nsource = wt_generators.size();
+        if(nsource>0)
+        {
+            file<<"% WT generator"<<endl;
+            file<<"BUS,NAME,ID,P/MW,Q/MVAR,VOLTAGE/PU"<<endl;
+            for(size_t i=0; i!=nsource; ++i)
+            {
+                size_t bus = wt_generators[i]->get_source_bus();
+                /*file<<bus<<",\""<<wt_generators[i]->get_identifier()<<"\","
+                    <<setprecision(6)<<fixed<<wt_generators[i]->get_p_generation_in_MW()<<","
+                    <<setprecision(6)<<fixed<<wt_generators[i]->get_q_generation_in_MVar()<<","
+                    <<setprecision(6)<<db->get_bus_voltage_in_pu(bus)<<endl;*/
+                snprintf(buffer, 1000, "%lu,\"%s\",\"%s\",%.6f,%.6f,%.6f",
+                         bus, psdb.bus_number2bus_name(bus).c_str(),
+                         (wt_generators[i]->get_identifier()).c_str(),
+                         wt_generators[i]->get_p_generation_in_MW(), wt_generators[i]->get_q_generation_in_MVar(),
+                         psdb.get_bus_voltage_in_pu(bus));
+                file<<buffer<<endl;
+            }
+        }
 
-    vector<LOAD*> loads = psdb.get_all_loads();
-    size_t nload = loads.size();
-    if(nload>0)
-    {
-        file<<"% Load"<<endl;
-        file<<"BUS,NAME,ID,P/MW,Q/MVAR,VOLTAGE/PU"<<endl;
-    }
-    for(size_t i=0; i!=nload; ++i)
-    {
-        size_t bus = loads[i]->get_load_bus();
-        complex<double> s = loads[i]->get_actual_total_load_in_MVA();
-        /*file<<bus<<",\""<<loads[i]->get_identifier()<<"\","
-            <<setprecision(6)<<fixed<<s.real()<<","
-            <<setprecision(6)<<fixed<<s.imag()<<","
-            <<setprecision(6)<<db->get_bus_voltage_in_pu(bus)<<endl;*/
-        snprintf(buffer, 1000, "%lu,\"%s\",\"%s\",%.6f,%.6f,%.6f",
-                 bus, psdb.bus_number2bus_name(bus).c_str(),
-                 (loads[i]->get_identifier()).c_str(),
-                 s.real(), s.imag(), psdb.get_bus_voltage_in_pu(bus));
-        file<<buffer<<endl;
-    }
+        vector<LOAD*> loads = psdb.get_all_loads();
+        size_t nload = loads.size();
+        if(nload>0)
+        {
+            file<<"% Load"<<endl;
+            file<<"BUS,NAME,ID,P/MW,Q/MVAR,VOLTAGE/PU"<<endl;
+            for(size_t i=0; i!=nload; ++i)
+            {
+                size_t bus = loads[i]->get_load_bus();
+                complex<double> s = loads[i]->get_actual_total_load_in_MVA();
+                /*file<<bus<<",\""<<loads[i]->get_identifier()<<"\","
+                    <<setprecision(6)<<fixed<<s.real()<<","
+                    <<setprecision(6)<<fixed<<s.imag()<<","
+                    <<setprecision(6)<<db->get_bus_voltage_in_pu(bus)<<endl;*/
+                snprintf(buffer, 1000, "%lu,\"%s\",\"%s\",%.6f,%.6f,%.6f",
+                         bus, psdb.bus_number2bus_name(bus).c_str(),
+                         (loads[i]->get_identifier()).c_str(),
+                         s.real(), s.imag(), psdb.get_bus_voltage_in_pu(bus));
+                file<<buffer<<endl;
+            }
+        }
 
-    vector<LINE*> lines = psdb.get_all_lines();
-    size_t nline = lines.size();
-    if(nline>0)
-    {
-        file<<"% Line"<<endl;
-        file<<"IBUS,INAME,JBUS,JNAMEID,PI/MW,QI/MVAR,PJ/MW,QJ/MVAR,II/KA,IJ/KA"<<endl;
-    }
-    for(size_t i=0; i!=nline; ++i)
-    {
-        size_t ibus = lines[i]->get_sending_side_bus();
-        size_t jbus = lines[i]->get_receiving_side_bus();
-        complex<double> si = lines[i]->get_line_complex_power_at_sending_side_in_MVA();
-        complex<double> sj = lines[i]->get_line_complex_power_at_receiving_side_in_MVA();
-        /*file<<lines[i]->get_sending_side_bus()<<","<<lines[i]->get_receiving_side_bus()<<",\""<<lines[i]->get_identifier()<<"\","
-            <<setprecision(6)<<fixed<<si.real()<<","
-            <<setprecision(6)<<fixed<<si.imag()<<","
-            <<setprecision(6)<<fixed<<sj.real()<<","
-            <<setprecision(6)<<fixed<<sj.imag()<<","
-            <<setprecision(6)<<fixed<<steps_fast_complex_abs(lines[i]->get_line_complex_current_at_sending_side_in_kA())<<","
-            <<setprecision(6)<<fixed<<steps_fast_complex_abs(lines[i]->get_line_complex_current_at_receiving_side_in_kA())<<endl;*/
+        vector<LINE*> lines = psdb.get_all_lines();
+        size_t nline = lines.size();
+        if(nline>0)
+        {
+            file<<"% Line"<<endl;
+            file<<"IBUS,INAME,JBUS,JNAMEID,PI/MW,QI/MVAR,PJ/MW,QJ/MVAR,II/KA,IJ/KA"<<endl;
+            for(size_t i=0; i!=nline; ++i)
+            {
+                size_t ibus = lines[i]->get_sending_side_bus();
+                size_t jbus = lines[i]->get_receiving_side_bus();
+                complex<double> si = lines[i]->get_line_complex_power_at_sending_side_in_MVA();
+                complex<double> sj = lines[i]->get_line_complex_power_at_receiving_side_in_MVA();
+                /*file<<lines[i]->get_sending_side_bus()<<","<<lines[i]->get_receiving_side_bus()<<",\""<<lines[i]->get_identifier()<<"\","
+                    <<setprecision(6)<<fixed<<si.real()<<","
+                    <<setprecision(6)<<fixed<<si.imag()<<","
+                    <<setprecision(6)<<fixed<<sj.real()<<","
+                    <<setprecision(6)<<fixed<<sj.imag()<<","
+                    <<setprecision(6)<<fixed<<steps_fast_complex_abs(lines[i]->get_line_complex_current_at_sending_side_in_kA())<<","
+                    <<setprecision(6)<<fixed<<steps_fast_complex_abs(lines[i]->get_line_complex_current_at_receiving_side_in_kA())<<endl;*/
 
-        snprintf(buffer, 1000, "%lu,\"%s\",%lu,\"%s\",\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f,%.6f",
-                 ibus, psdb.bus_number2bus_name(ibus).c_str(),
-                 jbus, psdb.bus_number2bus_name(jbus).c_str(),
-                 (lines[i]->get_identifier()).c_str(),
-                 si.real(), si.imag(),sj.real(), sj.imag(),
-                 steps_fast_complex_abs(lines[i]->get_line_complex_current_at_sending_side_in_kA()),
-                 steps_fast_complex_abs(lines[i]->get_line_complex_current_at_receiving_side_in_kA()));
-        file<<buffer<<endl;
-    }
+                snprintf(buffer, 1000, "%lu,\"%s\",%lu,\"%s\",\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f,%.6f",
+                         ibus, psdb.bus_number2bus_name(ibus).c_str(),
+                         jbus, psdb.bus_number2bus_name(jbus).c_str(),
+                         (lines[i]->get_identifier()).c_str(),
+                         si.real(), si.imag(),sj.real(), sj.imag(),
+                         steps_fast_complex_abs(lines[i]->get_line_complex_current_at_sending_side_in_kA()),
+                         steps_fast_complex_abs(lines[i]->get_line_complex_current_at_receiving_side_in_kA()));
+                file<<buffer<<endl;
+            }
+        }
 
-    vector<TRANSFORMER*> transformers = psdb.get_all_transformers();
-    size_t ntrans = transformers.size();
-    if(ntrans>0)
-    {
-        file<<"% Transformer"<<endl;
-        file<<"IBUS,INAME,JBUS,JNAME,KBUS,KNAME,ID,PI/MW,QI/MVAR,PJ/MW,QJ/MVAR,PK/MW,QK/MVAR,KI/PU,KJ/PU,KK/PU"<<endl;
-    }
-    for(size_t i=0; i!=ntrans; ++i)
-    {
-        size_t ibus = transformers[i]->get_winding_bus(PRIMARY_SIDE);
-        size_t jbus = transformers[i]->get_winding_bus(SECONDARY_SIDE);
-        size_t kbus = transformers[i]->get_winding_bus(TERTIARY_SIDE);
-
-        complex<double> sp = transformers[i]->get_winding_complex_power_in_MVA(PRIMARY_SIDE);
-        complex<double> ss = transformers[i]->get_winding_complex_power_in_MVA(SECONDARY_SIDE);
-        complex<double> st = transformers[i]->get_winding_complex_power_in_MVA(TERTIARY_SIDE);
-
-        /*file<<transformers[i]->get_winding_bus(PRIMARY_SIDE)<<","
-            <<transformers[i]->get_winding_bus(SECONDARY_SIDE)<<","
-            <<transformers[i]->get_winding_bus(TERTIARY_SIDE)<<",\""<<transformers[i]->get_identifier()<<"\","
-            <<setprecision(6)<<fixed<<sp.real()<<","
-            <<setprecision(6)<<fixed<<sp.imag()<<","
-            <<setprecision(6)<<fixed<<ss.real()<<","
-            <<setprecision(6)<<fixed<<ss.imag()<<","
-            <<setprecision(6)<<fixed<<st.real()<<","
-            <<setprecision(6)<<fixed<<st.imag()<<","
-            <<setprecision(6)<<fixed<<transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE)<<","
-            <<setprecision(6)<<fixed<<transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE)<<","
-            <<setprecision(6)<<fixed<<transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(TERTIARY_SIDE)<<endl;*/
+        vector<TRANSFORMER*> transformers = psdb.get_all_transformers();
+        size_t ntrans = transformers.size();
+        if(ntrans>0)
+        {
+            file<<"% Transformer"<<endl;
+            file<<"IBUS,INAME,JBUS,JNAME,KBUS,KNAME,ID,PI/MW,QI/MVAR,PJ/MW,QJ/MVAR,PK/MW,QK/MVAR,KI/PU,KJ/PU,KK/PU"<<endl;
+            for(size_t i=0; i!=ntrans; ++i)
+            {
+                size_t ibus = transformers[i]->get_winding_bus(PRIMARY_SIDE);
+                size_t jbus = transformers[i]->get_winding_bus(SECONDARY_SIDE);
+                size_t kbus = transformers[i]->get_winding_bus(TERTIARY_SIDE);
+
+                complex<double> sp = transformers[i]->get_winding_complex_power_in_MVA(PRIMARY_SIDE);
+                complex<double> ss = transformers[i]->get_winding_complex_power_in_MVA(SECONDARY_SIDE);
+                complex<double> st = transformers[i]->get_winding_complex_power_in_MVA(TERTIARY_SIDE);
+
+                /*file<<transformers[i]->get_winding_bus(PRIMARY_SIDE)<<","
+                    <<transformers[i]->get_winding_bus(SECONDARY_SIDE)<<","
+                    <<transformers[i]->get_winding_bus(TERTIARY_SIDE)<<",\""<<transformers[i]->get_identifier()<<"\","
+                    <<setprecision(6)<<fixed<<sp.real()<<","
+                    <<setprecision(6)<<fixed<<sp.imag()<<","
+                    <<setprecision(6)<<fixed<<ss.real()<<","
+                    <<setprecision(6)<<fixed<<ss.imag()<<","
+                    <<setprecision(6)<<fixed<<st.real()<<","
+                    <<setprecision(6)<<fixed<<st.imag()<<","
+                    <<setprecision(6)<<fixed<<transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE)<<","
+                    <<setprecision(6)<<fixed<<transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE)<<","
+                    <<setprecision(6)<<fixed<<transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(TERTIARY_SIDE)<<endl;*/
 
 
-        snprintf(buffer, 1000, "%lu,\"%s\",%lu,\"%s\",%lu,\"%s\",\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f",
-                 ibus, psdb.bus_number2bus_name(ibus).c_str(),
-                 jbus, psdb.bus_number2bus_name(jbus).c_str(),
-                 kbus, psdb.bus_number2bus_name(kbus).c_str(),
-                 (transformers[i]->get_identifier()).c_str(),
-                 sp.real(), sp.imag(), ss.real(), ss.imag(), st.real(), st.imag(),
-                 transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE),
-                 transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE),
-                 transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(TERTIARY_SIDE));
-        file<<buffer<<endl;
-    }
+                snprintf(buffer, 1000, "%lu,\"%s\",%lu,\"%s\",%lu,\"%s\",\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f",
+                         ibus, psdb.bus_number2bus_name(ibus).c_str(),
+                         jbus, psdb.bus_number2bus_name(jbus).c_str(),
+                         kbus, psdb.bus_number2bus_name(kbus).c_str(),
+                         (transformers[i]->get_identifier()).c_str(),
+                         sp.real(), sp.imag(), ss.real(), ss.imag(), st.real(), st.imag(),
+                         transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(PRIMARY_SIDE),
+                         transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(SECONDARY_SIDE),
+                         transformers[i]->get_winding_off_nominal_turn_ratio_in_pu(TERTIARY_SIDE));
+                file<<buffer<<endl;
+            }
+        }
 
-    vector<HVDC*> hvdcs = psdb.get_all_hvdcs();
-    size_t nhvdc = hvdcs.size();
-    if(nhvdc>0)
-    {
-        file<<"% Hvdc"<<endl;
-        file<<"IBUS,INAME,JBUS,JNAME,ID,PR/MW,QR/MVAR,PI/MW,QI/MVAR,ALPHA/DEG,GAMMA/DEG,VDCR/KV,VDCI/KV,IDC/KA,VACR/PU,VACI/PU,KR/PU,KI/PU"<<endl;
+        vector<HVDC*> hvdcs = psdb.get_all_hvdcs();
+        size_t nhvdc = hvdcs.size();
+        if(nhvdc>0)
+        {
+            file<<"% Hvdc"<<endl;
+            file<<"IBUS,INAME,JBUS,JNAME,ID,PR/MW,QR/MVAR,PI/MW,QI/MVAR,ALPHA/DEG,GAMMA/DEG,VDCR/KV,VDCI/KV,IDC/KA,VACR/PU,VACI/PU,KR/PU,KI/PU"<<endl;
+            for(size_t i=0; i!=nhvdc; ++i)
+            {
+                size_t busr = hvdcs[i]->get_converter_bus(RECTIFIER);
+                size_t busi = hvdcs[i]->get_converter_bus(INVERTER);
+                /*file<<busr<<","<<busi<<",\""<<hvdcs[i]->get_identifier()<<"\","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_active_power_in_MW(RECTIFIER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_reactive_power_in_MVar(RECTIFIER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_active_power_in_MW(INVERTER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_reactive_power_in_MVar(INVERTER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_alpha_or_gamma_in_deg(RECTIFIER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_alpha_or_gamma_in_deg(INVERTER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_dc_voltage_in_kV(RECTIFIER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_dc_voltage_in_kV(INVERTER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_dc_current_in_kA(RECTIFIER)<<","
+                    <<setprecision(6)<<fixed<<db->get_bus_voltage_in_pu(busr)<<","
+                    <<setprecision(6)<<fixed<<db->get_bus_voltage_in_pu(busi)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_transformer_tap_in_pu(RECTIFIER)<<","
+                    <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_transformer_tap_in_pu(INVERTER)<<endl;*/
+                snprintf(buffer, 1000, "%lu,\"%s\",%lu,\"%s\",\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f",
+                         busr, psdb.bus_number2bus_name(busr).c_str(),
+                         busi, psdb.bus_number2bus_name(busi).c_str(),
+                         (hvdcs[i]->get_identifier()).c_str(),
+                         hvdcs[i]->get_converter_ac_active_power_in_MW(RECTIFIER),
+                         hvdcs[i]->get_converter_ac_reactive_power_in_MVar(RECTIFIER),
+                         hvdcs[i]->get_converter_ac_active_power_in_MW(INVERTER),
+                         hvdcs[i]->get_converter_ac_reactive_power_in_MVar(INVERTER),
+                         hvdcs[i]->get_converter_alpha_or_gamma_in_deg(RECTIFIER),
+                         hvdcs[i]->get_converter_alpha_or_gamma_in_deg(INVERTER),
+                         hvdcs[i]->get_converter_dc_voltage_in_kV(RECTIFIER),
+                         hvdcs[i]->get_converter_dc_voltage_in_kV(INVERTER),
+                         hvdcs[i]->get_converter_dc_current_in_kA(RECTIFIER),
+                         psdb.get_bus_voltage_in_pu(busr),
+                         psdb.get_bus_voltage_in_pu(busi),
+                         hvdcs[i]->get_converter_transformer_tap_in_pu(RECTIFIER),
+                         hvdcs[i]->get_converter_transformer_tap_in_pu(INVERTER));
+                file<<buffer<<endl;
+            }
+        }
+
+        file.close();
     }
-    for(size_t i=0; i!=nhvdc; ++i)
+    else
     {
-        size_t busr = hvdcs[i]->get_converter_bus(RECTIFIER);
-        size_t busi = hvdcs[i]->get_converter_bus(INVERTER);
-        /*file<<busr<<","<<busi<<",\""<<hvdcs[i]->get_identifier()<<"\","
-            <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_active_power_in_MW(RECTIFIER)<<","
-            <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_reactive_power_in_MVar(RECTIFIER)<<","
-            <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_active_power_in_MW(INVERTER)<<","
-            <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_ac_reactive_power_in_MVar(INVERTER)<<","
-            <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_alpha_or_gamma_in_deg(RECTIFIER)<<","
-            <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_alpha_or_gamma_in_deg(INVERTER)<<","
-            <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_dc_voltage_in_kV(RECTIFIER)<<","
-            <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_dc_voltage_in_kV(INVERTER)<<","
-            <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_dc_current_in_kA(RECTIFIER)<<","
-            <<setprecision(6)<<fixed<<db->get_bus_voltage_in_pu(busr)<<","
-            <<setprecision(6)<<fixed<<db->get_bus_voltage_in_pu(busi)<<","
-            <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_transformer_tap_in_pu(RECTIFIER)<<","
-            <<setprecision(6)<<fixed<<hvdcs[i]->get_converter_transformer_tap_in_pu(INVERTER)<<endl;*/
-        snprintf(buffer, 1000, "%lu,\"%s\",%lu,\"%s\",\"%s\",%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f,%.6f",
-                 busr, psdb.bus_number2bus_name(busr).c_str(),
-                 busi, psdb.bus_number2bus_name(busi).c_str(),
-                 (hvdcs[i]->get_identifier()).c_str(),
-                 hvdcs[i]->get_converter_ac_active_power_in_MW(RECTIFIER),
-                 hvdcs[i]->get_converter_ac_reactive_power_in_MVar(RECTIFIER),
-                 hvdcs[i]->get_converter_ac_active_power_in_MW(INVERTER),
-                 hvdcs[i]->get_converter_ac_reactive_power_in_MVar(INVERTER),
-                 hvdcs[i]->get_converter_alpha_or_gamma_in_deg(RECTIFIER),
-                 hvdcs[i]->get_converter_alpha_or_gamma_in_deg(INVERTER),
-                 hvdcs[i]->get_converter_dc_voltage_in_kV(RECTIFIER),
-                 hvdcs[i]->get_converter_dc_voltage_in_kV(INVERTER),
-                 hvdcs[i]->get_converter_dc_current_in_kA(RECTIFIER),
-                 psdb.get_bus_voltage_in_pu(busr),
-                 psdb.get_bus_voltage_in_pu(busi),
-                 hvdcs[i]->get_converter_transformer_tap_in_pu(RECTIFIER),
-                 hvdcs[i]->get_converter_transformer_tap_in_pu(INVERTER));
-        file<<buffer<<endl;
+        osstream<<"File '"<<filename<<"' cannot be opened for saving extended powerflow result to file."<<endl
+          <<"No powerflow result will be exported.";
+        toolkit.show_information_with_leading_time_stamp(osstream);
+        return;
     }
-
-    file.close();
 }
 
 void POWERFLOW_SOLVER::save_network_matrix_to_file(string filename) const
@@ -2267,25 +2271,27 @@ void POWERFLOW_SOLVER::save_bus_powerflow_result_to_file(string filename) const
     POWER_SYSTEM_DATABASE& psdb = toolkit.get_power_system_database();
 
     ofstream file(filename);
-    if(not file.is_open())
+    if(file.is_open())
+    {
+        file<<"BUS,VOLTAGE,ANGLE"<<endl;
+
+        vector<BUS*> buses = psdb.get_all_buses();
+        size_t nbus = buses.size();
+        for(size_t i=0; i!=nbus; ++i)
+        {
+            file<<buses[i]->get_bus_number()<<","
+                <<setprecision(6)<<fixed<<buses[i]->get_voltage_in_pu()<<","
+                <<setprecision(6)<<fixed<<buses[i]->get_angle_in_deg()<<endl;
+        }
+        file.close();
+    }
+    else
     {
         osstream<<"File '"<<filename<<"' cannot be opened for saving bus powerflow result to file."<<endl
           <<"No bus powerflow result will be exported.";
         toolkit.show_information_with_leading_time_stamp(osstream);
         return;
     }
-
-    file<<"BUS,VOLTAGE,ANGLE"<<endl;
-
-    vector<BUS*> buses = psdb.get_all_buses();
-    size_t nbus = buses.size();
-    for(size_t i=0; i!=nbus; ++i)
-    {
-        file<<buses[i]->get_bus_number()<<","
-            <<setprecision(6)<<fixed<<buses[i]->get_voltage_in_pu()<<","
-            <<setprecision(6)<<fixed<<buses[i]->get_angle_in_deg()<<endl;
-    }
-    file.close();
 }
 
 size_t POWERFLOW_SOLVER::get_iteration_count() const