From 69dabc367f84370061cd1edee382b36d15b4d047 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 17 Nov 2022 16:36:52 +0100 Subject: [PATCH] ci: fix test configs --- scripts/solve_network.py | 1 - test/config.myopic.yaml | 52 -------------------------------------- test/config.overnight.yaml | 11 -------- 3 files changed, 64 deletions(-) diff --git a/scripts/solve_network.py b/scripts/solve_network.py index 63b073bd..b2201478 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -290,7 +290,6 @@ if __name__ == "__main__": logging.basicConfig(filename=snakemake.log.python, level=snakemake.config['logging_level']) - print(snakemake.config) update_config_with_sector_opts(snakemake.config, snakemake.wildcards.sector_opts) tmpdir = snakemake.config['solving'].get('tmpdir') diff --git a/test/config.myopic.yaml b/test/config.myopic.yaml index 865204e4..64a4bdcb 100644 --- a/test/config.myopic.yaml +++ b/test/config.myopic.yaml @@ -25,60 +25,8 @@ existing_capacities: grouping_years: [1980, 1985, 1990, 1995, 2000, 2005, 2010, 2015, 2019] sector: - land_transport_fuel_cell_share: - 2020: 0 - 2030: 0.05 - 2040: 0.1 - 2050: 0.15 - land_transport_electric_share: - 2020: 0 - 2030: 0.25 - 2040: 0.6 - 2050: 0.85 - shipping_hydrogen_share: - 2020: 0 - 2025: 0 - 2030: 0.05 - 2035: 0.15 - 2040: 0.3 - 2045: 0.6 - 2050: 1 - reduce_space_heat_exogenously_factor: - 2020: 0.10 # this results in a space heat demand reduction of 10% - 2025: 0.09 # first heat demand increases compared to 2020 because of larger floor area per capita - 2030: 0.09 - 2035: 0.11 - 2040: 0.16 - 2045: 0.21 - 2050: 0.29 co2_vent: true -industry: - St_primary_fraction: # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6 - 2020: 0.6 - 2025: 0.55 - 2030: 0.5 - 2035: 0.45 - 2040: 0.4 - 2045: 0.35 - 2050: 0.3 - DRI_fraction: # fraction of the primary route converted to DRI + EAF - 2020: 0 - 2025: 0 - 2030: 0.05 - 2035: 0.2 - 2040: 0.4 - 2045: 0.7 - 2050: 1 - Al_primary_fraction: # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4 - 2020: 0.4 - 2025: 0.375 - 2030: 0.35 - 2035: 0.325 - 2040: 0.3 - 2045: 0.25 - 2050: 0.2 - solving: solver: name: cbc diff --git a/test/config.overnight.yaml b/test/config.overnight.yaml index 21446811..47cad3e2 100644 --- a/test/config.overnight.yaml +++ b/test/config.overnight.yaml @@ -22,23 +22,12 @@ atlite: sector: - district_heating: - progress: 1 - land_transport_fuel_cell_share: 0.15 # 1 means all FCEVs - land_transport_electric_share: 0.85 # 1 means all EVs - shipping_hydrogen_share: 1 # 1 means all hydrogen FC - reduce_space_heat_exogenously_factor: 0.29 # per unit reduction in space heat demand co2_vent: true gas_network: true H2_retrofit: true # if set to True existing gas pipes can be retrofitted to H2 pipes biomass_boiler: false -industry: - St_primary_fraction: 0.3 # fraction of steel produced via primary route versus secondary route (scrap+EAF); today fraction is 0.6 - DRI_fraction: 1 # fraction of the primary route converted to DRI + EAF - Al_primary_fraction: 0.2 # fraction of aluminium produced via the primary route versus scrap; today fraction is 0.4 - solving: solver: name: cbc