Merge pull request #279 from justin-richling/tem-config-update

Update TEM configuration
NCAR · Mar 5, 2024 · b961522 · b961522
2 parents eccd282 + 0d18949
commit b961522
Show file tree

Hide file tree

Showing 4 changed files with 246 additions and 195 deletions.
diff --git a/config_amwg_default_plots.yaml b/config_amwg_default_plots.yaml
@@ -182,6 +182,20 @@ diag_cam_climo:
     #Location where time series files are (or will be) stored:
     cam_ts_loc: /glade/scratch/${user}/ADF/${diag_cam_climo.cam_case_name}/ts
 
+    #TEM diagnostics
+    #---------------
+    #TEM history file number
+    #If missing or blank, ADF will default to h4
+    tem_hist_str: cam.h4
+
+    #Location where TEM files are stored:
+    #NOTE: If path not specified or commented out, TEM calculation/plots will be skipped!
+    cam_tem_loc: /glade/scratch/${user}/${diag_cam_climo.cam_case_name}/tem/
+
+    #Overwrite TEM files, if found?
+    #If set to false, then TEM creation will be skipped if files are found:
+    overwrite_tem: false
+
     #----------------------
 
 #This third set of variables provide info for the CAM baseline climatologies.
@@ -239,6 +253,20 @@ diag_cam_baseline_climo:
     #Location where time series files are (or will be) stored:
     cam_ts_loc: /glade/scratch/${user}/ADF/${diag_cam_baseline_climo.cam_case_name}/ts
 
+    #TEM diagnostics
+    #---------------
+    #TEM history file number
+    #If missing or blank, ADF will default to h4
+    tem_hist_str: cam.h4
+
+    #Location where TEM files are stored:
+    #NOTE: If path not specified or commented out, TEM calculation/plots will be skipped!
+    cam_tem_loc: /glade/scratch/${user}/${diag_cam_baseline_climo.cam_case_name}/tem/
+
+    #Overwrite TEM files, if found?
+    #If set to false, then TEM creation will be skipped if files are found:
+    overwrite_tem: false
+
 #This fourth set of variables provides settings for calling the Climate Variability
 # Diagnostics Package (CVDP). If cvdp_run is set to true the CVDP will be set up and
 # run in background mode, likely completing after the ADF has completed.
@@ -298,8 +326,7 @@ plotting_scripts:
     - polar_map
     - cam_taylor_diagram
     #- tape_recorder
-    #- tem #To plot TEM, please un-comment fill-out
-                              #the "tem_info" section below
+    #- tem
     #- regional_map_multicase #To use this please un-comment and fill-out
                               #the "region_multicase" section below
 
@@ -361,25 +388,4 @@ diag_var_list:
 #     region_season: <NULL means use annual mean>
 #     region_variables: <list of variables to try to use; allows for a subset of the total diag variables>
 
-# 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, TEM calculation/plots will be skipped
-#    tem_loc: /glade/scratch/richling/adf-output/ADF-data/TEM/
-
-    #TEM history file number
-    #If missing or blank, ADF will default to h4
-#    hist_num: h4
-
-    #Overwrite TEM files, if found?
-    #If set to false, then TEM creation will be skipped if files are found:
-#    overwrite_tem_case: false
-
-    #For multi-case
-    #overwrite_tem_case:
-    #    - false
-    #    - true
-
-#    overwrite_tem_base: false
-
 #END OF FILE
diff --git a/config_cam_baseline_example.yaml b/config_cam_baseline_example.yaml
@@ -182,6 +182,20 @@ diag_cam_climo:
     #Location where time series files are (or will be) stored:
     cam_ts_loc: /glade/scratch/${user}/ADF/${diag_cam_climo.cam_case_name}/ts
 
+    #TEM diagnostics
+    #---------------
+    #TEM history file number
+    #If missing or blank, ADF will default to h4
+    tem_hist_str: cam.h4
+
+    #Location where TEM files are stored:
+    #NOTE: If path not specified or commented out, TEM calculation/plots will be skipped!
+    cam_tem_loc: /glade/scratch/${user}/${diag_cam_climo.cam_case_name}/tem/
+
+    #Overwrite TEM files, if found?
+    #If set to false, then TEM creation will be skipped if files are found:
+    overwrite_tem: false
+
     #----------------------
 
     #You can alternatively provide a list of cases, which will make the ADF
@@ -245,6 +259,26 @@ diag_cam_climo:
     #    - /some/where/you/want/to/have/time_series_files
     #    - /same/or/different/place/you/want/files
 
+    #TEM diagnostics
+    #---------------
+    #TEM history file number
+    #If missing or blank, ADF will default to h4
+    #tem_hist_str:
+    #    - cam.h4
+    #    - cam.h#
+
+    #Location where TEM files are stored:
+    #NOTE: If path not specified or commented out, TEM calculation/plots will be skipped!
+    #cam_tem_loc:
+    #    - /some/where/you/want/to/have/TEM_files/
+    #    - /same/or/different/place/you/want/TEM_files/
+
+    #Overwrite TEM files, if found?
+    #If set to false, then TEM creation will be skipped if files are found:
+    #overwrite_tem:
+    #    - false
+    #    - true
+
     #----------------------
 
 
@@ -303,6 +337,21 @@ diag_cam_baseline_climo:
     #Location where time series files are (or will be) stored:
     cam_ts_loc: /glade/scratch/${user}/ADF/${diag_cam_baseline_climo.cam_case_name}/ts
 
+    #TEM diagnostics
+    #---------------
+    #TEM history file number
+    #If missing or blank, ADF will default to h4
+    tem_hist_str: cam.h4
+
+    #Location where TEM files are stored:
+    #NOTE: If path not specified or commented out, TEM calculation/plots will be skipped!
+    cam_tem_loc: /glade/scratch/${user}/${diag_cam_baseline_climo.cam_case_name}/tem/
+
+    #Overwrite TEM files, if found?
+    #If set to false, then TEM creation will be skipped if files are found:
+    overwrite_tem: false
+
+
 #This fourth set of variables provides settings for calling the Climate Variability
 # Diagnostics Package (CVDP). If cvdp_run is set to true the CVDP will be set up and
 # run in background mode, likely completing after the ADF has completed.
@@ -364,8 +413,7 @@ plotting_scripts:
     - cam_taylor_diagram
     - qbo
     #- tape_recorder
-    #- tem #To plot TEM, please un-comment fill-out
-                              #the "tem_info" section below
+    #- tem
     #- regional_map_multicase #To use this please un-comment and fill-out
                               #the "region_multicase" section below
 
@@ -403,25 +451,4 @@ diag_var_list:
 #     region_season: <NULL means use annual mean>
 #     region_variables: <list of variables to try to use; allows for a subset of the total diag variables>
 
-# 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, TEM calculation/plots will be skipped
-#    tem_loc: /glade/scratch/richling/adf-output/ADF-data/TEM/
-
-    #TEM history file number
-    #If missing or blank, ADF will default to h4
-#    hist_num: h4
-
-    #Overwrite TEM files, if found?
-    #If set to false, then TEM creation will be skipped if files are found:
-#    overwrite_tem_case: false
-
-    #For multi-case
-    #overwrite_tem_case:
-    #    - false
-    #    - true
-
-#    overwrite_tem_base: false
-
 #END OF FILE