fix technology-dependent parameters, adjust test

amos-schledorn · amos-schledorn · commit 9eae93be041c · 2025-09-24T16:52:10.000+02:00
diff --git a/outputs/costs_2020.csv b/outputs/costs_2020.csv
@@ -648,7 +648,6 @@ biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_rene
 biogas manure,fuel,19.7575,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2010.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
 biogas plus hydrogen,VOM,4.5939,EUR/MWh_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Variable O&M,2020.0
-biogas plus hydrogen,efficiency,0.001,per unit,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","99 SNG from methan. of biogas:  District Heating Output,",2020.0
 biogas plus hydrogen,investment,964.7165,EUR/kW_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Specific investment,2020.0
 biogas plus hydrogen,lifetime,25.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Technical lifetime,2020.0
 biogas upgrading,FOM,17.0397,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","82 Upgrading 3,000 Nm3 per h:  Fixed O&M ",2020.0
diff --git a/outputs/costs_2025.csv b/outputs/costs_2025.csv
@@ -648,7 +648,6 @@ biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_rene
 biogas manure,fuel,19.8126,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2010.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
 biogas plus hydrogen,VOM,4.2111,EUR/MWh_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Variable O&M,2020.0
-biogas plus hydrogen,efficiency,0.001,per unit,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","99 SNG from methan. of biogas:  District Heating Output,",2020.0
 biogas plus hydrogen,investment,884.3234,EUR/kW_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Specific investment,2020.0
 biogas plus hydrogen,lifetime,25.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Technical lifetime,2020.0
 biogas upgrading,FOM,17.0397,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","82 Upgrading 3,000 Nm3 per h:  Fixed O&M ",2020.0
diff --git a/outputs/costs_2030.csv b/outputs/costs_2030.csv
@@ -648,7 +648,6 @@ biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_rene
 biogas manure,fuel,19.8676,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2010.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
 biogas plus hydrogen,VOM,3.8282,EUR/MWh_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Variable O&M,2020.0
-biogas plus hydrogen,efficiency,0.001,per unit,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","99 SNG from methan. of biogas:  District Heating Output,",2020.0
 biogas plus hydrogen,investment,803.9304,EUR/kW_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Specific investment,2020.0
 biogas plus hydrogen,lifetime,25.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Technical lifetime,2020.0
 biogas upgrading,FOM,17.0397,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","82 Upgrading 3,000 Nm3 per h:  Fixed O&M ",2020.0
diff --git a/outputs/costs_2035.csv b/outputs/costs_2035.csv
@@ -648,7 +648,6 @@ biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_rene
 biogas manure,fuel,19.8729,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2010.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
 biogas plus hydrogen,VOM,3.4454,EUR/MWh_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Variable O&M,2020.0
-biogas plus hydrogen,efficiency,0.001,per unit,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","99 SNG from methan. of biogas:  District Heating Output,",2020.0
 biogas plus hydrogen,investment,723.5374,EUR/kW_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Specific investment,2020.0
 biogas plus hydrogen,lifetime,25.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Technical lifetime,2020.0
 biogas upgrading,FOM,17.3842,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","82 Upgrading 3,000 Nm3 per h:  Fixed O&M ",2020.0
diff --git a/outputs/costs_2040.csv b/outputs/costs_2040.csv
@@ -648,7 +648,6 @@ biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_rene
 biogas manure,fuel,19.8782,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2010.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
 biogas plus hydrogen,VOM,3.0626,EUR/MWh_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Variable O&M,2020.0
-biogas plus hydrogen,efficiency,0.001,per unit,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","99 SNG from methan. of biogas:  District Heating Output,",2020.0
 biogas plus hydrogen,investment,643.1443,EUR/kW_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Specific investment,2020.0
 biogas plus hydrogen,lifetime,25.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Technical lifetime,2020.0
 biogas upgrading,FOM,17.8139,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","82 Upgrading 3,000 Nm3 per h:  Fixed O&M ",2020.0
diff --git a/outputs/costs_2045.csv b/outputs/costs_2045.csv
@@ -648,7 +648,6 @@ biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_rene
 biogas manure,fuel,19.9144,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2010.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
 biogas plus hydrogen,VOM,2.6798,EUR/MWh_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Variable O&M,2020.0
-biogas plus hydrogen,efficiency,0.001,per unit,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","99 SNG from methan. of biogas:  District Heating Output,",2020.0
 biogas plus hydrogen,investment,562.7513,EUR/kW_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Specific investment,2020.0
 biogas plus hydrogen,lifetime,25.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Technical lifetime,2020.0
 biogas upgrading,FOM,17.4434,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","82 Upgrading 3,000 Nm3 per h:  Fixed O&M ",2020.0
diff --git a/outputs/costs_2050.csv b/outputs/costs_2050.csv
@@ -648,7 +648,6 @@ biogas CC,lifetime,20.0,years,"Danish Energy Agency, inputs/data_sheets_for_rene
 biogas manure,fuel,19.9506,EUR/MWhth,"JRC ENSPRESO ca avg for MINBIOGAS1 (manure), ENS_BaU_GFTM",,2010.0
 biogas plus hydrogen,FOM,4.0,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Fixed O&M,2020.0
 biogas plus hydrogen,VOM,2.2969,EUR/MWh_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Variable O&M,2020.0
-biogas plus hydrogen,efficiency,0.001,per unit,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","99 SNG from methan. of biogas:  District Heating Output,",2020.0
 biogas plus hydrogen,investment,482.3582,EUR/kW_CH4,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Specific investment,2020.0
 biogas plus hydrogen,lifetime,25.0,years,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx",99 SNG from methan. of biogas:  Technical lifetime,2020.0
 biogas upgrading,FOM,17.0397,%/year,"Danish Energy Agency, inputs/data_sheets_for_renewable_fuels.xlsx","82 Upgrading 3,000 Nm3 per h:  Fixed O&M ",2020.0
diff --git a/scripts/compile_cost_assumptions.py b/scripts/compile_cost_assumptions.py
@@ -809,6 +809,16 @@ def get_data_DEA(
             "Heat generation from geothermal heat (MJ/s)",
         ]
 
+    if tech_name == "methanolisation":
+        parameters += ["District heating"]
+
+    if tech_name == "Fischer-Tropsch":
+        parameters += ["District Heat  Output,"]
+
+    if tech_name == "Haber-Bosch":
+        parameters += ["High value heat Output", "District Heating Output,"]
+ 
+
     df = pd.DataFrame()
     for para in parameters:
         # attr = excel[excel.index.str.contains(para)]
@@ -869,11 +879,9 @@ def get_data_DEA(
 
     if tech_name == "methanolisation":
         df.drop(df.loc[df.index.str.contains("1,000 t Methanol")].index, inplace=True)
-        parameters += ["District heating"]
 
     if tech_name == "Fischer-Tropsch":
         df.drop(df.loc[df.index.str.contains("l FT Liquids")].index, inplace=True)
-        parameters += ["District Heat  Output,"]
 
     if tech_name == "biomass boiler":
         df.drop(
@@ -908,7 +916,6 @@ def get_data_DEA(
             ].index,
             inplace=True,
         )
-        parameters = ["High value heat Output", "District Heating Output,"]
 
     if tech_name == "air separation unit":
         divisor = (
@@ -2101,6 +2108,7 @@ def order_data(years: list, technology_dataframe: pd.DataFrame) -> pd.DataFrame:
                 patterns = ["High value heat Output", "District Heating Output,"]
 
             # Find all matching heat recovery rows
+            breakpoint()
             heat_masks = [
                 efficiency.index.str.contains(pattern) for pattern in patterns
             ]
diff --git a/test/test_compile_cost_assumptions.py b/test/test_compile_cost_assumptions.py
@@ -242,10 +242,10 @@ def test_get_data_from_dea(config):
         "BtL": (6, 9),
         "biomass-to-methanol": (8, 9),
         "biogas plus hydrogen": (6, 9),
-        "methanolisation": (7, 9),
-        "Fischer-Tropsch": (6, 9),
+        "methanolisation": (8, 9),
+        "Fischer-Tropsch": (7, 9),
         "central hydrogen CHP": (8, 9),
-        "Haber-Bosch": (10, 9),
+        "Haber-Bosch": (12, 9),
         "air separation unit": (7, 9),
         "waste CHP": (16, 9),
         "waste CHP CC": (16, 9),
