update nc suffix in atm_jjob var and ens ctests, generalize atm and e…

…ns layout (NOAA-EMC#911)
RussTreadon-NOAA · Feb 23, 2024 · 267687c · 267687c
1 parent c2d8235
commit 267687c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 11 deletions.
diff --git a/test/atm/global-workflow/config.atmanl b/test/atm/global-workflow/config.atmanl
@@ -13,11 +13,11 @@ export STATICB_TYPE="identity"
 export BERROR_YAML=${HOMEgfs}/sorc/gdas.cd/parm/atm/berror/staticb_${STATICB_TYPE}.yaml
 export INTERP_METHOD='barycentric'
 
-export layout_x=1
-export layout_y=1
+export layout_x_atmanl=@LAYOUT_X_ATMANL@
+export layout_y_atmanl=@LAYOUT_Y_ATMANL@
 
-export io_layout_x=1
-export io_layout_y=1
+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"

diff --git a/test/atm/global-workflow/config.yaml b/test/atm/global-workflow/config.yaml
@@ -9,3 +9,13 @@ base:
 atmanl:
   OBS_LIST: "@srcdir@/test/atm/global-workflow/gdas_prototype.yaml"
   ATMRES_ANL: "C48"
+  LAYOUT_X_ATMANL: 1
+  LAYOUT_Y_ATMANL: 1
+  IO_LAYOUT_X: 1
+  IO_LAYOUT_Y: 1
+
+atmensanl:
+  LAYOUT_X_ATMENSANL: 1
+  LAYOUT_Y_ATMENSANL: 1
+  IO_LAYOUT_X: 1
+  IO_LAYOUT_Y: 1
diff --git a/test/atm/global-workflow/jjob_ens_init.sh b/test/atm/global-workflow/jjob_ens_init.sh
@@ -68,15 +68,19 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} generate_com -rx \
 # Link observations
 dpath=gdas.$PDY/$cyc/obs
 mkdir -p $COM_OBS
-flist="amsua_n19.$CDATE.nc4 sondes.$CDATE.nc4"
+flist="amsua_n19.$CDATE sondes.$CDATE"
 for file in $flist; do
-   ln -fs $GDASAPP_TESTDATA/lowres/$dpath/${oprefix}.$file $COM_OBS/${oprefix}.$file
+   ln -fs $GDASAPP_TESTDATA/lowres/$dpath/${oprefix}.${file}.nc4 $COM_OBS/${oprefix}.${file}.nc
 done
 
 # Link radiance bias correction files
 dpath=gdas.$gPDY/$gcyc/analysis/atmos
 mkdir -p $COM_ATMOS_ANALYSIS_PREV
-flist="amsua_n19.satbias.nc4 amsua_n19.satbias_cov.nc4 amsua_n19.tlapse.txt"
+flist="amsua_n19.satbias amsua_n19.satbias_cov"
+for file in $flist; do
+   ln -fs $GDASAPP_TESTDATA/lowres/$dpath/$gprefix.${file}.nc4 $COM_ATMOS_ANALYSIS_PREV/$gprefix.${file}.nc
+done
+flist="amsua_n19.tlapse.txt"
 for file in $flist; do
    ln -fs $GDASAPP_TESTDATA/lowres/$dpath/$gprefix.$file $COM_ATMOS_ANALYSIS_PREV/$gprefix.$file
 done

diff --git a/test/atm/global-workflow/jjob_var_init.sh b/test/atm/global-workflow/jjob_var_init.sh
@@ -70,17 +70,21 @@ RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} generate_com -rx \
 # Link observations
 dpath=gdas.$PDY/$cyc/obs
 mkdir -p $COM_OBS
-flist="amsua_n19.$CDATE.nc4 sondes.$CDATE.nc4"
+flist="amsua_n19.$CDATE sondes.$CDATE"
 for file in $flist; do
-   ln -fs $GDASAPP_TESTDATA/lowres/$dpath/${oprefix}.$file $COM_OBS/${oprefix}.$file
+   ln -fs $GDASAPP_TESTDATA/lowres/$dpath/${oprefix}.${file}.nc4 $COM_OBS/${oprefix}.${file}.nc
 done
 
 # Link radiance bias correction files
 dpath=gdas.$gPDY/$gcyc/analysis/atmos
 mkdir -p $COM_ATMOS_ANALYSIS_PREV
-flist="amsua_n19.satbias.nc4 amsua_n19.satbias_cov.nc4 amsua_n19.tlapse.txt"
+flist="amsua_n19.satbias amsua_n19.satbias_cov"
 for file in $flist; do
-   ln -fs $GDASAPP_TESTDATA/lowres/$dpath/$gprefix.$file $COM_ATMOS_ANALYSIS_PREV/$gprefix.$file
+   ln -fs $GDASAPP_TESTDATA/lowres/$dpath/$gprefix.${file}.nc4 $COM_ATMOS_ANALYSIS_PREV/$gprefix.${file}.nc
+done
+flist="amsua_n19.tlapse.txt"
+for file in $flist; do
+   ln -fs $GDASAPP_TESTDATA/lowres/$dpath/$gprefix.${file} $COM_ATMOS_ANALYSIS_PREV/$gprefix.${file}
 done
 
 # Link atmospheric background on gaussian grid