Skip to content

Commit

Permalink
Merge pull request #82 from oemof/fix/docs-facades-equations
Browse files Browse the repository at this point in the history
Fix equations for facades in the docs
  • Loading branch information
jnnr committed Jan 23, 2023
2 parents 1e77679 + e82583d commit c12e387
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/oemof/tabular/facades.py
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,8 @@ class Dispatchable(Source, Facade):
capacity_minimum: numeric
Minimum install capacity if capacity is to be expanded
The mathematical representations for this components are dependent on the
The mathematical representations for these components are dependent on the
user defined attributes. If the capacity is fixed before
(**dispatch mode**) the following equation holds:
Expand All @@ -392,7 +393,7 @@ class Dispatchable(Source, Facade):
x^{capacity} \leq c^{capacity\_potential}
**Ojective expression** for operation:
**Objective expression** for operation:
.. math::
Expand Down Expand Up @@ -516,7 +517,7 @@ class Volatile(Source, Facade):
x_{volatile}^{capacity} \leq c_{volatile}^{capacity\_potential}
**Ojective expression** for operation:
**Objective expression** for operation:
.. math::
Expand Down Expand Up @@ -634,7 +635,7 @@ class ExtractionTurbine(ExtractionTurbineCHP, Facade):
c^{electrical\_efficiency(t)}}{c^{thermal\_efficiency}(t)}
\qquad \forall t \in T
**Ojective expression** for operation includes marginal cost and/or
**Objective expression** for operation includes marginal cost and/or
carrier costs:
.. math::
Expand Down Expand Up @@ -772,7 +773,7 @@ class BackpressureTurbine(Transformer, Facade):
x^{flow, carrier}(t) =
\frac{x^{flow, electricity}(t) + x^{flow, heat}(t)}\
{c^{thermal\:efficiency}(t) + c^{electrical\:efficiency}(t)}
{c^{thermal\:efficiency}(t) + c^{electrical\:efficiency}(t)} \\
\qquad \forall t \in T
.. math::
Expand All @@ -781,7 +782,7 @@ class BackpressureTurbine(Transformer, Facade):
\frac{c^{electrical\:efficiency}(t)}{c^{thermal\:efficiency}(t)}
\qquad \forall t \in T
**Ojective expression** for operation includes marginal cost and/or
**Objective expression** for operation includes marginal cost and/or
carrier costs:
.. math::
Expand Down Expand Up @@ -908,7 +909,7 @@ class Conversion(Transformer, Facade):
x^{flow, from}(t) \cdot c^{efficiency}(t) = x^{flow, to}(t)
\qquad \forall t \in T
**Ojective expression** for operation includes marginal cost and/or
**Objective expression** for operation includes marginal cost and/or
carrier costs:
.. math::
Expand Down Expand Up @@ -1036,7 +1037,7 @@ class HeatPump(Transformer, Facade):
x_{low\_temperature\_source, low\_temperature\_bus}^{flow} =
x_{hp, high\_temperature\_bus}^{flow} \frac{c^{COP} -1}{c^{COP}}
**Ojective expression** for operation includes marginal cost and/or
**Objective expression** for operation includes marginal cost and/or
carrier costs:
.. math::
Expand Down Expand Up @@ -1226,7 +1227,7 @@ class Storage(GenericStorage, Facade):
x^{level}(t) =
x^{level}(t-1) \cdot (1 - c^{loss\_rate})
+ \sqrt{c^{efficiency}(t)} x^{flow, in}(t)
- \frac{x^{flow, out}(t)}{\sqrt{c^{efficiency}(t)}}
- \frac{x^{flow, out}(t)}{\sqrt{c^{efficiency}(t)}}\\
\qquad \forall t \in T
.. math::
Expand Down

0 comments on commit c12e387

Please sign in to comment.