Skip to content

Commit

Permalink
Enhancing EE2 compliance in support of the AQMv7 implementation (#1008)
Browse files Browse the repository at this point in the history
* adding a new task to monitoring forecast job and copy output files from  to  and replace ln -sf with cpreq for several exscripts

* disable MODIS_XLAI for nexus

* update exaqm_output.sh

* update exscript for forecast and output

* adding make_ics as the 2nd trigger condition for aqm_lbc ecf task

* update forecast and monitoring job to copy model output and restart files to

* Merge from AQM forecast RESTART solution redesign requested by NCO

* adding an exaqm script for the forecast_manager task

* Update NCO quested forecast RESTART change

* Update ecflow event to use new RESTART interval

* including the change for generation of var_defns.sh and input.nml

* upate J-jobs for sourcing var_defns.sh

* update aqm_nco_conf.sh and i add input.nml file

* clean up var_defns.sh file

* update the changes provided by NCO and rename grib2 files and adding missing grib2 files for G227, G198, and G196

* update the trigger condition for aqm_lbcs

* update JAQM_FORECAST job

* upate var_defns.template

---------

Co-authored-by: Lin.Gan <[email protected]>
Co-authored-by: lgannoaa <[email protected]>
  • Loading branch information
3 people authored Feb 5, 2024
1 parent c069c2a commit 9198b6a
Show file tree
Hide file tree
Showing 35 changed files with 1,039 additions and 1,690 deletions.
208 changes: 202 additions & 6 deletions ecf/defs/aqm_cycled.def
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
suite nco_aqm
family primary
edit aqm_ver 'v7.0.1'
edit PACKAGEHOME '/lfs/h2/emc/global/noscrub/%EMC_USER%/para/packages/aqm.%aqm_ver%'
edit PACKAGEHOME '/lfs/h2/emc/physics/noscrub/%EMC_USER%/nwdev/packages/aqm.%aqm_ver%'
edit NET 'aqm'
edit RUN 'aqm'
edit PROJ 'AQM'
edit PROJENVIR 'DEV'
edit MACHINE_SITE 'development'
edit ENVIR 'prod'
edit QUEUE 'dev'
edit QUEUE 'devhigh'
edit QUEUE_ARCH 'dev_transfer'
edit OUTPUTDIR '/lfs/h2/emc/ptmp/%EMC_USER%/ecflow_aqm/para/output/prod/today'
family 00
Expand Down Expand Up @@ -49,7 +49,7 @@ suite nco_aqm
task jaqm_ics
trigger ./jaqm_make_ics==complete
task jaqm_lbcs
trigger ./jaqm_make_lbcs==complete
trigger ./jaqm_make_lbcs==complete and ./jaqm_make_ics==complete
endfamily
family pts_fire_emis
task jaqm_point_source
Expand All @@ -60,6 +60,17 @@ suite nco_aqm
family forecast
task jaqm_forecast
trigger ../nexus==complete and ../prep==complete and ../pts_fire_emis==complete
event 1 release_manager
task jaqm_forecast_manager
trigger ./jaqm_forecast:release_manager
event 1 restart_gp1_rdy
event 2 000_rdy
event 3 001_rdy
event 4 002_rdy
event 5 003_rdy
event 6 004_rdy
event 7 005_rdy
event 8 006_rdy
endfamily
family post
task jaqm_post_f000
Expand Down Expand Up @@ -137,7 +148,7 @@ suite nco_aqm
task jaqm_ics
trigger ./jaqm_make_ics==complete
task jaqm_lbcs
trigger ./jaqm_make_lbcs==complete
trigger ./jaqm_make_lbcs==complete and ./jaqm_make_ics==complete
endfamily
family pts_fire_emis
task jaqm_point_source
Expand All @@ -148,6 +159,93 @@ suite nco_aqm
family forecast
task jaqm_forecast
trigger ../nexus==complete and ../prep==complete and ../pts_fire_emis==complete
event 1 release_manager
task jaqm_forecast_manager
trigger ./jaqm_forecast:release_manager
event 1 restart_gp1_rdy
event 2 restart_gp2_rdy
event 3 restart_gp3_rdy
event 4 restart_gp4_rdy
event 5 restart_gp5_rdy
event 6 restart_gp6_rdy
event 7 restart_gp7_rdy
event 8 restart_gp8_rdy
event 9 restart_gp9_rdy
event 10 restart_gp10_rdy
event 11 restart_gp11_rdy
event 12 000_rdy
event 13 001_rdy
event 14 002_rdy
event 15 003_rdy
event 16 004_rdy
event 17 005_rdy
event 18 006_rdy
event 19 007_rdy
event 20 008_rdy
event 21 009_rdy
event 22 010_rdy
event 23 011_rdy
event 24 012_rdy
event 25 013_rdy
event 26 014_rdy
event 27 015_rdy
event 28 016_rdy
event 29 017_rdy
event 30 018_rdy
event 31 019_rdy
event 32 020_rdy
event 33 021_rdy
event 34 022_rdy
event 35 023_rdy
event 36 024_rdy
event 37 025_rdy
event 38 026_rdy
event 39 027_rdy
event 40 028_rdy
event 41 029_rdy
event 42 030_rdy
event 43 031_rdy
event 44 032_rdy
event 45 033_rdy
event 46 034_rdy
event 47 035_rdy
event 48 036_rdy
event 49 037_rdy
event 50 038_rdy
event 51 039_rdy
event 52 040_rdy
event 53 041_rdy
event 54 042_rdy
event 55 043_rdy
event 56 044_rdy
event 57 045_rdy
event 58 046_rdy
event 59 047_rdy
event 60 048_rdy
event 61 049_rdy
event 62 050_rdy
event 63 051_rdy
event 64 052_rdy
event 65 053_rdy
event 66 054_rdy
event 67 055_rdy
event 68 056_rdy
event 69 057_rdy
event 70 058_rdy
event 71 059_rdy
event 72 060_rdy
event 73 061_rdy
event 74 062_rdy
event 75 063_rdy
event 76 064_rdy
event 77 065_rdy
event 78 066_rdy
event 79 067_rdy
event 80 068_rdy
event 81 069_rdy
event 82 070_rdy
event 83 071_rdy
event 84 072_rdy
endfamily
family post
task jaqm_post_f000
Expand Down Expand Up @@ -423,7 +521,7 @@ suite nco_aqm
task jaqm_ics
trigger ./jaqm_make_ics==complete
task jaqm_lbcs
trigger ./jaqm_make_lbcs==complete
trigger ./jaqm_make_ics==complete and ./jaqm_make_lbcs==complete
endfamily
family pts_fire_emis
task jaqm_point_source
Expand All @@ -434,6 +532,93 @@ suite nco_aqm
family forecast
task jaqm_forecast
trigger ../nexus==complete and ../prep==complete and ../pts_fire_emis==complete
event 1 release_manager
task jaqm_forecast_manager
trigger ./jaqm_forecast:release_manager
event 1 restart_gp1_rdy
event 2 restart_gp2_rdy
event 3 restart_gp3_rdy
event 4 restart_gp4_rdy
event 5 restart_gp5_rdy
event 6 restart_gp6_rdy
event 7 restart_gp7_rdy
event 8 restart_gp8_rdy
event 9 restart_gp9_rdy
event 10 restart_gp10_rdy
event 11 restart_gp11_rdy
event 12 000_rdy
event 13 001_rdy
event 14 002_rdy
event 15 003_rdy
event 16 004_rdy
event 17 005_rdy
event 18 006_rdy
event 19 007_rdy
event 20 008_rdy
event 21 009_rdy
event 22 010_rdy
event 23 011_rdy
event 24 012_rdy
event 25 013_rdy
event 26 014_rdy
event 27 015_rdy
event 28 016_rdy
event 29 017_rdy
event 30 018_rdy
event 31 019_rdy
event 32 020_rdy
event 33 021_rdy
event 34 022_rdy
event 35 023_rdy
event 36 024_rdy
event 37 025_rdy
event 38 026_rdy
event 39 027_rdy
event 40 028_rdy
event 41 029_rdy
event 42 030_rdy
event 43 031_rdy
event 44 032_rdy
event 45 033_rdy
event 46 034_rdy
event 47 035_rdy
event 48 036_rdy
event 49 037_rdy
event 50 038_rdy
event 51 039_rdy
event 52 040_rdy
event 53 041_rdy
event 54 042_rdy
event 55 043_rdy
event 56 044_rdy
event 57 045_rdy
event 58 046_rdy
event 59 047_rdy
event 60 048_rdy
event 61 049_rdy
event 62 050_rdy
event 63 051_rdy
event 64 052_rdy
event 65 053_rdy
event 66 054_rdy
event 67 055_rdy
event 68 056_rdy
event 69 057_rdy
event 70 058_rdy
event 71 059_rdy
event 72 060_rdy
event 73 061_rdy
event 74 062_rdy
event 75 063_rdy
event 76 064_rdy
event 77 065_rdy
event 78 066_rdy
event 79 067_rdy
event 80 068_rdy
event 81 069_rdy
event 82 070_rdy
event 83 071_rdy
event 84 072_rdy
endfamily
family post
task jaqm_post_f000
Expand Down Expand Up @@ -709,7 +894,7 @@ suite nco_aqm
task jaqm_ics
trigger ./jaqm_make_ics==complete
task jaqm_lbcs
trigger ./jaqm_make_lbcs==complete
trigger ./jaqm_make_lbcs==complete and ./jaqm_make_ics==complete
endfamily
family pts_fire_emis
task jaqm_point_source
Expand All @@ -720,6 +905,17 @@ suite nco_aqm
family forecast
task jaqm_forecast
trigger ../nexus==complete and ../prep==complete and ../pts_fire_emis==complete
event 1 release_manager
task jaqm_forecast_manager
trigger ./jaqm_forecast:release_manager
event 1 restart_gp1_rdy
event 2 000_rdy
event 3 001_rdy
event 4 002_rdy
event 5 003_rdy
event 6 004_rdy
event 7 005_rdy
event 8 006_rdy
endfamily
family post
task jaqm_post_f000
Expand Down
20 changes: 17 additions & 3 deletions ecf/include/envir-p1.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# envir-p1.h
export job=${job:-$PBS_JOBNAME}
export jobid=${jobid:-$job.$PBS_JOBID}

export RUN_ENVIR=nco
export RUN=%RUN%
export NET=%NET%
export envir=%ENVIR%
export MACHINE_SITE=%MACHINE_SITE%
export RUN=%RUN%

if [ -n "%SENDCANNEDDBN:%" ]; then export SENDCANNEDDBN=${SENDCANNEDDBN:-%SENDCANNEDDBN:%}; fi
export SENDCANNEDDBN=${SENDCANNEDDBN:-"NO"}
Expand All @@ -23,8 +24,21 @@ export DBNROOT=$SIPHONROOT

if [[ ! " prod para test " =~ " ${envir} " && " ops.prod ops.para " =~ " $(whoami) " ]]; then err_exit "ENVIR must be prod, para, or test [envir-p1.h]"; fi

# Developer configuration
PTMP=/lfs/h2/emc/ptmp
model=aqm
PSLOT=ecflow_aqm
export COMROOT=${PTMP}/${USER}/${PSLOT}/para/com
export COMPATH=${COMROOT}/${model}
if [ -n "%PDY:%" ]; then
export PDY=${PDY:-%PDY:%}
export CDATE=${PDY}%CYC:%
else
export PDY=$($NDATE | cut -c1-8)
fi
export CDATE=${PDY}%CYC:%
export COMaqm=$(compath.py aqm/${aqm_ver})
export COMOUT_PREP="$(compath.py obsproc/v1.1.0)"

export DATAROOT=/lfs/h2/emc/stmp/${USER}/${model}/${PSLOT}
mkdir -p ${DATAROOT} # ${COMaqm}

10 changes: 10 additions & 0 deletions ecf/scripts/cycle_end.ecf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash -l

model=aqm
%include <head.h>
%include <envir-p1.h>
set -x
cyc=%CYC%
ecflow_client --requeue=force /nco_aqm/primary/${cyc}/aqm
%include <tail.h>
exit 0
Original file line number Diff line number Diff line change
@@ -1,30 +1,36 @@
#PBS -N aqm_forecast_data_cleanup_%CYC%
#PBS -N aqm_forecast_manager_%CYC%
#PBS -j oe
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:10:00
#PBS -l select=1:ncpus=1:mem=1GB
#PBS -l place=vscatter
#PBS -l walltime=04:00:00
#PBS -l select=1:mpiprocs=1:ncpus=1
#PBS -l debug=true

model=aqm
export cyc="%CYC%"
%include <head.h>
%include <envir-p1.h>

############################################################
# Load modules
############################################################
module load intel/${intel_ver}
module load craype/${craype_ver}
module load cray-mpich/${cray_mpich_ver}
module load cray-pals/${cray_pals_ver}
module load hdf5/${hdf5_ver}
module load netcdf/${netcdf_ver}
module load python/${python_ver}

module list

export cyc=%CYC%

############################################################
# CALL executable job script here
############################################################
${HOMEaqm}/jobs/JAQM_DATA_CLEANUP
${HOMEaqm}/jobs/JAQM_FORECAST_MANAGER

%include <tail.h>
%manual

%manual
%end
9 changes: 5 additions & 4 deletions jobs/JAQM_BIAS_CORRECTION_O3
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ export subcyc=0
export pid=${pid:-$$}
export outid=${outid:-"LL$job"}

. ${PARMaqm}/config/var_defns.sh
. $USHaqm/source_util_funcs.sh

export DATA=${DATA:-${DATAROOT}/${jobid}}

mkdir -p ${DATA}
cd ${DATA}

. $USHaqm/aqm_nco_config.sh

. $USHaqm/source_util_funcs.sh

export cycle=${cycle:-t${cyc}z}

setpdy.sh
Expand All @@ -37,6 +37,7 @@ 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}"
Expand Down
Loading

0 comments on commit 9198b6a

Please sign in to comment.