Commit ee65a9c0 authored by Kilian Weishaupt's avatar Kilian Weishaupt
Browse files

Merge branch 'cleanup/nonwetting' into 'master'

[cleanup] Consistent spelling as nonwetting/Nonwetting

See merge request !137
parents b7627d45 93f053c0
......@@ -186,7 +186,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.
*
......@@ -220,7 +220,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.
*
......
......@@ -242,7 +242,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 Acosta
* parameterization.
*
......@@ -266,7 +266,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 Acosta
* parameterization.
*
......
......@@ -182,7 +182,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"
......@@ -230,7 +230,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.
*
......
......@@ -181,7 +181,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"
......@@ -229,7 +229,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.
*
......
......@@ -218,7 +218,7 @@ public:
}
/*!
* \brief Return the residual non-wetting saturation.
* \brief Return the residual nonwetting saturation.
*/
Scalar snr() const
{
......@@ -232,7 +232,7 @@ public:
}
/*!
* \brief Set the residual non-wetting saturation.
* \brief Set the residual nonwetting saturation.
*/
void setSnr(Scalar input)
{
......
......@@ -214,7 +214,7 @@ public:
}
/*!
* \brief Return the residual non-wetting saturation.
* \brief Return the residual nonwetting saturation.
*/
Scalar snr() const
{
......@@ -228,7 +228,7 @@ public:
}
/*!
* \brief Set the residual non-wetting saturation.
* \brief Set the residual nonwetting saturation.
*/
void setSnr(Scalar input)
{
......
......@@ -590,7 +590,7 @@ public:
}
/*!
* \brief Return the residual non-wetting saturation.
* \brief Return the residual nonwetting saturation.
*/
Scalar snr() const
{
......@@ -604,7 +604,7 @@ public:
}
/*!
* \brief Set the residual non-wetting saturation.
* \brief Set the residual nonwetting saturation.
*/
void setSnr(Scalar input)
{
......
......@@ -165,14 +165,14 @@ on the shape of the front and the mathematical type of the problem
%capillary pressure - saturation relationship [Pa]
%
%ResidualSaturationWetting = 0. # residual saturation of the wetting phase [-]
%ResidualSaturationNonWetting = 0. # residual saturation of the non-wetting phase [-]
%ResidualSaturationNonwetting = 0. # residual saturation of the nonwetting phase [-]
%
%[Fluid]
%
%densityW = 1e3 # density of the wetting phase [kg/m^3]
%densityNW = 1e3 # density of the non-wetting phase [kg/m^3]
%densityNW = 1e3 # density of the nonwetting phase [kg/m^3]
%viscosityW = 1e-3 # dynamic viscosity of the wetting phase [kg/(ms)]
%viscosityNW = 1e-3 # dynamic viscosity of the non-wetting phase [kg/(ms)]
%viscosityNW = 1e-3 # dynamic viscosity of the nonwetting phase [kg/(ms)]
%
%[Grid]
%numberOfCellsX= 10 # grid resolution in x direction, max 200
......
......@@ -51,11 +51,11 @@ void usage(const char *progName, const std::string &errorMsg)
"\t-SpatialParams.BrooksCoreyEntryPressure The entry pressure for the \n"
"\t \t Brooks-Corey capillary pressure - saturation relationship [Pa]\n"
"\t-SpatialParams.ResidualSaturationWetting The residual saturation of the wetting phase [-]\n"
"\t-SpatialParams.ResidualSaturationNonWetting The residual saturation of the non-wetting phase [-]\n"
"\t-SpatialParams.ResidualSaturationNonwetting The residual saturation of the nonwetting phase [-]\n"
"\t-Fluid.DensityW The density of the wetting phase [kg/m^3]\n"
"\t-Fluid.DensityNW The density of the non-wetting phase [kg/m^3]\n"
"\t-Fluid.DensityNW The density of the nonwetting phase [kg/m^3]\n"
"\t-Fluid.ViscosityW The dynamic viscosity of the wetting phase [kg/(ms)]\n"
"\t-Fluid.ViscosityNW The dynamic viscosity of the non-wetting phase [kg/(ms)]\n"
"\t-Fluid.ViscosityNW The dynamic viscosity of the nonwetting phase [kg/(ms)]\n"
"\t-Grid.NumberOfCellsX The grid resolution in x direction [-]\n"
"\n optional: \n"
"\t-Output.ParaviewOutput Boolean, default is not writing ViPLab but paraview output";
......
......@@ -11,13 +11,13 @@ Porosity = 0.2 # porosity of the porous medium [-]
BrooksCoreyLambda = 3.0 # pore size distribution parameter for the Brooks-Corey capillary pressure - saturation relationship [-]
BrooksCoreyEntryPressure = 8000 # entry pressure for the Brooks-Corey capillary pressure - saturation relationship [Pa]
ResidualSaturationWetting = 0.2 # residual saturation of the wetting phase [-]
ResidualSaturationNonWetting = 0.2 # residual saturation of the non-wetting phase [-]
ResidualSaturationNonwetting = 0.2 # residual saturation of the nonwetting phase [-]
[Fluid]
DensityW = 1e3 # density of the wetting phase [kg/m^3]
DensityNW = 1e3 # density of the non-wetting phase [kg/m^3]
DensityNW = 1e3 # density of the nonwetting phase [kg/m^3]
ViscosityW = 1e-3 # dynamic viscosity of the wetting phase [kg/(ms)]
ViscosityNW = 1e-3 # dynamic viscosity of the non-wetting phase [kg/(ms)]
ViscosityNW = 1e-3 # dynamic viscosity of the nonwetting phase [kg/(ms)]
[Grid]
UpperRight = 2 1 # extension of the domain (x, y) [m]
......
......@@ -80,7 +80,7 @@ public:
PseudoH2O<Scalar>::setDensity( getParam<Scalar>("Fluid.DensityNW") );
swr_ = getParam<Scalar>("SpatialParams.ResidualSaturationWetting");
snr_ = getParam<Scalar>("SpatialParams.ResidualSaturationNonWetting");
snr_ = getParam<Scalar>("SpatialParams.ResidualSaturationNonwetting");
paraviewOutput_ = getParam<bool>("Output.paraviewOutput", true);
}
......
Supports Markdown
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