Commit eb69c4d9 authored by Mathis Kelm's avatar Mathis Kelm
Browse files

[cleanup] Changed hyphenated spelling to nonwetting/Nonwetting

parent 01bc7ea0
......@@ -64,7 +64,7 @@ An additional new option is `Vtk.CoordPrecision` which changes the precision of
### Immediate interface changes not allowing/requiring a deprecation period
- Remove `Grid.HeapSize` as dune-ugrid removed the according feature as well.
- __Van Genuchten__: Corrected VanGenuchten-Mualem exponent in the non-wetting saturation formula (`1/3` instead of `1/2` (or `l`, see above))
- __Van Genuchten__: Corrected VanGenuchten-Mualem exponent in the nonwetting saturation formula (`1/3` instead of `1/2` (or `l`, see above))
- __Van Genuchten__: Corrected VanGenuchten-Mualem implementation of `dkrn/dSw`
- __Brooks-Corey__: Corrected Brooks-Corey implementation of `dkrn/dSw` and added the derivatives for the regularized version
- __AMGBackend__: The internal structure of the AMGBackend and the ParallelISTLHelper has been overhauled, as only used by the AMG, we did not make the changes backwards-compatible
......@@ -1345,7 +1345,7 @@ Differences Between DuMu<sup>x</sup> 2.2 and DuMu<sup>x</sup> 2.3
test/decoupled/2p. They work in parallel only if the AMGBackend is used
as linear solver. No dynamic loadbalancing can be done yet.
- The MPNC model can use either the most wetting or the most non-wetting phase
- The MPNC model can use either the most wetting or the most nonwetting phase
pressure as primary variable. This is controlled via the property
"PressureFormulation."
......
......@@ -10,7 +10,7 @@ Basic definitions and assumptions are given. More information can be found e.g.
\begin{description}
\item[Phases:]
A \emph{phase} is defined as a continuum having distinct properties (e.g. density and viscosity). If phases are miscible, they contain dissolved portions of the substance of the other phase.
Fluid and solid phases are distinguished. The fluid phases have different affinities to the solid phases. The phase, which has a higher affinity to the solid phases is referred to as the (more) wetting phase. In the case of two phases, the less wetting one is called the non-wetting phase.
Fluid and solid phases are distinguished. The fluid phases have different affinities to the solid phases. The phase, which has a higher affinity to the solid phases is referred to as the (more) wetting phase. In the case of two phases, the less wetting one is called the nonwetting phase.
For compositional multi-phase models, fluid phases may be composed of several components, while the solid phases are assumed to consist exclusively of a single component.
......@@ -257,10 +257,10 @@ for each of the fluid phases.
This increases the resistance to flow of the phases, which is accounted for by the means of
the relative permeability $k_\mathrm{r,\alpha}$, which scales the intrinsic permeability.
It is a value between zero and one, depending on the saturation.
The relations describing the relative permeabilities of the wetting and non-wetting phase are different
The relations describing the relative permeabilities of the wetting and nonwetting phase are different
as the wetting phase predominantly occupies small pores and the edges of larger pores while the
non-wetting phases occupies large pores.
The relative permeabilities for the wetting phase $k_\mathrm{r,w}$ and the non-wetting phase are e.g. calculated as (also by \citet{brooks1964hydrau}):
nonwetting phases occupies large pores.
The relative permeabilities for the wetting phase $k_\mathrm{r,w}$ and the nonwetting phase are e.g. calculated as (also by \citet{brooks1964hydrau}):
\begin{equation}\label{eq:krw}
k_\mathrm{r,w} = S_\mathrm{e}^{\frac{2+3\lambda}{\lambda}}
......
......@@ -181,7 +181,7 @@ struct EnableBoxInterfaceSolver { using type = UndefinedProperty; };
template<class TypeTag, class MyTypeTag>
struct Chemistry { using type = UndefinedProperty; }; //!< The chemistry class with which solves equlibrium reactions
template<class TypeTag, class MyTypeTag>
struct SetMoleFractionsForFirstPhase { using type = UndefinedProperty; }; //!< Set the mole fraction in the wetting or non-wetting phase
struct SetMoleFractionsForFirstPhase { using type = UndefinedProperty; }; //!< Set the mole fraction in the wetting or nonwetting phase
//////////////////////////////////////////////////////////////
// Additional properties used by the richards model
......
......@@ -285,7 +285,7 @@ public:
}
}
gnuplot.setXlabel("non-wetting phase saturation [-]");
gnuplot.setXlabel("nonwetting phase saturation [-]");
gnuplot.setYlabel("transition function [-]");
gnuplot.addDataSetToPlot(sn, alpha, curveTitle + "_alpha");
}
......
......@@ -215,7 +215,7 @@ public:
}
/*!
* \brief The relative permeability for the non-wetting phase of
* \brief The relative permeability for the nonwetting phase of
* the medium as implied by the Brooks-Corey
* parameterization.
*
......@@ -223,7 +223,7 @@ public:
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen, and then the params container
* is constructed accordingly. Afterwards the values are set there, too.
* \return Relative permeability of the non-wetting phase calculated as implied by Brooks & Corey.
* \return Relative permeability of the nonwetting phase calculated as implied by Brooks & Corey.
*
* \note Instead of undefined behaviour if pc is not in the valid range, we return a valid number,
* by clamping the input.
......@@ -242,7 +242,7 @@ public:
/*!
* \brief The derivative of the relative permeability for the
* non-wetting phase in regard to the wetting saturation of
* nonwetting phase in regard to the wetting saturation of
* the medium as implied by the Brooks-Corey
* parameterization.
*
......@@ -250,7 +250,7 @@ public:
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Derivative of the relative permeability of the non-wetting phase w.r.t. effective wetting phase
* \return Derivative of the relative permeability of the nonwetting phase w.r.t. effective wetting phase
* saturation calculated as implied by Brooks & Corey.
*
* \note Instead of undefined behaviour if pc is not in the valid range, we return a valid number,
......
......@@ -178,14 +178,14 @@ public:
}
/*!
* \brief The relative permeability for the non-wetting phase.
* \brief The relative permeability for the nonwetting phase.
*
* \param sw Absolute saturation of the wetting phase \f$\mathrm{[{S}_w]}\f$. It is converted to effective saturation
* and then handed over to the material law actually used for calculation.
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Relative permeability of the non-wetting phase calculated as implied by
* \return Relative permeability of the nonwetting phase calculated as implied by
* EffLaw e.g. Brooks & Corey, van Genuchten, linear... .
*/
static Scalar krn(const Params &params, Scalar sw)
......@@ -195,7 +195,7 @@ public:
/*!
* \brief Returns the partial derivative of the relative permeability
* of the non-wetting phase with respect to the wetting saturation.
* of the nonwetting phase with respect to the wetting saturation.
*
* \param sw Absolute saturation of the wetting phase \f$\mathrm{[\overline{S}_w]}\f$.
* \param params A container object that is populated with the appropriate coefficients
......@@ -221,13 +221,13 @@ public:
}
/*!
* \brief Convert an absolute non-wetting saturation to an effective one.
* \brief Convert an absolute nonwetting saturation to an effective one.
*
* \param sn Absolute saturation of the non-wetting phase \f$\mathrm{[{S}_n]}\f$.
* \param sn Absolute saturation of the nonwetting phase \f$\mathrm{[{S}_n]}\f$.
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Effective saturation of the non-wetting phase.
* \return Effective saturation of the nonwetting phase.
*/
static Scalar snToSne(const Params &params, Scalar sn)
{
......@@ -237,23 +237,23 @@ public:
/*!
* \brief Convert an effective wetting saturation to an absolute one.
*
* \param swe Effective saturation of the non-wetting phase \f$\mathrm{[\overline{S}_n]}\f$.
* \param swe Effective saturation of the nonwetting phase \f$\mathrm{[\overline{S}_n]}\f$.
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Absolute saturation of the non-wetting phase.
* \return Absolute saturation of the nonwetting phase.
*/
static Scalar sweToSw(const Params &params, Scalar swe)
{ return swe*(1. - params.swr() - params.snr()) + params.swr(); }
/*!
* \brief Convert an effective non-wetting saturation to an absolute one.
* \brief Convert an effective nonwetting saturation to an absolute one.
*
* \param sne Effective saturation of the non-wetting phase \f$\mathrm{[{S}_n]}\f$.
* \param sne Effective saturation of the nonwetting phase \f$\mathrm{[{S}_n]}\f$.
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Absolute saturation of the non-wetting phase.
* \return Absolute saturation of the nonwetting phase.
*/
static Scalar sneToSn(const Params &params, Scalar sne)
{ return sne*(1. - params.swr() - params.snr()) + params.snr(); }
......
......@@ -71,13 +71,13 @@ public:
{ swr_ = v; }
/*!
* \brief Return the residual non-wetting saturation.
* \brief Return the residual nonwetting saturation.
*/
Scalar snr() const
{ return snr_; }
/*!
* \brief Set the residual non-wetting saturation.
* \brief Set the residual nonwetting saturation.
*/
void setSnr(Scalar v)
{ snr_ = v; }
......
......@@ -133,7 +133,7 @@ public:
}
/*!
* \brief The relative permeability for the non-wetting phase.
* \brief The relative permeability for the nonwetting phase.
*
* \param params Array of parameters
* \param Sw The mobile saturation of the wetting phase.
......
......@@ -149,13 +149,13 @@ public:
}
/*!
* \brief The relative permeability for the non-wetting phase.
* \brief The relative permeability for the nonwetting phase.
*
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen, and then the params container
* is constructed accordingly. Afterwards the values are set there, too.
* \param swe Effective saturation of the wetting phase \f$\mathrm{[\overline{S}_w]}\f$ conversion from absolute saturation happened in EffToAbsLaw.
* \return Relative permeability of the non-wetting phase calculated as linear relation.
* \return Relative permeability of the nonwetting phase calculated as linear relation.
*/
static Scalar krn(const Params &params, Scalar swe)
{
......
......@@ -284,7 +284,7 @@ public:
/*!
* \brief Regularized version of the relative permeability
* for the non-wetting phase of
* for the nonwetting phase of
* the medium implied by the Brooks-Corey
* parameterization.
*
......@@ -308,7 +308,7 @@ public:
/*!
* \brief A regularized version of the derivative of the relative permeability
* for the non-wetting phase in regard to the wetting saturation of
* for the nonwetting phase in regard to the wetting saturation of
* the medium as implied by the Brooks-Corey parameterization.
*
* \copydetails BrooksCorey::dkrn_dswe()
......
......@@ -156,7 +156,7 @@ public:
}
/*!
* \brief The relative permeability for the non-wetting phase.
* \brief The relative permeability for the nonwetting phase.
*
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen, and then the params container
......
......@@ -377,7 +377,7 @@ public:
/*!
* \brief Regularized version of the relative permeability
* for the non-wetting phase of
* for the nonwetting phase of
* the medium implied by the van Genuchten
* parameterization.
*
......@@ -392,7 +392,7 @@ public:
static Scalar krn(const Params &params, Scalar swe)
{
// retrieve the low threshold saturation for the unregularized
// relative permeability curve of the non-wetting phase from
// relative permeability curve of the nonwetting phase from
// the parameters
const Scalar swThLow = params.krnLowSw();
......@@ -413,7 +413,7 @@ public:
/*!
* \brief A regularized version of the derivative of the relative permeability
* for the non-wetting phase in regard to the wetting saturation of
* for the nonwetting phase in regard to the wetting saturation of
* the medium as implied by the van Genuchten parameterization.
*
* \copydetails VanGenuchten::dkrw_dswe()
......@@ -421,7 +421,7 @@ public:
static Scalar dkrn_dswe(const Params &params, Scalar swe)
{
// retrieve the low threshold saturation for the unregularized
// relative permeability curve of the non-wetting phase from
// relative permeability curve of the nonwetting phase from
// the parameters
const Scalar swThLow = params.krnLowSw();
......
......@@ -118,7 +118,7 @@ public:
/*!
* \brief Set the threshold saturation below which the relative
* permeability of the non-wetting phase gets regularized.
* permeability of the nonwetting phase gets regularized.
*/
void setKrnLowSw(Scalar krnLowSw)
{
......@@ -127,7 +127,7 @@ public:
/*!
* \brief Threshold saturation below which the relative
* permeability of the non-wetting phase gets regularized.
* permeability of the nonwetting phase gets regularized.
*/
Scalar krnLowSw() const
{
......
......@@ -67,7 +67,7 @@ public:
*
* This formulation is semi-empirical and fitted to quartz sand.
* This gives an interpolation of the effective thermal conductivities of a porous medium
* filled with the non-wetting phase and a porous medium filled with the wetting phase.
* filled with the nonwetting phase and a porous medium filled with the wetting phase.
* These two effective conductivities are computed as geometric mean of the solid and the
* fluid conductivities and interpolated with the Kersten number.<br>
* Johansen, O. 1975. Thermal conductivity of soils. Ph.D. diss. Norwegian Univ.
......@@ -97,7 +97,7 @@ private:
*
* \param Sw The saturation of the wetting phase
* \param lambdaW The thermal conductivity of the wetting phase in \f$\mathrm{[W/(m K)]}\f$
* \param lambdaN The thermal conductivity of the non-wetting phase in \f$\mathrm{[W/(m K)]}\f$
* \param lambdaN The thermal conductivity of the nonwetting phase in \f$\mathrm{[W/(m K)]}\f$
* \param lambdaSolid The thermal conductivity of the solid phase in \f$\mathrm{[W/(m K)]}\f$
* \param porosity The porosity
* \param rhoSolid The density of solid phase in \f$\mathrm{[kg/m^3]}\f$
......
......@@ -62,7 +62,7 @@ private:
*
* \param sw The saturation of the wetting phase
* \param lambdaW The thermal conductivity of the wetting phase in \f$\mathrm{[W/(m K)]}\f$
* \param lambdaN The thermal conductivity of the non-wetting phase in \f$\mathrm{[W/(m K)]}\f$
* \param lambdaN The thermal conductivity of the nonwetting phase in \f$\mathrm{[W/(m K)]}\f$
* \param lambdaSolid The thermal conductivity of the solid phase in \f$\mathrm{[W/(m K)]}\f$
* \param porosity The porosity
*
......
......@@ -66,7 +66,7 @@ public:
* \return effective thermal conductivity \f$\mathrm{[W/(m K)]}\f$ after Somerton (1974) \cite somerton1974 <BR>
*
* This gives an interpolation of the effective thermal conductivities of a porous medium
* filled with the non-wetting phase and a porous medium filled with the wetting phase.
* filled with the nonwetting phase and a porous medium filled with the wetting phase.
* These two effective conductivities are computed as geometric mean of the solid and the
* fluid conductivities and interpolated with the square root of the wetting saturation.
* See f.e. Ebigbo, A.: Thermal Effects of Carbon Dioxide Sequestration in the Subsurface, Diploma thesis \cite ebigbo2005 .
......
......@@ -226,7 +226,7 @@ public:
}
/*!
* \brief The relative permeability for the non-wetting phase
* \brief The relative permeability for the nonwetting phase
* of the medium implied by van Genuchten's
* parameterization.
*
......@@ -238,7 +238,7 @@ public:
*
* \note Instead of undefined behaviour if pc is not in the valid range, we return a valid number,
* by clamping the input.
* \note See e.g. Dury, Fischer, Schulin (1999) for application of Mualem model to non-wetting rel. perm.
* \note See e.g. Dury, Fischer, Schulin (1999) for application of Mualem model to nonwetting rel. perm.
*/
static Scalar krn(const Params &params, Scalar swe)
{
......@@ -252,7 +252,7 @@ public:
/*!
* \brief The derivative of the relative permeability for the
* non-wetting phase in regard to the wetting saturation of
* nonwetting phase in regard to the wetting saturation of
* the medium as implied by the van Genuchten
* parameterization.
*
......
......@@ -91,7 +91,7 @@ public:
}
/*!
* \brief The capillary pressure-saturation curve the non-wetting and wetting phase
* \brief The capillary pressure-saturation curve the nonwetting and wetting phase
* \param params Array of parameters
* \param sw wetting phase saturation or sum of wetting phase saturations
*/
......@@ -101,7 +101,7 @@ public:
}
/*!
* \brief The capillary pressure-saturation curve for the gas and non-wetting phase
* \brief The capillary pressure-saturation curve for the gas and nonwetting phase
* \param params Array of parameters
* \param st sum of wetting (liquid) phase saturations
*/
......@@ -113,7 +113,7 @@ public:
/*!
* \brief This function ensures a continuous transition from 2 to 3 phases and vice versa
* \param params Array of parameters
* \param sn Non-wetting liquid saturation
* \param sn Nonwetting liquid saturation
*/
static Scalar pcAlpha(const Params &params, const Scalar sn)
{
......@@ -183,7 +183,7 @@ public:
*
* \param sw Absolute saturation of the wetting phase \f$\mathrm{[\overline{S}_w]}\f$. It is converted to effective saturation
* and then handed over to the material law actually used for calculation.
* \param sn Absolute saturation of the non-wetting phase \f$\mathrm{[{S}_n]}\f$. It is converted to effective saturation
* \param sn Absolute saturation of the nonwetting phase \f$\mathrm{[{S}_n]}\f$. It is converted to effective saturation
* and then handed over to the material law actually used for calculation.
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
......@@ -198,16 +198,16 @@ public:
}
/*!
* \brief The relative permeability for the non-wetting phase.
* \brief The relative permeability for the nonwetting phase.
*
* \param sw Absolute saturation of the wetting phase \f$\mathrm{[{S}_w]}\f$. It is converted to effective saturation
* and then handed over to the material law actually used for calculation.
* \param sn Absolute saturation of the non-wetting phase \f$\mathrm{[{S}_n]}\f$. It is converted to effective saturation
* \param sn Absolute saturation of the nonwetting phase \f$\mathrm{[{S}_n]}\f$. It is converted to effective saturation
* and then handed over to the material law actually used for calculation.
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Relative permeability of the non-wetting phase calculated as implied by
* \return Relative permeability of the nonwetting phase calculated as implied by
* EffLaw e.g. Brooks & Corey, van Genuchten, linear... .
*/
static Scalar krn(const Params &params, const Scalar sw, const Scalar sn)
......@@ -221,12 +221,12 @@ public:
*
* \param sw Absolute saturation of the wetting phase \f$\mathrm{[{S}_w]}\f$. It is converted to effective saturation
* and then handed over to the material law actually used for calculation.
* \param sn Absolute saturation of the non-wetting phase \f$\mathrm{[{S}_n]}\f$. It is converted to effective saturation
* \param sn Absolute saturation of the nonwetting phase \f$\mathrm{[{S}_n]}\f$. It is converted to effective saturation
* and then handed over to the material law actually used for calculation.
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Relative permeability of the non-wetting phase calculated as implied by
* \return Relative permeability of the nonwetting phase calculated as implied by
* EffLaw e.g. Brooks & Corey, van Genuchten, linear... .
*/
static Scalar krg(const Params &params, const Scalar sw, const Scalar sn)
......@@ -239,7 +239,7 @@ public:
* \brief The relative permeability for a phase.
* \param sw Wetting liquid saturation
* \param sg Gas saturation
* \param sn Non-wetting liquid saturation
* \param sn Nonwetting liquid saturation
* \param params Array of parameters.
* \param phaseIdx indicator, The saturation of all phases.
*/
......@@ -273,13 +273,13 @@ public:
}
/*!
* \brief Convert an absolute non-wetting saturation to an effective one.
* \brief Convert an absolute nonwetting saturation to an effective one.
*
* \param sn Absolute saturation of the non-wetting phase \f$\mathrm{[{S}_n]}\f$.
* \param sn Absolute saturation of the nonwetting phase \f$\mathrm{[{S}_n]}\f$.
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Effective saturation of the non-wetting phase.
* \return Effective saturation of the nonwetting phase.
*/
static Scalar snToSne(const Params &params, const Scalar sn)
{
......@@ -293,7 +293,7 @@ public:
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Effective saturation of the non-wetting phase.
* \return Effective saturation of the nonwetting phase.
*/
static Scalar stToSte(const Params &params, const Scalar st)
{
......@@ -307,7 +307,7 @@ public:
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Effective saturation of the non-wetting phase.
* \return Effective saturation of the nonwetting phase.
*/
static Scalar sgToSge(const Params &params, Scalar sg)
{
......@@ -318,11 +318,11 @@ public:
/*!
* \brief Convert an effective wetting saturation to an absolute one.
*
* \param swe Effective saturation of the non-wetting phase \f$\mathrm{[\overline{S}_n]}\f$.
* \param swe Effective saturation of the nonwetting phase \f$\mathrm{[\overline{S}_n]}\f$.
* \param params A container object that is populated with the appropriate coefficients for the respective law.
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen,
* and then the params container is constructed accordingly. Afterwards the values are set there, too.
* \return Absolute saturation of the non-wetting phase.
* \return Absolute saturation of the nonwetting phase.
*/
static Scalar sweToSw_(const Params &params, Scalar swe)
{
......
......@@ -58,13 +58,13 @@ public:
{ EffLawParams::setSwr(v); }
/*!
* \brief Return the residual non-wetting saturation.
* \brief Return the residual nonwetting saturation.
*/
Scalar snr() const
{ return EffLawParams::snr(); }
/*!
* \brief Set the residual non-wetting saturation.
* \brief Set the residual nonwetting saturation.
*/
void setSnr(Scalar v)
{ EffLawParams::setSnr(v); }
......
......@@ -80,9 +80,9 @@ public:
}
/*!
* \brief The capillary pressure-saturation curve for the gas and non-wetting phase
* \brief The capillary pressure-saturation curve for the gas and nonwetting phase
* \param params Array of parameters
* \param ste Effective total liquid (wetting + non-wetting) saturation
* \param ste Effective total liquid (wetting + nonwetting) saturation
*/
static Scalar pcgn(const Params &params, const Scalar ste)
{
......@@ -93,7 +93,7 @@ public:
/*!
* \brief This function ensures a continuous transition from 2 to 3 phases and vice versa
* \param params Array of parameters
* \param sne Non-wetting liquid saturation
* \param sne Nonwetting liquid saturation
*/
static Scalar pcAlpha(const Params &params, Scalar sne)
{
......@@ -211,7 +211,7 @@ public:
}
/*!
* \brief The relative permeability for the non-wetting phase
* \brief The relative permeability for the nonwetting phase
* after the Model of Parker et al. (1987).
*
* See model 7 in "Comparison of the Three-Phase Oil Relative Permeability Models"
......@@ -224,8 +224,8 @@ public:
*
* \param params Array of parameters.
* \param swe Effective wetting phase saturation
* \param sn Absolute non-wetting liquid saturation
* \param ste Effective total liquid (wetting + non-wetting) saturation
* \param sn Absolute nonwetting liquid saturation
* \param ste Effective total liquid (wetting + nonwetting) saturation
*/
static Scalar krn(const Params &params, const Scalar swe, const Scalar sn, const Scalar ste)
{
......@@ -250,7 +250,7 @@ public:
}
/*!
* \brief The relative permeability for the non-wetting phase
* \brief The relative permeability for the nonwetting phase
* of the medium implied by van Genuchten's
* parameterization.
*
......@@ -259,7 +259,7 @@ public:
* MOJDEH DELSHAD and GARY A. POPE, Transport in Porous Media 4 (1989), 59-83.) \cite delshad1989 <BR>
*
* \param params Array of parameters.
* \param ste Effective total liquid (wetting + non-wetting) saturation
* \param ste Effective total liquid (wetting + nonwetting) saturation
*/
static Scalar krg(const Params &params, const Scalar ste)
{
......@@ -297,8 +297,8 @@ public:
* \param params Array of parameters.
* \param phaseIdx Indicator, The saturation of all phases.
* \param swe Effective wetting phase saturation
* \param sn Absolute non-wetting liquid saturation
* \param ste Effective total liquid (wetting + non-wetting) saturation
* \param sn Absolute nonwetting liquid saturation
* \param ste Effective total liquid (wetting + nonwetting) saturation
*/
static Scalar kr(const Params &params, const int phaseIdx, const Scalar swe, const Scalar sn, const Scalar ste)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment