Skip to content

Commit 64d27fe

Browse files
authored
Merge pull request #271 from xylar/fix-multisphinx
Don't include v0.1.0 in the docs
2 parents 78f31e6 + 4dfdae4 commit 64d27fe

File tree

9 files changed

+43
-42
lines changed

9 files changed

+43
-42
lines changed

docs/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
],
108108
}
109109

110-
smv_tag_whitelist = r"^\d+\.\d+.\d+$" # Include tags like "tags/2.5.0"
110+
# Include tags like "tags/1.0.0" -- 0.1.0-0.4.0 don't build
111+
smv_tag_whitelist = r'^(?!(0.1.0|0.2.0|0.3.0|0.4.0))\d+\.\d+.\d+$'
111112
smv_branch_whitelist = "main"
112113
smv_remote_whitelist = "origin"

docs/developers_guide/ocean/framework.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ convergence is being tested in space (or space and time together). The
226226
`base_resolution` is applied to all steps when convergence in time is tested.
227227
`base_resolution` times `dt_per_km` determines the base timestep in that case
228228
and is then multiplied by the `refinement_factors` to determine which time steps
229-
to test. When spherical meshes are being tested, the values in the
229+
to test. When spherical meshes are being tested, the values in the
230230
`convergence` section are overridden by their values in the
231231
`spherical_convergence` section with a prefix indicating the mesh type.
232232

@@ -441,7 +441,7 @@ mpas-ocean:
441441
on the associated config options (first at setup and again at runtime in case
442442
the config options have changed).
443443

444-
In addition, the {py:class}`polaris.ocean.convergence.ConvergenceAnalysis`
444+
In addition, the {py:class}`polaris.ocean.convergence.analysis.ConvergenceAnalysis`
445445
step can serve as a parent class for analysis steps in convergence tests. This
446446
parent class computes the error norm for the output from each resolution's
447447
forward step. It also produces the convergence plot.
@@ -486,12 +486,12 @@ class Analysis(ConvergenceAnalysis):
486486
```
487487

488488
Many tasks will also need to override the
489-
{py:meth}`polaris.ocean.convergence.ConvergenceAnalysis.exact_solution()`
489+
{py:meth}`polaris.ocean.convergence.analysis.ConvergenceAnalysis.exact_solution()`
490490
method. If not overridden, the analysis step will compute the difference of the
491491
output from the initial state.
492492

493493
In some cases, the child class will also need to override the
494-
{py:meth}`polaris.ocean.convergence.ConvergenceAnalysis.get_output_field()`
494+
{py:meth}`polaris.ocean.convergence.analysis.ConvergenceAnalysis.get_output_field()`
495495
method if the requested field is not available directly from the output put
496496
rather needs to be computed. The default behavior is to read the requested
497497
variable (the value associate the `'name'` key) at the time index closest to

docs/developers_guide/ocean/tasks/correlated_tracers_2d.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ of convergence.
1212

1313
## framework
1414

15-
The config options for the `correlated_tracers_2d` test is described in
15+
The config options for the `correlated_tracers_2d` test is described in
1616
{ref}`ocean-correlated-tracers-2d` in the User's Guide.
1717

1818
Additionally, the test uses a `forward.yaml` file with a few common
@@ -41,14 +41,14 @@ descends from {py:class}`polaris.ocean.convergence.spherical.SphericalConvergenc
4141
and defines a step for running MPAS-Ocean from an initial condition produced in
4242
an `init` step. See {ref}`dev-ocean-convergence` for some relevant
4343
discussion of the parent class. The time step is determined from the resolution
44-
based on the `dt_per_km` config option in the `[convergence_forward]`
44+
based on the `dt_per_km` config option in the `[convergence_forward]`
4545
section. Other model config options are taken from `forward.yaml`.
4646

4747
### analysis
4848

4949
The class {py:class}`polaris.ocean.tasks.sphere_transport.analysis.Analysis`
5050
descends from
51-
{py:class}`polaris.ocean.convergence.ConvergenceAnalysis`,
51+
{py:class}`polaris.ocean.convergence.analysis.ConvergenceAnalysis`,
5252
and defines a step for computing the error norm (L2) for the results
5353
at each resolution for tracers and layer thickness, saving them in
5454
`convergence_*.csv` and plotting them in `convergence_*.png`.

docs/developers_guide/ocean/tasks/divergent_2d.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ of convergence.
1212

1313
## framework
1414

15-
The config options for the `divergent_2d` test is described in
15+
The config options for the `divergent_2d` test is described in
1616
{ref}`ocean-divergent-2d` in the User's Guide.
1717

1818
Additionally, the test uses a `forward.yaml` file with a few common
@@ -41,14 +41,14 @@ descends from {py:class}`polaris.ocean.convergence.spherical.SphericalConvergenc
4141
and defines a step for running MPAS-Ocean from an initial condition produced in
4242
an `init` step. See {ref}`dev-ocean-convergence` for some relevant
4343
discussion of the parent class. The time step is determined from the resolution
44-
based on the `dt_per_km` config option in the `[convergence_forward]`
44+
based on the `dt_per_km` config option in the `[convergence_forward]`
4545
section. Other model config options are taken from `forward.yaml`.
4646

4747
### analysis
4848

4949
The class {py:class}`polaris.ocean.tasks.sphere_transport.analysis.Analysis`
5050
descends from
51-
{py:class}`polaris.ocean.convergence.ConvergenceAnalysis`,
51+
{py:class}`polaris.ocean.convergence.analysis.ConvergenceAnalysis`,
5252
and defines a step for computing the error norm (L2) for the results
5353
at each resolution for tracers and layer thickness, saving them in
5454
`convergence_*.csv` and plotting them in `convergence_*.png`.

docs/developers_guide/ocean/tasks/geostrophic.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ used to produce the initial condition to determine the rate of convergence.
1010

1111
## framework
1212

13-
The config options for the `geostrophic` tests are described in
13+
The config options for the `geostrophic` tests are described in
1414
{ref}`ocean-geostrophic` in the User's Guide.
1515

1616
Additionally, the test uses a `forward.yaml` file with a few common
@@ -37,14 +37,14 @@ descends from {py:class}`polaris.ocean.convergence.spherical.SphericalConvergenc
3737
and defines a step for running MPAS-Ocean from an initial condition produced in
3838
an `init` step. See {ref}`dev-ocean-convergence` for some relevant
3939
discussion of the parent class. The time step is determined from the resolution
40-
based on the `dt_per_km` config option in the `[spherical_convergences]`
40+
based on the `dt_per_km` config option in the `[spherical_convergences]`
4141
section. Other model config options are taken from `forward.yaml`.
4242

4343
### analysis
4444

4545
The class {py:class}`polaris.ocean.tasks.geostrophic.analysis.Analysis`
4646
descends from
47-
{py:class}`polaris.ocean.convergence.ConvergenceAnalysis`,
47+
{py:class}`polaris.ocean.convergence.analysis.ConvergenceAnalysis`,
4848
and defines a step for computing the error norm (L2) for the water-column
4949
thickness and normal velocity at each resolution, saving them in
5050
`convergence_h.csv` and `convergence_normalVelocity.csv`, and plotting them

docs/developers_guide/ocean/tasks/inertial_gravity_wave.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(dev-ocean-inertial-gravity-wave)=
1+
(dev-ocean-inertial-gravity-wave)=
22

33
# inertial_gravity_wave
44

@@ -8,11 +8,11 @@ is a linear shallow water test case at 4 resolutions (200, 100, 50, and
88

99
The {py:class}`polaris.ocean.tasks.inertial_gravity_wave.InertialGravityWave`
1010
test performs a 10-hour run with a series of resolutions. The convergence rate
11-
is calculated and visualizations are generated.
11+
is calculated and visualizations are generated.
1212

1313
## framework
1414

15-
The config options for the `inertial_gravity_wave` test are described in
15+
The config options for the `inertial_gravity_wave` test are described in
1616
{ref}`ocean-inertial-gravity-wave` in the User's Guide.
1717

1818
Additionally, the test uses a `forward.yaml` file with a few common
@@ -55,19 +55,19 @@ Namelist and streams files are updated by the parent class with time steps
5555
determined algorithmically based on config options. The number
5656
of cells is approximated from config options in
5757
{py:meth}`polaris.ocean.tasks.inertial_gravity_wave.forward.Forward.compute_cell_count()`
58-
so that this can be used to constrain the number of MPI tasks that Polaris
59-
tasks have as their target and minimum (if the resources are not explicitly
60-
prescribed). For MPAS-Ocean, PIO namelist options are modified and a graph
61-
partition is generated as part of `runtime_setup()`. Then, the ocean model
62-
is run. Finally, validation of `layerThickness` and `normalVelocity` are
63-
performed against a baseline if one is provided when calling
58+
so that this can be used to constrain the number of MPI tasks that Polaris
59+
tasks have as their target and minimum (if the resources are not explicitly
60+
prescribed). For MPAS-Ocean, PIO namelist options are modified and a graph
61+
partition is generated as part of `runtime_setup()`. Then, the ocean model
62+
is run. Finally, validation of `layerThickness` and `normalVelocity` are
63+
performed against a baseline if one is provided when calling
6464
{ref}`dev-polaris-setup`.
6565

6666
### analysis
6767

6868
The class
6969
{py:class}`polaris.ocean.tasks.inertial_gravity_wave.analysis.Analysis`
70-
descends from {py:class}`polaris.ocean.convergence.ConvergenceAnalysis`
70+
descends from {py:class}`polaris.ocean.convergence.analysis.ConvergenceAnalysis`
7171
a step for computing the error from the final simulated field
7272
and the exact solution. It uses the config options to determine whether the
7373
convergence rate falls within acceptable bounds.

docs/developers_guide/ocean/tasks/manufactured_solution.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
# manufactured_solution
44

55
The manufactured solution test in `polaris.ocean.tasks.manufactured_solution`
6-
uses the Method of Manufactured Solutions (see
6+
uses the Method of Manufactured Solutions (see
77
{ref}`ocean-manufactured-solution`) at 4 resolutions (200, 100, 50, and 25 km).
88

99
The {py:class}`polaris.ocean.tasks.manufactured_solution.ManufacturedSolution`
10-
test performs a 10-hour run.
10+
test performs a 10-hour run.
1111

1212
## framework
1313

14-
The config options for the `manufactured_solution` test are described in
14+
The config options for the `manufactured_solution` test are described in
1515
{ref}`ocean-manufactured-solution` in the User's Guide.
1616

1717
Additionally, the test uses a `forward.yaml` file with
18-
a few common model config options related to run duration and default
19-
horizontal and vertical momentum and tracer diffusion, as well as defining
18+
a few common model config options related to run duration and default
19+
horizontal and vertical momentum and tracer diffusion, as well as defining
2020
`mesh`, `input`, `restart`, and `output` streams.
2121

2222
### exact_solution
@@ -52,18 +52,18 @@ Namelist and streams files are updated by the parent class with time steps
5252
determined algorithmically based on config options. The number
5353
of cells is approximated from config options in
5454
{py:meth}`polaris.ocean.tasks.inertial_gravity_wave.forward.Forward.compute_cell_count()`
55-
so that this can be used to constrain the number of MPI tasks that Polaris
56-
tasks have as their target and minimum (if the resources are not explicitly
57-
prescribed). For MPAS-Ocean, PIO namelist options are modified and a graph
58-
partition is generated as part of `runtime_setup()`. Then, the ocean model
59-
is run. Finally, validation of `temperature`, `layerThickness` and
60-
`normalVelocity` are performed against a baseline if one is provided when
55+
so that this can be used to constrain the number of MPI tasks that Polaris
56+
tasks have as their target and minimum (if the resources are not explicitly
57+
prescribed). For MPAS-Ocean, PIO namelist options are modified and a graph
58+
partition is generated as part of `runtime_setup()`. Then, the ocean model
59+
is run. Finally, validation of `temperature`, `layerThickness` and
60+
`normalVelocity` are performed against a baseline if one is provided when
6161
calling {ref}`dev-polaris-setup`.
6262

6363
### analysis
6464

6565
The class {py:class}`polaris.ocean.tasks.manufactured_solution.analysis.Analysis`
66-
descends from {py:class}`polaris.ocean.convergence.ConvergenceAnalysis`
66+
descends from {py:class}`polaris.ocean.convergence.analysis.ConvergenceAnalysis`
6767
a step for computing the error from the final simulated field
6868
and the exact solution. It uses the config options to determine whether the
6969
convergence rate falls within acceptable bounds.

docs/developers_guide/ocean/tasks/nondivergent_2d.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ of convergence.
1212

1313
## framework
1414

15-
The config options for the `nondivergent_2d` test is described in
15+
The config options for the `nondivergent_2d` test is described in
1616
{ref}`ocean-nondivergent-2d` in the User's Guide.
1717

1818
Additionally, the test uses a `forward.yaml` file with a few common
@@ -41,14 +41,14 @@ descends from {py:class}`polaris.ocean.convergence.spherical.SphericalConvergenc
4141
and defines a step for running MPAS-Ocean from an initial condition produced in
4242
an `init` step. See {ref}`dev-ocean-convergence` for some relevant
4343
discussion of the parent class. The time step is determined from the resolution
44-
based on the `dt_per_km` config option in the `[convergence_forward]`
44+
based on the `dt_per_km` config option in the `[convergence_forward]`
4545
section. Other model config options are taken from `forward.yaml`.
4646

4747
### analysis
4848

4949
The class {py:class}`polaris.ocean.tasks.sphere_transport.analysis.Analysis`
5050
descends from
51-
{py:class}`polaris.ocean.convergence.ConvergenceAnalysis`,
51+
{py:class}`polaris.ocean.convergence.analysis.ConvergenceAnalysis`,
5252
and defines a step for computing the error norm (L2) for the results
5353
at each resolution for tracers and layer thickness, saving them in
5454
`convergence_*.csv` and plotting them in `convergence_*.png`.

docs/developers_guide/ocean/tasks/rotation_2d.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ of convergence.
1212

1313
## framework
1414

15-
The config options for the `rotation_2d` test is described in
15+
The config options for the `rotation_2d` test is described in
1616
{ref}`ocean-rotation-2d` in the User's Guide.
1717

1818
Additionally, the test uses a `forward.yaml` file with a few common
@@ -41,14 +41,14 @@ descends from {py:class}`polaris.ocean.convergence.spherical.SphericalConvergenc
4141
and defines a step for running MPAS-Ocean from an initial condition produced in
4242
an `init` step. See {ref}`dev-ocean-convergence` for some relevant
4343
discussion of the parent class. The time step is determined from the resolution
44-
based on the `dt_per_km` config option in the `[convergence_forward]`
44+
based on the `dt_per_km` config option in the `[convergence_forward]`
4545
section. Other model config options are taken from `forward.yaml`.
4646

4747
### analysis
4848

4949
The class {py:class}`polaris.ocean.tasks.sphere_transport.analysis.Analysis`
5050
descends from
51-
{py:class}`polaris.ocean.convergence.ConvergenceAnalysis`,
51+
{py:class}`polaris.ocean.convergence.analysis.ConvergenceAnalysis`,
5252
and defines a step for computing the error norm (L2) for the results
5353
at each resolution for tracers and layer thickness, saving them in
5454
`convergence_*.csv` and plotting them in `convergence_*.png`.

0 commit comments

Comments
 (0)