Merge branch 'dev' of github.com:openego/eDisGo into dev

doc/api/edisgo.flex_opt.rst

@@ -68,6 +68,13 @@ edisgo.flex\_opt.storage\_operation module
     :undoc-members:
     :show-inheritance:
 
+edisgo.flex\_opt.storage\_positioning module
+----------------------------------------------
+
+.. automodule:: edisgo.flex_opt.storage_positioning
+    :members:
+    :undoc-members:
+    :show-inheritance:
 
 Module contents
 ---------------

doc/api/edisgo.tools.rst

@@ -28,6 +28,14 @@ edisgo.tools.geo module
     :undoc-members:
     :show-inheritance:
 
+edisgo.tools.plots module
+--------------------------
+
+.. automodule:: edisgo.tools.plots
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 edisgo.tools.pypsa\_io module
 -----------------------------
 

doc/conf.py

@@ -78,11 +78,10 @@
                       'SQLAlchemy session object'),
             'shapely':('http://toblerity.org/shapely/manual.html#%s',
                       'Shapely object'),
-            'dingo':('https://dingo.readthedocs.io/en/dev/api/dingo.html#%s',
-                     'Dingo'),
+            'ding0':('https://dingo.readthedocs.io/en/dev/api/ding0.html#%s',
+                     'Ding0'),
             'pypsa': ('https://pypsa.org/doc/components.html#%s', 'pypsa')
             }
-
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -107,7 +106,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.0.5'
+version = '0.0.6'
 # The full version, including alpha/beta/rc tags.
 release = version
 

doc/whatsnew.rst

@@ -8,6 +8,7 @@ Changelog for each release.
     :local:
     :backlinks: top
 
+.. include::  whatsnew/v0-0-6.rst
 .. include::  whatsnew/v0-0-5.rst
 .. include::  whatsnew/v0-0-3.rst
 .. include::  whatsnew/v0-0-2.rst

doc/whatsnew/v0-0-6.rst

@@ -1,10 +1,32 @@
 Release v0.0.6
 ==============
 
-Release date: July <DAY>, 2018
+Release date: September 6, 2018
 
-<Summary>
+This release comes with a bunch of new features such as results output and visualization, speed-up options, a new storage 
+integration methodology and an option to provide separate allowed voltage deviations for calculation of grid expansion needs.
+See list of changes below for more details.
 
 Changes
 -------
 
+* A methodolgy to integrate storages in the MV grid to reduce grid expansion costs was added that takes a given storage capacity and operation and allocates it to multiple smaller storages.
+  This methodology is mainly to be used together with the `eTraGo tool <https://github.com/openego/eTraGo>`_ where an optimization of the HV and EHV levels is conducted to calculate
+  optiomal storage size and operation at each HV/MV substation.
+* The voltage-based curtailment methodolgy was adapted to take into account allowed voltage deviations and curtail generators with voltages that exceed the allowed voltage deviation
+  more than generators with voltages that do not exceed the allowed voltage deviation.
+* When conducting grid reinforcement it is now possible to apply separate allowed voltage deviations for different voltage levels (`#108 <https://github.com/openego/eDisGo/issues/108>`_). 
+  Furthermore, an additional check was added at the end of the grid expansion methodology if the 10%-criterion was observed.
+* To speed up calculations functions to update the pypsa representation of the edisgo graph after generator import, storage integration and time series update, e.g. after curtailment, were added.
+* Also as a means to speed up calculations an option to calculate grid expansion costs for the two worst time steps, characterized by highest and lowest residual load at the HV/MV substation,
+  was added.
+* For the newly added storage integration methodology it was necessary to calculate grid expansion costs without changing the topology of the graph in order to identify feeders with
+  high grid expansion needs. Therefore, the option to conduct grid reinforcement on a copy of the graph was added to the grid expansion function.
+* So far loads and generators always provided or consumed inductive reactive power with the specified power factor. It is now possible to specify whether loads and generators should 
+  behave as inductors or capacitors and to provide a concrete reactive power time series(`#131 <https://github.com/openego/eDisGo/issues/131>`_). 
+* The Results class was extended by outputs for storages, grid losses and active and reactive power at the HV/MV substation (`#138 <https://github.com/openego/eDisGo/issues/138>`_)
+  as well as by a function to save all results to csv files.
+* A plotting function to plot line loading in the MV grid was added. 
+* Update `ding0 version to v0.1.8 <https://github.com/openego/ding0/releases/tag/v0.1.8>`_ and include
+  `data processing v0.4.5 data <https://github.com/openego/data_processing/releases/tag/v0.4.5>`_
+* `Bug fix <https://github.com/openego/eDisGo/issues/135>`_

doc/whatsnew/v0-0-7.rst

@@ -0,0 +1,10 @@
+Release v0.0.7
+==============
+
+Release date: <MONTH> <DAY>, 2018
+
+<Summary>
+
+Changes
+-------
+

edisgo/config/config_db_tables_default.cfg

@@ -39,4 +39,4 @@ res_feedin_data = EgoRenewableFeedin
 load_data = EgoDemandHvmvDemand
 load_areas = EgoDemandLoadarea
 
-version = v0.4.2
+version = v0.4.5

edisgo/data/import_data.py

@@ -4,6 +4,7 @@
 from ..grid.connect import connect_mv_generators, connect_lv_generators
 from ..grid.tools import select_cable, position_switch_disconnectors
 from ..tools.geo import proj2equidistant
+from edisgo.tools import pypsa_io
 
 from egoio.db_tables import model_draft, supply
 from egoio.tools.db import connection
@@ -20,15 +21,12 @@
 from math import isnan
 import random
 import os
-import oedialect
-
-from ding0.core import GeneratorFluctuatingDing0
-
 
 if not 'READTHEDOCS' in os.environ:
     from ding0.tools.results import load_nd_from_pickle
     from ding0.core.network.stations import LVStationDing0
     from ding0.core.structure.regions import LVLoadAreaCentreDing0
+    from ding0.core import GeneratorFluctuatingDing0
     from shapely.ops import transform
     from shapely.wkt import loads as wkt_loads
 
@@ -717,7 +715,6 @@ def _validate_ding0_grid_import(mv_grid, ding0_mv_grid, lv_grid_mapping):
     _validate_load_generation(mv_grid, ding0_mv_grid)
 
 
-
 def _validate_ding0_mv_grid_import(grid, ding0_grid):
     """Verify imported data with original data from Ding0
 
@@ -1031,10 +1028,8 @@ def import_generators(network, data_source=None, file=None):
                         'imported from the oedb.')
         _import_genos_from_oedb(network=network)
         network.mv_grid._weather_cells = None
-        # ToDo: Implement update of pypsa network after generator import
-        # work-around for now: reset pypsa network to make sure it is
-        # generated again with new and decommissioned generators
-        network.pypsa = None
+        if network.pypsa is not None:
+            pypsa_io.update_pypsa_generator_import(network)
     elif data_source == 'pypsa':
         _import_genos_from_pypsa(network=network, file=file)
     else:

edisgo/examples/example.py

@@ -58,7 +58,7 @@
 
         # set up worst-case scenario
         edisgo = EDisGo(ding0_grid=os.path.join('data', dingo_grid),
-                        worst_case_analysis='worst-case-feedin')
+                        worst_case_analysis='worst-case')
 
         try:
             # Calculate grid expansion costs before generator import
@@ -78,7 +78,6 @@
 
             # Clear results
             edisgo.network.results = Results(edisgo.network)
-            edisgo.network.pypsa = None
 
             # Calculate grid expansion costs after generator import
             logging.info('Grid expansion after generator import.')