From cae63a3578de797406370c5d6eb73e85f0f75b1b Mon Sep 17 00:00:00 2001
From: Philipp Glaum <p.glaum@tu-berlin.de>
Date: Fri, 30 Aug 2024 16:47:46 +0200
Subject: [PATCH] prepare_sector_network: get tech data for allam cycle from
 data base

---
 config/config.default.yaml        |  2 +-
 scripts/prepare_sector_network.py | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/config/config.default.yaml b/config/config.default.yaml
index 42b069d6..4060729d 100644
--- a/config/config.default.yaml
+++ b/config/config.default.yaml
@@ -815,7 +815,7 @@ industry:
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#costs
 costs:
   year: 2030
-  version: v0.9.1
+  version: v0.9.2
   social_discountrate: 0.02
   fill_values:
     FOM: 0
diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
index 5f393645..2bb63e89 100644
--- a/scripts/prepare_sector_network.py
+++ b/scripts/prepare_sector_network.py
@@ -786,11 +786,11 @@ def add_allam(n, costs):
         carrier="allam",
         p_nom_extendable=True,
         # TODO: add costs to technology-data
-        capital_cost=0.6 * 1.5e6 * 0.1,  # efficiency * EUR/MW * annuity
-        marginal_cost=2,
-        efficiency=0.6,
+        capital_cost=costs.at["allam", "fixed"] * costs.at["allam", "efficiency"],
+        marginal_cost=costs.at["allam", "VOM"] * costs.at["allam", "efficiency"],
+        efficiency=costs.at["allam", "efficiency"],
         efficiency2=costs.at["gas", "CO2 intensity"],
-        lifetime=30.0,
+        lifetime=costs.at["allam", "lifetime"],
     )
 
 
@@ -862,11 +862,9 @@ def add_methanol_to_power(n, costs, types={}):
             bus3="co2 atmosphere",
             carrier="allam methanol",
             p_nom_extendable=True,
-            capital_cost=0.59
-            * 1.832e6
-            * calculate_annuity(25, 0.07),  # efficiency * EUR/MW * annuity
-            marginal_cost=2,
-            efficiency=0.59,
+            capital_cost=costs.at["allam", "fixed"] * costs.at["allam", "efficiency"],
+            marginal_cost=costs.at["allam", "VOM"] * costs.at["allam", "efficiency"],
+            efficiency=costs.at["allam", "efficiency"],
             efficiency2=0.98 * costs.at["methanolisation", "carbondioxide-input"],
             efficiency3=0.02 * costs.at["methanolisation", "carbondioxide-input"],
             lifetime=25,
@@ -921,7 +919,7 @@ def add_methanol_to_power(n, costs, types={}):
             carrier="CCGT methanol CC",
             p_nom_extendable=True,
             capital_cost=capital_cost_cc,
-            marginal_cost=2,
+            marginal_cost=costs.at["CCGT", "VOM"] * costs.at["CCGT", "VOM"],
             efficiency=costs.at["CCGT", "efficiency"],
             efficiency2=costs.at["cement capture", "capture_rate"]
             * costs.at["methanolisation", "carbondioxide-input"],
@@ -943,7 +941,7 @@ def add_methanol_to_power(n, costs, types={}):
             carrier="OCGT methanol",
             p_nom_extendable=True,
             capital_cost=costs.at["OCGT", "fixed"] * costs.at["OCGT", "efficiency"],
-            marginal_cost=2,
+            marginal_cost=costs.at["OCGT", "VOM"] * costs.at["OCGT", "efficiency"],
             efficiency=costs.at["OCGT", "efficiency"],
             efficiency2=costs.at["methanolisation", "carbondioxide-input"],
             lifetime=costs.at["OCGT", "lifetime"],