bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ci modularization fix cutout retrieval and profile in dag

Browse Source
This commit is contained in:
Fabian 2023-03-06 15:41:02 +01:00
parent 0332216891
commit bf969424a2
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Snakefile
View File

@ -319,7 +319,7 @@ rule retrieve_ship_raster:
rule build_ship_raster: rule build_ship_raster:
input: input:
ship_density="data/shipdensity_global.zip", ship_density="data/shipdensity_global.zip",
cutouts=expand("cutouts/" + CDIR + "{cutouts}.nc", **config["atlite"]), cutouts=expand("cutouts/" + CDIR + "{cutout}.nc", cutout=[config["renewable"][k]['cutout'] for k in config['electricity']['renewable_carriers']])
output: output:
"resources/" + RDIR + "shipdensity_raster.nc", "resources/" + RDIR + "shipdensity_raster.nc",
log: log:
@ -381,9 +381,7 @@ rule build_hydro_profile:
input: input:
country_shapes="resources/" + RDIR + "country_shapes.geojson", country_shapes="resources/" + RDIR + "country_shapes.geojson",
eia_hydro_generation="data/eia_hydro_annual_generation.csv", eia_hydro_generation="data/eia_hydro_annual_generation.csv",
cutout=f"cutouts/" + CDIR + config["renewable"]["hydro"]["cutout"] + ".nc" cutout=f"cutouts/" + CDIR + config["renewable"]["hydro"]["cutout"] + ".nc",
if "hydro" in config["renewable"]
else [],
output: output:
"resources/" + RDIR + "profile_hydro.nc", "resources/" + RDIR + "profile_hydro.nc",
log: log:
@ -398,7 +396,7 @@ rule add_electricity:
input: input:
**{ **{
f"profile_{tech}": "resources/" + RDIR + f"profile_{tech}.nc" f"profile_{tech}": "resources/" + RDIR + f"profile_{tech}.nc"
for tech in config["renewable"] for tech in config["electricity"]["renewable_carriers"]
}, },
**{ **{
f"conventional_{carrier}_{attr}": fn f"conventional_{carrier}_{attr}": fn

2
config.default.yaml
View File

@ -356,8 +356,8 @@ solving:
solutiontype: 2 # non basic solution, ie no crossover solutiontype: 2 # non basic solution, ie no crossover
barrier_convergetol: 1.e-5 barrier_convergetol: 1.e-5
feasopt_tolerance: 1.e-6 feasopt_tolerance: 1.e-6
cbc-default: {} # Used in CI cbc-default: {} # Used in CI
glpk-default: {} # Used in CI
mem: 30000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2 mem: 30000 #memory in MB; 20 GB enough for 50+B+I+H2; 100 GB for 181+B+I+H2

2
scripts/add_electricity.py
View File

@ -720,7 +720,7 @@ if __name__ == "__main__":
ppl = load_powerplants(snakemake.input.powerplants) ppl = load_powerplants(snakemake.input.powerplants)
if "renewable_carriers" in snakemake.config["electricity"]: if "renewable_carriers" in snakemake.config["electricity"]:
renewable_carriers = set(snakemake.config["renewable"]) renewable_carriers = set(snakemake.config["electricity"]["renewable_carriers"])
else: else:
logger.warning( logger.warning(
"Missing key `renewable_carriers` under config entry `electricity`. " "Missing key `renewable_carriers` under config entry `electricity`. "

5
test/config.test1.yaml
View File

@ -23,6 +23,8 @@ electricity:
Store: [H2] Store: [H2]
Link: [H2 pipeline] Link: [H2 pipeline]
renewable_carriers: [solar, onwind, offwind-ac, offwind-dc]
atlite: atlite:
cutouts: cutouts:
@ -44,9 +46,12 @@ renewable:
solar: solar:
cutout: be-03-2013-era5 cutout: be-03-2013-era5
clustering: clustering:
exclude_carriers: ["OCGT", "offwind-ac", "coal"] exclude_carriers: ["OCGT", "offwind-ac", "coal"]
solving: solving:
solver: solver:
name: glpk name: glpk
options: "glpk-default"