From 0bcfe15362c4ab97cf2dfe8b69b72d38e9a8e724 Mon Sep 17 00:00:00 2001 From: Fred Thomas Date: Fri, 12 Apr 2024 15:58:02 +0100 Subject: [PATCH] Revert erroneously committed changes to input functions --- workflow/power-tc/disruption.smk | 2 +- workflow/power-tc/exposure.smk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/power-tc/disruption.smk b/workflow/power-tc/disruption.smk index 504b7058..1d546e7c 100644 --- a/workflow/power-tc/disruption.smk +++ b/workflow/power-tc/disruption.smk @@ -437,7 +437,7 @@ def disruption_summaries_for_storm_set(wildcards): affects and return paths to their summary files. """ - json_file = f"{wildcards.OUTPUT_DIR}/power/by_storm_set/{wildcards.STORM_SET}/countries_impacted.json" + json_file = checkpoints.countries_intersecting_storm_set.get(**wildcards).output.country_set country_set = cached_json_file_read(json_file) return expand( diff --git a/workflow/power-tc/exposure.smk b/workflow/power-tc/exposure.smk index 1ff400c8..ba0b5738 100644 --- a/workflow/power-tc/exposure.smk +++ b/workflow/power-tc/exposure.smk @@ -138,7 +138,7 @@ def exposure_summaries_for_storm_set(wildcards): affects and return paths to their summary files. """ - json_file = f"{wildcards.OUTPUT_DIR}/power/by_storm_set/{wildcards.STORM_SET}/countries_impacted.json" + json_file = checkpoints.countries_intersecting_storm_set.get(**wildcards).output.country_set country_set = cached_json_file_read(json_file) return expand(