From eddccbdd7a16843b80f7087c1d2fc7db5292cada Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Thu, 10 Aug 2023 16:03:45 -0700 Subject: [PATCH 1/3] minor bug fix --- pcmdi_metrics/graphics/share/read_json_mean_clim.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pcmdi_metrics/graphics/share/read_json_mean_clim.py b/pcmdi_metrics/graphics/share/read_json_mean_clim.py index 457c78d51..5dc6aac75 100644 --- a/pcmdi_metrics/graphics/share/read_json_mean_clim.py +++ b/pcmdi_metrics/graphics/share/read_json_mean_clim.py @@ -146,12 +146,11 @@ def extract_data(results_dict, var_list, region, stat, season, mip, debug=False) Return a pandas dataframe for metric numbers at given region/stat/season. Rows: models, Columns: variables (i.e., 2d array) """ + model_list = sorted(list(results_dict[var_list[0]]["RESULTS"].keys())) if "rlut" in list(results_dict.keys()): if "rlut" in list(results_dict["rlut"]["RESULTS"].keys()): model_list = sorted(list(results_dict["rlut"]["RESULTS"].keys())) - else: - model_list = sorted(list(results_dict[var_list[0]]["RESULTS"].keys())) - + data_list = [] for model in model_list: if "rlut" in list(results_dict.keys()): From 11f013704378a513b31f05a4df871ec3f97c8241 Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Thu, 10 Aug 2023 16:20:10 -0700 Subject: [PATCH 2/3] minor bug fix --- pcmdi_metrics/graphics/share/read_json_mean_clim.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pcmdi_metrics/graphics/share/read_json_mean_clim.py b/pcmdi_metrics/graphics/share/read_json_mean_clim.py index 5dc6aac75..d011f8e1a 100644 --- a/pcmdi_metrics/graphics/share/read_json_mean_clim.py +++ b/pcmdi_metrics/graphics/share/read_json_mean_clim.py @@ -147,9 +147,12 @@ def extract_data(results_dict, var_list, region, stat, season, mip, debug=False) Rows: models, Columns: variables (i.e., 2d array) """ model_list = sorted(list(results_dict[var_list[0]]["RESULTS"].keys())) + # update model_list if "rlut" in list(results_dict.keys()): if "rlut" in list(results_dict["rlut"]["RESULTS"].keys()): model_list = sorted(list(results_dict["rlut"]["RESULTS"].keys())) + + print('extract_data:: model_list: ', model_list) data_list = [] for model in model_list: From 925d1ddb5ee0bc3e55bfbb809aa87fa487da882d Mon Sep 17 00:00:00 2001 From: Jiwoo Lee Date: Thu, 10 Aug 2023 16:23:48 -0700 Subject: [PATCH 3/3] bug fix --- pcmdi_metrics/graphics/share/read_json_mean_clim.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pcmdi_metrics/graphics/share/read_json_mean_clim.py b/pcmdi_metrics/graphics/share/read_json_mean_clim.py index d011f8e1a..823f78e72 100644 --- a/pcmdi_metrics/graphics/share/read_json_mean_clim.py +++ b/pcmdi_metrics/graphics/share/read_json_mean_clim.py @@ -156,13 +156,12 @@ def extract_data(results_dict, var_list, region, stat, season, mip, debug=False) data_list = [] for model in model_list: + run_list = sort_human(list( + results_dict[var_list[0]]["RESULTS"][model]["default"].keys()) + ) if "rlut" in list(results_dict.keys()): if "rlut" in list(results_dict["rlut"]["RESULTS"].keys()): run_list = sort_human(list(results_dict["rlut"]["RESULTS"][model]["default"].keys())) - else: - run_list = sort_human(list( - results_dict[var_list[0]]["RESULTS"][model]["default"].keys()) - ) if debug: print("model, run_list:", model, run_list)