Skip to content

Commit ac1f31b

Browse files
[develop] Update ufs-weather-model hash to July 9 version (#1383)
* doc/conf.py - Add https://www.nssl.noaa.gov/ to the ignore check listing due to certificate errors * doc/ContribGuide/contributing.rst - Update URLs for docs.github.com to address warnings * Externals.cfg - Update ufs-weather-model hash to 5040b33 (July 9) * parm/wflow/aqm_prep.yaml - Add exclusive flag for task_nexus_emission * parm/wflow/coldstart.yaml - Add exclusive falgs for task_make_ics and task_make_lbcs * ush/aqm-use-cases/config.aqm.FallOzone.yaml - Increase walltime from 1 hour and 20 minutes to 2 hours to allow the use case to run on Orion * ush/aqm-use-cases/config.aqm.AEROMMA.yaml - Increase walltime from 1 hour and 20 minutes to 2 hours to allow the use case to run on Orion * ush/config_defaults.yaml - Add exclusive to task_nexus_emission, task_make_ics, and task_make_lbcs
1 parent d265ab4 commit ac1f31b

8 files changed

Lines changed: 14 additions & 7 deletions

File tree

Externals.cfg

Lines changed: 1 addition & 1 deletion
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 = 04a67f0
15+
hash = 5040b33
1616
local_path = sorc/ufs-weather-model
1717
required = True
1818

doc/ContribGuide/contributing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Fork and PR Overview
99

1010
Thank you to the Unified Workflow (UW) team for allowing us to adapt their Fork and PR Model overview for use in the SRW App. The original can be viewed in the `uwtools` :uw:`documentation <sections/contributor_guide/fork_pr_model.html>`.
1111

12-
Contributions to the ``ufs-srweather-app`` project are made via a :github-docs:`Fork<pull-requests/collaborating-with-pull-requests/working-with-forks/about-forks>` and :github-docs:`Pull Request (PR)<pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests>` model. GitHub provides a thorough description of this contribution model in their `Contributing to a project` :github-docs:`Quickstart<get-started/exploring-projects-on-github/contributing-to-a-project>`, but the steps, with respect to ``ufs-srweather-app`` contributions, can be summarized as:
12+
Contributions to the ``ufs-srweather-app`` project are made via a :github-docs:`Fork<pull-requests/reference/forks>` and :github-docs:`Pull Request (PR)<pull-requests/reference/pull-requests>` model. GitHub provides a thorough description of this contribution model in their `Contributing to a project` :github-docs:`Quickstart<get-started/exploring-projects-on-github/contributing-to-a-project>`, but the steps, with respect to ``ufs-srweather-app`` contributions, can be summarized as:
1313

1414
#. :github-docs:`Create an issue <issues/tracking-your-work-with-issues/using-issues/creating-an-issue>` to document proposed changes.
1515
#. :github-docs:`Fork<get-started/exploring-projects-on-github/contributing-to-a-project#creating-your-own-copy-of-a-project>` the :srw-repo:`ufs-srweather-app repository<>` into your personal GitHub account.
@@ -18,7 +18,7 @@ Contributions to the ``ufs-srweather-app`` project are made via a :github-docs:`
1818
#. :github-docs:`Make, commit, and push changes<get-started/exploring-projects-on-github/contributing-to-a-project#making-and-pushing-changes>` in your clone / to your fork.
1919
#. When your work is complete, :github-docs:`create a pull request (PR)<get-started/exploring-projects-on-github/contributing-to-a-project#making-a-pull-request>` to merge your changes.
2020

21-
For future contributions, you may delete and then recreate your fork or configure the official ``ufs-srweather-app`` repository as a :github-docs:`remote repository<pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-repository-for-a-fork>` on your clone and :github-docs:`sync upstream changes<pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork>` to stay up-to-date with the official repository.
21+
For future contributions, you may delete and then recreate your fork or configure the official ``ufs-srweather-app`` repository as a :github-docs:`remote repository<pull-requests/how-tos/work-with-forks/configuring-a-remote-repository-for-a-fork>` on your clone and :github-docs:`sync upstream changes<pull-requests/how-tos/work-with-forks/syncing-a-fork>` to stay up-to-date with the official repository.
2222

2323

2424
Development and Testing Process
@@ -179,7 +179,7 @@ All changes to the SRW App ``develop`` branch should be handled via GitHub’s "
179179

180180
* Ensure that your PR is targeting the base repository ``ufs-community/ufs-srweather-app`` and an appropriate base branch (usually ``develop``).
181181
* **Complete PR template.** Your PR will appear pre-populated with a :ref:`template <pr-template>` that you should complete. Provide an informative synopsis of your contribution, then mark appropriate checklist items by placing an "X" between their square brackets. You may tidy up the description by removing boilerplate text and non-selected checklist items. View :ref:`useful PR template guidance <pr-template-guidance>` and information on :ref:`best practices <tips-best-practices>` for completing each section below.
182-
* **Create draft PR.** Use the pull-down arrow on the green button below the description to initially create a :github-docs:`draft pull request<pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests>`.
182+
* **Create draft PR.** Use the pull-down arrow on the green button below the description to initially create a :github-docs:`draft pull request<pull-requests/reference/pull-requests>`.
183183

184184
* Once your draft PR is open, visit its *Files changed* tab and add comments to any lines of code where you think reviewers will benefit from more explanation. Try to save time by proactively answering questions you suspect reviewers will ask.
185185

doc/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
r'https://gsl.noaa.gov/',
132132
r'https://gsl.noaa.gov/research/predictions',
133133
r'https://fvcom.smast.umassd.edu',
134+
r'https://www.nssl.noaa.gov/',
134135
]
135136

136137
# Ignore anchor tags for SRW App data bucket. Shows Not Found even when they exist.

parm/wflow/aqm_prep.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ metatask_nexus_emission:
7373
value: '&LOGDIR;/{{ jobname }}_@Y@m@d@H&LOGEXT;'
7474
nodes: '{{ task_nexus_emission.execution.batchargs.nodes }}:ppn={{ task_nexus_emission.execution.batchargs.tasks_per_node }}'
7575
walltime: '{{ task_nexus_emission.execution.batchargs.walltime }}'
76+
exclusive: '{{ task_nexus_emission.execution.batchargs.exclusive }}'
7677
envars:
7778
<<: *default_vars
7879
nspt: "#nspt#"

parm/wflow/coldstart.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ metatask_run_ensemble:
115115
value: '&LOGDIR;/{{ jobname }}_@Y@m@d@H&LOGEXT;'
116116
nodes: '{{ task_make_ics.chgres_cube.execution.batchargs.nodes // 1 }}:ppn={{ task_make_ics.chgres_cube.execution.batchargs.tasks_per_node }}'
117117
walltime: '{{ task_make_ics.chgres_cube.execution.batchargs.walltime }}'
118+
exclusive: '{{ task_make_ics.chgres_cube.execution.batchargs.exclusive }}'
118119
dependency:
119120
and: &make_ics_deps
120121
taskdep_get_extrn:
@@ -162,6 +163,7 @@ metatask_run_ensemble:
162163
value: '&LOGDIR;/{{ jobname }}_@Y@m@d@H&LOGEXT;'
163164
nodes: '{{ task_make_lbcs.chgres_cube.execution.batchargs.nodes // 1 }}:ppn={{ task_make_lbcs.chgres_cube.execution.batchargs.tasks_per_node }}'
164165
walltime: '{{ task_make_lbcs.chgres_cube.execution.batchargs.walltime }}'
166+
exclusive: '{{ task_make_lbcs.chgres_cube.execution.batchargs.exclusive }}'
165167
dependency:
166168
and:
167169
<<: *make_ics_deps

ush/aqm-use-cases/config.aqm.AEROMMA.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ task_run_fcst:
4444
fv3:
4545
execution:
4646
batchargs:
47-
walltime: 01:20:00
47+
walltime: 02:00:00
4848
envvars:
4949
DT_ATMOS: 180
5050
OMP_NUM_THREADS_RUN_FCST: 1
@@ -113,4 +113,4 @@ melodies_monet_parm:
113113
observation_template: <path to AQM data>/Observations/AirNow/AirNow_20230601_20230701.nc
114114
ish:
115115
active: true
116-
observation_template: <path to AQM data>/Observations/ISH/ISH-Lite_20230601_20230701.nc
116+
observation_template: <path to AQM data>/Observations/ISH/ISH-Lite_20230601_20230701.nc

ush/aqm-use-cases/config.aqm.FallOzone.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ task_run_fcst:
4343
fv3:
4444
execution:
4545
batchargs:
46-
walltime: 01:20:00
46+
walltime: 02:00:00
4747
envvars:
4848
DT_ATMOS: 180
4949
OMP_NUM_THREADS_RUN_FCST: 1

ush/config_defaults.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,6 +1478,7 @@ task_make_ics:
14781478
nodes: 4
14791479
tasks_per_node: 12
14801480
walltime: 00:30:00
1481+
exclusive: True
14811482
threads: !int '{{ task_make_ics.envvars.OMP_NUM_THREADS_MAKE_ICS }}'
14821483
#-----------------------------------------------------------------------
14831484
# KMP_AFFINITY_MAKE_ICS:
@@ -1550,6 +1551,7 @@ task_make_lbcs:
15501551
nodes: 4
15511552
tasks_per_node: 12
15521553
walltime: 01:00:00
1554+
exclusive: True
15531555
threads: !int '{{ task_make_lbcs.envvars.OMP_NUM_THREADS_MAKE_ICS }}'
15541556
#------------------------------------------------------------------------
15551557
#
@@ -2099,6 +2101,7 @@ task_nexus_emission:
20992101
nodes: 4
21002102
tasks_per_node: !int '{{ platform.NCORES_PER_NODE // task_nexus_emission.envvars.OMP_NUM_THREADS_NEXUS_EMISSION }}'
21012103
walltime: 01:00:00
2104+
exclusive: True
21022105
threads: !int '{{ task_nexus_emission.envvars.OMP_NUM_THREADS_NEXUS_EMISSION }}'
21032106
envvars:
21042107
KMP_AFFINITY_NEXUS_EMISSION: "scatter"

0 commit comments

Comments
 (0)