Skip to content

Commit

Permalink
[Production/AQM.v7] To merge the changes that are made to address the…
Browse files Browse the repository at this point in the history 
… EE2 compliance issues for AQMv7 implementation (#1053)

* create a branch to update build.sh by removing hardcode with UPP
* correct daily 1hr and 8hr max o3 double-alerting issue for o3 bias correction script
* Update ecflow time trigger for 18Z
* fix the forecast job failure and reproducibility of results
* clean up var_defns.sh.template
* remove 0-size of data_table from parm and update hash numbers for ufs-weather-model with nowarn fix and ufs_util
* Fix model crash issus found with diag_table and add exception handling code in forecast manager
* removing scaling factors for fire emissions
* remove additional exec code from UFS_UTILS
* update aqm_bias_correction for O3
* replace cp with cpreq for exaqm scripts
* update ecflow scripts to address computer resource issues provided by NCO
* update fire_emission by removing scaling factors
* getting scaling factor back for RAVE v1 fire product
* udpate exaqm script to address AQM v7.0 failure mode testing issues

---------

Co-authored-by: Lin.Gan <lin.gan@noaa.gov>
  • Loading branch information
@JianpingHuang-NOAA @lgannoaa
JianpingHuang-NOAA and lgannoaa committed Mar 7, 2024
1 parent 90c57bc commit dbf416d
Show file tree
Hide file tree
Showing 46 changed files with 367 additions and 355 deletions.
80 changes: 40 additions & 40 deletions ecf/defs/aqm_cycled.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,40 +22,40 @@ suite nco_aqm
family nexus
task jaqm_nexus_emission_00
edit NSPT '00'
trigger :TIME == 0142
trigger :TIME >= 0142 and :TIME < 0742
task jaqm_nexus_emission_01
edit NSPT '01'
trigger :TIME == 0142
trigger :TIME >= 0142 and :TIME < 0742
task jaqm_nexus_emission_02
edit NSPT '02'
trigger :TIME == 0142
trigger :TIME >= 0142 and :TIME < 0742
task jaqm_nexus_emission_03
edit NSPT '03'
trigger :TIME == 0142
trigger :TIME >= 0142 and :TIME < 0742
task jaqm_nexus_emission_04
edit NSPT '04'
trigger :TIME == 0142
trigger :TIME >= 0142 and :TIME < 0742
task jaqm_nexus_emission_05
edit NSPT '05'
trigger :TIME == 0142
trigger :TIME >= 0142 and :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 == 0142
trigger :TIME >= 0142 and :TIME < 0742
task jaqm_make_lbcs
trigger :TIME == 0142
trigger :TIME >= 0142 and :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 == 0142
trigger :TIME >= 0142 and :TIME < 0742
task jaqm_fire_emission
trigger :TIME == 0142
trigger :TIME >= 0142 and :TIME < 0742
endfamily
family forecast
task jaqm_forecast
Expand Down Expand Up @@ -121,40 +121,40 @@ suite nco_aqm
family nexus
task jaqm_nexus_emission_00
edit NSPT '00'
trigger :TIME == 0742
trigger :TIME >= 0742 and :TIME < 1342
task jaqm_nexus_emission_01
edit NSPT '01'
trigger :TIME == 0742
trigger :TIME >= 0742 and :TIME < 1342
task jaqm_nexus_emission_02
edit NSPT '02'
trigger :TIME == 0742
trigger :TIME >= 0742 and :TIME < 1342
task jaqm_nexus_emission_03
edit NSPT '03'
trigger :TIME == 0742
trigger :TIME >= 0742 and :TIME < 1342
task jaqm_nexus_emission_04
edit NSPT '04'
trigger :TIME == 0742
trigger :TIME >= 0742 and :TIME < 1342
task jaqm_nexus_emission_05
edit NSPT '05'
trigger :TIME == 0742
trigger :TIME >= 0742 and :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 == 0742
trigger :TIME >= 0742 and :TIME < 1342
task jaqm_make_lbcs
trigger :TIME == 0742
trigger :TIME >= 0742 and :TIME < 1342
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 == 0742
trigger :TIME >= 0742 and :TIME < 1342
task jaqm_fire_emission
trigger :TIME == 0742
trigger :TIME >= 0742 and :TIME < 1342
endfamily
family forecast
task jaqm_forecast
Expand Down Expand Up @@ -494,40 +494,40 @@ suite nco_aqm
family nexus
task jaqm_nexus_emission_00
edit NSPT '00'
trigger :TIME == 1342
trigger :TIME >= 1342 and :TIME < 1942
task jaqm_nexus_emission_01
edit NSPT '01'
trigger :TIME == 1342
trigger :TIME >= 1342 and :TIME < 1942
task jaqm_nexus_emission_02
edit NSPT '02'
trigger :TIME == 1342
trigger :TIME >= 1342 and :TIME < 1942
task jaqm_nexus_emission_03
edit NSPT '03'
trigger :TIME == 1342
trigger :TIME >= 1342 and :TIME < 1942
task jaqm_nexus_emission_04
edit NSPT '04'
trigger :TIME == 1342
trigger :TIME >= 1342 and :TIME < 1942
task jaqm_nexus_emission_05
edit NSPT '05'
trigger :TIME == 1342
trigger :TIME >= 1342 and :TIME < 1942
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 == 1342
trigger :TIME >= 1342 and :TIME < 1942
task jaqm_make_lbcs
trigger :TIME == 1342
trigger :TIME >= 1342 and :TIME < 1942
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 == 1342
trigger :TIME >= 1342 and :TIME < 1942
task jaqm_fire_emission
trigger :TIME == 1342
trigger :TIME >= 1342 and :TIME < 1942
endfamily
family forecast
task jaqm_forecast
Expand Down Expand Up @@ -867,40 +867,40 @@ suite nco_aqm
family nexus
task jaqm_nexus_emission_00
edit NSPT '00'
trigger :TIME == 2042
trigger :TIME >= 1942 and :TIME < 2342
task jaqm_nexus_emission_01
edit NSPT '01'
trigger :TIME == 2042
trigger :TIME >= 1942 and :TIME < 2342
task jaqm_nexus_emission_02
edit NSPT '02'
trigger :TIME == 2042
trigger :TIME >= 1942 and :TIME < 2342
task jaqm_nexus_emission_03
edit NSPT '03'
trigger :TIME == 2042
trigger :TIME >= 1942 and :TIME < 2342
task jaqm_nexus_emission_04
edit NSPT '04'
trigger :TIME == 2042
trigger :TIME >= 1942 and :TIME < 2342
task jaqm_nexus_emission_05
edit NSPT '05'
trigger :TIME == 2042
trigger :TIME >= 1942 and :TIME < 2342
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 == 2042
trigger :TIME >= 1942 and :TIME < 2342
task jaqm_make_lbcs
trigger :TIME == 2042
trigger :TIME >= 1942 and :TIME < 2342
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 == 2042
trigger :TIME >= 1942 and :TIME < 2342
task jaqm_fire_emission
trigger :TIME == 2042
trigger :TIME >= 1942 and :TIME < 2342
endfamily
family forecast
task jaqm_forecast
Expand Down
1 change: 1 addition & 0 deletions ecf/include/head.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ fi
modelhome=%PACKAGEHOME:%
eval "export HOME${model:?'model undefined'}=$modelhome"
eval "versionfile=\$HOME${model}/versions/run.ver"
if [ -n "%aqm_ver:%" ]; then export aqm_ver=${aqm_ver:-%aqm_ver:%}; fi
if [ -f "$versionfile" ]; then
. $versionfile
fi
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/forecast/jaqm_forecast.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=04:00:00
#PBS -l walltime=03:15:00
#PBS -l select=14:mpiprocs=128:ompthreads=1:ncpus=128
#PBS -l place=vscatter:exclhost
#PBS -l debug=true
Expand Down
4 changes: 2 additions & 2 deletions ecf/scripts/forecast/jaqm_forecast_manager.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=04:00:00
#PBS -l select=1:mpiprocs=1:ncpus=1
#PBS -l walltime=03:15:00
#PBS -l select=1:mpiprocs=1:ncpus=1:mem=150G:prepost=true
#PBS -l debug=true

model=aqm
Expand Down
4 changes: 2 additions & 2 deletions ecf/scripts/nexus/jaqm_nexus_post_split.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:30:00
#PBS -l select=1:mpiprocs=1:ncpus=1
#PBS -l walltime=00:15:00
#PBS -l select=1:mpiprocs=1:ncpus=1:mem=32G:prepost=true
#PBS -l debug=true

model=aqm
Expand Down
6 changes: 3 additions & 3 deletions ecf/scripts/post/jaqm_post_master.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:15:00
#PBS -l select=2:mpiprocs=24:ncpus=24
#PBS -l place=vscatter:exclhost
#PBS -l walltime=00:10:00
#PBS -l select=1:mpiprocs=48:ncpus=48:mem=16G
#PBS -l place=vscatter
#PBS -l debug=true

model=aqm
Expand Down
4 changes: 2 additions & 2 deletions ecf/scripts/prep/jaqm_ics.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:30:00
#PBS -l select=1:mpiprocs=1:ncpus=1
#PBS -l walltime=00:10:00
#PBS -l select=1:mpiprocs=1:ncpus=1:mem=48G:prepost=true
#PBS -l debug=true

model=aqm
Expand Down
3 changes: 2 additions & 1 deletion ecf/scripts/prep/jaqm_lbcs.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:20:00
#PBS -l walltime=00:10:00
#PBS -l select=1:mpiprocs=128:ncpus=128
#PBS -l place=vscatter:exclhost
#PBS -l debug=true

model=aqm
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/prep/jaqm_make_ics.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:30:00
#PBS -l walltime=00:10:00
#PBS -l select=1:mpiprocs=128:ncpus=128
#PBS -l place=vscatter:exclhost
#PBS -l debug=true
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/prep/jaqm_make_lbcs.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:30:00
#PBS -l walltime=00:15:00
#PBS -l select=1:mpiprocs=128:ncpus=128
#PBS -l place=vscatter:exclhost
#PBS -l debug=true
Expand Down
4 changes: 2 additions & 2 deletions ecf/scripts/product/jaqm_bias_correction_o3.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:30:00
#PBS -l select=1:mpiprocs=1:ompthreads=32:ncpus=32:mem=120G
#PBS -l walltime=00:10:00
#PBS -l select=1:mpiprocs=1:ompthreads=32:ncpus=32:mem=128G
#PBS -l debug=true

model=aqm
Expand Down
4 changes: 2 additions & 2 deletions ecf/scripts/product/jaqm_bias_correction_pm25.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:30:00
#PBS -l select=1:mpiprocs=1:ompthreads=32:ncpus=32:mem=120G
#PBS -l walltime=00:10:00
#PBS -l select=1:mpiprocs=1:ompthreads=32:ncpus=32:mem=128G
#PBS -l debug=true

model=aqm
Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/product/jaqm_post_stat_o3.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:30:00
#PBS -l walltime=00:10:00
#PBS -l select=1:mpiprocs=1:ncpus=1:mem=120G
#PBS -l debug=true

Expand Down
2 changes: 1 addition & 1 deletion ecf/scripts/product/jaqm_post_stat_pm25.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:30:00
#PBS -l walltime=00:10:00
#PBS -l select=1:mpiprocs=1:ncpus=1:mem=120G
#PBS -l debug=true

Expand Down
4 changes: 2 additions & 2 deletions ecf/scripts/product/jaqm_pre_post_stat.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:30:00
#PBS -l select=1:mpiprocs=1:ncpus=1
#PBS -l walltime=00:10:00
#PBS -l select=1:mpiprocs=1:ncpus=1:mem=4G
#PBS -l debug=true

model=aqm
Expand Down
4 changes: 2 additions & 2 deletions ecf/scripts/pts_fire_emis/jaqm_fire_emission.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=00:30:00
#PBS -l select=1:mpiprocs=1:ncpus=1
#PBS -l walltime=00:10:00
#PBS -l select=1:mpiprocs=1:ncpus=1:mem=8G
#PBS -l debug=true

model=aqm
Expand Down
4 changes: 2 additions & 2 deletions ecf/scripts/pts_fire_emis/jaqm_point_source.ecf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#PBS -S /bin/bash
#PBS -q %QUEUE%
#PBS -A %PROJ%-%PROJENVIR%
#PBS -l walltime=01:00:00
#PBS -l select=1:mpiprocs=1:ncpus=1
#PBS -l walltime=00:10:00
#PBS -l select=1:mpiprocs=1:ncpus=1:mem=8G
#PBS -l debug=true

model=aqm
Expand Down
Empty file removed parm/config/data_table
View file
Empty file.

0 comments on commit dbf416d

Please sign in to comment.