Update crtm to v2.4.0 (#1319)

* Update module_base modulefiles to use crtm/2.4.0. * Remove line in module_base modulefiles to set CRTM_FIX; this variable is now set in the crtm module as of v2.4.0. * Update ufs-weather-model hash to c22aaad * Temporarily set crtm_ver in GSI build script to force GSI to build with crtm/2.4.0 Refs #1233
NOAA-EMC · Feb 22, 2023 · dbbd8b1 · dbbd8b1
1 parent adae24c
commit dbbd8b1
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 16 deletions.
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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"))
 

diff --git 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 \

diff --git 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 + $?))