Format and remove debug

Author: JMGilbert

src/dscim/preprocessing/input_damages.py

@@ -771,12 +771,18 @@ def prep(
 
         d_ls = []
         for eta in etas:
-            paths_ls = [paths.format(i,eta) for i in range(15)]
-            data = xr.open_mfdataset(paths_ls, preprocess=prep, parallel=True, engine="zarr").assign_coords({'eta': eta}).expand_dims('eta')
+            paths_ls = [paths.format(i, eta) for i in range(15)]
+            data = (
+                xr.open_mfdataset(
+                    paths_ls, preprocess=prep, parallel=True, engine="zarr"
+                )
+                .assign_coords({"eta": eta})
+                .expand_dims("eta")
+            )
             d_ls.append(data)
-        
+
         data = xr.merge(d_ls)
-            
+
         damages = xr.Dataset(
             {
                 "delta": (
@@ -804,7 +810,6 @@ def prep(
                 "gcm": 1,
                 "year": 10,
                 "region": -1,
-                "eta": 1,
             }
         )
         damages.coords.update({"batch": [f"batch{i}" for i in damages.batch.values]})
@@ -821,7 +826,7 @@ def prep(
             if damages[v].dtype == object:
                 damages[v] = damages[v].astype("unicode")
 
-        damages.coords['gcm'] = damages.coords['gcm'].astype('object')
+        damages.coords["gcm"] = damages.coords["gcm"].astype("object")
 
         if i == 0:
             damages.to_zarr(

src/dscim/preprocessing/preprocessing.py

@@ -43,8 +43,6 @@ def ce_from_chunk(
     else:
         raise NotImplementedError("Pass 'cc' or 'no_cc' to reduction.")
 
-    calculation = xr.where(calculation > 1e8, np.nan, calculation)
-        
     if recipe == "adding_up":
         result = mean_func(
             np.maximum(
@@ -110,7 +108,9 @@ def reduce_damages(
                 }
 
             ce_batch_dims = [i for i in gdppc.dims] + [
-                i for i in ds.dims if i not in gdppc.dims and i != "batch" and i != "eta"
+                i
+                for i in ds.dims
+                if i not in gdppc.dims and i != "batch" and i != "eta"
             ]
             ce_batch_coords = {c: ds[c].values for c in ce_batch_dims}
             ce_batch_coords["region"] = [
@@ -126,8 +126,8 @@ def reduce_damages(
 
     other = xr.open_zarr(damages).chunk(chunkies)
     if "eta" in other.coords:
-        other = other.sel(eta = eta, drop=True)
-    
+        other = other.sel(eta=eta, drop=True)
+
     out = other.map_blocks(
         ce_from_chunk,
         kwargs=dict(

src/dscim/utils/menu_runs.py

@@ -104,8 +104,6 @@ def run_ssps(
                     "damage_function_path": f"{conf['paths']['ssp_damage_function_library']}/{sector}/2020/unmasked",
                     "save_files": [
                         "damage_function_points",
-                        #"uncollapsed_marginal_damages",
-                        #"uncollapsed_discount_factors",
                         "marginal_damages",
                         "discount_factors",
                         "uncollapsed_sccs",