diff --git a/README.md b/README.md
index ba856a03..e049f5d7 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,6 @@ Here is a complete procedure of how to build STEPS.
## How to use stepspy
stepspy is a Python module of advanced APIs of STEPS. It enables most of STEPS applications. It is recommended to use stepspy in Python 3 of 64-bit version, though Python 2 is also supported.
-stepspy will be uploaded to pypi.org soon, and will be installed via:
+stepspy has been uploaded to pypi.org, and can be installed via:
- pip3 install stepspy
- python -m pip install stepspy
diff --git a/bench/IEEE39_wind.dyr b/bench/IEEE39_wind.dyr
index 0bba7f4a..5bd1bb54 100644
--- a/bench/IEEE39_wind.dyr
+++ b/bench/IEEE39_wind.dyr
@@ -67,17 +67,17 @@
/ 36 'WT3G0' 1 560 1.5 0.02 0.2 0.02 0.5 0.9 1.22
/ 0.02 0.8 20.0
/ 0.0 0.0 0.1 -0.1 /
- 36 'WT3G2' 1 0.02 0.02 0.0 0.0 0.1 1.5
+ 36 'WT3G2' 1 600 0.02 0.02 0.0 0.0 0.1 1.5
0.5 0.9 1.22 0.8 20.0 0.2 0.02/
36 'AERD0' 1 0 3 13.0 1.0 1.25 0.7 1.2 1.25
0.5176 116.0 0.4 5.0 21.0 0.0068 0.08 0.035/
36 'WT3T0' 1 2.5, 0.5 0.3 1.0 0.0/
- 36 'WT3E0' 1 0 0 1
- 0.0, 0.02, 1.0, 18.0, 0.05, 5.0, -0.5, 0.5, 0.15, 0.05,
- 0.1, 0.9, 1.1, 10.0, -1.5, 1.45,
- 10.0, 0.0, 0.00001, 20.0, 1.0, 100.0, 0.1, 0.0, 0.0, 0.0
- -0.45, 0.45, 0.05, 0.04, 1.12, 1.1/
-/ 36 'WT3P0' 1 0, 60.0, 150.0, 25.0, 0.2, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1, 90.0, 0.0, 90.0 1.0/
+/ 36 'WT3E0' 1 0 0 1
+/ 0.0, 0.02, 1.0, 18.0, 0.05, 5.0, -0.5, 0.5, 0.15, 0.05,
+/ 0.1, 0.9, 1.1, 10.0, -1.5, 1.45,
+/ 60.0, 3.0, 0.6, 0.0, 1.0, 15.0, 0.1, 0.0, 0.0, 0.0
+/ -0.45, 0.45, 0.05, 0.04, 1.12, 1.1/
+ 36 'WT3P0' 1 0, 60.0, 150.0, 25.0, 0.2, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1, 90.0, 0.0, 90.0 1.0/
36 'WTRLY0' 1
0
2 0.4 0.1 1.3 0.1
@@ -87,16 +87,16 @@
/ 37 'WT3G0' 1 560 1.5 0.02 0.2 0.02 0.5 0.9 1.22
/ 0.02 0.8 20.0
/ 0.0 0.0 0.1 -0.1 /
- 37 'WT3G2' 1 0.02 0.02 0.0 0.0 0.1 1.5
+ 37 'WT3G2' 1 600 0.02 0.02 0.0 0.0 0.1 1.5
0.5 0.9 1.22 0.8 20.0 0.2 0.02/
37 'AERD0' 1 0 3 13.0 1.0 1.25 0.7 1.2 1.25
0.5176 116.0 0.4 5.0 21.0 0.0068 0.08 0.035/
37 'WT3T0' 1 2.5, 0.5 0.3 1.0 0.0/
- 37 'WT3E0' 1 0 0 1
- 0.0, 0.02, 1.0, 18.0, 0.05, 5.0, -0.5, 0.5, 0.15, 0.05,
- 0.1, 0.9, 1.1, 10.0, -1.5, 1.45,
- 60.0, 3.0, 0.6, 20.0, 1.0, 15.0, 0.1, 0.0, 0.0, 0.0
- -0.45, 0.45, 0.05, 0.04, 1.12, 1.1/
+/ 37 'WT3E0' 1 0 0 1
+/ 0.0, 0.02, 1.0, 18.0, 0.05, 5.0, -0.5, 0.5, 0.15, 0.05,
+/ 0.1, 0.9, 1.1, 10.0, -1.5, 1.45,
+/ 60.0, 3.0, 0.6, 0.0, 1.0, 15.0, 0.1, 0.0, 0.0, 0.0
+/ -0.45, 0.45, 0.05, 0.04, 1.12, 1.1/
37 'WT3P0' 1 0, 60.0, 150.0, 25.0, 0.2, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1, 90.0, 0.0, 90.0 1.0/
37 'WTRLY0' 1
0
diff --git a/code/STEPS.cbp b/code/STEPS.cbp
index f3a0b522..53b5a301 100644
--- a/code/STEPS.cbp
+++ b/code/STEPS.cbp
@@ -17,6 +17,7 @@
+
@@ -28,8 +29,10 @@
+
+
@@ -355,13 +358,13 @@
-
+
+
-
+
-
diff --git a/code/STEPS.depend b/code/STEPS.depend
index 409270b4..8912e8eb 100644
--- a/code/STEPS.depend
+++ b/code/STEPS.depend
@@ -1,26 +1,17 @@
# depslib dependency file v1.0
-1563081783 source:c:\users\lichg\steps\code\source\apis\steps_api_add_devices.cpp
- "header/apis/steps_api.h"
- "header/basic/utility.h"
- "header/steps_namespace.h"
- "header/data_imexporter/psse_imexporter.h"
- "header/data_imexporter/bpa_imexporter.h"
-
-1561862316 c:\users\lichg\steps\code\header\apis\steps_api.h
-
- "header/basic/constants.h"
-
-1558487093 c:\users\lichg\steps\code\header\steps.h
+1566651734 source:c:\users\lichg\steps\code\main_arxl_simulation.cpp
+
+
"header/power_system_database.h"
- "header/toolkit/powerflow_solver/powerflow_solver.h"
+ "header/steps_namespace.h"
"header/toolkit/dynamic_simulator/dynamic_simulator.h"
- "header/network/network_matrix.h"
- "header/basic/constants.h"
- "header/apis/steps_api_search_buffer.h"
-
-
+ "header/toolkit/powerflow_solver/powerflow_solver.h"
+ "header/basic/utility.h"
+ "header/data_imexporter/psse_imexporter.h"
+ "header/prepare_for_tests/prepare_models_for_test.h"
+ "header/data_imexporter/equivalent_model_imexporter.h"
-1564670765 c:\users\lichg\steps\code\header\power_system_database.h
+1566651734 c:\users\lichg\steps\code\header\power_system_database.h
"header/device/bus.h"
"header/device/generator.h"
"header/device/wt_generator.h"
@@ -43,7 +34,7 @@
"header/model/sg_models/turbine_governor_model/turbine_governor_model.h"
-1556950220 c:\users\lichg\steps\code\header\device\bus.h
+1566885118 c:\users\lichg\steps\code\header\device\bus.h
"header/device/device.h"
"header/basic/area.h"
"header/basic/zone.h"
@@ -55,7 +46,7 @@