Skip to content

Commit

Permalink
Proposed renamming regulating phase tap changer (#551)
Browse files Browse the repository at this point in the history 
* Revert mistake in previous commit

* fix regulating when modifying phase tap changer (renamming proposition )
  • Loading branch information
@thangqp
thangqp authored Oct 17, 2024
1 parent 86a0260 commit fb77a31
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 59 deletions.
4 changes: 1 addition & 3 deletions ...ridsuite/modification/server/dto/byfilter/equipmentfield/TwoWindingsTransformerField.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +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 AttributeModification<PhaseTapChanger.RegulationMode> regulationMode = phaseTapChanger != null ?
AttributeModification.toAttributeModification(phaseTapChanger.getRegulationMode(), OperationType.SET) : null;
final AttributeModification<Double> attributeModification = new AttributeModification<>(Double.parseDouble(newValue), OperationType.SET);

switch (field) {
Expand All @@ -82,7 +80,7 @@ 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, true, regulationMode, 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,
Expand Down
120 changes: 64 additions & 56 deletions ...a/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModification.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,116 +231,124 @@ private void processPhaseTapChanger(Network network,
public static void processPhaseTapRegulation(PhaseTapChanger phaseTapChanger,
PhaseTapChangerAdder phaseTapChangerAdder,
boolean isModification,
AttributeModification<PhaseTapChanger.RegulationMode> regulationModeValue,
AttributeModification<Double> modifyRegulationValue,
AttributeModification<Double> modifyTargetDeadband,
AttributeModification<PhaseTapChanger.RegulationMode> regulationModeModification,
AttributeModification<Double> regulationValueModification,
AttributeModification<Double> targetDeadbandModification,
List<ReportNode> regulationReports) throws NetworkModificationException {
AttributeModification<PhaseTapChanger.RegulationMode> finalRegulationMode = regulationModeValue;
AttributeModification<Double> finalTargetDeadband = modifyTargetDeadband;
AttributeModification<Boolean> finalRegulating = null;

// Regulation Mode is linked to regulating
if (isModification) {
// modification
if (regulationModeValue != null) {
Double regulationValue = modifyRegulationValue == null ? null : modifyRegulationValue.getValue();
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 = regulationModeValue.getValue();
double targetDeadBand = phaseTapChanger.getTargetDeadband();
// if previous regulation mode was FIXED_TAP there is a check that there are all the attributes needed to regulate
PhaseTapChanger.RegulationMode newRegulationMode = regulationModeModification.getValue();
double oldTargetDeadBand = phaseTapChanger.getTargetDeadband();

if (oldRegulationMode == PhaseTapChanger.RegulationMode.FIXED_TAP) {
if (regulationValue == null) {
throw new NetworkModificationException(MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Regulation value can not be null if phase tap changer is now regulating");
}
finalRegulating = AttributeModification.toAttributeModification(true, OperationType.SET);
finalRegulationMode = AttributeModification.toAttributeModification(newRegulationMode, OperationType.SET);
if (Double.isNaN(targetDeadBand) && modifyTargetDeadband == null) {
finalTargetDeadband = AttributeModification.toAttributeModification(0.0, OperationType.SET);
// 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 while phase tap changer is now regulating");
}

// 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 {
} 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) {
finalRegulating = AttributeModification.toAttributeModification(false, OperationType.SET);
finalRegulationMode = AttributeModification.toAttributeModification(oldRegulationMode, OperationType.SET);
} else {
if (Double.isNaN(targetDeadBand) && modifyTargetDeadband == null) {
finalTargetDeadband = AttributeModification.toAttributeModification(0.0, OperationType.SET);
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);
}
finalRegulating = AttributeModification.toAttributeModification(true, OperationType.SET);
finalRegulationMode = AttributeModification.toAttributeModification(newRegulationMode, OperationType.SET);
}
}
}
} else {
// creation check
if (regulationModeValue == null) {
throw new NetworkModificationException(CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Regulation mode can not be null when creating tap phase changer");
if (regulationModeModification == null) {
throw new NetworkModificationException(CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Regulation mode is missing when creating tap phase changer");
}
PhaseTapChanger.RegulationMode regulationMode = regulationModeValue.getValue();

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

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

}

private static void setPhaseTapChangerRegulationAttributes(PhaseTapChanger phaseTapChanger,
PhaseTapChangerAdder phaseTapChangerAdder,
boolean isModification,
AttributeModification<PhaseTapChanger.RegulationMode> regulationModeValue,
AttributeModification<Double> modifyRegulationValue,
AttributeModification<Double> modifyTargetDeadband,
AttributeModification<Boolean> regulating,
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 = regulationModeValue == null ? null : regulationModeValue.getValue();
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,
modifyRegulationValue, fieldName, 1);
regulationValueModification, fieldName, 1);
if (regulationReports != null && regulationValueReportNode != null) {
regulationReports.add(regulationValueReportNode);
}
// targetDeadBand
ReportNode targetDeadbandReportNode = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(
isModification ? phaseTapChanger::setTargetDeadband
: phaseTapChangerAdder::setTargetDeadband,
isModification ? phaseTapChanger::setTargetDeadband : phaseTapChangerAdder::setTargetDeadband,
isModification ? phaseTapChanger::getTargetDeadband : () -> null,
modifyTargetDeadband, "Target deadband", 1);
targetDeadbandModification, "Target deadband", 1);
if (regulationReports != null && targetDeadbandReportNode != null) {
regulationReports.add(targetDeadbandReportNode);
}

// RegulationMode
ReportNode regulationReportNode = ModificationUtils.getInstance().applyElementaryModificationsAndReturnReport(
isModification ? phaseTapChanger::setRegulationMode
: phaseTapChangerAdder::setRegulationMode,
isModification ? phaseTapChanger::setRegulationMode : phaseTapChangerAdder::setRegulationMode,
isModification ? phaseTapChanger::getRegulationMode : () -> null,
AttributeModification.toAttributeModification(regulationMode, OperationType.SET),
"Regulation mode", 1);
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::setRegulating : phaseTapChangerAdder::setRegulating,
isModification ? phaseTapChanger::isRegulating : () -> null,
regulating, "Phase tap regulating", 1);
regulatingModification, "Phase tap regulating", 1);
if (regulationReports != null && regulatingReportNode != null) {
regulationReports.add(regulatingReportNode);
}
Expand Down

0 comments on commit fb77a31

Please sign in to comment.