Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Production/AQM.v7] To merge the changes that are made to address the EE2 compliance issues for AQMv7 implementation #1053

Merged
merged 26 commits into from
Mar 7, 2024
Merged

[Production/AQM.v7] To merge the changes that are made to address the EE2 compliance issues for AQMv7 implementation #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
7c37f47
create a branch to update build.sh by removing hardcode with UPP
JianpingHuang-NOAA Feb 16, 2024
8ba3a7c
correct daily 1hr and 8hr max o3 double-alerting issue for o3 bias co…
JianpingHuang-NOAA Feb 21, 2024
c715228
update hash of UPP and auto_build_exec.sh
JianpingHuang-NOAA Feb 23, 2024
1004ccc
update hash number for the ufwm which has a fix to the compiling fail…
JianpingHuang-NOAA Feb 23, 2024
68cc4ef
update auto_A1_checkout.sh and au auto_A2_build_exec.sh
JianpingHuang-NOAA Feb 23, 2024
baf8be2
Bring NCO update back
lgannoaa Feb 23, 2024
7d69dc7
Update ecflow time trigger for 18Z
lgannoaa Feb 23, 2024
d06101c
Merge pull request #2 from lgannoaa/feature/nco-merge-0223
JianpingHuang-NOAA Feb 24, 2024
aa95d7e
update aqm_lbcs script
JianpingHuang-NOAA Feb 24, 2024
831905a
update exaqm_lbcs.sh
JianpingHuang-NOAA Feb 24, 2024
3d5917e
fix the forecast job failure and reproducibility of results
JianpingHuang-NOAA Feb 25, 2024
a26ea03
clean up var_defns.sh.template
JianpingHuang-NOAA Feb 26, 2024
fd35057
remove 0-size of data_table from parm and update hash numbers for ufs…
JianpingHuang-NOAA Feb 27, 2024
35b0811
update Externals.cfg
JianpingHuang-NOAA Feb 27, 2024
8f518e8
update exaqm_fire_emission.sh script
JianpingHuang-NOAA Mar 1, 2024
5d78edb
Fix model crash issus found with diag_table and add exception handlin…
lgannoaa Mar 1, 2024
2c7514a
Merge pull request #3 from lgannoaa/feature/aqm-fcst-patch-date
JianpingHuang-NOAA Mar 1, 2024
f8f3574
removing scaling factors for fire emissions
JianpingHuang-NOAA Mar 1, 2024
748c0ef
remove additional exec code from UFS_UTILS
JianpingHuang-NOAA Mar 1, 2024
7a9c820
update aqm_bias_correction for O3
JianpingHuang-NOAA Mar 5, 2024
ad04db8
replace cp with cpreq for exaqm scripts
JianpingHuang-NOAA Mar 5, 2024
d9ecc11
update ecflow scripts to address computer resource issues provided by…
JianpingHuang-NOAA Mar 5, 2024
41958eb
update fire_emission by removing scaling factors
JianpingHuang-NOAA Mar 5, 2024
aa53ca7
getting scaling factor back for RAVE v1 fire product
JianpingHuang-NOAA Mar 6, 2024
6c56088
udpate exaqm script to address AQM v7.0 failure mode testing issues
JianpingHuang-NOAA Mar 7, 2024
747ab4a
correct a typo in create_symlink_to_file.sh
JianpingHuang-NOAA Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
80 changes: 40 additions & 40 deletions ecf/defs/aqm_cycled.def
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
Empty file.