Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
f94a3e16
Commit
f94a3e16
authored
Nov 03, 2015
by
Christoph Grüninger
Browse files
[whitespace] Replace tabs by spaces.
parent
04894362
Changes
68
Hide whitespace changes
Inline
Side-by-side
dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
View file @
f94a3e16
...
...
@@ -443,8 +443,8 @@ public:
(
*
mobilityNW
)[
i
]
=
cellData
.
mobility
(
nPhaseIdx
);
if
(
compressibility_
)
{
(
*
mobilityW
)[
i
]
=
(
*
mobilityW
)[
i
]
/
cellData
.
density
(
wPhaseIdx
);
(
*
mobilityNW
)[
i
]
=
(
*
mobilityNW
)[
i
]
/
cellData
.
density
(
nPhaseIdx
);
(
*
mobilityW
)[
i
]
=
(
*
mobilityW
)[
i
]
/
cellData
.
density
(
wPhaseIdx
);
(
*
mobilityNW
)[
i
]
=
(
*
mobilityNW
)[
i
]
/
cellData
.
density
(
nPhaseIdx
);
}
}
if
(
vtkOutputLevel_
>
1
)
...
...
dumux/freeflow/stokes/stokeslocalresidual.hh
View file @
f94a3e16
...
...
@@ -617,7 +617,7 @@ protected:
/*!
* \brief Interpolate the pressure at corner points of the grid, thus taking the degree of freedom there.
*
This is required due to stability reasons.
*
This is required due to stability reasons.
*/
void
interpolateCornerPoints_
(
const
BoundaryTypes
&
bcTypes
,
const
int
scvIdx
)
{
...
...
dumux/freeflow/stokesnc/stokesnclocalresidual.hh
View file @
f94a3e16
...
...
@@ -49,7 +49,7 @@ class StokesncLocalResidual : public StokesLocalResidual<TypeTag>
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
Indices
)
Indices
;
//dimensions
enum
{
dim
=
GridView
::
dimension
};
enum
{
dim
=
GridView
::
dimension
};
//number of equations
enum
{
numEq
=
GET_PROP_VALUE
(
TypeTag
,
NumEq
)
};
//number of components
...
...
@@ -63,25 +63,25 @@ class StokesncLocalResidual : public StokesLocalResidual<TypeTag>
//primary variable indices
enum
{
pressureIdx
=
Indices
::
pressureIdx
};
//phase employed
enum
{
phaseIdx
=
Indices
::
phaseIdx
};
enum
{
phaseIdx
=
Indices
::
phaseIdx
};
//component indices
enum
{
phaseCompIdx
=
Indices
::
phaseCompIdx
,
transportCompIdx
=
Indices
::
transportCompIdx
};
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
PrimaryVariables
)
PrimaryVariables
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
PrimaryVariables
)
PrimaryVariables
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
VolumeVariables
)
VolumeVariables
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
FluxVariables
)
FluxVariables
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
ElementVolumeVariables
)
ElementVolumeVariables
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
FluidSystem
)
FluidSystem
;
typedef
Dune
::
FieldVector
<
Scalar
,
dim
>
DimVector
;
typedef
Dune
::
FieldVector
<
Scalar
,
dim
>
DimVector
;
typedef
typename
GridView
::
Intersection
Intersection
;
typedef
typename
GridView
::
Intersection
Intersection
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
BoundaryTypes
)
BoundaryTypes
;
static
const
bool
calculateNavierStokes
=
GET_PROP_VALUE
(
TypeTag
,
EnableNavierStokes
);
static
const
bool
calculateNavierStokes
=
GET_PROP_VALUE
(
TypeTag
,
EnableNavierStokes
);
//! property that defines whether mole or mass fractions are used
//! property that defines whether mole or mass fractions are used
static
const
bool
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
);
public:
...
...
@@ -108,7 +108,7 @@ public:
// is required to compute the derivative of the storage term
// using the implicit Euler method.
const
ElementVolumeVariables
&
elemVolVars
=
usePrevSol
?
this
->
prevVolVars_
()
:
this
->
curVolVars_
();
this
->
prevVolVars_
()
:
this
->
curVolVars_
();
const
VolumeVariables
&
volVars
=
elemVolVars
[
scvIdx
];
if
(
useMoles
)
...
...
@@ -155,12 +155,12 @@ public:
void
computeAdvectiveFlux
(
PrimaryVariables
&
flux
,
const
FluxVariables
&
fluxVars
)
const
{
// call ParentType function
ParentType
::
computeAdvectiveFlux
(
flux
,
fluxVars
);
// call ParentType function
ParentType
::
computeAdvectiveFlux
(
flux
,
fluxVars
);
// data attached to upstream and the downstream vertices
const
VolumeVariables
&
up
=
this
->
curVolVars_
(
fluxVars
.
upstreamIdx
());
const
VolumeVariables
&
dn
=
this
->
curVolVars_
(
fluxVars
.
downstreamIdx
());
const
VolumeVariables
&
up
=
this
->
curVolVars_
(
fluxVars
.
upstreamIdx
());
const
VolumeVariables
&
dn
=
this
->
curVolVars_
(
fluxVars
.
downstreamIdx
());
Scalar
tmp
=
fluxVars
.
normalVelocity
();
...
...
dumux/freeflow/stokesnc/stokesncmodel.hh
View file @
f94a3e16
...
...
@@ -81,11 +81,11 @@ class StokesncModel : public StokesModel<TypeTag>
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
Indices
)
Indices
;
enum
{
dim
=
GridView
::
dimension
,
transportCompIdx
=
Indices
::
transportCompIdx
,
phaseIdx
=
GET_PROP_VALUE
(
TypeTag
,
PhaseIdx
),
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
),
numComponents
=
Indices
::
numComponents
};
transportCompIdx
=
Indices
::
transportCompIdx
,
phaseIdx
=
GET_PROP_VALUE
(
TypeTag
,
PhaseIdx
),
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
),
numComponents
=
Indices
::
numComponents
};
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
FVElementGeometry
)
FVElementGeometry
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
ElementBoundaryTypes
)
ElementBoundaryTypes
;
...
...
@@ -102,7 +102,7 @@ public:
MultiWriter
&
writer
)
{
typedef
Dune
::
BlockVector
<
Dune
::
FieldVector
<
Scalar
,
1
>
>
ScalarField
;
typedef
Dune
::
BlockVector
<
Dune
::
FieldVector
<
Scalar
,
1
>
>
ScalarField
;
typedef
Dune
::
BlockVector
<
Dune
::
FieldVector
<
Scalar
,
dim
>
>
VelocityField
;
const
Scalar
scale_
=
GET_PROP_VALUE
(
TypeTag
,
Scaling
);
...
...
@@ -111,17 +111,17 @@ public:
unsigned
numVertices
=
this
->
gridView_
().
size
(
dim
);
ScalarField
&
pN
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
&
delP
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
&
T
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
&
T
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
*
moleFraction
[
numComponents
];
ScalarField
*
moleFraction
[
numComponents
];
for
(
int
i
=
0
;
i
<
numComponents
;
++
i
)
moleFraction
[
i
]
=
writer
.
template
allocateManagedBuffer
<
Scalar
,
1
>(
numVertices
);
ScalarField
*
massFraction
[
numComponents
];
for
(
int
i
=
0
;
i
<
numComponents
;
++
i
)
massFraction
[
i
]
=
writer
.
template
allocateManagedBuffer
<
Scalar
,
1
>(
numVertices
);
ScalarField
*
massFraction
[
numComponents
];
for
(
int
i
=
0
;
i
<
numComponents
;
++
i
)
massFraction
[
i
]
=
writer
.
template
allocateManagedBuffer
<
Scalar
,
1
>(
numVertices
);
ScalarField
&
rho
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
&
rho
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
&
mu
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
VelocityField
&
velocity
=
*
writer
.
template
allocateManagedBuffer
<
Scalar
,
dim
>
(
numVertices
);
...
...
@@ -156,23 +156,23 @@ public:
pN
[
vIdxGlobal
]
=
volVars
.
pressure
()
*
scale_
;
delP
[
vIdxGlobal
]
=
volVars
.
pressure
()
*
scale_
-
1e5
;
for
(
int
compIdx
=
0
;
compIdx
<
numComponents
;
++
compIdx
)
for
(
int
compIdx
=
0
;
compIdx
<
numComponents
;
++
compIdx
)
{
(
*
moleFraction
[
compIdx
])[
vIdxGlobal
]
=
volVars
.
moleFraction
(
compIdx
);
(
*
massFraction
[
compIdx
])[
vIdxGlobal
]
=
volVars
.
massFraction
(
compIdx
);
(
*
massFraction
[
compIdx
])[
vIdxGlobal
]
=
volVars
.
massFraction
(
compIdx
);
Valgrind
::
CheckDefined
((
*
moleFraction
[
compIdx
])[
vIdxGlobal
]);
Valgrind
::
CheckDefined
((
*
massFraction
[
compIdx
])[
vIdxGlobal
]);
}
Valgrind
::
CheckDefined
((
*
massFraction
[
compIdx
])[
vIdxGlobal
]);
}
T
[
vIdxGlobal
]
=
volVars
.
temperature
();
T
[
vIdxGlobal
]
=
volVars
.
temperature
();
rho
[
vIdxGlobal
]
=
volVars
.
density
()
*
scale_
*
scale_
*
scale_
;
rho
[
vIdxGlobal
]
=
volVars
.
density
()
*
scale_
*
scale_
*
scale_
;
mu
[
vIdxGlobal
]
=
volVars
.
dynamicViscosity
()
*
scale_
;
velocity
[
vIdxGlobal
]
=
volVars
.
velocity
();
velocity
[
vIdxGlobal
]
*=
1
/
scale_
;
}
}
writer
.
attachVertexData
(
T
,
"temperature"
);
writer
.
attachVertexData
(
T
,
"temperature"
);
writer
.
attachVertexData
(
pN
,
"P"
);
writer
.
attachVertexData
(
delP
,
"delP"
);
...
...
dumux/freeflow/stokesnc/stokesncvolumevariables.hh
View file @
f94a3e16
...
...
@@ -57,12 +57,12 @@ class StokesncVolumeVariables : public StokesVolumeVariables<TypeTag>
enum
{
transportCompIdx
=
Indices
::
transportCompIdx
,
phaseCompIdx
=
Indices
::
phaseCompIdx
};
//number of components
enum
{
numComponents
=
Indices
::
numComponents
};
enum
{
numComponents
=
Indices
::
numComponents
};
//employed phase index
enum
{
phaseIdx
=
GET_PROP_VALUE
(
TypeTag
,
PhaseIdx
)
};
enum
{
phaseIdx
=
GET_PROP_VALUE
(
TypeTag
,
PhaseIdx
)
};
//primary variable indices
enum
{
massOrMoleFracIdx
=
Indices
::
massOrMoleFracIdx
};
//equation indices
enum
{
massOrMoleFracIdx
=
Indices
::
massOrMoleFracIdx
};
//equation indices
enum
{
conti0EqIdx
=
Indices
::
conti0EqIdx
,
massBalanceIdx
=
Indices
::
massBalanceIdx
,
transportEqIdx
=
Indices
::
transportEqIdx
};
...
...
@@ -82,17 +82,17 @@ public:
const
bool
isOldSol
)
{
// Model is restricted to 2 components when using mass fractions
if
(
!
useMoles
&&
numComponents
>
2
)
{
DUNE_THROW
(
Dune
::
NotImplemented
,
"This model is restricted to 2 components when using mass fractions!\
To use mole fractions set property UseMoles true ..."
);
}
// Model is restricted to 2 components when using mass fractions
if
(
!
useMoles
&&
numComponents
>
2
)
{
DUNE_THROW
(
Dune
::
NotImplemented
,
"This model is restricted to 2 components when using mass fractions!\
To use mole fractions set property UseMoles true ..."
);
}
// set the mole fractions first
// set the mole fractions first
completeFluidState
(
priVars
,
problem
,
element
,
fvGeometry
,
scvIdx
,
this
->
fluidState
(),
isOldSol
);
// update vertex data for the mass and momentum balance
// update vertex data for the mass and momentum balance
ParentType
::
update
(
priVars
,
problem
,
element
,
...
...
@@ -108,19 +108,19 @@ public:
for
(
int
compIdx
=
0
;
compIdx
<
numComponents
;
compIdx
++
)
{
if
(
phaseCompIdx
!=
compIdx
)
{
diffCoeff_
[
compIdx
]
=
FluidSystem
::
binaryDiffusionCoefficient
(
this
->
fluidState
(),
if
(
phaseCompIdx
!=
compIdx
)
{
diffCoeff_
[
compIdx
]
=
FluidSystem
::
binaryDiffusionCoefficient
(
this
->
fluidState
(),
paramCache
,
phaseIdx
,
compIdx
,
phaseCompIdx
);
}
else
diffCoeff_
[
compIdx
]
=
0.0
;
}
else
diffCoeff_
[
compIdx
]
=
0.0
;
Valgrind
::
CheckDefined
(
diffCoeff_
[
compIdx
]);
}
Valgrind
::
CheckDefined
(
diffCoeff_
[
compIdx
]);
}
};
/*!
...
...
@@ -163,7 +163,7 @@ public:
/*!
* \brief Returns the mass fraction of a given component in the
*
given fluid phase within the control volume.
*
given fluid phase within the control volume.
*
* \param compIdx The component index
*/
...
...
dumux/freeflow/stokesncni/stokesncnimodel.hh
View file @
f94a3e16
...
...
@@ -94,7 +94,7 @@ class StokesncniModel : public StokesncModel<TypeTag>
enum
{
transportCompIdx
=
Indices
::
transportCompIdx
};
enum
{
phaseIdx
=
GET_PROP_VALUE
(
TypeTag
,
PhaseIdx
)
};
enum
{
useMoles
=
GET_PROP_VALUE
(
TypeTag
,
UseMoles
)
};
enum
{
numComponents
=
Indices
::
numComponents
};
enum
{
numComponents
=
Indices
::
numComponents
};
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
FVElementGeometry
)
FVElementGeometry
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
ElementBoundaryTypes
)
ElementBoundaryTypes
;
...
...
@@ -118,17 +118,17 @@ public:
unsigned
numVertices
=
this
->
gridView_
().
size
(
dim
);
ScalarField
&
pn
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
&
delP
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
&
T
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
&
T
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
&
h
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
*
moleFraction
[
numComponents
];
for
(
int
i
=
0
;
i
<
numComponents
;
++
i
)
ScalarField
*
moleFraction
[
numComponents
];
for
(
int
i
=
0
;
i
<
numComponents
;
++
i
)
moleFraction
[
i
]
=
writer
.
template
allocateManagedBuffer
<
Scalar
,
1
>(
numVertices
);
ScalarField
*
massFraction
[
numComponents
];
for
(
int
i
=
0
;
i
<
numComponents
;
++
i
)
ScalarField
*
massFraction
[
numComponents
];
for
(
int
i
=
0
;
i
<
numComponents
;
++
i
)
massFraction
[
i
]
=
writer
.
template
allocateManagedBuffer
<
Scalar
,
1
>(
numVertices
);
ScalarField
&
rho
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
&
rho
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
ScalarField
&
mu
=
*
writer
.
allocateManagedBuffer
(
numVertices
);
VelocityField
&
velocity
=
*
writer
.
template
allocateManagedBuffer
<
Scalar
,
dim
>
(
numVertices
);
...
...
@@ -163,24 +163,24 @@ public:
pn
[
vIdxGlobal
]
=
volVars
.
pressure
()
*
scale_
;
delP
[
vIdxGlobal
]
=
volVars
.
pressure
()
*
scale_
-
1e5
;
for
(
int
compIdx
=
0
;
compIdx
<
numComponents
;
++
compIdx
)
{
(
*
moleFraction
[
compIdx
])[
vIdxGlobal
]
=
volVars
.
moleFraction
(
compIdx
);
(
*
massFraction
[
compIdx
])[
vIdxGlobal
]
=
volVars
.
massFraction
(
compIdx
);
Valgrind
::
CheckDefined
((
*
moleFraction
[
compIdx
])[
vIdxGlobal
]);
Valgrind
::
CheckDefined
((
*
massFraction
[
compIdx
])[
vIdxGlobal
]);
}
for
(
int
compIdx
=
0
;
compIdx
<
numComponents
;
++
compIdx
)
{
(
*
moleFraction
[
compIdx
])[
vIdxGlobal
]
=
volVars
.
moleFraction
(
compIdx
);
(
*
massFraction
[
compIdx
])[
vIdxGlobal
]
=
volVars
.
massFraction
(
compIdx
);
Valgrind
::
CheckDefined
((
*
moleFraction
[
compIdx
])[
vIdxGlobal
]);
Valgrind
::
CheckDefined
((
*
massFraction
[
compIdx
])[
vIdxGlobal
]);
}
T
[
vIdxGlobal
]
=
volVars
.
temperature
();
T
[
vIdxGlobal
]
=
volVars
.
temperature
();
rho
[
vIdxGlobal
]
=
volVars
.
density
()
*
scale_
*
scale_
*
scale_
;
rho
[
vIdxGlobal
]
=
volVars
.
density
()
*
scale_
*
scale_
*
scale_
;
mu
[
vIdxGlobal
]
=
volVars
.
dynamicViscosity
()
*
scale_
;
h
[
vIdxGlobal
]
=
volVars
.
enthalpy
();
velocity
[
vIdxGlobal
]
=
volVars
.
velocity
();
velocity
[
vIdxGlobal
]
*=
1
/
scale_
;
}
}
writer
.
attachVertexData
(
T
,
"temperature"
);
writer
.
attachVertexData
(
T
,
"temperature"
);
writer
.
attachVertexData
(
pn
,
"pg"
);
writer
.
attachVertexData
(
delP
,
"delP"
);
...
...
dumux/implicit/2p/2pgridadaptindicator.hh
View file @
f94a3e16
...
...
@@ -47,8 +47,8 @@ private:
enum
{
saturationIdx
=
Indices
::
saturationIdx
,
pressureIdx
=
Indices
::
pressureIdx
saturationIdx
=
Indices
::
saturationIdx
,
pressureIdx
=
Indices
::
pressureIdx
};
enum
{
...
...
@@ -96,17 +96,17 @@ public:
// index of the current leaf-elements
int
globalIdxI
=
problem_
.
elementMapper
().
index
(
element
);
Scalar
satI
=
0.0
;
Scalar
satI
=
0.0
;
if
(
!
isBox
)
satI
=
problem_
.
model
().
curSol
()[
globalIdxI
][
saturationIdx
];
else
{
if
(
!
isBox
)
satI
=
problem_
.
model
().
curSol
()[
globalIdxI
][
saturationIdx
];
else
{
const
LocalFiniteElementCache
feCache
;
const
auto
geometryI
=
element
.
geometry
();
Dune
::
GeometryType
geomType
=
geometryI
.
type
();
Dune
::
GeometryType
geomType
=
geometryI
.
type
();
GlobalPosition
centerI
=
geometryI
.
local
(
geometryI
.
center
());
GlobalPosition
centerI
=
geometryI
.
local
(
geometryI
.
center
());
const
LocalFiniteElement
&
localFiniteElement
=
feCache
.
get
(
geomType
);
std
::
vector
<
Dune
::
FieldVector
<
Scalar
,
1
>
>
shapeVal
;
localFiniteElement
.
localBasis
().
evaluateFunction
(
centerI
,
shapeVal
);
...
...
@@ -116,7 +116,7 @@ public:
int
dofIdxGlobal
=
problem_
.
model
().
dofMapper
().
subIndex
(
element
,
i
,
dofCodim
);
satI
+=
shapeVal
[
i
]
*
problem_
.
model
().
curSol
()[
dofIdxGlobal
][
saturationIdx
];
}
}
}
globalMin
=
std
::
min
(
satI
,
globalMin
);
globalMax
=
std
::
max
(
satI
,
globalMax
);
...
...
@@ -134,17 +134,17 @@ public:
// Visit intersection only once
if
(
element
.
level
()
>
outside
.
level
()
||
(
element
.
level
()
==
outside
.
level
()
&&
globalIdxI
<
globalIdxJ
))
{
Scalar
satJ
=
0.0
;
Scalar
satJ
=
0.0
;
if
(
!
isBox
)
satJ
=
problem_
.
model
().
curSol
()[
globalIdxJ
][
saturationIdx
];
else
{
if
(
!
isBox
)
satJ
=
problem_
.
model
().
curSol
()[
globalIdxJ
][
saturationIdx
];
else
{
const
LocalFiniteElementCache
feCache
;
const
auto
geometryJ
=
outside
.
geometry
();
Dune
::
GeometryType
geomType
=
geometryJ
.
type
();
Dune
::
GeometryType
geomType
=
geometryJ
.
type
();
GlobalPosition
centerJ
=
geometryJ
.
local
(
geometryJ
.
center
());
GlobalPosition
centerJ
=
geometryJ
.
local
(
geometryJ
.
center
());
const
LocalFiniteElement
&
localFiniteElement
=
feCache
.
get
(
geomType
);
std
::
vector
<
Dune
::
FieldVector
<
Scalar
,
1
>
>
shapeVal
;
localFiniteElement
.
localBasis
().
evaluateFunction
(
centerJ
,
shapeVal
);
...
...
@@ -155,7 +155,7 @@ public:
satJ
+=
shapeVal
[
i
]
*
problem_
.
model
().
curSol
()[
dofIdxGlobal
][
saturationIdx
];
}
}
}
...
...
dumux/implicit/2pminc/2pmincmodel.hh
View file @
f94a3e16
...
...
@@ -253,7 +253,7 @@ public:
interfaceArea_
[
nC
]
=
0.0
;
// transmissibility_[nC] = 0.0;
distNestedContinua_
[
nC
]
=
0.0
;
//
volumetricFraction_[nC] =0.0;
//
volumetricFraction_[nC] =0.0;
}
/*
...
...
dumux/implicit/2pminc/2pmincvolumevariables.hh
View file @
f94a3e16
...
...
@@ -97,7 +97,7 @@ public:
const
MaterialLawParams
&
materialParamsMatrix
=
problem
.
spatialParams
().
materialLawParamsMatrix
(
element
,
fvGeometry
,
scvIdx
);
// relative permeabilities krw/krn for fractures (idx 0) and matrix elements (>= idx 1)
// relative permeabilities krw/krn for fractures (idx 0) and matrix elements (>= idx 1)
for
(
int
cIdx
=
0
;
cIdx
<
numContinua
;
++
cIdx
)
{
Scalar
krw
;
...
...
dumux/implicit/2pnc/2pncfluxvariables.hh
View file @
f94a3e16
...
...
@@ -46,7 +46,7 @@ namespace Dumux
template
<
class
TypeTag
>
class
TwoPNCFluxVariables
:
public
GET_PROP_TYPE
(
TypeTag
,
BaseFluxVariables
)
{
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
BaseFluxVariables
)
BaseFluxVariables
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
BaseFluxVariables
)
BaseFluxVariables
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
Scalar
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
GridView
)
GridView
;
...
...
@@ -105,8 +105,8 @@ public:
potentialGrad_
[
phaseIdx
]
=
Scalar
(
0
);
for
(
int
compIdx
=
0
;
compIdx
<
numComponents
;
++
compIdx
)
{
massFractionGrad_
[
phaseIdx
][
compIdx
]
=
Scalar
(
0
);
moleFractionGrad_
[
phaseIdx
][
compIdx
]
=
Scalar
(
0
);
massFractionGrad_
[
phaseIdx
][
compIdx
]
=
Scalar
(
0
);
moleFractionGrad_
[
phaseIdx
][
compIdx
]
=
Scalar
(
0
);
}
}
calculateGradients_
(
problem
,
element
,
elemVolVars
);
...
...
@@ -269,7 +269,7 @@ protected:
Scalar
tauI
=
1.0
/
(
volVarsI
.
porosity
()
*
volVarsI
.
porosity
())
*
pow
(
volVarsI
.
porosity
()
*
volVarsI
.
saturation
(
phaseIdx
),
7.0
/
3
);
Scalar
tauJ
=
1.0
/
(
volVarsJ
.
porosity
()
*
volVarsJ
.
porosity
())
*
Scalar
tauJ
=
1.0
/
(
volVarsJ
.
porosity
()
*
volVarsJ
.
porosity
())
*
pow
(
volVarsJ
.
porosity
()
*
volVarsJ
.
saturation
(
phaseIdx
),
7.0
/
3
);
// Diffusion coefficient in the porous medium
...
...
dumux/implicit/2pnc/2pncindices.hh
View file @
f94a3e16
...
...
@@ -53,10 +53,10 @@ struct TwoPNCFormulation//TODO: This might need to be change similar to 2p2c ind
template
<
class
TypeTag
,
int
PVOffset
=
0
>
class
TwoPNCIndices
{
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
FluidSystem
)
FluidSystem
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
FluidSystem
)
FluidSystem
;
public:
// Phase indices
// Phase indices
static
const
int
wPhaseIdx
=
FluidSystem
::
wPhaseIdx
;
//!< Index of the wetting phase
static
const
int
nPhaseIdx
=
FluidSystem
::
nPhaseIdx
;
//!< Index of the non-wetting phase
// present phases (-> 'pseudo' primary variable)
...
...
dumux/implicit/2pnc/2pncvolumevariables.hh
View file @
f94a3e16
...
...
@@ -264,7 +264,7 @@ public:
Miscible2pNCComposition
::
solve
(
fluidState
,
paramCache
,
wPhaseIdx
,
//known phaseIdx
wPhaseIdx
,
//known phaseIdx
/*setViscosity=*/
true
,
/*setInternalEnergy=*/
false
);
}
...
...
dumux/implicit/2pncmin/2pncminfluxvariables.hh
View file @
f94a3e16
...
...
@@ -108,8 +108,8 @@ public:
this
->
potentialGrad_
[
phaseIdx
]
=
Scalar
(
0
);
for
(
int
compIdx
=
0
;
compIdx
<
numComponents
;
++
compIdx
)
{
this
->
massFractionGrad_
[
phaseIdx
][
compIdx
]
=
Scalar
(
0
);
this
->
moleFractionGrad_
[
phaseIdx
][
compIdx
]
=
Scalar
(
0
);
this
->
massFractionGrad_
[
phaseIdx
][
compIdx
]
=
Scalar
(
0
);
this
->
moleFractionGrad_
[
phaseIdx
][
compIdx
]
=
Scalar
(
0
);
}
}
this
->
calculateGradients_
(
problem
,
element
,
elemVolVars
);
...
...
dumux/implicit/2pncmin/2pncminindices.hh
View file @
f94a3e16
...
...
@@ -37,7 +37,7 @@ namespace Dumux
* \tparam PVOffset The first index in a primary variable vector.
*/
template
<
class
TypeTag
,
int
PVOffset
=
0
>
class
TwoPNCMinIndices
:
public
TwoPNCIndices
<
TypeTag
,
PVOffset
>
class
TwoPNCMinIndices
:
public
TwoPNCIndices
<
TypeTag
,
PVOffset
>
{
};
...
...
dumux/implicit/2pncmin/2pncminlocalresidual.hh
View file @
f94a3e16
...
...
@@ -43,9 +43,9 @@ template<class TypeTag>
class
TwoPNCMinLocalResidual
:
public
TwoPNCLocalResidual
<
TypeTag
>
{
protected:
typedef
TwoPNCLocalResidual
<
TypeTag
>
ParentType
;
typedef
TwoPNCLocalResidual
<
TypeTag
>
ParentType
;
typedef
TwoPNCMinLocalResidual
<
TypeTag
>
ThisType
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
)
Problem
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
Problem
)
Problem
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
Scalar
)
Scalar
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
FluidSystem
)
FluidSystem
;
typedef
typename
GET_PROP_TYPE
(
TypeTag
,
SolutionVector
)
SolutionVector
;
...
...
dumux/implicit/2pncmin/2pncminvolumevariables.hh
View file @
f94a3e16
...
...
@@ -162,7 +162,7 @@ public:
salinity_
=
0.0
;
moleFractionSalinity_
=
0.0
;
for
(
int
compIdx
=
numMajorComponents
;
compIdx
<
numComponents
;
compIdx
++
)
//sum of the mass fraction of the components
for
(
int
compIdx
=
numMajorComponents
;
compIdx
<
numComponents
;
compIdx
++
)
//sum of the mass fraction of the components
{
if
(
this
->
fluidState_
.
moleFraction
(
wPhaseIdx
,
compIdx
)
>
0
)
{
...
...
@@ -283,12 +283,12 @@ public:
// can be used by the Miscible2pNcComposition constraint solver
for
(
int
compIdx
=
numMajorComponents
;
compIdx
<
numComponents
;
++
compIdx
)
{
fluidState
.
setMoleFraction
(
wPhaseIdx
,
compIdx
,
priVars
[
compIdx
]);
fluidState
.
setMoleFraction
(
wPhaseIdx
,
compIdx
,
priVars
[
compIdx
]);
}
Miscible2pNCComposition
::
solve
(
fluidState
,
paramCache
,
wPhaseIdx
,
//known phaseIdx
wPhaseIdx
,
//known phaseIdx
/*setViscosity=*/
true
,
/*setInternalEnergy=*/
false
);
}
...
...
@@ -317,7 +317,7 @@ public:
Scalar
sumMoleFracNotGas
=
0
;
for
(
int
compIdx
=
numMajorComponents
;
compIdx
<
numComponents
;
++
compIdx
)
{
sumMoleFracNotGas
+=
moleFrac
[
compIdx
];
sumMoleFracNotGas
+=
moleFrac
[
compIdx
];
}
sumMoleFracNotGas
+=
moleFrac
[
wCompIdx
];
moleFrac
[
nCompIdx
]
=
1
-
sumMoleFracNotGas
;
...
...
@@ -329,7 +329,7 @@ public:
// Set fluid state mole fractions
for
(
int
compIdx
=
0
;
compIdx
<
numComponents
;
++
compIdx
)
{
fluidState
.
setMoleFraction
(
nPhaseIdx
,
compIdx
,
moleFrac
[
compIdx
]);
fluidState
.
setMoleFraction
(
nPhaseIdx
,
compIdx
,
moleFrac
[
compIdx
]);
}
// calculate the composition of the remaining phases (as
...
...
@@ -352,13 +352,13 @@ public:
for
(
int
compIdx
=
numMajorComponents
;
compIdx
<
numComponents
;
++
compIdx
)
{
moleFrac
[
compIdx
]
=
priVars
[
compIdx
];
moleFrac
[
compIdx
]
=
priVars
[
compIdx
];
}
moleFrac
[
nCompIdx
]
=
priVars
[
switchIdx
];
Scalar
sumMoleFracNotWater
=
0
;
for
(
int
compIdx
=
numMajorComponents
;
compIdx
<
numComponents
;
++
compIdx
)
{
sumMoleFracNotWater
+=
moleFrac
[
compIdx
];
sumMoleFracNotWater
+=
moleFrac
[
compIdx
];
}
sumMoleFracNotWater
+=
moleFrac
[
nCompIdx
];
moleFrac
[
wCompIdx
]
=
1
-
sumMoleFracNotWater
;
...
...
@@ -405,23 +405,23 @@ public:
/*!
* \brief Returns the inital permeability of the
* pure, precipitate-free porous medium
*/
*/
Scalar
initialPermeability
()
const
{
return
initialPermeability_
;}
/*!
* \brief Returns the factor for the reduction of the initial permeability
* due precipitates in the porous medium
*/
*/
Scalar
permeabilityFactor
()
const
{
return
permeabilityFactor_
;
}
/*!
* \brief Returns the mole fraction of a component in the phase
*
*
* \param phaseIdx the index of the fluid phase
* \param compIdx the index of the component