From 6ac2a5b73543592f1a515b5b291d8d13cd37e70f Mon Sep 17 00:00:00 2001 From: Charles G Waldman Date: Fri, 30 Jan 2026 22:28:51 -0600 Subject: [PATCH 1/2] use new syntax for fixed-length arrays (Ints, Reals) --- .../user_guide/inputs/boundary_conditions.rst | 6 +++--- docs/source_docs/user_guide/inputs/domain.rst | 6 +++--- .../user_guide/inputs/geometry.rst | 12 +++++------ .../user_guide/inputs/initial_conditions.rst | 4 ++-- .../user_guide/inputs/mesh_and_gridding.rst | 6 +++--- .../user_guide/inputs/model_options.rst | 8 ++++---- .../source_docs/user_guide/inputs/regions.rst | 20 +++++++++---------- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docs/source_docs/user_guide/inputs/boundary_conditions.rst b/docs/source_docs/user_guide/inputs/boundary_conditions.rst index f327480..dcaf2dd 100644 --- a/docs/source_docs/user_guide/inputs/boundary_conditions.rst +++ b/docs/source_docs/user_guide/inputs/boundary_conditions.rst @@ -62,7 +62,7 @@ using the prefix ``bc.[region_name].[fluid_name]``: +------------------------+------------------------------------------------------------------------+-------------+-----------+ | temperature | Fluid temperature [required if bc type is ``mi`` or ``pi``] | Real | 0 | +------------------------+------------------------------------------------------------------------+-------------+-----------+ -| velocity | Velocity components [required if bc type is ``mi`` | Reals | 0 0 0 | +| velocity | Velocity components [required if bc type is ``mi`` | Reals<3> | 0 0 0 | | | and ``volflow`` or ``massflow`` not specified] | | | +------------------------+------------------------------------------------------------------------+-------------+-----------+ | volflow | Volumetric flow rate [required if bc type is ``mi`` | Real | 0 | @@ -157,7 +157,7 @@ please refer to :ref:`ReferenceParticleDistributions | 0 0 0 | +------------------------+-----------------------------------------------------------------------+-------------+-----------+ | volflow | Volumetric flow rate. | Real | 0 | +------------------------+-----------------------------------------------------------------------+-------------+-----------+ @@ -272,7 +272,7 @@ angular tolerance. The following inputs are defined using the prefix ``bc.[regio +--------------------+-----------------------------------------------------------------------+-------------+-----------+ | | Description | Type | Default | +====================+=======================================================================+=============+===========+ -| normal | [Optional] Specifies the target face normal direction. Only EB faces | Reals | 0 0 0 | +| normal | [Optional] Specifies the target face normal direction. Only EB faces | Reals<3> | 0 0 0 | | | whose normals are parallel (within the specified tolerance) will have | | | | | the boundary condition applied. | | | +--------------------+-----------------------------------------------------------------------+-------------+-----------+ diff --git a/docs/source_docs/user_guide/inputs/domain.rst b/docs/source_docs/user_guide/inputs/domain.rst index f49b9c8..6d3f001 100644 --- a/docs/source_docs/user_guide/inputs/domain.rst +++ b/docs/source_docs/user_guide/inputs/domain.rst @@ -16,11 +16,11 @@ The following inputs are defined using the prefix ``geometry``: | coord_sys | Coordinate system used in simulation. Only Cartesian coordinates | Int | 0 | | | (``coord_sys = 0``) are supported. | | | +-----------------+-----------------------------------------------------------------------+-------------+-----------+ -| is_periodic | 1 for true, 0 for false (one value for each coordinate direction) | Ints | 0 0 0 | +| is_periodic | 1 for true, 0 for false (one value for each coordinate direction) | Ints<3> | 0 0 0 | +-----------------+-----------------------------------------------------------------------+-------------+-----------+ -| prob_lo | Low corner of physical domain (physical not index space) | Reals | 0 0 0 | +| prob_lo | Low corner of physical domain (physical not index space) | Reals<3> | 0 0 0 | +-----------------+-----------------------------------------------------------------------+-------------+-----------+ -| prob_hi | High corner of physical domain (physical not index space) | Reals | 0 0 0 | +| prob_hi | High corner of physical domain (physical not index space) | Reals<3> | 0 0 0 | +-----------------+-----------------------------------------------------------------------+-------------+-----------+ .. attention:: diff --git a/docs/source_docs/user_guide/inputs/geometry.rst b/docs/source_docs/user_guide/inputs/geometry.rst index 21b38a5..55818fc 100644 --- a/docs/source_docs/user_guide/inputs/geometry.rst +++ b/docs/source_docs/user_guide/inputs/geometry.rst @@ -53,9 +53,9 @@ The following inputs are defined using the prefix ``box``: +------------------------+-------------------------------------------------------------------+----------+---------------------+ | | Description | Type | Default | +========================+===================================================================+==========+=====================+ -| Lo | Low corner of the embedded boundary box | Reals | ``prob_lo`` | +| Lo | Low corner of the embedded boundary box | Reals<3> | ``prob_lo`` | +------------------------+-------------------------------------------------------------------+----------+---------------------+ -| Hi | High corner of the embedded boundary box | Reals | ``prob_hi`` | +| Hi | High corner of the embedded boundary box | Reals<3> | ``prob_hi`` | +------------------------+-------------------------------------------------------------------+----------+---------------------+ | internal_flow | Indicates that flow is *inside* the box. | Bool | true | +------------------------+-------------------------------------------------------------------+----------+---------------------+ @@ -164,7 +164,7 @@ The following inputs are defined using the prefix ``cylinder``: | | * ``1`` - Y | | | | | * ``2`` - Z | | | +------------------------+-------------------------------------------------------------------+----------+---------------------+ -| center | Center of cylinder. For a cylinder with an undefined ``height``, | Reals | 0 0 0 | +| center | Center of cylinder. For a cylinder with an undefined ``height``, | Reals<3> | 0 0 0 | | | the center value in the height ``direction`` can be any value. | | | +------------------------+-------------------------------------------------------------------+----------+---------------------+ | rotation | Rotation angle of cylinder, in degrees. | Real | 0. | @@ -305,9 +305,9 @@ The following inputs are defined using the prefix ``csg``: +------------------------+-------------------------------------------------------------------+----------+---------------------+ | internal_flow | Indicates that flow is *inside* the box. | Bool | true | +------------------------+-------------------------------------------------------------------+----------+---------------------+ -| scaling_factor | Scale the geometry. | Reals | 1 1 1 | +| scaling_factor | Scale the geometry. | Reals<3> | 1 1 1 | +------------------------+-------------------------------------------------------------------+----------+---------------------+ -| translation | Translate the geometry. | Reals | 0 0 0 | +| translation | Translate the geometry. | Reals<3> | 0 0 0 | +------------------------+-------------------------------------------------------------------+----------+---------------------+ .. note:: @@ -331,7 +331,7 @@ The following inputs are defined using the prefix ``stl``: +------------------------+-------------------------------------------------------------------+----------+---------------------+ | scaling_factor | Scale the geometry. | Real | 1 | +------------------------+-------------------------------------------------------------------+----------+---------------------+ -| translation | Translate the geometry. | Reals | 0 0 0 | +| translation | Translate the geometry. | Reals<3> | 0 0 0 | +------------------------+-------------------------------------------------------------------+----------+---------------------+ | use_bvh | Use bounding volume optimization. | Bool | true | +------------------------+-------------------------------------------------------------------+----------+---------------------+ diff --git a/docs/source_docs/user_guide/inputs/initial_conditions.rst b/docs/source_docs/user_guide/inputs/initial_conditions.rst index 8c85ec2..505bff8 100644 --- a/docs/source_docs/user_guide/inputs/initial_conditions.rst +++ b/docs/source_docs/user_guide/inputs/initial_conditions.rst @@ -30,7 +30,7 @@ using the compound prefix ``ic.[region_name].[fluid_name]``: +------------------------+------------------------------------------------------------------------+-------------+-----------+ | density | Fluid density | Real | 0 | +------------------------+------------------------------------------------------------------------+-------------+-----------+ -| velocity | Velocity components | Reals | 0 0 0 | +| velocity | Velocity components | Reals<3> | 0 0 0 | +------------------------+------------------------------------------------------------------------+-------------+-----------+ | pressure | Fluid pressure | Real | 0 | +------------------------+------------------------------------------------------------------------+-------------+-----------+ @@ -84,7 +84,7 @@ please refer to :ref:`ReferenceParticleDistributions | 0 0 0 | +------------------------+-----------------------------------------------------------------------+-------------+-----------+ | diameter | Method to specify particle diameter in the IC region. This is | String | None | | | only used for auto-generated particles. | | | diff --git a/docs/source_docs/user_guide/inputs/mesh_and_gridding.rst b/docs/source_docs/user_guide/inputs/mesh_and_gridding.rst index cdd2078..7e54b0d 100644 --- a/docs/source_docs/user_guide/inputs/mesh_and_gridding.rst +++ b/docs/source_docs/user_guide/inputs/mesh_and_gridding.rst @@ -19,7 +19,7 @@ The following inputs are defined using the prefix ``amr``: | max_level | Maximum level of refinement. The default value, 0, means that there | Int | 0 | | | is one cell size covering the entire domain (i.e., single-level). | | | +----------------------+-----------------------------------------------------------------------+-------------+-----------+ -| n_cell | Number of cells at level 0 in each coordinate direction. | Ints | 0 0 0 | +| n_cell | Number of cells at level 0 in each coordinate direction. | Ints<3> | 0 0 0 | +----------------------+-----------------------------------------------------------------------+-------------+-----------+ The level 0 mesh spacing is computed for each direction by dividing the :ref:`domain length` by the @@ -213,7 +213,7 @@ The following inputs are defined using the prefix ``fabarray``: +----------------------+-----------------------------------------------------------------------+----------+-------------+ | | Description | Type | Default | +======================+=======================================================================+==========+=============+ -| mfiter_tile_size | Maximum number of cells in each direction for (logical) tiles. | Ints | 1024000 8 8 | +| mfiter_tile_size | Maximum number of cells in each direction for (logical) tiles. | Ints<3> | 1024000 8 8 | +----------------------+-----------------------------------------------------------------------+----------+-------------+ The following inputs are defined using the prefix ``particles``: @@ -221,7 +221,7 @@ The following inputs are defined using the prefix ``particles``: +----------------------+-----------------------------------------------------------------------+-------------+--------------+ | | Description | Type | Default | +======================+=======================================================================+=============+==============+ -| tile_size | Maximum number of cells in each direction for (logical) tiles | Ints | 1024000 8 8 | +| tile_size | Maximum number of cells in each direction for (logical) tiles | Ints<3> | 1024000 8 8 | | | in the ParticleBoxArray if ``load_balance`` is ``DualGrid`` | | | +----------------------+-----------------------------------------------------------------------+-------------+--------------+ diff --git a/docs/source_docs/user_guide/inputs/model_options.rst b/docs/source_docs/user_guide/inputs/model_options.rst index 80dd9c8..94638dc 100644 --- a/docs/source_docs/user_guide/inputs/model_options.rst +++ b/docs/source_docs/user_guide/inputs/model_options.rst @@ -7,13 +7,13 @@ The following inputs are defined using the prefix ``mfix``: +------------------------+----------------------------------------------------------------------------+----------+---------------------+ | | Description | Type | Default | +========================+============================================================================+==========+=====================+ -| gravity | Gravity vector [required] | Reals | 0 0 0 | +| gravity | Gravity vector [required] | Reals<3> | 0 0 0 | +------------------------+----------------------------------------------------------------------------+----------+---------------------+ -| advect_density | Enable time evolution of fluid density. | Int | 0 | +| advect_density | Enable time evolution of fluid density. | Int | 0 | +------------------------+----------------------------------------------------------------------------+----------+---------------------+ -| advect_enthalpy | Enable time evolution of fluid temperature and enthalpy. | Int | 0 | +| advect_enthalpy | Enable time evolution of fluid temperature and enthalpy. | Int | 0 | +------------------------+----------------------------------------------------------------------------+----------+---------------------+ -| constraint | Select low Mach number constraint. | String | IncompressibleFluid | +| constraint | Select low Mach number constraint. | String | IncompressibleFluid | | | | | | | | Options (case-insensitive): | | | | | | | | diff --git a/docs/source_docs/user_guide/inputs/regions.rst b/docs/source_docs/user_guide/inputs/regions.rst index 4f0e384..07ffb7a 100644 --- a/docs/source_docs/user_guide/inputs/regions.rst +++ b/docs/source_docs/user_guide/inputs/regions.rst @@ -30,9 +30,9 @@ For each region, the inputs are defined using the compound prefix ``regions.[reg +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ | | Description | Type | Default | +==========================+=======================================================================+=============+===========+ -| lo | Low corner of physical region (physical, not index space) | Reals | 0 0 0 | +| lo | Low corner of physical region (physical, not index space) | Reals<3> | 0 0 0 | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ -| hi | High corner of physical region (physical, not index space) | Reals | 0 0 0 | +| hi | High corner of physical region (physical, not index space) | Reals<3> | 0 0 0 | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ Below is an example for specifying two regions. @@ -61,9 +61,9 @@ For each region, the inputs are defined using the compound prefix ``regions.[reg +==========================+=======================================================================+=============+===========+ | radius | cylinder radius | Real | None | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ -| start | Coordinates of the cylinder's bottom cap | Reals | 0 0 0 | +| start | Coordinates of the cylinder's bottom cap | Reals<3> | 0 0 0 | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ -| end | Coordinates of the cylinder's top cap | Reals | 0 0 0 | +| end | Coordinates of the cylinder's top cap | Reals<3> | 0 0 0 | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ @@ -77,7 +77,7 @@ For each region, the inputs are defined using the compound prefix ``regions.[reg +==========================+=======================================================================+=============+===========+ | radius | Cylinder radius | Real | None | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ -| center | Coordinates of the sphere's center | Reals | 0 0 0 | +| center | Coordinates of the sphere's center | Reals<3> | 0 0 0 | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ @@ -89,9 +89,9 @@ For each region, the inputs are defined using the compound prefix ``regions.[reg +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ | | Description | Type | Default | +==========================+=======================================================================+=============+===========+ -| lo | Low corner of physical region (physical, not index space) | Reals | 0 0 0 | +| lo | Low corner of physical region (physical, not index space) | Reals<3> | 0 0 0 | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ -| hi | High corner of physical region (physical, not index space) | Reals | 0 0 0 | +| hi | High corner of physical region (physical, not index space) | Reals<3> | 0 0 0 | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ @@ -106,9 +106,9 @@ For each region, the inputs are defined using the compound prefix ``regions.[reg +==========================+=======================================================================+=============+===========+ | radius | Disk radius | Real | None | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ -| center | Coordinates of the disk's center | Reals | 0 0 0 | +| center | Coordinates of the disk's center | Reals<3> | 0 0 0 | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ -| normal | Surface normal | Reals | 0 0 0 | +| normal | Surface normal | Reals<3> | 0 0 0 | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ @@ -120,5 +120,5 @@ For each region, the inputs are defined using the compound prefix ``regions.[reg +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ | | Description | Type | Default | +==========================+=======================================================================+=============+===========+ -| center | Coordinate of point | Reals | 0 0 0 | +| center | Coordinate of point | Reals<3> | 0 0 0 | +--------------------------+-----------------------------------------------------------------------+-------------+-----------+ -- GitLab From c0ddb7a2e68181dacfd5334a6fffa0b6d1592d03 Mon Sep 17 00:00:00 2001 From: Charles G Waldman Date: Fri, 30 Jan 2026 22:37:11 -0600 Subject: [PATCH 2/2] Allow per-level blocking factor --- docs/source_docs/user_guide/inputs/mesh_and_gridding.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source_docs/user_guide/inputs/mesh_and_gridding.rst b/docs/source_docs/user_guide/inputs/mesh_and_gridding.rst index 7e54b0d..a32719e 100644 --- a/docs/source_docs/user_guide/inputs/mesh_and_gridding.rst +++ b/docs/source_docs/user_guide/inputs/mesh_and_gridding.rst @@ -167,11 +167,11 @@ The following inputs are defined using the prefix ``amr``: +----------------------+-----------------------------------------------------------------------+-------------+-----------+ | | Description | Type | Default | +======================+=======================================================================+=============+===========+ -| blocking_factor_x | Each grid in *X* must be divisible by ``blocking_factor_x`` | Int | 8 | +| blocking_factor_x | Each grid in *X* must be divisible by ``blocking_factor_x`` | Ints | 8 | +----------------------+-----------------------------------------------------------------------+-------------+-----------+ -| blocking_factor_y | Each grid in *Y* must be divisible by ``blocking_factor_y`` | Int | 8 | +| blocking_factor_y | Each grid in *Y* must be divisible by ``blocking_factor_y`` | Ints | 8 | +----------------------+-----------------------------------------------------------------------+-------------+-----------+ -| blocking_factor_z | Each grid in *Z* must be divisible by ``blocking_factor_z`` | Int | 8 | +| blocking_factor_z | Each grid in *Z* must be divisible by ``blocking_factor_z`` | Ints | 8 | +----------------------+-----------------------------------------------------------------------+-------------+-----------+ | max_grid_size_x | Maximum number of cells at level 0 in each grid in *X* | Int | 32 | +----------------------+-----------------------------------------------------------------------+-------------+-----------+ -- GitLab