diff --git a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml index 319b09ff9..618f0e4e9 100644 --- a/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml +++ b/.github/workflows/esmf-8.0.1_jasper-2.0.22_nceplibs-develop.yml @@ -36,6 +36,7 @@ jobs: - name: install-dependencies run: | + echo "/home/runner/mpich/bin" >> $GITHUB_PATH if [[ ${{ matrix.os }} == "ubuntu-20.04" ]]; then sudo apt-get update sudo apt-get install libmpich-dev diff --git a/CMakeLists.txt b/CMakeLists.txt index 55dc55b40..0f10b2658 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ endif() # Find packages. find_package(NetCDF REQUIRED C Fortran) -find_package(MPI REQUIRED) +find_package(MPI REQUIRED C Fortran) find_package(ESMF MODULE REQUIRED) if(OPENMP) diff --git a/reg_tests/chgres_cube/driver.hera.sh b/reg_tests/chgres_cube/driver.hera.sh index 63b7b813f..cbabc7b36 100755 --- a/reg_tests/chgres_cube/driver.hera.sh +++ b/reg_tests/chgres_cube/driver.hera.sh @@ -31,9 +31,11 @@ module use ../../modulefiles module load build.$target.$compiler module list -export OUTDIR=/scratch2/NCEPDEV/stmp1/$LOGNAME/chgres_reg_tests -PROJECT_CODE="fv3-cpu" -QUEUE="batch" +export OUTDIR="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}" +export OUTDIR="${OUTDIR}/reg-tests/chgres-cube" + +PROJECT_CODE="${PROJECT_CODE:-fv3-cpu}" +QUEUE="${QUEUE:-batch}" #----------------------------------------------------------------------------- # Should not have to change anything below here. HOMEufs is the root diff --git a/reg_tests/chgres_cube/driver.jet.sh b/reg_tests/chgres_cube/driver.jet.sh index 8dd4e9bbd..2d2c5f373 100755 --- a/reg_tests/chgres_cube/driver.jet.sh +++ b/reg_tests/chgres_cube/driver.jet.sh @@ -29,9 +29,11 @@ module use ../../modulefiles module load build.$target.intel module list -export OUTDIR=/lfs4/HFIP/emcda/$LOGNAME/stmp/chgres_reg_tests -PROJECT_CODE="hfv3gfs" -QUEUE="debug" +export OUTDIR="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}" +export OUTDIR="${OUTDIR}/reg-tests/chgres-cube" + +PROJECT_CODE="${PROJECT_CODE:-hfv3gfs}" +QUEUE="${QUEUE:-debug}" #----------------------------------------------------------------------------- # Should not have to change anything below here. HOMEufs is the root diff --git a/reg_tests/chgres_cube/driver.orion.sh b/reg_tests/chgres_cube/driver.orion.sh index c27d1657e..67d8e0d78 100755 --- a/reg_tests/chgres_cube/driver.orion.sh +++ b/reg_tests/chgres_cube/driver.orion.sh @@ -29,9 +29,13 @@ module use ../../modulefiles module load build.$target.intel module list -export OUTDIR=/work/noaa/stmp/$LOGNAME/chgres_reg_tests -PROJECT_CODE="fv3-cpu" -QUEUE="debug" +ulimit -s unlimited + +export OUTDIR="${WORK_DIR:-/work/noaa/stmp/$LOGNAME}" +export OUTDIR="${OUTDIR}/reg-tests/chgres-cube" + +PROJECT_CODE="${PROJECT_CODE:-fv3-cpu}" +QUEUE="${QUEUE:-debug}" #----------------------------------------------------------------------------- # Should not have to change anything below here. HOMEufs is the root diff --git a/reg_tests/chgres_cube/driver.cray.sh b/reg_tests/chgres_cube/driver.wcoss_cray.sh similarity index 97% rename from reg_tests/chgres_cube/driver.cray.sh rename to reg_tests/chgres_cube/driver.wcoss_cray.sh index 4082b738a..2042c2d83 100755 --- a/reg_tests/chgres_cube/driver.cray.sh +++ b/reg_tests/chgres_cube/driver.wcoss_cray.sh @@ -27,9 +27,11 @@ module use ../../modulefiles module load build.$target.intel module list -export OUTDIR=/gpfs/hps3/stmp/$LOGNAME/chgres_reg_tests -QUEUE="debug" -PROJECT_CODE="GFS-DEV" +export OUTDIR="${WORK_DIR:-/gpfs/hps3/stmp/$LOGNAME}" +export OUTDIR="${OUTDIR}/reg-tests/chgres-cube" + +QUEUE="${QUEUE:-debug}" +PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}" #----------------------------------------------------------------------------- # Should not have to change anything below here. HOMEufs is the root diff --git a/reg_tests/chgres_cube/driver.dell.sh b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh similarity index 97% rename from reg_tests/chgres_cube/driver.dell.sh rename to reg_tests/chgres_cube/driver.wcoss_dell_p3.sh index 03008b958..3449925bd 100755 --- a/reg_tests/chgres_cube/driver.dell.sh +++ b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh @@ -27,9 +27,11 @@ module use ../../modulefiles module load build.$target.intel module list -export OUTDIR=/gpfs/dell1/stmp/$LOGNAME/chgres_reg_tests -QUEUE="debug" -PROJECT_CODE="GFS-DEV" +export OUTDIR="${WORK_DIR:-/gpfs/dell1/stmp/$LOGNAME}" +export OUTDIR="${OUTDIR}/reg-tests/chgres-cube" + +QUEUE="${QUEUE:-debug}" +PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}" #----------------------------------------------------------------------------- # Should not have to change anything below here. HOMEufs is the root diff --git a/reg_tests/global_cycle/driver.hera.sh b/reg_tests/global_cycle/driver.hera.sh index b552bd5da..1828ad1b2 100755 --- a/reg_tests/global_cycle/driver.hera.sh +++ b/reg_tests/global_cycle/driver.hera.sh @@ -36,7 +36,8 @@ module use ../../modulefiles module load build.$target.$compiler module list -export DATA=/scratch2/NCEPDEV/stmp1/$LOGNAME/reg_tests.cycle +export DATA="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}" +export DATA="${DATA}/reg-tests/global-cycle" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/global_cycle/driver.jet.sh b/reg_tests/global_cycle/driver.jet.sh index 1aa338c56..e55da2636 100755 --- a/reg_tests/global_cycle/driver.jet.sh +++ b/reg_tests/global_cycle/driver.jet.sh @@ -35,7 +35,8 @@ module use ../../modulefiles module load build.$target.intel module list -export DATA=/lfs4/HFIP/emcda/$LOGNAME/stmp/reg_tests.cycle +export DATA="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}" +export DATA="${DATA}/reg-tests/global-cycle" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/global_cycle/driver.orion.sh b/reg_tests/global_cycle/driver.orion.sh index 90ba198c4..b84abae19 100755 --- a/reg_tests/global_cycle/driver.orion.sh +++ b/reg_tests/global_cycle/driver.orion.sh @@ -34,7 +34,10 @@ module use ../../modulefiles module load build.$target.intel module list -export DATA=/work/noaa/stmp/$LOGNAME/reg_tests.cycle +ulimit -s unlimited + +export DATA="${WORK_DIR:-/work/noaa/stmp/$LOGNAME}" +export DATA="${DATA}/reg-tests/global-cycle" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/global_cycle/driver.cray.sh b/reg_tests/global_cycle/driver.wcoss_cray.sh similarity index 94% rename from reg_tests/global_cycle/driver.cray.sh rename to reg_tests/global_cycle/driver.wcoss_cray.sh index d7b64ed43..1468d07eb 100755 --- a/reg_tests/global_cycle/driver.cray.sh +++ b/reg_tests/global_cycle/driver.wcoss_cray.sh @@ -32,7 +32,8 @@ module use ../../modulefiles module load build.$target.intel module list -export DATA=/gpfs/hps3/stmp/$LOGNAME/reg_tests.cycle +export DATA="${WORK_DIR:-/gpfs/hps3/stmp/$LOGNAME}" +export DATA="${DATA}/reg-tests/global-cycle" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/global_cycle/driver.dell.sh b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh similarity index 93% rename from reg_tests/global_cycle/driver.dell.sh rename to reg_tests/global_cycle/driver.wcoss_dell_p3.sh index 35e560387..609339082 100755 --- a/reg_tests/global_cycle/driver.dell.sh +++ b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh @@ -37,7 +37,8 @@ module use ../../modulefiles module load build.$target.intel module list -export DATA=/gpfs/dell1/stmp/$LOGNAME/reg_tests.cycle +export DATA="${WORK_DIR:-/gpfs/dell1/stmp/$LOGNAME}" +export DATA="${DATA}/reg-tests/global-cycle" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/grid_gen/driver.hera.sh b/reg_tests/grid_gen/driver.hera.sh index 31a17c0fb..5810b40e2 100755 --- a/reg_tests/grid_gen/driver.hera.sh +++ b/reg_tests/grid_gen/driver.hera.sh @@ -30,9 +30,10 @@ module list set -x -export WORK_DIR=/scratch2/NCEPDEV/stmp1/$LOGNAME/reg_tests.grid -QUEUE="batch" -PROJECT_CODE="fv3-cpu" +export WORK_DIR="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}" +export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen" +QUEUE="${QUEUE:-batch}" +PROJECT_CODE="${PROJECT_CODE:-fv3-cpu}" #----------------------------------------------------------------------------- # Should not have to change anything below here. diff --git a/reg_tests/grid_gen/driver.jet.sh b/reg_tests/grid_gen/driver.jet.sh index ed2cb3492..afae062e5 100755 --- a/reg_tests/grid_gen/driver.jet.sh +++ b/reg_tests/grid_gen/driver.jet.sh @@ -28,9 +28,10 @@ module list set -x -QUEUE="windfall" -PROJECT_CODE="emcda" -export WORK_DIR=/lfs4/HFIP/emcda/$LOGNAME/stmp/reg_tests.grid +QUEUE="${QUEUE:-windfall}" +PROJECT_CODE="${PROJECT_CODE:-emcda}" +export WORK_DIR="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}" +export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen" #----------------------------------------------------------------------------- # Should not have to change anything below here. diff --git a/reg_tests/grid_gen/driver.orion.sh b/reg_tests/grid_gen/driver.orion.sh index a18bac7ff..e93ec5ba9 100755 --- a/reg_tests/grid_gen/driver.orion.sh +++ b/reg_tests/grid_gen/driver.orion.sh @@ -27,10 +27,12 @@ module load build.$target.intel module list set -x +ulimit -s unlimited -export WORK_DIR=/work/noaa/stmp/$LOGNAME/reg_tests.grid -QUEUE="batch" -PROJECT_CODE="fv3-cpu" +export WORK_DIR="${WORK_DIR:-/work/noaa/stmp/$LOGNAME}" +export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen" +QUEUE="${QUEUE:-batch}" +PROJECT_CODE=${PROJECT_CODE:-fv3-cpu} #----------------------------------------------------------------------------- # Should not have to change anything below here. diff --git a/reg_tests/grid_gen/driver.cray.sh b/reg_tests/grid_gen/driver.wcoss_cray.sh similarity index 95% rename from reg_tests/grid_gen/driver.cray.sh rename to reg_tests/grid_gen/driver.wcoss_cray.sh index f3d55b731..1aaf19f5d 100755 --- a/reg_tests/grid_gen/driver.cray.sh +++ b/reg_tests/grid_gen/driver.wcoss_cray.sh @@ -26,9 +26,10 @@ module list set -x -QUEUE="debug" -PROJECT_CODE="GFS-DEV" -export WORK_DIR=/gpfs/hps3/stmp/$LOGNAME/reg_tests.grid +QUEUE="${QUEUE:-debug}" +PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}" +export WORK_DIR="${WORK_DIR:-/gpfs/hps3/stmp/$LOGNAME}" +export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen" #----------------------------------------------------------------------------- # Should not have to change anything below here. diff --git a/reg_tests/grid_gen/driver.dell.sh b/reg_tests/grid_gen/driver.wcoss_dell_p3.sh similarity index 95% rename from reg_tests/grid_gen/driver.dell.sh rename to reg_tests/grid_gen/driver.wcoss_dell_p3.sh index 3495e9e01..8961c90c5 100755 --- a/reg_tests/grid_gen/driver.dell.sh +++ b/reg_tests/grid_gen/driver.wcoss_dell_p3.sh @@ -26,9 +26,10 @@ module list set -x -QUEUE="debug" -PROJECT_CODE="GFS-DEV" -export WORK_DIR=/gpfs/dell1/stmp/$LOGNAME/reg_tests.grid +QUEUE="${QUEUE:-debug}" +PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}" +export WORK_DIR="${WORK_DIR:-/gpfs/dell1/stmp/$LOGNAME}" +export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen" #----------------------------------------------------------------------------- # Should not have to change anything below here. diff --git a/reg_tests/ice_blend/driver.hera.sh b/reg_tests/ice_blend/driver.hera.sh index 479804537..0fd03dc47 100755 --- a/reg_tests/ice_blend/driver.hera.sh +++ b/reg_tests/ice_blend/driver.hera.sh @@ -36,7 +36,8 @@ module use ../../modulefiles module load build.$target.$compiler module list -export DATA="/scratch2/NCEPDEV/stmp1/$LOGNAME/reg_test.ice_blend" +export DATA="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}" +export DATA="${DATA}/reg-tests/ice-blend" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/ice_blend/driver.jet.sh b/reg_tests/ice_blend/driver.jet.sh index 6d693b1c3..446df2f14 100755 --- a/reg_tests/ice_blend/driver.jet.sh +++ b/reg_tests/ice_blend/driver.jet.sh @@ -33,7 +33,8 @@ module use ../../modulefiles module load build.$target.intel module list -export DATA="/lfs4/HFIP/emcda/$LOGNAME/stmp/reg_test.ice_blend" +export DATA="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}" +export DATA="${DATA}/reg-tests/ice-blend" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/ice_blend/driver.orion.sh b/reg_tests/ice_blend/driver.orion.sh index 83c23e35b..ddb1459af 100755 --- a/reg_tests/ice_blend/driver.orion.sh +++ b/reg_tests/ice_blend/driver.orion.sh @@ -34,7 +34,10 @@ module use ../../modulefiles module load build.$target.intel module list -export DATA="/work/noaa/stmp/$LOGNAME/reg_test.ice_blend" +ulimit -s unlimited + +export DATA="${WORK_DIR:-/work/noaa/stmp/$LOGNAME}" +export DATA="${DATA}/reg-tests/ice-blend" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/ice_blend/driver.cray.sh b/reg_tests/ice_blend/driver.wcoss_cray.sh similarity index 94% rename from reg_tests/ice_blend/driver.cray.sh rename to reg_tests/ice_blend/driver.wcoss_cray.sh index 2aa975161..e5ff611e7 100755 --- a/reg_tests/ice_blend/driver.cray.sh +++ b/reg_tests/ice_blend/driver.wcoss_cray.sh @@ -33,7 +33,8 @@ module use ../../modulefiles module load build.$target.intel module list -export DATA=/gpfs/hps3/stmp/$LOGNAME/reg_tests.ice_blend +export DATA="${WORK_DIR:-/gpfs/hps3/stmp/$LOGNAME}" +export DATA="${DATA}/reg-tests/ice-blend" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/ice_blend/driver.dell.sh b/reg_tests/ice_blend/driver.wcoss_dell_p3.sh similarity index 94% rename from reg_tests/ice_blend/driver.dell.sh rename to reg_tests/ice_blend/driver.wcoss_dell_p3.sh index 417e80051..90b3c3630 100755 --- a/reg_tests/ice_blend/driver.dell.sh +++ b/reg_tests/ice_blend/driver.wcoss_dell_p3.sh @@ -33,7 +33,8 @@ module list set -x -export DATA=/gpfs/dell1/stmp/$LOGNAME/reg_tests.ice_blend +export DATA="${WORK_DIR:-/gpfs/dell1/stmp/$LOGNAME}" +export DATA="${DATA}/reg-tests/ice-blend" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/rt.sh b/reg_tests/rt.sh new file mode 100755 index 000000000..342e96cec --- /dev/null +++ b/reg_tests/rt.sh @@ -0,0 +1,139 @@ +#!/bin/bash -l + +ulimit -s unlimited + +export MAILTO= + +# Directory to download UFS_UTILS to and run the regression tests +export WORK_DIR= + +export PROJECT_CODE= +export QUEUE= +TIMEOUT_LIMIT=3600 + +mkdir -p ${WORK_DIR} +cd ${WORK_DIR} +rm -f reg_test_results.txt +rm -rf UFS_UTILS + +git clone --recursive https://github.com/NOAA-EMC/UFS_UTILS.git +cd UFS_UTILS + +source sorc/machine-setup.sh + +current_hash=$(git rev-parse HEAD) + +if [[ -f "${WORK_DIR}/prev_hash.txt" ]]; then + prev_hash=$(cat ${WORK_DIR}/prev_hash.txt) + if [[ "$current_hash" == "$prev_hash" ]]; then + echo `date` + echo "" + echo "UFS_UTILS has not changed since last time. Not building." + echo "UFS_UTILS hash: ${current_hash}" + exit 0 + fi +fi + +echo "Started on " `hostname -s` >> ${WORK_DIR}/reg_test_results.txt + +./build_all.sh + +if [[ $target == "wcoss_dell_p3" ]] || [[ $target == "wcoss_cray" ]]; then + prod_machine=`cat /etc/prod` + prod_letter=${prod_machine:0:1} + + this_machine=`hostname -s` + this_letter=${this_machine:0:1} + + # Mars (m), Venus (v) + if [[ "${this_letter}" == "${prod_letter}" ]]; then + exit 0 + fi +fi + +# Set machine_id variable for running link_fixdirs +if [[ $target == "wcoss_dell_p3" ]]; then + machine_id=dell + module load lsf/10.1 +elif [[ $target == "wcoss_cray" ]]; then + machine_id=cray + module load xt-lsfhpc/9.1.3 +else + machine_id=$target +fi + +cd fix +./link_fixdirs.sh emc $machine_id + +cd ../reg_tests + +sleep_time=0 +for dir in chgres_cube grid_gen; do + cd $dir + ./driver.$target.sh + # Wait for job to complete + while [ ! -f "summary.log" ]; do + sleep 10 + sleep_time=$((sleep_time+10)) + if (( sleep_time > TIMEOUT_LIMIT )); then + mail -s "UFS_UTILS Regression Tests timed out on ${target}" ${MAILTO} < ${WORK_DIR}/reg_test_results.txt + exit 1 + fi + done + cd .. +done + +if [[ $target == "wcoss_dell_p3" ]]; then + module load lsf/10.1 +elif [[ $target == "wcoss_cray" ]]; then + module load xt-lsfhpc/9.1.3 +fi + + +for dir in snow2mdl global_cycle ice_blend; do + cd $dir + if [[ $target == "hera" ]] || [[ $target == "jet" ]] || [[ $target == "orion" ]]; then + sbatch -A ${PROJECT_CODE} ./driver.$target.sh + elif [[ $target == "wcoss_dell_p3" ]] || [[ $target == "wcoss_cray" ]]; then + cat ./driver.$target.sh | bsub -P ${PROJECT_CODE} + fi + + # Wait for job to complete + sleep_time=0 + while [ ! -f "summary.log" ]; do + sleep 10 + sleep_time=$((sleep_time+10)) + if (( sleep_time > TIMEOUT_LIMIT )); then + mail -s "UFS_UTILS Regression Tests timed out on ${target}" ${MAILTO} < ${WORK_DIR}/reg_test_results.txt + exit 1 + fi + done + cd .. +done + + +echo "Commit hash: ${current_hash}" >> ${WORK_DIR}/reg_test_results.txt +echo "" >> ${WORK_DIR}/reg_test_results.txt + +for dir in chgres_cube grid_gen global_cycle ice_blend snow2mdl; do + success=true + if grep -qi "FAILED" ${dir}/summary.log; then + success=false + echo "${dir} regression tests FAILED" >> ${WORK_DIR}/reg_test_results.txt + else + echo "${dir} regression tests PASSED" >> ${WORK_DIR}/reg_test_results.txt + fi +done + +if [[ "$success" == true ]]; then + mail -s "UFS_UTILS Regression Tests PASSED on ${target}" ${MAILTO} < ${WORK_DIR}/reg_test_results.txt +else + mail -s "UFS_UTILS Regression Tests FAILED on ${target}" ${MAILTO} < ${WORK_DIR}/reg_test_results.txt +fi + +# Save current hash as previous hash for next time +echo $current_hash > ${WORK_DIR}/prev_hash.txt + + + + diff --git a/reg_tests/snow2mdl/driver.hera.sh b/reg_tests/snow2mdl/driver.hera.sh index 599819384..f2710a0b8 100755 --- a/reg_tests/snow2mdl/driver.hera.sh +++ b/reg_tests/snow2mdl/driver.hera.sh @@ -36,7 +36,8 @@ module use ../../modulefiles module load build.$target.$compiler module list -export DATA="/scratch2/NCEPDEV/stmp1/$LOGNAME/reg_tests.snow2mdl" +export DATA="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}" +export DATA="${DATA}/reg-tests/snow2mdl" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/snow2mdl/driver.jet.sh b/reg_tests/snow2mdl/driver.jet.sh index 289f9dcc2..22b867b52 100755 --- a/reg_tests/snow2mdl/driver.jet.sh +++ b/reg_tests/snow2mdl/driver.jet.sh @@ -33,7 +33,8 @@ module use ../../modulefiles module load build.$target.intel module list -export DATA="/lfs4/HFIP/emcda/$LOGNAME/stmp/reg_tests.snow2mdl" +export DATA="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}" +export DATA="${DATA}/reg-tests/snow2mdl" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/snow2mdl/driver.orion.sh b/reg_tests/snow2mdl/driver.orion.sh index 94971f6b5..993d479cf 100755 --- a/reg_tests/snow2mdl/driver.orion.sh +++ b/reg_tests/snow2mdl/driver.orion.sh @@ -34,7 +34,10 @@ module use ../../modulefiles module load build.$target.intel module list -export DATA="/work/noaa/stmp/$LOGNAME/reg_tests.snow2mdl" +ulimit -s unlimited + +export DATA="${WORK_DIR:-/work/noaa/stmp/$LOGNAME}" +export DATA="${DATA}/reg-tests/snow2mdl" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/snow2mdl/driver.cray.sh b/reg_tests/snow2mdl/driver.wcoss_cray.sh similarity index 93% rename from reg_tests/snow2mdl/driver.cray.sh rename to reg_tests/snow2mdl/driver.wcoss_cray.sh index 2c1646118..e62cc6816 100755 --- a/reg_tests/snow2mdl/driver.cray.sh +++ b/reg_tests/snow2mdl/driver.wcoss_cray.sh @@ -33,7 +33,8 @@ module use ../../modulefiles module load build.$target.intel module list -export DATA=/gpfs/hps3/stmp/$LOGNAME/reg_tests.snow2mdl +export DATA="${WORK_DIR:-/gpfs/hps3/stmp/$LOGNAME}" +export DATA="${DATA}/reg-tests/snow2mdl" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/reg_tests/snow2mdl/driver.dell.sh b/reg_tests/snow2mdl/driver.wcoss_dell_p3.sh similarity index 93% rename from reg_tests/snow2mdl/driver.dell.sh rename to reg_tests/snow2mdl/driver.wcoss_dell_p3.sh index 4b06502f5..1e9f396a7 100755 --- a/reg_tests/snow2mdl/driver.dell.sh +++ b/reg_tests/snow2mdl/driver.wcoss_dell_p3.sh @@ -33,7 +33,8 @@ module list set -x -export DATA=/gpfs/dell1/stmp/$LOGNAME/reg_tests.snow2mdl +export DATA="${WORK_DIR:-/gpfs/dell1/stmp/$LOGNAME}" +export DATA="${DATA}/reg-tests/snow2mdl" #----------------------------------------------------------------------------- # Should not have to change anything below. diff --git a/sorc/emcsfc_snow2mdl.fd/model_grid.F90 b/sorc/emcsfc_snow2mdl.fd/model_grid.F90 index 9cb9b5902..426032c95 100755 --- a/sorc/emcsfc_snow2mdl.fd/model_grid.F90 +++ b/sorc/emcsfc_snow2mdl.fd/model_grid.F90 @@ -86,7 +86,7 @@ subroutine read_mdl_grid_info implicit none - character*150 :: fngrib + character*256 :: fngrib integer :: i, j, ij, jj integer :: ii, iii, istart, iend, imid diff --git a/sorc/emcsfc_snow2mdl.fd/program_setup.F90 b/sorc/emcsfc_snow2mdl.fd/program_setup.F90 index 63b6869a9..7a50603a9 100755 --- a/sorc/emcsfc_snow2mdl.fd/program_setup.F90 +++ b/sorc/emcsfc_snow2mdl.fd/program_setup.F90 @@ -19,22 +19,22 @@ module program_setup private character*200, public :: afwa_snow_global_file !< global afwa snow file. - character*150, public :: afwa_snow_nh_file !< path/name afwa n hemis snow depth - character*150, public :: afwa_snow_sh_file !< path/name afwa s hemis snow depth - character*150, public :: afwa_lsmask_nh_file !< path/name afwa n hemis land/sea mask - character*150, public :: afwa_lsmask_sh_file !< path/name afwa s hemis land/sea mask - character*150, public :: autosnow_file !< path/name s hemis autosnow file - character*150, public :: climo_qc_file !< Climatological snow cover + character*200, public :: afwa_snow_nh_file !< path/name afwa n hemis snow depth + character*200, public :: afwa_snow_sh_file !< path/name afwa s hemis snow depth + character*200, public :: afwa_lsmask_nh_file !< path/name afwa n hemis land/sea mask + character*200, public :: afwa_lsmask_sh_file !< path/name afwa s hemis land/sea mask + character*200, public :: autosnow_file !< path/name s hemis autosnow file + character*200, public :: climo_qc_file !< Climatological snow cover !! file. Used to quality control snow data. - character*150, public :: gfs_lpl_file !< GFS gaussian thinned (reduced) grid + character*200, public :: gfs_lpl_file !< GFS gaussian thinned (reduced) grid !! definition file. Contains the number of !! longitudes (i-points) for each latitude (row). - character*150, public :: model_lat_file !< path/name lats on the model grid - character*150, public :: model_lon_file !< path/name lons on the model grid - character*150, public :: model_lsmask_file !< path/name nesdis/ims land mask - character*150, public :: model_snow_file !< path/name nesdis/ims snow cover - character*150, public :: nesdis_lsmask_file !< nesdis/ims land mask file - character*150, public :: nesdis_snow_file !< nesdis/ims snow file + character*200, public :: model_lat_file !< path/name lats on the model grid + character*200, public :: model_lon_file !< path/name lons on the model grid + character*200, public :: model_lsmask_file !< path/name nesdis/ims land mask + character*200, public :: model_snow_file !< path/name nesdis/ims snow cover + character*200, public :: nesdis_lsmask_file !< nesdis/ims land mask file + character*200, public :: nesdis_snow_file !< nesdis/ims snow file integer, public :: grib_century !< date of the final merged snow product that will be placed in grib header.