feature/hera_port This commit references #1.

Update 'emcsfc' and 'sfc_climo_gen' build for Hera.

Add better logic to 'machine-setup.sh' to determine if on Hera.

modulefiles/modulefile.global_emcsfc_ice_blend.hera

@@ -0,0 +1,20 @@
+#%Module#####################################################
+## emcsfc_ice_blend build module for Hera
+#############################################################
+
+module load intel/18.0.5.274
+export FCOMP=ifort
+export FFLAGS="-O0 -i4"
+
+# load ncep library modules
+
+module use -a $MOD_PATH
+module load w3nco/2.0.6
+module load bacio/2.0.2
+
+export NCEPLIBS=/scratch1/NCEPDEV/global/gwv/l819/lib
+module use -a $NCEPLIBS/modulefiles
+module load jasper-intel-sandybridge/1.900.1
+module load zlib-intel-sandybridge/1.2.7
+module load png-intel-sandybridge/1.2.59
+module load g2-intel-sandybridge/2.5.0

modulefiles/modulefile.global_emcsfc_snow2mdl.hera

@@ -0,0 +1,26 @@
+#%Module#####################################################
+## emcsfc_snow2mdl build module for Hera
+#############################################################
+
+# load intel compiler
+
+module load intel/18.0.5.274
+
+# load ncep library modules
+
+module use -a $MOD_PATH
+module load ip/3.0.1
+module load sp/2.0.2
+module load w3nco/2.0.6
+module load bacio/2.0.2
+module load landsfcutil/2.1.0
+
+export NCEPLIBS=/scratch1/NCEPDEV/global/gwv/l819/lib
+module use -a $NCEPLIBS/modulefiles
+module load jasper-intel-sandybridge/1.900.1
+module load zlib-intel-sandybridge/1.2.7
+module load png-intel-sandybridge/1.2.59
+module load g2-intel-sandybridge/2.5.0
+
+export FCOMP=ifort
+export FFLAGS="-O0 -r8 -i4 -FR -I${IP_INCd} -qopenmp -convert big_endian -assume byterecl"

modulefiles/modulefile.sfc_climo_gen.theia → modulefiles/modulefile.sfc_climo_gen.hera

@@ -1,12 +1,13 @@
 #%Module#####################################################
-## Module file for sfc_climo_gen
+## Module file for sfc_climo_gen (Hera)
 #############################################################
 
-module load intel/15.1.133
-module load impi/5.1.1.109
-module load netcdf/4.3.0
-module use /scratch4/NCEPDEV/nems/noscrub/emc.nemspara/soft/modulefiles
+module load intel/18.0.5.274
+module load impi/2018.0.4
 module load esmf/7.1.0r
 
+module use -a $MOD_PATH
+module load netcdf/4.6.1
+
 export FCOMP=mpiifort
 export FFLAGS="-O3 -fp-model=precise -g -traceback -r8 -i4 -convert big_endian"

sorc/build_emcsfc.sh

@@ -14,6 +14,7 @@ do
   module purge
   USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"}
   if [ $USE_PREINST_LIBS = true ]; then
+    export MOD_PATH
     source ../modulefiles/modulefile.global_${prog}.${target}             > /dev/null 2>&1
   else
     export MOD_PATH=${cwd}/lib/modulefiles

sorc/build_sfc_climo_gen.sh

@@ -12,6 +12,7 @@ fi
 module purge
 USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"}
 if [ $USE_PREINST_LIBS = true ]; then
+  export MOD_PATH
   source ../modulefiles/modulefile.sfc_climo_gen.${target}             > /dev/null 2>&1
 else
   export MOD_PATH=${cwd}/lib/modulefiles

sorc/machine-setup.sh

@@ -28,7 +28,7 @@ if [[ -d /lfs3 ]] ; then
     target=jet
     module purge
     module use /mnt/lfs3/projects/hfv3gfs/nwprod/lib/modulefiles
-elif [[ -d /scratch1 ]] ; then
+elif [[ `hostname -a` == *"hera.fairmont.rdhpcs.noaa.gov"* ]] ; then
     # We are on NOAA Hera
     if ( ! eval module help > /dev/null 2>&1 ) ; then
 	echo load the module command 1>&2