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

added minor cleanup correcting local adjustment

Browse Source
This commit is contained in:
LukasFrankenQ 2023-09-05 15:04:46 +01:00
parent e486d6bcfe
commit 489cbcd880
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rules/build_sector.smk
View File

@ -268,11 +268,10 @@ rule build_biomass_potentials:
params: params:
biomass=config["biomass"], biomass=config["biomass"],
input: input:
# enspreso_biomass=HTTP.remote( enspreso_biomass=HTTP.remote(
# "https://cidportal.jrc.ec.europa.eu/ftp/jrc-opendata/ENSPRESO/ENSPRESO_BIOMASS.xlsx", "https://cidportal.jrc.ec.europa.eu/ftp/jrc-opendata/ENSPRESO/ENSPRESO_BIOMASS.xlsx",
# keep_local=True, keep_local=True,
# ), ),
enspreso_biomass="cidportal.jrc.ec.europa.eu/ftp/jrc-opendata/ENSPRESO/ENSPRESO_BIOMASS.xlsx", # dealing with temporary server issues
nuts2="data/bundle-sector/nuts/NUTS_RG_10M_2013_4326_LEVL_2.geojson", # https://gisco-services.ec.europa.eu/distribution/v2/nuts/download/#nuts21 nuts2="data/bundle-sector/nuts/NUTS_RG_10M_2013_4326_LEVL_2.geojson", # https://gisco-services.ec.europa.eu/distribution/v2/nuts/download/#nuts21
regions_onshore=RESOURCES + "regions_onshore_elec_s{simpl}_{clusters}.geojson", regions_onshore=RESOURCES + "regions_onshore_elec_s{simpl}_{clusters}.geojson",
nuts3_population=ancient("data/bundle/nama_10r_3popgdp.tsv.gz"), nuts3_population=ancient("data/bundle/nama_10r_3popgdp.tsv.gz"),

2
scripts/prepare_sector_network.py
View File

@ -3568,14 +3568,12 @@ if __name__ == "__main__":
if options.get("enhanced_geothermal"): if options.get("enhanced_geothermal"):
logger.info("Adding Enhanced Geothermal Potential.") logger.info("Adding Enhanced Geothermal Potential.")
"""
add_enhanced_geothermal( add_enhanced_geothermal(
n, n,
snakemake.input["egs_potentials"], snakemake.input["egs_potentials"],
snakemake.input["egs_overlap"], snakemake.input["egs_overlap"],
costs costs
) )
"""
n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards))) n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards)))