diff --git a/parm/config/config.atmanal b/parm/config/config.atmanal index 854fef0059..2e36ffa603 100755 --- a/parm/config/config.atmanal +++ b/parm/config/config.atmanal @@ -5,11 +5,12 @@ echo "BEGIN: config.atmanal" -export OBS_YAML_DIR=$HOMEgfs/sorc/gdas.cd/parm/atm/obs/config/ -export OBS_LIST=$HOMEgfs/sorc/gdas.cd/parm/atm/obs/lists/gdas_prototype.yaml -export ATMVARYAML=$HOMEgfs/sorc/gdas.cd/parm/atm/variational/3dvar_dripcg.yaml -export BERROR_YAML=$HOMEgfs/sorc/gdas.cd/parm/atm/berror/staticb_identity.yaml -export FV3JEDI_FIX=$HOMEgfs/fix/gdas +export OBS_YAML_DIR=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/config/ +export OBS_LIST=${HOMEgfs}/sorc/gdas.cd/parm/atm/obs/lists/gdas_prototype.yaml +export ATMVARYAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/variational/3dvar_dripcg.yaml +export STATICB_TYPE="identity" +export BERROR_YAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/berror/staticb_${STATICB_TYPE}.yaml +export FV3JEDI_FIX=${HOMEgfs}/fix/gdas export R2D2_OBS_DB='ufsda_test' export R2D2_OBS_DUMP='oper_gdas' export R2D2_OBS_SRC='ncdiag' diff --git a/scripts/exgdas_global_atmos_analysis_run.sh b/scripts/exgdas_global_atmos_analysis_run.sh index 80ea770334..4090a7ef4b 100755 --- a/scripts/exgdas_global_atmos_analysis_run.sh +++ b/scripts/exgdas_global_atmos_analysis_run.sh @@ -103,8 +103,10 @@ fi ################################################################################ # link fix files to $DATA # static B -CASE_BERROR=${CASE_BERROR:-${CASE_ANL:-$CASE}} -$NLN $FV3JEDI_FIX/bump/$CASE_BERROR/ $DATA/berror +CASE_BERROR=${CASE_BERROR:-${CASE_ANL:-${CASE}}} +if [[ (${STATICB_TYPE} = "bump") || (${STATICB_TYPE} = "gsibec") ]] ; then + ${NLN} "${FV3JEDI_FIX}/${STATICB_TYPE}/${CASE_BERROR}/" "${DATA}/berror" +fi # vertical coordinate LAYERS=$(expr $LEVS - 1) @@ -139,9 +141,13 @@ export err=$?; err_chk ################################################################################ # translate FV3-JEDI increment to FV3 readable format -atmges_fv3=$COMIN_GES/${GPREFIX}atmf006.ensres.nc -atminc_jedi=$DATA/anl/atminc.${PDY}_${cyc}0000z.nc4 -atminc_fv3=$COMOUT/${CDUMP}.${cycle}.atminc.nc +if [[ "${CASE_BERROR}" = "${CASE}" ]]; then + atmges_fv3=${COMIN_GES}/${GPREFIX}atmf006.nc +else + atmges_fv3=${COMIN_GES}/${GPREFIX}atmf006.ensres.nc +fi +atminc_jedi=${DATA}/anl/atminc.${PDY}_${cyc}0000z.nc4 +atminc_fv3=${COMOUT}/${CDUMP}.${cycle}.atminc.nc if [ -s $atminc_jedi ]; then $INCPY $atmges_fv3 $atminc_jedi $atminc_fv3 export err=$? diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh index fdc367bcd9..5395721a0c 100755 --- a/sorc/link_workflow.sh +++ b/sorc/link_workflow.sh @@ -179,7 +179,7 @@ if [ -d "${script_dir}/gdas.cd" ]; then cd "${top_dir}/fix" || exit 1 [[ ! -d gdas ]] && mkdir -p gdas cd gdas || exit 1 - for gdas_sub in bump crtm fv3jedi; do + for gdas_sub in bump crtm fv3jedi gsibec; do if [ -d "${gdas_sub}" ]; then rm -rf "${gdas_sub}" fi diff --git a/versions/fix.ver b/versions/fix.ver index ceaaab14aa..43da6ac1c6 100644 --- a/versions/fix.ver +++ b/versions/fix.ver @@ -10,6 +10,7 @@ export datm_ver=20220805 export gdas_bump_ver=20220805 export gdas_crtm_ver=20220805 export gdas_fv3jedi_ver=20220805 +export gdas_gsibec_ver=20221031 export gldas_ver=20220920 export glwu_ver=20220805 export lut_ver=20220805