Skip to content

Commit

Permalink
Merge pull request #337 from hklion/drag
Browse files Browse the repository at this point in the history 
add in info about drag regression tests
  • Loading branch information
@hklion
hklion authored Jan 23, 2025
2 parents 1b99d10 + 0a6dd7a commit e728be6
Showing 1 changed file with 68 additions and 34 deletions.
102 changes: 68 additions & 34 deletions Docs/sphinx_doc/RegressionTests.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Regression Tests
================

There are currently 9 accuracy tests which are run as part of every PR.
There are currently 12 accuracy tests which are run as part of every PR on a range of architectures.
The CI tests use cmake and are based on the version
of AMReX in the REMORA submodule. This suite can be run following the
instructions in :ref:`Testing`<Testing>`.
Expand All @@ -25,39 +25,57 @@ Continuous Integration (CI) Tests

The following problems are currently tested in the CI. More details about the problems underlying these tests are given in :ref:`sec:verification`.

+----------------------+----------+----------+----------+-----------------------+
| Test | nx ny nz | xbc | ybc | Other |
+======================+==========+==========+==========+=======================+
| Advection | 81 81 16 | Periodic | Periodic | |
+----------------------+----------+----------+----------+-----------------------+
| Advection_ML | 80 80 16 | Periodic | Periodic | multilevel |
+----------------------+----------+----------+----------+-----------------------+
| Channel_Test | 20 60 50 | Periodic | SlipWall | Coriolis |
| | | | | |
| | | | | GLS mixing scheme |
| | | | | |
| | | | | non-flat bathymetry |
+----------------------+----------+----------+----------+-----------------------+
| DoubleGyre | 54 108 4 | SlipWall | SlipWall | Coriolis |
+----------------------+----------+----------+----------+-----------------------+
| DoublyPeriodic | 41 80 16 | Periodic | Periodic | Coriolis |
+----------------------+----------+----------+----------+-----------------------+
| DoublyPeriodic_bathy | 41 80 16 | Periodic | Periodic | Coriolis |
| | | | | |
| | | | | non-flat bathymetry |
+----------------------+----------+----------+----------+-----------------------+
| Seamount | 49 48 13 | Periodic | Periodic | Coriolis |
+----------------------+----------+----------+----------+-----------------------+
| Upwelling | 41 80 16 | Periodic | SlipWall | Coriolis |
| | | | | |
| | | | | non-flat bathymetry |
+----------------------+----------+----------+----------+-----------------------+
| Upwelling_GLS | 41 80 16 | Periodic | SlipWall | Coriolis |
| | | | | |
| | | | | non-flat bathymetry |
| | | | | |
| | | | | GLS mixing scheme |
+----------------------+----------+----------+----------+-----------------------+
+----------------------+----------+----------+----------+---------------------------------+
| Test | nx ny nz | xbc | ybc | Other |
+======================+==========+==========+==========+=================================+
| Advection | 81 81 16 | Periodic | Periodic | |
+----------------------+----------+----------+----------+---------------------------------+
| Advection_ML | 80 80 16 | Periodic | Periodic | multilevel |
+----------------------+----------+----------+----------+---------------------------------+
| Channel_Test | 20 60 50 | Periodic | SlipWall | Coriolis |
| | | | | |
| | | | | GLS mixing scheme |
| | | | | |
| | | | | non-flat bathymetry |
+----------------------+----------+----------+----------+---------------------------------+
| DoubleGyre | 54 108 4 | SlipWall | SlipWall | Coriolis |
+----------------------+----------+----------+----------+---------------------------------+
| DoublyPeriodic | 41 80 16 | Periodic | Periodic | Coriolis |
+----------------------+----------+----------+----------+---------------------------------+
| DoublyPeriodic_bathy | 41 80 16 | Periodic | Periodic | Coriolis |
| | | | | |
| | | | | non-flat bathymetry |
+----------------------+----------+----------+----------+---------------------------------+
| Seamount | 49 48 13 | Periodic | Periodic | Coriolis |
+----------------------+----------+----------+----------+---------------------------------+
| Upwelling | 41 80 16 | Periodic | SlipWall | Coriolis |
| | | | | |
| | | | | non-flat bathymetry |
+----------------------+----------+----------+----------+---------------------------------+
| Upwelling_GLS | 41 80 16 | Periodic | SlipWall | Coriolis |
| | | | | |
| | | | | non-flat bathymetry |
| | | | | |
| | | | | GLS mixing scheme |
+----------------------+----------+----------+----------+---------------------------------+
| Upwelling_NLEOS | 41 80 16 | Periodic | SlipWall | Coriolis |
| | | | | |
| | | | | non-flat bathymetry |
| | | | | |
| | | | | nonlinear equation of state |
+----------------------+----------+----------+----------+---------------------------------+
| Upwelling_logdrag | 41 80 16 | Periodic | SlipWall | Coriolis |
| | | | | |
| | | | | non-flat bathymetry |
| | | | | |
| | | | | logarithmic bottom stress |
+----------------------+----------+----------+----------+---------------------------------+
| Upwelling_qdrag | 41 80 16 | Periodic | SlipWall | Coriolis |
| | | | | |
| | | | | non-flat bathymetry |
| | | | | |
| | | | | quadratic bottom stress |
+----------------------+----------+----------+----------+---------------------------------+

Nightly Regression Tests on CPU
-------------------------------
Expand Down Expand Up @@ -408,10 +426,18 @@ Based on :ref:`Upwelling<upwelling-desc>`, which always includes Coriolis and no
+----------------------------------------+--------------+------------------+-------------------+----------------------------------+
| Upwelling-OMP | 41 80 16 | Periodic | SlipWall | MPI + OpenMP |
+----------------------------------------+--------------+------------------+-------------------+----------------------------------+
| Upwelling-logDrag-OMP | 41 80 16 | Periodic | SlipWall | MPI + OpenMP |
| | | | | |
| | | | | logarithmic bottom stress |
+----------------------------------------+--------------+------------------+-------------------+----------------------------------+
| Upwelling-nonlinEOS-OMP | 41 80 16 | Periodic | SlipWall | MPI + OpenMP |
| | | | | |
| | | | | nonlinear equation of state |
+----------------------------------------+--------------+------------------+-------------------+----------------------------------+
| Upwelling-quadDrag-OMP | 41 80 16 | Periodic | SlipWall | MPI + OpenMP |
| | | | | |
| | | | | quadratic bottom stress |
+----------------------------------------+--------------+------------------+-------------------+----------------------------------+
| Upwelling-OMP-1grid | 41 80 16 | Periodic | SlipWall | OpenMP |
+----------------------------------------+--------------+------------------+-------------------+----------------------------------+
| Upwelling-restart | 41 80 16 | Periodic | SlipWall | MPI |
Expand Down Expand Up @@ -731,10 +757,18 @@ Based on :ref:`Upwelling<upwelling-desc>`, which always includes Coriolis and no
+----------------------------------------+--------------+------------------+-------------------+----------------------------------+
| Upwelling-1grid | 41 80 16 | Periodic | SlipWall | |
+----------------------------------------+--------------+------------------+-------------------+----------------------------------+
| Upwelling-logDrag | 41 80 16 | Periodic | SlipWall | MPI |
| | | | | |
| | | | | logarithmic bottom stress |
+----------------------------------------+--------------+------------------+-------------------+----------------------------------+
| Upwelling-nonlinEOS | 41 80 16 | Periodic | SlipWall | MPI |
| | | | | |
| | | | | nonlinear equation of state |
+----------------------------------------+--------------+------------------+-------------------+----------------------------------+
| Upwelling-quadDrag | 41 80 16 | Periodic | SlipWall | MPI |
| | | | | |
| | | | | quadratic bottom stress |
+----------------------------------------+--------------+------------------+-------------------+----------------------------------+
| Upwelling-x | 41 80 16 | SlipWall | Periodic | MPI |
+----------------------------------------+--------------+------------------+-------------------+----------------------------------+
| Upwelling-x-1grid | 41 80 16 | SlipWall | Periodic | |
Expand Down

0 comments on commit e728be6

Please sign in to comment.