CGMES: remove extension for Control Areas, use IIDM Area #3149
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /** | ||
| Copyright (c) 2024, RTE (http://www.rte-france.com) | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| * SPDX-License-Identifier: MPL-2.0 | ||
| */ | ||
| package com.powsybl.cgmes.conversion.elements; | ||
|
|
||
| import com.powsybl.cgmes.conversion.Context; | ||
| import com.powsybl.cgmes.model.CgmesNames; | ||
| import com.powsybl.iidm.network.Area; | ||
| import com.powsybl.triplestore.api.PropertyBag; | ||
|
|
||
| /** | ||
| * @author Luma Zamarreño {@literal <zamarrenolm at aia.es>} | ||
| */ | ||
| public class ControlAreaConversion extends AbstractIdentifiedObjectConversion { | ||
|
|
||
| public ControlAreaConversion(PropertyBag area, Context context) { | ||
| super(CgmesNames.CONTROL_AREA, area, context); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean valid() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void convert() { | ||
| String controlAreaId = p.getId(CgmesNames.CONTROL_AREA); | ||
| String type = p.getLocal("controlAreaType"); | ||
| Area area = context.network().newArea() | ||
| .setAreaType(type) // Copy the type defined by CGMES | ||
| .setId(controlAreaId) | ||
| .setName(p.getLocal("name")) | ||
| .setInterchangeTarget(p.asDouble("netInterchange", Double.NaN)) | ||
| .add(); | ||
| if (p.containsKey(CgmesNames.P_TOLERANCE)) { | ||
| String pTolerance = p.get(CgmesNames.P_TOLERANCE); | ||
| area.setProperty(CgmesNames.P_TOLERANCE, pTolerance); | ||
| } | ||
| if (p.containsKey(CgmesNames.ENERGY_IDENT_CODE_EIC)) { | ||
| area.addAlias(p.get(CgmesNames.ENERGY_IDENT_CODE_EIC), CgmesNames.ENERGY_IDENT_CODE_EIC); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /** | ||
| Copyright (c) 2024, RTE (http://www.rte-france.com) | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| * SPDX-License-Identifier: MPL-2.0 | ||
| */ | ||
| package com.powsybl.cgmes.conversion.elements; | ||
|
|
||
| import com.powsybl.cgmes.conversion.Context; | ||
| import com.powsybl.cgmes.conversion.RegulatingTerminalMapper; | ||
| import com.powsybl.cgmes.model.CgmesNames; | ||
| import com.powsybl.cgmes.model.CgmesTerminal; | ||
| import com.powsybl.iidm.network.Area; | ||
| import com.powsybl.iidm.network.Boundary; | ||
| import com.powsybl.triplestore.api.PropertyBag; | ||
|
|
||
| /** | ||
| * @author Luma Zamarreño {@literal <zamarrenolm at aia.es>} | ||
| */ | ||
| public class TieFlowConversion extends AbstractIdentifiedObjectConversion { | ||
|
|
||
| public TieFlowConversion(PropertyBag tieFlow, Context context) { | ||
| super(CgmesNames.TIE_FLOW, tieFlow, context); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean valid() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void convert() { | ||
| String controlAreaId = p.getId(CgmesNames.CONTROL_AREA); | ||
| Area area = context.network().getArea(controlAreaId); | ||
| if (area == null) { | ||
| context.ignored("Tie Flow", String.format("Tie Flow %s refers to a non-existing control area", p.getId("TieFlow"))); | ||
|
There was a problem hiding this comment. You could use the constant from CgmesNames for more consistency: p.getId(CgmesNames.TIE_FLOW) |
||
| return; | ||
| } | ||
| String terminalId = p.getId("terminal"); | ||
|
There was a problem hiding this comment. You could use the constant from CgmesNames for more consistency: p.getId(CgmesNames.TERMINAL) |
||
| boolean isAc = isConsideredAcTieFlow(terminalId); | ||
| Boundary boundary = context.terminalMapping().findBoundary(terminalId, context.cgmes()); | ||
| if (boundary != null) { | ||
| area.newAreaBoundary() | ||
| .setAc(isAc) | ||
| .setBoundary(boundary) | ||
| .add(); | ||
| return; | ||
| } | ||
| RegulatingTerminalMapper.mapForTieFlow(terminalId, context) | ||
| .ifPresent(t -> area.newAreaBoundary() | ||
| .setAc(isAc) | ||
| .setTerminal(t) | ||
| .add()); | ||
| } | ||
|
|
||
| private boolean isConsideredAcTieFlow(String terminalId) { | ||
| CgmesTerminal cgmesTerminal = context.cgmes().terminal(terminalId); | ||
| String node = cgmesTerminal.topologicalNode() == null ? cgmesTerminal.connectivityNode() : cgmesTerminal.topologicalNode(); | ||
| boolean isDc = context.boundary().isHvdc(node); | ||
| return !isDc; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ControlAreaTypeKind.Interchangeenum value is used here as well as in:EquipmentExportSteadyStateHypothesisExportControlAreaEqCgmesConformity1ModifiedConversionTestEquipmentExportTestSteadyStateHypothesisExportTestI think it would be worth creating a constant in
CgmesNames.