diff --git a/Externals.cfg b/Externals.cfg index bf67375691..6176a7e3b8 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -57,7 +57,7 @@ protocol = git required = False [GDASApp] -hash = 7e3d694 +hash = fd8aa2f local_path = sorc/gdas.cd repo_url = https://github.com/NOAA-EMC/GDASApp.git protocol = git diff --git a/jobs/rocoto/preplandobs.sh b/jobs/rocoto/preplandobs.sh index 399b26048c..6304dd611b 100755 --- a/jobs/rocoto/preplandobs.sh +++ b/jobs/rocoto/preplandobs.sh @@ -14,7 +14,7 @@ export jobid="${job}.$$" ############################################################### # setup python path for workflow utilities and tasks wxflowPATH="${HOMEgfs}/ush/python:${HOMEgfs}/ush/python/wxflow/src" -gdasappPATH="${HOMEgfs}/sorc/gdas.cd/iodaconv/src:${HOMEgfs}/sorc/gdas.cd/build/lib/python3.7/pyioda" +gdasappPATH="${HOMEgfs}/sorc/gdas.cd/iodaconv/src:${HOMEgfs}/sorc/gdas.cd/build/lib/python3.7" PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${wxflowPATH}:${gdasappPATH}" export PYTHONPATH diff --git a/parm/config/gfs/config.landanl b/parm/config/gfs/config.landanl index bfeb47ae91..942e4528fe 100644 --- a/parm/config/gfs/config.landanl +++ b/parm/config/gfs/config.landanl @@ -21,11 +21,7 @@ export JEDIEXE="${HOMEgfs}/exec/fv3jedi_letkf.x" export JEDIYAML="${HOMEgfs}/sorc/gdas.cd/parm/land/letkfoi/letkfoi.yaml" # Ensemble member properties -if [[ "${FRAC_GRID}" = ".true." ]]; then - export SNOWDEPTHVAR="snodl" -elif [[ "${FRAC_GRID}" = ".false." ]]; then - export SNOWDEPTHVAR="snwdph" -fi +export SNOWDEPTHVAR="snodl" export BESTDDEV="30." # Background Error Std. Dev. for LETKFOI # Name of the executable that applies increment to bkg and its namelist template diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 9cf1dde20b..acf5ae072a 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -160,7 +160,7 @@ if [[ ${checkout_gsi} == "YES" ]]; then fi if [[ ${checkout_gdas} == "YES" ]]; then - checkout "gdas.cd" "https://github.com/NOAA-EMC/GDASApp.git" "7e3d694"; errs=$((errs + $?)) + checkout "gdas.cd" "https://github.com/NOAA-EMC/GDASApp.git" "fd8aa2f"; errs=$((errs + $?)) fi if [[ ${checkout_gsi} == "YES" || ${checkout_gdas} == "YES" ]]; then diff --git a/ush/python/pygfs/task/land_analysis.py b/ush/python/pygfs/task/land_analysis.py index 5439679db6..390e559d95 100644 --- a/ush/python/pygfs/task/land_analysis.py +++ b/ush/python/pygfs/task/land_analysis.py @@ -224,8 +224,7 @@ def execute(self) -> None: localconf = AttrDict() keys = ['HOMEgfs', 'DATA', 'current_cycle', 'COM_ATMOS_RESTART_PREV', 'COM_LAND_ANALYSIS', 'APREFIX', - 'SNOWDEPTHVAR', 'BESTDDEV', - 'FRAC_GRID', 'CASE', 'ntiles', + 'SNOWDEPTHVAR', 'BESTDDEV', 'CASE', 'ntiles', 'APRUN_LANDANL', 'JEDIEXE', 'jedi_yaml', 'APPLY_INCR_NML_TMPL', 'APPLY_INCR_EXE', 'APRUN_APPLY_INCR'] for key in keys: @@ -383,7 +382,7 @@ def create_ensemble(vname: str, bestddev: float, config: Dict) -> None: Parameters ---------- vname : str - snow depth variable to perturb. "snowdl" or "snwdph" depending on FRAC_GRID (.true.|.false.) + snow depth variable to perturb: "snodl" bestddev : float Background Error Standard Deviation to perturb around to create ensemble config: Dict @@ -432,7 +431,6 @@ def add_increments(config: Dict) -> None: COM_ATMOS_RESTART_PREV DATA current_cycle - FRAC_GRID CASE ntiles APPLY_INCR_NML_TMPL