Skip to content

Commit 37c9e08

Browse files
committed
Including reviewer's comments.
1 parent 6a491b0 commit 37c9e08

File tree

4 files changed

+17
-68
lines changed

4 files changed

+17
-68
lines changed
-3.02 KB
Loading

docs/readthedocs/_static/figures/transformerWithSwitchGear.tex

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@
159159
\begin{tikzpicture}
160160
% === Anschlüsse ===
161161
\node[circle, draw = tuGreen, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_a) at (0,0){};
162-
\node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_b) at (15mm,0){};
163-
\node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_c) at (30mm,0){};
164-
\node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_d) at (45mm,0){};
162+
\node[circle, draw = tuOrange, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_b) at (15mm,0){};
163+
\node[circle, draw = tuOrange, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_c) at (30mm,0){};
164+
\node[circle, draw = tuOrange, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_d) at (45mm,0){};
165165
\node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_e) at (62.5mm,0){};
166166

167167
\draw (port_a.west) -- ++(-3mm, -1mm) -- ++(0mm, -2mm) edge[densely dotted] ++(0mm, -1.8mm);
@@ -176,9 +176,9 @@
176176
\draw (port_d.east) -- (winding_a.west) (winding_b.east) -- (port_e.west);
177177

178178
\node[tuGreen, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_a.south) {A \\ \SI{110}{\kV} \\ 1};
179-
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_b.south) {B \\ \SI{110}{\kV} \\ 2};
180-
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_c.south) {C \\ \SI{110}{\kV} \\ 2};
181-
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_d.south) {D \\ \SI{110}{\kV} \\ 2};
179+
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_b.south) {B \\ \SI{110}{\kV} \\ 1};
180+
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_c.south) {C \\ \SI{110}{\kV} \\ 1};
181+
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_d.south) {D \\ \SI{110}{\kV} \\ 1};
182182
\node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_e.south) {E \\ \SI{10}{\kV} \\ 2};
183183
\end{tikzpicture}
184184
\end{document}

docs/readthedocs/models/input/grid/gridcontainer.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@ Why predominant?
2020
As of convention, the `SubGridContainers` hold also reference to the transformers leading to higher sub grids
2121
and their higher voltage coupling point.
2222

23+
![Sub grid boundary definition for transformers with upstream switchgear](../../../_static/figures/transformerWithSwitchGear.png)
24+
25+
Let's shed a more detailed light on the boundaries of a sub grid as of our definition.
26+
This especially is important, if the switchgear of the transformer is modeled in detail.
27+
We defined, that all nodes in upstream direction of the transformer, including those, which are connected by switches *only*
28+
(therefore are within the switchgear) are counted towards the superior sub grid structure (here "1"), because they belong
29+
to a different voltage level.
30+
If a switchgear should be operated by the inferior grid, one can set the operator, that is used in the inferior grid, for
31+
the switchgear. This can be necessary, if we assume, that the interest to operate on the given switchgear will most likely
32+
be placed in the inferior grid structure.
33+
2334
A synoptic overview of both classes' attributes is given here:
2435

2536
## Attributes, Units and Remarks

src/test/groovy/edu/ie3/datamodel/utils/ContainerUtilsTest.groovy

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -585,66 +585,4 @@ class ContainerUtilsTest extends Specification {
585585
then:
586586
actual == expected
587587
}
588-
589-
def "Determining the surrounding sub grid containers of a two winding transformer w/ switchgear works fine"() {
590-
given:
591-
def nodeA = Mock(NodeInput)
592-
nodeA.getUuid() >> UUID.fromString("a37b2501-70c5-479f-92f9-d5b0e4628b2b")
593-
nodeA.getSubnet() >> 1
594-
def nodeB = Mock(NodeInput)
595-
nodeB.getUuid() >> UUID.fromString("8361b082-9d4c-4c54-97d0-2df9ac35333c")
596-
nodeB.getSubnet() >> 1
597-
def nodeC = Mock(NodeInput)
598-
nodeC.getUuid() >> UUID.fromString("b9e4f16b-0317-4794-9f53-339db45a2092")
599-
nodeC.getSubnet() >> 1
600-
def nodeD = Mock(NodeInput)
601-
nodeD.getUuid() >> UUID.fromString("ae4869d5-3551-4cce-a101-d61629716c4f")
602-
nodeD.getSubnet() >> 1
603-
def nodeE = Mock(NodeInput)
604-
nodeE.getUuid() >> UUID.fromString("5d4107b2-385b-40fe-a668-19414bf45d9d")
605-
nodeE.getSubnet() >> 2
606-
607-
def transformer = Mock(Transformer2WInput)
608-
transformer.getUuid() >> UUID.fromString("ddcdd72a-5f97-4bef-913b-d32d31216e27")
609-
transformer.getNodeA() >> nodeD
610-
transformer.getNodeB() >> nodeE
611-
transformer.allNodes() >> List.of(nodeD, nodeE)
612-
613-
def switchAB = Mock(SwitchInput)
614-
switchAB.getUuid() >> UUID.fromString("5fcb8705-1436-4fbe-97b3-d2dcaf6a783b")
615-
switchAB.allNodes() >> List.of(nodeA, nodeB)
616-
def switchBC = Mock(SwitchInput)
617-
switchBC.getUuid() >> UUID.fromString("4ca81b0b-e06d-408e-a991-de140f4e229b")
618-
switchBC.allNodes() >> List.of(nodeB, nodeC)
619-
def switchCD = Mock(SwitchInput)
620-
switchCD.getUuid() >> UUID.fromString("92ce075e-9e3b-4ee6-89b6-19e6372fba01")
621-
switchCD.allNodes() >> List.of(nodeC, nodeD)
622-
623-
def rawGridElements = new RawGridElements([
624-
nodeA,
625-
nodeB,
626-
nodeC,
627-
nodeD,
628-
nodeE,
629-
transformer,
630-
switchAB,
631-
switchBC,
632-
switchCD
633-
])
634-
635-
def subGrid1 = Mock(SubGridContainer)
636-
def subGrid2 = Mock(SubGridContainer)
637-
def subGridMapping = [
638-
1: subGrid1,
639-
2: subGrid2
640-
]
641-
642-
def expected = new ContainerUtils.TransformerSubGridContainers(subGrid1, subGrid2)
643-
644-
when:
645-
def actual = ContainerUtils.getSubGridContainers(transformer, rawGridElements, subGridMapping)
646-
647-
then:
648-
actual == expected
649-
}
650588
}

0 commit comments

Comments
 (0)