Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ protocol = git
repo_url = https://github.com/ufs-community/ufs-weather-model
# Specify either a branch name or a hash but not both.
#branch = develop
hash = 04a67f0
hash = 5040b33
local_path = sorc/ufs-weather-model
required = True

Expand Down
6 changes: 3 additions & 3 deletions doc/ContribGuide/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Fork and PR Overview

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>`.

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:
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:

#. :github-docs:`Create an issue <issues/tracking-your-work-with-issues/using-issues/creating-an-issue>` to document proposed changes.
#. :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.
Expand All @@ -18,7 +18,7 @@ Contributions to the ``ufs-srweather-app`` project are made via a :github-docs:`
#. :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.
#. 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.

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.
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.


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

* Ensure that your PR is targeting the base repository ``ufs-community/ufs-srweather-app`` and an appropriate base branch (usually ``develop``).
* **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.
* **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>`.
* **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>`.

* 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.

Expand Down
1 change: 1 addition & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@
r'https://gsl.noaa.gov/',
r'https://gsl.noaa.gov/research/predictions',
r'https://fvcom.smast.umassd.edu',
r'https://www.nssl.noaa.gov/',
]

# Ignore anchor tags for SRW App data bucket. Shows Not Found even when they exist.
Expand Down
1 change: 1 addition & 0 deletions parm/wflow/aqm_prep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ metatask_nexus_emission:
value: '&LOGDIR;/{{ jobname }}_@Y@m@d@H&LOGEXT;'
nodes: '{{ task_nexus_emission.execution.batchargs.nodes }}:ppn={{ task_nexus_emission.execution.batchargs.tasks_per_node }}'
walltime: '{{ task_nexus_emission.execution.batchargs.walltime }}'
exclusive: '{{ task_nexus_emission.execution.batchargs.exclusive }}'
envars:
<<: *default_vars
nspt: "#nspt#"
Expand Down
2 changes: 2 additions & 0 deletions parm/wflow/coldstart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ metatask_run_ensemble:
value: '&LOGDIR;/{{ jobname }}_@Y@m@d@H&LOGEXT;'
nodes: '{{ task_make_ics.chgres_cube.execution.batchargs.nodes // 1 }}:ppn={{ task_make_ics.chgres_cube.execution.batchargs.tasks_per_node }}'
walltime: '{{ task_make_ics.chgres_cube.execution.batchargs.walltime }}'
exclusive: '{{ task_make_ics.chgres_cube.execution.batchargs.exclusive }}'
dependency:
and: &make_ics_deps
taskdep_get_extrn:
Expand Down Expand Up @@ -162,6 +163,7 @@ metatask_run_ensemble:
value: '&LOGDIR;/{{ jobname }}_@Y@m@d@H&LOGEXT;'
nodes: '{{ task_make_lbcs.chgres_cube.execution.batchargs.nodes // 1 }}:ppn={{ task_make_lbcs.chgres_cube.execution.batchargs.tasks_per_node }}'
walltime: '{{ task_make_lbcs.chgres_cube.execution.batchargs.walltime }}'
exclusive: '{{ task_make_lbcs.chgres_cube.execution.batchargs.exclusive }}'
dependency:
and:
<<: *make_ics_deps
Expand Down
4 changes: 2 additions & 2 deletions ush/aqm-use-cases/config.aqm.AEROMMA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ task_run_fcst:
fv3:
execution:
batchargs:
walltime: 01:20:00
walltime: 02:00:00
envvars:
DT_ATMOS: 180
OMP_NUM_THREADS_RUN_FCST: 1
Expand Down Expand Up @@ -113,4 +113,4 @@ melodies_monet_parm:
observation_template: <path to AQM data>/Observations/AirNow/AirNow_20230601_20230701.nc
ish:
active: true
observation_template: <path to AQM data>/Observations/ISH/ISH-Lite_20230601_20230701.nc
observation_template: <path to AQM data>/Observations/ISH/ISH-Lite_20230601_20230701.nc
2 changes: 1 addition & 1 deletion ush/aqm-use-cases/config.aqm.FallOzone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ task_run_fcst:
fv3:
execution:
batchargs:
walltime: 01:20:00
walltime: 02:00:00
envvars:
DT_ATMOS: 180
OMP_NUM_THREADS_RUN_FCST: 1
Expand Down
3 changes: 3 additions & 0 deletions ush/config_defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1478,6 +1478,7 @@ task_make_ics:
nodes: 4
tasks_per_node: 12
walltime: 00:30:00
exclusive: True
threads: !int '{{ task_make_ics.envvars.OMP_NUM_THREADS_MAKE_ICS }}'
#-----------------------------------------------------------------------
# KMP_AFFINITY_MAKE_ICS:
Expand Down Expand Up @@ -1550,6 +1551,7 @@ task_make_lbcs:
nodes: 4
tasks_per_node: 12
walltime: 01:00:00
exclusive: True
threads: !int '{{ task_make_lbcs.envvars.OMP_NUM_THREADS_MAKE_ICS }}'
#------------------------------------------------------------------------
#
Expand Down Expand Up @@ -2099,6 +2101,7 @@ task_nexus_emission:
nodes: 4
tasks_per_node: !int '{{ platform.NCORES_PER_NODE // task_nexus_emission.envvars.OMP_NUM_THREADS_NEXUS_EMISSION }}'
walltime: 01:00:00
exclusive: True
threads: !int '{{ task_nexus_emission.envvars.OMP_NUM_THREADS_NEXUS_EMISSION }}'
envvars:
KMP_AFFINITY_NEXUS_EMISSION: "scatter"
Expand Down
Loading