From 06b5bf08b418ea18a42c9f72dc56d63decc992a7 Mon Sep 17 00:00:00 2001 From: HelinWei-NOAA <48133472+HelinWei-NOAA@users.noreply.github.com> Date: Wed, 12 Jan 2022 14:05:54 -0500 Subject: [PATCH] Wcoss2 nco (#35) * 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 Co-authored-by: Helin Wei Co-authored-by: Helin Wei --- jobs/JGDAS_ATMOS_GLDAS | 3 --- modulefiles/gdas2gldas.wcoss2.lua | 2 +- modulefiles/gldas2gdas.wcoss2.lua | 2 +- modulefiles/gldas_forcing.wcoss2.lua | 2 +- modulefiles/gldas_model.wcoss2.lua | 2 +- modulefiles/gldas_post.wcoss2.lua | 2 +- modulefiles/gldas_rst.wcoss2.lua | 2 +- sorc/build_gdas2gldas.sh | 6 +++--- sorc/build_gldas2gdas.sh | 6 +++--- sorc/build_gldas_forcing.sh | 6 +++--- sorc/build_gldas_model.sh | 6 +++--- sorc/build_gldas_post.sh | 6 +++--- sorc/build_gldas_rst.sh | 6 +++--- sorc/machine-setup.sh | 25 ++++++++++++------------- 14 files changed, 36 insertions(+), 40 deletions(-) diff --git a/jobs/JGDAS_ATMOS_GLDAS b/jobs/JGDAS_ATMOS_GLDAS index de2eb6e..8db81a1 100755 --- a/jobs/JGDAS_ATMOS_GLDAS +++ b/jobs/JGDAS_ATMOS_GLDAS @@ -70,9 +70,6 @@ export pgmerr=errfile export CDATE=${CDATE:-${PDY}${cyc}} export CDUMP=${CDUMP:-${RUN:-"gdas"}} export COMPONENT=${COMPONENT:-atmos} -if [ $RUN_ENVIR = "nco" ]; then - export ROTDIR=${COMROOT:?}/$NET/$envir -fi ############################################## diff --git a/modulefiles/gdas2gldas.wcoss2.lua b/modulefiles/gdas2gldas.wcoss2.lua index 8595460..3ed0b66 100644 --- a/modulefiles/gdas2gldas.wcoss2.lua +++ b/modulefiles/gdas2gldas.wcoss2.lua @@ -4,7 +4,7 @@ Load environment to run GLDAS on WCOSS2 envvar_ver=os.getenv("envvar_ver") or "1.0" PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0" -craype_ver=os.getenv("craype_ver") or "2.7.8" +craype_ver=os.getenv("craype_ver") or "2.7.10" intel_ver=os.getenv("intel_ver") or "19.1.3.304" cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9" load(pathJoin("envvar", envvar_ver)) diff --git a/modulefiles/gldas2gdas.wcoss2.lua b/modulefiles/gldas2gdas.wcoss2.lua index 8595460..3ed0b66 100644 --- a/modulefiles/gldas2gdas.wcoss2.lua +++ b/modulefiles/gldas2gdas.wcoss2.lua @@ -4,7 +4,7 @@ Load environment to run GLDAS on WCOSS2 envvar_ver=os.getenv("envvar_ver") or "1.0" PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0" -craype_ver=os.getenv("craype_ver") or "2.7.8" +craype_ver=os.getenv("craype_ver") or "2.7.10" intel_ver=os.getenv("intel_ver") or "19.1.3.304" cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9" load(pathJoin("envvar", envvar_ver)) diff --git a/modulefiles/gldas_forcing.wcoss2.lua b/modulefiles/gldas_forcing.wcoss2.lua index 596f0d6..4bf3d83 100644 --- a/modulefiles/gldas_forcing.wcoss2.lua +++ b/modulefiles/gldas_forcing.wcoss2.lua @@ -4,7 +4,7 @@ Load environment to run GLDAS on WCOSS2 envvar_ver=os.getenv("envvar_ver") or "1.0" PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0" -craype_ver=os.getenv("craype_ver") or "2.7.8" +craype_ver=os.getenv("craype_ver") or "2.7.10" intel_ver=os.getenv("intel_ver") or "19.1.3.304" cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9" load(pathJoin("envvar", envvar_ver)) diff --git a/modulefiles/gldas_model.wcoss2.lua b/modulefiles/gldas_model.wcoss2.lua index dd6b8fc..52c1785 100644 --- a/modulefiles/gldas_model.wcoss2.lua +++ b/modulefiles/gldas_model.wcoss2.lua @@ -4,7 +4,7 @@ Load environment to run GLDAS on WCOSS2 envvar_ver=os.getenv("envvar_ver") or "1.0" PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0" -craype_ver=os.getenv("craype_ver") or "2.7.8" +craype_ver=os.getenv("craype_ver") or "2.7.10" intel_ver=os.getenv("intel_ver") or "19.1.3.304" cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9" load(pathJoin("envvar", envvar_ver)) diff --git a/modulefiles/gldas_post.wcoss2.lua b/modulefiles/gldas_post.wcoss2.lua index 41118c3..448df74 100644 --- a/modulefiles/gldas_post.wcoss2.lua +++ b/modulefiles/gldas_post.wcoss2.lua @@ -4,7 +4,7 @@ Load environment to run GLDAS on WCOSS2 envvar_ver=os.getenv("envvar_ver") or "1.0" PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0" -craype_ver=os.getenv("craype_ver") or "2.7.8" +craype_ver=os.getenv("craype_ver") or "2.7.10" intel_ver=os.getenv("intel_ver") or "19.1.3.304" cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9" load(pathJoin("envvar", envvar_ver)) diff --git a/modulefiles/gldas_rst.wcoss2.lua b/modulefiles/gldas_rst.wcoss2.lua index 41118c3..448df74 100644 --- a/modulefiles/gldas_rst.wcoss2.lua +++ b/modulefiles/gldas_rst.wcoss2.lua @@ -4,7 +4,7 @@ Load environment to run GLDAS on WCOSS2 envvar_ver=os.getenv("envvar_ver") or "1.0" PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0" -craype_ver=os.getenv("craype_ver") or "2.7.8" +craype_ver=os.getenv("craype_ver") or "2.7.10" intel_ver=os.getenv("intel_ver") or "19.1.3.304" cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.9" load(pathJoin("envvar", envvar_ver)) diff --git a/sorc/build_gdas2gldas.sh b/sorc/build_gdas2gldas.sh index 083dc67..0bdbb02 100755 --- a/sorc/build_gdas2gldas.sh +++ b/sorc/build_gdas2gldas.sh @@ -7,17 +7,17 @@ cwd=`pwd` USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} if [ $USE_PREINST_LIBS = true ]; then export MOD_PATH - module purge + module reset module use ../modulefiles module load gdas2gldas.$target > /dev/null 2>&1 else export MOD_PATH=${cwd}/lib/modulefiles if [ $target = wcoss_cray ]; then - module purge + module reset module use ../modulefiles module load gdas2gldas.${target}_userlib > /dev/null 2>&1 else - module purge + module reset module use ../modulefiles module load gdas2gldas.$target > /dev/null 2>&1 fi diff --git a/sorc/build_gldas2gdas.sh b/sorc/build_gldas2gdas.sh index be6dffe..d0d3192 100755 --- a/sorc/build_gldas2gdas.sh +++ b/sorc/build_gldas2gdas.sh @@ -7,17 +7,17 @@ cwd=`pwd` USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} if [ $USE_PREINST_LIBS = true ]; then export MOD_PATH - module purge + module reset module use ../modulefiles module load gldas2gdas.$target > /dev/null 2>&1 else export MOD_PATH=${cwd}/lib/modulefiles if [ $target = wcoss_cray ]; then - module purge + module reset module use ../modulefiles module load gldas2gdas.${target}_userlib > /dev/null 2>&1 else - module purge + module reset module use ../modulefiles module load gldas2gdas.$target > /dev/null 2>&1 fi diff --git a/sorc/build_gldas_forcing.sh b/sorc/build_gldas_forcing.sh index 89ce345..887e8c3 100755 --- a/sorc/build_gldas_forcing.sh +++ b/sorc/build_gldas_forcing.sh @@ -7,17 +7,17 @@ cwd=`pwd` USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} if [ $USE_PREINST_LIBS = true ]; then export MOD_PATH - module purge + module reset module use ../modulefiles module load gldas_forcing.$target > /dev/null 2>&1 else export MOD_PATH=${cwd}/lib/modulefiles if [ $target = wcoss_cray ]; then - module purge + module reset module use ../modulefiles module load gldas_forcing.${target}_userlib > /dev/null 2>&1 else - module purge + module reset module use ../modulefiles module load gldas_forcing.$target > /dev/null 2>&1 fi diff --git a/sorc/build_gldas_model.sh b/sorc/build_gldas_model.sh index a39930e..9f6db09 100755 --- a/sorc/build_gldas_model.sh +++ b/sorc/build_gldas_model.sh @@ -7,17 +7,17 @@ cwd=`pwd` USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} if [ $USE_PREINST_LIBS = true ]; then export MOD_PATH - module purge + module reset module use ../modulefiles module load gldas_model.$target > /dev/null 2>&1 else export MOD_PATH=${cwd}/lib/modulefiles if [ $target = wcoss_cray ]; then - module purge + module reset module use ../modulefiles module load gldas_model.${target}_userlib > /dev/null 2>&1 else - module purge + module reset module use ../modulefiles module load gldas_model.$target > /dev/null 2>&1 fi diff --git a/sorc/build_gldas_post.sh b/sorc/build_gldas_post.sh index 0ad31cc..637239f 100755 --- a/sorc/build_gldas_post.sh +++ b/sorc/build_gldas_post.sh @@ -7,17 +7,17 @@ cwd=`pwd` USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} if [ $USE_PREINST_LIBS = true ]; then export MOD_PATH - module purge + module reset module use ../modulefiles module load gldas_post.$target > /dev/null 2>&1 else export MOD_PATH=${cwd}/lib/modulefiles if [ $target = wcoss_cray ]; then - module purge + module reset module use ../modulefiles module load gldas_post.${target}_userlib > /dev/null 2>&1 else - module purge + module reset module use ../modulefiles module load gldas_post.$target > /dev/null 2>&1 fi diff --git a/sorc/build_gldas_rst.sh b/sorc/build_gldas_rst.sh index 3203070..3ae6415 100755 --- a/sorc/build_gldas_rst.sh +++ b/sorc/build_gldas_rst.sh @@ -7,17 +7,17 @@ cwd=`pwd` USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} if [ $USE_PREINST_LIBS = true ]; then export MOD_PATH - module purge + module reset module use ../modulefiles module load gldas_rst.$target > /dev/null 2>&1 else export MOD_PATH=${cwd}/lib/modulefiles if [ $target = wcoss_cray ]; then - module purge + module reset module use ../modulefiles module load gldas_rst.${target}_userlib > /dev/null 2>&1 else - module purge + module reset module use ../modulefiles module load gldas_rst.$target > /dev/null 2>&1 fi diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh index 54ca7c1..431744e 100644 --- a/sorc/machine-setup.sh +++ b/sorc/machine-setup.sh @@ -26,7 +26,7 @@ if [[ -d /lfs3 ]] ; then source /apps/lmod/lmod/init/$__ms_shell fi target=jet - module purge + module reset elif [[ -d /scratch1 ]] ; then # We are on NOAA Hera if ( ! eval module help > /dev/null 2>&1 ) ; then @@ -34,7 +34,7 @@ elif [[ -d /scratch1 ]] ; then source /apps/lmod/lmod/init/$__ms_shell fi target=hera - module purge + module reset MOD_PATH=/scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles elif [[ -d /work ]] ; then # We are on Orion @@ -43,7 +43,7 @@ elif [[ -d /work ]] ; then source /apps/lmod/lmod/init/$__ms_shell fi target=orion - module purge + module reset MOD_PATH=/apps/contrib/NCEPLIBS/orion/modulefiles elif [[ -d /gpfs/hps && -e /etc/SuSE-release ]] ; then # We are on NOAA Luna or Surge @@ -53,9 +53,9 @@ elif [[ -d /gpfs/hps && -e /etc/SuSE-release ]] ; then fi target=wcoss_cray - # Silence the "module purge" to avoid the expected error messages + # Silence the "module reset" to avoid the expected error messages # related to modules that load modules. - module purge > /dev/null 2>&1 + module reset > /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 @@ -63,7 +63,7 @@ elif [[ -d /gpfs/hps && -e /etc/SuSE-release ]] ; then module use /opt/cray/craype/default/alt-modulefiles module use /opt/cray/ari/modulefiles module use /opt/modulefiles - module purge > /dev/null 2>&1 + module reset > /dev/null 2>&1 # Workaround until module issues are fixed: #unset _LMFILES_ @@ -86,7 +86,7 @@ elif [[ -L /usrx && "$( readlink /usrx 2> /dev/null )" =~ dell ]] ; then source /usrx/local/prod/lmod/lmod/init/$__ms_shell fi target=wcoss_dell_p3 - module purge + module reset elif [[ -d /lfs/h2 ]] ; then # We are on NOAA Cactus or Dogwood @@ -95,8 +95,7 @@ elif [[ -d /lfs/h2 ]] ; then source /usr/share/lmod/lmod/init/$__ms_shell fi target=wcoss2 - module purge - module load envvar/1.0 + module reset elif [[ -d /dcom && -d /hwrf ]] ; then # We are on NOAA Tide or Gyre @@ -105,7 +104,7 @@ elif [[ -d /dcom && -d /hwrf ]] ; then source /usrx/local/Modules/default/init/$__ms_shell fi target=wcoss - module purge + module reset elif [[ -d /glade ]] ; then # We are on NCAR Yellowstone if ( ! eval module help > /dev/null 2>&1 ) ; then @@ -113,7 +112,7 @@ elif [[ -d /glade ]] ; then . /usr/share/Modules/init/$__ms_shell fi target=yellowstone - module purge + module reset elif [[ -d /lustre && -d /ncrc ]] ; then # We are on GAEA. if ( ! eval module help > /dev/null 2>&1 ) ; then @@ -126,11 +125,11 @@ elif [[ -d /lustre && -d /ncrc ]] ; then source /etc/profile fi target=gaea - module purge + module reset elif [[ -d /data/prod ]] ; then # We are on SSEC S4 target=s4 - module purge + module reset else echo WARNING: UNKNOWN PLATFORM 1>&2 fi