Skip to content

Commit

Permalink
Merge branch 'main' into ucte_allow_multiple_loads
Browse files Browse the repository at this point in the history
  • Loading branch information
@colinepiloquet
colinepiloquet authored Feb 4, 2025
2 parents cec87b1 + c4d300e commit 27ac742
Show file tree
Hide file tree
Showing 69 changed files with 1,587 additions and 24,545 deletions.
105 changes: 0 additions & 105 deletions ...onformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1ModifiedCatalog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -969,57 +969,6 @@ public static GridModelReferenceResources miniNodeBreakerSvInjection() {
MINI_GRID_BD_TP));
}

public static GridModelReferenceResources miniNodeBreakerLoadBreakSwitch() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MiniGrid/NodeBreaker/BaseCase_Complete_v3_load_break_switch/";
return new GridModelReferenceResources(
"MiniGrid-NodeBreaker-Load-Break-Switch",
null,
new ResourceSet(base,
MINI_GRID_EQ),
new ResourceSet(MINI_GRID_NODE_BREAKER_BASE,
MINI_GRID_SV,
MINI_GRID_DL,
MINI_GRID_SSH,
MINI_GRID_TP),
new ResourceSet(MINI_GRID_NODE_BREAKER_BD_BASE, MINI_GRID_BD_EQ,
MINI_GRID_BD_TP));
}

public static GridModelReferenceResources miniNodeBreakerProtectedSwitch() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MiniGrid/NodeBreaker/BaseCase_Complete_v3_protected_switch/";
return new GridModelReferenceResources(
"MiniGrid-NodeBreaker-Protected-Switch",
null,
new ResourceSet(base,
MINI_GRID_EQ),
new ResourceSet(MINI_GRID_NODE_BREAKER_BASE,
MINI_GRID_SV,
MINI_GRID_DL,
MINI_GRID_SSH,
MINI_GRID_TP),
new ResourceSet(MINI_GRID_NODE_BREAKER_BD_BASE, MINI_GRID_BD_EQ,
MINI_GRID_BD_TP));
}

public static GridModelReference miniNodeBreakerInternalLineZ0() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MiniGrid/NodeBreaker/BaseCase_Complete_v3_internal_line_z0/";
return new GridModelReferenceResources(
"MiniGrid-NodeBreaker-InternalLineZ0",
null,
new ResourceSet(base,
MINI_GRID_EQ),
new ResourceSet(MINI_GRID_NODE_BREAKER_BASE,
MINI_GRID_SV,
MINI_GRID_DL,
MINI_GRID_SSH,
MINI_GRID_TP),
new ResourceSet(MINI_GRID_NODE_BREAKER_BD_BASE, MINI_GRID_BD_EQ,
MINI_GRID_BD_TP));
}

public static GridModelReference miniNodeBreakerMissingSubstationRegion() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MiniGrid/NodeBreaker/BaseCase_Complete_v3_missing_substation_region/";
Expand Down Expand Up @@ -1351,19 +1300,6 @@ public static GridModelReference microGridBaseCaseAssembledEntsoeCategory() {
microGridBaseCaseBoundaries());
}

public static GridModelReference miniNodeBreakerTerminalDisconnected() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MiniGrid/NodeBreaker/BaseCase_Complete_v3_terminal_disconnected/";
return new GridModelReferenceResources(
"MiniGrid-NodeBreaker-terminal-disconnected",
null,
new ResourceSet(base, MINI_GRID_SSH),
new ResourceSet(MINI_GRID_NODE_BREAKER_BASE, MINI_GRID_EQ),
new ResourceSet(MINI_GRID_NODE_BREAKER_BD_BASE, MINI_GRID_BD_EQ,
MINI_GRID_BD_TP));

}

public static GridModelReference microGridBaseCaseAssembledBadIds() {
String baseModified = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MicroGrid/BaseCase/BC_Assembled_v2_bad_ids/";
Expand Down Expand Up @@ -1407,33 +1343,6 @@ public static GridModelReference microGridBaseCaseNLShuntCompensatorGP() {
microGridBaseCaseBoundaries());
}

public static GridModelReference microGridBaseCaseNLSwitchWithoutName() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MicroGrid/BaseCase/BC_NL_v2_switch_without_name/";
String baseOriginal = ENTSOE_CONFORMITY_1
+ MICROGRID_CONFIGURATION;
return new GridModelReferenceResources(
"MicroGrid-BaseCase-NL-switch-no-name",
null,
new ResourceSet(base, MICRO_GRID_NL_EQ),
new ResourceSet(baseOriginal, MICRO_GRID_NL_SSH,
MICRO_GRID_NL_TP),
microGridBaseCaseBoundaries());
}

public static GridModelReference microGridBaseCaseNLSwitchTypePreserved() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MicroGrid/BaseCase/BC_NL_v2_switch_type_preserved/";
String baseOriginal = ENTSOE_CONFORMITY_1
+ MICROGRID_CONFIGURATION;
return new GridModelReferenceResources(
"MicroGrid-BaseCase-NL-switch-type-preserved",
null,
new ResourceSet(base, MICRO_GRID_NL_EQ, MICRO_GRID_NL_SSH),
new ResourceSet(baseOriginal, MICRO_GRID_NL_TP),
microGridBaseCaseBoundaries());
}

public static GridModelReference microGridBaseCaseBESingleFile() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MicroGrid/BaseCase/BC_BE_v2_single_file/";
Expand Down Expand Up @@ -1529,20 +1438,6 @@ public static GridModelReferenceResources smallGridBusBranchWithBusbarSectionsAn
SMALL_GRID_BD_TP));
}

public static GridModelReferenceResources miniGridNodeBreakerSwitchTypePreserved() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MiniGrid/NodeBreaker/BaseCase_Complete_v3_switch_type_preserved/";
return new GridModelReferenceResources(
"MiniGrid-NodeBreaker-BaseCase-Complete-v3-switch-type-preserved",
null,
new ResourceSet(base, MINI_GRID_EQ, MINI_GRID_SSH),
new ResourceSet(MINI_GRID_NODE_BREAKER_BASE,
MINI_GRID_SV,
MINI_GRID_TP),
new ResourceSet(MINI_GRID_NODE_BREAKER_BD_BASE, MINI_GRID_BD_EQ,
MINI_GRID_BD_TP));
}

public static GridModelReferenceResources microGridBaseCaseAssembledSvWithMas() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MicroGrid/BaseCase/BC_Assembled_v2_sv_with_mas/";
Expand Down
2 changes: 1 addition & 1 deletion ...Grid/BaseCase/BC_BE_v2_transformer_at_boundary/MicroGridTestConfiguration_BC_BE_EQ_V2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1427,7 +1427,7 @@
<cim:OperationalLimitType.direction rdf:resource="http://iec.ch/TC57/2013/CIM-schema-cim16#OperationalLimitDirectionKind.absoluteValue"/>
<entsoe:OperationalLimitType.limitType rdf:resource="http://entsoe.eu/CIM/SchemaExtension/3/1#LimitTypeKind.tct"/>
</cim:OperationalLimitType>
<cim:PhaseTapChangerAsymmetrical rdf:ID="_6ebbef67-3061-4236-a6fd-6ccc4595f6c3">
<cim:PhaseTapChangerAsymmetrical rdf:ID="_6ebbef67-3061-4236-a6fd-6ccc4595f6c4">
<cim:IdentifiedObject.name>BE-TR2_1</cim:IdentifiedObject.name>
<entsoe:IdentifiedObject.shortName>BE-T_1</entsoe:IdentifiedObject.shortName>
<cim:TapChanger.neutralU>400.000000</cim:TapChanger.neutralU>
Expand Down
Loading

0 comments on commit 27ac742

Please sign in to comment.