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

abishekg7 · Jul 30, 2019 · ed3e590 · ed3e590
2 parents 6a63a80 + bcaa6d7
commit ed3e590
Show file tree

Hide file tree

Showing 49 changed files with 2,391 additions and 520 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,13 +14,15 @@ ilamb/ilamb
 reshaper/pyReshaper
 conformer/conformer
 mpi_utils/pyTools
+ocean_remap/ocean_remap
 
 # Ignore python build and dist dirs
 cesm_utils/dist/
 conform/dist/
 diag_utils/dist/
 diagnostics/dist/
 timeseries/dist/
+ocean_remap/dist/
 
 cesm_utils/build/
 conform/build/

diff --git a/Config/config_timeseries.xml b/Config/config_timeseries.xml
@@ -141,71 +141,71 @@
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>month_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>1000</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h1.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>month_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h2.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>month_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h3.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>day_365</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h4.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>day_365</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h5.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>day_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h6.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>day_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h7.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>hour_3</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h8.[0-9]">
         <subdir>hist</subdir>
         <tseries_create>FALSE</tseries_create>
         <tseries_output_format>netcdf4c</tseries_output_format>
         <tseries_tper>day_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
     </files>
     <tseries_time_variant_variables>
@@ -219,16 +219,6 @@
       <variable>time_bounds</variable>
       <variable>time_written</variable>
     </tseries_time_variant_variables>
-    <tseries_exclude_variables>
-      <variable>HKSAT</variable>
-      <variable>ZLAKE</variable>
-      <variable>DZLAKE</variable>
-      <variable>BSW</variable>
-      <variable>SUCSAT</variable>
-      <variable>ZSOI</variable>
-      <variable>DZSOI</variable>
-      <variable>WATSAT</variable>
-    </tseries_exclude_variables>
   </comp_archive_spec>
 
   <comp_archive_spec name="rtm">
@@ -242,31 +232,31 @@
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>month_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>1000</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h1.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>day_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h2.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>hour_6</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h3.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>hour_3</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
     </files>
     <tseries_time_variant_variables>
@@ -293,31 +283,31 @@
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>month_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>1000</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h1.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>day_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h2.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>hour_6</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h3.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>hour_3</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
     </files>
     <tseries_time_variant_variables>
@@ -344,15 +334,15 @@
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>month_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>1000</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h1.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>day_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
     </files>
     <tseries_time_variant_variables>
@@ -372,47 +362,47 @@
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>month_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>1000</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h.nday1.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>day_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h.nyear1.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>year_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h.ecosys.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>month_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>1000</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h.ecosys.nyear1.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>year_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>1000</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h.ecosys.nday1.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>day_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>100</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
     </files>
     <tseries_time_variant_variables>
@@ -432,15 +422,15 @@
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>year_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>1000</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
       <file_extension suffix=".h1.[0-9]">      
 	<subdir>hist</subdir> 
 	<tseries_create>FALSE</tseries_create>
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>month_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>1000</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
     </files>
     <tseries_time_variant_variables>
@@ -459,7 +449,7 @@
 	<tseries_output_format>netcdf4c</tseries_output_format>
 	<tseries_tper>month_1</tseries_tper>
         <tseries_filecat_tper>years</tseries_filecat_tper>
-        <tseries_filecat_n>1000</tseries_filecat_n>
+        <tseries_filecat_n>50</tseries_filecat_n>
       </file_extension>
     </files>
   </comp_archive_spec>

diff --git a/Externals.cfg b/Externals.cfg
@@ -13,7 +13,7 @@ local_path = reshaper/pyReshaper
 required = True
 
 [PyConform]
-tag = PyConform-0.2.5
+tag = PyConform-0.2.8
 protocol = git
 repo_url = https://github.com/NCAR/PyConform.git
 local_path = conformer/conformer
@@ -33,6 +33,13 @@ repo_url = https://bitbucket.org/ncollier/ilamb
 local_path = ilamb/ilamb
 required = True
 
+[ocean_remap]
+tag = master
+protocol = git
+repo_url = https://github.com/bertinia/ocean_remap
+local_path = ocean_remap/ocean_remap
+required = True
+
 [externals_description]
 schema_version = 1.0.0
 
diff --git a/Machines/cheyenne_modules b/Machines/cheyenne_modules
@@ -2,18 +2,19 @@
 
 echo "Python boot-strap modules for machine cheyenne"
 
-module load python/2.7.14
-module load intel/17.0.1
+module load python/2.7.16
+##module load intel/17.0.1
+module load gnu/8.3.0
 module load ncarenv
 module load ncarcompilers
 module load mpt/2.19
-module load netcdf/4.6.1
-module load nco/4.7.4
-module load ncl/6.4.0
+module load netcdf/4.6.3
+module load nco/4.7.9
+module load ncl/6.6.2
 
 # clone the ncat virtualenv first with helper script ncar_pylib
 # use "ncar_pylib --help" to see all options
-ncar_pylib -c 20181024 ${pp_dir}/cesm-env2
+ncar_pylib -c 20190627 ${pp_dir}/cesm-env2
 
 export PYTHONPATH=${pp_dir}/cesm-env2/lib/python2.7/site-packages
 

diff --git a/Machines/dav_modules b/Machines/dav_modules
@@ -2,18 +2,18 @@
 
 echo "Python boot-strap modules for NCAR DAV"
 
-module load python/2.7.14
+module load python/2.7.15
 module load intel/17.0.1
 module load ncarenv
 module load ncarcompilers
 module load impi
 module load netcdf/4.6.1
 module load nco/4.7.4
-module load ncl/6.4.0
+module load ncl/6.6.2
 
 # clone the ncat virtualenv first with helper script ncar_pylib
 # use "ncar_pylib --help" to see all options
-ncar_pylib -c 20181029 ${pp_dir}/cesm-env2
+ncar_pylib -c 20190718 ${pp_dir}/cesm-env2
 
 export PYTHONPATH=${pp_dir}/cesm-env2/lib/python2.7/site-packages