Skip to content

Commit b58b48a

Browse files
jdkublnickjdkublnick
authored
Merge branch 'ufs-community:develop' into text/uss-500
2 parents 83d87e8 + 065ba1e commit b58b48a

12 files changed

Lines changed: 97 additions & 13 deletions

File tree

‎Externals.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ protocol = git
1212
repo_url = https://github.com/ufs-community/ufs-weather-model
1313
# Specify either a branch name or a hash but not both.
1414
#branch = develop
15-
hash = d2e5b36
15+
hash = b8f9428
1616
local_path = sorc/ufs-weather-model
1717
required = True
1818

@@ -21,7 +21,7 @@ protocol = git
2121
repo_url = https://github.com/NOAA-EMC/UPP
2222
# Specify either a branch name or a hash but not both.
2323
#branch = develop
24-
hash = 8f6caa9
24+
hash = 1a16f94
2525
local_path = sorc/UPP
2626
required = True
2727

‎doc/UsersGuide/BuildingRunningTesting/AQM.rst‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _AQM:
22

33
=====================================
4-
Air Quality Modeling (SRW-AQM)
4+
Air Quality Modeling (UFS-AQM)
55
=====================================
66

77
.. attention::
@@ -16,7 +16,7 @@ The AQM is a UFS Application that dynamically couples the Community Multiscale A
1616

1717
Although this chapter is the primary documentation resource for running the AQM configuration, users may need to refer to :numref:`Chapter %s <BuildSRW>` and :numref:`Chapter %s <RunSRW>` for additional information on building and running the SRW App, respectively.
1818

19-
Quick Start Guide (SRW-AQM)
19+
Quick Start Guide (UFS-AQM)
2020
=====================================
2121

2222
.. attention::
@@ -335,6 +335,9 @@ An AQM "use case" is a scientifically interesting air quality event with preconf
335335
* - `Atmospheric Emissions and Reactions Observed from Megacities to Marine Areas <https://csl.noaa.gov/projects/aeromma/>`__
336336
- :term:`AEROMMA`
337337
- ``./ush/aqm-use-cases/config.aqm.AEROMMA.yaml``
338+
* - `Fall Ozone`
339+
- FALL_OZONE
340+
- ``./ush/aqm-use-cases/config.aqm.FALL_OZONE.yaml``
338341

339342
.. _acquire-use-case-data:
340343

‎scripts/exregional_run_post.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ to the temporary work directory (DATA_FHR):
163163
===================================================================="
164164
else
165165
if [ $(boolify "${CPL_AQM}") = "TRUE" ]; then
166-
post_config_fp="${PARMdir}/upp/postxconfig-NT-AQM.txt"
166+
post_config_fp="${PARMdir}/upp/aqm/postxconfig-NT-AQM.txt"
167167
else
168168
post_config_fp="${PARMdir}/upp/rrfs/postxconfig-NT-rrfs.txt"
169169
fi

‎tests/WE2E/machine_suites/comprehensive.derecho‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
3535
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
3636
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
3737
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
38-
grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
3938
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR
4039
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_sas
4140
grid_RRFS_CONUScompact_25km_ics_RRFS_lbcs_RRFS_suite_RRFS_sas

‎tests/WE2E/machine_suites/comprehensive.hera.gnu‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
4343
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
4444
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
4545
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
46-
grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
4746
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR
4847
grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
4948
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR

‎tests/WE2E/machine_suites/comprehensive.hera.intel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
4444
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
4545
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
4646
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
47-
grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
4847
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR
4948
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_sas
5049
grid_RRFS_CONUScompact_25km_ics_RRFS_lbcs_RRFS_suite_RRFS_sas

‎tests/WE2E/machine_suites/comprehensive.noaacloud‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
2424
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
2525
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
2626
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
27-
grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
2827
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR
2928
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_sas
3029
grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16

‎tests/WE2E/machine_suites/comprehensive.orion‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
3535
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
3636
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
3737
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
38-
grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
3938
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR
4039
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_sas
4140
grid_RRFS_CONUScompact_25km_ics_RRFS_lbcs_RRFS_suite_RRFS_sas

‎tests/WE2E/machine_suites/comprehensive.ursa.gnu‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
4343
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
4444
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
4545
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
46-
grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
4746
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR
4847
grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
4948
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR

‎tests/WE2E/machine_suites/comprehensive.ursa.intel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
4444
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
4545
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
4646
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
47-
grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
4847
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR
4948
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_sas
5049
grid_RRFS_CONUScompact_25km_ics_RRFS_lbcs_RRFS_suite_RRFS_sas

0 commit comments

Comments
 (0)