fixing filepaths for the new mask sublevel

Author: Kit Schwarz

dscim/preprocessing/midprocessing.py

@@ -29,18 +29,18 @@ def update_damage_function_library(
 
 
 def combine_CAMEL_coefs(
-    recipe, disc, eta, rho, CAMEL, coastal, AMEL, input_dir, pulse_year=2020, fit=True
+    recipe, disc, eta, rho, CAMEL, coastal, AMEL, input_dir, mask='unmasked', pulse_year=2020, fit=True
 ):
 
     print(f"Creating {recipe} {disc} for {CAMEL}...")
-    os.makedirs(f"{input_dir}/{CAMEL}/{pulse_year}", exist_ok=True)
+    os.makedirs(f"{input_dir}/{CAMEL}/{pulse_year}/{mask}", exist_ok=True)
 
     coefs, fit = {}, {}
 
     for sector in [coastal, AMEL]:
         coefs[
             sector
-        ] = f"{input_dir}/{sector}/{pulse_year}/{recipe}_{disc}_eta{eta}_rho{rho}_damage_function_coefficients.nc4"
+        ] = f"{input_dir}/{sector}/{pulse_year}/{mask}/{recipe}_{disc}_eta{eta}_rho{rho}_damage_function_coefficients.nc4"
 
     coefs["combined"] = xr.combine_by_coords(
         [
@@ -59,15 +59,15 @@ def combine_CAMEL_coefs(
     }
 
     coefs["combined"].to_netcdf(
-        f"{input_dir}/{CAMEL}/{pulse_year}/{recipe}_{disc}_eta{eta}_rho{rho}_damage_function_coefficients.nc4"
+        f"{input_dir}/{CAMEL}/{pulse_year}/{mask}/{recipe}_{disc}_eta{eta}_rho{rho}_damage_function_coefficients.nc4"
     )
 
     if fit:
 
         for sector in [coastal, AMEL]:
             fit[
                 sector
-            ] = f"{input_dir}/{sector}/{pulse_year}/{recipe}_{disc}_eta{eta}_rho{rho}_damage_function_fit.nc4"
+            ] = f"{input_dir}/{sector}/{pulse_year}/{mask}/{recipe}_{disc}_eta{eta}_rho{rho}_damage_function_fit.nc4"
 
         fit["combined"] = xr.open_dataset(fit[coastal]) + xr.open_dataset(fit[AMEL])
 
@@ -80,5 +80,5 @@ def combine_CAMEL_coefs(
         }
 
         fit["combined"].to_netcdf(
-            f"{input_dir}/{CAMEL}/{pulse_year}/{recipe}_{disc}_eta{eta}_rho{rho}_damage_function_fit.nc4"
+            f"{input_dir}/{CAMEL}/{pulse_year}/{mask}/{recipe}_{disc}_eta{eta}_rho{rho}_damage_function_fit.nc4"
         )

dscim/utils/menu_runs.py

@@ -95,7 +95,7 @@ def run_ssps(
         if "CAMEL" in sector:
             kwargs.update(
                 {
-                    "damage_function_path": f"{conf['paths']['ssp_damage_function_library']}/{sector}/2020/",
+                    "damage_function_path": f"{conf['paths']['ssp_damage_function_library']}/{sector}/2020/unmasked",
                     "save_files": [
                         "damage_function_points",
                         "marginal_damages",
@@ -213,7 +213,7 @@ def run_rff(
             "save_path": save_path,
             "eta": eta_rho[0],
             "rho": eta_rho[1],
-            "damage_function_path": f"{conf['paths']['rff_damage_function_library']}/{sector}/2020",
+            "damage_function_path": f"{conf['paths']['rff_damage_function_library']}/{sector}/2020/unmasked",
             "save_files": ["uncollapsed_sccs"],
             "ecs_mask_path": None,
             "ecs_mask_name": None,