-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into bugfix/pst-non-impedant-branch-bus-imbalance
- Loading branch information
Showing
21 changed files
with
1,612 additions
and
252 deletions.
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
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
131 changes: 131 additions & 0 deletions
131
src/main/java/com/powsybl/openloadflow/dc/fastdc/ComputedElement.java
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,131 @@ | ||
| /** | ||
| * Copyright (c) 2020, 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.openloadflow.dc.fastdc; | ||
|
|
||
| import com.powsybl.commons.PowsyblException; | ||
| import com.powsybl.math.matrix.DenseMatrix; | ||
| import com.powsybl.math.matrix.Matrix; | ||
| import com.powsybl.openloadflow.dc.DcLoadFlowContext; | ||
| import com.powsybl.openloadflow.dc.equations.ClosedBranchSide1DcFlowEquationTerm; | ||
| import com.powsybl.openloadflow.dc.equations.DcEquationType; | ||
| import com.powsybl.openloadflow.dc.equations.DcVariableType; | ||
| import com.powsybl.openloadflow.equations.Equation; | ||
| import com.powsybl.openloadflow.equations.EquationSystem; | ||
| import com.powsybl.openloadflow.network.LfBranch; | ||
| import com.powsybl.openloadflow.network.LfBus; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
| /** | ||
| * @author Geoffroy Jamgotchian {@literal <geoffroy.jamgotchian at rte-france.com>} | ||
| * @author Gaël Macherel {@literal <gael.macherel@artelys.com>} | ||
| */ | ||
| public class ComputedElement { | ||
| private int computedElementIndex = -1; // index of the element in the rhs for +1-1 | ||
| private int localIndex = -1; // local index of the element : index of the element in the matrix used in the setAlphas method | ||
| private double alphaForWoodburyComputation = Double.NaN; | ||
| private final LfBranch lfBranch; | ||
| private final ClosedBranchSide1DcFlowEquationTerm branchEquation; | ||
|
|
||
| public ComputedElement(LfBranch lfBranch, ClosedBranchSide1DcFlowEquationTerm branchEquation) { | ||
| this.lfBranch = lfBranch; | ||
| this.branchEquation = branchEquation; | ||
| } | ||
|
|
||
| public int getComputedElementIndex() { | ||
| return computedElementIndex; | ||
| } | ||
|
|
||
| public void setComputedElementIndex(final int index) { | ||
| this.computedElementIndex = index; | ||
| } | ||
|
|
||
| public int getLocalIndex() { | ||
| return localIndex; | ||
| } | ||
|
|
||
| protected void setLocalIndex(final int index) { | ||
| this.localIndex = index; | ||
| } | ||
|
|
||
| public double getAlphaForWoodburyComputation() { | ||
| return alphaForWoodburyComputation; | ||
| } | ||
|
|
||
| public void setAlphaForWoodburyComputation(double alphaForPostContingencyStates) { | ||
| this.alphaForWoodburyComputation = alphaForPostContingencyStates; | ||
| } | ||
|
|
||
| public LfBranch getLfBranch() { | ||
| return lfBranch; | ||
| } | ||
|
|
||
| public ClosedBranchSide1DcFlowEquationTerm getLfBranchEquation() { | ||
| return branchEquation; | ||
| } | ||
|
|
||
| public static void setComputedElementIndexes(Collection<? extends ComputedElement> elements) { | ||
| int index = 0; | ||
| for (ComputedElement element : elements) { | ||
| element.setComputedElementIndex(index++); | ||
| } | ||
| } | ||
|
|
||
| public static void setLocalIndexes(Collection<? extends ComputedElement> elements) { | ||
| int index = 0; | ||
| for (ComputedElement element : elements) { | ||
| element.setLocalIndex(index++); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Fills the right hand side with +1/-1 to model a branch contingency or action. | ||
| */ | ||
| private static void fillRhs(EquationSystem<DcVariableType, DcEquationType> equationSystem, Collection<? extends ComputedElement> computedElements, Matrix rhs) { | ||
| for (ComputedElement element : computedElements) { | ||
| LfBranch lfBranch = element.getLfBranch(); | ||
| if (lfBranch.getBus1() == null || lfBranch.getBus2() == null) { | ||
| continue; | ||
| } | ||
| LfBus bus1 = lfBranch.getBus1(); | ||
| LfBus bus2 = lfBranch.getBus2(); | ||
| if (bus1.isSlack()) { | ||
| Equation<DcVariableType, DcEquationType> p = equationSystem.getEquation(bus2.getNum(), DcEquationType.BUS_TARGET_P).orElseThrow(IllegalStateException::new); | ||
| rhs.set(p.getColumn(), element.getComputedElementIndex(), -1); | ||
| } else if (bus2.isSlack()) { | ||
| Equation<DcVariableType, DcEquationType> p = equationSystem.getEquation(bus1.getNum(), DcEquationType.BUS_TARGET_P).orElseThrow(IllegalStateException::new); | ||
| rhs.set(p.getColumn(), element.getComputedElementIndex(), 1); | ||
| } else { | ||
| Equation<DcVariableType, DcEquationType> p1 = equationSystem.getEquation(bus1.getNum(), DcEquationType.BUS_TARGET_P).orElseThrow(IllegalStateException::new); | ||
| Equation<DcVariableType, DcEquationType> p2 = equationSystem.getEquation(bus2.getNum(), DcEquationType.BUS_TARGET_P).orElseThrow(IllegalStateException::new); | ||
| rhs.set(p1.getColumn(), element.getComputedElementIndex(), 1); | ||
| rhs.set(p2.getColumn(), element.getComputedElementIndex(), -1); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static DenseMatrix initRhs(EquationSystem<DcVariableType, DcEquationType> equationSystem, Collection<? extends ComputedElement> elements) { | ||
| // otherwise, defining the rhs matrix will result in integer overflow | ||
| int equationCount = equationSystem.getIndex().getSortedEquationsToSolve().size(); | ||
| int maxElements = Integer.MAX_VALUE / (equationCount * Double.BYTES); | ||
| if (elements.size() > maxElements) { | ||
| throw new PowsyblException("Too many elements " + elements.size() | ||
| + ", maximum is " + maxElements + " for a system with " + equationCount + " equations"); | ||
| } | ||
|
|
||
| DenseMatrix rhs = new DenseMatrix(equationCount, elements.size()); | ||
| fillRhs(equationSystem, elements, rhs); | ||
| return rhs; | ||
| } | ||
|
|
||
| public static DenseMatrix calculateElementsStates(DcLoadFlowContext loadFlowContext, Collection<? extends ComputedElement> computedElements) { | ||
| DenseMatrix elementsStates = initRhs(loadFlowContext.getEquationSystem(), computedElements); // rhs with +1 -1 on computed elements | ||
| loadFlowContext.getJacobianMatrix().solveTransposed(elementsStates); | ||
| return elementsStates; | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
src/main/java/com/powsybl/openloadflow/dc/fastdc/ComputedTapPositionChangeElement.java
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,32 @@ | ||
| /** | ||
| * Copyright (c) 2024, Coreso SA (https://www.coreso.eu/) and TSCNET Services GmbH (https://www.tscnet.eu/) | ||
| * 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.openloadflow.dc.fastdc; | ||
|
|
||
| import com.powsybl.openloadflow.dc.equations.ClosedBranchSide1DcFlowEquationTerm; | ||
| import com.powsybl.openloadflow.dc.equations.DcEquationType; | ||
| import com.powsybl.openloadflow.dc.equations.DcVariableType; | ||
| import com.powsybl.openloadflow.equations.EquationSystem; | ||
| import com.powsybl.openloadflow.network.ElementType; | ||
| import com.powsybl.openloadflow.network.TapPositionChange; | ||
|
|
||
| /** | ||
| * @author Pierre Arvy {@literal <pierre.arvy@artelys.com>} | ||
| */ | ||
| public final class ComputedTapPositionChangeElement extends ComputedElement { | ||
|
|
||
| private final TapPositionChange tapPositionChange; | ||
|
|
||
| public ComputedTapPositionChangeElement(TapPositionChange tapPositionChange, EquationSystem<DcVariableType, DcEquationType> equationSystem) { | ||
| super(tapPositionChange.getBranch(), equationSystem.getEquationTerm(ElementType.BRANCH, tapPositionChange.getBranch().getNum(), ClosedBranchSide1DcFlowEquationTerm.class)); | ||
| this.tapPositionChange = tapPositionChange; | ||
| } | ||
|
|
||
| public TapPositionChange getTapPositionChange() { | ||
| return tapPositionChange; | ||
| } | ||
| } |
Oops, something went wrong.