From 1ed67d9939a8f789da6918f1a1150e12da709119 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 1 Sep 2023 15:00:26 +0000 Subject: [PATCH 1/3] fix for gsi --- scripts/exgdas_enkf_update.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/exgdas_enkf_update.sh b/scripts/exgdas_enkf_update.sh index 3e931d39ff..1f11026ac4 100755 --- a/scripts/exgdas_enkf_update.sh +++ b/scripts/exgdas_enkf_update.sh @@ -99,7 +99,7 @@ use_gfs_nemsio=".false." paranc=${paranc:-".true."} WRITE_INCR_ZERO="incvars_to_zero= $INCREMENTS_TO_ZERO," if [ $DO_CALC_INCREMENT = "YES" ]; then - write_fv3_incr=".false." + write_fv3_incr=".false." else write_fv3_incr=".true." fi @@ -255,7 +255,7 @@ cat > enkf.nml << EOFnml &nam_enkf datestring="${PDY}${cyc}",datapath="$DATA/", analpertwtnh=${analpertwt},analpertwtsh=${analpertwt},analpertwttr=${analpertwt}, - covinflatemax=1.e2,covinflatemin=1,pseudo_rh=.true.,iassim_order=0, + covinflatemax=1.e2,covinflatemin=1,pseudo_rh=.false.,iassim_order=0, corrlengthnh=${corrlength},corrlengthsh=${corrlength},corrlengthtr=${corrlength}, lnsigcutoffnh=${lnsigcutoff},lnsigcutoffsh=${lnsigcutoff},lnsigcutofftr=${lnsigcutoff}, lnsigcutoffpsnh=${lnsigcutoff},lnsigcutoffpssh=${lnsigcutoff},lnsigcutoffpstr=${lnsigcutoff}, @@ -269,7 +269,7 @@ cat > enkf.nml << EOFnml use_gfs_nemsio=${use_gfs_nemsio},use_gfs_ncio=${use_gfs_ncio},imp_physics=$imp_physics,lupp=$lupp, univaroz=.false.,adp_anglebc=.true.,angord=4,use_edges=.false.,emiss_bc=.true., letkf_flag=${letkf_flag},nobsl_max=${nobsl_max},denkf=${denkf},getkf=${getkf}., - nhr_anal=${IAUFHRS_ENKF},nhr_state=${IAUFHRS_ENKF},use_qsatensmean=.true., + nhr_anal=${IAUFHRS_ENKF},nhr_state=${IAUFHRS_ENKF}, lobsdiag_forenkf=$lobsdiag_forenkf, write_spread_diag=$write_spread_diag, modelspace_vloc=$modelspace_vloc, From deda645dc93eb4e31b58ab82cc5e457dbeff8ce3 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Fri, 1 Sep 2023 15:11:36 +0000 Subject: [PATCH 2/3] Update gsi hash --- Externals.cfg | 2 +- sorc/checkout.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index f6ac6586a9..35ab85d3e9 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -36,7 +36,7 @@ protocol = git required = True [GSI-EnKF] -hash = 8735959 +hash = 9e5aa09 local_path = sorc/gsi_enkf.fd repo_url = https://github.com/NOAA-EMC/GSI.git protocol = git diff --git a/sorc/checkout.sh b/sorc/checkout.sh index dcf0d192f3..d1fad13431 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -156,7 +156,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" "8735959" "NO"; errs=$((errs + $?)) + checkout "gsi_enkf.fd" "https://github.com/NOAA-EMC/GSI.git" "9e5aa09" "NO"; errs=$((errs + $?)) fi if [[ ${checkout_gdas} == "YES" ]]; then From 24aa9ab8022fc1b23cb1bc7175aab51de44efb70 Mon Sep 17 00:00:00 2001 From: CoryMartin-NOAA Date: Tue, 5 Sep 2023 14:18:18 +0000 Subject: [PATCH 3/3] Try slightly older hash --- Externals.cfg | 2 +- sorc/checkout.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 203702e34f..17bb9686fd 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -36,7 +36,7 @@ protocol = git required = True [GSI-EnKF] -hash = 9e5aa09 +hash = accb07e local_path = sorc/gsi_enkf.fd repo_url = https://github.com/NOAA-EMC/GSI.git protocol = git diff --git a/sorc/checkout.sh b/sorc/checkout.sh index af5d344a0f..314fcd8ba2 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -156,7 +156,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" "9e5aa09" "NO"; errs=$((errs + $?)) + checkout "gsi_enkf.fd" "https://github.com/NOAA-EMC/GSI.git" "accb07e" "NO"; errs=$((errs + $?)) fi if [[ ${checkout_gdas} == "YES" ]]; then