diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN index 3a5ea3a79f3..b344a0e0afb 100755 --- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN +++ b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN @@ -1,5 +1,10 @@ #!/bin/bash source "${HOMEgfs}/ush/preamble.sh" + +export DATAjob="${DATAROOT}/${RUN}marineanalysis.${PDY:-}${cyc}" +export DATA="${DATAjob}/${jobid}" +export DATAens="${DATAjob}/ensdata" + source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalecen" -c "base marineanl ocnanalecen" ############################################## @@ -10,21 +15,22 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalecen" -c "base marineanl ocnan GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours") export gPDY=${GDATE:0:8} export gcyc=${GDATE:8:2} +export GDUMP="gdas" +export GDUMP_ENS="enkf${GDUMP}" -YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ +RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ COMIN_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL \ COMIN_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL +RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \ + COMIN_OCEAN_HISTORY_ENS_PREV:COM_OCEAN_HISTORY_TMPL \ + COMIN_ICE_HISTORY_ENS_PREV:COM_ICE_HISTORY_TMPL + YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \ COMOUT_OCEAN_ANALYSIS:COM_OCEAN_ANALYSIS_TMPL \ COMIN_ICE_RESTART:COM_ICE_RESTART_TMPL \ COMOUT_ICE_ANALYSIS:COM_ICE_ANALYSIS_TMPL -export DATAjob="${DATAROOT}/${RUN}marineanalysis.${PDY:-}${cyc}" -export DATAens="${DATAjob}/ensdata" -export GDUMP="gdas" -export GDUMP_ENS="enkf${GDUMP}" - ############################################## # Begin JOB SPECIFIC work ############################################## diff --git a/sorc/gdas.cd b/sorc/gdas.cd index 4525d36bb21..964a927011d 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit 4525d36bb2175b8cca2e9fe0dd80651a9b45dcca +Subproject commit 964a927011df5c330cd546c3ffec507f4db1952a