From f5180d3d6d9802bc2ebe067db937922a7ff26ea4 Mon Sep 17 00:00:00 2001 From: Fred Thomas Date: Fri, 16 Feb 2024 15:44:28 +0000 Subject: [PATCH] Concat for damage fractions, too --- workflow/Snakefile | 1 + workflow/transport-flood/flood_damages.smk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/workflow/Snakefile b/workflow/Snakefile index 807e21d0..c52ea9e5 100644 --- a/workflow/Snakefile +++ b/workflow/Snakefile @@ -90,6 +90,7 @@ wildcard_constraints: STORM_MODEL_FUTURE="CMCC-CM2-VHR4|CNRM-CM6-1-HR|EC-Earth3P-HR|HadGEM3-GC31-HM", STORM_SET="(?:IBTrACS|STORM|IRIS)[^\/]*", EVENTS_OR_FIXED="events|fixed", + COST_OR_FRACTION="cost|fraction", DIRECT_DAMAGE_TYPES="fraction_per_RP|cost_per_RP|EAD|EAD_and_cost_per_RP", SAMPLE="\d+", # may be upper or lower, one 'f' or two diff --git a/workflow/transport-flood/flood_damages.smk b/workflow/transport-flood/flood_damages.smk index f8037f30..9db1e784 100644 --- a/workflow/transport-flood/flood_damages.smk +++ b/workflow/transport-flood/flood_damages.smk @@ -72,14 +72,14 @@ rule concat_event_set_direct_damages: "direct_damages", "{DATASET}_{FILTER_SLUG}", "{HAZARD_SLUG}", - "cost", + "{COST_OR_FRACTION}", "slice-{i}.gpq", ), **wildcards, i=range(config["slice_count"]) ), output: - damage_cost = "{OUTPUT_DIR}/direct_damages/{DATASET}_{FILTER_SLUG}/{HAZARD_SLUG}/cost.gpq", + damage_cost = "{OUTPUT_DIR}/direct_damages/{DATASET}_{FILTER_SLUG}/{HAZARD_SLUG}/{COST_OR_FRACTION}.gpq", run: import geopandas as gpd import pandas as pd