update esmf lib for some machines (#38)

* address CFP machine checks, jlogfile, compath * address CFP machine checks on gldas_forcing.sh * use ftn to replace mpifort on wcoss2 * addressed the requested changes from NCO * fixed the issue for other than machines * update esmf lib for some machines * fix_for_other_machines Co-authored-by: Helin Wei <[email protected]> Co-authored-by: Helin Wei <[email protected]>
NOAA-EMC · Jan 28, 2022 · 42af7c5 · 42af7c5
1 parent b429d75
commit 42af7c5
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 68 deletions.
diff --git a/modulefiles/gdas2gldas.jet b/modulefiles/gdas2gldas.jet
@@ -14,7 +14,4 @@ module load sp/2.3.3
 
 module load netcdf/4.7.4
 module load hdf5/1.10.6
-module load esmf/8_1_1
-
-export FCOMP=mpiifort
-export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
+module load esmf/8_2_0_beta_snapshot_14
diff --git a/modulefiles/gdas2gldas.orion b/modulefiles/gdas2gldas.orion
@@ -13,7 +13,4 @@ module load bacio/2.4.1
 module load sp/2.3.3
 
 module load netcdf/4.7.4
-module load esmf/8.1.1 
-
-export FCOMP=mpiifort
-export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
+module load esmf/8_2_0_beta_snapshot_14
diff --git a/modulefiles/gdas2gldas.s4 b/modulefiles/gdas2gldas.s4
@@ -16,6 +16,3 @@ module load sp/2.3.3
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load esmf/8_1_1
-
-export FCOMP=mpiifort
-export FFLAGS="-march=ivybridge -O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
diff --git a/modulefiles/gdas2gldas.wcoss_cray b/modulefiles/gdas2gldas.wcoss_cray
@@ -18,6 +18,3 @@ module load w3nco-intel/2.2.0
 module load nemsio-intel/2.2.4
 module load bacio-intel/2.0.3
 module load sp-intel/2.0.3
-
-export FCOMP=ftn
-export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
diff --git a/modulefiles/gldas2gdas.jet b/modulefiles/gldas2gdas.jet
@@ -14,7 +14,4 @@ module load sp/2.3.3
 
 module load netcdf/4.7.4
 module load hdf5/1.10.6
-module load esmf/8_1_1
-
-export FCOMP=mpiifort
-export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
+module load esmf/8_2_0_beta_snapshot_14
diff --git a/modulefiles/gldas2gdas.orion b/modulefiles/gldas2gdas.orion
@@ -13,7 +13,4 @@ module load bacio/2.4.1
 module load sp/2.3.3
 
 module load netcdf/4.7.4
-module load esmf/8.1.1 
-
-export FCOMP=mpiifort
-export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
+module load esmf/8_2_0_beta_snapshot_14
diff --git a/modulefiles/gldas2gdas.s4 b/modulefiles/gldas2gdas.s4
@@ -16,6 +16,3 @@ module load sp/2.3.3
 module load hdf5/1.10.6
 module load netcdf/4.7.4
 module load esmf/8_1_1
-
-export FCOMP=mpiifort
-export FFLAGS="-march=ivybridge -O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
diff --git a/modulefiles/gldas2gdas.wcoss_cray b/modulefiles/gldas2gdas.wcoss_cray
@@ -18,6 +18,3 @@ module load w3nco-intel/2.2.0
 module load nemsio-intel/2.2.4
 module load bacio-intel/2.0.3
 module load sp-intel/2.0.3
-
-export FCOMP=ftn
-export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
diff --git a/modulefiles/gldas_forcing.jet b/modulefiles/gldas_forcing.jet
@@ -8,6 +8,3 @@ module load hpc-intel/18.0.5.274
 
 module load w3nco/2.4.1
 module load bacio/2.4.1
-
-export FC=ifort
-export FOPTS="-O0 -FR"
diff --git a/modulefiles/gldas_forcing.orion b/modulefiles/gldas_forcing.orion
@@ -8,6 +8,3 @@ module load hpc-intel/2018.4
 
 module load w3nco/2.4.1
 module load bacio/2.4.1
-
-export FC=ifort
-export FOPTS="-O0 -FR"
diff --git a/modulefiles/gldas_forcing.s4 b/modulefiles/gldas_forcing.s4
@@ -10,6 +10,3 @@ module load hpc-impi/18.0.4
 
 module load w3nco/2.4.1
 module load bacio/2.4.1
-
-export FC=ifort
-export FOPTS="-march=ivybridge -O0 -FR"
diff --git a/modulefiles/gldas_forcing.wcoss_cray b/modulefiles/gldas_forcing.wcoss_cray
@@ -7,6 +7,3 @@ module load craype-haswell
 
 module load w3nco-intel/2.2.0
 module load bacio-intel/2.0.3
-
-export FC=ftn
-export FOPTS="-O0 -FR"
diff --git a/modulefiles/gldas_post.jet b/modulefiles/gldas_post.jet
@@ -11,6 +11,3 @@ module load w3nco/2.4.1
 module load w3emc/2.7.3
 module load bacio/2.4.1
 module load nemsio/2.5.2
-
-export FC=ifort
-export FOPTS='-O -FR -I$(NEMSIO_INC) -convert big_endian'
diff --git a/modulefiles/gldas_post.orion b/modulefiles/gldas_post.orion
@@ -11,5 +11,3 @@ module load w3nco/2.4.1
 module load bacio/2.4.1
 module load nemsio/2.5.2
 
-export FC=ifort
-export FOPTS='-O -FR -I$(NEMSIO_INC) -convert big_endian'
diff --git a/modulefiles/gldas_post.s4 b/modulefiles/gldas_post.s4
@@ -12,6 +12,3 @@ module load w3nco/2.4.1
 module load w3emc/2.7.3
 module load bacio/2.4.1
 module load nemsio/2.5.2
-
-export FC=ifort
-export FOPTS='-march=ivybridge -O -FR -I$(NEMSIO_INC) -convert big_endian'
diff --git a/modulefiles/gldas_post.wcoss_cray b/modulefiles/gldas_post.wcoss_cray
@@ -9,6 +9,3 @@ module load w3nco-intel/2.2.0
 module load w3emc-intel/2.4.0
 module load bacio-intel/2.0.3
 module load nemsio-intel/2.2.4
-
-export FC=ftn
-export FOPTS='-O -FR -I$(NEMSIO_INC) -convert big_endian'
diff --git a/modulefiles/gldas_rst.jet b/modulefiles/gldas_rst.jet
@@ -11,6 +11,3 @@ module load w3nco/2.4.1
 module load w3emc/2.7.3
 module load bacio/2.4.1
 module load nemsio/2.5.2
-
-export FC=ifort
-export FOPTS='-O -FR -I$(NEMSIO_INC) -convert big_endian'
diff --git a/modulefiles/gldas_rst.orion b/modulefiles/gldas_rst.orion
@@ -10,6 +10,3 @@ module load hpc-impi/2018.4
 module load w3nco/2.4.1
 module load bacio/2.4.1
 module load nemsio/2.5.2
-
-export FC=ifort
-export FOPTS='-O -FR -I$(NEMSIO_INC) -convert big_endian'
diff --git a/modulefiles/gldas_rst.s4 b/modulefiles/gldas_rst.s4
@@ -12,6 +12,3 @@ module load w3nco/2.4.1
 module load w3emc/2.7.3
 module load bacio/2.4.1
 module load nemsio/2.5.2
-
-export FC=ifort
-export FOPTS='-march=ivybridge -O -FR -I$(NEMSIO_INC) -convert big_endian'
diff --git a/modulefiles/gldas_rst.wcoss_cray b/modulefiles/gldas_rst.wcoss_cray
@@ -9,6 +9,3 @@ module load w3nco-intel/2.2.0
 module load w3emc-intel/2.4.0
 module load bacio-intel/2.0.3
 module load nemsio-intel/2.2.4
-
-export FC=ftn
-export FOPTS='-O -FR -I$(NEMSIO_INC) -convert big_endian'
diff --git a/sorc/build_gdas2gldas.sh b/sorc/build_gdas2gldas.sh
@@ -46,7 +46,13 @@ elif [ $target = wcoss_dell_p3 ]; then
 else
    export FCOMP=mpiifort
 fi
-export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
+
+if [ $target = s4 ]; then
+   export FFLAGS="-march=ivybridge -O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
+else
+   export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
+fi
+
 
 make clean
 make

diff --git a/sorc/build_gldas2gdas.sh b/sorc/build_gldas2gdas.sh
@@ -46,7 +46,13 @@ elif [ $target = wcoss_dell_p3 ]; then
 else
    export FCOMP=mpiifort
 fi
-export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
+
+if [ $target = s4 ]; then
+   export FFLAGS="-march=ivybridge -O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
+else
+   export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
+fi
+
 
 make clean
 make

diff --git a/sorc/build_gldas_forcing.sh b/sorc/build_gldas_forcing.sh
@@ -44,7 +44,12 @@ elif [ $target = wcoss_cray ]; then
 else
    export FC=ifort
 fi
+
+if [ $target = s4 ]; then
+export FOPTS="-march=ivybridge -O0 -FR"
+else
 export FOPTS="-O0 -FR"
+fi
 
 make clean
 make

diff --git a/sorc/build_gldas_post.sh b/sorc/build_gldas_post.sh
@@ -41,7 +41,12 @@ elif [ $target = wcoss_cray ]; then
 else
    export FC=ifort
 fi
+
+if [ $target = s4 ]; then
+export FOPTS='-march=ivybridge -O -FR -I$(NEMSIO_INC) -convert big_endian'
+else
 export FOPTS='-O -FR -I$(NEMSIO_INC) -convert big_endian'
+fi
 
 make clean
 make

diff --git a/sorc/build_gldas_rst.sh b/sorc/build_gldas_rst.sh
@@ -41,7 +41,12 @@ elif [ $target = wcoss_cray ]; then
 else
    export FC=ifort
 fi
+
+if [ $target = s4 ]; then
+export FOPTS='-march=ivybridge -O -FR -I$(NEMSIO_INC) -convert big_endian'
+else
 export FOPTS='-O -FR -I$(NEMSIO_INC) -convert big_endian'
+fi
 
 make clean
 make

diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh
@@ -53,17 +53,17 @@ elif [[ -d /gpfs/hps && -e /etc/SuSE-release ]] ; then
     fi
     target=wcoss_cray
 
-    # Silence the "module reset" to avoid the expected error messages
+    # Silence the "module purge" to avoid the expected error messages
     # related to modules that load modules.
-    module reset > /dev/null 2>&1
+    module purge > /dev/null 2>&1
     module use /usrx/local/prod/modulefiles
     module use /gpfs/hps/nco/ops/nwprod/lib/modulefiles
     module use /gpfs/hps/nco/ops/nwprod/modulefiles
     module use /opt/cray/alt-modulefiles
     module use /opt/cray/craype/default/alt-modulefiles
     module use /opt/cray/ari/modulefiles
     module use /opt/modulefiles
-    module reset > /dev/null 2>&1
+    module purge > /dev/null 2>&1
 
     # Workaround until module issues are fixed:
     #unset _LMFILES_
@@ -88,6 +88,7 @@ elif [[ -L /usrx && "$( readlink /usrx 2> /dev/null )" =~ dell ]] ; then
     target=wcoss_dell_p3
     module purge
 
+
 elif [[ -d /lfs/h2 ]] ; then
     # We are on NOAA Cactus or Dogwood
     if ( ! eval module help > /dev/null 2>&1 ) ; then