Merge pull request #88 from PyPSA/fix/further-description-from-manual…

…-input Fix processing but of further_description from manual_input.csv and 'solar', 'solar-rooftop' description
PyPSA · May 10, 2023 · 52bdf1b · 52bdf1b
2 parents b3db13d + b1f1882
commit 52bdf1b
Show file tree

Hide file tree

Showing 9 changed files with 887 additions and 838 deletions.
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -5,10 +5,13 @@ Release Notes
 Upcoming Release
 ================
 
-Updated technologies
- - updated cost assumptions for 'digestible biomass to hydrogen' and "solid biomass to hydrogen"
-- Fix: Unit for methanation investment costs is now correctly displayed as "EUR/kW_CH4" (`#82 <https://github.com/PyPSA/technology-data/issues/82#event-8638160137>`_)
+* General:
+  - Fix 'further_description' column from 'manual_inputs.csv' not being correctly parsed by the workflow
 
+* Updated technologies
+  - updated cost assumptions for 'digestible biomass to hydrogen' and "solid biomass to hydrogen"
+  - Fix: Unit for methanation investment costs is now correctly displayed as "EUR/kW_CH4" (`#82 <https://github.com/PyPSA/technology-data/issues/82#event-8638160137>`_)
+  - Fix source and description for 'solar' and 'solar-rooftop' to correctly indicate how they are calculated
 
 * New technologies
   - new biomass technologies ('biogas CC', 'central gas CHP CC', 'central hydrogen CHP', 'central solid biomass CHP CC', 'central solid biomass CHP powerboost CC',

diff --git a/outputs/costs_2020.csv b/outputs/costs_2020.csv
diff --git a/outputs/costs_2025.csv b/outputs/costs_2025.csv
diff --git a/outputs/costs_2030.csv b/outputs/costs_2030.csv
diff --git a/outputs/costs_2035.csv b/outputs/costs_2035.csv
diff --git a/outputs/costs_2040.csv b/outputs/costs_2040.csv
diff --git a/outputs/costs_2045.csv b/outputs/costs_2045.csv
diff --git a/outputs/costs_2050.csv b/outputs/costs_2050.csv
diff --git a/scripts/compile_cost_assumptions.py b/scripts/compile_cost_assumptions.py
@@ -1304,7 +1304,7 @@ def add_manual_input(data):
             s['technology'] = tech
             for col in ['unit','source','further_description']:
                 s[col] = "; and\n".join(c[col].unique().astype(str))
-
+            s = s.rename({"further_description":"further description"}) # match column name between manual_input and original TD workflow
             l.append(s)
 
     new_df = pd.DataFrame(l).set_index(['technology','parameter'])
@@ -1747,12 +1747,16 @@ def add_mean_solar_rooftop(data):
         rooftop[col] = data.loc["solar-rooftop residential"][col]
     # set multi index
     rooftop = pd.concat([rooftop], keys=["solar-rooftop"])
+    rooftop["source"] = "Calculated. See 'further description'."
+    rooftop["further description"] = "Mixed investment costs based on average of 50% 'solar-rooftop commercial' and 50% 'solar-rooftop residential'"
     # add to data
     data = pd.concat([data, rooftop])
     # add solar assuming 50% utility and 50% rooftop
     solar = (data.loc[["solar-rooftop", "solar-utility"]][years]).astype(float).groupby(level=1).mean()
     for col in data.columns[~data.columns.isin(years)]:
-        solar[col] = data.loc["solar-rooftop residential"][col]
+        solar[col] = data.loc["solar-rooftop residential"][col] 
+    solar["source"] = "Calculated. See 'further description'."
+    solar["further description"] = "Mixed investment costs based on average of 50% 'solar-rooftop' and 50% 'solar-utility'"
     # set multi index
     solar = pd.concat([solar], keys=["solar"])
     return pd.concat([data, solar])