Merge remote-tracking branch 'upstream/CoTraDis' into pr/308

doc/CoTraDis/distribution_system_implementation.rst

@@ -1,37 +1,41 @@
 .. _distribution_system_implementation:
 
-Distribution System Framework
-===================================
+Automated Coupling of Modularly Defined System Modules
+=======================================================
 
-This section explains the implementations to consider specific distribution system characteristics.
-Major additions & modifications were applied to the the following scripts:
+This section explains the implementations to consider specif distribution system characteristics.
+Major additions/modifications were done on the following, already existing scripts:
 
-- `model.py: <distribution_system_implementation.html#model-section>`_
+- `model.py: <distribution_system_implementation.html#model-section>`_ ``urbs/model.py``
+
+- `transmission.py: <distribution_system_implementation.html#transmission-section>`_ ``urbs/transmission.py``
 
-- `transmission.py: <distribution_system_implementation.html#transmission-section>`_
 
 which will be described below.
-| Before dealing with the code, a short summary of required aspects to consider will be given.
-    Distribution systems are different from transmission systems in a number of facets. Diffrerences to highlight are the
-    reactance-to-resistance ratio (X/R) and their common radial composition. Depending on these attributes an AC
-    optimal-power-flow model may be helpful to deal with distribution system reactive power and voltage constraints.
-    Hence, the "LinDistFlow" model linearization has been introduced into the given framework as shown in `transmission.py <distribution_system_implementation.html#transmission-section>`_.
-    Besides, we enhanced the `urbs` framework by integrating several aspects that characterize classic distribution systems:
 
-- radially-operated open ring grid segments
 
-- a transformer between both system levels modelled with a boundary bus
+
+.. _theory-section
+
+Distribution System Model Framework
+-------------------------------------
+Distribution systems are different from transmission systems in a number of aspects such as the reactance-to-resistance ratio (X/R) and the typical radial, tree-like structure. Depending on system size, voltage level and the corresponding X/R ratio an alternating current optimal-power-flow model is required to consider distribution system reactive power and voltage constraints. Therefore, the "Linearized Distribution Flow" (LinDistFlow) model linearization has been introduced into our framework as shown in `transmission.py <distribution_system_implementation.html#transmission-section>`_.
+
+Besides, we extended the `urbs` framework by incorporating the following model components to characterize typical distribution grids:
+
+- radially-operated open ring grid segments denoted as microgrids
+
+- a boundary bus with a transformer between both systems
 
 - reactive power demand for households
 
 - reactive power line flows and an apparent power line flow constraint
 
-- a central reactive power compensation system
+- a centralized reactive power compensation system and
 
-- inverters with a predefined permittible ratio of reactive to active power generation.
+- inverters with a defined ratio of possible reactive to active power generation.
 
-The microgrids to describe the distribution system can be freely defined with the microgrid input sheets.
-The predefined microgrid structure with their assigned technologies as provided in the input data are illustrated below:
+The microgrids to describe the distribution system can be freely defined with the microgrid input sheets. The predefined microgrids in the repository are illustrated below:
 
 .. image:: graphics/Microgrids.jpg
 

doc/CoTraDis/transdist_implementation.rst

@@ -203,4 +203,4 @@ Concatenation of the previously processed data from both system levels:
 
 The workflow of all previously described ``transdisthelper.py`` implementation is illustrated below:
 
-.. image:: graphics/CodeFlowDiagramm.png
+.. image:: graphics/CodeFlowDiagramm.png

doc/CoTraDis/typeperiod_tsam_implementation.rst

@@ -153,4 +153,3 @@ The definition of required sets, variables, constraints and rules to implement t
 
 
 
-

doc/index.rst

@@ -58,16 +58,15 @@ implementation.
    implementation
    api
 
-ADMM module for regional decomposition
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+CoTraDis module
+^^^^^^^^^^^^^^^
 
-Continue here if you would like to use the regional decomposition module, using 
-the alternating direction method of multipliers (ADMM).
+Continue here for the usage instructions on the coupled transmission-distribution system (CoTraDis) module.
 
 .. toctree::
    :maxdepth: 1
 
-   admm
+   CoTraDis
 
 Features
 --------

urbs-env.yml

@@ -14,3 +14,4 @@ dependencies:
   - pyomo=5.6.7
   - glpk
   - psutil=5.6.5
+  - tsam=1.1.1