diff --git a/test/porousmediumflow/2p/cornerpoint/problem.hh b/test/porousmediumflow/2p/cornerpoint/problem.hh index 2eea7cee11e8c29443d77ff536e675b3e0414cf9..86d7de5502344fbeee975b96108a9745bf37ee3d 100644 --- a/test/porousmediumflow/2p/cornerpoint/problem.hh +++ b/test/porousmediumflow/2p/cornerpoint/problem.hh @@ -18,7 +18,7 @@ *****************************************************************************/ /*! * \ingroup TwoPTests - * \brief The properties for the 2p cornerpoint test. + * \brief The incompressible 2p cornerpoint test problem. */ #ifndef DUMUX_TWOP_CORNERPOINT_TEST_PROBLEM_HH diff --git a/test/porousmediumflow/2p/cornerpoint/spatialparams.hh b/test/porousmediumflow/2p/cornerpoint/spatialparams.hh index d6cd40f3a12da236c9757e23b5cf80422193ffd1..2ed63a93c29aa4305e6ceac54564dfafbacc4ef6 100644 --- a/test/porousmediumflow/2p/cornerpoint/spatialparams.hh +++ b/test/porousmediumflow/2p/cornerpoint/spatialparams.hh @@ -35,7 +35,7 @@ namespace Dumux { /*! * \ingroup TwoPTests - * \brief The spatial params for the incompressible 2p test. + * \brief The spatial params for the 2p cornerpoint test. */ template class TwoPCornerPointTestSpatialParams diff --git a/test/porousmediumflow/2p/fracture/problem.hh b/test/porousmediumflow/2p/fracture/problem.hh index eb028916052070301027bc197d164de0de6b237a..b4d6a2b096870827246078e2474a90322d1b1c24 100644 --- a/test/porousmediumflow/2p/fracture/problem.hh +++ b/test/porousmediumflow/2p/fracture/problem.hh @@ -71,10 +71,6 @@ public: FractureProblem(std::shared_ptr gridGeometry) : ParentType(gridGeometry) {} - /*! - * \name Boundary conditions - */ - // \{ /*! * \brief Specifies which kind of boundary condition should be @@ -128,22 +124,15 @@ public: return values; } - // \} - - /*! - * \name Volume terms - */ - // \{ - - /*! * \brief Evaluates the initial values for a control volume. * * \param globalPos The global position */ PrimaryVariables initialAtPos(const GlobalPosition &globalPos) const - { return dirichletAtPos(globalPos); } - // \} + { return dirichletAtPos(globalPos); + } + private: diff --git a/test/porousmediumflow/2p/fracture/spatialparams.hh b/test/porousmediumflow/2p/fracture/spatialparams.hh index bb6ef498a742cd4a9d6980cf50360926748aa8b2..5aac8b6026ae0aabd1b2b69427d0c452386f51a5 100644 --- a/test/porousmediumflow/2p/fracture/spatialparams.hh +++ b/test/porousmediumflow/2p/fracture/spatialparams.hh @@ -19,8 +19,7 @@ /*! * \file * \ingroup TwoPTests - * \brief The spatial parameters for the LensProblem which uses the - * two-phase fully implicit model. + * \brief The spatial parameters for A discrete fracture network embedded in an impermeable matrix. */ #ifndef DUMUX_TWOP_FRACTURE_TEST_SPATIALPARAMS_HH diff --git a/test/porousmediumflow/2p/nonisothermal/problem.hh b/test/porousmediumflow/2p/nonisothermal/problem.hh index 0bcb48b1a3e3468d531af7e9cc33f19d54add866..1b1719a57d5e7eb16b96a1e70a8830077f1881ee 100644 --- a/test/porousmediumflow/2p/nonisothermal/problem.hh +++ b/test/porousmediumflow/2p/nonisothermal/problem.hh @@ -19,10 +19,8 @@ /*! * \file * \ingroup TwoPTests - * \brief Non-isothermal gas injection problem where a gas (e.g. air) is injected into a fully - * water saturated medium. + * \brief Non-isothermal gas injection problem where a gas (e.g. air) is injected into a fully water saturated medium. * - * During buoyancy driven upward migration the gas passes a high temperature area. */ #ifndef DUMUX_INJECTION_PROBLEM_2PNI_HH @@ -39,31 +37,7 @@ namespace Dumux { /*! * \ingroup TwoPTests - * \brief Non-isothermal gas injection problem where a gas (e.g. air) is injected into a fully - * water saturated medium. - * - * During buoyancy driven upward migration the gas passes a high temperature area. - * - * The domain is sized 60m times 40m. The rectangular area with the increased - * temperature (380K) starts at (20m, 5m) and ends at (30m, 35m). - * - * For the mass conservation equation Neumann boundary conditions are used on - * the top, on the bottom and on the right of the domain, while Dirichlet conditions - * are applied on the left boundary. - * For the energy conservation equation Dirichlet boundary conditions are applied - * on all boundaries. - * - * Gas is injected at the right boundary from 5m to 15m at a rate of - * 0.001kg/(s m), the remaining Neumann boundaries are no-flow boundaries. - * - * At the Dirichlet boundaries a hydrostatic pressure, a gas saturation of zero and - * a geothermal temperature gradient of 0.03K/m are applied. - * - * This problem uses the \ref TwoPModel and \ref NIModel model. - * - * To run the simulation execute the following line in shell: - * ./test_box2pni -parameterFile test_box2pni.input or - * ./test_cc2pni -parameterFile test_cc2pni.input + * \brief Non-isothermal gas injection problem where a gas (e.g. air) is injected into a fully water saturated medium. */ template class InjectionProblem2PNI : public PorousMediumFlowProblem @@ -122,11 +96,6 @@ public: name_ = getParam("Problem.Name"); } - /*! - * \name Problem parameters - */ - // \{ - /*! * \brief Returns the problem name * @@ -147,12 +116,6 @@ public: return values; } - // \} - - /*! - * \name Boundary conditions - */ - // \{ /*! * \brief Specifies which kind of boundary condition should be @@ -220,14 +183,6 @@ public: return values; } - // \} - - - /*! - * \name Volume terms - */ - // \{ - /*! * \brief Evaluates the initial values for a control volume. * @@ -246,7 +201,7 @@ public: return values; } - // \} + private: Scalar maxDepth_; diff --git a/test/porousmediumflow/2p/nonisothermal/properties.hh b/test/porousmediumflow/2p/nonisothermal/properties.hh index caba88abbe8444e2858cfed6c8cc987c85f09c91..5c42bdca2e32537bf6ac0213bfa1772fbe5fb3bf 100644 --- a/test/porousmediumflow/2p/nonisothermal/properties.hh +++ b/test/porousmediumflow/2p/nonisothermal/properties.hh @@ -19,10 +19,8 @@ /*! * \file * \ingroup TwoPTests - * \brief Non-isothermal gas injection problem where a gas (e.g. air) is injected into a fully - * water saturated medium. + * \brief Non-isothermal gas injection problem where a gas (e.g. air) is injected into a fully water saturated medium. * - * During buoyancy driven upward migration the gas passes a high temperature area. */ #ifndef DUMUX_INJECTION_PROPERTIES_2PNI_HH diff --git a/test/porousmediumflow/2p/rotationsymmetry/properties.hh b/test/porousmediumflow/2p/rotationsymmetry/properties.hh index a5b9a6b52a1dc309e34cf80d3f9465f26f762004..554c0fd4b1406d5c3c51e93fe0a9c0b2df7ed063 100644 --- a/test/porousmediumflow/2p/rotationsymmetry/properties.hh +++ b/test/porousmediumflow/2p/rotationsymmetry/properties.hh @@ -16,6 +16,10 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see . * *****************************************************************************/ +/*! + * \file + * \brief The properties of 2p rotational symmetry test + */ #ifndef DUMUX_TEST_TWOP_ROTATIONALSYMMETRY_PROPERTIES_HH #define DUMUX_TEST_TWOP_ROTATIONALSYMMETRY_PROPERTIES_HH diff --git a/test/porousmediumflow/2p1c/problem.hh b/test/porousmediumflow/2p1c/problem.hh index 6e054df3c822de94c02c296a9d5ac9116740577c..b0180021d1b00b5bdd11c5bbeb306a85ef2cd66f 100644 --- a/test/porousmediumflow/2p1c/problem.hh +++ b/test/porousmediumflow/2p1c/problem.hh @@ -38,7 +38,6 @@ namespace Dumux { * \ingroup TwoPOneCTests * \brief Non-isothermal 2D problem where steam is injected on the lower left side of the domain. * - * This problem uses the \ref TwoPOneCModel. */ template class InjectionProblem : public PorousMediumFlowProblem @@ -84,11 +83,6 @@ public: : ParentType(gridGeometry) { FluidSystem::init(); } - /*! - * \name Problem parameters - */ - // \{ - //! \copydoc Dumux::FVProblem::source() NumEqVector source(const Element &element, @@ -97,11 +91,6 @@ public: const SubControlVolume &scv) const { return NumEqVector(0.0); } - /*! - * \name Boundary conditions - */ - // \{ - /*! * \brief Specifies which kind of boundary condition should be * used for which equation on a given boundary segment @@ -169,13 +158,6 @@ public: return values; } - // \} - - /*! - * \name Volume terms - */ - // \{ - /*! * \brief Evaluates the initial values for a control volume. * diff --git a/test/porousmediumflow/2p1c/properties.hh b/test/porousmediumflow/2p1c/properties.hh index 171711da59d6a438b97e3cc5fe474919787ca02c..dfccc6fea45c9f6a90d8676b09eace5ddcc4d09e 100644 --- a/test/porousmediumflow/2p1c/properties.hh +++ b/test/porousmediumflow/2p1c/properties.hh @@ -19,7 +19,7 @@ /*! * \file * \ingroup TwoPOneCTests - * \brief Non-isothermal steam injection test problem for the 2p1cni model. + * \brief Properties of non-isothermal steam injection test problem for the 2p1cni model. */ #ifndef DUMUX_STEAM_INJECTIONPROBLEM_PROPERTIES_HH diff --git a/test/porousmediumflow/2p1c/spatialparams.hh b/test/porousmediumflow/2p1c/spatialparams.hh index d34c54e2f272a09acd5069a7dfd672e2a34850f7..b928ec845995217a2d67055ff1e68535dc311390 100644 --- a/test/porousmediumflow/2p1c/spatialparams.hh +++ b/test/porousmediumflow/2p1c/spatialparams.hh @@ -19,7 +19,7 @@ /*! * \file * \ingroup TwoPOneCTests - * \brief Definition of the spatial parameters for the steam injection problem. + * \brief Spatial parameters non-isothermal steam injection test problem for the 2p1cni model. */ #ifndef DUMUX_STEAMINJECTION_SPATIAL_PARAMS_HH diff --git a/test/porousmediumflow/2p2c/chemicalnonequilibrium/main.cc b/test/porousmediumflow/2p2c/chemicalnonequilibrium/main.cc index d85d1f19c46b635e02c08b6159e87e6c0f415a00..06502ee31d7fe80f7e2371d0eecd4cbc13d167ae 100644 --- a/test/porousmediumflow/2p2c/chemicalnonequilibrium/main.cc +++ b/test/porousmediumflow/2p2c/chemicalnonequilibrium/main.cc @@ -19,7 +19,7 @@ /*! * \file * \ingroup TwoPTwoCTests - * \brief Test for the 2p2cni CC model + * \brief Test for the 2p2c chemical nonequilibrium problem. */ #include diff --git a/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh b/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh index e7c226ca5c29267cc3d847515841cd87f054e57e..bf6fd7f9d2996356b9f2ea9a554f4aae09c913cb 100644 --- a/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh +++ b/test/porousmediumflow/2p2c/chemicalnonequilibrium/problem.hh @@ -20,9 +20,7 @@ /*! * \file * \ingroup TwoPTwoCTests - * \brief Problem where air is injected in a unsaturated porous medium. - * - * Tests a 2p2c model assuming chemical nonequiibrium. + * \brief Problem for the 2p2c chemical nonequilibrium problem. */ #ifndef DUMUX_TWOPTWOC_NONEQUILIBRIUM_PROBLEM_HH @@ -39,9 +37,7 @@ namespace Dumux { /*! * \ingroup TwoPTwoCTests - * \brief Problem where air is injected in a unsaturated porous medium. - * - * This test compares a mpnc problem with a 2p2c problem. + * \brief Problem for the 2p2c chemical nonequilibrium problem. */ template class TwoPTwoCChemicalNonequilibriumProblem : public PorousMediumFlowProblem @@ -94,10 +90,6 @@ public: const GridVariables& gridVariables() const { return *gridVariables_; } - /*! - * \name Problem parameters - */ - // \{ /*! * \brief Returns the problem name @@ -176,7 +168,7 @@ public: return values; } - // \} + /*! * \brief Evaluates the initial value for a control volume. @@ -225,8 +217,6 @@ public: } } - // \} - private: // the internal method for the initial condition PrimaryVariables initial_(const GlobalPosition &globalPos) const diff --git a/test/porousmediumflow/2p2c/chemicalnonequilibrium/properties.hh b/test/porousmediumflow/2p2c/chemicalnonequilibrium/properties.hh index 084cd9c88b00f3aa60c9161204fdc16541f404b8..d3e8b0583ea36edf80f161c508025cbefe99ee8c 100644 --- a/test/porousmediumflow/2p2c/chemicalnonequilibrium/properties.hh +++ b/test/porousmediumflow/2p2c/chemicalnonequilibrium/properties.hh @@ -19,7 +19,7 @@ /*! * \file * \ingroup TwoPTwoCTests - * \brief The properties of the problem where air is injected in a unsaturated porous medium. + * \brief The properties for the 2p2c chemical nonequilibrium problem. */ #ifndef DUMUX_TWOPTWOC_NONEQUILIBRIUM_PROPERTIES_HH diff --git a/test/porousmediumflow/2p2c/evaporation/main.cc b/test/porousmediumflow/2p2c/evaporation/main.cc index 6faa54953919a964824601f7b22144e876715046..f5e35121cdf998e972e0af261f3a5c99f25369fd 100644 --- a/test/porousmediumflow/2p2c/evaporation/main.cc +++ b/test/porousmediumflow/2p2c/evaporation/main.cc @@ -19,7 +19,7 @@ /*! * \file * \ingroup TwoPTwoCTests - * \brief Test for the two-phase two-component CC model. + * \brief Test of a evaporation problem where two components with constant properties mix and evaporate. */ #include diff --git a/test/porousmediumflow/2p2c/evaporation/problem.hh b/test/porousmediumflow/2p2c/evaporation/problem.hh index 5ed87d1645764ed4b9b1a81d4d2a2828ca707a3e..d9c7850cf63dd151e29c195c32c69de793fcd158 100644 --- a/test/porousmediumflow/2p2c/evaporation/problem.hh +++ b/test/porousmediumflow/2p2c/evaporation/problem.hh @@ -19,7 +19,7 @@ /*! * \file * \ingroup TwoPTwoCTests - * \brief Evaporation problem where two components with constant propierties mix and evaporate. + * \brief Evaporation problem where two components with constant properties mix and evaporate. */ #ifndef DUMUX_EVAPORATION_CONSTANT_COMPONENT_PROBLEM_HH @@ -36,16 +36,9 @@ namespace Dumux { /*! * \ingroup TwoPTwoCModel - * \brief Evaporation problem where two components with constant propierties mix and evaporate. + * \brief Evaporation problem where two components with constant properties mix and evaporate. * - * The constant fluid properties are specified in the params.input file. The first component uses simplified properties of H2O and the second component simplified properties of N2. - * - * This problem uses the \ref TwoPTwoCModel and \ref NIModel model. - * - * To run the simulation execute the following line in shell: - * ./test_2p2cni_evaporation_box or - * ./test_2p2cni_evaporation_tpfa - * */ + */ template class EvaporationConstantComponentProblem : public PorousMediumFlowProblem { @@ -103,10 +96,6 @@ public: std::cout << "The problem uses mass-fractions" << std::endl; } - /*! - * \name Problem parameters - */ - // \{ /*! * \brief The problem name. @@ -116,13 +105,6 @@ public: const std::string& name() const { return name_; } - // \} - - /*! - * \name Boundary conditions - */ - // \{ - /*! * \brief Specifies which kind of boundary condition should be * used for which equation on a given boundary segment. @@ -197,12 +179,7 @@ public: } - // \} - /*! - * \name Volume terms - */ - // \{ /*! * \brief Evaluates the initial value for a control volume. diff --git a/test/porousmediumflow/2p2c/evaporation/properties.hh b/test/porousmediumflow/2p2c/evaporation/properties.hh index 4ec95e4ed10514005ba6429b85d3f2597ee7436b..10e1a5ec0081b967cb682863aca09009aadeaf69 100644 --- a/test/porousmediumflow/2p2c/evaporation/properties.hh +++ b/test/porousmediumflow/2p2c/evaporation/properties.hh @@ -19,7 +19,7 @@ /*! * \file * \ingroup TwoPTwoCTests - * \brief The properties of a evaporation problem where two components with constant propierties mix and evaporate. + * \brief The properties of a evaporation problem where two components with constant properties mix and evaporate. */ #ifndef DUMUX_EVAPORATION_CONSTANT_COMPONENT_PROPERTIES_HH diff --git a/test/porousmediumflow/2p2c/injection/main.cc b/test/porousmediumflow/2p2c/injection/main.cc index 8ba188a6a90ecff1351630a2928142fd5eec8cd2..abf95823594aa8be3da6a9d3dcd12dae0e48858f 100644 --- a/test/porousmediumflow/2p2c/injection/main.cc +++ b/test/porousmediumflow/2p2c/injection/main.cc @@ -19,7 +19,7 @@ /*! * \file * \ingroup TwoPTwoCTests - * \brief Test for the two-phase two-component CC model. + * \brief Test for the problem where air is injected under a low permeable layer in a depth of 2700m. */ #include diff --git a/test/porousmediumflow/2p2c/injection/problem.hh b/test/porousmediumflow/2p2c/injection/problem.hh index 703759d26782f6970fac4d1f74078fcedf62af65..0d38ffbedd53c97529a1ff5e5614027439bc4636 100644 --- a/test/porousmediumflow/2p2c/injection/problem.hh +++ b/test/porousmediumflow/2p2c/injection/problem.hh @@ -39,27 +39,6 @@ namespace Dumux { * \ingroup TwoPTwoCTests * \brief Problem where air is injected under a low permeable layer in a depth of 2700m. * - * The domain is sized 60m times 40m and consists of two layers, a moderately - * permeable one (\f$K=10e-12\f$) for \f$y<22m\f$ and one with a lower - * permeablility (\f$K=10e-13\f$) in the rest of the domain. - * - * A mixture of Nitrogen and Water vapor, which is composed according to the - * prevailing conditions (temperature, pressure) enters a water-filled aquifer. - * This is realized with a solution-dependent Neumann boundary condition at the - * right boundary (\f$5m./test_box2p2c or - * ./test_cc2p2c */ template class InjectionProblem : public PorousMediumFlowProblem @@ -140,11 +119,6 @@ public: std::cout<<"problem uses mass-fractions"< diff --git a/test/porousmediumflow/2p2c/mpnccomparison/problem.hh b/test/porousmediumflow/2p2c/mpnccomparison/problem.hh index 6fa68b4a003161f28cfd864b06758f800f241b66..bf09519003159f1cab62d2c531a3348869a2356b 100644 --- a/test/porousmediumflow/2p2c/mpnccomparison/problem.hh +++ b/test/porousmediumflow/2p2c/mpnccomparison/problem.hh @@ -19,9 +19,8 @@ /*! * \file * \ingroup TwoPTwoCTests - * \brief Problem where air is injected in a unsaturated porous medium. + * \brief Problem for the 2p2c mpnc comparison problem. * - * This test compares a mpnc problem with a 2p2c problem. */ #ifndef DUMUX_TWOPTWOC_MPNC_PROBLEM_HH @@ -38,9 +37,8 @@ namespace Dumux { /*! * \ingroup TwoPTwoCTests - * \brief Problem where air is injected in a unsaturated porous medium. + * \brief Problem for the 2p2c mpnc comparison problem. * - * This test compares a mpnc problem with a 2p2c problem. */ template class TwoPTwoCComparisonProblem : public PorousMediumFlowProblem @@ -78,10 +76,6 @@ public: name_ = getParam("Problem.Name"); } - /*! - * \name Problem parameters - */ - // \{ /*! * \brief Returns the problem name @@ -92,7 +86,6 @@ public: { return name_; } /*! - * \name Boundary conditions * \brief Specifies which kind of boundary condition should be * used for which equation on a given boundary segment * @@ -132,7 +125,6 @@ public: return values; } - // \} /*! * \brief Evaluates the initial value for a control volume. @@ -147,7 +139,6 @@ public: return initial_(globalPos); } - // \} private: // the internal method for the initial condition diff --git a/test/porousmediumflow/2p2c/mpnccomparison/properties.hh b/test/porousmediumflow/2p2c/mpnccomparison/properties.hh index 39d5f4513e420ff21b480f8dca740e900cd49a23..26846f4756b7e6f7061c5af518e600d648824cc7 100644 --- a/test/porousmediumflow/2p2c/mpnccomparison/properties.hh +++ b/test/porousmediumflow/2p2c/mpnccomparison/properties.hh @@ -19,7 +19,7 @@ /*! * \file * \ingroup TwoPTwoCTests - * \brief The properties of the problem where air is injected in a unsaturated porous medium. + * \brief The properties for the 2p2c mpnc comparison problem. */ #ifndef DUMUX_TWOPTWOC_MPNC_PROPERTIES_HH diff --git a/test/porousmediumflow/2p2c/waterair/main.cc b/test/porousmediumflow/2p2c/waterair/main.cc index 6faa54953919a964824601f7b22144e876715046..f8a2539be4f0b05543ec534cf66e0e73aec979c2 100644 --- a/test/porousmediumflow/2p2c/waterair/main.cc +++ b/test/porousmediumflow/2p2c/waterair/main.cc @@ -19,7 +19,7 @@ /*! * \file * \ingroup TwoPTwoCTests - * \brief Test for the two-phase two-component CC model. + * \brief Test for the non-isothermal gas injection problem where a gas (e.g. air) is injected into a fully water saturated medium. */ #include diff --git a/test/porousmediumflow/2p2c/waterair/problem.hh b/test/porousmediumflow/2p2c/waterair/problem.hh index 63069a2a51e42ed9bcd33973c5b779a15ac23f5d..3b45c6c33a6149f4ed5c10e1e1cebd7fb4e1b5f3 100644 --- a/test/porousmediumflow/2p2c/waterair/problem.hh +++ b/test/porousmediumflow/2p2c/waterair/problem.hh @@ -41,34 +41,6 @@ namespace Dumux { * \brief Non-isothermal gas injection problem where a gas (e.g. air) * is injected into a fully water saturated medium. * - * During buoyancy driven upward migration the gas passes a high temperature area. - * - * The domain is sized 40m times 40m in a depth of 1000m. The rectangular area - * with the increased temperature (380K) starts at (20m, 1m) and ends at - * (30m, 30m). - * - * For the mass conservation equation Neumann boundary conditions are used on - * the top and on the bottom of the domain, while Dirichlet conditions - * apply on the left and the right boundary. - * For the energy conservation equation Dirichlet boundary conditions are applied - * on all boundaries. - * - * Gas is injected at the bottom boundary from 15m to 25m at a rate of - * 0.001kg/(s m), the remaining Neumann boundaries are no-flow boundaries. - * - * At the Dirichlet boundaries a hydrostatic pressure, a gas saturation of zero and - * a geothermal temperature gradient of 0.03K/m are applied. - * - * The model is able to use either mole or mass fractions. The property useMoles - * can be set to either true or false in the problem file. Make sure that the - * according units are used in the problem set-up. - * The default setting for useMoles is true. - * - * This problem uses the \ref TwoPTwoCModel and \ref NIModel model. - * - * To run the simulation execute the following line in shell: - * ./test_box2p2cni or - * ./test_cc2p2cni * */ template class WaterAirProblem : public PorousMediumFlowProblem @@ -132,11 +104,6 @@ public: this->spatialParams().plotMaterialLaw(); } - /*! - * \name Problem parameters - */ - // \{ - /*! * \brief The problem name. * @@ -145,12 +112,6 @@ public: const std::string& name() const { return name_; } - // \} - - /*! - * \name Boundary conditions - */ - // \{ /*! * \brief Specifies which kind of boundary condition should be @@ -226,12 +187,6 @@ public: return values; } - // \} - - /*! - * \name Volume terms - */ - // \{ /*! * \brief Evaluates the initial value for a control volume. diff --git a/test/porousmediumflow/2p2c/waterair/properties.hh b/test/porousmediumflow/2p2c/waterair/properties.hh index 60c7778b53d2f3eb71b220e3f938a7d60258dcac..8c774097d1b8741267e41f27446df6def3412742 100644 --- a/test/porousmediumflow/2p2c/waterair/properties.hh +++ b/test/porousmediumflow/2p2c/waterair/properties.hh @@ -19,8 +19,7 @@ /*! * \file * \ingroup TwoPTwoCTests - * \brief The properties of the non-isothermal gas injection problem where a gas (e.g. air) - * is injected into a fully water saturated medium. + * \brief The properties of the non-isothermal gas injection problem where a gas (e.g. air) is injected into a fully water saturated medium. */ #ifndef DUMUX_WATER_AIR_PROPERTIES_HH diff --git a/test/porousmediumflow/2p2c/waterair/spatialparams.hh b/test/porousmediumflow/2p2c/waterair/spatialparams.hh index 0bb0a8bcf05e3db296016a3e300b6f0dd2dca912..142323a05902920d2e2388e34036012e02406b06 100644 --- a/test/porousmediumflow/2p2c/waterair/spatialparams.hh +++ b/test/porousmediumflow/2p2c/waterair/spatialparams.hh @@ -19,7 +19,7 @@ /*! * \file * \ingroup TwoPTwoCTests - * \brief Definition of the spatial parameters for the water-air problem. + * \brief Definition of the spatial parameters for the non-isothermal gas injection problem where a gas (e.g. air) is injected into a fully water saturated medium. */ #ifndef DUMUX_WATER_AIR_SPATIAL_PARAMS_HH #define DUMUX_WATER_AIR_SPATIAL_PARAMS_HH diff --git a/test/porousmediumflow/2pnc/diffusion/main.cc b/test/porousmediumflow/2pnc/diffusion/main.cc index ec3f1cfff3ce97e125cef4e4856f6e0add7a46b5..7523bc2afe862f011c8a646ea556890be11ee690 100644 --- a/test/porousmediumflow/2pnc/diffusion/main.cc +++ b/test/porousmediumflow/2pnc/diffusion/main.cc @@ -19,7 +19,8 @@ /*! * \file * \ingroup TwoPNCTests - * \brief Test for the 2pnc cc model used for water management in PEM fuel cells. + * \brief Test for a diffusion + * problem which uses the isothermal 2p2c box model. */ #include diff --git a/test/porousmediumflow/2pnc/diffusion/problem.hh b/test/porousmediumflow/2pnc/diffusion/problem.hh index 75d9c80ec1b51039782ea21cb6bdbc1241a24cf1..0caf605d1b1ec4690ef8c9cc77731609a88446a7 100644 --- a/test/porousmediumflow/2pnc/diffusion/problem.hh +++ b/test/porousmediumflow/2pnc/diffusion/problem.hh @@ -19,7 +19,8 @@ /*! * \file * \ingroup TwoPNCTests - * \brief Problem where air is injected under a low permeable layer in a depth of 2700m. + * \brief Problem of a diffusion + * problem which uses the isothermal 2p2c box model. */ #ifndef DUMUX_TWOPNC_DIFFUSION_PROBLEM_HH #define DUMUX_TWOPNC_DIFFUSION_PROBLEM_HH @@ -35,7 +36,8 @@ namespace Dumux { /*! * \ingroup TwoPNCTests - * \brief Problem where air is injected under a low permeable layer in a depth of 2700m. + * \brief Problem of a diffusion + * problem which uses the isothermal 2p2c box model. */ template class TwoPNCDiffusionProblem : public PorousMediumFlowProblem @@ -82,11 +84,6 @@ public: } } - /*! - * \name Problem parameters - */ - // \{ - /*! * \brief Returns the problem name * @@ -95,13 +92,6 @@ public: const std::string& name() const { return name_; } - // \} - - /*! - * \name Boundary conditions - */ - // \{ - /*! * \brief Specifies which kind of boundary condition should be * used for which equation on a given boundary segment @@ -148,13 +138,6 @@ public: return values; } - // \} - - /*! - * \name Volume terms - */ - // \{ - /*! * \brief Evaluates the initial values for a control volume. * diff --git a/test/porousmediumflow/2pnc/diffusion/properties.hh b/test/porousmediumflow/2pnc/diffusion/properties.hh index 0cb21399778fa706bd2865a21aab364c456cc88a..651b43da96ecd1b10ad4f9edf9fe5015a03eba3e 100644 --- a/test/porousmediumflow/2pnc/diffusion/properties.hh +++ b/test/porousmediumflow/2pnc/diffusion/properties.hh @@ -19,8 +19,8 @@ /*! * \file * \ingroup TwoPNCTests - * \brief The properties of the problem where air is injected under a low permeable layer in a depth - * of 2700m. + * \brief The properties of a diffusion + * problem which uses the isothermal 2p2c box model. */ #ifndef DUMUX_TWOPNC_DIFFUSION_PROPERTIES_HH #define DUMUX_TWOPNC_DIFFUSION_PROPERTIES_HH diff --git a/test/porousmediumflow/2pnc/diffusion/spatialparams.hh b/test/porousmediumflow/2pnc/diffusion/spatialparams.hh index 60a9ffe3af38ef38a76af7d686f83ac20cbe0ad6..b30e28f66ede7c0cd06e57376c515d6012ccb9eb 100644 --- a/test/porousmediumflow/2pnc/diffusion/spatialparams.hh +++ b/test/porousmediumflow/2pnc/diffusion/spatialparams.hh @@ -19,8 +19,8 @@ /*! * \file * \ingroup TwoPNCTests - * \brief Definition of the spatial parameters for the fuel cell - * problem which uses the isothermal/non-insothermal 2pnc box model. + * \brief Definition of the spatial parameters for a diffusion + * problem which uses the isothermal 2p2c box model. */ #ifndef DUMUX_TWOPNC_DIFFUSION_SPATIAL_PARAMS_HH @@ -33,7 +33,7 @@ namespace Dumux { /*! * \ingroup TwoPNCTests - * \brief Definition of the spatial parameters for the TwoPNCDiffusion + * \brief Definition of the spatial parameters for a diffusion * problem which uses the isothermal 2p2c box model. */ template diff --git a/test/porousmediumflow/2pnc/fuelcell/params.input b/test/porousmediumflow/2pnc/fuelcell/params.input index e26db822b16aab8511ba3e64c0ad795702e74efb..b84252bbe0f0700bb6c5958bb342fd4e1b55b6ae 100644 --- a/test/porousmediumflow/2pnc/fuelcell/params.input +++ b/test/porousmediumflow/2pnc/fuelcell/params.input @@ -1,6 +1,4 @@ # Parameter file for test case 2pnc. -# Everything behind a '#' is a comment. -# Type "./test_2pnc --help" for more information. [TimeLoop] DtInitial = 5e-1 # [s] initial time step size diff --git a/test/porousmediumflow/2pnc/fuelcell/params_ni.input b/test/porousmediumflow/2pnc/fuelcell/params_ni.input index 25f50569bc9e7456dccb2c64b10f8b9288a55159..4e24ba5cf01fd8a23f6506e4dd8c4616aea43b1a 100644 --- a/test/porousmediumflow/2pnc/fuelcell/params_ni.input +++ b/test/porousmediumflow/2pnc/fuelcell/params_ni.input @@ -1,6 +1,4 @@ # Parameter file for test case 2pnc. -# Everything behind a '#' is a comment. -# Type "./test_2pnc --help" for more information. [TimeLoop] DtInitial = 5e-1 # [s] initial time step size diff --git a/test/porousmediumflow/2pnc/fuelcell/problem.hh b/test/porousmediumflow/2pnc/fuelcell/problem.hh index ec6cdd55786944cefd2b9a7df252b5167c974c31..c0944b2839514dae4fe04c3814746840df30c147 100644 --- a/test/porousmediumflow/2pnc/fuelcell/problem.hh +++ b/test/porousmediumflow/2pnc/fuelcell/problem.hh @@ -42,10 +42,8 @@ namespace Dumux { /*! * \ingroup TwoPNCTests - * \brief Problem or water management in PEM fuel cells. + * \brief Problem for water management in PEM fuel cells. * - * To run the simulation execute the following line in shell: - * ./test_box2pnc */ template class FuelCellProblem : public PorousMediumFlowProblem @@ -101,9 +99,6 @@ public: /*np=*/nPressure_); } - /*! - * \name Problem parameters - */ /*! * \brief The problem name. @@ -134,10 +129,6 @@ public: } - /*! - * \name Boundary conditions - */ - // \{ /*! * \brief Specifies which kind of boundary condition should be @@ -179,9 +170,6 @@ public: return priVars; } - /*! - * \name Volume terms - */ /*! diff --git a/test/porousmediumflow/2pnc/fuelcell/spatialparams.hh b/test/porousmediumflow/2pnc/fuelcell/spatialparams.hh index 924955d54f3d16092f2e6c6973e821eb9eea6ee9..9c049ca16931e78fa68fc7a1d39b84a082f4c98f 100644 --- a/test/porousmediumflow/2pnc/fuelcell/spatialparams.hh +++ b/test/porousmediumflow/2pnc/fuelcell/spatialparams.hh @@ -19,8 +19,7 @@ /*! * \file * \ingroup TwoPNCTests - * \brief Definition of the spatial parameters for the fuel cell - * problem which uses the isothermal/non-insothermal 2pnc box model. + * \brief Definition of the spatial parameters for water management in PEM fuel cells. */ #ifndef DUMUX_FUELCELL_SPATIAL_PARAMS_HH @@ -33,8 +32,7 @@ namespace Dumux { /*! * \ingroup TwoPNCTests - * \brief Definition of the spatial parameters for the FuelCell - * problem which uses the isothermal 2p2c box model. + * \brief Definition of the spatial parameters for water management in PEM fuel cells. */ template class FuelCellSpatialParams diff --git a/test/porousmediumflow/2pnc/surfactant/fluidsystem.hh b/test/porousmediumflow/2pnc/surfactant/fluidsystem.hh index 2d75ceb2291625be1f5b11b4c3bf7c278ebd54c9..4e75499516cf9d5c8574f7df38a6bd2fe40b2fcd 100644 --- a/test/porousmediumflow/2pnc/surfactant/fluidsystem.hh +++ b/test/porousmediumflow/2pnc/surfactant/fluidsystem.hh @@ -1,3 +1,26 @@ +// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +// vi: set et ts=4 sw=4 sts=4: +/***************************************************************************** + * See the file COPYING for full copying permissions. * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + *****************************************************************************/ +/*! + * \file + * \ingroup TwoPNCTests + * \brief Fluidsystem for a surfactant model. + */ #ifndef DUMUX_TEST_2P3C_SURFACTANT_FLUIDSYSTEM_HH #define DUMUX_TEST_2P3C_SURFACTANT_FLUIDSYSTEM_HH diff --git a/test/porousmediumflow/2pnc/surfactant/main.cc b/test/porousmediumflow/2pnc/surfactant/main.cc index 94f42192a3fd0179edc0113891887255a1528927..2e49cf2a42491aa55db3296361cc08052e4f8176 100644 --- a/test/porousmediumflow/2pnc/surfactant/main.cc +++ b/test/porousmediumflow/2pnc/surfactant/main.cc @@ -1,3 +1,26 @@ +// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +// vi: set et ts=4 sw=4 sts=4: +/***************************************************************************** + * See the file COPYING for full copying permissions. * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + *****************************************************************************/ +/*! + * \file + * \ingroup TwoPNCTests + * \brief Test for a surfactant model. + */ #include #include diff --git a/test/porousmediumflow/2pnc/surfactant/materiallaw.hh b/test/porousmediumflow/2pnc/surfactant/materiallaw.hh index 1e772b8cb2ae138bc4edf4cf2201ecad82fa8123..fbc0ffa0c97485f924c51d55b632d8a2abb61632 100644 --- a/test/porousmediumflow/2pnc/surfactant/materiallaw.hh +++ b/test/porousmediumflow/2pnc/surfactant/materiallaw.hh @@ -1,3 +1,26 @@ +// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +// vi: set et ts=4 sw=4 sts=4: +/***************************************************************************** + * See the file COPYING for full copying permissions. * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + *****************************************************************************/ +/*! + * \file + * \ingroup TwoPNCTests + * \brief Material law for a surfactant model. + */ #ifndef DUMUX_TEST_2P3C_SURFACTANT_MATERIALLAW_HH #define DUMUX_TEST_2P3C_SURFACTANT_MATERIALLAW_HH @@ -7,7 +30,7 @@ namespace Dumux::FluidMatrix { /*! - * \brief This is based on the surfactant model described + * \brief Material law for a surfactant model.This is based on the surfactant model described * in K. Jørgensen's master thesis (NTNU, 2013) http://hdl.handle.net/11250/240038 */ template diff --git a/test/porousmediumflow/2pnc/surfactant/problem.hh b/test/porousmediumflow/2pnc/surfactant/problem.hh index 427a4be7ac3c98d9c6a6d264315c1b39eaab3973..96139feaa196aab64cf3076943536704649dfb84 100644 --- a/test/porousmediumflow/2pnc/surfactant/problem.hh +++ b/test/porousmediumflow/2pnc/surfactant/problem.hh @@ -1,3 +1,26 @@ +// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +// vi: set et ts=4 sw=4 sts=4: +/***************************************************************************** + * See the file COPYING for full copying permissions. * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + *****************************************************************************/ +/*! + * \file + * \ingroup TwoPNCTests + * \brief Definition of a problem for a surfactant model. + */ #ifndef DUMUX_TEST_2P3C_SURFACTANT_PROBLEM_HH #define DUMUX_TEST_2P3C_SURFACTANT_PROBLEM_HH @@ -10,6 +33,12 @@ namespace Dumux { +/*! + * \ingroup TwoPNCTests + * \brief Problem for a surfactant model. + * + */ + template class TestSurfactantProblem : public PorousMediumFlowProblem @@ -49,9 +78,19 @@ public: name_ = getParam("Problem.Name"); } + /*! + * \brief The problem name. + * + * This is used as a prefix for files generated by the simulation. + */ const std::string& name() const { return name_; } + /*! + * \brief Specifies which kind of boundary condition should be + * used for which equation on a given boundary segment + */ + BoundaryTypes boundaryTypes(const Element& element, const SubControlVolume& scv) const { BoundaryTypes bcTypes; @@ -59,6 +98,10 @@ public: return bcTypes; } + /*! + * \brief Evaluates the boundary conditions for a Neumann boundary segment. + */ + template NumEqVector neumann(const Element& element, const FVElementGeometry& fvGeometry, @@ -110,6 +153,12 @@ public: return values; } + /*! + * \brief Evaluates the initial values for a control volume. + * + * \param globalPos The global position + */ + PrimaryVariables initialAtPos(const GlobalPosition& globalPos) const { using ModelTraits = GetPropType; diff --git a/test/porousmediumflow/2pnc/surfactant/properties.hh b/test/porousmediumflow/2pnc/surfactant/properties.hh index abb1ce6f794b415ddc83dd317a81a1699210f851..15b783e496285d11f957641e8d17fd755b5c84c8 100644 --- a/test/porousmediumflow/2pnc/surfactant/properties.hh +++ b/test/porousmediumflow/2pnc/surfactant/properties.hh @@ -1,3 +1,26 @@ +// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +// vi: set et ts=4 sw=4 sts=4: +/***************************************************************************** + * See the file COPYING for full copying permissions. * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + *****************************************************************************/ +/*! + * \file + * \ingroup TwoPNCTests + * \brief The properties of a surfactant model. + */ #ifndef DUMUX_TEST_2P3C_SURFACTANT_PROPERTIES_HH #define DUMUX_TEST_2P3C_SURFACTANT_PROPERTIES_HH @@ -19,20 +42,24 @@ struct TestSurfactantBox { using InheritsFrom = std::tuple; }; } // end namespace TTag +// Set the grid type template struct Grid { using type = Dune::YaspGrid<1, Dune::EquidistantOffsetCoordinates>; }; +// Set the problem property template struct Problem { using type = TestSurfactantProblem; }; +// Enable caching template struct EnableGridVolumeVariablesCache { static constexpr bool value = true; }; +// Set fluid configuration template struct FluidSystem { @@ -40,6 +67,7 @@ struct FluidSystem using type = FluidSystems::TestSurfactant; }; +// Set the spatial parameters template struct SpatialParams { diff --git a/test/porousmediumflow/2pnc/surfactant/spatialparams.hh b/test/porousmediumflow/2pnc/surfactant/spatialparams.hh index f2c2b236403fb9484d4227b099c86756ff901401..401e7319dac30eaa02e8c3d2ad3da187d28babe3 100644 --- a/test/porousmediumflow/2pnc/surfactant/spatialparams.hh +++ b/test/porousmediumflow/2pnc/surfactant/spatialparams.hh @@ -1,3 +1,26 @@ +// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +// vi: set et ts=4 sw=4 sts=4: +/***************************************************************************** + * See the file COPYING for full copying permissions. * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + *****************************************************************************/ +/*! + * \file + * \ingroup TwoPNCTests + * \brief Definition of the spatial parameters for a surfactant model. + */ #ifndef DUMUX_TEST_2P3C_SURFACTANT_SPATIALPARAMS_HH #define DUMUX_TEST_2P3C_SURFACTANT_SPATIALPARAMS_HH @@ -11,7 +34,10 @@ #include "materiallaw.hh" namespace Dumux { - +/*! + * \ingroup TwoPNCTests + * \brief Definition of the spatial parameters for a surfactant model. + */ template class TestSurfactantSpatialParams : public FVPorousMediumFlowSpatialParamsMP("SpatialParams.SroSurf"); } + /*! + * \brief Defines the porosity \f$[-]\f$of the spatial parameters + * + * \param globalPos The global position + */ + Scalar porosityAtPos(const GlobalPosition& globalPos) const { return 0.18; } + /*! + * \brief Returns the hydraulic conductivity \f$[m^2]\f$+ */ + PermeabilityType permeability(const Element& element) const { return 1e-13; } + /*! + * \brief Returns the temperature in the domain at the given position + * \param globalPos The position in global coordinates where the temperature should be specified. + */ + Scalar temperatureAtPos(const GlobalPosition& globalPos) const { return 300.0; @@ -97,6 +138,12 @@ public: return MaterialLaw(Ncv, sMinKr_, sMaxKr_, srwSurf_, sroSurf_); } + /*! + * \brief Function for defining which phase is to be considered as the wetting phase. + * + * \param globalPos The position of the center of the element + * \return The wetting phase index + */ template int wettingPhaseAtPos(const GlobalPosition& globalPos) const diff --git a/test/porousmediumflow/2pncmin/isothermal/params.input b/test/porousmediumflow/2pncmin/isothermal/params.input index 94578dd96b84662c9571dd0fddedb4a25b97a65d..fdcdde7bc0645340c37cb5a7013efd93db015592 100644 --- a/test/porousmediumflow/2pncmin/isothermal/params.input +++ b/test/porousmediumflow/2pncmin/isothermal/params.input @@ -1,6 +1,4 @@ # Parameter file for test case 2pncmin. -# Everything behind a '#' is a comment. -# Type "./test_2pncmin --help" for more information. [TimeLoop] TEnd = 1e6 # duration of the simulation [s] diff --git a/test/porousmediumflow/2pncmin/isothermal/problem.hh b/test/porousmediumflow/2pncmin/isothermal/problem.hh index ab8a00cbfd696e24b7a43223730c285428dbc918..5f1e5e50c3da876b8a05d70c84053002abf94795 100644 --- a/test/porousmediumflow/2pncmin/isothermal/problem.hh +++ b/test/porousmediumflow/2pncmin/isothermal/problem.hh @@ -35,29 +35,8 @@ namespace Dumux { /*! * \ingroup TwoPNCMinTests - * \brief Problem where water is injected to flush precipitated salt in a gas - * reservoir clogged due to precipitated salt. + * \brief Problem where water is injected to flush precipitated salt in a gas reservoir clogged due to precipitated salt. * - * The domain is sized 10m times 20m and contains a vertical low-permeable layer - * of precipitated salt near an extraction well. - * - * To flush this precipitated salt, water is injected through the gas extraction - * well in order to dissolve the precipitated salt increasing the permeability - * and thereby achieving high gas extraction rates later. Here, the system is - * assumed to be isothermal. - * Neumann no-flow boundary condition is applied at the top and bottom boundary - * and Dirichlet boundary condition is used on the right and left sides. - * The injected water phase migrates downwards due to increase in density as - * the precipitated salt dissolves. - * - * The model uses mole fractions of dissolved components and volume fractions of - * precipitated salt as primary variables. Make sure that the according units - * are used in the problem set-up. - * - * This problem uses the \ref TwoPNCMinModel. - * - * To run the simulation execute the following line in shell: - * ./test_box2pncmin */ template class DissolutionProblem : public PorousMediumFlowProblem @@ -162,10 +141,6 @@ public: timeStepSize_ = timeStepSize; } - /*! - * \name Problem parameters - */ - /*! * \brief The problem name. @@ -175,11 +150,6 @@ public: const std::string& name() const { return name_; } - /*! - * \name Boundary conditions - */ - // \{ - /*! * \brief Specifies which kind of boundary condition should be * used for which equation on a given boundary segment. @@ -240,8 +210,6 @@ public: * * \param globalPos The global position * - * For this method, the \a values parameter stores primary - * variables. */ PrimaryVariables initialAtPos(const GlobalPosition& globalPos) const { @@ -259,10 +227,6 @@ public: return priVars; } - /*! - * \name Volume terms - */ - // \{ /*! * \brief Evaluates the source term for all phases within a given @@ -277,10 +241,6 @@ public: * \param elemVolVars All volume variables for the element * \param scv The subcontrolvolume * - * For this method, the \a values parameter stores the conserved quantity rate - * generated or annihilated per volume unit. Positive values mean - * that the conserved quantity is created, negative ones mean that it vanishes. - * E.g. for the mass balance that would be a mass rate in \f$ [ kg / (m^3 \cdot s)] \f\$. */ NumEqVector source(const Element &element, const FVElementGeometry& fvGeometry, diff --git a/test/porousmediumflow/2pncmin/isothermal/properties.hh b/test/porousmediumflow/2pncmin/isothermal/properties.hh index db21c9c5a5f9a90ca9ad1578f3c4c2f68600f2f0..6a4937b750ef5e703ece8fe99141b62c50fdb518 100644 --- a/test/porousmediumflow/2pncmin/isothermal/properties.hh +++ b/test/porousmediumflow/2pncmin/isothermal/properties.hh @@ -19,8 +19,7 @@ /*! * \file * \ingroup TwoPNCMinTests - * \brief The properties of the problem where water is injected in a for flushing precipitated salt - * clogging a gas reservoir. + * \brief The properties of the problem where water is injected in a for flushing precipitated salt clogging a gas reservoir. */ #ifndef DUMUX_DISSOLUTION_PROPERTIES_HH #define DUMUX_DISSOLUTION_PROPERTIES_HH diff --git a/test/porousmediumflow/2pncmin/isothermal/spatialparams.hh b/test/porousmediumflow/2pncmin/isothermal/spatialparams.hh index f5212a735045294e176f8d4f0660bc8780c408f4..d5923e3b45d6b1855fbf736a5f3afc974842b95f 100644 --- a/test/porousmediumflow/2pncmin/isothermal/spatialparams.hh +++ b/test/porousmediumflow/2pncmin/isothermal/spatialparams.hh @@ -19,8 +19,7 @@ /*! * \file * \ingroup TwoPNCMinTests - * \brief Spatial parameters for the dissolution problem where water is injected - * in a for flushing precipitated salt clogging a gas reservoir. + * \brief Spatial parameters for the dissolution problem where water is injected in a for flushing precipitated salt clogging a gas reservoir. */ #ifndef DUMUX_INJECTION_SPATIAL_PARAMETERS_HH diff --git a/test/porousmediumflow/2pncmin/nonisothermal/params.input b/test/porousmediumflow/2pncmin/nonisothermal/params.input index 51d63dc04c19a8e8b6aa9943a93fcd2bbfacde34..d5d8b25bb0c95b5d5ecb7c3f3e8337e4dbc7a827 100644 --- a/test/porousmediumflow/2pncmin/nonisothermal/params.input +++ b/test/porousmediumflow/2pncmin/nonisothermal/params.input @@ -1,6 +1,4 @@ # Parameter file for test case 2pncmin. -# Everything behind a '#' is a comment. -# Type "./test_2pncmin --help" for more information. [TimeLoop] TEnd = 150000 # duration of the simulation [s] diff --git a/test/porousmediumflow/2pncmin/nonisothermal/problem.hh b/test/porousmediumflow/2pncmin/nonisothermal/problem.hh index 17e651fe932c898279f6044ba6eaecd76ad7ceec..1d6fba8ab489344a1daf87b5a26d6c1e44148448 100644 --- a/test/porousmediumflow/2pncmin/nonisothermal/problem.hh +++ b/test/porousmediumflow/2pncmin/nonisothermal/problem.hh @@ -36,29 +36,8 @@ namespace Dumux { /*! * \ingroup TwoPNCMinTests - * \brief Problem where water is evaporating at the top of a porous media filled - * container saturated with brine and air, which causes precipitation at the top. + * \brief Problem where water is evaporating at the top of a porous media filled container saturated with brine and air, which causes precipitation at the top. * - * Problem with a porous media in a container, which is open to the atmosphere - * at the top boundary. The container has dimensions of 0.2m by 0.2m. Neumann - * no-flow boundaries are applied at the left, right and bottom boundary. - * The grid is refined towards the upper boundary to capter the relevant processes. - * - * Initially the porous medium is 50 % saturated with brine. Evaporation takes - * place at the top boundary and hence the temperature and liquid saturation - * decreases first at the top, then in the whole system, whereas the sodium - * chloride (NaCl) concentration increases. This results in precipitaion of NaCl - * at the top as the solubility limit is exceeded. Due to the low liquid saturation - * the top after some time, top temperature rises again. - * - * The model uses mole fractions of dissolved components and volume fractions of - * precipitated salt as primary variables. Make sure that the according units - * are used in the problem set-up. - * - * This problem uses the \ref TwoPNCMinModel. - * - * To run the simulation execute the following line in shell: - * ./test_2pncminni_salinization */ template class SalinizationProblem : public PorousMediumFlowProblem @@ -175,9 +154,6 @@ public: timeStepSize_ = timeStepSize; } - /*! - * \name Problem parameters - */ /*! * \brief The problem name. @@ -187,11 +163,6 @@ public: const std::string& name() const { return name_; } - /*! - * \name Boundary conditions - */ - // \{ - /*! * \brief Specifies which kind of boundary condition should be * used for which equation on a given boundary segment. @@ -334,11 +305,6 @@ public: return priVars; } - /*! - * \name Volume terms - */ - // \{ - /*! * \brief Evaluates the source term for all phases within a given * sub-controlvolume. diff --git a/test/porousmediumflow/2pncmin/nonisothermal/properties.hh b/test/porousmediumflow/2pncmin/nonisothermal/properties.hh index 4939f1eef7c9ccb4de1a7d42d704915cdd6638b2..fcbdd4175db0c4161f741cab32302460ba9af415 100644 --- a/test/porousmediumflow/2pncmin/nonisothermal/properties.hh +++ b/test/porousmediumflow/2pncmin/nonisothermal/properties.hh @@ -19,8 +19,7 @@ /*! * \file * \ingroup TwoPNCMinTests - * \brief The properties of the problem where brine is evaporating at the top boundary. The system - * is closed at the remaining boundaries. + * \brief The properties of the problem where brine is evaporating at the top boundary. The system is closed at the remaining boundaries. */ #ifndef DUMUX_SALINIZATION_PROPERTIES_HH #define DUMUX_SALINIZATION_PROPERTIES_HH