fixed a few issues with merge

bitterbark · Jun 28, 2024 · 78de938 · 78de938
1 parent 94bfecb
commit 78de938
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/config_amwg_default_plots.yaml b/config_amwg_default_plots.yaml
@@ -328,7 +328,7 @@ diag_mdtf_info:
 
     mdtf_codebase_path : /glade/campaign/cgd/amp/amwg/mdtf                                                                                                                                 
     mdtf_codebase_loc  : ${mdtf_codebase_path}/MDTF-diagnostics.v3.1.20230817.ADF
-    conda_root         : ${mdtf_codebase_path}/miniconda2
+    conda_root         : /glade/u/apps/opt/conda
     conda_env_root     : ${mdtf_codebase_path}/miniconda2/envs.MDTFv3.1.20230412/
     OBS_DATA_ROOT      : ${mdtf_codebase_path}/obs_data
 

diff --git a/config_cam_baseline_example.yaml b/config_cam_baseline_example.yaml
@@ -413,7 +413,7 @@ diag_mdtf_info:
 
     mdtf_codebase_path : /glade/campaign/cgd/amp/amwg/mdtf                                                                                                                                 
     mdtf_codebase_loc  : ${mdtf_codebase_path}/MDTF-diagnostics.v3.1.20230817.ADF
-    conda_root         : ${mdtf_codebase_path}/miniconda2
+    conda_root         : /glade/u/apps/opt/conda
     conda_env_root     : ${mdtf_codebase_path}/miniconda2/envs.MDTFv3.1.20230412/
     OBS_DATA_ROOT      : ${mdtf_codebase_path}/obs_data
 

diff --git a/lib/adf_info.py b/lib/adf_info.py
@@ -124,15 +124,14 @@ def __init__(self, config_file, debug=False):
                 self.__cam_climo_info[conf_var] = [conf_val]
             #End if
         #End for
-        #-------------------------------------------
 
-        #Read hist_str (component.hist_num) from the yaml file, or set to default
-        hist_str = self.__cam_climo_info('hist_str')
-        #If hist_str is not present, then default to 'cam.h0a':
+        #If hist_str (component.hist_num) was not in yaml file, set to default
+        hist_str = self.__cam_climo_info['hist_str']
         if not hist_str:
             hist_str = [['cam.h0a']]*self.__num_cases
         #End if
-        self.__hist_str = hist_str
+
+        #-------------------------------------------
 
         #Initialize ADF variable list:
         self.__diag_var_list = self.read_config_var('diag_var_list', required=True)
@@ -338,7 +337,7 @@ def __init__(self, config_file, debug=False):
         cam_hist_locs = self.get_cam_info('cam_hist_loc')
 
         # Read hist_str (component.hist_num, eg cam.h0) from the yaml file
-        cam_hist_str = self.__hist_str
+        cam_hist_str = self.get_cam_info('hist_str')
 
         #Check if using pre-made ts files
         cam_ts_done   = self.get_cam_info("cam_ts_done")