PyPSA · lisazeyen · Jul 5, 2021 · Dec 15, 2020 · Dec 15, 2020 · Dec 15, 2020
diff --git a/Snakefile b/Snakefile
@@ -13,7 +13,8 @@ rule compile_cost_assumptions:
         dea_storage = "inputs/technology_data_catalogue_for_energy_storage.xlsx",
         dea_generation = "inputs/technology_data_for_el_and_dh_-_0009.xlsx",
         dea_heating = "inputs/technologydatafor_heating_installations_marts_2018.xlsx",
-        dea_industrial = "inputs/technology_data_for_industrial_process_heat_0002.xlsx"
+        dea_industrial = "inputs/technology_data_for_industrial_process_heat_0002.xlsx",
+        manual_input = "inputs/manual_input.csv"
     output:
         expand("outputs/costs_{year}.csv", year = config["years"])
     threads: 1

diff --git a/config.yaml b/config.yaml
@@ -22,3 +22,8 @@ h2_from_budischak : false
 # remove grid connection costs from DEA for offwind because they are calculated
 # seperately in pypsa-eur
 offwind_no_gridcosts : true
+
+desalination:
+    salinity: 35 # in PSU (Practical Salinity Unit) = kg/m^3
+
+ndigits: 2
diff --git a/inputs/manual_input.csv b/inputs/manual_input.csv
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