From b59c762ade9a5d51c77ffc066a2afe783e3ccafe Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Tue, 14 Feb 2023 18:03:30 +0000 Subject: [PATCH 1/3] Update crtm version to 2.4.0 - Update modulefiles to use crtm/2.4.0. - Remove line in modulefiles to set CRTM_FIX; this variable is now set in the crtm module as of v2.4.0. Refs #1233 --- modulefiles/module_base.hera.lua | 5 +---- modulefiles/module_base.jet.lua | 2 +- modulefiles/module_base.orion.lua | 5 +---- modulefiles/module_base.s4.lua | 5 +---- modulefiles/module_base.wcoss2.lua | 2 +- 5 files changed, 5 insertions(+), 14 deletions(-) diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua index 5b412049c14..b93f459a21e 100644 --- a/modulefiles/module_base.hera.lua +++ b/modulefiles/module_base.hera.lua @@ -24,10 +24,7 @@ load(pathJoin("prod_util", "1.2.2")) load(pathJoin("grib_util", "1.2.2")) load(pathJoin("g2tmpl", "1.10.0")) load(pathJoin("ncdiag", "1.0.0")) - -load(pathJoin("crtm", "2.3.0")) -setenv("CRTM_FIX","/scratch2/NCEPDEV/nwprod/NCEPLIBS/fix/crtm_v2.3.0") - +load(pathJoin("crtm", "2.4.0")) load(pathJoin("wgrib2", "2.0.8")) setenv("WGRIB2","wgrib2") diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua index 8971b0c894b..93ad98eb70e 100644 --- a/modulefiles/module_base.jet.lua +++ b/modulefiles/module_base.jet.lua @@ -19,7 +19,7 @@ load(pathJoin("nco", "4.9.1")) load(pathJoin("prod_util", "1.2.2")) load(pathJoin("grib_util", "1.2.2")) load(pathJoin("g2tmpl", "1.10.0")) -load(pathJoin("crtm", "2.3.0")) +load(pathJoin("crtm", "2.4.0")) load(pathJoin("wgrib2", "2.0.8")) whatis("Description: GFS run environment") diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua index f62f3d78048..19897aaf33d 100644 --- a/modulefiles/module_base.orion.lua +++ b/modulefiles/module_base.orion.lua @@ -23,10 +23,7 @@ load(pathJoin("prod_util", "1.2.2")) load(pathJoin("grib_util", "1.2.2")) load(pathJoin("g2tmpl", "1.10.0")) load(pathJoin("ncdiag", "1.0.0")) - -load(pathJoin("crtm", "2.3.0")) -setenv("CRTM_FIX","/apps/contrib/NCEPLIBS/orion/fix/crtm_v2.3.0") - +load(pathJoin("crtm", "2.4.0")) load(pathJoin("wgrib2", "2.0.8")) setenv("WGRIB2","wgrib2") diff --git a/modulefiles/module_base.s4.lua b/modulefiles/module_base.s4.lua index 689ae54ea9e..62170bbeb66 100644 --- a/modulefiles/module_base.s4.lua +++ b/modulefiles/module_base.s4.lua @@ -24,10 +24,7 @@ load(pathJoin("prod_util", "1.2.2")) load(pathJoin("grib_util", "1.2.2")) load(pathJoin("g2tmpl", "1.10.0")) load(pathJoin("ncdiag", "1.0.0")) - -load(pathJoin("crtm", "2.3.0")) -setenv("CRTM_FIX","/data/prod/hpc-stack/fix/crtm/2.3.0") - +load(pathJoin("crtm", "2.4.0")) load(pathJoin("wgrib2", "2.0.8")) setenv("WGRIB2","wgrib2") diff --git a/modulefiles/module_base.wcoss2.lua b/modulefiles/module_base.wcoss2.lua index a89e1dc3687..842a6092666 100644 --- a/modulefiles/module_base.wcoss2.lua +++ b/modulefiles/module_base.wcoss2.lua @@ -26,7 +26,7 @@ load(pathJoin("prod_util", "2.0.9")) load(pathJoin("grib_util", "1.2.3")) load(pathJoin("bufr_dump", "1.0.0")) load(pathJoin("util_shared", "1.4.0")) -load(pathJoin("crtm", "2.3.0")) +load(pathJoin("crtm", "2.4.0")) load(pathJoin("g2tmpl", "1.9.1")) load(pathJoin("wgrib2", "2.0.7")) From 455bdc0a70a3e2dd346b842f7953ff864dd42da5 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Fri, 17 Feb 2023 15:06:22 +0000 Subject: [PATCH 2/3] Update ufs-weather-model hash to c22aaad - Update model hash in Externals.cfg and checkout.sh. Refs #1233 --- Externals.cfg | 2 +- sorc/checkout.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index ec5b58610a3..4b5c1d318ef 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,7 +1,7 @@ # External sub-modules of global-workflow [UFS] -tag = 6b73f5d +tag = c22aaad local_path = sorc/ufs_model.fd repo_url = https://github.com/ufs-community/ufs-weather-model.git protocol = git diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 514e772c988..90226286906 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -156,7 +156,7 @@ mkdir -p "${logdir}" # The checkout version should always be a speciifc commit (hash or tag), not a branch errs=0 checkout "gfs_utils.fd" "https://github.com/NOAA-EMC/gfs-utils" "0b8ff56" ; errs=$((errs + $?)) -checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-7a1ce44}" ; errs=$((errs + $?)) +checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-c22aaad}" ; errs=$((errs + $?)) checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "8b990c0" ; errs=$((errs + $?)) checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git" "c267780" ; errs=$((errs + $?)) From 797884e0146fed9c25aa1eedc5a124fc1e90e723 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Fri, 17 Feb 2023 15:07:38 +0000 Subject: [PATCH 3/3] Temporarily force GSI to build with crtm/2.4.0 Add temporary setting in build_gsi_enkf.sh to set crtm_ver=2.4.0 for build. Will remove when we move to new GSI hash that uses 2.4.0. Refs #1233 --- sorc/build_gsi_enkf.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sorc/build_gsi_enkf.sh b/sorc/build_gsi_enkf.sh index 671c3d6205b..9bc911ef116 100755 --- a/sorc/build_gsi_enkf.sh +++ b/sorc/build_gsi_enkf.sh @@ -19,6 +19,9 @@ while getopts ":dov" option; do done shift $((OPTIND-1)) +# Temporary crtm version setting +export crtm_ver="2.4.0" + BUILD_TYPE=${BUILD_TYPE:-"Release"} \ BUILD_VERBOSE=${BUILD_VERBOSE:-"NO"} \ GSI_MODE=GFS \