From 65af55c22b48e305a6baa30f265054429ba79a55 Mon Sep 17 00:00:00 2001 From: Koen van Greevenbroek Date: Tue, 19 Mar 2024 08:54:58 +0100 Subject: [PATCH 1/3] Fix typos --- scripts/add_brownfield.py | 2 +- scripts/retrieve_cost_data.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/add_brownfield.py b/scripts/add_brownfield.py index 82a40e57..7e49031b 100644 --- a/scripts/add_brownfield.py +++ b/scripts/add_brownfield.py @@ -145,7 +145,7 @@ def disable_grid_expansion_if_limit_hit(n): for name, glc in glcs.iterrows(): total_expansion = ( ( - n.lines.query("p_nom_extendable") + n.lines.query("s_nom_extendable") .eval(f"s_nom_min * {cols[limit_type]}") .sum() ) diff --git a/scripts/retrieve_cost_data.py b/scripts/retrieve_cost_data.py index 39fcab7c..e236fbfd 100644 --- a/scripts/retrieve_cost_data.py +++ b/scripts/retrieve_cost_data.py @@ -26,7 +26,7 @@ if __name__ == "__main__": version = snakemake.params.version if "/" in version: - baseurl = f"https://raw.githubusercontent.com/{version}/outputs" + baseurl = f"https://raw.githubusercontent.com/{version}/outputs/" else: baseurl = f"https://raw.githubusercontent.com/PyPSA/technology-data/{version}/outputs/" filepath = Path(snakemake.output[0]) From 22d1bf5dd1a35554d476263c91d9bb390881dc2f Mon Sep 17 00:00:00 2001 From: Koen van Greevenbroek Date: Mon, 18 Mar 2024 11:58:39 +0100 Subject: [PATCH 2/3] Bugfix for missing eia years First, cannot cast pd index to boolean. Second, fix logic error of mistakenly swapped difference in calculating missing years. --- scripts/build_hydro_profile.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/build_hydro_profile.py b/scripts/build_hydro_profile.py index b7f270b3..c4e9701e 100644 --- a/scripts/build_hydro_profile.py +++ b/scripts/build_hydro_profile.py @@ -202,9 +202,10 @@ if __name__ == "__main__": contained_years = pd.date_range(freq="YE", **snakemake.params.snapshots).year norm_year = config_hydro.get("eia_norm_year") + missing_years = contained_years.difference(eia_stats.index) if norm_year: eia_stats.loc[contained_years] = eia_stats.loc[norm_year] - elif missing_years := eia_stats.index.difference(contained_years): + elif missing_years.any(): eia_stats.loc[missing_years] = eia_stats.median() inflow = cutout.runoff( From fcf773c003254975740340bb8cb21827aef7fc8b Mon Sep 17 00:00:00 2001 From: Koen van Greevenbroek Date: Tue, 19 Mar 2024 08:28:14 +0000 Subject: [PATCH 3/3] Copy, don't move natura.tiff to resources Preventing problems when parallel processes attempt to move the same file to different resources directories. --- rules/retrieve.smk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/retrieve.smk b/rules/retrieve.smk index ac296f79..4b244483 100644 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -115,7 +115,7 @@ if config["enable"]["retrieve"] and config["enable"].get( mem_mb=5000, retries: 2 run: - move(input[0], output[0]) + copyfile(input[0], output[0]) validate_checksum(output[0], input[0])