Merge branch 'main' of https://github.com/iiasa/rime into setuptest

environment.yml

@@ -0,0 +1,6 @@
+name: rime
+channels:
+  - defaults
+  - conda-forge
+dependencies:
+  - python

rime/process_tabledata.py

@@ -5,8 +5,8 @@
 @author: byers
 """
 if __name__ == "__main__":
-    from process_config import *
-    from rime_functions import *
+    from rime.process_config import *
+    from rime.rime_functions import *
 
     #  from alive_progress import alive_bar
     import dask.dataframe as dd

rime/utils.py

@@ -4,6 +4,7 @@
 import numpy as np
 import pandas as pd
 import pyam
+import yaml
 
 
 def fix_duplicate_temps(df, years):
@@ -89,10 +90,11 @@ def ssp_helper(dft, ssp_meta_col="Ssp_family", default_ssp="SSP2", keep_meta=Tru
     dft = np.round(dft.as_pandas()[pyam.IAMC_IDX + ["year", "value"] + meta_cols], 3)
     # Check if SSP denoted by numbers only already?
     sspdic = {1.0: "SSP1", 2.0: "SSP2", 3.0: "SSP3", 4.0: "SSP4", 5.0: "SSP5"}
-    dft[ssp_meta_col].replace(
-        sspdic, inplace=True
-    )  # metadata must have Ssp_family column. If not SSP2 automatically chosen
+    dft[ssp_meta_col] = dft[ssp_meta_col].replace(
+        sspdic)  # metadata must have Ssp_family column. If not SSP2 automatically chosen
     dft.loc[dft[ssp_meta_col].isnull(), ssp_meta_col] = default_ssp
+    dft.loc[dft[ssp_meta_col]=='', ssp_meta_col] = default_ssp
+
     metadata = (
         dft[["model", "scenario"] + meta_cols]
         .drop_duplicates()
@@ -153,3 +155,17 @@ def check_ds_dims(ds):
         raise ValueError(
             "The dataset does not contain 'lat' and 'lon' or 'x' and 'y' dimensions."
         )
+
+def load_indicator_params():
+    """
+    Function to load the indicator parameters to facilitate reading in climate impacts  data from Climate Solutions Explorer (Werning et al. 2023 - DOI:                                                                                                          https://zenodo.org/doi/10.5281/zenodo.7971429 )
+
+    Returns
+    -------
+    params : dict
+
+    """
+    with open("rime.indicator_params.yml", "r") as f:
+        params = yaml.full_load(f)
+
+    return params