Merge pull request #160 from imagepbl/fix-rci

Fix region dimension in rci

Author: MarkMDekker

scripts/cabe_export.py

@@ -43,8 +43,12 @@
 # uncomment below for testing only run on a few regions
 # regions_iso = list(regions_iso)[:4]
 for cty in tqdm(regions_iso, desc="Allocations for region", unit="region"):
-    dss = allocations_for_region(region=cty, config=config, gas=gas, lulucf=lulucf)
-    save_allocations(dss=dss, region=cty, config=config, gas=gas, lulucf=lulucf)
+    # TODO: skip if file already exists
+    try:
+        dss = allocations_for_region(region=cty, config=config, gas=gas, lulucf=lulucf)
+        save_allocations(dss=dss, region=cty, config=config, gas=gas, lulucf=lulucf)
+    except Exception as e:
+        print(f"@@@@@@@@@@@@@@@@@@@ Error processing region {cty}: {e}")
 
 # Create {CABE_START_YEAR} / {CABE_ASSUMPTIONSET} / "Aggregated_files" / "xr_alloc_{YEAR}.nc"
 for year in aggregated_years:

src/effortsharing/allocation/gdr.py

@@ -5,7 +5,7 @@
 import xarray as xr
 
 from effortsharing.allocation.ap import ap
-from effortsharing.allocation.utils import LULUCF, Gas, config2base_var, load_future_emissions
+from effortsharing.allocation.utils import LULUCF, Gas, config2base_var, load_dataread, load_future_emissions
 from effortsharing.config import Config
 from effortsharing.input.emissions import load_emissions, read_modelscenarios
 from effortsharing.save import load_rci
@@ -33,7 +33,9 @@ def gdr(
     if ap_da is None:
         ap_da = ap(config, region, gas, lulucf)
 
-    xr_rci = load_rci(config)
+
+    xr_version = load_dataread(config)
+    xr_rci = load_rci(config, region_dim=xr_version.Region)
     yearfracs = xr.Dataset(
         data_vars={
             "Value": (

src/effortsharing/pathways/global_pathways.py

@@ -243,7 +243,7 @@ def global_pathways(config: Config):
     save_total(config, xr_version)
     # TODO move below to own high level function, above is for making xr_dataread.nc
     save_rbw(config, xr_version, countries)
-    load_rci(config)
+    load_rci(config, region_dim=xr_version.Region)
 
     # Country-specific data readers
     datareader_netherlands(config, new_total)

src/effortsharing/save.py

@@ -111,7 +111,7 @@ def save_rbw(config: Config, xr_version, countries):
 
 
 @intermediate_file("xr_rci.nc")
-def load_rci(config: Config) -> xr.Dataset:
+def load_rci(config: Config, region_dim) -> xr.Dataset:
     """Load responsibility capability index (RCI) data from netcdf file."""
 
     # GDR RCI indices
@@ -145,4 +145,5 @@ def load_rci(config: Config) -> xr.Dataset:
     dfdummy = fulldf.set_index(
         ["Region", "Time", "Historical_startyear", "Capability_threshold", "RCI_weight"]
     )
-    return xr.Dataset.from_dataframe(dfdummy)
+
+    return xr.Dataset.from_dataframe(dfdummy).reindex({"Region": region_dim})