Skip to content

Commit

Permalink
Merge branch 'develop' into feature/no_wgrib2_mgrid
Browse files Browse the repository at this point in the history
  • Loading branch information
GeorgeGayno-NOAA committed Feb 4, 2022
2 parents 474401f + 26cd024 commit 0b73768
Show file tree
Hide file tree
Showing 64 changed files with 362 additions and 32 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/debug-docs-test_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ jobs:
uses: actions/cache@v2
with:
path: ~/esmf
key: esmf-8.1.1-${{ runner.os }}3
key: esmf-8.2.0-${{ runner.os }}3

- name: build-esmf
if: steps.cache-esmf.outputs.cache-hit != 'true'
run: |
pushd ~
export ESMF_DIR=~/esmf-ESMF_8_1_1
wget https://github.com/esmf-org/esmf/archive/ESMF_8_1_1.tar.gz &> /dev/null
tar zxf ESMF_8_1_1.tar.gz
cd esmf-ESMF_8_1_1
export ESMF_DIR=~/esmf-ESMF_8_2_0
wget https://github.com/esmf-org/esmf/archive/ESMF_8_2_0.tar.gz &> /dev/null
tar zxf ESMF_8_2_0.tar.gz
cd esmf-ESMF_8_2_0
export ESMF_COMM=mpich3
export ESMF_INSTALL_BINDIR=bin
export ESMF_INSTALL_LIBDIR=lib
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/intel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,16 @@ jobs:
uses: actions/cache@v2
with:
path: ~/esmf
key: esmf-8.1.1-${{ runner.os }}-intel3
key: esmf-8.2.0-${{ runner.os }}-intel3

- name: build-esmf
if: steps.cache-esmf.outputs.cache-hit != 'true'
run: |
pushd ~
export ESMF_DIR=~/esmf-ESMF_8_1_1
wget https://github.com/esmf-org/esmf/archive/ESMF_8_1_1.tar.gz &> /dev/null
tar zxf ESMF_8_1_1.tar.gz
cd esmf-ESMF_8_1_1
export ESMF_DIR=~/esmf-ESMF_8_2_0
wget https://github.com/esmf-org/esmf/archive/ESMF_8_2_0.tar.gz &> /dev/null
tar zxf ESMF_8_2_0.tar.gz
cd esmf-ESMF_8_2_0
export ESMF_COMM=intelmpi
export ESMF_INSTALL_BINDIR=bin
export ESMF_INSTALL_LIBDIR=lib
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/linux-mac-nceplibs-mpi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,17 +123,17 @@ jobs:
uses: actions/cache@v2
with:
path: ~/esmf
key: esmf--8.1.1-${{ runner.os }}-${{ matrix.mpi_type }}-netcdf-${{ matrix.netcdf_version }}3
key: esmf--8.2.0-${{ runner.os }}-${{ matrix.mpi_type }}-netcdf-${{ matrix.netcdf_version }}3

- name: build-esmf
if: steps.cache-esmf.outputs.cache-hit != 'true'
run: |
set -x
pushd ~
export ESMF_DIR=~/esmf-ESMF_8_1_1
wget https://github.com/esmf-org/esmf/archive/ESMF_8_1_1.tar.gz &> /dev/null
tar zxf ESMF_8_1_1.tar.gz
cd esmf-ESMF_8_1_1
export ESMF_DIR=~/esmf-ESMF_8_2_0
wget https://github.com/esmf-org/esmf/archive/ESMF_8_2_0.tar.gz &> /dev/null
tar zxf ESMF_8_2_0.tar.gz
cd esmf-ESMF_8_2_0
if [[ ${{ matrix.mpi_type}} == "mpich" ]]; then
export ESMF_COMM=mpich3
elif [[ ${{ matrix.mpi_type}} == "openmpi" ]]; then
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/netcdf-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@ jobs:
uses: actions/cache@v2
with:
path: ~/esmf
key: esmf-8.1.1-${{ runner.os }}-netcdf-${{ matrix.netcdf_version }}3
key: esmf-8.2.0-${{ runner.os }}-netcdf-${{ matrix.netcdf_version }}3

- name: build-esmf
#if: steps.cache-esmf.outputs.cache-hit != 'true'
run: |
pushd ~
export ESMF_DIR=~/esmf-ESMF_8_1_1
wget https://github.com/esmf-org/esmf/archive/ESMF_8_1_1.tar.gz &> /dev/null
tar zxf ESMF_8_1_1.tar.gz
cd esmf-ESMF_8_1_1
export ESMF_DIR=~/esmf-ESMF_8_2_0
wget https://github.com/esmf-org/esmf/archive/ESMF_8_2_0.tar.gz &> /dev/null
tar zxf ESMF_8_2_0.tar.gz
cd esmf-ESMF_8_2_0
export ESMF_COMM=mpich3
export ESMF_INSTALL_BINDIR=bin
export ESMF_INSTALL_LIBDIR=lib
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/build.hera.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ load(pathJoin("netcdf", netcdf_ver))
nccmp_ver=os.getenv("nccmp_ver") or "1.8.7.0"
load(pathJoin("nccmp", nccmp_ver))

esmf_ver=os.getenv("esmf_ver") or "8_1_1"
esmf_ver=os.getenv("esmf_ver") or "8_2_0"
load(pathJoin("esmf", esmf_ver))

whatis("Description: UFS_UTILS build environment")
2 changes: 1 addition & 1 deletion modulefiles/build.jet.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ load(pathJoin("netcdf", netcdf_ver))
nccmp_ver=os.getenv("nccmp_ver") or "1.8.7.0"
load(pathJoin("nccmp", nccmp_ver))

esmf_ver=os.getenv("esmf_ver") or "8_1_0_beta_snapshot_27"
esmf_ver=os.getenv("esmf_ver") or "8_2_0"
load(pathJoin("esmf", esmf_ver))

w3nco_ver=os.getenv("w3nco_ver") or "2.4.1"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/build.orion.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ load(pathJoin("netcdf", netcdf_ver))
nccmp_ver=os.getenv("nccmp_ver") or "1.8.7.0"
load(pathJoin("nccmp", nccmp_ver))

esmf_ver=os.getenv("esmf_ver") or "8_1_0_beta_snapshot_27"
esmf_ver=os.getenv("esmf_ver") or "8_2_0"
load(pathJoin("esmf", esmf_ver))

whatis("Description: UFS_UTILS build environment")
4 changes: 1 addition & 3 deletions modulefiles/build.wcoss_cray.intel
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ setenv ZLIB_ROOT /usrx/local/prod/zlib/1.2.7/intel/haswell
setenv PNG_ROOT /usrx/local/prod/png/1.2.49/intel/haswell
setenv Jasper_ROOT /usrx/local/prod/jasper/1.900.1/intel/haswell

module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
#module load esmf/8.0.0
setenv ESMFMKFILE /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/esmf/8.0.0/lib/esmf.mk
module load esmf/820
setenv NETCDF /opt/cray/netcdf/4.3.3.1/INTEL/14.0
module rm gcc
module load gcc/6.3.0
8 changes: 4 additions & 4 deletions modulefiles/build.wcoss_dell_p3.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ prepend_path("MODULEPATH", "/usrx/local/nceplibs/dev/hpc-stack/libs/hpc-stack/mo
hpc_ver=os.getenv("hpc_ver") or "1.1.0"
load(pathJoin("hpc", hpc_ver))

ips_ver=os.getenv("ips_ver") or "18.0.1.163"
ips_ver=os.getenv("ips_ver") or "18.0.5.274"
load(pathJoin("hpc-ips", ips_ver))

impi_ver=os.getenv("impi_ver") or "18.0.1"
Expand All @@ -34,16 +34,16 @@ load(pathJoin("hdf5", hdf5_ver))
netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
load(pathJoin("netcdf", netcdf_ver))

nccmp_ver=os.getenv("nccmp_ver") or "1.8.7.0"
nccmp_ver=os.getenv("nccmp_ver") or "1.8.9.0"
load(pathJoin("nccmp", nccmp_ver))

esmf_ver=os.getenv("esmf_ver") or "8_1_0_beta_snapshot_27"
esmf_ver=os.getenv("esmf_ver") or "8_2_0"
load(pathJoin("esmf", esmf_ver))

bacio_ver=os.getenv("bacio_ver") or "2.4.1"
load(pathJoin("bacio", bacio_ver))

g2_ver=os.getenv("g2_ver") or "3.4.1"
g2_ver=os.getenv("g2_ver") or "3.4.2"
load(pathJoin("g2", g2_ver))

ip_ver=os.getenv("ip_ver") or "3.3.3"
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/13km.conus.nam.grib2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< 13-KM CONUS NAM GRIB2 TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "13km_conus_nam_grib2" $commit_num
fi
else
echo "<<< 13-KM CONUS NAM GRIB2 TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/13km.conus.rap.grib2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< 13-km CONUS RAP W/ GSD PHYSICS AND SFC FROM FILE GRIB2 TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "13km_conus_rap_grib2" $commit_num
fi
else
echo "<<< 13-km CONUS RAP W/ GSD PHYSICS AND SFC FROM FILE GRIB2 TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/13km.na.gfs.ncei.grib2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< 13-KM NA GFS NCEI GRIB2 TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "13km_na_gfs_ncei_grib2" $commit_num
fi
else
echo "<<< 13-KM NA GFS NCEI GRIB2 TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/25km.conus.gfs.grib2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< 25-KM CONUS GFS GRIB2 TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "25km_conus_gfs_grib2" $commit_num
fi
else
echo "<<< 25-KM CONUS GFS GRIB2 TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< 25-KM CONUS GFS PGRIB2+BGRIB2 TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "25km_conus_gfs_pbgrib2" $commit_num
fi
else
echo "<<< 25-KM CONUS GFS PGRIB2+BGRIB2 TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/3km.conus.hrrr.gfssdf.grib2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< 3-km CONUS HRRR W/ GFS PHYSICS GRIB2 TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "3km_conus_hrrr_gfssdf_grib2" $commit_num
fi
else
echo "<<< 3-km CONUS HRRR W/ GFS PHYSICS GRIB2 TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/3km.conus.hrrr.newsfc.grib2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< 3-km CONUS HRRR W/ GSD PHYSICS AND SFC FROM FILE GRIB2 TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "3km_conus_hrrr_newsfc_grib2" $commit_num
fi
else
echo "<<< 3-km CONUS HRRR W/ GSD PHYSICS AND SFC FROM FILE GRIB2 TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/c192.fv3.history.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< C192 FV3 HISTORY TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c192_fv3_history" $commit_num
fi
else
echo "<<< C192 FV3 HISTORY TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/c192.gfs.grib2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< C192 GFS GRIB2 TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c192_gfs_grib2" $commit_num
fi
else
echo "<<< C192 GFS GRIB2 TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/c96.fv3.nemsio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< C96 FV3 GAUSSIAN NEMSIO TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_fv3_nemsio" $commit_num
fi
else
echo "<<< C96 FV3 GAUSSIAN NEMSIO TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/c96.fv3.netcdf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< C96 FV3 GAUSSIAN NETCDF TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_fv3_netcdf" $commit_num
fi
else
echo "<<< C96 FV3 GAUSSIAN NETCDF TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< C96 FV3 GAUSSIAN NETCDF2WAM TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_fv3_netcdf2wam" $commit_num
fi
else
echo "<<< C96 FV3 GAUSSIAN NETCDF2WAM TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/c96.fv3.restart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< C96 FV3 RESTART TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_fv3_restart" $commit_num
fi
else
echo "<<< C96 FV3 RESTART TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/c96.gfs.nemsio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< C96 GFS GAUSSIAN NEMSIO TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_gfs_nemsio" $commit_num
fi
else
echo "<<< C96 GFS GAUSSIAN NEMSIO TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/c96.gfs.sigio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< C96 GFS SIGIO TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_gfs_sigio" $commit_num
fi
else
echo "<<< C96 GFS SIGIO TEST PASSED. >>>"
fi
Expand Down
3 changes: 3 additions & 0 deletions reg_tests/chgres_cube/c96.regional.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ done
set +x
if [ $test_failed -ne 0 ]; then
echo "<<< C96 REGIONAL TEST FAILED. >>>"
if [ "$UPDATE_BASELINE" = "TRUE" ]; then
$HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_regional" $commit_num
fi
else
echo "<<< C96 REGIONAL TEST PASSED. >>>"
fi
Expand Down
7 changes: 7 additions & 0 deletions reg_tests/chgres_cube/driver.hera.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ QUEUE="${QUEUE:-batch}"
# and baseline data for each test.
#-----------------------------------------------------------------------------

export UPDATE_BASELINE="FALSE"
#export UPDATE_BASELINE="TRUE"

if [ "$UPDATE_BASELINE" = "TRUE" ]; then
source ../get_hash.sh
fi

export HOMEufs=$PWD/../..

export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/chgres_cube
Expand Down
7 changes: 7 additions & 0 deletions reg_tests/chgres_cube/driver.jet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ export HDF5_DISABLE_VERSION_CHECK=2
# and baseline data for each test.
#-----------------------------------------------------------------------------

export UPDATE_BASELINE="FALSE"
#export UPDATE_BASELINE="TRUE"

if [ "$UPDATE_BASELINE" = "TRUE" ]; then
source ../get_hash.sh
fi

export HOMEufs=$PWD/../..

export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/chgres_cube
Expand Down
7 changes: 7 additions & 0 deletions reg_tests/chgres_cube/driver.orion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ QUEUE="${QUEUE:-batch}"
# and baseline data for each test.
#-----------------------------------------------------------------------------

export UPDATE_BASELINE="FALSE"
#export UPDATE_BASELINE="TRUE"

if [ "$UPDATE_BASELINE" = "TRUE" ]; then
source ../get_hash.sh
fi

export HOMEufs=$PWD/../..

export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/reg_tests/chgres_cube
Expand Down
7 changes: 7 additions & 0 deletions reg_tests/chgres_cube/driver.wcoss_cray.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}"

export HOMEufs=$PWD/../..

export UPDATE_BASELINE="FALSE"
#export UPDATE_BASELINE="TRUE"

if [ "$UPDATE_BASELINE" = "TRUE" ]; then
source ../get_hash.sh
fi

export HOMEreg=/gpfs/hps3/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/chgres_cube

LOG_FILE=consistency.log
Expand Down
7 changes: 7 additions & 0 deletions reg_tests/chgres_cube/driver.wcoss_dell_p3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}"
# and baseline data for each test.
#-----------------------------------------------------------------------------

export UPDATE_BASELINE="FALSE"
#export UPDATE_BASELINE="TRUE"

if [ "$UPDATE_BASELINE" = "TRUE" ]; then
source ../get_hash.sh
fi

export HOMEufs=$PWD/../..

export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/chgres_cube
Expand Down
11 changes: 11 additions & 0 deletions reg_tests/get_hash.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

#set -x

commit_string=$(git log -1 --oneline)

commit_num=$(echo $commit_string | cut -c1-7)

echo ${commit_num}

export commit_num
Loading

0 comments on commit 0b73768

Please sign in to comment.