From 8f42f83b7d414401feb45f20b75545aaaf0dc777 Mon Sep 17 00:00:00 2001 From: Marius Staudt Date: Thu, 28 Apr 2022 10:08:55 +0200 Subject: [PATCH 1/2] Changing the export methode for diagrams. --- docs/readthedocs/models/bm_model.md | 6 +++--- docs/readthedocs/models/chp_model.md | 6 +++--- docs/readthedocs/models/pv_model.md | 2 +- docs/readthedocs/models/three_winding_transformer_model.md | 2 +- docs/readthedocs/models/two_winding_transformer_model.md | 2 +- docs/readthedocs/models/wec_model.md | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/readthedocs/models/bm_model.md b/docs/readthedocs/models/bm_model.md index 4f22f481f0..8401617862 100644 --- a/docs/readthedocs/models/bm_model.md +++ b/docs/readthedocs/models/bm_model.md @@ -7,7 +7,7 @@ The BM model is part of the SIMONA Simulation framework and represented by an ag ### Parameters -![](../_static/figures/models/bm_model/bm_parameters.png) +![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/bm_model/bm_parameters.png) ### Attributes, Units and Remarks @@ -21,7 +21,7 @@ The main objective of the BM agent is to cover the heat demand of the connected ### Implemented Behaviour -![](../_static/figures/models/bm_model/bm_behaviour.png) +![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/bm_model/bm_behaviour.png) #### Calculate Heat Demand The heat demand is calculated in relation to the temperature using the results of a linear regression. Furthermore, correction factors, which take different heat demands on the weekend and outside the heating season into account are used. @@ -66,7 +66,7 @@ $$OPEX_{current} = \frac{OPEX}{efficiency}$$ For a given usage (example: $20\,%$), the average of the current $OPEX$ and $OPEX$ at full usage is calculated (orange line) and compared with the granted feed in tariff. If the feed in tariff exceeds the average costs, the usage will be set to $100\,%$. -![](../_static/figures/models/bm_model/mc.png) +![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/bm_model/mc.png) #### Load Gradient Owing to the inertia of the cogeneration process, the BM plant may not be able to change its output power to the calculated optimal value. In order to account for this, the change in power since the last time step (t-τ) is compared to the load gradient, which describes the maximum rate of change of the electrical power. The output power is set to: diff --git a/docs/readthedocs/models/chp_model.md b/docs/readthedocs/models/chp_model.md index 47751b0190..12532f884c 100644 --- a/docs/readthedocs/models/chp_model.md +++ b/docs/readthedocs/models/chp_model.md @@ -10,7 +10,7 @@ The CHP unit is able to operate either at full load or not at all. Uncovered hea ### Parameters -![](../_static/figures/models/chp_model/chp4.png) +![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/chp_model/chp4.png) ### Attributes, Units and Remarks @@ -27,8 +27,8 @@ The implemented behaviour is shown in the program sequence plan below. In genera ### Implementation: -![](../_static/figures/models/chp_model/ChpModelCalculation.png) -![](../_static/figures/models/chp_model/ModelChpModelCalculationConcept.png) +![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/uml/main/participants/ChpModelCalculation.puml) +![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/uml/main/participants/ChpModelCalculationConcept.puml) ### Mathematical concept diff --git a/docs/readthedocs/models/pv_model.md b/docs/readthedocs/models/pv_model.md index 0a3e5be103..adb976fcdb 100644 --- a/docs/readthedocs/models/pv_model.md +++ b/docs/readthedocs/models/pv_model.md @@ -10,7 +10,7 @@ The PV Model is part of the SIMONA Simulation framework and represented by an ag ### Parameters -![](../_static/figures/models/pv_model/ModelPv.png) +![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/pv_model/ModelPv.png) ### Attributes, Units and Remarks diff --git a/docs/readthedocs/models/three_winding_transformer_model.md b/docs/readthedocs/models/three_winding_transformer_model.md index 8de169312d..66b34783ee 100644 --- a/docs/readthedocs/models/three_winding_transformer_model.md +++ b/docs/readthedocs/models/three_winding_transformer_model.md @@ -26,7 +26,7 @@ The following basic principles lead us to the implemented solution: This is why we divide the physical three-winding transformer model (which is a T-equivalent circuit with an additional branch) as shown in the figure below. -![](../_static/figures/models/transformer_model/ModelTwt.png) +![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/transformer_model/ModelTwt.png) Being scissored at the artificial central node, allows for the model in subgrid A to remain in one single voltage level. The transformation between voltage level A and B or C, respectively, happens during the message exchange between the `GridAgent`s for subgrid A and B as well as C. diff --git a/docs/readthedocs/models/two_winding_transformer_model.md b/docs/readthedocs/models/two_winding_transformer_model.md index 51a9d335eb..0aed318fc9 100644 --- a/docs/readthedocs/models/two_winding_transformer_model.md +++ b/docs/readthedocs/models/two_winding_transformer_model.md @@ -11,7 +11,7 @@ Input and Result Attributes and Units are defined at PowerSystemDataModel. Pleas - Result: {doc}`PowerSystemDataModel - Two Winding Transformer Model ` -![](../_static/figures/models/transformer_model/tecdoc_tc1.jpg) +![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/transformer_model/tecdoc_tc1.jpg) **Calculation of basic equivalent circuit elements** diff --git a/docs/readthedocs/models/wec_model.md b/docs/readthedocs/models/wec_model.md index c32c0d3299..55bb08ed7c 100644 --- a/docs/readthedocs/models/wec_model.md +++ b/docs/readthedocs/models/wec_model.md @@ -12,7 +12,7 @@ Please refer to {doc}`PowerSystemDataModel - Wec Model Date: Tue, 3 May 2022 13:11:44 +0200 Subject: [PATCH 2/2] With this commit only uml diagrams are sent through the proxy of plantuml. --- docs/readthedocs/models/bm_model.md | 6 +++--- docs/readthedocs/models/chp_model.md | 2 +- docs/readthedocs/models/pv_model.md | 2 +- docs/readthedocs/models/three_winding_transformer_model.md | 2 +- docs/readthedocs/models/two_winding_transformer_model.md | 2 +- docs/readthedocs/models/wec_model.md | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/readthedocs/models/bm_model.md b/docs/readthedocs/models/bm_model.md index 8401617862..4f22f481f0 100644 --- a/docs/readthedocs/models/bm_model.md +++ b/docs/readthedocs/models/bm_model.md @@ -7,7 +7,7 @@ The BM model is part of the SIMONA Simulation framework and represented by an ag ### Parameters -![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/bm_model/bm_parameters.png) +![](../_static/figures/models/bm_model/bm_parameters.png) ### Attributes, Units and Remarks @@ -21,7 +21,7 @@ The main objective of the BM agent is to cover the heat demand of the connected ### Implemented Behaviour -![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/bm_model/bm_behaviour.png) +![](../_static/figures/models/bm_model/bm_behaviour.png) #### Calculate Heat Demand The heat demand is calculated in relation to the temperature using the results of a linear regression. Furthermore, correction factors, which take different heat demands on the weekend and outside the heating season into account are used. @@ -66,7 +66,7 @@ $$OPEX_{current} = \frac{OPEX}{efficiency}$$ For a given usage (example: $20\,%$), the average of the current $OPEX$ and $OPEX$ at full usage is calculated (orange line) and compared with the granted feed in tariff. If the feed in tariff exceeds the average costs, the usage will be set to $100\,%$. -![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/bm_model/mc.png) +![](../_static/figures/models/bm_model/mc.png) #### Load Gradient Owing to the inertia of the cogeneration process, the BM plant may not be able to change its output power to the calculated optimal value. In order to account for this, the change in power since the last time step (t-τ) is compared to the load gradient, which describes the maximum rate of change of the electrical power. The output power is set to: diff --git a/docs/readthedocs/models/chp_model.md b/docs/readthedocs/models/chp_model.md index 12532f884c..736d819718 100644 --- a/docs/readthedocs/models/chp_model.md +++ b/docs/readthedocs/models/chp_model.md @@ -10,7 +10,7 @@ The CHP unit is able to operate either at full load or not at all. Uncovered hea ### Parameters -![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/chp_model/chp4.png) +![](../_static/figures/models/chp_model/chp4.png) ### Attributes, Units and Remarks diff --git a/docs/readthedocs/models/pv_model.md b/docs/readthedocs/models/pv_model.md index adb976fcdb..0a3e5be103 100644 --- a/docs/readthedocs/models/pv_model.md +++ b/docs/readthedocs/models/pv_model.md @@ -10,7 +10,7 @@ The PV Model is part of the SIMONA Simulation framework and represented by an ag ### Parameters -![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/pv_model/ModelPv.png) +![](../_static/figures/models/pv_model/ModelPv.png) ### Attributes, Units and Remarks diff --git a/docs/readthedocs/models/three_winding_transformer_model.md b/docs/readthedocs/models/three_winding_transformer_model.md index 66b34783ee..8de169312d 100644 --- a/docs/readthedocs/models/three_winding_transformer_model.md +++ b/docs/readthedocs/models/three_winding_transformer_model.md @@ -26,7 +26,7 @@ The following basic principles lead us to the implemented solution: This is why we divide the physical three-winding transformer model (which is a T-equivalent circuit with an additional branch) as shown in the figure below. -![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/transformer_model/ModelTwt.png) +![](../_static/figures/models/transformer_model/ModelTwt.png) Being scissored at the artificial central node, allows for the model in subgrid A to remain in one single voltage level. The transformation between voltage level A and B or C, respectively, happens during the message exchange between the `GridAgent`s for subgrid A and B as well as C. diff --git a/docs/readthedocs/models/two_winding_transformer_model.md b/docs/readthedocs/models/two_winding_transformer_model.md index 0aed318fc9..51a9d335eb 100644 --- a/docs/readthedocs/models/two_winding_transformer_model.md +++ b/docs/readthedocs/models/two_winding_transformer_model.md @@ -11,7 +11,7 @@ Input and Result Attributes and Units are defined at PowerSystemDataModel. Pleas - Result: {doc}`PowerSystemDataModel - Two Winding Transformer Model ` -![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/transformer_model/tecdoc_tc1.jpg) +![](../_static/figures/models/transformer_model/tecdoc_tc1.jpg) **Calculation of basic equivalent circuit elements** diff --git a/docs/readthedocs/models/wec_model.md b/docs/readthedocs/models/wec_model.md index 55bb08ed7c..82e9d71de6 100644 --- a/docs/readthedocs/models/wec_model.md +++ b/docs/readthedocs/models/wec_model.md @@ -39,6 +39,6 @@ The Enercon E-82 has a three-bladed rotor with a diameter of 82m. A rotors swept The betz curve (or betz characteristic) is a mapping of wind velocities to cP values. It is used to determine the power that can be extracted from the wind. It follows [Betz's law](https://en.wikipedia.org/wiki/Betz's_law). Each wind turbine has a unique betz curve. The figure below shows the betz curve for the Enercon E-82 wind turbine. -![](http://www.plantuml.com/plantuml/proxy?cache=no&src=https://raw.githubusercontent.com/ie3-institute/simona/dev/docs/readthedocs/_static/figures/models/wec_model/EnerconE82cpPlot.png) +![](../_static/figures/models/wec_model/EnerconE82cpPlot.png) The cut-in wind velocity is $2\frac{m}{s}$, meaning that the turbine requires wind speed of at least $2\frac{m}{s}$ to produce energy. The cut-off wind velocity is $34\frac{m}{s}$, meaning that the Enercon E-82 won't produce energy for velocities that are higher.