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
4b428748
Commit
4b428748
authored
Mar 12, 2020
by
Simon Emmert
Browse files
[tests][2pncminni] rename forgotten fvGridGeometry occurences to gridGeometry
parent
07dd5199
Changes
3
Hide whitespace changes
Inline
Side-by-side
test/porousmediumflow/2pncmin/implicit/nonisothermal/main.cc
View file @
4b428748
...
...
@@ -105,13 +105,13 @@ int main(int argc, char** argv) try
const
auto
&
leafGridView
=
gridManager
.
grid
().
leafGridView
();
// create the finite volume grid geometry
using
FV
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
auto
fvG
ridGeometry
=
std
::
make_shared
<
FV
GridGeometry
>
(
leafGridView
);
fvG
ridGeometry
->
update
();
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
auto
g
ridGeometry
=
std
::
make_shared
<
GridGeometry
>
(
leafGridView
);
g
ridGeometry
->
update
();
// the problem (initial and boundary conditions)
using
Problem
=
GetPropType
<
TypeTag
,
Properties
::
Problem
>
;
auto
problem
=
std
::
make_shared
<
Problem
>
(
fvG
ridGeometry
);
auto
problem
=
std
::
make_shared
<
Problem
>
(
g
ridGeometry
);
// get some time loop parameters
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
...
...
@@ -124,7 +124,7 @@ int main(int argc, char** argv) try
// the solution vector
using
SolutionVector
=
GetPropType
<
TypeTag
,
Properties
::
SolutionVector
>
;
SolutionVector
x
(
fvG
ridGeometry
->
numDofs
());
SolutionVector
x
(
g
ridGeometry
->
numDofs
());
if
(
restartTime
>
0
)
{
using
IOFields
=
GetPropType
<
TypeTag
,
Properties
::
IOFields
>
;
...
...
@@ -134,7 +134,7 @@ int main(int argc, char** argv) try
using
SolidSystem
=
GetPropType
<
TypeTag
,
Properties
::
SolidSystem
>
;
const
auto
fileName
=
getParam
<
std
::
string
>
(
"Restart.File"
);
const
auto
pvName
=
createPVNameFunction
<
IOFields
,
PrimaryVariables
,
ModelTraits
,
FluidSystem
,
SolidSystem
>
();
loadSolution
(
x
,
fileName
,
pvName
,
*
fvG
ridGeometry
);
loadSolution
(
x
,
fileName
,
pvName
,
*
g
ridGeometry
);
}
else
problem
->
applyInitialSolution
(
x
);
...
...
@@ -142,7 +142,7 @@ int main(int argc, char** argv) try
// the grid variables
using
GridVariables
=
GetPropType
<
TypeTag
,
Properties
::
GridVariables
>
;
auto
gridVariables
=
std
::
make_shared
<
GridVariables
>
(
problem
,
fvG
ridGeometry
);
auto
gridVariables
=
std
::
make_shared
<
GridVariables
>
(
problem
,
g
ridGeometry
);
gridVariables
->
init
(
x
);
// initialize the vtk output module
...
...
@@ -163,11 +163,11 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using
Assembler
=
FVAssembler
<
TypeTag
,
DiffMethod
::
numeric
>
;
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
fvG
ridGeometry
,
gridVariables
,
timeLoop
);
auto
assembler
=
std
::
make_shared
<
Assembler
>
(
problem
,
g
ridGeometry
,
gridVariables
,
timeLoop
);
// the linear solver
using
LinearSolver
=
AMGBiCGSTABBackend
<
LinearSolverTraits
<
GridGeometry
>>
;
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
fvG
ridGeometry
->
dofMapper
());
auto
linearSolver
=
std
::
make_shared
<
LinearSolver
>
(
leafGridView
,
g
ridGeometry
->
dofMapper
());
// the non-linear solver
using
NewtonSolver
=
NewtonSolver
<
Assembler
,
LinearSolver
>
;
...
...
test/porousmediumflow/2pncmin/implicit/nonisothermal/problem.hh
View file @
4b428748
...
...
@@ -91,9 +91,9 @@ struct SolidSystem<TypeTag, TTag::Salinization>
template
<
class
TypeTag
>
struct
SpatialParams
<
TypeTag
,
TTag
::
Salinization
>
{
using
FV
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
Scalar
=
GetPropType
<
TypeTag
,
Properties
::
Scalar
>
;
using
type
=
SalinizationSpatialParams
<
FV
GridGeometry
,
Scalar
>
;
using
type
=
SalinizationSpatialParams
<
GridGeometry
,
Scalar
>
;
};
// Set properties here to override the default property settings
...
...
@@ -188,7 +188,7 @@ class SalinizationProblem : public PorousMediumFlowProblem<TypeTag>
using
ElementFluxVariablesCache
=
typename
GridVariables
::
GridFluxVariablesCache
::
LocalView
;
using
ElementVolumeVariables
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridVolumeVariables
>::
LocalView
;
using
Element
=
typename
GridView
::
template
Codim
<
0
>
::
Entity
;
using
FV
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
GridGeometry
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>
;
using
SolutionVector
=
GetPropType
<
TypeTag
,
Properties
::
SolutionVector
>
;
using
FVElementGeometry
=
typename
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
...
...
@@ -197,8 +197,8 @@ class SalinizationProblem : public PorousMediumFlowProblem<TypeTag>
using
FluidState
=
GetPropType
<
TypeTag
,
Properties
::
FluidState
>
;
public:
SalinizationProblem
(
std
::
shared_ptr
<
const
FV
GridGeometry
>
fvG
ridGeometry
)
:
ParentType
(
fvG
ridGeometry
)
SalinizationProblem
(
std
::
shared_ptr
<
const
GridGeometry
>
g
ridGeometry
)
:
ParentType
(
g
ridGeometry
)
{
//Fluidsystem
nTemperature_
=
getParam
<
int
>
(
"FluidSystem.NTemperature"
);
...
...
@@ -220,7 +220,7 @@ public:
unsigned
int
codim
=
GetPropType
<
TypeTag
,
Properties
::
GridGeometry
>::
discMethod
==
DiscretizationMethod
::
box
?
dim
:
0
;
permeability_
.
resize
(
fvG
ridGeometry
->
gridView
().
size
(
codim
));
permeability_
.
resize
(
g
ridGeometry
->
gridView
().
size
(
codim
));
FluidSystem
::
init
(
/*Tmin=*/
temperatureLow_
,
/*Tmax=*/
temperatureHigh_
,
/*nT=*/
nTemperature_
,
...
...
test/porousmediumflow/2pncmin/implicit/nonisothermal/spatialparams.hh
View file @
4b428748
...
...
@@ -42,18 +42,18 @@ namespace Dumux {
* \brief Spatial parameters for the salinization problem, where evaporation
* from a porous medium saturated wit brine and air leads to precipitation of salt.
*/
template
<
class
FV
GridGeometry
,
class
Scalar
>
template
<
class
GridGeometry
,
class
Scalar
>
class
SalinizationSpatialParams
:
public
FVSpatialParams
<
FV
GridGeometry
,
Scalar
,
SalinizationSpatialParams
<
FV
GridGeometry
,
Scalar
>>
:
public
FVSpatialParams
<
GridGeometry
,
Scalar
,
SalinizationSpatialParams
<
GridGeometry
,
Scalar
>>
{
using
GridView
=
typename
FV
GridGeometry
::
GridView
;
using
FVElementGeometry
=
typename
FV
GridGeometry
::
LocalView
;
using
GridView
=
typename
GridGeometry
::
GridView
;
using
FVElementGeometry
=
typename
GridGeometry
::
LocalView
;
using
SubControlVolume
=
typename
FVElementGeometry
::
SubControlVolume
;
using
Element
=
typename
GridView
::
template
Codim
<
0
>
::
Entity
;
using
ParentType
=
FVSpatialParams
<
FV
GridGeometry
,
Scalar
,
SalinizationSpatialParams
<
FV
GridGeometry
,
Scalar
>>
;
using
ParentType
=
FVSpatialParams
<
GridGeometry
,
Scalar
,
SalinizationSpatialParams
<
GridGeometry
,
Scalar
>>
;
using
EffectiveLaw
=
RegularizedVanGenuchten
<
Scalar
>
;
...
...
@@ -66,8 +66,8 @@ public:
using
MaterialLaw
=
EffToAbsLaw
<
EffectiveLaw
>
;
using
MaterialLawParams
=
typename
MaterialLaw
::
Params
;
SalinizationSpatialParams
(
std
::
shared_ptr
<
const
FV
GridGeometry
>
fvG
ridGeometry
)
:
ParentType
(
fvG
ridGeometry
)
SalinizationSpatialParams
(
std
::
shared_ptr
<
const
GridGeometry
>
g
ridGeometry
)
:
ParentType
(
g
ridGeometry
)
{
solubilityLimit_
=
getParam
<
Scalar
>
(
"SpatialParams.SolubilityLimit"
,
0.26
);
referencePorosity_
=
getParam
<
Scalar
>
(
"SpatialParams.referencePorosity"
,
0.11
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment