Skip to content
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.

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

Psse: fix the export process #3347

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,32,0.0,0.0,60.0
0,100.0,32,0,0,60.0
Example MODEL; OUTPUT GENERATED 2014-07-15 08:42:22

1,'Bus 1 ',138.0,3,1,1,1,1.02,0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,33,0.0,0.0,60.0
0,100.0,33,0,0,60.0
08/25/93 UW ARCHIVE 100.0 1961 W IEEE 118 Bus Test Case

1,'Riversde ',138.0,2,1,1,1,0.955,10.9828
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,35,0.0,0.0,60.0
0,100.0,35,0,0,60.0
08/19/93 UW ARCHIVE 100.0 1962 W IEEE 14 Bus Test Case

0 / END OF SYSTEM-WIDE DATA, BEGIN BUS DATA
Expand Down Expand Up @@ -85,7 +85,6 @@
0 / END OF GNE DEVICE DATA, BEGIN INDUCTION MACHINE DATA
0 / END OF INDUCTION MACHINE DATA, BEGIN SUBSTATION DATA
1,'STATION 1',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',1,1,1.0,0.0
2,'NB2',1,1,1.0,0.0
3,'NL2',1,1,1.0,0.0
Expand All @@ -102,7 +101,6 @@
1,4,'B',5,'1 '
0 / END OF SUBSTATION EQUIPMENT TERMINAL DATA
2,'STATION 5',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',2,1,1.0,0.0
2,'NB2',2,1,1.0,0.0
3,'NL3',2,1,1.0,0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,35,0.0,0.0,60.0
0,100.0,35,0,0,60.0
08/19/93 UW ARCHIVE 100.0 1962 W IEEE 14 Bus Test Case

0 / END OF SYSTEM-WIDE DATA, BEGIN BUS DATA
Expand Down Expand Up @@ -85,7 +85,6 @@
0 / END OF GNE DEVICE DATA, BEGIN INDUCTION MACHINE DATA
0 / END OF INDUCTION MACHINE DATA, BEGIN SUBSTATION DATA
1,'STATION 1',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',1,1,1.0,0.0
2,'NB2',1,1,1.0,0.0
3,'NL2',1,1,1.0,0.0
Expand All @@ -102,7 +101,6 @@
1,4,'B',5,'1 '
0 / END OF SUBSTATION EQUIPMENT TERMINAL DATA
2,'STATION 5',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',2,1,1.0,0.0
2,'NB2',2,1,1.0,0.0
3,'NL3',2,1,1.0,0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,33,0.0,0.0,60.0
0,100.0,33,0,0,60.0


1,'1 ',138.0,1,1,1,1,1.01,0.0,1.1,0.9,1.1,0.9
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,32,0.0,0.0,60.0
0,100.0,32,0,0,60.0
08/20/93 UW ARCHIVE 100.0 1961 W IEEE 30 Bus Test Case

1,'Glen Lyn ',132.0,3,1,1,1,1.06,98.4316
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,33,0.0,0.0,60.0
0,100.0,33,0,0,60.0
08/25/93 UW ARCHIVE 100.0 1961 W IEEE 57 Bus Test Case

1,'Kanawha ',138.0,3,1,1,1,1.04,0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,33,0.0,0.0,60.0
0,100.0,33,0,0,60.0


1,'Bus1\!@ ',18.0,2,1,1,1,1.04,-6.5957,1.1,0.9,1.1,0.9
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,33,0.0,0.0,60.0
0,100.0,33,0,0,60.0


1,'1 ',18.0,2,1,1,1,1.04,-6.5957,1.1,0.9,1.1,0.9
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,33,0.0,0.0,60.0
0,100.0,33,0,0,60.0


1,'1 ',18.0,2,1,1,1,1.04,-6.5957,1.1,0.9,1.1,0.9
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,33,0.0,0.0,60.0
0,100.0,33,0,0,60.0


1,'1 ',18.0,2,1,1,1,1.04,-6.5957,1.1,0.9,1.1,0.9
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,33,0.0,0.0,60.0
0,100.0,33,0,0,60.0
08/19/93 UW ARCHIVE 100.0 1962 W IEEE 14 Bus Test Case

1,'Bus 1 ',138.0,3,1,1,1,1.06,0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,35,0.0,0.0,60.0
0,100.0,35,0,0,60.0
17/04/24 UW ARCHIVE 100.0 1962 W Five Bus nodeBreaker Test Case

0 / END OF SYSTEM-WIDE DATA, BEGIN BUS DATA
Expand Down Expand Up @@ -48,7 +48,6 @@
0 / END OF GNE DEVICE DATA, BEGIN INDUCTION MACHINE DATA
0 / END OF INDUCTION MACHINE DATA, BEGIN SUBSTATION DATA
1,'STATION 1',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',1,1,1.0,0.0
2,'NB2',1,1,1.0,0.0
3,'NLINE',1,1,1.0,0.0
Expand All @@ -71,7 +70,6 @@
1,5,'3',3,4,'1 '
0 / END OF SUBSTATION EQUIPMENT TERMINAL DATA
2,'STATION 2',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',2,1,1.0,0.0
2,'NB2',2,1,1.0,0.0
3,'NLINE',2,1,1.0,0.0
Expand All @@ -88,7 +86,6 @@
2,3,'B',1,'1 '
0 / END OF SUBSTATION EQUIPMENT TERMINAL DATA
3,'STATION 3',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',3,1,1.0,0.0
2,'NB2',3,1,1.0,0.0
3,'NT2W',3,1,1.0,0.0
Expand All @@ -105,7 +102,6 @@
3,4,'3',1,4,'1 '
0 / END OF SUBSTATION EQUIPMENT TERMINAL DATA
4,'STATION 4',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',4,1,1.0,0.0
2,'NB2',4,1,1.0,0.0
3,'NT3W',4,1,1.0,0.0
Expand All @@ -119,7 +115,6 @@
4,3,'3',1,3,'1 '
0 / END OF SUBSTATION EQUIPMENT TERMINAL DATA
5,'STATION 5',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',5,1,1.0,0.0
2,'NB2',5,1,1.0,0.0
3,'NDCLINE',5,1,1.0,0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,35,0.0,0.0,60.0
0,100.0,35,0,0,60.0
17/04/24 UW ARCHIVE 100.0 1962 W Five Bus nodeBreaker Test Case

0 / END OF SYSTEM-WIDE DATA, BEGIN BUS DATA
Expand Down Expand Up @@ -48,7 +48,6 @@
0 / END OF GNE DEVICE DATA, BEGIN INDUCTION MACHINE DATA
0 / END OF INDUCTION MACHINE DATA, BEGIN SUBSTATION DATA
1,'STATION 1',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',1,1,1.0,0.0
2,'NB2',1,1,1.0,0.0
3,'NLINE',1,1,1.0,0.0
Expand All @@ -71,7 +70,6 @@
1,5,'3',3,4,'1 '
0 / END OF SUBSTATION EQUIPMENT TERMINAL DATA
2,'STATION 2',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',2,1,1.0,0.0
2,'NB2',2,1,1.0,0.0
3,'NLINE',2,1,1.0,0.0
Expand All @@ -88,7 +86,6 @@
2,3,'B',1,'1 '
0 / END OF SUBSTATION EQUIPMENT TERMINAL DATA
3,'STATION 3',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',3,1,1.0,0.0
2,'NB2',3,1,1.0,0.0
3,'NT2W',3,1,1.0,0.0
Expand All @@ -105,7 +102,6 @@
3,4,'3',1,4,'1 '
0 / END OF SUBSTATION EQUIPMENT TERMINAL DATA
4,'STATION 4',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',4,1,1.0,0.0
2,'NB2',4,1,1.0,0.0
3,'NT3W',4,1,1.0,0.0
Expand All @@ -119,7 +115,6 @@
4,3,'3',1,3,'1 '
0 / END OF SUBSTATION EQUIPMENT TERMINAL DATA
5,'STATION 5',0.0,0.0,0.1
/ BEGIN SUBSTATION NODE DATA
1,'NB1',5,1,1.0,0.0
2,'NB2',5,1,1.0,0.0
3,'NDCLINE',5,1,1.0,0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0 100.0 33 0.0 0.0 60.0
0 100.0 33 0 0 60.0
TwoTerminalDc Bus Test Case
8/19/93
1 'Bus 1' 230.0 3 1 1 1 1.06 0.0 1.1 0.9 1.1 0.9
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0 100.0 33 0.0 0.0 60.0
0 100.0 33 0 0 60.0
IEEE 14 Bus Test Case
8/19/93
1 'Bus 1' 230.0 3 1 1 1 1.06 0.0 1.1 0.9 1.1 0.9
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0 100.0 33 0.0 0.0 60.0
0 100.0 33 0 0 60.0
TwoTerminalDc Bus Test Case
8/19/93
1 'Bus 1' 230.0 3 1 1 1 1.06 0.0 1.1 0.9 1.1 0.9
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@
0 / END OF INTER-AREA TRANSFER DATA, BEGIN OWNER DATA
1,'1'
0 / END OF OWNER DATA, BEGIN FACTS CONTROL DEVICE DATA
'FACTS_DVCE_1', 153, 0, 1, 0.0, 0.0, 1.015, 50.0,100.0, 0.9263, 1.134, 1.0, 0.0, 0.05652, 100.0, 1, 0.0, 0.0, 0, 153, ''
'FACTS_DVCE_2', 153, 155, 1, 350.0, 40.0, 1.015, 25.0, 9999.0, 0.9, 1.1, 1.0, 0.0, 0.05, 100.0, 1, 0.0, 0.0, 0, 153, ''
'FACTS_DVCE_1', 5, 0, 1, 0.0, 0.0, 1.015, 50.0,100.0, 0.9263, 1.134, 1.0, 0.0, 0.05652, 100.0, 1, 0.0, 0.0, 0, 5, ''
'FACTS_DVCE_2', 7, 0, 1, 350.0, 40.0, 1.015, 25.0, 9999.0, 0.9, 1.1, 1.0, 0.0, 0.05, 100.0, 1, 0.0, 0.0, 0, 7, ''
0 / END OF FACTS CONTROL DEVICE DATA, BEGIN SWITCHED SHUNT DATA
0 /END OF SWITCHED SHUNT DATA, BEGIN GNE DEVICE DATA
'GNE-1', 'boslModel', 1, 153, 0, 3, 3, 3, 1, 1, 153
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,33,0.0,0.0,60.0
0,100.0,33,0,0,60.0
08/19/93 UW ARCHIVE 100.0 1962 W IEEE 14 Bus Test Case

1,'Bus 1 ',138.0,3,1,1,1,1.06,0.0
Expand Down Expand Up @@ -111,8 +111,8 @@
0 / END OF INTER-AREA TRANSFER DATA, BEGIN OWNER DATA
1,'1'
0 / END OF OWNER DATA, BEGIN FACTS CONTROL DEVICE DATA
'FACTS_DVCE_1',153,0,1,0.0,0.0,1.015,50.0,100.0,0.9263,1.134,,0.0,0.05652,100.0,1,0.0,0.0,0.0,153,''
'FACTS_DVCE_2',153,155,1,350.0,40.0,1.015,25.0,9999.0,0.9,1.1,,0.0,0.05,100.0,1,0.0,0.0,0.0,153,''
'FACTS_DVCE_1',5,0,1,0.0,0.0,1.015,50.0,100.0,0.9263,1.134,1.0,0.0,0.05652,100.0,1,0.0,0.0,0,5,''
'FACTS_DVCE_2',7,0,1,350.0,40.0,1.015,25.0,9999.0,0.9,1.1,1.0,0.0,0.05,100.0,1,0.0,0.0,0,7,''
0 / END OF FACTS CONTROL DEVICE DATA, BEGIN SWITCHED SHUNT DATA
0 / END OF SWITCHED SHUNT DATA, BEGIN GNE DEVICE DATA
'GNE-1','boslModel',1,153,0,3,3,3,1,1,153
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,33,0.0,0.0,60.0
0,100.0,33,0,0,60.0
08/19/93 UW ARCHIVE 100.0 1962 W IEEE 14 Bus Test Case

1,'Bus 1 ',138.0,3,1,1,1,1.06,0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,35,0.0,0.0,60.0
0,100.0,35,0,0,60.0
08/19/93 UW ARCHIVE 100.0 1962 W IEEE 14 Bus Test Case

0 / END OF SYSTEM-WIDE DATA, BEGIN BUS DATA
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"network" : {
"caseid" : {
"fields" : [ "ic", "sbase", "rev", "xfrrat", "nxfrat", "basfrq", "title1", "title2" ],
"data" : [ 0,100.0,35,0.0,0.0,60.0," 08/19/93 UW ARCHIVE 100.0 1962 W IEEE 14 Bus Test Case","" ]
"data" : [ 0,100.0,35,0,0,60.0," 08/19/93 UW ARCHIVE 100.0 1962 W IEEE 14 Bus Test Case","" ]
},
"bus" : {
"fields" : [ "ibus", "name", "baskv", "ide", "area", "zone", "owner", "vm", "va" ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ public class PsseCaseIdentification {
private float rev = 33;

@Parsed
@Format(formats = {"0"})
private double xfrrat = Double.NaN;

@Parsed
@Format(formats = {"0"})
private double nxfrat = Double.NaN;

@Parsed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public class PsseFacts extends PsseVersioned {
private double set2 = 0.0;

@Parsed
private double vsref = 0.0;
private int vsref = 0;

@Parsed
@Revision(until = 33)
Expand Down Expand Up @@ -234,11 +234,11 @@ public void setSet2(double set2) {
this.set2 = set2;
}

public double getVsref() {
public int getVsref() {
return vsref;
}

public void setVsref(double vsref) {
public void setVsref(int vsref) {
this.vsref = vsref;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,14 @@
*/
class FactsDeviceData extends AbstractRecordGroup<PsseFacts> {

private static final String[] FIELD_NAMES_32_33 = {"name", "i", "j", "mode", "pdes", "qdes", "vset", "shmx", "trmx", "vtmn", "vtmx", "vxmx", "imx", "linx",
"rmpct", "owner", "set1", "set2", "vsref", "remot", STR_MNAME};
private static final String[] FIELD_NAMES_32_33 = {"name", "i", "j", "mode", "pdes", "qdes", "vset", "shmx", "trmx", "vtmn", "vtmx", "vsmx", "imx", "linx", "rmpct", "owner", "set1", "set2", "vsref", "remot", STR_MNAME};
static final String[] FIELD_NAMES_35 = {"name", "ibus", "jbus", "mode", "pdes", "qdes", "vset", "shmx", "trmx", "vtmn", "vtmx", "vsmx", "imx", "linx", "rmpct", "owner", "set1", "set2", "vsref", "fcreg", "nreg", STR_MNAME};

FactsDeviceData() {
super(FACTS_CONTROL_DEVICE);
withFieldNames(V32, FIELD_NAMES_32_33);
withFieldNames(V33, FIELD_NAMES_32_33);
withFieldNames(V35, "name", "ibus", "jbus", "mode", "pdes", "qdes", "vset", "shmx", "trmx", "vtmn", "vtmx", "vxmx", "imx", "linx",
"rmpct", "owner", "set1", "set2", "vsref", "fcreg", "nreg", STR_MNAME);
withFieldNames(V35, FIELD_NAMES_35);
withQuotedFields("name", STR_MNAME);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ public void write(List<PsseSubstation> substationList, Context context, OutputSt
SubstationRecordData recordData = new SubstationRecordData();
write(recordData.buildRecords(Collections.singletonList(substation.getRecord()), context.getFieldNames(SUBSTATION), recordData.quotedFields(), context), outputStream);

writeComment(" BEGIN SUBSTATION NODE DATA", outputStream);

SubstationNodeData nodeData = new SubstationNodeData();
write(nodeData.buildRecords(substation.getNodes(), context.getFieldNames(INTERNAL_SUBSTATION_NODE), nodeData.quotedFields(), context), outputStream);
writeEndComment(" END OF SUBSTATION NODE DATA, BEGIN SUBSTATION SWITCHING DEVICE DATA", outputStream);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
0,100.0,32,0.0,0.0,60.0
0,100.0,32,0,0,60.0
Example MODEL; OUTPUT GENERATED 2014-07-15 08:42:22

1,'Bus 1 ',138.0,3,1,1,1,1.02,0.0
Expand Down
14 changes: 7 additions & 7 deletions psse/psse-model/src/test/resources/IEEE_14_bus_completed.json
Original file line number Diff line number Diff line change
Expand Up @@ -1763,7 +1763,7 @@
} ],
"facts" : [ {
"name" : "FACTS_DVCE_1",
"i" : 153,
"i" : 5,
"j" : 0,
"mode" : 1,
"pdes" : 0.0,
Expand All @@ -1780,13 +1780,13 @@
"owner" : 1,
"set1" : 0.0,
"set2" : 0.0,
"vsref" : 0.0,
"remot" : 153,
"vsref" : 0,
"remot" : 5,
"mname" : ""
}, {
"name" : "FACTS_DVCE_2",
"i" : 153,
"j" : 155,
"i" : 7,
"j" : 0,
"mode" : 1,
"pdes" : 350.0,
"qdes" : 40.0,
Expand All @@ -1802,8 +1802,8 @@
"owner" : 1,
"set1" : 0.0,
"set2" : 0.0,
"vsref" : 0.0,
"remot" : 153,
"vsref" : 0,
"remot" : 7,
"mname" : ""
} ],
"switchedShunts" : [ ],
Expand Down
Loading