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.

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

adjusting regulating when modifying phase tap changer #537

Merged
merged 19 commits into from
Oct 25, 2024
Merged

adjusting regulating when modifying phase tap changer #537

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
be3f875
fix regulating when modifying phase tap changer
EtienneLt Sep 24, 2024
32dda30
fix
EtienneLt Oct 1, 2024
62fd2ed
fix
EtienneLt Oct 7, 2024
e7958ea
review
EtienneLt Oct 10, 2024
b805380
review
EtienneLt Oct 10, 2024
a8924ae
fix
EtienneLt Oct 10, 2024
9a50653
fix
EtienneLt Oct 11, 2024
c6fa695
fix
EtienneLt Oct 11, 2024
775dfa2
text
EtienneLt Oct 11, 2024
cd8b0f3
reworked and fix logic
EtienneLt Oct 16, 2024
e083cda
Proposed renamming regulating phase tap changer (#551)
thangqp Oct 17, 2024
a3afe1e
add test coverage
EtienneLt Oct 21, 2024
588d6c2
add tests
EtienneLt Oct 21, 2024
79ae373
add tests
EtienneLt Oct 21, 2024
7189eb7
add more tests
EtienneLt Oct 23, 2024
2684fce
add new test
EtienneLt Oct 24, 2024
9f14121
fix sonar
EtienneLt Oct 24, 2024
f24fe0d
Merge branch 'main' into fix-regulating-phaseTapChanger
EtienneLt Oct 24, 2024
7634e8f
test
EtienneLt Oct 25, 2024
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
5 changes: 2 additions & 3 deletions ...ridsuite/modification/server/dto/byfilter/equipmentfield/TwoWindingsTransformerField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ public static void setNewValue(TwoWindingsTransformer transformer, String twoWin
TwoWindingsTransformerField field = TwoWindingsTransformerField.valueOf(twoWindingsTransformerField);
final PhaseTapChanger phaseTapChanger = transformer.getPhaseTapChanger();
final RatioTapChanger ratioTapChanger = transformer.getRatioTapChanger();
final PhaseTapChanger.RegulationMode regulationMode = phaseTapChanger != null ? phaseTapChanger.getRegulationMode() : null;
final AttributeModification<Double> attributeModification = new AttributeModification<>(Double.parseDouble(newValue), OperationType.SET);

switch (field) {
Expand All @@ -81,13 +80,13 @@ public static void setNewValue(TwoWindingsTransformer transformer, String twoWin
null, new AttributeModification<>((int) Double.parseDouble(newValue), OperationType.SET), null, null);
case RATIO_TARGET_DEADBAND -> modifyTargets(ratioTapChanger, null, true, null, attributeModification, null);
case REGULATION_VALUE -> processPhaseTapRegulation(
phaseTapChanger, null, regulationMode, true, attributeModification, null, null);
phaseTapChanger, null, true, null, attributeModification, null, null);
case PHASE_LOW_TAP_POSITION -> processTapChangerPositionsAndSteps(phaseTapChanger, null, true,
new AttributeModification<>((int) Double.parseDouble(newValue), OperationType.SET), null, null, null);
case PHASE_TAP_POSITION -> processTapChangerPositionsAndSteps(phaseTapChanger, null, true,
null, new AttributeModification<>((int) Double.parseDouble(newValue), OperationType.SET), null, null);
case PHASE_TARGET_DEADBAND -> processPhaseTapRegulation(
phaseTapChanger, null, null, true, null, attributeModification, null
phaseTapChanger, null, true, null, null, attributeModification, null
);
}
}
Expand Down
16 changes: 5 additions & 11 deletions src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,17 +1007,11 @@ public <T> void reportElementaryCreation(ReportNode subReportNode, T value, Stri
}

public String formatRegulationModeReport(PhaseTapChanger.RegulationMode regulationMode) {
switch (regulationMode) {
case FIXED_TAP:
return " Fixed tap";
case CURRENT_LIMITER :
return " Current limiter";
case ACTIVE_POWER_CONTROL :
return " Active power control";
default :
return "";

}
return switch (regulationMode) {
case FIXED_TAP -> " Fixed tap";
case CURRENT_LIMITER -> " Current limiter";
case ACTIVE_POWER_CONTROL -> " Active power control";
};
}

public void modifyReactiveCapabilityCurvePoints(Collection<ReactiveCapabilityCurve.Point> points,
Expand Down
169 changes: 118 additions & 51 deletions ...a/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.util.ArrayList;
import java.util.List;

import static org.gridsuite.modification.server.NetworkModificationException.Type.TWO_WINDINGS_TRANSFORMER_NOT_FOUND;
import static org.gridsuite.modification.server.NetworkModificationException.Type.*;
import static org.gridsuite.modification.server.modifications.ModificationUtils.insertReportNode;

/**
Expand Down Expand Up @@ -198,26 +198,10 @@ private void processPhaseTapChanger(Network network,
PhaseTapChangerAdder phaseTapChangerAdder = isModification ? null : twt.newPhaseTapChanger();
PhaseTapChangerModificationInfos phaseTapChangerInfos = twoWindingsTransformerModificationInfos
.getPhaseTapChanger();

List<ReportNode> phaseTapChangerReports = new ArrayList<>();
ReportNode regulationModeReport = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(
isModification ? phaseTapChanger::setRegulationMode : phaseTapChangerAdder::setRegulationMode,
isModification ? phaseTapChanger::getRegulationMode : () -> null,
phaseTapChangerInfos.getRegulationMode(), "Regulation mode", 1);
if (regulationModeReport != null) {
phaseTapChangerReports.add(regulationModeReport);
}

List<ReportNode> regulationReports = new ArrayList<>();
PhaseTapChanger.RegulationMode regulationMode = isModification ? phaseTapChanger.getRegulationMode() : null;
if (phaseTapChangerInfos.getRegulationMode() != null
&& phaseTapChangerInfos.getRegulationMode().getValue() != null) {
regulationMode = phaseTapChangerInfos.getRegulationMode().getValue();
}
if (!PhaseTapChanger.RegulationMode.FIXED_TAP.equals(regulationMode)) {
processPhaseTapRegulation(phaseTapChanger, phaseTapChangerAdder, regulationMode, isModification, phaseTapChangerInfos.getRegulationValue(), phaseTapChangerInfos.getTargetDeadband(), regulationReports
);
}

processPhaseTapRegulation(phaseTapChanger, phaseTapChangerAdder, isModification, phaseTapChangerInfos.getRegulationMode(),
phaseTapChangerInfos.getRegulationValue(), phaseTapChangerInfos.getTargetDeadband(), regulationReports);

processRegulatingTerminal(phaseTapChangerInfos, phaseTapChanger, phaseTapChangerAdder, regulationReports,
network,
Expand All @@ -230,60 +214,143 @@ private void processPhaseTapChanger(Network network,
phaseTapChangerAdder.add();
}

if (!phaseTapChangerReports.isEmpty() || !regulationReports.isEmpty() || !positionsAndStepsReports.isEmpty()) {
if (!regulationReports.isEmpty() || !positionsAndStepsReports.isEmpty()) {
ReportNode phaseTapChangerSubreporter = ModificationUtils.getInstance().reportModifications(subReportNode,
phaseTapChangerReports, TapChangerType.PHASE.name(), PHASE_TAP_CHANGER_SUBREPORTER_DEFAULT_MESSAGE
regulationReports, TapChangerType.PHASE.name(), PHASE_TAP_CHANGER_SUBREPORTER_DEFAULT_MESSAGE
);
if (phaseTapChangerSubreporter == null) {
phaseTapChangerSubreporter = subReportNode.newReportNode()
.withMessageTemplate(TapChangerType.PHASE.name(), PHASE_TAP_CHANGER_SUBREPORTER_DEFAULT_MESSAGE)
.add();
}
ModificationUtils.getInstance().reportModifications(phaseTapChangerSubreporter, regulationReports,
regulationMode != null ? regulationMode.name() : null,
ModificationUtils.getInstance().formatRegulationModeReport(regulationMode)
);
ModificationUtils.getInstance().reportModifications(phaseTapChangerSubreporter, positionsAndStepsReports,
"phaseTapChangerPositionsAndStepsModification", " Tap Changer");
}
}

public static void processPhaseTapRegulation(PhaseTapChanger phaseTapChanger,
PhaseTapChangerAdder phaseTapChangerAdder,
PhaseTapChanger.RegulationMode regulationMode,
boolean isModification,
AttributeModification<Double> modifyRegulationValue,
AttributeModification<Double> modifyTargetDeadband,
List<ReportNode> regulationReports) {

if (regulationMode != null) {
String fieldName = (regulationMode.equals(PhaseTapChanger.RegulationMode.CURRENT_LIMITER)) ? "Value" : "Flow set point";
ReportNode regulationValueReportNode = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(
isModification ? phaseTapChanger::setRegulationValue
: phaseTapChangerAdder::setRegulationValue,
isModification ? phaseTapChanger::getRegulationValue : () -> null,
modifyRegulationValue,
fieldName,
2);
if (regulationReports != null && regulationValueReportNode != null) {
regulationReports.add(regulationValueReportNode);
AttributeModification<PhaseTapChanger.RegulationMode> regulationModeModification,
AttributeModification<Double> regulationValueModification,
AttributeModification<Double> targetDeadbandModification,
List<ReportNode> regulationReports) throws NetworkModificationException {
AttributeModification<PhaseTapChanger.RegulationMode> finalRegulationModeModification = regulationModeModification;
AttributeModification<Double> finalTargetDeadbandModification = targetDeadbandModification;
AttributeModification<Boolean> finalRegulatingModification = null;

// --- Regulation Mode impacts on regulating => pre-processing regulating --- //
if (isModification) { // modifying an existing extension
// modification check
if (regulationModeModification != null) {
PhaseTapChanger.RegulationMode oldRegulationMode = phaseTapChanger.getRegulationMode();
PhaseTapChanger.RegulationMode newRegulationMode = regulationModeModification.getValue();
double oldTargetDeadBand = phaseTapChanger.getTargetDeadband();

if (oldRegulationMode == PhaseTapChanger.RegulationMode.FIXED_TAP) {
// if new regulation mode is FIXED_TAP set regulating to false
if (newRegulationMode == PhaseTapChanger.RegulationMode.FIXED_TAP) {
finalRegulatingModification = AttributeModification.toAttributeModification(false, OperationType.SET);
} else { // new regulation mode is CURRENT_LIMITER or ACTIVE_POWER_CONTROL
// check required field
if (regulationValueModification == null) {
throw new NetworkModificationException(MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Regulation value is missing, phase tap changer can not regulate");
}

// set regulating to true
finalRegulatingModification = AttributeModification.toAttributeModification(true, OperationType.SET);

// set default value for deadband
if (Double.isNaN(oldTargetDeadBand) && targetDeadbandModification == null) {
finalTargetDeadbandModification = AttributeModification.toAttributeModification(0.0, OperationType.SET);
}
}
} else { // previous regulation mode is CURRENT_LIMITER or ACTIVE_POWER_CONTROL
// if new regulation mode is FIXED_TAP we keep the old regulation mode and set regulating to false
if (newRegulationMode == PhaseTapChanger.RegulationMode.FIXED_TAP) {
finalRegulatingModification = AttributeModification.toAttributeModification(false, OperationType.SET);
finalRegulationModeModification = AttributeModification.toAttributeModification(oldRegulationMode, OperationType.SET);
} else { // new regulation mode is CURRENT_LIMITER or ACTIVE_POWER_CONTROL
// set regulating to true
finalRegulatingModification = AttributeModification.toAttributeModification(true, OperationType.SET);
// set default value for deadband
if (Double.isNaN(oldTargetDeadBand) && targetDeadbandModification == null) {
finalTargetDeadbandModification = AttributeModification.toAttributeModification(0.0, OperationType.SET);
}
}
}
}
} else {
// creation check
if (regulationModeModification == null) {
throw new NetworkModificationException(CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Regulation mode is missing when creating tap phase changer");
}

PhaseTapChanger.RegulationMode regulationMode = regulationModeModification.getValue();
if (regulationMode != PhaseTapChanger.RegulationMode.FIXED_TAP) {
finalRegulatingModification = AttributeModification.toAttributeModification(true, OperationType.SET);
if (regulationValueModification == null) {
throw new NetworkModificationException(CREATE_TWO_WINDINGS_TRANSFORMER_ERROR,
"Regulation value is missing when creating tap phase changer with regulation enabled (different from FIXED_TAP)");
}
if (finalTargetDeadbandModification == null) {
finalTargetDeadbandModification = AttributeModification.toAttributeModification(0.0, OperationType.SET);
}
} else {
finalRegulatingModification = AttributeModification.toAttributeModification(false, OperationType.SET);
}
}

//c--- apply changes after pre-processing of regulating --- //
setPhaseTapChangerRegulationAttributes(phaseTapChanger, phaseTapChangerAdder, isModification,
finalRegulationModeModification, regulationValueModification, finalTargetDeadbandModification, finalRegulatingModification, regulationReports);

}

private static void setPhaseTapChangerRegulationAttributes(PhaseTapChanger phaseTapChanger,
PhaseTapChangerAdder phaseTapChangerAdder,
boolean isModification,
AttributeModification<PhaseTapChanger.RegulationMode> regulationModeModification,
AttributeModification<Double> regulationValueModification,
AttributeModification<Double> targetDeadbandModification,
AttributeModification<Boolean> regulatingModification,
List<ReportNode> regulationReports) {
// the order is important if regulation mode is set and regulation value or target dead band is null it will crash
PhaseTapChanger.RegulationMode regulationMode = regulationModeModification == null ? null : regulationModeModification.getValue();
String fieldName = (regulationMode == PhaseTapChanger.RegulationMode.CURRENT_LIMITER) ? "Value" : "Flow set point";
// Regulation value
ReportNode regulationValueReportNode = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(
isModification ? phaseTapChanger::setRegulationValue : phaseTapChangerAdder::setRegulationValue,
isModification ? phaseTapChanger::getRegulationValue : () -> null,
regulationValueModification, fieldName, 1);
if (regulationReports != null && regulationValueReportNode != null) {
regulationReports.add(regulationValueReportNode);
}
// targetDeadBand
ReportNode targetDeadbandReportNode = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(
isModification ? phaseTapChanger::setTargetDeadband
: phaseTapChangerAdder::setTargetDeadband,
isModification ? phaseTapChanger::getTargetDeadband : () -> null,
modifyTargetDeadband, "Target deadband", 2);

isModification ? phaseTapChanger::setTargetDeadband : phaseTapChangerAdder::setTargetDeadband,
isModification ? phaseTapChanger::getTargetDeadband : () -> null,
targetDeadbandModification, "Target deadband", 1);
if (regulationReports != null && targetDeadbandReportNode != null) {
regulationReports.add(targetDeadbandReportNode);
}

if (isModification) {
phaseTapChanger.setRegulating(true);
} else {
phaseTapChangerAdder.setRegulating(true);
// RegulationMode
ReportNode regulationReportNode = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(
isModification ? phaseTapChanger::setRegulationMode : phaseTapChangerAdder::setRegulationMode,
isModification ? phaseTapChanger::getRegulationMode : () -> null,
regulationModeModification, "Regulation mode", 1);
if (regulationReports != null && regulationReportNode != null) {
regulationReports.add(regulationReportNode);
}

// Regulating
ReportNode regulatingReportNode = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(
isModification ? phaseTapChanger::setRegulating : phaseTapChangerAdder::setRegulating,
isModification ? phaseTapChanger::isRegulating : () -> null,
regulatingModification, "Phase tap regulating", 1);
if (regulationReports != null && regulatingReportNode != null) {
regulationReports.add(regulatingReportNode);
}
}

Expand Down
Loading
Loading