Merge pull request #84 from bertinia/master

bug fix for ocn_diag_generator; update config default settings
NCAR · May 18, 2017 · 318579f · 318579f
2 parents acbeb85 + 27058e2
commit 318579f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,9 +21,10 @@ cesm-env2/
 *.mod
 *.so
 
-# Ignore zonal average binary and link
+# Ignore zonal average binary, makefile and link
 ocn_diag/tool_lib/za
 ocn_diag/tool_lib/zon_avg/za
+ocn_diag/tool_lib/zon_avg/makefile
 
 # ignore any .svn files
 .svn*
diff --git a/Config/config_postprocess.xml b/Config/config_postprocess.xml
@@ -110,7 +110,7 @@
 
     <group name="postprocess">
       <order>1</order>
-      <comment>Environment variable settings to control postprocessing tasks.</comment>
+      <comment>Environment variable settings to control postprocessing tasks. These variables are used by the cylc workflow manager and the copy_html utility.</comment>
 
       <entry id="POSTPROCESS_VIRTUALENV" 
 	     type="string"
@@ -163,71 +163,71 @@
       <entry id="GENERATE_AVGS_ATM"  
 	     type="logical"
 	     valid_values="TRUE,FALSE"  
-	     value="FALSE" 
+	     value="TRUE" 
 	     group="postprocess"
 	     desc="If TRUE, this calls the atm_averages script which launches the parallel python wrapper script atm_avg_generator.py to generate climatological files using the pyAverager tool. Settings for creating the averages are specified in the env_diags_atm.xml file."
 	     ></entry> 
 
       <entry id="GENERATE_DIAGS_ATM"  
 	     type="logical"
 	     valid_values="TRUE,FALSE"  
-	     value="FALSE" 
+	     value="TRUE" 
 	     group="postprocess"
 	     desc="If TRUE, this calls the atm_diagnostics script with launches the  AMWG diagnostics package parallel python wrapper script atm_diags_generator.py to generate climatological plots associated with the run job output. See the AMWG diagnostics documentation for more details. Settings for creating the diagnostics are specified in the env_diags_atm.xml file."
 	     ></entry> 
 
       <entry id="GENERATE_AVGS_ICE"  
 	     type="logical"
 	     valid_values="TRUE,FALSE"  
-	     value="FALSE" 
+	     value="TRUE" 
 	     group="postprocess"
 	     desc="If TRUE, this calls the ice_averages script which launches the parallel python wrapper script ice_avg_generator.py to generate climatological files using the pyAverager tool. Settings for creating the averages are specified in the env_diags_ice.xml file."
 	     ></entry> 
 
       <entry id="GENERATE_DIAGS_ICE"  
 	     type="logical"
 	     valid_values="TRUE,FALSE"  
-	     value="FALSE" 
+	     value="TRUE" 
 	     group="postprocess"
 	     desc="If TRUE, this calls the ice_diagnostics script which launches the PCWG diagnostics package parallel python wrapper script ice_diags_generator.py to generate climatological plots associated with the run job output. See the PCWG diagnostics documentation for more details. Settings for creating the diagnostics are specified in the env_diags_ice.xml file."
 	     ></entry> 
 
       <entry id="GENERATE_AVGS_LND"  
 	     type="logical"
 	     valid_values="TRUE,FALSE"  
-	     value="FALSE" 
+	     value="TRUE" 
 	     group="postprocess"
 	     desc="If TRUE, this calls the lnd_averages script which launches the parallel python wrapper script lnd_avg_generator.py to generate climatological files using the pyAverager tool. Settings for creating the averages are specified in the env_diags_lnd.xml file."
 	     ></entry> 
 
       <entry id="GENERATE_REGRID_LND"  
 	     type="logical"
 	     valid_values="TRUE,FALSE"  
-	     value="FALSE" 
+	     value="TRUE" 
 	     group="postprocess"
 	     desc="If TRUE, this calls the lnd_regrid script which launches the parallel python wrapper script lnd_regrid_generator.py to regrid climatological files in parallel. Settings for creating the regridded files are specified in the env_diags_lnd.xml file."
 	     ></entry> 
 
       <entry id="GENERATE_DIAGS_LND"  
 	     type="logical"
 	     valid_values="TRUE,FALSE"  
-	     value="FALSE" 
+	     value="TRUE" 
 	     group="postprocess"
 	     desc="If TRUE, this calls the lnd_diagnostics script which launches the LMWG diagnostics package parallel python wrapper script lnd_diags_generator.py to generate climatological plots associated with the run job output. See the LMWG diagnostics documentation for more details. Settings for creating the diagnostics are specified in the env_diags_lnd.xml file."
 	     ></entry> 
 
       <entry id="GENERATE_AVGS_OCN"  
 	     type="logical"
 	     valid_values="TRUE,FALSE"  
-	     value="FALSE" 
+	     value="TRUE" 
 	     group="postprocess"
 	     desc="If TRUE, this calls the ocn_averages script which launches the parallel python wrapper script ocn_avg_generator.py to generate climatological files using the pyAverager tool. Settings for creating the averages are specified in the env_diags_ocn.xml file."
 	     ></entry> 
 
       <entry id="GENERATE_DIAGS_OCN" 
 	     type="logical"
 	     valid_values="TRUE,FALSE"  
-	     value="FALSE" 
+	     value="TRUE" 
 	     group="postprocess"
 	     desc="If TRUE, this calls the OMWG diagnostics package parallel python wrapper script to generate climatological plots associated with the run job output. See the OMWG diagnostics documentation for more details. Settings for creating the diagnostics are specified in the env_diags_ocn.xml file."
 	     ></entry> 

diff --git a/diagnostics/diagnostics/ocn/Config/config_diags_ocn.xml b/diagnostics/diagnostics/ocn/Config/config_diags_ocn.xml
@@ -685,15 +685,15 @@ Applies to both model and control cases."
       <entry id="OCNDIAG_CPLLOGFILEPATH"
 	     type="char"
 	     valid_values=""
-	     value="$DOUT_S_ROOT/cpl/logs"
+	     value="$DOUT_S_ROOT/logs"
 	     group="timeseries_options"
 	     desc="Local machine directory for cpl log files"
 	     ></entry>
 
       <entry id="OCNDIAG_OCNLOGFILEPATH"
 	     type="char"
 	     valid_values=""
-	     value="$DOUT_S_ROOT/ocn/logs"
+	     value="$DOUT_S_ROOT/logs"
 	     group="timeseries_options"
 	     desc="Local machine directory for ocn log files"
 	     ></entry>

diff --git a/diagnostics/diagnostics/ocn/ocn_diags_generator.py b/diagnostics/diagnostics/ocn/ocn_diags_generator.py
@@ -244,7 +244,7 @@ def main(options, main_comm, debugMsg):
             os.makedirs(envDict['WORKDIR'])
         except OSError as exception:
             if exception.errno != errno.EEXIST:
-                err_msg = 'ERROR: {0} problem accessing the working directory {1}'.format(envDict['WORKDIR'])
+                err_msg = 'ERROR: ocn_diags_generator.py problem accessing the working directory {0}'.format(envDict['WORKDIR'])
                 raise OSError(err_msg)
 
         debugMsg('Ocean diagnostics - Creating main index.html page', header=True, verbosity=2)