Merge branch 'master' of https://github.com/bertinia/CESM_postprocessing

Author: bertinia

Machines/cheyenne_modules

@@ -3,7 +3,8 @@
 echo "Python boot-strap modules for machine cheyenne"
 
 module load python/2.7.16
-module load intel/17.0.1
+##module load intel/17.0.1
+module load gnu/8.3.0
 module load ncarenv
 module load ncarcompilers
 module load mpt/2.19

Machines/machine_postprocess.xml

@@ -132,16 +132,16 @@
     <pythonpath></pythonpath>
     <f2py fcompiler="intelem" f77exec="/glade/u/apps/ch/opt/ncarcompilers/0.4.1/mpi/ifort">f2py</f2py>
     <za>
-      <compiler>ifort</compiler>
+      <compiler>gfortran</compiler>
       <flags>-c -g -O2</flags>
-      <include>-I/glade/u/apps/ch/opt/netcdf/4.6.1/intel/17.0.1/include</include>
-      <libs>-L/glade/u/apps/ch/opt/netcdf/4.6.1/intel/17.0.1/lib -lnetcdff -lnetcdf</libs>
+      <include>-I/glade/u/apps/ch/opt/netcdf/4.6.3/gnu/8.3.0/include</include>
+      <libs>-L/glade/u/apps/ch/opt/netcdf/4.6.3/gnu/8.3.0/lib -lnetcdff -lnetcdf</libs>
     </za>
     <reset_modules>
       <module>module purge</module>
     </reset_modules>
     <modules>
-      <module>module load intel/17.0.1</module>
+      <module>module load gnu/8.3.0</module>
       <module>module load ncarenv</module>
       <module>module load ncarcompilers</module>
       <module>module load mpt/2.19</module>

Tools/ration_script

@@ -23,8 +23,7 @@ pwd
 . activate
 
 ## load the boot-strap modules
-##module load python/2.7.14
-module load intel/17.0.1
+module load gnu/8.3.0
 module load ncarenv
 module load ncarcompilers
 module load mpt/2.19

diagnostics/diagnostics/ocn/ocn_remap_generator.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# This wrapper script calls the ocean_remap class to remap CESM CMIP6 conformed variables
+# on the native 1-degree Greenland displace pole grid (gx1v7) to a regular lat-lon grid.
 
 from __future__ import print_function
 import sys
@@ -20,7 +22,7 @@
 from cesm_utils import cesmEnvLib
 from diag_utils import diagUtilsLib
 
-import ocean_remap as remap
+from ocean_remap import ocean_remap as remap
 
 
 #=====================================================

timeseries/timeseries/cesm_tseries_generator.py

@@ -70,7 +70,7 @@ def commandline_options():
         err_msg = 'cesm_tseries_generator.py ERROR: invalid option --caseroot {0}'.format(options.caseroot[0])
         raise OSError(err_msg)
 
-    return options.caseroot[0], options.debug, options.standalone, options.backtrace
+    return options.caseroot[0], options.debug[0], options.standalone, options.backtrace
 
 #==============================================================================================
 # readArchiveXML - read the $CASEROOT/env_timeseries.xml file and build the pyReshaper classes