Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
f0b8975
Updates for upp.
christinaholtNOAA Apr 26, 2024
3b0b612
Add new files for UPP driver.
christinaholtNOAA Apr 26, 2024
727282d
Remove old vtable task from new upp driver.
christinaholtNOAA May 1, 2024
fbbbb1f
Merge branch 'main' into uw-463-upp-driver
maddenp-cu May 1, 2024
0553212
Merge branch 'main' into uw-463-upp-driver
maddenp-cu May 1, 2024
3ff9d9c
Merge branch 'main' into uw-463-upp-driver
maddenp-cu May 2, 2024
4e03aa4
WIP
maddenp-cu May 2, 2024
1144544
Add leadtime support to CLI
maddenp-cu May 2, 2024
0461b93
Handle leadtime in API
maddenp-cu May 2, 2024
c8437da
Require cycle when leadtime provided in API
maddenp-cu May 2, 2024
c4d5e2d
Add cycle/leadtime check in Driver
maddenp-cu May 2, 2024
f77eacb
Merge branch 'main' into uw-463-upp-driver
maddenp-cu May 2, 2024
234be3f
Render leadtime info configs
maddenp-cu May 3, 2024
14d4c53
Can we do a single driver-config dereference?
maddenp-cu May 3, 2024
fb7814a
WIP
maddenp-cu May 3, 2024
a1e5a3e
WIP
maddenp-cu May 3, 2024
9a8f423
WIP
maddenp-cu May 3, 2024
8319970
WIP
maddenp-cu May 3, 2024
4d32c7b
WIP
maddenp-cu May 4, 2024
7b68dab
WIP
maddenp-cu May 4, 2024
e42193a
Fix unit test
maddenp-cu May 4, 2024
0d6e413
Provide default batch-job output path
maddenp-cu May 4, 2024
64c5769
Remove dead code
maddenp-cu May 4, 2024
e493874
Work on schema
maddenp-cu May 5, 2024
4b87f50
Work on schema
maddenp-cu May 5, 2024
32ccad9
WIP
maddenp-cu May 5, 2024
36c1e90
Simplify namelist and runscript filenames
maddenp-cu May 6, 2024
95ea350
Work on unit tests
maddenp-cu May 6, 2024
5ad1a80
Work on unit tests
maddenp-cu May 6, 2024
11bfa73
Work on unit tests
maddenp-cu May 6, 2024
781911e
Fix schema
maddenp-cu May 6, 2024
78414b2
Work on unit tests
maddenp-cu May 6, 2024
ad00c64
Work on unit tests
maddenp-cu May 6, 2024
b1bf25c
Work on unit tests
maddenp-cu May 6, 2024
2da7da9
Work on unit tests
maddenp-cu May 6, 2024
eb13878
Work on unit tests
maddenp-cu May 6, 2024
d1dfa9f
Work on unit tests
maddenp-cu May 6, 2024
746898b
Unit tests @ 100%
maddenp-cu May 6, 2024
e09ce4f
Work on schema tests
maddenp-cu May 6, 2024
eb19b06
Update docs/shared/upp.yaml
maddenp-cu May 6, 2024
194d1a0
Work on schema tests
maddenp-cu May 6, 2024
f0d8085
Work on docs
maddenp-cu May 6, 2024
51a5654
Work on docs
maddenp-cu May 6, 2024
d6dcd5b
Work on docs
maddenp-cu May 6, 2024
1a43a1d
Work on docs
maddenp-cu May 6, 2024
597eae2
Work on docs
maddenp-cu May 6, 2024
e5d3064
Harmonize --help switches in CLI examples
maddenp-cu May 6, 2024
1e031f3
Fix PR template
maddenp-cu May 6, 2024
d8ba52a
injected_leadtime -> injected_validtime
maddenp-cu May 6, 2024
f1a74a6
More generalization related to leadtime
maddenp-cu May 6, 2024
6559933
Update
maddenp-cu May 6, 2024
40aae19
Merge branch 'main' into uw-463-upp-driver
maddenp-cu May 7, 2024
c0297df
Formatting
maddenp-cu May 7, 2024
15d26bb
Doc update
maddenp-cu May 7, 2024
e1aa6ee
Doc whitespace fixes
maddenp-cu May 7, 2024
d2aa937
Doc fix
maddenp-cu May 7, 2024
a5e13a7
Update CLI doc examples
maddenp-cu May 7, 2024
440ce1f
Update CLI examples in docs
maddenp-cu May 7, 2024
bea9f8e
Run yaml-sort
maddenp-cu May 7, 2024
3413f8a
Doc update for consistency
maddenp-cu May 7, 2024
b5abed6
Fix JEDI doc section on main page
maddenp-cu May 7, 2024
8966304
Add namelist.base_file to upp.yaml
maddenp-cu May 7, 2024
2870a4c
Harmonize run_dir: descriptions in UW YAML docs
maddenp-cu May 7, 2024
6dc1f56
Test update
maddenp-cu May 8, 2024
b040f6a
Support subhourly leadtime
maddenp-cu May 8, 2024
0ffe17e
Give ISO8601 example in CLI help
maddenp-cu May 8, 2024
80e59e9
Doc fix
maddenp-cu May 8, 2024
46432cd
Doc improvement
maddenp-cu May 8, 2024
5aa2ed9
Tweak CLI help message for --leadtime
maddenp-cu May 8, 2024
3af186f
Give current 6-hourly cycle in CLI advice
maddenp-cu May 8, 2024
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 .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ INSTRUCTIONS
- [ ] Bug fix (corrects a known issue)
- [ ] Code maintenance (refactoring, etc. without behavior change)
- [ ] Documentation
- [ ] Enhancement (adds a new functionality)
- [ ] Enhancement (adds new functionality)
Comment thread
maddenp-cu marked this conversation as resolved.
- [ ] Tooling (CI, code-quality, packaging, revision-control, etc.)

**Impact**
Expand Down
37 changes: 20 additions & 17 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -110,28 +110,28 @@ Drivers for UFS
To prepare a complete forecast, drivers would typically be run in the order shown here (along with additional drivers still in development).

esg_grid
"""""""""""
""""""""

| **CLI**: ``uw esg_grid -h``
| **API**: ``import uwtools.api.drivers.esg_grid``
| **API**: ``import uwtools.api.esg_grid``
Comment thread
maddenp-cu marked this conversation as resolved.

global_equiv_resol
""""""""""""""""""

| **CLI**: ``uw global_equiv_resol -h``
| **API**: ``import uwtools.api.drivers.global_equiv_resol``
| **API**: ``import uwtools.api.global_equiv_resol``

make_hgrid
""""""""""

| **CLI**: ``uw make_hgrid -h``
| **API**: ``import uwtools.api.drivers.make_hgrid``
| **API**: ``import uwtools.api.make_hgrid``

sfc_climo_gen
"""""""""""""

| **CLI**: ``uw sfc_climo_gen -h``
| **API**: ``import uwtools.api.drivers.sfc_climo_gen``
| **API**: ``import uwtools.api.sfc_climo_gen``

shave
"""""
Expand All @@ -143,22 +143,28 @@ chgres_cube
"""""""""""

| **CLI**: ``uw chgres_cube -h``
| **API**: ``import uwtools.api.drivers.chgres_cube``
| **API**: ``import uwtools.api.chgres_cube``

FV3
"""

| **CLI**: ``uw fv3 -h``
| **API**: ``import uwtools.api.drivers.fv3``
| **API**: ``import uwtools.api.fv3``

JEDI
Comment thread
maddenp-cu marked this conversation as resolved.
""""
UPP
"""

| **CLI**: ``uw jedi -h``
| **API**: ``import uwtools.api.drivers.jedi``
| **CLI**: ``uw upp -h``
| **API**: ``import uwtools.api.upp``

Driver for JEDI
^^^^^^^^^^^^^^^

JEDI
""""
Comment thread
maddenp-cu marked this conversation as resolved.

| **CLI**: ``uw jedi -h``
| **API**: ``import uwtools.api.jedi``

Drivers for MPAS
^^^^^^^^^^^^^^^^
Expand All @@ -169,22 +175,19 @@ ungrib
""""""

| **CLI**: ``uw ungrib -h``
| **API**: ``import uwtools.api.drivers.ungrib``

| **API**: ``import uwtools.api.ungrib``

mpas_init
"""""""""

| **CLI**: ``uw mpas_init -h``
| **API**: ``import uwtools.api.drivers.mpas_init``
| **API**: ``import uwtools.api.mpas_init``

mpas
""""

| **CLI**: ``uw mpas -h``
| **API**: ``import uwtools.api.drivers.mpas``


| **API**: ``import uwtools.api.mpas``

------------------

Expand Down
2 changes: 1 addition & 1 deletion docs/sections/user_guide/api/chgres_cube.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
``uwtools.api.chgres_cube``
=============================
===========================

.. automodule:: uwtools.api.chgres_cube
:members:
2 changes: 1 addition & 1 deletion docs/sections/user_guide/api/esg_grid.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
``uwtools.api.esg_grid``
=============================
========================

.. automodule:: uwtools.api.esg_grid
:members:
2 changes: 1 addition & 1 deletion docs/sections/user_guide/api/fv3.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
``uwtools.api.fv3``
========================
===================

.. automodule:: uwtools.api.fv3
:members:
1 change: 1 addition & 0 deletions docs/sections/user_guide/api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ API
shave
template
ungrib
upp
2 changes: 1 addition & 1 deletion docs/sections/user_guide/api/jedi.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
``uwtools.api.jedi``
==========================
====================

.. automodule:: uwtools.api.jedi
:members:
2 changes: 1 addition & 1 deletion docs/sections/user_guide/api/mpas.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
``uwtools.api.mpas``
=============================
====================

.. automodule:: uwtools.api.mpas
:members:
2 changes: 1 addition & 1 deletion docs/sections/user_guide/api/mpas_init.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
``uwtools.api.mpas_init``
=============================
=========================

.. automodule:: uwtools.api.mpas_init
:members:
2 changes: 1 addition & 1 deletion docs/sections/user_guide/api/shave.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
``uwtools.api.shave``
======================
=====================

.. automodule:: uwtools.api.shave
:members:
4 changes: 2 additions & 2 deletions docs/sections/user_guide/api/ungrib.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
``uwtools.api.ungrib``
=============================
======================

.. automodule:: uwtools.api.ungrib
:members:
:members:
5 changes: 5 additions & 0 deletions docs/sections/user_guide/api/upp.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
``uwtools.api.upp``
===================

.. automodule:: uwtools.api.upp
:members:
12 changes: 5 additions & 7 deletions docs/sections/user_guide/cli/drivers/chgres_cube.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@ All tasks take the same arguments. For example:
.. code-block:: text

$ uw chgres_cube run --help
usage: uw chgres_cube run --config-file PATH --cycle CYCLE [-h] [--version] [--batch] [--dry-run]
[--graph-file PATH] [--quiet] [--verbose]
usage: uw chgres_cube run --cycle CYCLE [-h] [--version] [--config-file PATH] [--batch]
[--dry-run] [--graph-file PATH] [--quiet] [--verbose]

A run

Required arguments:
--config-file PATH, -c PATH
Path to UW YAML config file
Comment thread
maddenp-cu marked this conversation as resolved.
--cycle CYCLE
The cycle in ISO8601 format
The cycle in ISO8601 format (e.g. 2024-05-08T18)

Optional arguments:
-h, --help
Show help and exit
--version
Show version info and exit
--config-file PATH, -c PATH
Path to UW YAML config file (default: read from stdin)
--batch
Submit run to batch scheduler
--dry-run
Expand All @@ -69,10 +69,8 @@ The examples use a configuration file named ``config.yaml`` with content similar
.. highlight:: yaml
.. literalinclude:: ../../../../shared/chgres_cube.yaml


Its contents are described in depth in section :ref:`chgres_cube_yaml`. Each of the values in the ``chgres_cube`` YAML may contain Jinja2 variables/expressions using a ``cycle`` variable, which is a Python ``datetime`` object corresponding to the FV3 cycle being run.


* Run ``chgres_cube`` on an interactive node

.. code-block:: text
Expand Down
91 changes: 45 additions & 46 deletions docs/sections/user_guide/cli/drivers/esg_grid.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,57 +6,56 @@ The ``uw`` mode for configuring and running the :ufs-utils:`regional_esg_grid<re
.. code-block:: text

$ uw esg_grid --help
usage: uw esg_grid [-h] [--version] TASK ...

Execute esg_grid tasks

Optional arguments:
-h, --help
Show help and exit
--version
Show version info and exit

Positional arguments:
TASK
namelist_file
The namelist file
provisioned_run_directory
Run directory provisioned with all required content
run
A run
runscript
The runscript
validate
Validate the UW driver config
usage: uw esg_grid [-h] [--version] TASK ...

Execute esg_grid tasks

Optional arguments:
-h, --help
Show help and exit
--version
Show version info and exit

Positional arguments:
TASK
namelist_file
The namelist file
provisioned_run_directory
Run directory provisioned with all required content
run
A run
runscript
The runscript
validate
Validate the UW driver config

All tasks take the same arguments. For example:

.. code-block:: text

$ uw esg_grid run --help
usage: uw esg_grid run --config-file PATH [-h] [--version] [--batch] [--dry-run] [--graph-file PATH] [--quiet] [--verbose]

A run

Required arguments:
--config-file PATH, -c PATH
Path to UW YAML config file

Optional arguments:
-h, --help
Show help and exit
--version
Show version info and exit
--batch
Submit run to batch scheduler
--dry-run
Only log info, making no changes
--graph-file PATH
Path to Graphviz DOT output [experimental]
--quiet, -q
Print no logging messages
--verbose, -v
Print all logging messages
$ uw esg_grid run --help
usage: uw esg_grid run [-h] [--version] [--config-file PATH] [--batch] [--dry-run]
[--graph-file PATH] [--quiet] [--verbose]

A run

Optional arguments:
-h, --help
Show help and exit
--version
Show version info and exit
--config-file PATH, -c PATH
Path to UW YAML config file (default: read from stdin)
--batch
Submit run to batch scheduler
--dry-run
Only log info, making no changes
--graph-file PATH
Path to Graphviz DOT output [experimental]
--quiet, -q
Print no logging messages
--verbose, -v
Print all logging messages

Examples
^^^^^^^^
Expand Down
4 changes: 2 additions & 2 deletions docs/sections/user_guide/cli/drivers/fv3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The ``uw`` mode for configuring and running FV3.
$ uw fv3 --help
usage: uw fv3 [-h] [--version] TASK ...

Execute FV3 tasks
Execute fv3 tasks

Optional arguments:
-h, --help
Expand Down Expand Up @@ -57,7 +57,7 @@ All tasks take the same arguments. For example:
--config-file PATH, -c PATH
Path to UW YAML config file
--cycle CYCLE
The cycle in ISO8601 format
The cycle in ISO8601 format (e.g. 2024-05-08T18)

Optional arguments:
-h, --help
Expand Down
13 changes: 5 additions & 8 deletions docs/sections/user_guide/cli/drivers/global_equiv_resol.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ The ``uw`` mode for configuring and running the UFS Utils preprocessing componen

.. code-block:: text

$ uw global_equiv_resol -h
$ uw global_equiv_resol --help
Comment thread
maddenp-cu marked this conversation as resolved.
usage: uw global_equiv_resol [-h] [--version] TASK ...

Execute global_equiv_resol tasks
Expand Down Expand Up @@ -33,21 +33,19 @@ All tasks take the same arguments. For example:

.. code-block:: text

$ uw global_equiv_resol run -h
usage: uw global_equiv_resol run --config-file PATH [-h] [--version] [--batch] [--dry-run]
$ uw global_equiv_resol run --help
usage: uw global_equiv_resol run [-h] [--version] [--config-file PATH] [--batch] [--dry-run]
[--graph-file PATH] [--quiet] [--verbose]

A run

Required arguments:
--config-file PATH, -c PATH
Path to config file

Optional arguments:
-h, --help
Show help and exit
--version
Show version info and exit
--config-file PATH, -c PATH
Path to UW YAML config file (default: read from stdin)
--batch
Submit run to batch scheduler
--dry-run
Expand All @@ -67,7 +65,6 @@ The examples use a configuration file named ``config.yaml`` with content similar
.. highlight:: yaml
.. literalinclude:: ../../../../shared/global_equiv_resol.yaml


Its contents are described in section :ref:`global_equiv_resol_yaml`.

* Run ``global_equiv_resol`` on an interactive node
Expand Down
1 change: 1 addition & 0 deletions docs/sections/user_guide/cli/drivers/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ Drivers
sfc_climo_gen
shave
ungrib
upp
Loading