diff --git a/rime/generate_aggregated_inputs.py b/rime/generate_aggregated_inputs.py index 5a9500a..7e80701 100644 --- a/rime/generate_aggregated_inputs.py +++ b/rime/generate_aggregated_inputs.py @@ -107,8 +107,8 @@ df = df.timeseries().reset_index() df.dropna(how="all", inplace=True) - df[["SSP", "GMT"]] = df.scenario.str.split("_", expand=True) - df["GMT"] = df["GMT"].str.replace("p", ".").astype("float") + df[["SSP", "GWL"]] = df.scenario.str.split("_", expand=True) + df["GWL"] = df["GWL"].str.replace("p", ".").astype("float") # df.drop(columns=['model', 'scenario'], inplace=True) @@ -129,7 +129,7 @@ print("alive bar present") # Apply function here for vari in small_vars: - df_ind = loop_interpolate_gmt( + df_ind = loop_interpolate_gwl( df.loc[df.variable.str.startswith(vari)], yr_start, yr_end ) # dfbig = pd.concat([dfbig, df_ind]) @@ -146,7 +146,7 @@ "region", "unit", "SSP", - "GMT", + "GWL", ], value_vars=years, var_name="year", @@ -160,7 +160,7 @@ print(indicator) dx = ( dfp.loc[dfp.variable == indicator] - .set_index(["gmt", "year", "ssp", "region"]) + .set_index(["gwl", "year", "ssp", "region"]) .to_xarray() ) # dx.attrs['unit'] = dx.assign_coords({'unit':dx.unit.values[0,0,0,0]}) diff --git a/rime/pp_combined_example.ipynb b/rime/pp_combined_example.ipynb index 82bd19a..37d8518 100644 --- a/rime/pp_combined_example.ipynb +++ b/rime/pp_combined_example.ipynb @@ -578,11 +578,11 @@ "application/vnd.holoviews_exec.v0+json": "", "text/html": [ "
\n", - "
\n", + "
\n", "
\n", "