Merge pull request #181 from nismod/fix/reinsert_checkpoint

Revert erroneously committed changes to input functions
nismod · Apr 12, 2024 · d5932a6 · d5932a6
2 parents e7c469c + 0bcfe15
commit d5932a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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(