Commit c8b13c30 authored by Thomas Fetzer's avatar Thomas Fetzer
Browse files

[comments]

adapted templates in diffusivityconstanttau.hh, which wasn't used
anyway.
added rhoSolid to the thermalconductivitylaws.
updated some comments and GNU licence.



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14430 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 8f7db460
// -*- 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 2 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 <http://www.gnu.org/licenses/>. *
*****************************************************************************/
/*!
* \file
* \brief Plot variables over a line specified by two arguments.
* These output files are meant for visualization with another program (matlab, gnuplot...)
* These output files are meant for visualization with another
* program (matlab, gnuplot...)
*
*/
#ifndef DUMUX_PLOTOVERLINE_2D_HH
......
......@@ -62,16 +62,14 @@ public:
*/
Scalar thresholdSw() const
{
// Some problems are very sensitive to this value
// (e.g. makeing it smaller might result in negative
// pressures), if you change it here, you will almost
// certainly break someone's code!
// Most problems are very sensitive to this value
// (e.g. making it smaller might result in negative
// pressures)
//
// If you want to use a different regularization threshold,
// overload this class and supply the new class as second
// template parameter for the RegularizedVanGenuchten law!
return /* PLEASE DO _NOT_ */ 1e-2; /* CHANGE THIS VALUE. READ
* COMMENT ABOVE! */
return 1e-2;
}
};
......
......@@ -62,16 +62,14 @@ public:
*/
Scalar pcLowSw() const
{
// Some problems are very sensitive to this value
// Most problems are very sensitive to this value
// (e.g. making it smaller might result in negative
// pressures), if you change it here, you will almost
// certainly break someone's code!
// pressures)
//
// If you want to use a different regularization threshold,
// overload this class and supply the new class as second
// template parameter for the RegularizedVanGenuchten law!
return /* PLEASE DO _NOT_ */ 1e-2; /* CHANGE THIS VALUE. READ
* COMMENT ABOVE! */
return 1e-2;
}
/*!
......@@ -83,16 +81,14 @@ public:
*/
Scalar pcHighSw() const
{
// Some problems are very sensitive to this value
// Most problems are very sensitive to this value
// (e.g. making it smaller might result in negative
// pressures), if you change it here, you will almost
// certainly break someone's code!
// pressures)
//
// If you want to use a different regularization threshold,
// overload this class and supply the new class as second
// template parameter for the RegularizedVanGenuchten law!
return /* PLEASE DO _NOT_ */ 99e-2; /* CHANGE THIS VALUE. READ
* COMMENT ABOVE! */
return 99e-2;
}
/*!
......
......@@ -85,7 +85,8 @@ public:
const Scalar lambdaW,
const Scalar lambdaN,
const Scalar lambdaSolid,
const Scalar porosity)
const Scalar porosity,
const Scalar rhoSolid = 0.0 /*unused*/)
{
assert(numEnergyEquations != 3) ;
......
......@@ -29,7 +29,7 @@
namespace Dumux
{
struct SimpleTwoPIndices
struct SomertonIndices
{
static const int wPhaseIdx = 0;
static const int nPhaseIdx = 1;
......@@ -62,7 +62,7 @@ struct SimpleTwoPIndices
\f]
*
*/
template<class Scalar, class Indices = SimpleTwoPIndices>
template<class Scalar, class Indices = SomertonIndices>
class ThermalConductivitySomerton
{
public:
......@@ -114,7 +114,8 @@ public:
const Scalar lambdaW,
const Scalar lambdaN,
const Scalar lambdaSolid,
const Scalar porosity)
const Scalar porosity,
const Scalar rhoSolid = 0.0 /*unused*/)
{
const Scalar satW = std::max<Scalar>(0.0, sw);
// geometric mean
......
......@@ -25,7 +25,7 @@
#define DIFFUSIVITY_CONSTANT_TAU_HH
#include <dumux/common/parameters.hh>
#include <algorithm>
#include <dumux/common/basicproperties.hh>
namespace Dumux
{
......@@ -34,29 +34,24 @@ namespace Dumux
*
* \brief Relation for the saturation-dependent effective diffusion coefficient
*
*
* The material law is:
* \f[
\lambda_\text{eff} = \phi * S_w * \tau * D
\f]
*
* with
* \f[
\tau = \frac{1}{\phi^2} * \left(\phi S_w\right)^{7/3}
\f]
* D_\text{eff,pm} = \phi * S_w * \tau * D
* \f]
*
* with a constant tau.
*/
template<class TypeTag, class Scalar>
template<class Scalar>
class DiffusivityConstantTau
{
public:
/*!
* \brief Returns the effective diffusion coefficient \f$[m/s]\f$ based on a constant tortuosity value
* \brief Returns the effective diffusion coefficient \f$[m^2/s]\f$ based
* on a constant tortuosity value
*
* \param porosity The porosity
* \param saturation The saturation of the phase
* \param diffCoeff The diffusion coefficient of the phase
*
*/
static Scalar effectiveDiffusivity(const Scalar porosity,
const Scalar saturation,
......
......@@ -36,13 +36,13 @@ namespace Dumux
*
* The material law is:
* \f[
\lambda_\text{eff} = \phi * S_w * \tau * D
\f]
* D_\text{eff,pm} = \phi * S_w * \tau * D
* \f]
*
* with
* \f[
\tau = \frac{1}{\phi^2} * \left(\phi S_w\right)^{7/3}
\f]
* \tau = \frac{1}{\phi^2} * \left(\phi S_w\right)^{7/3}
* \f]
*
*/
template<class Scalar>
......@@ -50,12 +50,11 @@ class DiffusivityMillingtonQuirk
{
public:
/*!
* \brief Returns the effective diffusion coefficient \f$[m/s]\f$ after Millington Quirk.
* \brief Returns the effective diffusion coefficient \f$[m^2/s]\f$ after Millington Quirk.
*
* \param porosity The porosity
* \param saturation The saturation of the phase
* \param diffCoeff The diffusion coefficient of the phase
*
*/
static Scalar effectiveDiffusivity(const Scalar porosity,
const Scalar saturation,
......
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