[production/AQM.v7] Enhancing EE2 compliance for the AQMv7 package (#…

…1034) * update the scripts for ufs/bash_util * add prep_step in post scripts * update version number of module and libs * change the trigger time for 4 cycles * update J-jobs with correction of comin and comout env definition * delete auto_A2_cp_fix.sh from ~/ush * replace PCOM with COMOUTwmo for post and bias correction jobs
ufs-community · Feb 16, 2024 · 1308f93 · 1308f93
1 parent 567da2b
commit 1308f93
Show file tree

Hide file tree

Showing 55 changed files with 239 additions and 680 deletions.
diff --git a/ecf/defs/aqm_cycled.def b/ecf/defs/aqm_cycled.def
@@ -22,40 +22,40 @@ suite nco_aqm
           family nexus
             task jaqm_nexus_emission_00
               edit NSPT '00'
-              trigger :TIME == 0151
+              trigger :TIME == 0142
             task jaqm_nexus_emission_01
               edit NSPT '01'
-              trigger :TIME == 0151
+              trigger :TIME == 0142
             task jaqm_nexus_emission_02
               edit NSPT '02'
-              trigger :TIME == 0151
+              trigger :TIME == 0142
             task jaqm_nexus_emission_03
               edit NSPT '03'
-              trigger :TIME == 0151
+              trigger :TIME == 0142
             task jaqm_nexus_emission_04
               edit NSPT '04'
-              trigger :TIME == 0151
+              trigger :TIME == 0142
             task jaqm_nexus_emission_05
               edit NSPT '05'
-              trigger :TIME == 0151
+              trigger :TIME == 0142
             task jaqm_nexus_post_split
               trigger ./jaqm_nexus_emission_00==complete and ./jaqm_nexus_emission_01==complete and ./jaqm_nexus_emission_02==complete and ./jaqm_nexus_emission_03==complete and ./jaqm_nexus_emission_04==complete and ./jaqm_nexus_emission_05==complete
           endfamily
           family prep
             task jaqm_make_ics
-              trigger :TIME == 0151
+              trigger :TIME == 0142
             task jaqm_make_lbcs
-              trigger :TIME == 0151
+              trigger :TIME == 0142
             task jaqm_ics
               trigger ./jaqm_make_ics==complete
             task jaqm_lbcs
               trigger ./jaqm_make_lbcs==complete and ./jaqm_make_ics==complete
           endfamily
           family pts_fire_emis
             task jaqm_point_source
-              trigger :TIME == 0151
+              trigger :TIME == 0142
             task jaqm_fire_emission
-              trigger :TIME == 0151
+              trigger :TIME == 0142
           endfamily
           family forecast
             task jaqm_forecast
@@ -121,40 +121,40 @@ suite nco_aqm
           family nexus
             task jaqm_nexus_emission_00
               edit NSPT '00'
-              trigger :TIME == 0751
+              trigger :TIME == 0742
             task jaqm_nexus_emission_01
               edit NSPT '01'
-              trigger :TIME == 0751
+              trigger :TIME == 0742
             task jaqm_nexus_emission_02
               edit NSPT '02'
-              trigger :TIME == 0751
+              trigger :TIME == 0742
             task jaqm_nexus_emission_03
               edit NSPT '03'
-              trigger :TIME == 0751
+              trigger :TIME == 0742
             task jaqm_nexus_emission_04
               edit NSPT '04'
-              trigger :TIME == 0751
+              trigger :TIME == 0742
             task jaqm_nexus_emission_05
               edit NSPT '05'
-              trigger :TIME == 0751
+              trigger :TIME == 0742
             task jaqm_nexus_post_split
               trigger ./jaqm_nexus_emission_00==complete and ./jaqm_nexus_emission_01==complete and ./jaqm_nexus_emission_02==complete and ./jaqm_nexus_emission_03==complete and ./jaqm_nexus_emission_04==complete and ./jaqm_nexus_emission_05==complete
           endfamily
           family prep
             task jaqm_make_ics
-              trigger :TIME == 0751
+              trigger :TIME == 0742
             task jaqm_make_lbcs
-              trigger :TIME == 0751
+              trigger :TIME == 0742
             task jaqm_ics
               trigger ./jaqm_make_ics==complete
             task jaqm_lbcs
               trigger ./jaqm_make_lbcs==complete and ./jaqm_make_ics==complete
           endfamily
           family pts_fire_emis
             task jaqm_point_source
-              trigger :TIME == 0751
+              trigger :TIME == 0742
             task jaqm_fire_emission
-              trigger :TIME == 0751
+              trigger :TIME == 0742
           endfamily
           family forecast
             task jaqm_forecast
@@ -494,40 +494,40 @@ suite nco_aqm
           family nexus
             task jaqm_nexus_emission_00
               edit NSPT '00'
-              trigger :TIME == 1351
+              trigger :TIME == 1342
             task jaqm_nexus_emission_01
               edit NSPT '01'
-              trigger :TIME == 1351
+              trigger :TIME == 1342
             task jaqm_nexus_emission_02
               edit NSPT '02'
-              trigger :TIME == 1351
+              trigger :TIME == 1342
             task jaqm_nexus_emission_03
               edit NSPT '03'
-              trigger :TIME == 1351
+              trigger :TIME == 1342
             task jaqm_nexus_emission_04
               edit NSPT '04'
-              trigger :TIME == 1351
+              trigger :TIME == 1342
             task jaqm_nexus_emission_05
               edit NSPT '05'
-              trigger :TIME == 1351
+              trigger :TIME == 1342
             task jaqm_nexus_post_split
               trigger ./jaqm_nexus_emission_00==complete and ./jaqm_nexus_emission_01==complete and ./jaqm_nexus_emission_02==complete and ./jaqm_nexus_emission_03==complete and ./jaqm_nexus_emission_04==complete and ./jaqm_nexus_emission_05==complete
           endfamily
           family prep
             task jaqm_make_ics
-              trigger :TIME == 1351
+              trigger :TIME == 1342
             task jaqm_make_lbcs
-              trigger :TIME == 1351
+              trigger :TIME == 1342
             task jaqm_ics
               trigger ./jaqm_make_ics==complete
             task jaqm_lbcs
               trigger ./jaqm_make_ics==complete and ./jaqm_make_lbcs==complete 
           endfamily
           family pts_fire_emis
             task jaqm_point_source
-              trigger :TIME == 1351
+              trigger :TIME == 1342
             task jaqm_fire_emission
-              trigger :TIME == 1351
+              trigger :TIME == 1342
           endfamily
           family forecast
             task jaqm_forecast
@@ -867,40 +867,40 @@ suite nco_aqm
           family nexus
             task jaqm_nexus_emission_00
               edit NSPT '00'
-              trigger :TIME == 2051
+              trigger :TIME == 2042
             task jaqm_nexus_emission_01
               edit NSPT '01'
-              trigger :TIME == 2051
+              trigger :TIME == 2042
             task jaqm_nexus_emission_02
               edit NSPT '02'
-              trigger :TIME == 2051
+              trigger :TIME == 2042
             task jaqm_nexus_emission_03
               edit NSPT '03'
-              trigger :TIME == 2051
+              trigger :TIME == 2042
             task jaqm_nexus_emission_04
               edit NSPT '04'
-              trigger :TIME == 2051
+              trigger :TIME == 2042
             task jaqm_nexus_emission_05
               edit NSPT '05'
-              trigger :TIME == 2051
+              trigger :TIME == 2042
             task jaqm_nexus_post_split
               trigger ./jaqm_nexus_emission_00==complete and ./jaqm_nexus_emission_01==complete and ./jaqm_nexus_emission_02==complete and ./jaqm_nexus_emission_03==complete and ./jaqm_nexus_emission_04==complete and ./jaqm_nexus_emission_05==complete
           endfamily
           family prep
             task jaqm_make_ics
-              trigger :TIME == 2051
+              trigger :TIME == 2042
             task jaqm_make_lbcs
-              trigger :TIME == 2051
+              trigger :TIME == 2042
             task jaqm_ics
               trigger ./jaqm_make_ics==complete
             task jaqm_lbcs
               trigger ./jaqm_make_lbcs==complete and ./jaqm_make_ics==complete
           endfamily
           family pts_fire_emis
             task jaqm_point_source
-              trigger :TIME == 2051
+              trigger :TIME == 2042
             task jaqm_fire_emission
-              trigger :TIME == 2051
+              trigger :TIME == 2042
           endfamily
           family forecast
             task jaqm_forecast

diff --git a/jobs/JAQM_BIAS_CORRECTION_O3 b/jobs/JAQM_BIAS_CORRECTION_O3
@@ -35,18 +35,15 @@ export SENDDBN_NTC=${SENDDBN_NTC:-NO}
 export EXECaqm=${EXECaqm:-${HOMEaqm}/exec}
 export PARMaqm=${PARMaqm:-${HOMEaqm}/parm}
 export FIXaqm=${FIXaqm:-${HOMEaqm}/fix}
-export UTILaqm=${UTILaqm:-${HOMEaqm}/util}
 
-export COMaqm=${COMaqm:-$(compath.py ${envir}/aqm/${aqm_ver})}
-export COMIN="${COMIN:-${COMaqm}/${RUN}.${PDY}}"
-export COMINm1="${COMaqm}/${RUN}.${PDYm1}"
-export COMINm2="${COMaqm}/${RUN}.${PDYm2}"
-export COMOUT="${COMOUT:-${COMaqm}/${RUN}.${PDY}/${cyc}}"
+export COMIN="${COMIN:-$(compath.py ${NET}/${aqm_ver}/${RUN}.${PDY})}"
+export COMINm1="${COMINm1:-$(compath.py ${NET}/${aqm_ver}/${RUN}.${PDYm1})}"
+export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${aqm_ver}/${RUN}.${PDY}/${cyc})}"
 
 export DCOMINairnow="${DCOMINairnow:-${DCOMROOT}}"
 
-export COMINbicor=${COMINbicor:-${COMaqm}}
-export COMOUTbicor=${COMOUTbicor:-${COMaqm}}
+export COMINbicor="${COMINbicor:-$(compath.py ${NET}/${aqm_ver})}"
+export COMOUTbicor="${COMOUTbicor:-$(compath.py -o ${NET}/${aqm_ver})}"
 
 #-----------------------------------------------------------------------
 # Get the full path to the file in which this script/function is located 
@@ -78,9 +75,9 @@ This is the J-job script for the task that runs BIAS-CORRECTION-O3.
 DATA="${DATA:-${COMIN}${SLASH_ENSMEM_SUBDIR}/tmp_BIAS_CORRECTION_O3}"
 
 if [ "${cyc}" = "06" ] || [ "${cyc}" = "12" ]; then
-  export PCOM=${PCOM:-${COMOUT}/wmo}
-  if [ ! -d "${PCOM}" ]; then 
-      mkdir -p "${PCOM}"
+  export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
+  if [ ! -d "${COMOUTwmo}" ]; then 
+      mkdir -p "${COMOUTwmo}"
   fi
 fi
 

diff --git a/jobs/JAQM_BIAS_CORRECTION_PM25 b/jobs/JAQM_BIAS_CORRECTION_PM25
@@ -35,19 +35,15 @@ export SENDDBN_NTC=${SENDDBN_NTC:-NO}
 export EXECaqm=${EXECaqm:-${HOMEaqm}/exec}
 export PARMaqm=${PARMaqm:-${HOMEaqm}/parm}
 export FIXaqm=${FIXaqm:-${HOMEaqm}/fix}
-export UTILaqm=${UTILaqm:-${HOMEaqm}/util}
 
-export COMINgfs="${COMINgfs:-$(compath.py ${envir}/gfs/${gfs_ver})}"
-export COMaqm=${COMaqm:-$(compath.py ${envir}/aqm/${aqm_ver})}
-export COMIN="${COMIN:-${COMaqm}/${RUN}.${PDY}}"
-export COMINm1="${COMaqm}/${RUN}.${PDYm1}"
-export COMINm2="${COMaqm}/${RUN}.${PDYm2}"
-export COMOUT="${COMOUT:-${COMaqm}/${RUN}.${PDY}/${cyc}}"
+export COMIN="${COMIN:-$(compath.py ${NET}/${aqm_ver}/${RUN}.${PDY})}"
+export COMINm1="${COMINm1:-$(compath.py ${NET}/${aqm_ver}/${RUN}.${PDYm1})}"
+export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${aqm_ver}/${RUN}.${PDY}/${cyc})}"
 
 export DCOMINairnow="${DCOMINairnow:-${DCOMROOT}}"
 
-export COMINbicor=${COMINbicor:-${COMaqm}}
-export COMOUTbicor=${COMOUTbicor:-${COMaqm}}
+export COMINbicor="${COMINbicor:-$(compath.py ${NET}/${aqm_ver})}"
+export COMOUTbicor="${COMOUTbicor:-$(compath.py -o ${NET}/${aqm_ver})}"
 
 #-----------------------------------------------------------------------
 # Get the full path to the file in which this script/function is located 
@@ -78,9 +74,9 @@ This is the J-job script for the task that runs BIAS-CORRECTION-PM25.
 DATA="${DATA:-${COMIN}${SLASH_ENSMEM_SUBDIR}/tmp_BIAS_CORRECTION_PM25}"
 
 if [ "${cyc}" = "06" ] || [ "${cyc}" = "12" ]; then
-  export PCOM=${PCOM:-${COMOUT}/wmo}
-  if [ ! -d "${PCOM}" ]; then 
-      mkdir -p "${PCOM}"
+  export COMOUTwmo=${COMOUTwmo:-${COMOUT}/wmo}
+  if [ ! -d "${COMOUTwmo}" ]; then 
+      mkdir -p "${COMOUTwmo}"
   fi
 fi
 

diff --git a/jobs/JAQM_FIRE_EMISSION b/jobs/JAQM_FIRE_EMISSION
@@ -31,17 +31,14 @@ export CDATE=${PDY}${cyc}
 export EXECaqm=${EXECaqm:-${HOMEaqm}/exec}
 export PARMaqm=${PARMaqm:-${HOMEaqm}/parm}
 export FIXaqm=${FIXaqm:-${HOMEaqm}/fix}
-export UTILaqm=${UTILaqm:-${HOMEaqm}/util}
 export FIXaqmfire="${FIXaqmfire:-${HOMEaqm}/fix/fire}"
 
 export DCOMROOT=${DCOMROOT:-/lfs/h1/ops/prod/dcom}
 export DCOMINfire="${DCOMINfire:-${DCOMROOT}/${PDY}/rave}"
 
-export COMaqm=${COMaqm:-$(compath.py ${envir}/aqm/${aqm_ver})}
-export COMIN="${COMIN:-${COMaqm}/${RUN}.${PDY}}"
-export COMINm1="${COMaqm}/${RUN}.${PDYm1}"
-export COMINm2="${COMaqm}/${RUN}.${PDYm2}"
-export COMOUT="${COMOUT:-${COMaqm}/${RUN}.${PDY}/${cyc}}"
+export COMINgfs="${COMINgfs:-$(compath.py gfs/${gfs_ver})}"
+export COMIN="${COMIN:-$(compath.py ${NET}/${aqm_ver}/${RUN}.${PDY})}"
+export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${aqm_ver}/${RUN}.${PDY}/${cyc})}"
 
 #-----------------------------------------------------------------------
 # Get the full path to the file in which this script/function is located 

diff --git a/jobs/JAQM_FORECAST b/jobs/JAQM_FORECAST
@@ -11,7 +11,7 @@ export PARMaqm=${PARMaqm:-${HOMEaqm}/parm}
 export subcyc=0
 export pid=${pid:-$$}
 export outid=${outid:-"LL$job"}
-export RUN="${RUN:-${RUN_dfv}}"
+export RUN="${RUN:-aqm}"
 export umbrella_forecast_data=${DATAROOT}/${RUN}_forecast_${cyc}_${aqm_ver}
 # exception handling for retro case
 if [ -d ${umbrella_forecast_data}/RESTART_ORG ]; then
@@ -44,13 +44,9 @@ export SENDDBN_NTC=${SENDDBN_NTC:-NO}
 export EXECaqm=${EXECaqm:-${HOMEaqm}/exec}
 export PARMaqm=${PARMaqm:-${HOMEaqm}/parm}
 export FIXaqm=${FIXaqm:-${HOMEaqm}/fix}
-export UTILaqm=${UTILaqm:-${HOMEaqm}/util}
 
-export COMaqm=${COMaqm:-$(compath.py ${envir}/aqm/${aqm_ver})}
-export COMIN="${COMIN:-${COMaqm}/${RUN}.${PDY}}"
-export COMINm1="${COMaqm}/${RUN}.${PDYm1}"
-export COMINm2="${COMaqm}/${RUN}.${PDYm2}"
-export COMOUT="${COMOUT:-${COMaqm}/${RUN}.${PDY}/${cyc}}"
+export COMIN="${COMIN:-$(compath.py ${NET}/${aqm_ver}/${RUN}.${PDY})}"
+export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${aqm_ver}/${RUN}.${PDY}/${cyc})}"
 
 #-----------------------------------------------------------------------
 # Get the full path to the file in which this script/function is located 

diff --git a/jobs/JAQM_FORECAST_MANAGER b/jobs/JAQM_FORECAST_MANAGER
@@ -31,13 +31,9 @@ export CDATE=${PDY}${cyc}
 export EXECaqm=${EXECaqm:-${HOMEaqm}/exec}
 export PARMaqm=${PARMaqm:-${HOMEaqm}/parm}
 export FIXaqm=${FIXaqm:-${HOMEaqm}/fix}
-export UTILaqm=${UTILaqm:-${HOMEaqm}/util}
 
-export COMINgfs="${COMINgfs:-$(compath.py ${envir}/gfs/${gfs_ver})}"
-export COMIN="${COMIN:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-export COMINm1="${COMINm1:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDYm1})}"
-export COMINm2="${COMINm1:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDYm2})}"
-export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY}/${cyc})}"
+export COMIN="${COMIN:-$(compath.py ${NET}/${aqm_ver}/${RUN}.${PDY})}"
+export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${aqm_ver}/${RUN}.${PDY}/${cyc})}"
 
 #-----------------------------------------------------------------------
 # Save current shell options (in a global array).  Then set new options
@@ -76,6 +72,15 @@ This is the J-job script for the task that runs POST-UPP-STAT.
 startmsg
 ${HOMEaqm}/scripts/exaqm_forecast_manager.sh
 export err=$?; err_chk
+
+#======================================================================
+msg="JOB ${job} HAS COMPLETED NORMALLY."
+postmsg "${msg}"
+
+if [ "${KEEPDATA}" != "YES" ]; then
+	   rm -rf ${DATA}
+fi
+
 # Print exit message
 print_info_msg "
 ========================================================================

diff --git a/jobs/JAQM_ICS b/jobs/JAQM_ICS
@@ -34,14 +34,10 @@ export CDATE=${PDY}${cyc}
 export EXECaqm=${EXECaqm:-${HOMEaqm}/exec}
 export PARMaqm=${PARMaqm:-${HOMEaqm}/parm}
 export FIXaqm=${FIXaqm:-${HOMEaqm}/fix}
-export UTILaqm=${UTILaqm:-${HOMEaqm}/util}
-
-export COMINgfs="${COMINgfs:-$(compath.py ${envir}/gfs/${gfs_ver})}"
-export COMaqm=${COMaqm:-$(compath.py ${envir}/aqm/${aqm_ver})}
-export COMIN="${COMIN:-${COMaqm}/${RUN}.${PDY}}"
-export COMINm1="${COMaqm}/${RUN}.${PDYm1}"
-export COMINm2="${COMaqm}/${RUN}.${PDYm2}"
-export COMOUT="${COMOUT:-${COMaqm}/${RUN}.${PDY}/${cyc}}"
+
+export COMINgfs="${COMINgfs:-$(compath.py gfs/${gfs_ver})}"
+export COMIN="${COMIN:-$(compath.py ${NET}/${aqm_ver}/${RUN}.${PDY})}"
+export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${aqm_ver}/${RUN}.${PDY}/${cyc})}"
 
 #-----------------------------------------------------------------------
 # Get the full path to the file in which this script/function is located 

diff --git a/jobs/JAQM_LBCS b/jobs/JAQM_LBCS
@@ -34,18 +34,14 @@ export CDATE=${PDY}${cyc}
 export EXECaqm=${EXECaqm:-${HOMEaqm}/exec}
 export PARMaqm=${PARMaqm:-${HOMEaqm}/parm}
 export FIXaqm=${FIXaqm:-${HOMEaqm}/fix}
-export UTILaqm=${UTILaqm:-${HOMEaqm}/util}
 
-export COMINgfs="${COMINgfs:-$(compath.py ${envir}/gfs/${gfs_ver})}"
-export COMaqm=${COMaqm:-$(compath.py ${envir}/aqm/${aqm_ver})}
-export COMIN="${COMIN:-${COMaqm}/${RUN}.${PDY}}"
-export COMINm1="${COMaqm}/${RUN}.${PDYm1}"
-export COMINm2="${COMaqm}/${RUN}.${PDYm2}"
-export COMOUT="${COMOUT:-${COMaqm}/${RUN}.${PDY}/${cyc}}"
-
-export COMINgefs="${COMINgefs:-$(compath.py ${envir}/gefs/${gefs_ver})}"
 export FIXaqmchem_lbcs="${FIXaqmchem_lbcs:-${HOMEaqm}/fix/chem_lbcs}"
 
+export COMINgfs="${COMINgfs:-$(compath.py gfs/${gfs_ver})}"
+export COMINgefs="${COMINgefs:-$(compath.py gefs/${gefs_ver})}"
+export COMIN="${COMIN:-$(compath.py ${NET}/${aqm_ver}/${RUN}.${PDY})}"
+export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${aqm_ver}/${RUN}.${PDY}/${cyc})}"
+
 #-----------------------------------------------------------------------
 # Get the full path to the file in which this script/function is located 
 # (scrfunc_fp), the name of that file (scrfunc_fn), and the directory in