From 7cca921e07a2acd394b97a41f623551f7ef02a04 Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Tue, 19 Mar 2024 10:46:22 -0600 Subject: [PATCH 1/3] Update ADF to latest version There was a change to how the TEM computation was setup in the configuration file; rather than a top-level tem_info key, there is now a block of tem variables under each case. --- Externals.cfg | 2 +- ....FLTHIST_ne30.r328_gamma0.33_soae.001.yaml | 32 +++++++++++-------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 4682542..f84beee 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,6 +1,6 @@ [ADF] local_path = externals/ADF -hash = 4625c8a +branch = main protocol = git repo_url = https://github.com/NCAR/ADF.git required = True diff --git a/examples/nblibrary/config_f.cam6_3_119.FLTHIST_ne30.r328_gamma0.33_soae.001.yaml b/examples/nblibrary/config_f.cam6_3_119.FLTHIST_ne30.r328_gamma0.33_soae.001.yaml index 62cc9e0..6cb610f 100644 --- a/examples/nblibrary/config_f.cam6_3_119.FLTHIST_ne30.r328_gamma0.33_soae.001.yaml +++ b/examples/nblibrary/config_f.cam6_3_119.FLTHIST_ne30.r328_gamma0.33_soae.001.yaml @@ -169,6 +169,15 @@ diag_cam_climo: #Location where time series files are (or will be) stored: cam_ts_loc: ${ts_loc}${diag_cam_climo.cam_case_name}/${diag_cam_climo.yrs}/ + #Location where TEM files are stored: + #If path not specified or commented out, skip TEM calculation + #If no path, diagnostics wont run even if declared in averaging/plotting scripts below + cam_tem_loc: /glade/campaign/cesm/development/cross-wg/diagnostic_framework/ADF-data/TEM/ + + #TEM history file number + tem_hist_str: cam.h4 + + overwrite_tem: false case_nickname: ${diag_cam_climo.cam_case_name} @@ -226,6 +235,16 @@ diag_cam_baseline_climo: #Location where time series files are (or will be) stored: cam_ts_loc: /glade/campaign/cesm/development/cross-wg/diagnostic_framework/ADF-data/timeseries/${diag_cam_baseline_climo.cam_case_name}/${diag_cam_baseline_climo.yrs}/ + #Location where TEM files are stored: + #If path not specified or commented out, skip TEM calculation + #If no path, diagnostics wont run even if declared in averaging/plotting scripts below + cam_tem_loc: /glade/campaign/cesm/development/cross-wg/diagnostic_framework/ADF-data/TEM/ + + #TEM history file number + tem_hist_str: cam.h4 + + overwrite_tem: false + case_nickname: ${diag_cam_baseline_climo.cam_case_name} @@ -353,17 +372,4 @@ derived_var_list: # -# Options for TEM diagnostics (./averaging/create_TEM_files.py and ./plotting/temp.py) -tem_info: - #Location where TEM files are stored: - #If path not specified or commented out, skip TEM calculation - #If no path, diagnostics wont run even if declared in averaging/plotting scripts below - tem_loc: /glade/campaign/cesm/development/cross-wg/diagnostic_framework/ADF-data/TEM/ - - #TEM history file number - hist_num: h4 - - overwrite_tem_case: false - overwrite_tem_base: false - #END OF FILE From 4c9fedccfbb914bce62416202b8b71f71d3243a3 Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Tue, 19 Mar 2024 11:11:55 -0600 Subject: [PATCH 2/3] update cam_tem_loc The previous version of ADF appended the case name to the tem_loc directory, but this configuration schema requires the full path (including the case name). --- ...fig_f.cam6_3_119.FLTHIST_ne30.r328_gamma0.33_soae.001.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/nblibrary/config_f.cam6_3_119.FLTHIST_ne30.r328_gamma0.33_soae.001.yaml b/examples/nblibrary/config_f.cam6_3_119.FLTHIST_ne30.r328_gamma0.33_soae.001.yaml index 6cb610f..880a4d0 100644 --- a/examples/nblibrary/config_f.cam6_3_119.FLTHIST_ne30.r328_gamma0.33_soae.001.yaml +++ b/examples/nblibrary/config_f.cam6_3_119.FLTHIST_ne30.r328_gamma0.33_soae.001.yaml @@ -172,7 +172,7 @@ diag_cam_climo: #Location where TEM files are stored: #If path not specified or commented out, skip TEM calculation #If no path, diagnostics wont run even if declared in averaging/plotting scripts below - cam_tem_loc: /glade/campaign/cesm/development/cross-wg/diagnostic_framework/ADF-data/TEM/ + cam_tem_loc: /glade/campaign/cesm/development/cross-wg/diagnostic_framework/ADF-data/TEM/${diag_cam_climo.cam_case_name} #TEM history file number tem_hist_str: cam.h4 @@ -238,7 +238,7 @@ diag_cam_baseline_climo: #Location where TEM files are stored: #If path not specified or commented out, skip TEM calculation #If no path, diagnostics wont run even if declared in averaging/plotting scripts below - cam_tem_loc: /glade/campaign/cesm/development/cross-wg/diagnostic_framework/ADF-data/TEM/ + cam_tem_loc: /glade/campaign/cesm/development/cross-wg/diagnostic_framework/ADF-data/TEM/${diag_cam_baseline_climo.cam_case_name} #TEM history file number tem_hist_str: cam.h4 From 59a620f3d1eda7abaafe88372f6668f97716702d Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Wed, 20 Mar 2024 09:57:03 -0600 Subject: [PATCH 3/3] Pin ADF to hash currently head of main After discussion, we don't want to point to main (ADF is changing fairly rapidly) but now that we're compatible with the latest commit to main we can at least update the pin to that commit --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index f84beee..49236d4 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,6 +1,6 @@ [ADF] local_path = externals/ADF -branch = main +hash = b961522 protocol = git repo_url = https://github.com/NCAR/ADF.git required = True