Skip to content

merge feeder_parser and load model updates to master #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thuang wants to merge 23 commits into
base: feeder_parser
Choose a base branch
from
Open

merge feeder_parser and load model updates to master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a6cca75
working on 3Phase_model implementation
Dec 5, 2016
a4ff891
3Phase-Model implementation, fixed the TLoad issue
Dec 6, 2016
a0c03de
Completed 3Phase_model implementation preparation - pass the code
Dec 7, 2016
498b67c
update the test cases after the core update 12/6/2016
thuang Dec 7, 2016
50cf4dd
bug fix
Dec 7, 2016
8aca7d6
Merge remote-tracking branch 'origin/master'
Dec 7, 2016
09ca6fb
Sparse Eqn refactor to include the LeastSqaure method
Dec 16, 2016
e06984c
3Phase-model - completed the first pass
Dec 18, 2016
c7edd4a
bug fix per the core lib update
Jan 3, 2017
9877e73
updated Hazelcast lib to 3.8
Mar 2, 2017
4a187bc
updated common.math lib
Mar 3, 2017
13906f2
updating the ISparseEqnComplex interface
Mar 3, 2017
484057a
Merge remote-tracking branch 'origin/master'
Jan 21, 2018
4643927
updated the code per the DStab model update
Jun 4, 2018
5c44bc5
bug fix after switching to master
thuang Jul 17, 2018
177ae03
removed the two classes, since there are available in the core model
Jul 18, 2018
f814bd1
updated the classes per the 3Phase model update
Jul 18, 2018
9161fd7
rename org.ipss to org.interpss
Jul 18, 2018
91271b6
renamed MachineType.java to MachineModelType.java, updated the classes
Jul 19, 2018
a266878
Merge branch 'master' into Refactor_3Phase
Jul 20, 2018
24966eb
DStab model refactor
Jul 20, 2018
e33da83
update codes and test cases to latest InterPSS Core and plugin 1/8/2020
thuang Jan 8, 2020
b2858be
update bus casting after core update
thuang Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ipss.plugin.3phase/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<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 kind="lib" path="/ipss.lib.3rdPty/lib/apache/commons-math3-3.6.1.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"/>
Expand All @@ -19,6 +19,8 @@
<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="con" path="org.eclipse.jdt.USER_LIBRARY/Hazelcast"/>
<classpathentry kind="lib" path="/ipss.lib.3rdPty/lib/sparse/csparsej-1.1.1.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/ipss.plugin.dstab"/>
<classpathentry kind="output" path="bin"/>
</classpath>
6 changes: 6 additions & 0 deletions ipss.plugin.3phase/.settings/org.eclipse.core.resources.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
=\=\=\=\=\=\=
<<<<<<<=HEAD
>>>>>>>=refs/heads/master
eclipse.preferences.version=1
encoding//src/org/interpss/threePhase/dynamic/model/impl/SinglePhaseACMotor.java=UTF-8
encoding//src/org/interpss/threePhase/test/IEEE_13BusFeeder_Test.java=UTF-8
6 changes: 3 additions & 3 deletions ...x3/TestSparseEqnComplexMatrix3x3Impl.java → ...x3/TestSparseEqnComplexMatrix3x3Impl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.ipss.sparse.Matrix3x3;
package org.interpss.sparse.Matrix3x3;

import static org.junit.Assert.assertTrue;

Expand Down Expand Up @@ -37,7 +37,7 @@ public void testReal(){

try {

matrix3x3.luMatrixAndSolveEqn(1.0e-5);
matrix3x3.solveEqn(1.0e-5);
} catch (IpssNumericException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Expand Down Expand Up @@ -79,7 +79,7 @@ public void testComplex(){

try {

matrix3x3.luMatrixAndSolveEqn(1.0e-5);
matrix3x3.solveEqn(1.0e-5);
} catch (IpssNumericException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Expand Down
2 changes: 1 addition & 1 deletion ...g/ipss/threePhase/basic/Branch3Phase.java → ...terpss/threePhase/basic/Branch3Phase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.ipss.threePhase.basic;
package org.interpss.threePhase.basic;

import org.apache.commons.math3.complex.Complex;
import org.interpss.numeric.datatype.Complex3x1;
Expand Down
2 changes: 1 addition & 1 deletion ...ipss/threePhase/basic/Branch3W3Phase.java → ...rpss/threePhase/basic/Branch3W3Phase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.ipss.threePhase.basic;
package org.interpss.threePhase.basic;

import com.interpss.dstab.DStab3WBranch;

Expand Down
13 changes: 5 additions & 8 deletions .../org/ipss/threePhase/basic/Bus3Phase.java → .../interpss/threePhase/basic/Bus3Phase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
package org.ipss.threePhase.basic;
package org.interpss.threePhase.basic;

import java.util.List;

import org.interpss.numeric.datatype.Complex3x1;
import org.interpss.numeric.datatype.Complex3x3;
import org.ipss.threePhase.dynamic.model.DynLoadModel1Phase;
import org.ipss.threePhase.dynamic.model.DynLoadModel3Phase;
import org.interpss.threePhase.dynamic.model.DynLoadModel1Phase;
import org.interpss.threePhase.dynamic.model.DynLoadModel3Phase;

import com.interpss.core.aclf.AclfBus;
import com.interpss.core.acsc.AcscBus;
import com.interpss.dstab.DStabBus;
import com.interpss.dstab.dynLoad.DynLoadModel;
import com.interpss.dstab.BaseDStabBus;

public interface Bus3Phase extends DStabBus {
public interface Bus3Phase extends BaseDStabBus<Gen3Phase,Load3Phase> {

public Complex3x1 get3PhaseVotlages();

Expand Down
10 changes: 5 additions & 5 deletions .../org/ipss/threePhase/basic/Gen3Phase.java → .../interpss/threePhase/basic/Gen3Phase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.ipss.threePhase.basic;
package org.interpss.threePhase.basic;

import org.apache.commons.math3.complex.Complex;
import org.interpss.numeric.datatype.Complex3x1;
import org.interpss.numeric.datatype.Complex3x3;
import org.interpss.numeric.datatype.Unit.UnitType;

import com.interpss.core.acsc.AcscGen;
import com.interpss.dstab.DStabGen;
import com.interpss.dstab.GeneratorType;

public interface Gen3Phase extends DStabGen{
public interface Gen3Phase extends DStabGen {

/**
* directly set the generator 3x3 impedance matrix on machine MVA base
Expand Down Expand Up @@ -50,9 +50,9 @@ public interface Gen3Phase extends DStabGen{

public Complex3x1 getPowerflowEquivCurrInj();

public GenType getGenType();
public GeneratorType getGenType();

public void setGenType(GenType type);
public void setGenType(GeneratorType type);



Expand Down
2 changes: 1 addition & 1 deletion .../threePhase/basic/IEEEFeederLineCode.java → .../threePhase/basic/IEEEFeederLineCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.ipss.threePhase.basic;
package org.interpss.threePhase.basic;

import org.apache.commons.math3.complex.Complex;
import org.interpss.numeric.datatype.Complex3x3;
Expand Down
7 changes: 4 additions & 3 deletions ...org/ipss/threePhase/basic/Load3Phase.java → ...interpss/threePhase/basic/Load3Phase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package org.ipss.threePhase.basic;
package org.interpss.threePhase.basic;

import org.apache.commons.math3.complex.Complex;
import org.interpss.numeric.datatype.Complex3x1;
import org.interpss.numeric.datatype.Complex3x3;

import com.interpss.core.aclf.AclfLoad;
import com.interpss.core.acsc.AcscLoad;
import com.interpss.core.acsc.PhaseCode;
import com.interpss.dstab.DStabLoad;

public interface Load3Phase extends AclfLoad {
public interface Load3Phase extends DStabLoad {

/**
* calcuate the Yabc from Y120
Expand Down
2 changes: 1 addition & 1 deletion .../ipss/threePhase/basic/Network3Phase.java → ...erpss/threePhase/basic/Network3Phase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.ipss.threePhase.basic;
package org.interpss.threePhase.basic;

import org.interpss.numeric.sparse.ISparseEqnComplexMatrix3x3;

Expand Down
2 changes: 1 addition & 1 deletion ...s/threePhase/basic/Transformer3Phase.java → ...s/threePhase/basic/Transformer3Phase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.ipss.threePhase.basic;
package org.interpss.threePhase.basic;

import org.apache.commons.math3.complex.Complex;
import org.interpss.numeric.datatype.Complex3x3;
Expand Down
14 changes: 7 additions & 7 deletions ...eePhase/basic/impl/AclfNetwork3Phase.java → ...eePhase/basic/impl/AclfNetwork3Phase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
package org.ipss.threePhase.basic.impl;
package org.interpss.threePhase.basic.impl;

import java.util.Queue;

import org.apache.commons.math3.complex.Complex;
import org.interpss.numeric.datatype.Complex3x1;
import org.interpss.numeric.sparse.ISparseEqnComplexMatrix3x3;
import org.ipss.threePhase.basic.Branch3Phase;
import org.ipss.threePhase.basic.Bus3Phase;
import org.ipss.threePhase.basic.Network3Phase;
import org.interpss.threePhase.basic.Branch3Phase;
import org.interpss.threePhase.basic.Bus3Phase;
import org.interpss.threePhase.basic.Network3Phase;

import com.interpss.common.exp.InterpssException;
import com.interpss.core.aclf.AclfBus;
import com.interpss.core.acsc.AcscBranch;
import com.interpss.core.acsc.AcscBus;
import com.interpss.core.acsc.BaseAcscBus;
import com.interpss.core.acsc.XfrConnectCode;
import com.interpss.core.acsc.impl.AcscNetworkImpl;
import com.interpss.core.acsc.impl.BaseAcscNetworkImpl;
import com.interpss.core.net.Branch;
import com.interpss.core.net.Bus;
import com.interpss.core.sparse.impl.SparseEqnComplexMatrix3x3Impl;

public class AclfNetwork3Phase extends BaseAcscNetworkImpl<AcscBus,AcscBranch> implements
public class AclfNetwork3Phase extends BaseAcscNetworkImpl<AcscBus, AcscBranch> implements
Network3Phase {

protected ISparseEqnComplexMatrix3x3 yMatrixAbc =null;
Expand Down Expand Up @@ -83,7 +83,7 @@ private Complex phaseShiftCplxFactor(double shiftDeg){
public ISparseEqnComplexMatrix3x3 formYMatrixABC() throws Exception {
yMatrixAbc = new SparseEqnComplexMatrix3x3Impl(getNoBus());

for(AcscBus b:this.getBusList()){
for(BaseAcscBus<?,?> b:this.getBusList()){
if(b instanceof Bus3Phase){
int i = b.getSortNumber();
Bus3Phase ph3Bus = (Bus3Phase) b;
Expand Down
8 changes: 4 additions & 4 deletions ...reePhase/basic/impl/Branch3PhaseImpl.java → ...reePhase/basic/impl/Branch3PhaseImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.ipss.threePhase.basic.impl;
package org.interpss.threePhase.basic.impl;



import static org.ipss.threePhase.util.ThreePhaseUtilFunction.threePhaseXfrAptr;
import static org.interpss.threePhase.util.ThreePhaseUtilFunction.threePhaseXfrAptr;

import org.apache.commons.math3.complex.Complex;
import org.interpss.numeric.datatype.Complex3x1;
import org.interpss.numeric.datatype.Complex3x3;
import org.ipss.threePhase.basic.Branch3Phase;
import org.ipss.threePhase.basic.Transformer3Phase;
import org.interpss.threePhase.basic.Branch3Phase;
import org.interpss.threePhase.basic.Transformer3Phase;

import com.interpss.dstab.impl.DStabBranchImpl;

Expand Down
12 changes: 6 additions & 6 deletions ...ePhase/basic/impl/Branch3W3PhaseImpl.java → ...ePhase/basic/impl/Branch3W3PhaseImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.ipss.threePhase.basic.impl;
package org.interpss.threePhase.basic.impl;

import org.ipss.threePhase.basic.Branch3W3Phase;
import org.ipss.threePhase.dynamic.DStabNetwork3Phase;
import org.ipss.threePhase.util.ThreePhaseObjectFactory;
import org.interpss.threePhase.basic.Branch3Phase;
import org.interpss.threePhase.basic.Branch3W3Phase;
import org.interpss.threePhase.dynamic.DStabNetwork3Phase;
import org.interpss.threePhase.util.ThreePhaseObjectFactory;

import com.interpss.common.exp.InterpssException;
import com.interpss.core.aclf.AclfBranchCode;
import com.interpss.core.aclf.AclfBus;
import com.interpss.dstab.DStabBranch;
import com.interpss.dstab.impl.DStab3WBranchImpl;

public class Branch3W3PhaseImpl extends DStab3WBranchImpl implements Branch3W3Phase{
Expand Down Expand Up @@ -36,7 +36,7 @@ public void create2WBranches(AclfBranchCode branchCode, String[] properties) thr
((AclfBus)starBus).setVoltage(this.voltageStarBus);

// create the from branch: fromBudId -> starBusId
DStabBranch branch = ThreePhaseObjectFactory.create3PBranch();
Branch3Phase branch = ThreePhaseObjectFactory.create3PBranch();
net.addBranch(branch, fromId, starBusId, properties[1]);
this.setFromBranch(branch);
branch.setBranchCode(branchCode);
Expand Down
26 changes: 10 additions & 16 deletions .../threePhase/basic/impl/Bus3PhaseImpl.java → .../threePhase/basic/impl/Bus3PhaseImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,25 @@
package org.ipss.threePhase.basic.impl;

import static org.ipss.threePhase.util.ThreePhaseUtilFunction.threePhaseGenAptr;
package org.interpss.threePhase.basic.impl;

import java.util.ArrayList;
import java.util.List;

import org.apache.commons.math3.complex.Complex;
import org.interpss.numeric.datatype.Complex3x1;
import org.interpss.numeric.datatype.Complex3x3;
import org.ipss.threePhase.basic.Branch3Phase;
import org.ipss.threePhase.basic.Bus3Phase;
import org.ipss.threePhase.basic.Gen3Phase;
import org.ipss.threePhase.basic.Load3Phase;
import org.ipss.threePhase.dynamic.model.DStabGen3PhaseAdapter;
import org.ipss.threePhase.dynamic.model.DynLoadModel1Phase;
import org.ipss.threePhase.dynamic.model.DynLoadModel3Phase;
import org.ipss.threePhase.util.ThreeSeqLoadProcessor;
import org.interpss.threePhase.basic.Branch3Phase;
import org.interpss.threePhase.basic.Bus3Phase;
import org.interpss.threePhase.basic.Gen3Phase;
import org.interpss.threePhase.basic.Load3Phase;
import org.interpss.threePhase.dynamic.model.DynLoadModel1Phase;
import org.interpss.threePhase.dynamic.model.DynLoadModel3Phase;
import org.interpss.threePhase.util.ThreeSeqLoadProcessor;

import com.interpss.core.aclf.AclfGen;
import com.interpss.core.net.Branch;
import com.interpss.dstab.DStabGen;
import com.interpss.dstab.dynLoad.DynLoadModel;
import com.interpss.dstab.impl.DStabBusImpl;
import com.interpss.dstab.impl.BaseDStabBusImpl;



public class Bus3PhaseImpl extends DStabBusImpl implements Bus3Phase{
public class Bus3PhaseImpl extends BaseDStabBusImpl<Gen3Phase,Load3Phase> implements Bus3Phase{

private Complex3x1 Vabc = null;
private Complex3x1 initVabc = null;
Expand Down
18 changes: 9 additions & 9 deletions .../threePhase/basic/impl/Gen3PhaseImpl.java → .../threePhase/basic/impl/Gen3PhaseImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.ipss.threePhase.basic.impl;
package org.interpss.threePhase.basic.impl;

import org.apache.commons.math3.complex.Complex;
import org.interpss.numeric.datatype.Complex3x1;
import org.interpss.numeric.datatype.Complex3x3;
import org.interpss.numeric.datatype.Unit.UnitType;
import org.ipss.threePhase.basic.Bus3Phase;
import org.ipss.threePhase.basic.Gen3Phase;
import org.ipss.threePhase.basic.GenType;
import org.interpss.threePhase.basic.Bus3Phase;
import org.interpss.threePhase.basic.Gen3Phase;

import com.interpss.dstab.GeneratorType;
import com.interpss.dstab.impl.DStabGenImpl;

/**
Expand All @@ -30,7 +30,7 @@ public class Gen3PhaseImpl extends DStabGenImpl implements Gen3Phase {

private Complex3x1 igen3Ph = null;

private GenType genType = GenType.Inverter_based; // inverter-based by default
private GeneratorType genType = GeneratorType.INVERTER_BASED; // inverter-based by default



Expand Down Expand Up @@ -140,10 +140,10 @@ public Complex3x1 getPowerflowEquivCurrInj() {


// calculate the equivalent current injection based on the GenType
if(this.getGenType().equals(GenType.Synchrounous_machine)){
if(this.getGenType().equals(GeneratorType.SYNCH_MACHINE)){
currInj = this.getPower3Phase(UnitType.PU).divide(this.getParentBus().get3PhaseVotlages()).conjugate();
}
else if(this.getGenType().equals(GenType.Inverter_based)){
else if(this.getGenType().equals(GeneratorType.INVERTER_BASED)){

//TODO here assuming the inverter based DG only produces positive sequence current. negative sequence current is based on
//negative sequence impedance of the generator
Expand Down Expand Up @@ -187,13 +187,13 @@ else if(this.getGenType().equals(GenType.Inverter_based)){
}

@Override
public GenType getGenType() {
public GeneratorType getGenType() {

return this.genType;
}

@Override
public void setGenType(GenType type) {
public void setGenType(GeneratorType type) {
this.genType = type;

}
Expand Down
10 changes: 5 additions & 5 deletions ...threePhase/basic/impl/Load3PhaseImpl.java → ...threePhase/basic/impl/Load3PhaseImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package org.ipss.threePhase.basic.impl;
package org.interpss.threePhase.basic.impl;

import org.apache.commons.math3.complex.Complex;
import org.interpss.numeric.datatype.Complex3x1;
import org.interpss.numeric.datatype.Complex3x3;
import org.ipss.threePhase.basic.Bus3Phase;
import org.ipss.threePhase.basic.Load3Phase;
import org.interpss.threePhase.basic.Bus3Phase;
import org.interpss.threePhase.basic.Load3Phase;

import com.interpss.core.aclf.impl.AclfLoadImpl;
import com.interpss.core.acsc.PhaseCode;
import com.interpss.dstab.impl.DStabLoadImpl;

public class Load3PhaseImpl extends AclfLoadImpl implements Load3Phase {
public class Load3PhaseImpl extends DStabLoadImpl implements Load3Phase {

Complex3x1 ph3Load = new Complex3x1();
Complex3x3 equivYabc = new Complex3x3();
Expand Down
8 changes: 4 additions & 4 deletions ...ase/basic/impl/Transformer3PhaseImpl.java → ...ase/basic/impl/Transformer3PhaseImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.ipss.threePhase.basic.impl;
package org.interpss.threePhase.basic.impl;

import org.apache.commons.math3.complex.Complex;
import org.interpss.numeric.datatype.Complex3x3;
import org.ipss.threePhase.basic.Branch3Phase;
import org.ipss.threePhase.basic.Transformer3Phase;
import org.interpss.threePhase.basic.Branch3Phase;
import org.interpss.threePhase.basic.Transformer3Phase;

import com.interpss.core.acsc.XfrConnectCode;
import com.interpss.core.acsc.adpter.impl.AcscXformerImpl;
Expand Down Expand Up @@ -89,7 +89,7 @@ public Complex3x3 getYabc() {
//////////////////////////////////////////////////////////////////////////////////////////////////////////////

@Override
public Complex3x3 getYffabc() {
public Complex3x3 getYffabc() {
Complex3x3 yffabc = null;
//Yg
if(this.ph3Branch.getXfrFromConnectCode() == XfrConnectCode.WYE_SOLID_GROUNDED){
Expand Down
Loading