From df7a52f04fb6b571931926f7996d4e3bb9502e3e Mon Sep 17 00:00:00 2001 From: HelinWei-NOAA <48133472+HelinWei-NOAA@users.noreply.github.com> Date: Thu, 27 Jan 2022 01:21:37 -0500 Subject: [PATCH] Fix for other machines (#37) * 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 Co-authored-by: Helin Wei Co-authored-by: Helin Wei --- modulefiles/gdas2gldas.hera | 5 +---- modulefiles/gdas2gldas.wcoss_dell_p3 | 5 +---- modulefiles/gldas2gdas.hera | 5 +---- modulefiles/gldas2gdas.wcoss_dell_p3 | 5 +---- modulefiles/gldas_forcing.hera | 3 --- modulefiles/gldas_forcing.wcoss_dell_p3 | 3 --- modulefiles/gldas_post.hera | 3 --- modulefiles/gldas_post.wcoss_dell_p3 | 3 --- modulefiles/gldas_rst.hera | 3 --- modulefiles/gldas_rst.wcoss_dell_p3 | 3 --- sorc/build_gdas2gldas.sh | 14 +++++++++++++- sorc/build_gldas2gdas.sh | 14 +++++++++++++- sorc/build_gldas_forcing.sh | 12 +++++++++++- sorc/build_gldas_model.sh | 4 ++++ sorc/build_gldas_post.sh | 12 +++++++++++- sorc/build_gldas_rst.sh | 12 +++++++++++- 16 files changed, 67 insertions(+), 39 deletions(-) diff --git a/modulefiles/gdas2gldas.hera b/modulefiles/gdas2gldas.hera index cbad332..4e87c2f 100644 --- a/modulefiles/gdas2gldas.hera +++ b/modulefiles/gdas2gldas.hera @@ -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_1_1 diff --git a/modulefiles/gdas2gldas.wcoss_dell_p3 b/modulefiles/gdas2gldas.wcoss_dell_p3 index 03d226d..4ffce0f 100644 --- a/modulefiles/gdas2gldas.wcoss_dell_p3 +++ b/modulefiles/gdas2gldas.wcoss_dell_p3 @@ -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=mpif90 -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.hera b/modulefiles/gldas2gdas.hera index cbad332..4e87c2f 100644 --- a/modulefiles/gldas2gdas.hera +++ b/modulefiles/gldas2gdas.hera @@ -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_1_1 diff --git a/modulefiles/gldas2gdas.wcoss_dell_p3 b/modulefiles/gldas2gdas.wcoss_dell_p3 index 03d226d..4ffce0f 100644 --- a/modulefiles/gldas2gdas.wcoss_dell_p3 +++ b/modulefiles/gldas2gdas.wcoss_dell_p3 @@ -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=mpif90 -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/gldas_forcing.hera b/modulefiles/gldas_forcing.hera index 0471efa..62d8c0c 100644 --- a/modulefiles/gldas_forcing.hera +++ b/modulefiles/gldas_forcing.hera @@ -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.wcoss_dell_p3 b/modulefiles/gldas_forcing.wcoss_dell_p3 index dc34a94..f08d65c 100644 --- a/modulefiles/gldas_forcing.wcoss_dell_p3 +++ b/modulefiles/gldas_forcing.wcoss_dell_p3 @@ -8,6 +8,3 @@ module load hpc-ips/18.0.1.163 module load w3nco/2.4.1 module load bacio/2.4.1 - -export FC=ifort -export FOPTS="-O0 -FR" diff --git a/modulefiles/gldas_post.hera b/modulefiles/gldas_post.hera index 203a755..d8a0be8 100644 --- a/modulefiles/gldas_post.hera +++ b/modulefiles/gldas_post.hera @@ -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.wcoss_dell_p3 b/modulefiles/gldas_post.wcoss_dell_p3 index 4753750..fb0c720 100644 --- a/modulefiles/gldas_post.wcoss_dell_p3 +++ b/modulefiles/gldas_post.wcoss_dell_p3 @@ -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.hera b/modulefiles/gldas_rst.hera index 203a755..d8a0be8 100644 --- a/modulefiles/gldas_rst.hera +++ b/modulefiles/gldas_rst.hera @@ -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.wcoss_dell_p3 b/modulefiles/gldas_rst.wcoss_dell_p3 index 4753750..fb0c720 100644 --- a/modulefiles/gldas_rst.wcoss_dell_p3 +++ b/modulefiles/gldas_rst.wcoss_dell_p3 @@ -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/sorc/build_gdas2gldas.sh b/sorc/build_gdas2gldas.sh index 0bdbb02..56c2a3b 100755 --- a/sorc/build_gdas2gldas.sh +++ b/sorc/build_gdas2gldas.sh @@ -7,7 +7,11 @@ cwd=`pwd` USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} if [ $USE_PREINST_LIBS = true ]; then export MOD_PATH + if [ $target = wcoss2 ]; then module reset + else + module purge + fi module use ../modulefiles module load gdas2gldas.$target > /dev/null 2>&1 else @@ -33,7 +37,15 @@ fi # cd gdas2gldas.fd -export FCOMP=ftn +if [ $target = wcoss2 ]; then + export FCOMP=ftn +elif [ $target = wcoss_cray ]; then + export FCOMP=ftn +elif [ $target = wcoss_dell_p3 ]; then + export FCOMP=mpif90 +else + export FCOMP=mpiifort +fi export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl" make clean diff --git a/sorc/build_gldas2gdas.sh b/sorc/build_gldas2gdas.sh index d0d3192..2b9826f 100755 --- a/sorc/build_gldas2gdas.sh +++ b/sorc/build_gldas2gdas.sh @@ -7,7 +7,11 @@ cwd=`pwd` USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} if [ $USE_PREINST_LIBS = true ]; then export MOD_PATH + if [ $target = wcoss2 ]; then module reset + else + module purge + fi module use ../modulefiles module load gldas2gdas.$target > /dev/null 2>&1 else @@ -33,7 +37,15 @@ fi # cd gldas2gdas.fd -export FCOMP=ftn +if [ $target = wcoss2 ]; then + export FCOMP=ftn +elif [ $target = wcoss_cray ]; then + export FCOMP=ftn +elif [ $target = wcoss_dell_p3 ]; then + export FCOMP=mpif90 +else + export FCOMP=mpiifort +fi export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl" make clean diff --git a/sorc/build_gldas_forcing.sh b/sorc/build_gldas_forcing.sh index 887e8c3..0ad6d02 100755 --- a/sorc/build_gldas_forcing.sh +++ b/sorc/build_gldas_forcing.sh @@ -7,7 +7,11 @@ cwd=`pwd` USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} if [ $USE_PREINST_LIBS = true ]; then export MOD_PATH + if [ $target = wcoss2 ]; then module reset + else + module purge + fi module use ../modulefiles module load gldas_forcing.$target > /dev/null 2>&1 else @@ -33,7 +37,13 @@ fi # cd gldas_forcing.fd -export FC=ftn +if [ $target = wcoss2 ]; then + export FC=ftn +elif [ $target = wcoss_cray ]; then + export FC=ftn +else + export FC=ifort +fi export FOPTS="-O0 -FR" make clean diff --git a/sorc/build_gldas_model.sh b/sorc/build_gldas_model.sh index 9f6db09..7688146 100755 --- a/sorc/build_gldas_model.sh +++ b/sorc/build_gldas_model.sh @@ -7,7 +7,11 @@ cwd=`pwd` USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} if [ $USE_PREINST_LIBS = true ]; then export MOD_PATH + if [ $target = wcoss2 ]; then module reset + else + module purge + fi module use ../modulefiles module load gldas_model.$target > /dev/null 2>&1 else diff --git a/sorc/build_gldas_post.sh b/sorc/build_gldas_post.sh index 637239f..fd52a9a 100755 --- a/sorc/build_gldas_post.sh +++ b/sorc/build_gldas_post.sh @@ -7,7 +7,11 @@ cwd=`pwd` USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} if [ $USE_PREINST_LIBS = true ]; then export MOD_PATH + if [ $target = wcoss2 ]; then module reset + else + module purge + fi module use ../modulefiles module load gldas_post.$target > /dev/null 2>&1 else @@ -30,7 +34,13 @@ fi cd gldas_post.fd -export FC=ftn +if [ $target = wcoss2 ]; then + export FC=ftn +elif [ $target = wcoss_cray ]; then + export FC=ftn +else + export FC=ifort +fi export FOPTS='-O -FR -I$(NEMSIO_INC) -convert big_endian' make clean diff --git a/sorc/build_gldas_rst.sh b/sorc/build_gldas_rst.sh index 3ae6415..c445570 100755 --- a/sorc/build_gldas_rst.sh +++ b/sorc/build_gldas_rst.sh @@ -7,7 +7,11 @@ cwd=`pwd` USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} if [ $USE_PREINST_LIBS = true ]; then export MOD_PATH + if [ $target = wcoss2 ]; then module reset + else + module purge + fi module use ../modulefiles module load gldas_rst.$target > /dev/null 2>&1 else @@ -30,7 +34,13 @@ fi cd gldas_rst.fd/noah -export FC=ftn +if [ $target = wcoss2 ]; then + export FC=ftn +elif [ $target = wcoss_cray ]; then + export FC=ftn +else + export FC=ifort +fi export FOPTS='-O -FR -I$(NEMSIO_INC) -convert big_endian' make clean