diff --git a/dumux/implicit/adaptive/adaptionhelper.hh b/dumux/implicit/adaptive/adaptionhelper.hh index 4e39c499efcc437283c8f32b3ab044c46a3c9352..c4462861e865aa58b95a06fe7a3b070d02def0cf 100644 --- a/dumux/implicit/adaptive/adaptionhelper.hh +++ b/dumux/implicit/adaptive/adaptionhelper.hh @@ -350,7 +350,7 @@ public: /** * This methods stores reconstructed values into the cellData object, by * this setting a newly mapped solution to the storage container of the - * decoupled models. + * sequential models. * * \param adaptedValues Container for model-specific values to be adapted * \param u The variables to be stored diff --git a/dumux/implicit/adaptive/gridadaptproperties.hh b/dumux/implicit/adaptive/gridadaptproperties.hh index fb0741d893efa89d246234ec4c707f97438126e0..fb3928b944a3d8d4832b3d3cd0e71990e884f41b 100644 --- a/dumux/implicit/adaptive/gridadaptproperties.hh +++ b/dumux/implicit/adaptive/gridadaptproperties.hh @@ -33,7 +33,7 @@ namespace Dumux { namespace Properties { -//! Grid adaption type tag for all decoupled models. +//! Grid adaption type tag for all sequential models. NEW_TYPE_TAG(GridAdapt); //! Defines if the grid is h-adaptive diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh index 9dd76f759c146635029ea1415f473ca0f3534fd6..8be50efb14dab5b425b319992b73bc7eb2a82140 100644 --- a/dumux/material/components/tabulatedcomponent.hh +++ b/dumux/material/components/tabulatedcomponent.hh @@ -280,7 +280,7 @@ public: * \brief The vapor pressure in \f$\mathrm{[Pa]}\f$ of the component at a given * temperature. * - * The method is only called by the decoupled flash, so tabulating is omitted. + * The method is only called by the sequential flash, so tabulating is omitted. * \param pressure pressure of component in \f$\mathrm{[Pa]}\f$ */ static Scalar vaporTemperature(Scalar pressure) diff --git a/dumux/material/constraintsolvers/compositionalflash.hh b/dumux/material/constraintsolvers/compositionalflash.hh index a7d548b66218bdd09f15594b83bbd809940490e2..e4264ff71f27e9de6247a6945cf8af386e6002ef 100644 --- a/dumux/material/constraintsolvers/compositionalflash.hh +++ b/dumux/material/constraintsolvers/compositionalflash.hh @@ -38,7 +38,7 @@ namespace Dumux { /*! * \ingroup ConstraintSolver - * \brief Flash calculation routines for compositional decoupled models + * \brief Flash calculation routines for compositional sequential models * * Routines for isothermal and isobaric 2p2c and 1p2c flash. * \tparam TypeTag The property Type Tag @@ -75,7 +75,7 @@ public: * - determination of maximum solubilities (mole fractions) according to phase pressures * - comparison with Z1 to determine phase presence => phase mass fractions * - round off fluid properties - * \param fluidState The decoupled fluid State + * \param fluidState The sequential fluid State * \param Z1 Feed mass fraction: Mass of comp1 per total mass \f$\mathrm{[-]}\f$ * \param phasePressure Vector holding the pressure \f$\mathrm{[Pa]}\f$ * \param porosity Porosity \f$\mathrm{[-]}\f$ @@ -184,7 +184,7 @@ public: * - Check if we are in single phase condition * - Assign total concentration to the present phase * - * \param fluidState The decoupled fluid state + * \param fluidState The sequential fluid state * \param Z1 Feed mass fraction \f$\mathrm{[-]}\f$ * \param phasePressure Vector holding the pressure \f$\mathrm{[Pa]}\f$ * \param presentPhaseIdx Subdomain Index = Indication which phase is present @@ -255,7 +255,7 @@ public: * - determination of the equilibrium constants from the fluid system * - determination of maximum solubilities (mole fractions) according to phase pressures * - round off fluid properties - * \param fluidState The decoupled fluid state + * \param fluidState The sequential fluid state * \param saturation Saturation of phase 1 \f$\mathrm{[-]}\f$ * \param phasePressure Vector holding the pressure \f$\mathrm{[Pa]}\f$ * \param porosity Porosity \f$\mathrm{[-]}\f$ diff --git a/dumux/material/fluidstates/pseudo1p2c.hh b/dumux/material/fluidstates/pseudo1p2c.hh index 9f7afd26e3fefec49f616218a82f50dead74806e..3cb832e4c3ba347d3fd562e3e424ed034cd3ddf7 100644 --- a/dumux/material/fluidstates/pseudo1p2c.hh +++ b/dumux/material/fluidstates/pseudo1p2c.hh @@ -36,7 +36,7 @@ namespace Dumux * It is used in case of a multiphysics approach. For the non-present phase, * no information is stored but 0-values are returned to allow for general output * methods. - * The "flash" calculation routines are in the decoupled flash constrain solver, see + * The "flash" calculation routines are in the sequential flash constrain solver, see * Dumux::CompositionalFlash . * \tparam TypeTag The property Type Tag */ diff --git a/dumux/porousmediumflow/2p/sequential/celldataadaptive.hh b/dumux/porousmediumflow/2p/sequential/celldataadaptive.hh index 5fe0a9fcb7f239e3f9278193f31973d7b0c0f375..22bf67ccca23e0ccd8941e017f47b4d0500e0575 100644 --- a/dumux/porousmediumflow/2p/sequential/celldataadaptive.hh +++ b/dumux/porousmediumflow/2p/sequential/celldataadaptive.hh @@ -138,7 +138,7 @@ public: /** * This methods stores reconstructed values into the cellData object, by * this setting a newly mapped solution to the storage container of the - * decoupled models. + * sequential models. * * \param adaptedValues Container for model-specific values to be adapted * \param element The element where things are stored. diff --git a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh index 465eaccdbb09b8198f9613c1deba55a9f423535c..09cbcb93ffe2a8f265c7dcb513fa40b46bc7f91b 100644 --- a/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh +++ b/dumux/porousmediumflow/2p/sequential/transport/cellcentered/saturation.hh @@ -63,7 +63,7 @@ namespace Dumux * * In the IMPES models the default setting is: * - * formulation: \f$ p_w \f$ - \f$ S_w \f$ (Property: \a Formulation defined as \a DecoupledTwoPCommonIndices::pwsw) + * formulation: \f$ p_w \f$ - \f$ S_w \f$ (Property: \a Formulation defined as \a SequentialTwoPCommonIndices::pwsw) * * compressibility: disabled (Property: \a EnableCompressibility set to \a false) * diff --git a/dumux/porousmediumflow/2p/sequential/transport/problem.hh b/dumux/porousmediumflow/2p/sequential/transport/problem.hh index abc20e82ac242c03586dd13f94fccb26a05c2da3..373594998a3c4ba245fb952e26179d3932f38c91 100644 --- a/dumux/porousmediumflow/2p/sequential/transport/problem.hh +++ b/dumux/porousmediumflow/2p/sequential/transport/problem.hh @@ -43,7 +43,7 @@ SET_TYPE_PROP(TransportTwoP, Velocity, FVVelocityDefault<TypeTag>); /*! * \ingroup Saturation2p * \ingroup IMPETproblems - * \brief Base class for a decoupled two-phase transport problem + * \brief Base class for a sequential two-phase transport problem * * \tparam TypeTag The problem Type Tag */ diff --git a/dumux/porousmediumflow/2p/sequential/transport/properties.hh b/dumux/porousmediumflow/2p/sequential/transport/properties.hh index 30452e8e03602b9af433bd9d60bd7b6ce492bc2c..5cc855d271a3ea2a26249526bb7c4ba4ca399496 100644 --- a/dumux/porousmediumflow/2p/sequential/transport/properties.hh +++ b/dumux/porousmediumflow/2p/sequential/transport/properties.hh @@ -40,7 +40,7 @@ namespace Properties // Type tags tags ////////////////////////////////////////////////////////////////// -//! The type tag for transport part of a decoupled two-phase model +//! The type tag for transport part of a sequential two-phase model NEW_TYPE_TAG(TransportTwoP, INHERITS_FROM(Transport, SequentialTwoP)); ////////////////////////////////////////////////////////////////// diff --git a/dumux/porousmediumflow/2p2c/sequential/celldata.hh b/dumux/porousmediumflow/2p2c/sequential/celldata.hh index 55edd79a0c858ee6c1684b24bc543dfcf729f80f..63921ce557db9f6e617895cf3b4c5a4c39fb4907 100644 --- a/dumux/porousmediumflow/2p2c/sequential/celldata.hh +++ b/dumux/porousmediumflow/2p2c/sequential/celldata.hh @@ -33,7 +33,7 @@ namespace Dumux * \ingroup multiphysics multiphase */ //! Storage container for discretized data of the constitutive relations for one element -/*! This class stores all cell-centered (FV-Scheme) values for decoupled compositional two-phase flow +/*! This class stores all cell-centered (FV-Scheme) values for sequential compositional two-phase flow * models that are used by both pressure and transport model. All fluid data are already stored in the * fluidstate, so the CellData contains the fluidstate object for the current element. * At the moment, the compositional model does not use fluxVariables that are stored on the interfaces. diff --git a/dumux/porousmediumflow/2p2c/sequential/celldataadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/celldataadaptive.hh index 46f7e75645f0393cc3f7b79e20fafa1e80ceffd9..1108764718e49c1d4cf3b14d7e6330832f1da20c 100644 --- a/dumux/porousmediumflow/2p2c/sequential/celldataadaptive.hh +++ b/dumux/porousmediumflow/2p2c/sequential/celldataadaptive.hh @@ -173,7 +173,7 @@ public: /** * This methods stores reconstructed values into the cellData object, by * this setting a newly mapped solution to the storage container of the - * decoupled models. + * sequential models. * In new cells, update estimate does not give meaningful results. We therefore * copy volume derivatives from old time step, and indicate that those are already availabe. * diff --git a/dumux/porousmediumflow/2p2c/sequential/fluxdata.hh b/dumux/porousmediumflow/2p2c/sequential/fluxdata.hh index aa83332e37f98b78a389d391c8fc7177575400b6..ac34bfdb061c4cf6f7d8d460fccb02d6d93e7d92 100644 --- a/dumux/porousmediumflow/2p2c/sequential/fluxdata.hh +++ b/dumux/porousmediumflow/2p2c/sequential/fluxdata.hh @@ -33,7 +33,7 @@ namespace Dumux */ //! Class including the variables and data of discretized data of the constitutive relations. /*! The variables of two-phase flow, which are one pressure and one saturation are stored in this class. - * Additionally, a velocity needed in the transport part of the decoupled two-phase flow is stored, + * Additionally, a velocity needed in the transport part of the sequential two-phase flow is stored, * as well as discretized data of constitutive relationships like mobilities, fractional flow functions * and capillary pressure. Thus, they have to be callculated just once in every time step or every iteration step. * diff --git a/dumux/porousmediumflow/2p2c/sequential/variableclassadaptive.hh b/dumux/porousmediumflow/2p2c/sequential/variableclassadaptive.hh index 13ab16e3535225ed94f90a5a20b247dfb13fe059..f1ac90d370971131a83306ec7dbbc4741ee4a904 100644 --- a/dumux/porousmediumflow/2p2c/sequential/variableclassadaptive.hh +++ b/dumux/porousmediumflow/2p2c/sequential/variableclassadaptive.hh @@ -131,7 +131,7 @@ public: ParentType(gridView), grid_(gridView.grid()) {} - //! Resizes decoupled variable vectors + //! Resizes sequential variable vectors /*! Method that change the size of the vectors for h-adaptive simulations, and clears recently * stored transmissibility matrices for the newly adapted grid. * diff --git a/dumux/porousmediumflow/sequential/gridadaptproperties.hh b/dumux/porousmediumflow/sequential/gridadaptproperties.hh index 18a2d579d554b8042ed3ba3132ec4249e0143f15..a6d929616865cdc4a9d9d701feef96cd89cb32ee 100644 --- a/dumux/porousmediumflow/sequential/gridadaptproperties.hh +++ b/dumux/porousmediumflow/sequential/gridadaptproperties.hh @@ -33,7 +33,7 @@ namespace Dumux { namespace Properties { -//! Grid adaption type tag for all decoupled models. +//! Grid adaption type tag for all sequential models. NEW_TYPE_TAG(GridAdaptTypeTag); //! Defines if the grid is h-adaptive diff --git a/dumux/porousmediumflow/sequential/impet.hh b/dumux/porousmediumflow/sequential/impet.hh index 295b2608042b5b26c91bd3824fa532d69e261d2c..c79b86b463e601a6f9c012ec59eb6c4e59321277 100644 --- a/dumux/porousmediumflow/sequential/impet.hh +++ b/dumux/porousmediumflow/sequential/impet.hh @@ -32,7 +32,7 @@ namespace Dumux * \ingroup IMPET * \brief IMplicit Pressure Explicit Transport (IMPET) scheme for the solution of weakly coupled diffusion-transport formulations. * - * The model implements the decoupled equations of two-phase flow. + * The model implements the sequential equations of two-phase flow. * These equations can be derived from the two-phase flow equations shown for the two-phase box model (TwoPBoxModel). * The first equation to solve is a pressure equation of elliptic character. * The second one is a transport equation (e.g. for saturation, concentration,...), which can be hyperbolic or parabolic. diff --git a/dumux/porousmediumflow/sequential/onemodelproblem.hh b/dumux/porousmediumflow/sequential/onemodelproblem.hh index e8d8ca633804889707aced7a0c9c30e257510be6..96575f4cd24b113a52a778bfa80885d2ec1c0f9c 100644 --- a/dumux/porousmediumflow/sequential/onemodelproblem.hh +++ b/dumux/porousmediumflow/sequential/onemodelproblem.hh @@ -27,7 +27,7 @@ /** * @file - * @brief Base class for definition of an decoupled diffusion (pressure) or transport problem + * @brief Base class for definition of an sequential diffusion (pressure) or transport problem */ namespace Dumux @@ -35,7 +35,7 @@ namespace Dumux /*! \ingroup IMPET * - * @brief Base class for definition of an decoupled diffusion (pressure) or transport problem + * @brief Base class for definition of an sequential diffusion (pressure) or transport problem * * @tparam TypeTag The Type Tag */ diff --git a/dumux/porousmediumflow/sequential/properties.hh b/dumux/porousmediumflow/sequential/properties.hh index 6610fbe1c3d5c645351526949543163feaf46af4..3555b66464c583ef793f9df78b21d27be044d99c 100644 --- a/dumux/porousmediumflow/sequential/properties.hh +++ b/dumux/porousmediumflow/sequential/properties.hh @@ -40,7 +40,7 @@ namespace Properties // Type tags ////////////////////////////////////////////////////////////////// -//! Create a type tag for all decoupled models +//! Create a type tag for all sequential models NEW_TYPE_TAG(SequentialModel, INHERITS_FROM(NumericModel, GridAdaptTypeTag)); //! DEPRECATED Since compile-time detection is "impossible," a run-time check will be performed in start.hh diff --git a/dumux/porousmediumflow/sequential/variableclass.hh b/dumux/porousmediumflow/sequential/variableclass.hh index facc8cb1290a5b0f44878dc2bdd303994696518d..25a1e17554f3a892a13ccec99bf92a3d6b2cae59 100644 --- a/dumux/porousmediumflow/sequential/variableclass.hh +++ b/dumux/porousmediumflow/sequential/variableclass.hh @@ -92,7 +92,7 @@ public: cellDataVector_.resize(gridView_.size(0)); } - //! Resizes decoupled variable vectors + //! Resizes sequential variable vectors /*! Method that change the size of the vectors for h-adaptive simulations. * *\param size Size of the current (refined and coarsened) grid diff --git a/test/porousmediumflow/1p/sequential/test_1p.cc b/test/porousmediumflow/1p/sequential/test_1p.cc index ac41e42e40ebc6ae887c32c67c8a267c0c89ae09..017e61e72e140a52d38e22bf4bf44e43df23e88c 100644 --- a/test/porousmediumflow/1p/sequential/test_1p.cc +++ b/test/porousmediumflow/1p/sequential/test_1p.cc @@ -20,7 +20,7 @@ * \file * * \ingroup IMPETtests - * \brief test for the decoupled one-phase model. + * \brief test for the sequential one-phase model. */ #include <config.h> diff --git a/test/porousmediumflow/1p/sequential/test_1pproblem.hh b/test/porousmediumflow/1p/sequential/test_1pproblem.hh index 61d2b00acea1c97aa1a4f3adb6844f4c756b1cd9..666124e33e07bc301fb3c5a192eb9e53aac48c4a 100644 --- a/test/porousmediumflow/1p/sequential/test_1pproblem.hh +++ b/test/porousmediumflow/1p/sequential/test_1pproblem.hh @@ -19,7 +19,7 @@ /*! * \file * - * \brief test problem for the decoupled one-phase model. + * \brief test problem for the sequential one-phase model. */ #ifndef DUMUX_TEST_1P_PROBLEM_HH #define DUMUX_TEST_1P_PROBLEM_HH @@ -74,7 +74,7 @@ SET_TYPE_PROP(TestProblemOneP, Problem, Dumux::TestProblemOneP<TypeTag>); /*! * \ingroup IMPETtests * - * \brief test problem for the decoupled one-phase model. + * \brief test problem for the sequential one-phase model. */ template<class TypeTag> class TestProblemOneP: public DiffusionProblem1P<TypeTag > diff --git a/test/porousmediumflow/1p/sequential/test_diffusion.input b/test/porousmediumflow/1p/sequential/test_diffusion.input new file mode 100644 index 0000000000000000000000000000000000000000..05e0fbbdf4e86debb6c1cfd368e877dd00208ddd --- /dev/null +++ b/test/porousmediumflow/1p/sequential/test_diffusion.input @@ -0,0 +1,4 @@ +[Grid] +LowerLeft = 0 0 +UpperRight = 1 1 +Refinement = 3 diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh index e7bf53dec0acd7eb0e1a48c01a93cc89bd6ceda5..b9ae58c06070d5dd77d99d26dcae7891ead2cb44 100644 --- a/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh +++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh @@ -139,7 +139,7 @@ SET_BOOL_PROP(MimeticPressure2PTestProblem, ProblemEnableGravity, false); } /*! - * \ingroup DecoupledProblems + * \ingroup SequentialProblems * * \brief test problem for diffusion models from the FVCA5 benchmark. *