diff --git a/CHANGELOG.md b/CHANGELOG.md index 44ab34829..50ca0a440 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -130,6 +130,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed `MappingEntryies` not getting processed by adding `Getter` methods for record fields [#1084](https://github.com/ie3-institute/PowerSystemDataModel/issues/1084) - Fixed "depth of discharge" in documentation [#872](https://github.com/ie3-institute/PowerSystemDataModel/issues/872) - Fixed project being build twice in CI [#994](https://github.com/ie3-institute/PowerSystemDataModel/issues/994) +- Fix figure of SubGridContainer in rtd and clarify definitions [#1458](https://github.com/ie3-institute/PowerSystemDataModel/issues/1458) ### Changed - Improvements to the search for corner points in `IdCoordinateSource` [#1016](https://github.com/ie3-institute/PowerSystemDataModel/issues/1016) diff --git a/docs/readthedocs/_static/figures/transformerWithSwitchGear.png b/docs/readthedocs/_static/figures/transformerWithSwitchGear.png index 0ad8468fc..9f9079bac 100644 Binary files a/docs/readthedocs/_static/figures/transformerWithSwitchGear.png and b/docs/readthedocs/_static/figures/transformerWithSwitchGear.png differ diff --git a/docs/readthedocs/_static/figures/transformerWithSwitchGear.tex b/docs/readthedocs/_static/figures/transformerWithSwitchGear.tex index ac2d44160..e0a826427 100644 --- a/docs/readthedocs/_static/figures/transformerWithSwitchGear.tex +++ b/docs/readthedocs/_static/figures/transformerWithSwitchGear.tex @@ -58,6 +58,8 @@ \definecolor{tuViolette}{cmyk}{0.25, 1, 0, 0} \definecolor{tuYellow}{cmyk}{0.05, 0.08, 1, 0} \definecolor{tuBrown}{cmyk}{0.05, 0.69, 1, 0} +\definecolor{red}{rgb}{1, 0, 0} +\definecolor{blue}{rgb}{0, 0, 1} % === pgfplots === % Definition of cycle lists @@ -176,9 +178,26 @@ \draw (port_d.east) -- (winding_a.west) (winding_b.east) -- (port_e.west); \node[tuGreen, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_a.south) {A \\ \SI{110}{\kV} \\ 1}; - \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_b.south) {B \\ \SI{110}{\kV} \\ 1}; - \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_c.south) {C \\ \SI{110}{\kV} \\ 1}; - \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_d.south) {D \\ \SI{110}{\kV} \\ 1}; + \node[tuGreen, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_b.south) {B \\ \SI{110}{\kV} \\ 1}; + \node[tuGreen, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_c.south) {C \\ \SI{110}{\kV} \\ 1}; + \node[tuGreen, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_d.south) {D \\ \SI{110}{\kV} \\ 1}; \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_e.south) {E \\ \SI{10}{\kV} \\ 2}; + + % Corner points of SubGridContainerA + \node[anchor=south west, font=\footnotesize] (SGC_A_SW) at (-0.5, 0.75) {SubGridContainer A}; % South West corner + \node[anchor=south east] (SGC_A_SE) at (5.25, 1.0) {}; % South East corner + \node[anchor=south west] (SGC_A_NW) at (-0.5, -1.5) {}; % North West corner + \node[anchor=south east] (SGC_A_NE) at (5.25, -1.5) {}; % North East corner + + % Corner points of SubGridContainerA + \node[anchor=south west] (SGC_B_NW) at (4.0, 0.75) {}; % North West corner + \node[anchor=south east, font=\footnotesize] (SGC_B_NE) at (8.25, 0.75) {SubGridContainer B}; % North East corner + \node[anchor=north west] (SGC_B_SW) at (4.0, -2.0) {}; % South West corner + \node[anchor=south east] (SGC_B_SE) at (8.25, -2.0) {}; % South East corner + + % Draw a red rectangle using the defined nodes + \draw [red] (SGC_A_SW.north west) -- (SGC_A_SE.north east) -- (SGC_A_NE.south east) -- (SGC_A_NW.south west) -- cycle; + % Draw a bluerectangle using the defined nodes + \draw [blue] (SGC_B_SW.north west) -- (SGC_B_SE.south east) -- (SGC_B_NE.south east) -- (SGC_B_NW.south west) -- cycle; \end{tikzpicture} \end{document} \ No newline at end of file diff --git a/docs/readthedocs/models/input/grid/gridcontainer.md b/docs/readthedocs/models/input/grid/gridcontainer.md index 9c8eebd44..753e8794f 100644 --- a/docs/readthedocs/models/input/grid/gridcontainer.md +++ b/docs/readthedocs/models/input/grid/gridcontainer.md @@ -18,7 +18,7 @@ In contrast to the `JointGridContainer` it only covers one voltage level and the for the predominant voltage level apparent in the container. Why predominant? As of convention, the `SubGridContainers` hold also reference to the transformers leading to higher sub grids -and their higher voltage coupling point. +and their higher voltage coupling point. Thus, the higher voltage coupling point is part of more than one `SubGridContainer`. ![Sub grid boundary definition for transformers with upstream switchgear](../../../_static/figures/transformerWithSwitchGear.png)