From 7d95cf13887e229e9f1df3213b98b7440c450aac Mon Sep 17 00:00:00 2001 From: Oscar Antepara <oantepara@lbl.gov> Date: Mon, 9 Dec 2019 14:40:04 -0800 Subject: [PATCH] Changes at InputsMultigrid --- docs/source/InputsMultigrid.rst | 37 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/docs/source/InputsMultigrid.rst b/docs/source/InputsMultigrid.rst index a43a9a9..5e741a4 100644 --- a/docs/source/InputsMultigrid.rst +++ b/docs/source/InputsMultigrid.rst @@ -9,78 +9,77 @@ different solvers called by MFiX-Exa. NOTE: the nodal solver settings are read in directly by AMReX, the MAC and diffusion settings by MFiX. -These control the nodal projection and must be preceded by "projection": +These control the nodal projection and must be preceded by "nodal_proj": +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ | | Description | Type | Default | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| mg_verbose | Verbosity of multigrid solver in nodal projection | Int | 0 | +| verbose | Verbosity of multigrid solver in nodal projection | Int | 0 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| mg_cg_verbose | Verbosity of BiCGStab solver in nodal projection | Int | 0 | +| bottom_verbose | Verbosity of BiCGStab solver in nodal projection | Int | 0 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ | mg_rtol | Relative tolerance in nodal projection | Real | 1.e-11 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ | mg_atol | Absolute tolerance in nodal projection | Real | 1.e-14 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| mg_maxiter | Maximum number of iterations in the nodal projection | Int | 100 | +| maxiter | Maximum number of iterations in the nodal projection | Int | 100 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| mg_cg_maxiter | Maximum number of iterations in the nodal projection | Int | 100 | +| bottom_maxiter | Maximum number of iterations in the nodal projection | Int | 100 | | | bottom solver if using bicg, cg, bicgcg or cgbicg | | | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ | mg_max_coarsening_level | Maximum number of coarser levels to allowin the nodal projection | Int | 100 | | | If set to 0, the bottom solver will be called at the current level | | | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| bottom_solver_type | Which bottom solver to use in the nodal projection | String | bicgcg | +| bottom_solver | Which bottom solver to use in the nodal projection | String | bicgcg | | | Options are bicgcg, bicgstab, cg, cgbicg, smoother or hypre | | | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -These control the MAC projection and must be preceded by "mac": +These control the MAC projection and must be preceded by "mac_proj": +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ | | Description | Type | Default | +=========================+=======================================================================+=============+==============+ -| mg_verbose | Verbosity of multigrid solver in MAC projection | Int | 0 | +| verbose | Verbosity of multigrid solver in MAC projection | Int | 0 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| mg_cg_verbose | Verbosity of BiCGStab solver in MAC projection | Int | 0 | +| bottom_verbose | Verbosity of BiCGStab solver in MAC projection | Int | 0 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ | mg_rtol | Relative tolerance in MAC projection | Real | 1.e-11 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ | mg_atol | Absolute tolerance in MAC projection | Real | 1.e-14 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| mg_maxiter | Maximum number of iterations in the MAC projection | Int | 200 | +| maxiter | Maximum number of iterations in the MAC projection | Int | 200 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| mg_cg_maxiter | Maximum number of iterations in the MAC projection | Int | 200 | +| bottom_maxiter | Maximum number of iterations in the MAC projection | Int | 200 | | | bottom solver if using bicg, cg, bicgcg or cgbicg | | | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ | mg_max_coarsening_level | Maximum number of coarser levels to allow in the MAC projection | Int | 100 | | | If set to 0, the bottom solver will be called at the current level | | | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| bottom_solver_type | Which bottom solver to use in the MAC projection | String | bicgcg | +| bottom_solver | Which bottom solver to use in the MAC projection | String | bicgcg | | | Options are bicgcg, bicgstab, cg, cgbicg, smoother or hypre | | | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -These control the diffusion solver and must be preceded by "diff": -The following inputs must be preceded by "diff" +These control the diffusion solver and must be preceded by "diffusion": +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ | | Description | Type | Default | +=========================+=======================================================================+=============+==============+ -| mg_verbose | Verbosity of linear solver for diffusion solve | Int | 0 | +| verbose | Verbosity of linear solver for diffusion solve | Int | 0 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| mg_cg_verbose | Verbosity of BiCGStab solver in diffusion solve | Int | 0 | +| bottom_verbose | Verbosity of BiCGStab solver in diffusion solve | Int | 0 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ | mg_rtol | Relative tolerance in diffusion solve | Real | 1.e-11 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ | mg_atol | Absolute tolerance in diffusion solve | Real | 1.e-14 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| mg_maxiter | Maximum number of iterations in diffusion solve | Int | 100 | +| maxiter | Maximum number of iterations in diffusion solve | Int | 100 | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| mg_cg_maxiter | Maximum number of iterations in diffusion solve | Int | 100 | +| bottom_maxiter | Maximum number of iterations in diffusion solve | Int | 100 | | | bottom solver if using bicg, cg, bicgcg or cgbicg | | | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ | mg_max_coarsening_level | Maximum number of coarser levels to allow in diffusion solve | Int | 100 | | | If set to 0, the bottom solver will be called at the current level | | | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -| bottom_solver_type | Which bottom solver to use in the diffusion solve | String | bicgcg | +| bottom_solver | Which bottom solver to use in the diffusion solve | String | bicgcg | | | Options are bicgcg, bicgstab, cg, cgbicg, smoother or hypre | | | +-------------------------+-----------------------------------------------------------------------+-------------+--------------+ -- GitLab