From 051d287661540ed12c4066049a0bb5ad7b1ca723 Mon Sep 17 00:00:00 2001 From: Ann Almgren Date: Thu, 16 May 2019 07:51:59 -0700 Subject: [PATCH] formatting --- docs/source/CITests.rst | 137 +++++++++++++++++++++++----------------- 1 file changed, 78 insertions(+), 59 deletions(-) diff --git a/docs/source/CITests.rst b/docs/source/CITests.rst index 0e7ea06..17116be 100644 --- a/docs/source/CITests.rst +++ b/docs/source/CITests.rst @@ -6,11 +6,11 @@ Continuous Integration The following regression tests are run every time a commit is pushed to the main MFiX-Exa repository on the NETL gitlab. -For each of the tests in the chart below, we have identified the "-x" version -in the table, but each of the tests also has a "-y" version and a "-z" version. +For each of the tests in the chart below, there are +three directional variations; these are identified in the repository as, +for example, FLD01-x, FLD01-y, and FLD01-z. -Similarly -- for many of these tests there are multiple versions, -with the following notations: +For each direction, where appropriate, there are multiple versions, with the following notations: * SGS: single grid serial @@ -35,58 +35,77 @@ None of these tests have non-rectangular geometry. Additional detail about these problems is given in tests/README.md -+-------------------+----+-------+--------+----+----+----------------------+ -| Test | nx | bc_x | Npa | Ng | Np | Description | -| | ny | bc_y | | | | | -| | nz | bc_z | | | | | -+===================+====+=======+========+====+====+======================+ -| FLD01-x:SGS | 8 | Per | 0 | 1 | 1 | Poiseuille Flow | -| | | | | | | (periodic) | -| MGS | 4 | NSW | | 2 | 1 | | -| | | | | | | | -| MGP | 4 | Per | | 2 | | | -+-------------------+----+-------+--------+----+----+----------------------+ -| FLD02-x:SGS | 80 | MI/PO | 0 | 1 | 1 | Couette flow in | -| | | | | | | rectangular channel | -| MGS | 16 | NSW | | 40 | 1 | | -| | | | | | | | -| MGP | 16 | NSW | | 40 | | | -+-------------------+----+-------+--------+----+----+----------------------+ -| FLD03-x:SGS | 8 | PI/PO | 0 | 1 | 1 | Poiseuille Flow | -| | | | | | | (pressure inflow | -| MGS | 8 | NSW | | 4 | 1 | pressure outflow) | -| | | | | | | | -| MGP | 4 | Per | | 4 | | | -+-------------------+----+-------+--------+----+----+----------------------+ -| DEM01:SGS | 2 | NSW | 1 | 1 | 1 | Freely falling | -| | 5 | Per | | | | particle with | -| | 5 | Per | | | | wall collision | -+-------------------+----+-------+--------+----+----+----------------------+ -| DEM02:SGS | 2 | NSW | 1 | 1 | 1 | Multiple bounces | -| | 5 | Per | | | | with bounce height | -| | 5 | Per | | | | measured | -+-------------------+----+-------+--------+----+----+----------------------+ -| DEM03:SGS | 2 | NSW | 2 | 1 | 1 | Two stacked | -| | 5 | Per | | | | compressed particles | -| | 5 | Per | | | | | -+-------------------+----+-------+--------+----+----+----------------------+ -| DEM04:SGS | 4 | NSW | 1 | 1 | 1 | Single particle | -| | 4 | Per | | | | slipping on a | -| | 4 | Per | | | | rough surface | -+-------------------+----+-------+--------+----+----+----------------------+ -| DEM05:SGS | 5 | Per | 93 | 1 | 1 | Oblique particle | -| | 2 | Per | | | | collisions | -| | 5 | Per | | | | | -+-------------------+----+-------+--------+----+----+----------------------+ -| DEM06-x:SGS | 50 | NSW | 1 | 1 | 1 | Single particle | -| | | | | | | falling under | -| MGS | 5 | NSW | | 10 | 1 | gravity, reaching | -| | | | | | | terminal velocity | -| MGP | 5 | NSW | | 10 | 1 | | -+-------------------+----+-------+--------+----+----+----------------------+ -| DEM07-x | 20 | Per | 1222 | 1 | 1 | Homogeneous | -| | | | | | | cooling system | -| MGS | 20 | Per | | 8 | 1 | | -| | | | | | | | -| MGP | 20 | Per | | 8 | | | -+-------------------+----+-------+--------+----+----+----------------------+ +Fluid-only tests: + ++-------+-----+----+-------+----+----+----------------------+ +| Test | | nx | bc_x | Ng | Np | Description | +| | | ny | bc_y | | | | +| | | nz | bc_z | | | | ++=======+=====+====+=======+====+====+======================+ +| FLD01 | SGS | 8 | Per | 1 | 1 | Poiseuille Flow | +| | | | | | | (periodic) | +| | MGS | 4 | NSW | 2 | 1 | | +| | | | | | | | +| | MGP | 4 | Per | 2 | | | ++-------+-----+----+-------+----+----+----------------------+ +| FLD02 | SGS | 80 | MI/PO | 1 | 1 | Couette flow in | +| | | | | | | rectangular channel | +| | MGS | 16 | NSW | 40 | 1 | | +| | | | | | | | +| | MGP | 16 | NSW | 40 | | | ++-------+-----+----+-------+----+----+----------------------+ +| FLD03 | SGS | 8 | PI/PO | 1 | 1 | Poiseuille Flow | +| | | | | | | (pressure inflow | +| | MGS | 8 | NSW | 4 | 1 | pressure outflow) | +| | | | | | | | +| | MGP | 4 | Per | 4 | | | ++-------+-----+----+-------+----+----+----------------------+ + +Single-grid, single-process (SGS) particle-only tests: + ++-------+----+-------+--------+----------------------+ +| Test | nx | bc_x | Npa | Description | +| | ny | bc_y | | | +| | nz | bc_z | | | ++-------+----+-------+--------+----------------------+ +| DEM01 | 2 | NSW | 1 | Freely falling | +| | 5 | Per | | particle with | +| | 5 | Per | | wall collision | ++-------+----+-------+--------+----------------------+ +| DEM02 | 2 | NSW | 1 | Multiple bounces | +| | 5 | Per | | with bounce height | +| | 5 | Per | | measured | ++-------+----+-------+--------+----------------------+ +| DEM03 | 2 | NSW | 2 | Two stacked | +| | 5 | Per | | compressed particles | +| | 5 | Per | | | ++-------+----+-------+--------+----------------------+ +| DEM04 | 4 | NSW | 1 | Single particle | +| | 4 | Per | | slipping on a | +| | 4 | Per | | rough surface | ++-------+----+-------+--------+----------------------+ +| DEM05 | 5 | Per | 93 | Oblique particle | +| | 2 | Per | | collisions | +| | 5 | Per | | | ++-------+----+-------+--------+----------------------+ + + +Coupled particle/fluid tests: + ++------+-----+----+-------+--------+----+----+----------------------+ +| Test | | nx | bc_x | Npa | Ng | Np | Description | +| | | ny | bc_y | | | | | +| | | nz | bc_z | | | | | ++------+-----+----+-------+--------+----+----+----------------------+ +| DEM06| SGS | 50 | NSW | 1 | 1 | 1 | Single particle | +| | | | | | | | falling under | +| | MGS | 5 | NSW | | 10 | 1 | gravity, reaching | +| | | | | | | | terminal velocity | +| | MGP | 5 | NSW | | 10 | | | ++------+-----+----+-------+--------+----+----+----------------------+ +| DEM07| SGS | 20 | Per | 1222 | 1 | 1 | Homogeneous | +| | | | | | | | cooling system | +| | MGS | 20 | Per | | 8 | 1 | | +| | | | | | | | | +| | MGP | 20 | Per | | 8 | | | ++------+-----+----+-------+--------+----+----+----------------------+ -- GitLab