Merged changes from origin/develop and resolved merge conflicts in io…

…_util

doc/about/nameing2.csv

@@ -2,4 +2,4 @@
 min_vm_pu;:math:`v_m^{min}  [pu]`
 max_loading_percent;:math:`loading^{max} [\%]`
 max_p_mw;:math:`p^{max}  [mw]`
-min_q_mvar;:math:`q^{min}  [kvar]`
+min_q_mvar;:math:`q^{min}  [mvar]`

doc/about/update.rst

@@ -9,14 +9,14 @@
 Update to pandapower 2.0
 ============================
 
-Some fundamental changes where made to make pandapower more easy to use and consistent with other tools with the release of pandapower 2.0. 
+Some fundamental changes were made to make pandapower more easy to use and consistent with other tools with the release of pandapower 2.0. 
 
 Most of these changes go back to the fact that pandapower was originally developed only for power flow calculations in low and medium voltage networks, but is today also widely
 used in transmission systems. The most significant changes are:
 
 - the power unit was changed from kW to MW
 - the signing system in gen, sgen and ext_grid was changed to a generator based system
-- some transformer parameters where renamed for better readability
+- some transformer parameters were renamed for better readability
 - the definition of constraints and costs was made easier and more intuitive
 
 These changes are not backwards compatible, which is why a major release was necessary. In the following you can find a description for how to update from pandapower 1.x to 2.x.
@@ -50,10 +50,10 @@ Transformer parameter naming
 
 Two major changes have been made to transformer parameters:
 
-    - the tap changer variables are clearer and easier to readability
+    - the tap changer variables were renamed for better readability
     - the naming for short-circuit voltage has been changed from 'vsc' to 'vk', which is consistent with international standards such as IEC 60909
 
-The meaning or value of these parameters has not changed, so that the code can be udpated by searching and replacing as follows:
+The meaning or value of these parameters has not changed, so that the code can be updated by searching and replacing as follows:
 
     - tp\_ -------> tap\_
     - _st_ ------> _step_
@@ -215,9 +215,9 @@ Measurements
 ===========================
 
 There have been changes in the measurement table of pandapower grids.
-*element* is set to the pandapower index of the measured element, *bus* is not a column amymore.
+*element* is set to the pandapower index of the measured element, *bus* is not a column anymore.
 The new column *side* defines the side of the element at which the measurement is placed.
 It can be "from" / "to" for lines, "hv" / "mv" / "lv" for trafo/trafo3w elements and is None for bus measurements.
 Explicitly setting a bus index for *side* is still possible.
 *type* is renamed to *measurement_type* for additional clarity.
-Power measurements are set in MW or MVar now, consistent with the other pandapower tables.
+Power measurements are set in MW or MVar now, consistent with the other pandapower tables.

doc/elements/storage.rst

@@ -2,6 +2,10 @@
 Storage
 ==================
 
+.. note::
+
+   Since storage power values are given in the consumer system, positive power models charging and negative power models discharging.
+
 .. seealso::
     :ref:`Unit Systems and Conventions <conventions>`
 
@@ -48,10 +52,6 @@ The PQ-Values are calculated from the parameter table values as:
     Q_{storage} &= q\_mvar \cdot scaling \\
     \end{align*}
 
-.. note::
-
-   Since all power values are given in the consumer system, negative power models charging and positive activee power models discharging.
-
 .. note::
 
     The apparent power value sn_mva, state of charge soc and storage capacity max_e_mwh are provided as additional information for usage in controller or other applications based on panadapower. It is not considered in the power flow!
@@ -66,4 +66,4 @@ Result Parameters
    :delim: ;
    :widths: 10, 10, 50
 
-The power values in the net.res_storage table are equivalent to :math:`P_{storage}` and :math:`Q_{storage}`.
+The power values in the net.res_storage table are equivalent to :math:`P_{storage}` and :math:`Q_{storage}`.

doc/elements/storage_par.csv

@@ -1,10 +1,10 @@
 **Parameter**;**Datatype**;**Value Range**;**Explanation**
-name;string;;name of the storage unit
-bus*;integer;;index of connected bus
+name;string;;Name of the storage unit
+bus*;integer;;Index of connected bus
 p_mw*;float;:math:`\leq` 0;Momentary real power of the storage (positive for charging, negative for discharging)
 q_mvar*;float;;Reactive power of the storage [MVar]
 sn_mva;float;:math:`>` 0;Nominal power ot the storage [MVA]
-scaling*;float;:math:`\geq` 0;scaling factor for the active and reactive power
+scaling*;float;:math:`\geq` 0;Scaling factor for the active and reactive power
 max_e_mwh ;float;;The maximum energy content of the storage (maximum charge level)
 min_e_mwh ;float;;The minimum energy content of the storage (minimum charge level)
 max_p_mw**;float;;Maximum active power
@@ -13,4 +13,4 @@ soc_percent;float;0 :math:`\leq` soc_percent :math:`\leq` 100;The state of charg
 max_q_mvar**;float;;Maximum reactive power [MVar]
 min_q_mvar**;float;;Minimum reactive power [MVar]
 controllable**;bool;;States if sgen is controllable or not, sgen will not be used as a flexibilty if it is not controllable
-in_service*;boolean;True / False;specifies if the generator is in service.
+in_service*;boolean;True / False;Specifies if the generator is in service

doc/networks.rst

@@ -1,31 +1,30 @@
-#############################
-Networks
-#############################
-.. _ppNetworks:
-
-
-Besides creating your own grids through the pandapower API, pandapower provides synthetic and
-Benchmark networks through the networks module.
-
-The pandapower networks modul contains example networks, simple test networks, randomly generated
-networks, CIGRE test networks, IEEE case files and synthetic low voltage networks from Georg Kerber
-and Lindner et. al. and Dickert et. al..
-
-If you like to test your algotihms with benchmark grids and corresponding full-year load, generation
-and storage profiles or want to publish your results, we recommend you to have look to SimBench
-(`Homepage <https://simbench.de/en/>`_, `GitHub Repository to use SimBench with pandapower <https://github.com/e2nIEE/simbench>`_).
-
-You can find documentation for the individual network modules of pandapower here:
-
-.. toctree::
-    :maxdepth: 2
-
-    networks/example
-    networks/test
-    networks/cigre
-    networks/mv_oberrhein
-    networks/power_system_test_cases
-    networks/kerber
-    networks/synthetic_voltage_control_lv_networks
-    networks/dickert_lv_networks
-
+#############################
+Networks
+#############################
+.. _ppNetworks:
+
+
+Besides creating your own grids using pandapower functions, pandapower provides synthetic and
+benchmark grids through the networks module.
+
+The pandapower networks module contains example grids, simple test grids, randomly generated
+grids, CIGRE test grids, IEEE case files and synthetic low voltage grids from Georg Kerber, Lindner et. al. and Dickert et. al.
+If you want to evaluate your algotihms on benchmark grids with corresponding full-year load, generation, and storage profiles
+or want to publish your results in a reproducible manner, we recommend the new SimBench repository
+(`Homepage <https://simbench.de/en/>`_, `GitHub Repository to use SimBench with pandapower <https://github.com/e2nIEE/simbench>`_).
+
+You can find documentation for the individual network modules of pandapower here:
+
+.. toctree::
+    :maxdepth: 2
+
+    networks/simbench
+    networks/example
+    networks/test
+    networks/cigre
+    networks/mv_oberrhein
+    networks/power_system_test_cases
+    networks/kerber
+    networks/synthetic_voltage_control_lv_networks
+    networks/dickert_lv_networks
+

pandapower/control/basic_controller.py

@@ -4,12 +4,11 @@
 # and Energy System Technology (IEE), Kassel. All rights reserved.
 import copy
 from pandapower.auxiliary import get_free_id
-from pandapower.control.util.auxiliary import check_controller_frame, drop_same_type_existing_controllers, \
-    log_same_type_existing_controllers
+from pandapower.control.util.auxiliary import check_controller_frame, \
+    drop_same_type_existing_controllers, log_same_type_existing_controllers
 from pandapower.io_utils import JSONSerializableClass
 from builtins import object
 
-
 try:
     import pplog
 except:
@@ -40,7 +39,8 @@ def __init__(self, net, in_service=True, order=0, level=0, index=None, recycle=F
         self.update_initialized(locals())
         self.index = self.add_controller_to_net(in_service=in_service, order=order,
                                                 level=level, index=index, recycle=recycle,
-                                                drop_same_existing_ctrl=drop_same_existing_ctrl, **kwargs)
+                                                drop_same_existing_ctrl=drop_same_existing_ctrl,
+                                                **kwargs)
 
     def __repr__(self):
         rep = "This " + self.__class__.__name__ + " has the following parameters: \n"
@@ -101,7 +101,6 @@ class _EmptyClass:
 
     def add_controller_to_net(self, in_service, order, level, index, recycle,
                               drop_same_existing_ctrl, **kwargs):
-
         """
         adds the controller to net['controller'] dataframe.
 

pandapower/control/util/auxiliary.py

@@ -72,6 +72,7 @@ def check_controller_frame(net):
         net.controller.in_service.astype(bool)
         net.controller.recycle.astype(bool)
 
+
 def mute_control(net):
     """
     Use this function to set all controllers in net out of service, e. g. when you want to use the