Commit 60442af3 authored by Tianyuan Zheng's avatar Tianyuan Zheng
Browse files

[namingConventions] changed "vars" into "fluxVars" and "fvElemGeom" into

"fvGeometry"

reviewed fetzer


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11268 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent e4646e64
......@@ -146,15 +146,15 @@ namespace Dumux
void computeFlux(PrimaryVariables &flux, int faceIdx, const bool onBoundary=false) const
{
flux = 0;
FluxVariables vars(this->problem_(),
FluxVariables fluxVars(this->problem_(),
this->element_(),
this->fvGeometry_(),
faceIdx,
this->curVolVars_());
this->computeAdvectiveFlux(flux, vars);
this->computeDiffusiveFlux(flux, vars);
this->computeStresses(flux,vars,faceIdx);
this->computeAdvectiveFlux(flux, fluxVars);
this->computeDiffusiveFlux(flux, fluxVars);
this->computeStresses(flux, fluxVars, faceIdx);
}
/*!
......@@ -312,11 +312,11 @@ namespace Dumux
* \brief Evaluates the total stress induced by effective stresses and fluid
* pressure in the solid fluid mixture.
* \param stress The stress over the sub-control-volume face for each component
* \param vars The variables at the current sub-control-volume face
* \param fluxVars The variables at the current sub-control-volume face
* \param faceIdx The index of the current sub-control-volume face
*/
void computeStresses(PrimaryVariables &stress,
const FluxVariables &vars, const int faceIdx) const
const FluxVariables &fluxVars, const int faceIdx) const
{
DimMatrix pressure(0.0), sigma(0.0);
// the normal vector corresponding to the current sub-control-volume face
......@@ -326,9 +326,9 @@ namespace Dumux
for (int i = 0; i < dim; ++i)
pressure[i][i] += 1.0;
pressure *= vars.pressure();
pressure *= fluxVars.pressure();
// effective stresses
sigma = vars.sigma();
sigma = fluxVars.sigma();
// calculate total stresses by subtracting the pressure
sigma -= pressure;
......
......@@ -308,14 +308,14 @@ public:
for (int faceIdx = 0; faceIdx < fvGeometry.numScvf; faceIdx++) {
//prepare the flux calculations (set up and prepare geometry, FE gradients)
FluxVariables vars(this->problem_(),
FluxVariables fluxVars(this->problem_(),
*elemIt, fvGeometry,
faceIdx,
elemVolVars);
// divide by number of scv-faces and sum up edge values
tmpEffPoro = vars.effPorosity() / fvGeometry.numScvf;
tmpEffStress = vars.sigma();
tmpEffPoro = fluxVars.effPorosity() / fvGeometry.numScvf;
tmpEffStress = fluxVars.sigma();
tmpEffStress /= fvGeometry.numScvf;
effPorosity[elemIdx] += tmpEffPoro;
......
......@@ -166,13 +166,13 @@ public:
{
stress = 0.0;
//prepare the flux calculations (set up and prepare geometry, FE gradients)
FluxVariables vars(this->problem_(),
FluxVariables fluxVars(this->problem_(),
*elemIt,
fvGeometry,
faceIdx,
elemVolVars);
stress = vars.sigma();
stress = fluxVars.sigma();
stress /= fvGeometry.numScvf;
// Add up stresses for each cell.
......
......@@ -208,8 +208,8 @@ class El1P2CProblem: public ImplicitPorousMediaProblem<TypeTag>
*/
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvElemGeom,
const Intersection &is,
const FVElementGeometry &fvGeometry,
const Intersection &intersection,
int scvIdx,
int boundaryFaceIdx) const
{
......@@ -232,7 +232,7 @@ class El1P2CProblem: public ImplicitPorousMediaProblem<TypeTag>
*/
void source(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvElemGeom,
const FVElementGeometry &fvGeometry,
int scvIdx) const
{
const GlobalPosition &globalPos
......@@ -256,7 +256,7 @@ class El1P2CProblem: public ImplicitPorousMediaProblem<TypeTag>
*/
void initial(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvElemGeom,
const FVElementGeometry &fvGeometry,
int scvIdx) const
{
values = 0.0;
......
......@@ -201,18 +201,18 @@ public:
*/
void neumann(PrimaryVariables &values,
const Element &element,
const FVElementGeometry &fvElemGeom,
const Intersection &is,
const FVElementGeometry &fvGeometry,
const Intersection &intersection,
int scvIdx,
int boundaryFaceIdx) const
{
values = 0.0;
// get Lame parameters
Scalar lambda = this->spatialParams().lameParams(element, fvElemGeom, scvIdx)[0];
Scalar mu = this->spatialParams().lameParams(element, fvElemGeom, scvIdx)[1];
Scalar E = this->spatialParams().E(element, fvElemGeom, scvIdx);
Scalar nu = this->spatialParams().nu(element, fvElemGeom, scvIdx);
Scalar lambda = this->spatialParams().lameParams(element, fvGeometry, scvIdx)[0];
Scalar mu = this->spatialParams().lameParams(element, fvGeometry, scvIdx)[1];
Scalar E = this->spatialParams().E(element, fvGeometry, scvIdx);
Scalar nu = this->spatialParams().nu(element, fvGeometry, scvIdx);
// calculate values of sigma in normal direction
Dune::FieldMatrix<Scalar, dim, dim> sigma(0);
......
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