Merge pull request #241 from OSeMOSYS/develop

Release 1.1.4 Candidate
OSeMOSYS · Nov 12, 2024 · 3e1f05d · 3e1f05d
2 parents cfa2910 + 097fa2d
commit 3e1f05d
Show file tree

Hide file tree

Showing 4 changed files with 1,071 additions and 39 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog
 =========
 
+Version 1.1.4
+=============
+- Add result calculations for ``DiscountedCapitalInvestment``, ``DiscountedCostByTechnology``, and ``DiscountedOperationalCost``
+- Add result calculations for ``CapitalInvestmentStorage``, ``DiscountedCapitalInvestmentStorage``, ``DiscountedCostByStorage`` and ``DiscountedSalvageValueStorage``
+- Correct ``TotalDiscountedCost`` calculation to account for storage costs
+
 Version 1.1.3
 ===========================
 - Lock pandas to 2.1.4 or later

diff --git a/src/otoole/preprocess/config.yaml b/src/otoole/preprocess/config.yaml
@@ -332,6 +332,11 @@ AnnualVariableOperatingCost:
     type: result
     dtype: float
     default: 0
+CapitalInvestmentStorage:
+    indices: [REGION, STORAGE, YEAR]
+    type: result
+    dtype: float
+    default: 0
 CapitalInvestment:
     indices: [REGION, TECHNOLOGY, YEAR]
     type: result
@@ -342,11 +347,42 @@ Demand:
     type: result
     dtype: float
     default: 0
+DiscountedCapitalInvestmentStorage:
+    short_name: DiscountedCapitalInvestStorage
+    indices: [REGION, STORAGE, YEAR]
+    type: result
+    dtype: float
+    default: 0
+DiscountedCapitalInvestment:
+    indices: [REGION, TECHNOLOGY, YEAR]
+    type: result
+    dtype: float
+    default: 0
+DiscountedCostByStorage:
+    indices: [REGION, STORAGE, YEAR]
+    type: result
+    dtype: float
+    default: 0
+DiscountedCostByTechnology:
+    indices: [REGION, TECHNOLOGY, YEAR]
+    type: result
+    dtype: float
+    default: 0
+DiscountedOperationalCost:
+    indices: [REGION, TECHNOLOGY, YEAR]
+    type: result
+    dtype: float
+    default: 0
 DiscountedSalvageValue:
     indices: [REGION, TECHNOLOGY, YEAR]
     type: result
     dtype: float
     default: 0
+DiscountedSalvageValueStorage:
+    indices: [REGION, STORAGE, YEAR]
+    type: result
+    dtype: float
+    default: 0
 DiscountedTechnologyEmissionsPenalty:
     short_name: DiscountedTechEmissionsPenalty
     indices: [REGION, TECHNOLOGY, YEAR]