diff --git a/Externals.cfg b/Externals.cfg index a8d805e4a4..0a3a7b50c4 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -29,7 +29,7 @@ protocol = git required = True [GSI-EnKF] -hash = 31b8b29 +hash = 113e307 local_path = sorc/gsi_enkf.fd repo_url = https://github.com/NOAA-EMC/GSI.git protocol = git @@ -43,7 +43,7 @@ protocol = git required = False [GSI-Monitor] -hash = c64cc47 +hash = 8cf16de local_path = sorc/gsi_monitor.fd repo_url = https://github.com/NOAA-EMC/GSI-monitor.git protocol = git diff --git a/modulefiles/module_base.wcoss2.lua b/modulefiles/module_base.wcoss2.lua index 5023a766ab..7faa8f11a1 100644 --- a/modulefiles/module_base.wcoss2.lua +++ b/modulefiles/module_base.wcoss2.lua @@ -26,16 +26,11 @@ 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.4.0")) load(pathJoin("g2tmpl", "1.9.1")) +load(pathJoin("ncdiag", "1.0.0")) +load(pathJoin("crtm", "2.4.0")) load(pathJoin("wgrib2", "2.0.7")) -pushenv("HPC_OPT", "/apps/ops/para/libs") -append_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304") -append_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7") - -load("ncdiag/1.0.0") - prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/v1.0.1/modulefiles")) load(pathJoin("prepobs", "1.0.1")) diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 85782c153b..34143011fb 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -161,7 +161,7 @@ checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git" "c267780" ; errs=$((errs + $?)) if [[ ${checkout_gsi} == "YES" ]]; then - checkout "gsi_enkf.fd" "https://github.com/NOAA-EMC/GSI.git" "31b8b29" "NO"; errs=$((errs + $?)) + checkout "gsi_enkf.fd" "https://github.com/NOAA-EMC/GSI.git" "113e307" "NO"; errs=$((errs + $?)) fi if [[ ${checkout_gdas} == "YES" ]]; then @@ -170,7 +170,7 @@ fi if [[ ${checkout_gsi} == "YES" || ${checkout_gdas} == "YES" ]]; then checkout "gsi_utils.fd" "https://github.com/NOAA-EMC/GSI-Utils.git" "322cc7b"; errs=$((errs + $?)) - checkout "gsi_monitor.fd" "https://github.com/NOAA-EMC/GSI-Monitor.git" "c64cc47"; errs=$((errs + $?)) + checkout "gsi_monitor.fd" "https://github.com/NOAA-EMC/GSI-Monitor.git" "8cf16de"; errs=$((errs + $?)) checkout "gldas.fd" "https://github.com/NOAA-EMC/GLDAS.git" "fd8ba62"; errs=$((errs + $?)) fi