Merge pull request #1 from NOAA-EMC/develop

Sync with the official develop
hafs-community · Oct 11, 2019 · a09e059 · a09e059
2 parents 947145c + 1b76994
commit a09e059
Show file tree

Hide file tree

Showing 66 changed files with 3,765 additions and 616 deletions.
diff --git a/driver_scripts/driver_grid.theia.sh → driver_scripts/driver_grid.hera.sh b/driver_scripts/driver_grid.theia.sh → driver_scripts/driver_grid.hera.sh
@@ -10,7 +10,7 @@
 #SBATCH -t 00:30:00
 
 #-----------------------------------------------------------------------
-# Driver script to create a cubic-sphere based model grid on Theia.
+# Driver script to create a cubic-sphere based model grid on Hera.
 #
 # Produces the following files (netcdf, each tile in separate file):
 #   1) 'mosaic' and 'grid' files containing lat/lon and other
@@ -53,10 +53,10 @@ set -x
 
 . /apps/lmod/lmod/init/sh
 module purge
-module load intel/16.1.150
-module load impi
-module load hdf5/1.8.14
-module load netcdf/4.3.0
+module load intel/18.0.5.274
+module load impi/2018.0.4
+module load hdf5/1.10.5
+module load netcdf/4.7.0
 module list
 
 #-----------------------------------------------------------------------
@@ -90,8 +90,8 @@ fi
 #-----------------------------------------------------------------------
 
 export home_dir=$SLURM_SUBMIT_DIR/..
-export TMPDIR=/scratch3/NCEPDEV/stmp1/$LOGNAME/fv3_grid.$gtype
-export out_dir=/scratch3/NCEPDEV/stmp1/$LOGNAME/C${res}
+export TMPDIR=/scratch2/NCEPDEV/stmp1/$LOGNAME/fv3_grid.$gtype
+export out_dir=/scratch2/NCEPDEV/stmp1/$LOGNAME/C${res}
 
 #-----------------------------------------------------------------------
 # Should not need to change anything below here.
@@ -101,7 +101,7 @@ export APRUN=time
 export APRUN_SFC=srun
 export OMP_NUM_THREADS=24
 export OMP_STACKSIZE=2048m
-export machine=THEIA
+export machine=HERA
 
 ulimit -a
 ulimit -s unlimited

diff --git a/modulefiles/chgres_cube.hera b/modulefiles/chgres_cube.hera
@@ -0,0 +1,23 @@
+#%Module#####################################################
+## Build module for Hera
+#############################################################
+
+module load intel/18.0.5.274
+module load impi/2018.0.4
+
+module use -a $MOD_PATH
+module load w3nco/2.0.6
+module load nemsio/2.2.3
+module load bacio/2.0.2
+module load sp/2.0.2
+module load sfcio/1.1.0
+module load sigio/2.1.0
+
+export NCEPLIBS=/scratch1/NCEPDEV/global/gwv/l819/lib
+module use -a $NCEPLIBS/modulefiles
+module load esmflocal/8_0_48b.netcdf47
+
+export FCOMP=mpiifort
+export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
+# for debugging
+#export FFLAGS="-O0 -g -traceback -r8 -i4 -qopenmp -convert big_endian -check bounds -warn unused -assume byterecl"
diff --git a/modulefiles/chgres_cube.theia b/modulefiles/chgres_cube.theia
diff --git a/modulefiles/fv3gfs/fre-nctools.theia → modulefiles/fv3gfs/fre-nctools.hera b/modulefiles/fv3gfs/fre-nctools.theia → modulefiles/fv3gfs/fre-nctools.hera
@@ -1,7 +1,9 @@
 #%Module#####################################################
 ## Module file for fre-nctools
 #############################################################
-module load intel/14.0.2
-module load impi/4.1.3.048
-module load netcdf/4.3.0
-module load hdf5/1.8.14
+
+module load intel/18.0.5.274
+module load impi/2018.0.4
+
+module load netcdf/4.7.0
+module load hdf5/1.10.5
diff --git a/modulefiles/fv3gfs/global_chgres.hera b/modulefiles/fv3gfs/global_chgres.hera
@@ -0,0 +1,29 @@
+#%Module#####################################################
+## global_chgres component - hera
+#############################################################
+
+# Loading Intel Compiler Suite
+module load intel/18.0.5.274
+module load impi/2018.0.4
+
+module load netcdf/4.7.0
+module load hdf5/1.10.5
+
+# Loding nceplibs modules
+module use -a $MOD_PATH
+module load sigio/2.1.0
+module load w3nco/2.0.6
+module load w3emc/2.3.0
+module load sp/2.0.2
+module load bacio/2.0.2
+module load nemsio/2.2.3
+module load nemsiogfs/2.2.0
+module load ip/3.0.1
+module load sfcio/1.1.0
+module load gfsio/1.1.0
+module load landsfcutil/2.1.0
+
+export NETCDF_INCLUDE="-I${NETCDF}/include"
+export NETCDF_LDFLAGS_F="-L${NETCDF}/lib -lnetcdf -lnetcdff -L${HDF5}/lib -lhdf5 -lhdf5_fortran"
+
+set FCMP ifort
diff --git a/modulefiles/fv3gfs/global_chgres.theia b/modulefiles/fv3gfs/global_chgres.theia
diff --git a/modulefiles/fv3gfs/global_chgres.wcoss b/modulefiles/fv3gfs/global_chgres.wcoss
@@ -3,7 +3,7 @@
 #############################################################
 
 # Loading Intel Compiler Suite
-module load ics/14.0.1
+module load ics/15.0.6
 
 # Loading nceplibs modules
 module load sigio/v2.1.0

diff --git a/modulefiles/fv3gfs/global_cycle.theia → modulefiles/fv3gfs/global_cycle.hera b/modulefiles/fv3gfs/global_cycle.theia → modulefiles/fv3gfs/global_cycle.hera
@@ -1,20 +1,21 @@
 #%Module#####################################################
-## global_cycle component - theia
+## global_cycle component - hera
 #############################################################
 
 # Loading Intel Compiler Suite
-module load intel/16.1.150
-module load impi
+module load intel/18.0.5.274
+module load impi/2018.0.4
 
-# Loding nceplibs modules
-module use -a /scratch3/NCEPDEV/nwprod/lib/modulefiles
-module load w3nco/v2.0.6
-module load sp/v2.0.2
-module load bacio/v2.0.1
-module load ip/v3.0.0
-module load netcdf/4.3.0
-module load hdf5/1.8.14
+module load netcdf/4.7.0
+module load hdf5/1.10.5
 export NETCDF_INCLUDE="-I${NETCDF}/include"
 export NETCDF_LDFLAGS_F="-L${NETCDF}/lib -lnetcdf -lnetcdff -L${HDF5}/lib -lhdf5 -lhdf5_fortran"
 
+# Loding nceplibs modules
+module use -a $MOD_PATH
+module load w3nco/2.0.6
+module load sp/2.0.2
+module load bacio/2.0.2
+module load ip/3.0.1
+
 export FCMP=mpiifort
diff --git a/modulefiles/fv3gfs/nst_tf_chg.theia → modulefiles/fv3gfs/nst_tf_chg.hera b/modulefiles/fv3gfs/nst_tf_chg.theia → modulefiles/fv3gfs/nst_tf_chg.hera
@@ -1,17 +1,17 @@
 #%Module#####################################################
-## gaussian_sfcanl build module for Theia
+## Build module for Hera
 #############################################################
 
 # Loading Intel Compiler Suite
-module load intel/15.1.133
+module load intel/18.0.5.274
 
 # Loding nceplibs modules
-module use -a /scratch3/NCEPDEV/nwprod/lib/modulefiles
-module load w3nco/v2.0.6
-module load bacio/v2.0.2
-module load nemsio/v2.2.3
-module load netcdf/4.3.0
-module load hdf5/1.8.14
+module use -a $MOD_PATH
+module load w3nco/2.0.6
+module load bacio/2.0.2
+module load nemsio/2.2.3
+module load netcdf/4.6.1
+module load hdf5/1.10.4
 export NETCDF_INCLUDE="-I${NETCDF}/include"
 export NETCDF_LDFLAGS_F="-L${NETCDF}/lib -lnetcdf -lnetcdff -L${HDF5}/lib -lhdf5 -lhdf5_fortran"
 

diff --git a/modulefiles/fv3gfs/orog.theia → modulefiles/fv3gfs/orog.hera b/modulefiles/fv3gfs/orog.theia → modulefiles/fv3gfs/orog.hera
@@ -2,15 +2,14 @@
 ## Module file for orog
 #############################################################
 # Loading Intel Compiler Suite
-module unload intel
-module load intel/16.1.150
+module load intel/18.0.5.274
 
-module load netcdf/4.3.0
+module load netcdf/4.7.0
 
 # Loding nceplibs modules
 module use -a $MOD_PATH
-module load ip/v2.0.0
-module load sp/v2.0.2
-module load w3emc/v2.2.0
-module load w3nco/v2.0.6
-module load bacio/v2.0.2
+module load ip/3.0.1
+module load sp/2.0.2
+module load w3emc/2.3.0
+module load w3nco/2.0.6
+module load bacio/2.0.2
diff --git a/modulefiles/module-setup.csh.inc b/modulefiles/module-setup.csh.inc
diff --git a/modulefiles/module-setup.sh.inc b/modulefiles/module-setup.sh.inc
@@ -22,8 +22,8 @@ if [[ -d /lfs3 ]] ; then
         source /apps/lmod/lmod/init/$__ms_shell
     fi
     module purge
-elif [[ -d /scratch3 ]] ; then
-    # We are on NOAA Theia
+elif [[ -d /scratch1 ]] ; then
+    # We are on NOAA Hera
     if ( ! eval module help > /dev/null 2>&1 ) ; then
         source /apps/lmod/lmod/init/$__ms_shell
     fi

diff --git a/modulefiles/module_base.hera b/modulefiles/module_base.hera
@@ -0,0 +1,11 @@
+#%Module######################################################################
+##
+##      FV3GFS prerequisites
+##
+
+module load intel/18.0.5.274
+module load impi/2018.0.4
+module load hpss/hpss
+module load netcdf/4.7.0
+module load nco/4.7.0
+module load hdf5/1.10.5
diff --git a/modulefiles/module_base.theia b/modulefiles/module_base.theia