Skip to content

Update crtm to v2.4.0 #1319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KateFriedman-NOAA merged 8 commits into from
Feb 22, 2023
Merged

Update crtm to v2.4.0 #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b59c762
Update crtm version to 2.4.0
KateFriedman-NOAA Feb 14, 2023
b99c2d3
Merge branch 'NOAA-EMC:develop' into feature/crtm-240
KateFriedman-NOAA Feb 15, 2023
3110010
Merge branch 'NOAA-EMC:develop' into feature/crtm-240
KateFriedman-NOAA Feb 16, 2023
455bdc0
Update ufs-weather-model hash to c22aaad
KateFriedman-NOAA Feb 17, 2023
797884e
Temporarily force GSI to build with crtm/2.4.0
KateFriedman-NOAA Feb 17, 2023
ac0d974
Merge branch 'NOAA-EMC:develop' into feature/crtm-240
KateFriedman-NOAA Feb 21, 2023
a4c78ff
Merge branch 'NOAA-EMC:develop' into feature/crtm-240
KateFriedman-NOAA Feb 22, 2023
fa5d124
Merge branch 'NOAA-EMC:develop' into feature/crtm-240
KateFriedman-NOAA Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions modulefiles/module_base.hera.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion modulefiles/module_base.jet.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
5 changes: 1 addition & 4 deletions modulefiles/module_base.orion.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
5 changes: 1 addition & 4 deletions modulefiles/module_base.s4.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion modulefiles/module_base.wcoss2.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

Expand Down
3 changes: 3 additions & 0 deletions sorc/build_gsi_enkf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion sorc/checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 + $?))

Expand Down