Issue oemof#565 and Issue oemof#566 fixed

ajimenezUCLA · Feb 18, 2019 · 886600d · 886600d
1 parent 73dd932
commit 886600d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/oemof/solph/blocks.py b/oemof/solph/blocks.py
@@ -49,12 +49,12 @@ class Flow(SimpleBlock):
 
     Flow max sum :attr:`om.Flow.summed_max[i, o]`
       .. math::
-        \sum_t flow(i, o, t) \cdot \tau \leq summed\_max(i, o), \\
+        \sum_t flow(i, o, t) \cdot \tau \leq summed\_max(i, o) \cdot nominal\_value(i,o), \\
         \forall (i, o) \in \textrm{SUMMED\_MAX\_FLOWS}.
 
     Flow min sum :attr:`om.Flow.summed_min[i, o]`
       .. math::
-        \sum_t flow(i, o, t) \cdot \tau \geq summed\_min(i, o), \\
+        \sum_t flow(i, o, t) \cdot \tau \geq summed\_min(i, o) \cdot nominal\_value(i,o), \\
         \forall (i, o) \in \textrm{SUMMED\_MIN\_FLOWS}.
 
     Negative gradient constraint :attr:`om.Flow.negative_gradient_constr[i, o]`:

diff --git a/oemof/solph/components.py b/oemof/solph/components.py
@@ -1098,7 +1098,7 @@ class ExtractionTurbineCHPBlock(SimpleBlock):
             \frac{P_{el} + \dot Q_{th} \cdot \beta}
                  {\eta_{el,woExtr}} \\
             &
-            P_{el} \leq \dot Q_{th} \cdot
+            P_{el} \geq \dot Q_{th} \cdot
             \frac{\eta_{el,maxExtr}}
                  {\eta_{th,maxExtr}}