diff --git a/.gitignore b/.gitignore
index d90bd3a..267998d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
.vs/
-.vscode/
\ No newline at end of file
+.vscode/
+temp/
\ No newline at end of file
diff --git a/Telemark-120/Grid/CIMJSON-LD/Telemark-120-LV1_EQ.jsonld b/Telemark-120/Grid/CIMJSON-LD/Telemark-120-LV1_EQ.jsonld
index 4aebe53..bfe7977 100644
--- a/Telemark-120/Grid/CIMJSON-LD/Telemark-120-LV1_EQ.jsonld
+++ b/Telemark-120/Grid/CIMJSON-LD/Telemark-120-LV1_EQ.jsonld
@@ -75,7 +75,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS1",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 50.0,
+ "cim:Conductor.length": 0.050,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.015999999945951,
@@ -98,7 +98,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS10",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -118,7 +118,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS11",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -138,7 +138,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS12",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 50.0,
+ "cim:Conductor.length": 0.050,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.015999999945951,
@@ -158,7 +158,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS13",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -178,7 +178,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS14",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 50.0,
+ "cim:Conductor.length": 0.050,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.015999999945951,
@@ -198,7 +198,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS15",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -218,7 +218,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS16",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -238,7 +238,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS17",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 60.0,
+ "cim:Conductor.length": 0.060,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.019199999935141,
@@ -258,7 +258,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS18",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 50.0,
+ "cim:Conductor.length": 0.050,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.015999999945951,
@@ -278,7 +278,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS19",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -298,7 +298,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS2",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -318,7 +318,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS20",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -338,7 +338,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS21",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 50.0,
+ "cim:Conductor.length": 0.050,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.015999999945951,
@@ -358,7 +358,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS22",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -378,7 +378,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS23",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 60.0,
+ "cim:Conductor.length": 0.060,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.019199999935141,
@@ -398,7 +398,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS4",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -418,7 +418,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS5",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 50.0,
+ "cim:Conductor.length": 0.050,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.015999999945951,
@@ -438,7 +438,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS6",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -458,7 +458,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS7",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -478,7 +478,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS8",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 40.0,
+ "cim:Conductor.length": 0.040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.012799999956761,
@@ -498,7 +498,7 @@
"cim:IdentifiedObject.name": "04 TELEMA2 ACLS9",
"cim:Equipment.aggregate": false,
"cim:Equipment.normallyInService": true,
- "cim:Conductor.length": 50.0,
+ "cim:Conductor.length": 0.050,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.gch": 0.0,
"cim:ACLineSegment.r": 0.015999999945951,
diff --git a/Telemark-120/Grid/CIMJSON-LD/Telemark-120-LV1_GL.jsonld b/Telemark-120/Grid/CIMJSON-LD/Telemark-120-LV1_GL.jsonld
index 31f8a1b..21b3217 100644
--- a/Telemark-120/Grid/CIMJSON-LD/Telemark-120-LV1_GL.jsonld
+++ b/Telemark-120/Grid/CIMJSON-LD/Telemark-120-LV1_GL.jsonld
@@ -137,6 +137,7 @@
{
"@id": "urn:uuid:36e1bc0b-c616-48f5-9a64-95c6d8beaa94",
"@type": "cim:Location",
+ "cim:IdentifiedObject.mRID": "36e1bc0b-c616-48f5-9a64-95c6d8beaa94",
"cim:IdentifiedObject.name": "L TELEMARKSTIEN2 CB6",
"cim:Location.CoordinateSystem": {
"@id": "urn:uuid:2be52cd7-b707-4dda-9e14-4a1966e22ff9"
diff --git a/Telemark-120/Grid/CIMJSON-LD/Telemark-120-MV1_EQ.jsonld b/Telemark-120/Grid/CIMJSON-LD/Telemark-120-MV1_EQ.jsonld
index 579fd7a..795b013 100644
--- a/Telemark-120/Grid/CIMJSON-LD/Telemark-120-MV1_EQ.jsonld
+++ b/Telemark-120/Grid/CIMJSON-LD/Telemark-120-MV1_EQ.jsonld
@@ -74,7 +74,7 @@
"cim:IdentifiedObject.description": "230V ZT1-EFC ACLineSegment 1",
"cim:IdentifiedObject.name": "023 ZT1-EFC ACLS 1",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 21.0,
+ "cim:Conductor.length": 0.0210,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 25.0,
"cim:ACLineSegment.x": 1.7,
@@ -92,7 +92,7 @@
"cim:IdentifiedObject.description": "230V ZT1-EFC ACLineSegment 2",
"cim:IdentifiedObject.name": "023 ZT1-EFC ACLS 2",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 10.5,
+ "cim:Conductor.length": 0.0105,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 12.5,
"cim:ACLineSegment.x": 0.85,
@@ -110,7 +110,7 @@
"cim:IdentifiedObject.description": "400V Telemarkstien 2 ACLineSegment 3",
"cim:IdentifiedObject.name": "04 TELEMA 2 ACLS 3",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 4.0,
+ "cim:Conductor.length": 0.0040,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 0.001278,
"cim:ACLineSegment.x": 0.0003016,
@@ -128,7 +128,7 @@
"cim:IdentifiedObject.description": "132kV Arendal-Froland 1 ACLineSegment 1",
"cim:IdentifiedObject.name": "132 ARENDAL-FROLAND ACLS 1",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 590.0,
+ "cim:Conductor.length": 0.5900,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 176.0,
"cim:ACLineSegment.x": 35.0,
@@ -146,7 +146,7 @@
"cim:IdentifiedObject.description": "132kV Arendal-T1 ACLineSegment 1",
"cim:IdentifiedObject.name": "132 ARENDAL-T1 ACLS 1",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 35.0,
+ "cim:Conductor.length": 0.0350,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 1.6,
"cim:ACLineSegment.x": 5.9,
@@ -164,7 +164,7 @@
"cim:IdentifiedObject.description": "132kV Froland-T-Engene ACLineSegment 1",
"cim:IdentifiedObject.name": "132 FROLAND-T_ENGENE ACLS 1",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 27070.0,
+ "cim:Conductor.length": 27.0700,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 1950.0,
"cim:ACLineSegment.x": 10530.0,
@@ -182,7 +182,7 @@
"cim:IdentifiedObject.description": "132kV T-Engene Engene 1 ACLineSegment 1",
"cim:IdentifiedObject.name": "132 T_ENGENE-ENGENE ACLS 1 1",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 2680.0,
+ "cim:Conductor.length": 2.6800,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 320.0,
"cim:ACLineSegment.x": 1080.0,
@@ -200,7 +200,7 @@
"cim:IdentifiedObject.description": "22kV Engene Nedenes ACLineSegment 1",
"cim:IdentifiedObject.name": "22 ENGENE-NEDENES ACLS 1",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 500.0,
+ "cim:Conductor.length": 0.5000,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 26.0,
"cim:ACLineSegment.x": 45.0,
@@ -218,7 +218,7 @@
"cim:IdentifiedObject.description": "22kV Engene Transformer 1 Cable 1",
"cim:IdentifiedObject.name": "22 ENGENE-T1 ACLS 1 1",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 20.0,
+ "cim:Conductor.length": 0.0200,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 1.6,
"cim:ACLineSegment.x": 3.4,
@@ -236,7 +236,7 @@
"cim:IdentifiedObject.description": "22kV Engene Transformer 1 Cable 2",
"cim:IdentifiedObject.name": "22 ENGENE-T1 ACLS 1 2",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 20.0,
+ "cim:Conductor.length": 0.0200,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 1.6,
"cim:ACLineSegment.x": 3.4,
@@ -254,7 +254,7 @@
"cim:IdentifiedObject.description": "22kV Engene-ZT1 ACLineSegment 1",
"cim:IdentifiedObject.name": "22 ENGENE-ZT1 ACLS 1",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 28.0,
+ "cim:Conductor.length": 0.0280,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 7.4,
"cim:ACLineSegment.x": 2.8,
@@ -272,7 +272,7 @@
"cim:IdentifiedObject.description": "22kV Telemarkstien 2 ACLineSegment 4",
"cim:IdentifiedObject.name": "22 TELEMA 2 ACLS 4",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 5.0,
+ "cim:Conductor.length": 0.0050,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 3.1,
"cim:ACLineSegment.x": 0.7,
@@ -290,7 +290,7 @@
"cim:IdentifiedObject.description": "22kV ZT1-EFC ACLineSegment 1",
"cim:IdentifiedObject.name": "22 ZT1-EFC ACLS 1",
"cim:Equipment.aggregate": false,
- "cim:Conductor.length": 13.0,
+ "cim:Conductor.length": 0.0130,
"cim:ACLineSegment.bch": 0.0,
"cim:ACLineSegment.r": 1.9,
"cim:ACLineSegment.x": 0.7,
@@ -1560,7 +1560,7 @@
"@type": "cim:CurrentLimit",
"cim:IdentifiedObject.mRID": "3401221c-3b67-7144-981f-94a1d57a77a1",
"cim:IdentifiedObject.name": "PATL T1 ARENDAL T1 420 P",
- "cim:CurrentLimit.normalValue": 412.0,
+ "cim:CurrentLimit.normalValue": 150.0,
"cim:OperationalLimit.OperationalLimitSet": {
"@id": "urn:uuid:17264ab0-1492-6243-8e2d-44d85d0841fc"
},
@@ -1573,7 +1573,7 @@
"@type": "cim:CurrentLimit",
"cim:IdentifiedObject.mRID": "1d069b92-4138-454e-9db4-c05f38f767ca",
"cim:IdentifiedObject.name": "TATL T1 ARENDAL T1 420 P",
- "cim:CurrentLimit.normalValue": 412.0,
+ "cim:CurrentLimit.normalValue": 150.0,
"cim:OperationalLimit.OperationalLimitSet": {
"@id": "urn:uuid:17264ab0-1492-6243-8e2d-44d85d0841fc"
},
@@ -1586,7 +1586,7 @@
"@type": "cim:CurrentLimit",
"cim:IdentifiedObject.mRID": "3817162d-5e9d-d243-be82-10c2eca33b5b",
"cim:IdentifiedObject.name": "PATL T2 ARENDAL T1 132 S",
- "cim:CurrentLimit.normalValue": 275.0,
+ "cim:CurrentLimit.normalValue": 500.0,
"cim:OperationalLimit.OperationalLimitSet": {
"@id": "urn:uuid:f681a7bd-f378-4c49-89b9-2fb70ec52c6a"
},
@@ -1599,7 +1599,7 @@
"@type": "cim:CurrentLimit",
"cim:IdentifiedObject.mRID": "a3dceeba-ffb3-4349-9c4f-efb8c5c05923",
"cim:IdentifiedObject.name": "TATL T2 ARENDAL T1 132 S",
- "cim:CurrentLimit.normalValue": 275.0,
+ "cim:CurrentLimit.normalValue": 500.0,
"cim:OperationalLimit.OperationalLimitSet": {
"@id": "urn:uuid:f681a7bd-f378-4c49-89b9-2fb70ec52c6a"
},
@@ -1828,8 +1828,8 @@
"cim:EquivalentInjection.r": 0.43445,
"cim:EquivalentInjection.regulationCapability": false,
"cim:EquivalentInjection.x": 4.3445,
- "cim:Equipment.EquipmentContainer": {
- "@id": "urn:uuid:1f4fabd4-8c57-c245-b107-4e64c9007ae3"
+ "cim:ConductingEquipment.BaseVoltage": {
+ "@id": "urn:uuid:2dd90159-bdfb-11e5-94fa-c8f73332c8f4"
}
},
{
@@ -3359,9 +3359,6 @@
"cim:IdentifiedObject.description": "Primary Winding Side",
"cim:IdentifiedObject.name": "T1 ENGENE NT1 22 P",
"cim:ACDCTerminal.sequenceNumber": 1,
- "cim:Terminal.phases": {
- "@id": "cim:PhaseCode.ABCN"
- },
"cim:Terminal.ConductingEquipment": {
"@id": "urn:uuid:681a2fcb-5a55-11eb-a658-74e5f963e191"
},
@@ -4418,6 +4415,48 @@
"@id": "urn:uuid:f1769670-9aeb-11e5-91da-b8763fd99c5f"
}
},
+ {
+ "@id": "urn:uuid:681a21b6-5a55-11eb-a658-74e5f963e191",
+ "@type": "cim:VoltageLevel",
+ "cim:IdentifiedObject.mRID": "681a21b6-5a55-11eb-a658-74e5f963e191",
+ "cim:IdentifiedObject.description": "Secondary Substation LV",
+ "cim:IdentifiedObject.name": "NEDENES 04",
+ "cim:VoltageLevel.BaseVoltage": {
+ "@id": "urn:uuid:9598e4a0-67e5-4ad7-879c-c85a1f63159c"
+ },
+ "cim:VoltageLevel.Substation": {
+ "@id": "urn:uuid:681a2179-5a55-11eb-a658-74e5f963e191"
+ }
+ },
+ {
+ "@id": "urn:uuid:681a2179-5a55-11eb-a658-74e5f963e191",
+ "@type": "cim:Substation",
+ "cim:IdentifiedObject.mRID": "681a2179-5a55-11eb-a658-74e5f963e191",
+ "cim:IdentifiedObject.description": "Secondary Substation Nedenes",
+ "cim:IdentifiedObject.name": "NEDENES",
+ "cim:Substation.Region": {
+ "@id": "urn:uuid:f176965f-9aeb-11e5-91da-b8763fd99c5f"
+ }
+ },
+ {
+ "@id": "urn:uuid:3d51330c-7528-4efb-8edc-e61dcc145ac4",
+ "@type": "cim:Bay",
+ "cim:IdentifiedObject.mRID": "3d51330c-7528-4efb-8edc-e61dcc145ac4",
+ "cim:IdentifiedObject.description": "Nedenes 400V Low Voltage Cable 1 Bay",
+ "cim:IdentifiedObject.name": "NEDENES 04LC1",
+ "cim:Bay.VoltageLevel": {
+ "@id": "urn:uuid:681a21b6-5a55-11eb-a658-74e5f963e191"
+ }
+ },
+ {
+ "@id": "urn:uuid:45fed034-857e-48df-b6ad-45d82eec564d",
+ "@type": "cim:ConnectivityNode",
+ "cim:IdentifiedObject.mRID": "45fed034-857e-48df-b6ad-45d82eec564d",
+ "cim:IdentifiedObject.name": "XNED1_XNED2 CN",
+ "cim:ConnectivityNode.ConnectivityNodeContainer": {
+ "@id": "urn:uuid:681a21b6-5a55-11eb-a658-74e5f963e191"
+ }
+ },
{
"@id": "urn:uuid:cb837454-5c66-d341-be63-d0c044e5fd3c",
"@type": "cim:ConnectivityNode",
diff --git a/Telemark-120/Grid/CIMJSON-LD/Telemark-120-MV1_SSH.jsonld b/Telemark-120/Grid/CIMJSON-LD/Telemark-120-MV1_SSH.jsonld
index c575e53..9621836 100644
--- a/Telemark-120/Grid/CIMJSON-LD/Telemark-120-MV1_SSH.jsonld
+++ b/Telemark-120/Grid/CIMJSON-LD/Telemark-120-MV1_SSH.jsonld
@@ -691,6 +691,7 @@
"cim:RotatingMachine.p": -178.0,
"cim:RotatingMachine.q": 0.0,
"cim:RegulatingCondEq.controlEnabled": true,
+ "cim:SynchronousMachine.referencePriority": 0,
"cim:SynchronousMachine.operatingMode": {
"@id": "cim:SynchronousMachineOperatingMode.generator"
}
diff --git a/Telemark-120/Grid/CIMXML/Telemark-120-LV1_EQ.xml b/Telemark-120/Grid/CIMXML/Telemark-120-LV1_EQ.xml
index db21f1c..6819095 100644
--- a/Telemark-120/Grid/CIMXML/Telemark-120-LV1_EQ.xml
+++ b/Telemark-120/Grid/CIMXML/Telemark-120-LV1_EQ.xml
@@ -22,7 +22,7 @@
04 TELEMA2 ACLS1
false
true
- 50
+ 0.050
0
0
0.015999999945951
@@ -38,7 +38,7 @@
04 TELEMA2 ACLS10
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -53,7 +53,7 @@
04 TELEMA2 ACLS11
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -68,7 +68,7 @@
04 TELEMA2 ACLS12
false
true
- 50
+ 0.050
0
0
0.015999999945951
@@ -83,7 +83,7 @@
04 TELEMA2 ACLS13
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -98,7 +98,7 @@
04 TELEMA2 ACLS14
false
true
- 50
+ 0.050
0
0
0.015999999945951
@@ -113,7 +113,7 @@
04 TELEMA2 ACLS15
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -128,7 +128,7 @@
04 TELEMA2 ACLS16
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -143,7 +143,7 @@
04 TELEMA2 ACLS17
false
true
- 60
+ 0.060
0
0
0.019199999935141
@@ -158,7 +158,7 @@
04 TELEMA2 ACLS18
false
true
- 50
+ 0.050
0
0
0.015999999945951
@@ -173,7 +173,7 @@
04 TELEMA2 ACLS19
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -188,7 +188,7 @@
04 TELEMA2 ACLS2
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -203,7 +203,7 @@
04 TELEMA2 ACLS20
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -218,7 +218,7 @@
04 TELEMA2 ACLS21
false
true
- 50
+ 0.050
0
0
0.015999999945951
@@ -233,7 +233,7 @@
04 TELEMA2 ACLS22
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -248,7 +248,7 @@
04 TELEMA2 ACLS23
false
true
- 60
+ 0.060
0
0
0.019199999935141
@@ -263,7 +263,7 @@
04 TELEMA2 ACLS4
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -278,7 +278,7 @@
04 TELEMA2 ACLS5
false
true
- 50
+ 0.050
0
0
0.015999999945951
@@ -293,7 +293,7 @@
04 TELEMA2 ACLS6
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -308,7 +308,7 @@
04 TELEMA2 ACLS7
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -323,7 +323,7 @@
04 TELEMA2 ACLS8
false
true
- 40
+ 0.040
0
0
0.012799999956761
@@ -338,7 +338,7 @@
04 TELEMA2 ACLS9
false
true
- 50
+ 0.050
0
0
0.015999999945951
diff --git a/Telemark-120/Grid/CIMXML/Telemark-120-LV1_GL.xml b/Telemark-120/Grid/CIMXML/Telemark-120-LV1_GL.xml
index fb3dcfb..320d4f6 100644
--- a/Telemark-120/Grid/CIMXML/Telemark-120-LV1_GL.xml
+++ b/Telemark-120/Grid/CIMXML/Telemark-120-LV1_GL.xml
@@ -94,6 +94,7 @@
+ 36e1bc0b-c616-48f5-9a64-95c6d8beaa94
L TELEMARKSTIEN2 CB6
diff --git a/Telemark-120/Grid/CIMXML/Telemark-120-LV1_SSH.xml b/Telemark-120/Grid/CIMXML/Telemark-120-LV1_SSH.xml
index be56cfa..d77b7f9 100644
--- a/Telemark-120/Grid/CIMXML/Telemark-120-LV1_SSH.xml
+++ b/Telemark-120/Grid/CIMXML/Telemark-120-LV1_SSH.xml
@@ -126,7 +126,7 @@
true
false
true
-
+
true
diff --git a/Telemark-120/Grid/CIMXML/Telemark-120-MV1_EQ.xml b/Telemark-120/Grid/CIMXML/Telemark-120-MV1_EQ.xml
index 0b371bf..a202d14 100644
--- a/Telemark-120/Grid/CIMXML/Telemark-120-MV1_EQ.xml
+++ b/Telemark-120/Grid/CIMXML/Telemark-120-MV1_EQ.xml
@@ -21,10 +21,10 @@
230V ZT1-EFC ACLineSegment 1
023 ZT1-EFC ACLS 1
false
- 21
+ 0.021
0
- 25
- 1.7
+ 0.025
+ 0.0017
@@ -34,10 +34,10 @@
230V ZT1-EFC ACLineSegment 2
023 ZT1-EFC ACLS 2
false
- 10.5
+ 0.0105
0
- 12.5
- 0.85
+ 0.0125
+ 0.00085
@@ -47,7 +47,7 @@
400V Telemarkstien 2 ACLineSegment 3
04 TELEMA 2 ACLS 3
false
- 4
+ 0.004
0
0.001278
0.0003016
@@ -60,10 +60,10 @@
132kV Arendal-Froland 1 ACLineSegment 1
132 ARENDAL-FROLAND ACLS 1
false
- 590
+ 0.590
0
- 176
- 35
+ 0.176
+ 0.035
@@ -73,10 +73,10 @@
132kV Arendal-T1 ACLineSegment 1
132 ARENDAL-T1 ACLS 1
false
- 35
+ 0.035
0
- 1.6
- 5.9
+ 0.0016
+ 0.0059
@@ -86,10 +86,10 @@
132kV Froland-T-Engene ACLineSegment 1
132 FROLAND-T_ENGENE ACLS 1
false
- 27070
+ 27.070
0
- 1950
- 10530
+ 1.95
+ 10.53
@@ -99,10 +99,10 @@
132kV T-Engene Engene 1 ACLineSegment 1
132 T_ENGENE-ENGENE ACLS 1 1
false
- 2680
+ 2.680
0
- 320
- 1080
+ 0.32
+ 1.08
@@ -112,10 +112,10 @@
22kV Engene Nedenes ACLineSegment 1
22 ENGENE-NEDENES ACLS 1
false
- 500
+ 0.500
0
- 26
- 45
+ 0.026
+ 0.045
@@ -125,10 +125,10 @@
22kV Engene Transformer 1 Cable 1
22 ENGENE-T1 ACLS 1 1
false
- 20
+ 0.020
0
- 1.6
- 3.4
+ 0.0016
+ 0.0034
@@ -138,10 +138,10 @@
22kV Engene Transformer 1 Cable 2
22 ENGENE-T1 ACLS 1 2
false
- 20
+ 0.020
0
- 1.6
- 3.4
+ 0.0016
+ 0.0034
@@ -151,10 +151,10 @@
22kV Engene-ZT1 ACLineSegment 1
22 ENGENE-ZT1 ACLS 1
false
- 28
+ 0.028
0
- 7.4
- 2.8
+ 0.0074
+ 0.0028
@@ -164,10 +164,10 @@
22kV Telemarkstien 2 ACLineSegment 4
22 TELEMA 2 ACLS 4
false
- 5
+ 0.005
0
- 3.1
- 0.7
+ 0.0031
+ 0.0007
@@ -177,13 +177,20 @@
22kV ZT1-EFC ACLineSegment 1
22 ZT1-EFC ACLS 1
false
- 13
+ 0.013
0
- 1.9
- 0.7
+ 0.0019
+ 0.0007
+
+
+ 3d51330c-7528-4efb-8edc-e61dcc145ac4
+ Nedenes 400V Low Voltage Cable 1 Bay
+ NEDENES 04LC1
+
+
5b498a4e-d2de-7f41-8f17-be255b3489db
@@ -504,6 +511,19 @@
DSO1 SA 1 LG 1
+
+
+ 45fed034-857e-48df-b6ad-45d82eec564d
+ XNED1_XNED2 CN
+
+
+
+
+ cb837454-5c66-d341-be63-d0c044e5fd3c
+
+ XARE1_XARE2 CN
+ Boundary on Arendal 420 Bus
+
681a1e80-5a55-11eb-a658-74e5f963e191
@@ -1028,7 +1048,7 @@
3401221c-3b67-7144-981f-94a1d57a77a1
PATL T1 ARENDAL T1 420 P
- 412
+ 150
@@ -1036,7 +1056,7 @@
1d069b92-4138-454e-9db4-c05f38f767ca
TATL T1 ARENDAL T1 420 P
- 412
+ 150
@@ -1044,7 +1064,7 @@
3817162d-5e9d-d243-be82-10c2eca33b5b
PATL T2 ARENDAL T1 132 S
- 275
+ 500
@@ -1052,7 +1072,7 @@
a3dceeba-ffb3-4349-9c4f-efb8c5c05923
TATL T2 ARENDAL T1 132 S
- 275
+ 500
@@ -1226,7 +1246,8 @@
0.43445
false
4.3445
-
+
+
@@ -1630,10 +1651,10 @@
1
false
0
- 0.84
+ 5.292
100
420
- 25.41
+ 246.9
@@ -1664,10 +1685,10 @@
1
false
0
- 2.37
+ 0.8712
100
132
- 82.28
+ 20.89
@@ -1732,10 +1753,10 @@
1
false
0
- 5.081
- 100
+ 2.5405
+ 2
22
- 35.45
+ 17.725
@@ -1750,7 +1771,7 @@
false
0
0
- 100
+ 2
0.400
0
@@ -1881,6 +1902,13 @@
T_ENGENE
+
+
+ 681a2179-5a55-11eb-a658-74e5f963e191
+ NEDENES
+
+ Secondary Substation Nedenes
+
33666962-c2f9-4f6b-af5a-2ef1982ac282
@@ -2258,7 +2286,6 @@
Primary Winding Side
T1 ENGENE NT1 22 P
1
-
@@ -2712,6 +2739,7 @@
Secondary Winding Side
T2 ENGENE ZT1 023 S
2
+
@@ -2915,12 +2943,13 @@
ARENDAL 420
-
- cb837454-5c66-d341-be63-d0c044e5fd3c
-
- XARE1_XARE2 CN
- Boundary on Arendal 420 Bus
-
+
+ 681a21b6-5a55-11eb-a658-74e5f963e191
+ Secondary Substation LV
+ NEDENES 04
+
+
+
2dd90174-bdfb-11e5-94fa-c8f73332c8f4
diff --git a/Telemark-120/Grid/CIMXML/Telemark-120-MV1_SC.xml b/Telemark-120/Grid/CIMXML/Telemark-120-MV1_SC.xml
index 1e12833..d2a5010 100644
--- a/Telemark-120/Grid/CIMXML/Telemark-120-MV1_SC.xml
+++ b/Telemark-120/Grid/CIMXML/Telemark-120-MV1_SC.xml
@@ -23,8 +23,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 0.006804
+ 0.09996
@@ -32,8 +32,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 0.003402
+ 0.04998
@@ -41,8 +41,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 0.001208
+ 0.00512
@@ -50,8 +50,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 0.06962
+ 0.61537
@@ -59,8 +59,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 0.01183
+ 0.00483
@@ -68,8 +68,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 21.06046
+ 6.82164
@@ -77,8 +77,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 2.16008
+ 1.11622
@@ -86,8 +86,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 0.135
+ 0.052
@@ -95,8 +95,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 0.0102
+ 0.0032
@@ -104,8 +104,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 0.0102
+ 0.0032
@@ -113,8 +113,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 0.0084
+ 0.014784
@@ -122,8 +122,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 0.0021
+ 0.0062
@@ -131,8 +131,8 @@
160.0000000000
0.0
0.0
- 0.900000
- 0.300000
+ 0.002106
+ 0.003796
diff --git a/Telemark-120/Grid/CIMXML/Telemark-120-MV1_SSH.xml b/Telemark-120/Grid/CIMXML/Telemark-120-MV1_SSH.xml
index 3e90cb4..d703605 100644
--- a/Telemark-120/Grid/CIMXML/Telemark-120-MV1_SSH.xml
+++ b/Telemark-120/Grid/CIMXML/Telemark-120-MV1_SSH.xml
@@ -528,6 +528,7 @@
-178
0
true
+ 0
diff --git a/Telemark-120/docs/ModelingGuide.adoc b/Telemark-120/docs/ModelingGuide.adoc
index d915d0e..2f28e4a 100644
--- a/Telemark-120/docs/ModelingGuide.adoc
+++ b/Telemark-120/docs/ModelingGuide.adoc
@@ -28,7 +28,7 @@ CGMES v3.0 currently only supports fixed units for any given attribute. The foll
[grid=none, frame=none, width=30em]
|===
||
-|Length|m
+|Length|km
|Power|MW
|Reactive Power |MVAr
|Voltage |kV