Add eta to input damages

Author: JMGilbert

src/dscim/menu/simple_storage.py

@@ -384,8 +384,8 @@ def gdppc(self):
     def adding_up_damages(self):
         """This property calls pre-calculated adding-up IR-level 'mean' over batches."""
 
-        mean_cc = f"{self.ce_path}/adding_up_cc.zarr"
-        mean_no_cc = f"{self.ce_path}/adding_up_no_cc.zarr"
+        mean_cc = f"{self.ce_path}/adding_up_cc_eta{self.eta}.zarr"
+        mean_no_cc = f"{self.ce_path}/adding_up_no_cc_eta{self.eta}.zarr"
 
         if os.path.exists(mean_cc) and os.path.exists(mean_no_cc):
             self.logger.info(

src/dscim/preprocessing/input_damages.py

@@ -710,6 +710,7 @@ def prep_mortality_damages(
     outpath,
     mortality_version,
     path_econ,
+    etas,
 ):
     ec = EconVars(path_econ=path_econ)
 
@@ -732,6 +733,10 @@ def prep_mortality_damages(
         scaling_deaths = "epa_row"
         scaling_costs = "epa_scaled"
         valuation = "vsl"
+    elif mortality_version == 9:
+        scaling_deaths = "epa_popavg"
+        scaling_costs = "epa_scaled"
+        valuation = "vly"
     else:
         raise ValueError("Mortality version not valid: ", str(mortality_version))
 
@@ -764,8 +769,14 @@ def prep(
                     valuation=valuation,
                 ).drop(["gcm", "valuation"])
 
-        data = xr.open_mfdataset(paths, preprocess=prep, parallel=True, engine="zarr")
-
+        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')
+            d_ls.append(data)
+        
+        data = xr.merge(d_ls)
+            
         damages = xr.Dataset(
             {
                 "delta": (
@@ -786,12 +797,14 @@ def prep(
         damages = damages.chunk(
             {
                 "batch": 15,
+                "eta": 1,
                 "ssp": 1,
                 "model": 1,
                 "rcp": 1,
                 "gcm": 1,
                 "year": 10,
                 "region": -1,
+                "eta": 1,
             }
         )
         damages.coords.update({"batch": [f"batch{i}" for i in damages.batch.values]})
@@ -808,6 +821,8 @@ def prep(
             if damages[v].dtype == object:
                 damages[v] = damages[v].astype("unicode")
 
+        damages.coords['gcm'] = damages.coords['gcm'].astype('object')
+
         if i == 0:
             damages.to_zarr(
                 f"{outpath}/impacts-darwin-montecarlo-damages-v{mortality_version}.zarr",

src/dscim/preprocessing/preprocessing.py

@@ -43,6 +43,8 @@ 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(
@@ -74,12 +76,6 @@ def reduce_damages(
     bottom_coding_gdppc=39.39265060424805,
     zero=False,
 ):
-    if recipe == "adding_up":
-        assert (
-            eta is None
-        ), "Adding up does not take an eta argument. Please set to None."
-    # client = Client(n_workers=35, memory_limit="9G", threads_per_worker=1)
-
     with open(config) as stream:
         c = yaml.safe_load(stream)
         params = c["sectors"][sector]
@@ -114,7 +110,7 @@ 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"
+                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"] = [
@@ -129,7 +125,9 @@ def reduce_damages(
     ).chunk(chunkies)
 
     other = xr.open_zarr(damages).chunk(chunkies)
-
+    if "eta" in other.coords:
+        other = other.sel(eta = eta, drop=True)
+    
     out = other.map_blocks(
         ce_from_chunk,
         kwargs=dict(
@@ -155,7 +153,7 @@ def reduce_damages(
 
     if recipe == "adding_up":
         out.to_zarr(
-            f"{outpath}/{recipe}_{reduction}.zarr",
+            f"{outpath}/{recipe}_{reduction}_eta{eta}.zarr",
             consolidated=True,
             mode="w",
         )

src/dscim/utils/menu_runs.py

@@ -104,6 +104,8 @@ 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",