Skip to content

Commit

Permalink
restore test_gdasapp_atm_jjob functionality (#981)
Browse files Browse the repository at this point in the history
`test_gdasapp_atm_jjob` tests fail due to inconsistencies between the
GDASApp tests and recent g-w updates. This PR restores _Passed_ result
for `test_gdasapp_atm_jjob`.

Fixes #980
  • Loading branch information
RussTreadon-NOAA committed Mar 22, 2024
1 parent a575b46 commit 861ae2b
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 13 deletions.
18 changes: 11 additions & 7 deletions test/atm/global-workflow/config.atmanl
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,29 @@

echo "BEGIN: config.atmanl"

export OBS_LIST=@OBS_LIST@
export JEDIYAML="${PARMgfs}/gdas/atm/variational/3dvar_drpcg.yaml.j2"
export STATICB_TYPE=@STATICB_TYPE@
export INTERP_METHOD='barycentric'

if [[ ${DOHYBVAR} = "YES" ]]; then
# shellcheck disable=SC2153
export CASE_ANL=${CASE_ENS}
export BERROR_YAML="${PARMgfs}/gdas/atm/berror/hybvar_${STATICB_TYPE}.yaml.j2"
else
export CASE_ANL=${CASE}
export BERROR_YAML="${PARMgfs}/gdas/atm/berror/staticb_${STATICB_TYPE}.yaml.j2"
fi
export OBS_LIST=@OBS_LIST@
export JEDIYAML="${HOMEgfs}/parm/gdas/atm/variational/3dvar_drpcg.yaml.j2"
export STATICB_TYPE="identity"
export BERROR_YAML="${HOMEgfs}/parm/gdas/atm/berror/staticb_${STATICB_TYPE}.yaml.j2"
export INTERP_METHOD='barycentric'

export CRTM_FIX_YAML="${PARMgfs}/gdas/atm_crtm_coeff.yaml.j2"
export JEDI_FIX_YAML="${PARMgfs}/gdas/atm_jedi_fix.yaml.j2"

export layout_x_atmanl=@LAYOUT_X_ATMANL@
export layout_y_atmanl=@LAYOUT_Y_ATMANL@

export io_layout_x=@IO_LAYOUT_X@
export io_layout_y=@IO_LAYOUT_Y@

export JEDIEXE=${HOMEgfs}/exec/fv3jedi_var.x
export crtm_VERSION="2.4.0"
export JEDIEXE=${EXECgfs}/fv3jedi_var.x

echo "END: config.atmanl"
7 changes: 5 additions & 2 deletions test/atm/global-workflow/config.atmensanl
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,18 @@
echo "BEGIN: config.atmensanl"

export OBS_LIST=@OBS_LIST@
export JEDIYAML="${HOMEgfs}/parm/gdas/atm/lgetkf/lgetkf.yaml.j2"
export JEDIYAML="${PARMgfs}/gdas/atm/lgetkf/lgetkf.yaml.j2"
export INTERP_METHOD='barycentric'

export CRTM_FIX_YAML="${PARMgfs}/gdas/atm_crtm_coeff.yaml.j2"
export JEDI_FIX_YAML="${PARMgfs}/gdas/atm_jedi_fix.yaml.j2"

export layout_x_atmensanl=@LAYOUT_X_ATMENSANL@
export layout_y_atmensanl=@LAYOUT_Y_ATMENSANL@

export io_layout_x=@IO_LAYOUT_X@
export io_layout_y=@IO_LAYOUT_Y@

export JEDIEXE=${HOMEgfs}/exec/fv3jedi_letkf.x
export JEDIEXE=${EXECgfs}/fv3jedi_letkf.x

echo "END: config.atmensanl"
7 changes: 3 additions & 4 deletions test/atm/global-workflow/config.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
base:
HOMEgfs: "@topdir@"
DOHYBVAR: "NO"
DO_JEDIATMVAR: "YES"
DO_JEDIATMENS: "YES"
DATAPATH: "@bindir@/test/atm/global-workflow/testrun"
DUMPDIR: "@dumpdir@"
STMP: "@bindir@/test/atm/global-workflow/testrun"
PTMP: "@bindir@/test/atm/global-workflow/testrun"

atmanl:
OBS_LIST: "@srcdir@/test/atm/global-workflow/gdas_prototype.yaml.j2"
STATICB_TYPE: "identity"
ATMRES_ANL: "C48"
LAYOUT_X_ATMANL: 1
LAYOUT_Y_ATMANL: 1
IO_LAYOUT_X: 1
IO_LAYOUT_Y: 1

atmensanl:
OBS_LIST: "@srcdir@/test/atm/global-workflow/lgetkf_prototype.yaml.j2"
LAYOUT_X_ATMENSANL: 1
LAYOUT_Y_ATMENSANL: 1
IO_LAYOUT_X: 1
IO_LAYOUT_Y: 1

0 comments on commit 861ae2b

Please sign in to comment.