Merge branch 'dev' into features/#21-import-connect-genos

openego · Sep 13, 2017 · cbb217a · cbb217a
2 parents ce6f97d + bfa7186
commit cbb217a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/edisgo/grid/network.py b/edisgo/grid/network.py
@@ -444,8 +444,9 @@ class ETraGoSpecs:
     _battery_active_power : :pandas:`pandas.Series<series>`
         Time series of active power the (virtual) battery (at Transition Point)
         is charged (negative) or discharged (positive) with
-    _curtailment : :obj:`dict` of :obj:`dict` of :pandas:`pandas.Series<series>`
-        Time series of active power curtailment of generators for technologies
+    _dispatch : :obj:`dict` of :obj:`dict` of :pandas:`pandas.Series<series>`
+        Time series of actual dispatch and a time series of power generation
+        potential (without curtailment) for technologies
         and sub-technologies, format::
 
             {
@@ -474,7 +475,7 @@ def __init__(self, **kwargs):
         self._reactive_power = kwargs.get('reactive_power', None)
         self._battery_capacity = kwargs.get('battery_capacity', None)
         self._battery_active_power = kwargs.get('battery_active_power', None)
-        self._curtailment = kwargs.get('curtailment', None)
+        self._dispatch = kwargs.get('dispatch', None)
 
 
 class Results:

diff --git a/edisgo/tools/pypsa_io.py b/edisgo/tools/pypsa_io.py
@@ -957,8 +957,10 @@ def process_pfa_results(network, pypsa):
     q1 = abs(pypsa.lines_t['q1'])
     p0 = abs(pypsa.lines_t['p0'])
     p1 = abs(pypsa.lines_t['p1'])
-    network.results.pfa_p = p0.where(p0 > p1, p1)
-    network.results.pfa_q = q0.where(q0 > q1, q1)
+    s0 = (p0 ** 2 + q0 ** 2).applymap(sqrt)
+    s1 = (p1 ** 2 + q1 ** 2).applymap(sqrt)
+    network.results.pfa_p = p0.where(s0 > s1, p1)
+    network.results.pfa_q = q0.where(s0 > s1, q1)
 
     # process results at nodes
     generators_names = [repr(g) for g in