merge Feeder parser

ipss.plugin.3phase/.classpath

@@ -1,24 +1,24 @@
-<?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="src" path="/ipss.core_EMF"/>
-	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/apache/commons-logging.jar"/>
-	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/apache/commons-math3-3.5.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.common"/>
-	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/eclipse/org.eclipse.emf.common.jar"/>
-	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/eclipse/org.eclipse.emf.ecore.change.jar"/>
-	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/eclipse/org.eclipse.emf.ecore.jar"/>
-	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/eclipse/org.eclipse.emf.ecore.xmi.jar"/>
-	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/eclipse/org.eclipse.emf.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.numeric"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.plugin.base"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.plugin.core"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/ipss.dstab_EMF"/>
-	<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.simu_EMF"/>
-	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/cache/hazelcast-3.6.jar"/>
-	<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="src" path="/ipss.core_EMF"/>
+	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/apache/commons-logging.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.common"/>
+	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/eclipse/org.eclipse.emf.common.jar"/>
+	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/eclipse/org.eclipse.emf.ecore.change.jar"/>
+	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/eclipse/org.eclipse.emf.ecore.jar"/>
+	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/eclipse/org.eclipse.emf.ecore.xmi.jar"/>
+	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/eclipse/org.eclipse.emf.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.numeric"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.plugin.base"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.plugin.core"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/ipss.dstab_EMF"/>
+	<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.simu_EMF"/>
+	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/cache/hazelcast-3.8.jar"/>
+	<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/apache/commons-math3-3.6.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

ipss.plugin.3phase/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/org/ipss/threePhase/dynamic/model/impl/SinglePhaseACMotor.java=UTF-8
+encoding//src/org/ipss/threePhase/test/IEEE_13BusFeeder_Test.java=UTF-8
+encoding//src/org/ipss/threePhase/test/ThreeBus_3Phase_Test.java=UTF-8

ipss.plugin.3phase/src/org/ipss/threePhase/basic/Branch3Phase.java

@@ -5,11 +5,15 @@
 import org.interpss.numeric.datatype.Complex3x3;
 
 import com.interpss.core.acsc.AcscBranch;
+import com.interpss.core.acsc.PhaseCode;
 import com.interpss.dstab.DStabBranch;
 
 public interface Branch3Phase extends DStabBranch{
 
-	//TODO add phase info
+	// phase code is currently used in the transformer; for lines, Zabc reflects the connection phases
+	public void setPhaseCode(PhaseCode phCode);
+
+	public PhaseCode getPhaseCode();
 
     public void setZabc(Complex3x3 Zabc);
 

ipss.plugin.3phase/src/org/ipss/threePhase/basic/Bus3Phase.java

@@ -30,6 +30,7 @@ public interface Bus3Phase extends DStabBus {
 
     public List<DynLoadModel3Phase> getThreePhaseDynLoadList();
 
+    public List<Load1Phase> getSinglePhaseLoadList();
 
     public List<Load3Phase> getThreePhaseLoadList();
 

ipss.plugin.3phase/src/org/ipss/threePhase/basic/LineConfiguration.java

@@ -0,0 +1,94 @@
+package org.ipss.threePhase.basic;
+
+import org.interpss.numeric.datatype.Complex3x3;
+
+public class LineConfiguration {
+
+	enum InputType { Physical, ZYMatrix, LineCode} 
+	enum LengthUnit {Feet, Mile, Meter, kM}
+
+
+	private String id = "";
+	private int nphases = 1;
+	private int baseFreq = 60;
+	private InputType type =null;
+
+	//TODO units
+
+	private Complex3x3 zMtx = null;
+
+	private Complex3x3 shuntYMtx = null;
+
+	//physical parameters
+
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public int getNphases() {
+		return nphases;
+	}
+
+	public void setNphases(int nphases) {
+		this.nphases = nphases;
+	}
+
+	public int getBaseFreq() {
+		return baseFreq;
+	}
+
+	public void setBaseFreq(int baseFreq) {
+		this.baseFreq = baseFreq;
+	}
+
+	public InputType getType() {
+		return type;
+	}
+
+	public void setType(InputType type) {
+		this.type = type;
+	}
+
+	public Complex3x3 getZ3x3Matrix() {
+		return zMtx;
+	}
+
+	public void setZ3x3Matrix(Complex3x3 zMtx) {
+		this.zMtx = zMtx;
+	}
+
+	public Complex3x3 getShuntY3x3Matrix() {
+		return shuntYMtx;
+	}
+
+	public void setShuntY3x3Matrix(Complex3x3 shuntYMtx) {
+		this.shuntYMtx = shuntYMtx;
+	}
+
+
+	public boolean calculateZYMatrixWithPhyiscalConfiguration(){
+		return true;
+	}
+
+	public String toString(){
+		StringBuffer sb = new StringBuffer();
+		sb.append("Line Configuration:\n");
+		sb.append("Id: "+id+"\n");
+		sb.append("InputType: "+type+"\n");
+		sb.append("nphases: "+nphases+"\n");
+		sb.append("baseFreq: "+baseFreq+"\n");
+		sb.append("zmatrix: "+this.zMtx.toString()+"\n");
+		sb.append("ymatrix: "+ (this.shuntYMtx==null? "":this.shuntYMtx.toString())+"\n");
+
+		return sb.toString();
+	}
+
+
+
+
+}

ipss.plugin.3phase/src/org/ipss/threePhase/basic/Load1Phase.java

@@ -0,0 +1,84 @@
+package org.ipss.threePhase.basic;
+
+import org.interpss.numeric.datatype.Complex3x1;
+import org.interpss.numeric.datatype.Complex3x3;
+
+import com.interpss.core.aclf.AclfLoad;
+import com.interpss.core.acsc.PhaseCode;
+
+public interface Load1Phase extends AclfLoad {
+
+	public void setPhaseCode (PhaseCode phCode);
+
+	public PhaseCode getPhaseCode ();
+
+	/**
+	 * The Norton equivalent admittance. Used in power flow and short circuit analysis. 
+	 * @return 
+	 */
+	public Complex3x3 getEquivYabc();
+
+	/**
+	 * calculate the equivalent current injection of the load, mainly used in power flow solution.
+	 * @param vabc
+	 * @return
+	 */
+	public Complex3x1 getEquivCurrInj(Complex3x1 vabc);
+
+	/**
+	 * set the load model type, such as constant PQ, constant current, constant impedance, etc.
+	 * @param loadModelType
+	 */
+//	public void setLoadModelType(DistLoadType loadModelType);
+//	
+//	/**
+//	 * get the load model type, such as constant PQ, constant current, constant impedance, etc.
+//	 * @return
+//	 */
+//	public DistLoadType getLoadModelType();
+
+	/**
+	 * set the load connection type. The connection type could be single phase wye, single phase delta, three phase wye and three phase delta.
+	 * @param loadConnectType
+	 */
+	public void setLoadConnectionType(LoadConnectionType loadConnectType);
+
+	/**
+	 * get the load connection type. The connection type could be single phase wye, single phase delta, three phase wye and three phase delta.
+	 * @return
+	 */
+	public LoadConnectionType getLoadConnectionType();
+
+	/**
+	 * set the nominal KV level of the load
+	 * @param ratedkV
+	 */
+	public void setNominalKV(double ratedkV);
+
+	/**
+	 * return the nominal KV level of the load
+	 * @return
+	 */
+	public double getNominalKV();
+
+	/**
+	 *  Set the minimum voltage in pu, above which the original input load model (e.g., constant power) can be maintained,
+	 *  Once the terminal voltage is lower than this value, the load will be represented by constant impedance
+	 */
+	public void setVminpu(double newVminpu);
+
+	/**
+	 *  Set the maximum voltage in pu to maintain the original input load model (e.g., constant power) 
+	 */
+	public void setVmaxpu(double newVmaxpu);
+
+	/**
+	 *  get the minimum voltage in pu to maintain the original input load model (e.g., constant power) 
+	 *  If the voltage is above this value, the original input load model (e.g., constant power) can be maintained.
+	 *  Once the terminal voltage is lower than this value, the load will be represented by constant impedance
+	 */
+	public double getVminpu();
+
+	public double getVmaxpu();
+
+}

ipss.plugin.3phase/src/org/ipss/threePhase/basic/Load3Phase.java

@@ -7,7 +7,8 @@
 import com.interpss.core.aclf.AclfLoad;
 import com.interpss.core.acsc.PhaseCode;
 
-public interface Load3Phase extends AclfLoad {
+public interface Load3Phase extends Load1Phase {
+
 
 	/**
 	 * calcuate the Yabc from Y120
@@ -20,37 +21,35 @@ public interface Load3Phase extends AclfLoad {
 	 * get three phase load equivalent 3x3 admittance matrix in pu
 	 * @return
 	 */
-	public Complex3x3 getEquivYabc();
 
-	/**
-	 *  get three phase loads in pu
-	 * @return
-	 */
-	public Complex3x1  get3PhaseLoad();
+	public Complex3x1  getInit3PhaseLoad();
+
+	public Complex  getInit3PhaseTotalLoad();
+
+	public Complex3x1  get3PhaseLoad(Complex3x1 vabc);
 
 
 	/**
-	 * 
+	 * set three-phase load
 	 * @param threePhaseLoad  three phase loads in pu
 	 * @return
 	 */
 	public void  set3PhaseLoad(Complex3x1 threePhaseLoad);
 
 
 	/**
-	 * 
+	 * get single-phase load
 	 * @param phase
 	 * @return
 	 */
 	public Complex   getPhaseLoad(PhaseCode phase);
 
-	public void  setPhaseLoad(Complex phaseLoad, PhaseCode phase);
-
 	/**
-	 * calculate the equivalent current injection of the load, used in power flow solution
-	 * @param vabc
-	 * @return
+	 * 
+	 * @param phaseLoad
+	 * @param phase
 	 */
-	public Complex3x1 getEquivCurrInj(Complex3x1 vabc);
+	public void  setPhaseLoad(Complex phaseLoad, PhaseCode phase);
+
 
-}
+	}

ipss.plugin.3phase/src/org/ipss/threePhase/basic/LoadConnectionType.java

@@ -0,0 +1,7 @@
+package org.ipss.threePhase.basic;
+
+public enum LoadConnectionType {
+
+	Single_Phase_Wye, Single_Phase_Delta,Three_Phase_Wye, Three_Phase_Delta;
+
+}

ipss.plugin.3phase/src/org/ipss/threePhase/basic/impl/Branch3PhaseImpl.java

@@ -10,10 +10,12 @@
 import org.ipss.threePhase.basic.Branch3Phase;
 import org.ipss.threePhase.basic.Transformer3Phase;
 
+import com.interpss.core.acsc.PhaseCode;
 import com.interpss.dstab.impl.DStabBranchImpl;
 
 public class Branch3PhaseImpl extends DStabBranchImpl implements Branch3Phase{
 
+	private PhaseCode phaseCode = PhaseCode.ABC;
 	private Complex3x3 Zabc =null;
 	private Complex3x3 Yabc =null;
 	private Complex3x3 fromShuntYabc =null;
@@ -95,7 +97,7 @@ public Complex3x3 getBranchYabc() {
 				}
 
 				if(dim == 0){
-					throw new Error(" The branch Yii diagonal elements are zero! # "+this.getId());
+					throw new Error(" The branch Yii diagonal elements are all zero! # "+this.getId());
 				}
 				else if(dim ==1){
 					if( hasPhaseA) {
@@ -391,4 +393,16 @@ public void setCurrentAbcAtToSide(Complex3x1 IabcToBus) {
 
 	}
 
+	@Override
+	public void setPhaseCode(PhaseCode phCode) {
+		this.phaseCode = phCode;
+
+	}
+
+	@Override
+	public PhaseCode getPhaseCode() {
+
+		return this.phaseCode;
+	}
+
 }