Update T&D co-sim and dyn sim mod euler method

.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ipss-plugin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

ipss.test.plugin.core/.classpathSrc → ipss.cmd/.classpath

@@ -1,25 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/EMF"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Spring"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.plugin.base"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.plugin.dstab"/>
-	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/apache/commons-logging.jar"/>
-	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/apache/commons-math3-3.1.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.plugin.core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.common"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.core_EMF"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.numeric"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ieee.odm_pss"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ieee.odm.schema"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.dist_EMF"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.dstab_EMF"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.simu_EMF"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.dcSen_EMF"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.pssl"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.util"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/EMF"/>
+	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/apache/commons-logging.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.pssl"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ieee.odm_pss"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ieee.odm.schema"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.core_EMF"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.dist_EMF"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.numeric"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.simu_EMF"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.plugin.base"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.plugin.core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.plugin.dstab"/>
+	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/apache/commons-math3-3.6.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

ipss.cmd/.gitignore

@@ -0,0 +1 @@
+/bin

ipss.cmd/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ipss.cmd</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

ipss.cmd/script/ipssCmd.bat

@@ -0,0 +1,24 @@
+@echo off
+
+REM define ipss lib location
+set BasePath=D:\eclipse\ws\gitRepo\ipss-common
+set IpssLib_HOME=%BasePath%\ipss.lib\lib
+set Pty3rd_HOME=%BasePath%\ipss.lib.3rdPty\lib
+
+REM define Java classpath
+
+REM ODM and ipss lib files
+set IPSS_CLASSPATH=%IpssLib_HOME%\ieee\ieee.odm_pss.jar;%IpssLib_HOME%\ieee\ieee.odm.schema.jar;%IpssLib_HOME%\ipss\ipss_core.impl.jar;%IpssLib_HOME%\ipss\ipss_core.jar;%IpssLib_HOME%\ipss\ipss_plugin.jar;%IpssLib_HOME%\ipss\ipss_pssl.jar;
+
+REM EMF lib files
+set IPSS_CLASSPATH=%IPSS_CLASSPATH%;%Pty3rd_HOME%\eclipse\org.eclipse.emf.common.jar;%Pty3rd_HOME%\eclipse\org.eclipse.emf.ecore.change.jar;%Pty3rd_HOME%\eclipse\org.eclipse.emf.ecore.jar;%Pty3rd_HOME%\eclipse\org.eclipse.emf.ecore.xmi.jar;%Pty3rd_HOME%\eclipse\org.eclipse.emf.jar;
+
+REM third-party lib files
+set IPSS_CLASSPATH=%IPSS_CLASSPATH%;%Pty3rd_HOME%\sparse\csparsej-1.1.1.jar;%Pty3rd_HOME%\apache\commons-math3-3.2.jar;%Pty3rd_HOME%\apache\commons-logging.jar;%Pty3rd_HOME%\spring\spring-2.5.6.jar;%Pty3rd_HOME%\cache\hazelcast-3.1.jar;%Pty3rd_HOME%\cache\hazelcast-client-3.1.jar;%Pty3rd_HOME%\json\gson-2.2.2.jar;
+
+REM define Java cmd
+set JAVA_CMD="C:\Program Files\Java\jre8\bin\java"
+
+REM launch the IpssCmd 
+REM sample "ipssCmd Aclf testData/aclf/aclfrun.json"
+%JAVA_CMD% -classpath %IPSS_CLASSPATH% -Xms512m -Xmx1024m org.interpss.app.IpssCmd -t %1 -c %2

ipss.cmd/src/org/interpss/app/IpssCmd.java

@@ -0,0 +1,86 @@
+package org.interpss.app;
+
+import org.interpss.IpssCorePlugin;
+import org.interpss.pssl.plugin.cmd.CmdRunner;
+import org.interpss.pssl.simu.BaseDSL;
+
+import com.interpss.CoreCommonFactory;
+import com.interpss.common.exp.InterpssException;
+
+public class IpssCmd {
+	/**
+	 * flag to control printing cmd help info 
+	 */
+	private static boolean outHelpInfo = false;
+
+	/**
+	 * Cmd run type 
+	 */
+	private static CmdRunner.RunType runType = CmdRunner.RunType.Aclf;
+
+	/**
+	 * Cdm run control file. It is in JSON format
+	 */
+	private static String controlFilename = null;
+
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		// init InterPSS runtime env
+		IpssCorePlugin.init();
+		BaseDSL.setMsgHub(CoreCommonFactory.getIpssMsgHub());		
+
+		try {
+			parseCmdInput(args);
+
+			if (outHelpInfo)
+				System.out.println(getHelpInfo());
+
+			new CmdRunner()
+					.runType(runType)
+					.controlFilename(controlFilename)
+					.run();
+
+		} catch (Exception e) {
+			System.err.println(e.toString());
+			e.printStackTrace();
+		}
+
+	}
+
+	private static void parseCmdInput(String[] args) throws InterpssException {
+		for (int cnt = 0; cnt < args.length; cnt++) {
+
+			// parse help message output flag
+			if (HelpOptStr.equals(args[cnt])) {
+				outHelpInfo = true;
+			}
+
+			// parse run type info 
+			else if (RunTypeOptStr.equals(args[cnt])) {
+				String str = args[++cnt];
+				runType = str.equalsIgnoreCase("Acsc") ? CmdRunner.RunType.Acsc : 
+							str.equalsIgnoreCase("DStab") ? CmdRunner.RunType.DStab : 
+								CmdRunner.RunType.Aclf;
+			} 
+
+			// parse run control file
+			else if (ControlOptStr.equals(args[cnt])) {
+				controlFilename = args[++cnt];
+			} 
+		}
+	}
+
+	private final static String RunTypeOptStr 	= "-t";
+	private final static String ControlOptStr 	= "-c";
+	private final static String HelpOptStr 		= "-h";
+
+	private static String getHelpInfo() {
+		return "java org.interpss.app.IpssCmd [-h] [-t Aclf|Acsc|DStab] -c controlFile \n"
+				+ "  -h for help info\n"
+				+ "  -t Simulation type Aclf|Acsc|DStab, default Aclf\n"
+				+ "  -c JSON file to control the run\n";
+	}	
+
+}

ipss.cmd/testData/aclf/aclfrun.json

@@ -0,0 +1,13 @@
+{
+	"dslRunnerClassName":"org.interpss.pssl.plugin.cmd.AclfDslRunner",
+	"aclfCaseFileName":"testData/aclf/ieee14.ieee",
+	"aclfOutputFileName":"ieee14_lfResult.txt",
+	"format":"IEEECommonFormat",
+	"version":"PSSE_30",
+	"lfMethod":"NR",
+	"maxIteration":20,
+	"tolerance":1.0E-4,
+	"nonDivergent":false,
+	"initBusVoltage":false,
+	"accFactor":1.0
+}

ipss.cmd/testData/acsc/acscrun.json

@@ -0,0 +1,13 @@
+{	
+	"dslRunnerClassName":"org.interpss.pssl.plugin.cmd.AcscDslRunner",
+	"runAclf":false,
+ 	"runAclfConfig":{"lfMethod":"NR","maxIteration":20,"tolerance":1.0E-4,"nonDivergent":false,"initBusVoltage":false,"accFactor":1.0},
+ 	"type":"BUS_FAULT",
+ 	"category":"GROUND_3P",
+ 	"zLG":{"re":0.0,"im":0.0},
+ 	"zLL":{"re":0.0,"im":0.0},
+ 	"faultBusId":"\u003cid\u003e",
+ 	"faultBranchFromId":"\u003cid\u003e",
+ 	"faultBranchToId":"\u003cid\u003e",
+ 	"distance":0.0
+ }

ipss.cmd/testData/acsc/ieee9.raw

@@ -0,0 +1,52 @@
+0,    100.00, 30 / PSS(tm)E-30 RAW created by rawd30  SUN, OCT 07 2012  11:29
+ 00/00/01                      100.0  0    0
+ 0
+     1,'BUS-1       ',  16.5000,3,     0.000,     0.000,   1,   1,1.04000,   0.0000,   1
+     2,'BUS-2       ',  18.0000,2,     0.000,     0.000,   1,   1,1.02500,   9.2800,   1
+     3,'BUS-3       ',  13.8000,2,     0.000,     0.000,   1,   1,1.02500,   4.6600,   1
+     4,'BUS-4       ', 230.0000,1,     0.000,     0.000,   1,   1,1.02500,  -2.2200,   1
+     5,'BUS-5       ', 230.0000,1,     0.000,     0.000,   1,   1,0.99500,  -3.9900,   1
+     6,'BUS-6       ', 230.0000,1,     0.000,     0.000,   1,   1,1.01200,  -3.6900,   1
+     7,'BUS-7       ', 230.0000,1,     0.000,     0.000,   1,   1,1.02500,   3.7200,   1
+     8,'BUS-8       ', 230.0000,1,     0.000,     0.000,   1,   1,1.01500,   0.7300,   1
+     9,'BUS-9       ', 230.0000,1,     0.000,     0.000,   1,   1,1.03200,   1.9700,   1
+ 0 / END OF BUS DATA, BEGIN LOAD DATA
+     5,'1 ',1,   1,   1,   125.000,    50.000,     0.000,     0.000,     0.000,     0.000,   1
+     6,'1 ',1,   1,   1,    90.000,    30.000,     0.000,     0.000,     0.000,     0.000,   1
+     8,'1 ',1,   1,   1,   100.000,    35.000,     0.000,     0.000,     0.000,     0.000,   1
+ 0 / END OF LOAD DATA, BEGIN GENERATOR DATA
+     1,'1 ',    71.640,    27.050,  9999.000, -9999.000,1.04000,     0,   100.000,   0.00000,   0.04,   0.00000,   0.00000,1.00000,1,  100.0,  9999.000, -9999.000,   1,1.0000,   0,0.0000,   0,0.0000,   0,0.0000
+     2,'1 ',   163.000,     6.650,  9999.000, -9999.000,1.02500,     0,   100.000,   0.00000,   0.089,   0.00000,   0.00000,1.00000,1,  100.0,  9999.000, -9999.000,   1,1.0000,   0,0.0000,   0,0.0000,   0,0.0000
+     3,'1 ',    85.000,   -10.860, 99990.000,-99990.000,1.02500,     0,   100.000,   0.00000,   0.107,   0.00000,   0.00000,1.00000,1,  100.0,  9999.000, -9999.000,   1,1.0000,   0,0.0000,   0,0.0000,   0,0.0000
+ 0 / END OF GENERATOR DATA, BEGIN NON-TRANSFORMER BRANCH DATA
+     7,      8,'0 ',   0.00850,   0.07200,   0.14900,    0.00,    0.00,    0.00,  0.00000,  0.00000,  0.00000,  0.00000,1,   0.00,   1,1.0000,   0,0.0000,   0,0.0000,   0,0.0000
+     8,     -9,'0 ',   0.01190,   0.10080,   0.20900,    0.00,    0.00,    0.00,  0.00000,  0.00000,  0.00000,  0.00000,1,   0.00,   1,1.0000,   0,0.0000,   0,0.0000,   0,0.0000
+     5,     -7,'0 ',   0.03200,   0.16100,   0.30600,    0.00,    0.00,    0.00,  0.00000,  0.00000,  0.00000,  0.00000,1,   0.00,   1,1.0000,   0,0.0000,   0,0.0000,   0,0.0000
+     6,     -9,'0 ',   0.03900,   0.17000,   0.35800,    0.00,    0.00,    0.00,  0.00000,  0.00000,  0.00000,  0.00000,1,   0.00,   1,1.0000,   0,0.0000,   0,0.0000,   0,0.0000
+     4,     -5,'0 ',   0.01000,   0.08500,   0.17600,    0.00,    0.00,    0.00,  0.00000,  0.00000,  0.00000,  0.00000,1,   0.00,   1,1.0000,   0,0.0000,   0,0.0000,   0,0.0000
+     4,     -6,'0 ',   0.01700,   0.09200,   0.15800,    0.00,    0.00,    0.00,  0.00000,  0.00000,  0.00000,  0.00000,1,   0.00,   1,1.0000,   0,0.0000,   0,0.0000,   0,0.0000
+ 0 / END OF NON-TRANSFORMER BRANCH DATA, BEGIN TRANSFORMER DATA
+   1,  4,  0,  '1',  1,  1,  1,  0,  0,  2,  'Gen1_to_Bus1_cirId_1',  1,  1,  1.0,  0,  0.0,  0,  0.0,  0,  0.0
+0.0000,  0.0567,  100.0
+1.0000,  16.5,  0.0,  0.0,  0.0,  0.0,  0,  0,  1.1,  0.9,  1.1,  0.9,  33,  0,  0.0,  0.0
+1.0,  230.0,  
+   2,  7,  0,  '1',  1,  1,  1,  0,  0,  2,  'Gen2_to_Bus2_cirId_1',  1,  1,  1.0,  0,  0.0,  0,  0.0,  0,  0.0
+0.0000,  0.0625,  100.0
+1.0000,  18.0,  0.0,  0.0,  0.0,  0.0,  0,  0,  1.1,  0.9,  1.1,  0.9,  33,  0,  0.0,  0.0
+1.0,  230.0,  
+   3,  9,  0,  '1',  1,  1,  1,  0,  0,  2,  'Gen3_to_Bus3_cirId_1',  1,  1,  1.0,  0,  0.0,  0,  0.0,  0,  0.0
+0.0000,  0.0586,  100.0
+1.0000,  13.8,  0.0,  0.0,  0.0,  0.0,  0,  0,  1.1,  0.9,  1.1,  0.9,  33,  0,  0.0,  0.0
+1.0,  230.0,
+ 0 / END OF TRANSFORMER DATA, BEGIN AREA INTERCHANGE DATA
+ 0 / END OF AREA INTERCHANGE DATA, BEGIN TWO-TERMINAL DC DATA
+ 0 / END OF TWO-TERMINAL DC DATA, BEGIN VSC DC LINE DATA
+ 0 / END OF VSC DC LINE DATA, BEGIN SWITCHED SHUNT DATA
+ 0 / END OF SWITCHED SHUNT DATA, BEGIN TRANS. IMP. CORR. TABLE DATA
+ 0 / END OF TRANS. IMP. CORR. TABLE DATA, BEGIN MULTI-TERMINAL DC LINE DATA
+ 0 / END OF MULTI-TERMINAL DC LINE DATA, BEGIN MULTI-SECTION LINE DATA
+ 0 / END OF MULTI-SECTION LINE DATA, BEGIN ZONE DATA
+ 0 / END OF ZONE DATA, BEGIN INTERAREA TRANSFER DATA
+ 0 / END OF INTERAREA TRANSFER DATA, BEGIN OWNER DATA
+ 0 / END OF OWNER DATA, BEGIN FACTS DEVICE DATA
+ 0 / END OF FACTS DEVICE DATA, END OF CASE DATA

ipss.cmd/testData/acsc/ieee9.seq

@@ -0,0 +1,29 @@
+ 0,  30           / PSS(R)E 30 SEQ created by RWSQVERSION  FRI, JUN 21 2013  16:16
+     1,'1 ', 0.00000E+00, 0.04
+     2,'1 ', 0.00000E+00, 0.089
+     3,'1 ', 0.00000E+00, 0.107
+ 0 /End of Positive sequence Generator data, Begin Negative sequence Generator data
+     1,'1 ', 0.00000E+00, 0.04
+     2,'1 ', 0.00000E+00, 0.089
+     3,'1 ', 0.00000E+00, 0.107
+ 0 /End of Negative sequence Generator data, Begin Zero sequence Generator data
+     1,'1 ', 0.00000E+00, 0.04
+     2,'1 ', 0.00000E+00, 0.089
+     3,'1 ', 0.00000E+00, 0.107
+ 0 /End of Zero sequence Generator data, Begin Negative sequence Load data
+ 0 /End of Negative sequence Load data, Begin Zero sequence Load data
+ 0 /End of Zero sequence Load data, Begin Zero sequence Branch data
+     7,      8,'0 ',   0.02125,	  0.18,      0.14900,   0.00000,  0.00000,  0.00000, 0.00000
+     8,      9,'0 ',   0.02975,	  0.252,     0.20900,  0.00000,  0.00000,  0.00000,  0.00000
+     5,      7,'0 ',   0.08,   	  0.4025,    0.30600,  0.00000,  0.00000,  0.00000,  0.00000
+     6,      9,'0 ',   0.0975,	  0.425,     0.35800,   0.00000,  0.00000,  0.00000, 0.00000
+     4,      5,'0 ',   0.025,	  0.2125,    0.17600,   0.00000,  0.00000,  0.00000, 0.00000
+     4,      6,'0 ',   0.0425,	  0.23,      0.15800,    0.00000,  0.00000,  0.00000,0.00000
+ 0 /End of Zero sequence Branch data, Begin Zero sequence Mutual data
+ 0 /End of Zero sequence Mutual data, Begin Zero sequence Transformer data
+   1,  4,  0,  '1',  3,   0,  0, 0.0000,  0.0567,  0, 0
+   2,  7,  0,  '1',  3,   0,  0, 0.0000,  0.0625,  0, 0
+   3,  9,  0,  '1',  3,   0,  0, 0.0000,  0.0586,  0, 0
+ 0 /End of Zero sequence Transformer data, Begin Zero sequence Switched shunt data
+ 0  / END OF ZERO SEQ. SWITCHED SHUNT DATA, BEGIN ZERO SEQ. FIXED SHUNT DATA
+ 0  / END OF ZERO SEQ. FIXED SHUNT DATA

ipss.cmd/testData/acsc/ieee9_Acsc_Config.json

@@ -0,0 +1,13 @@
+{	"seqFileName":"testData/acsc/ieee9.seq",
+    "acscOutputFileName":"testData/acsc/ieee9_acsc_result.txt",
+    "runAclf":false,
+    "runAclfConfig":{"aclfCaseFileName":"testData/acsc/ieee9.raw","format":"PSSE","version":"PSSE_30","lfMethod":"NR","maxIteration":20,"tolerance":1.0E-4,"nonDivergent":false,"initBusVoltage":false,"accFactor":1.0},
+ 	"type":"BUS_FAULT",
+ 	"category":"GROUND_3P",
+ 	"zLG":{"re":0.0,"im":0.0},
+ 	"zLL":{"re":0.0,"im":0.0},
+ 	"faultBusId":"Bus5",
+ 	"faultBranchFromId":"\u003cid\u003e",
+ 	"faultBranchToId":"\u003cid\u003e",
+ 	"distance":0.0
+ }