From 6a59d0f8da0fd1ed0a8e4ae444d70c4136ab9891 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Wed, 9 Oct 2019 17:09:24 +0200
Subject: [PATCH] [cleanup] use local variables gridGeoemtry instead of
fvGridGeometry
---
dumux/adaptive/initializationindicator.hh | 6 +-
dumux/assembly/cclocalassembler.hh | 16 ++--
dumux/assembly/fvlocalresidual.hh | 6 +-
dumux/assembly/partialreassembler.hh | 22 +++---
dumux/common/pointsource.hh | 6 +-
dumux/common/staggeredfvproblem.hh | 6 +-
dumux/discretization/box/elementsolution.hh | 8 +-
.../box/gridfluxvariablescache.hh | 12 +--
.../discretization/box/gridvolumevariables.hh | 14 ++--
.../box/scvftoscvboundarytypes.hh | 8 +-
.../cellcentered/connectivitymap.hh | 12 +--
.../cellcentered/elementsolution.hh | 8 +-
.../cellcentered/gridvolumevariables.hh | 12 +--
.../mpfa/elementfluxvariablescache.hh | 28 +++----
.../mpfa/elementvolumevariables.hh | 36 ++++-----
.../mpfa/gridfluxvariablescache.hh | 30 ++++----
.../mpfa/gridinteractionvolumeindexsets.hh | 22 +++---
.../cellcentered/mpfa/scvgradients.hh | 28 +++----
.../tpfa/elementfluxvariablescache.hh | 8 +-
.../tpfa/elementvolumevariables.hh | 16 ++--
.../tpfa/gridfluxvariablescache.hh | 10 +--
dumux/discretization/evalgradients.hh | 10 +--
dumux/discretization/evalsolution.hh | 14 ++--
dumux/discretization/fluxstencil.hh | 8 +-
.../discretization/staggered/facesolution.hh | 4 +-
.../staggered/freeflow/connectivitymap.hh | 14 ++--
.../freeflow/elementvolumevariables.hh | 8 +-
.../staggered/freeflow/gridvolumevariables.hh | 10 +--
.../staggered/fvgridgeometry.hh | 4 +-
.../staggered/gridfacevariables.hh | 10 +--
.../staggered/gridfluxvariablescache.hh | 10 +--
dumux/freeflow/navierstokes/problem.hh | 6 +-
dumux/freeflow/rans/oneeq/problem.hh | 4 +-
dumux/freeflow/rans/problem.hh | 6 +-
dumux/freeflow/rans/twoeq/kepsilon/problem.hh | 4 +-
dumux/freeflow/rans/twoeq/komega/problem.hh | 4 +-
.../rans/twoeq/lowrekepsilon/problem.hh | 4 +-
dumux/freeflow/rans/zeroeq/problem.hh | 6 +-
dumux/freeflow/shallowwater/problem.hh | 14 ++--
dumux/io/loadsolution.hh | 42 +++++-----
dumux/io/staggeredvtkoutputmodule.hh | 16 ++--
dumux/io/vtkoutputmodule.hh | 56 +++++++-------
.../porositydeformation.hh | 12 +--
dumux/material/spatialparams/fv.hh | 4 +-
dumux/material/spatialparams/fv1p.hh | 6 +-
dumux/material/spatialparams/fvelastic.hh | 6 +-
.../spatialparams/fvnonequilibrium.hh | 4 +-
dumux/material/spatialparams/fvporoelastic.hh | 6 +-
.../embedded/couplingmanagerbase.hh | 4 +-
.../embedded/integrationpointsource.hh | 6 +-
dumux/multidomain/facet/couplingmapperbase.hh | 10 +--
dumux/multidomain/newtonsolver.hh | 14 ++--
.../multidomain/subdomaincclocalassembler.hh | 22 +++---
.../subdomainstaggeredlocalassembler.hh | 20 ++---
dumux/nonlinear/newtonconvergencewriter.hh | 8 +-
dumux/nonlinear/newtonsolver.hh | 14 ++--
.../staggerednewtonconvergencewriter.hh | 12 +--
.../2p/boxmaterialinterfaceparams.hh | 16 ++--
.../porousmediumflow/2p/gridadaptindicator.hh | 6 +-
dumux/porousmediumflow/2p/griddatatransfer.hh | 8 +-
.../boxdfm/vtkoutputmodule.hh | 40 +++++-----
.../compositional/primaryvariableswitch.hh | 46 +++++------
.../fluxvariablescachefiller.hh | 8 +-
dumux/porousmediumflow/problem.hh | 14 ++--
.../porousmediumflow/richards/newtonsolver.hh | 8 +-
examples/1ptracer/main.cc | 20 ++---
examples/1ptracer/problem_1p.hh | 4 +-
examples/1ptracer/spatialparams_1p.hh | 8 +-
examples/1ptracer/spatialparams_tracer.hh | 4 +-
examples/2pinfiltration/main.cc | 20 ++---
examples/2pinfiltration/problem.hh | 4 +-
examples/2pinfiltration/spatialparams.hh | 4 +-
examples/shallowwaterfriction/problem.hh | 8 +-
.../shallowwaterfriction/spatialparams.hh | 4 +-
test/discretization/box/test_boxfvgeometry.cc | 8 +-
.../cellcentered/tpfa/test_tpfafvgeometry.cc | 8 +-
.../tpfa/test_tpfafvgeometry_nonconforming.cc | 14 ++--
.../test_staggered_free_flow_geometry.cc | 22 +++---
.../staggered/test_staggeredfvgeometry.cc | 10 +--
test/freeflow/navierstokes/angeli/main.cc | 32 ++++----
test/freeflow/navierstokes/angeli/problem.hh | 4 +-
test/freeflow/navierstokes/channel/1d/main.cc | 14 ++--
.../navierstokes/channel/1d/problem.hh | 4 +-
test/freeflow/navierstokes/channel/2d/main.cc | 22 +++---
.../navierstokes/channel/2d/problem.hh | 4 +-
test/freeflow/navierstokes/channel/3d/main.cc | 26 +++----
.../navierstokes/channel/3d/problem.hh | 4 +-
.../navierstokes/closedsystem/main.cc | 14 ++--
.../navierstokes/closedsystem/problem.hh | 4 +-
test/freeflow/navierstokes/donea/main.cc | 16 ++--
test/freeflow/navierstokes/donea/problem.hh | 4 +-
test/freeflow/navierstokes/kovasznay/main.cc | 14 ++--
.../navierstokes/kovasznay/problem.hh | 4 +-
test/freeflow/navierstokes/sincos/main.cc | 48 ++++++------
test/freeflow/navierstokes/sincos/problem.hh | 4 +-
test/freeflow/navierstokesnc/channel/main.cc | 14 ++--
.../navierstokesnc/channel/problem.hh | 4 +-
.../navierstokesnc/densitydrivenflow/main.cc | 14 ++--
.../densitydrivenflow/problem.hh | 4 +-
.../navierstokesnc/maxwellstefan/main.cc | 14 ++--
.../navierstokesnc/maxwellstefan/problem.hh | 4 +-
test/freeflow/rans/main.cc | 14 ++--
test/freeflow/rans/problem.hh | 4 +-
test/freeflow/ransnc/main.cc | 14 ++--
test/freeflow/ransnc/problem.hh | 4 +-
test/freeflow/shallowwater/dambreak/main.cc | 14 ++--
.../freeflow/shallowwater/dambreak/problem.hh | 8 +-
.../shallowwater/dambreak/spatialparams.hh | 4 +-
.../shallowwater/roughchannel/main.cc | 14 ++--
.../shallowwater/roughchannel/problem.hh | 8 +-
.../roughchannel/spatialparams.hh | 4 +-
test/geomechanics/elastic/main.cc | 18 ++---
test/geomechanics/elastic/problem.hh | 4 +-
test/geomechanics/elastic/spatialparams.hh | 4 +-
test/geomechanics/poroelastic/main.cc | 32 ++++----
test/geomechanics/poroelastic/problem.hh | 4 +-
.../geomechanics/poroelastic/spatialparams.hh | 4 +-
test/io/gridmanager/gmshboundaryflagtest.hh | 4 +-
.../vtk/test_vtk_staggeredfreeflowpvnames.cc | 76 +++++++++----------
.../boundary/darcydarcy/1p_1p/main.cc | 4 +-
.../boundary/darcydarcy/1p_1p/problem.hh | 4 +-
.../darcydarcy/1p_1p/spatialparams.hh | 4 +-
.../boundary/darcydarcy/1p_2p/problem.hh | 4 +-
.../darcydarcy/1p_2p/spatialparams.hh | 4 +-
.../diffusionlawcomparison/problem_darcy.hh | 4 +-
.../diffusionlawcomparison/problem_stokes.hh | 4 +-
.../stokesdarcy/1p2c_1p2c/problem_darcy.hh | 4 +-
.../stokesdarcy/1p2c_1p2c/problem_stokes.hh | 4 +-
.../stokesdarcy/1p2c_1p2c/spatialparams.hh | 4 +-
.../stokesdarcy/1p2c_2p2c/problem_darcy.hh | 4 +-
.../stokesdarcy/1p2c_2p2c/problem_stokes.hh | 4 +-
.../stokesdarcy/1p2c_2p2c/spatialparams.hh | 4 +-
.../stokesdarcy/1p3c_1p3c/problem_darcy.hh | 4 +-
.../stokesdarcy/1p3c_1p3c/problem_stokes.hh | 4 +-
.../stokesdarcy/1p_1p/problem_darcy.hh | 4 +-
.../stokesdarcy/1p_1p/problem_stokes.hh | 4 +-
.../stokesdarcy/1p_1p/spatialparams.hh | 4 +-
.../stokesdarcy/1p_2p/problem_darcy.hh | 4 +-
.../stokesdarcy/1p_2p/problem_stokes.hh | 4 +-
.../stokesdarcy/1p_2p/spatialparams.hh | 4 +-
.../1d3d/1p2c_richards2c/problem_root.hh | 4 +-
.../1d3d/1p2c_richards2c/problem_soil.hh | 6 +-
.../1p2c_richards2c/spatialparams_root.hh | 6 +-
.../1p2c_richards2c/spatialparams_soil.hh | 4 +-
.../embedded/1d3d/1p_1p/problem_bloodflow.hh | 4 +-
.../embedded/1d3d/1p_1p/problem_tissue.hh | 4 +-
.../1d3d/1p_1p/spatialparams_bloodflow.hh | 4 +-
.../1d3d/1p_1p/spatialparams_tissue.hh | 4 +-
.../embedded/1d3d/1p_richards/problem_root.hh | 4 +-
.../embedded/1d3d/1p_richards/problem_soil.hh | 4 +-
.../1d3d/1p_richards/spatialparams_root.hh | 6 +-
.../1d3d/1p_richards/spatialparams_soil.hh | 4 +-
.../embedded/2d3d/1p_1p/problem_fracture.hh | 4 +-
.../embedded/2d3d/1p_1p/problem_matrix.hh | 4 +-
.../embedded/2d3d/1p_1p/spatialparams.hh | 4 +-
.../facet/1p_1p/analytical/main.cc | 8 +-
.../facet/1p_1p/analytical/problem_bulk.hh | 4 +-
.../facet/1p_1p/analytical/problem_lowdim.hh | 4 +-
.../facet/1p_1p/analytical/spatialparams.hh | 4 +-
.../facet/1p_1p/gravity/problem_bulk.hh | 4 +-
.../facet/1p_1p/gravity/problem_lowdim.hh | 4 +-
.../facet/1p_1p/gravity/spatialparams.hh | 4 +-
.../facet/1p_1p/linearprofile/problem_bulk.hh | 4 +-
.../1p_1p/linearprofile/problem_lowdim.hh | 4 +-
.../1p_1p/linearprofile/spatialparams.hh | 4 +-
.../facet/1p_1p/threedomain/main.cc | 34 ++++-----
.../facet/1p_1p/threedomain/problem_bulk.hh | 4 +-
.../facet/1p_1p/threedomain/problem_edge.hh | 4 +-
.../facet/1p_1p/threedomain/problem_facet.hh | 4 +-
.../facet/1p_1p/threedomain/spatialparams.hh | 4 +-
test/multidomain/facet/tracer_tracer/main.cc | 24 +++---
.../facet/tracer_tracer/problem_1p_bulk.hh | 4 +-
.../facet/tracer_tracer/problem_1p_lowdim.hh | 4 +-
.../facet/tracer_tracer/spatialparams_1p.hh | 4 +-
.../tracer_tracer/spatialparams_tracer.hh | 4 +-
.../poromechanics/el1p/problem_1p.hh | 4 +-
.../poromechanics/el1p/problem_poroelastic.hh | 4 +-
.../poromechanics/el1p/spatialparams_1p.hh | 4 +-
.../el1p/spatialparams_poroelastic.hh | 4 +-
.../poromechanics/el2p/problem_2p.hh | 4 +-
.../poromechanics/el2p/problem_poroelastic.hh | 4 +-
.../poromechanics/el2p/spatialparams_2p.hh | 4 +-
.../el2p/spatialparams_poroelastic.hh | 4 +-
.../compressible/instationary/main.cc | 12 +--
.../compressible/instationary/problem.hh | 4 +-
.../instationary/spatialparams.hh | 4 +-
.../implicit/compressible/stationary/main.cc | 12 +--
.../compressible/stationary/problem.hh | 4 +-
.../compressible/stationary/spatialparams.hh | 4 +-
.../1p/implicit/convergence/problem.hh | 6 +-
.../1p/implicit/convergence/solver.hh | 20 ++---
.../1p/implicit/convergence/spatialparams.hh | 6 +-
.../1p/implicit/fracture2d3d/main.cc | 14 ++--
.../1p/implicit/fracture2d3d/problem.hh | 4 +-
.../1p/implicit/fracture2d3d/spatialparams.hh | 4 +-
.../1p/implicit/incompressible/main.cc | 26 +++----
.../1p/implicit/incompressible/problem.hh | 4 +-
.../implicit/incompressible/spatialparams.hh | 4 +-
.../1p/implicit/internaldirichlet/problem.hh | 4 +-
.../1p/implicit/isothermal/main.cc | 14 ++--
.../1p/implicit/isothermal/spatialparams.hh | 10 +--
.../1p/implicit/network1d3d/main.cc | 14 ++--
.../1p/implicit/network1d3d/spatialparams.hh | 4 +-
.../1p/implicit/nonisothermal/main.cc | 16 ++--
.../nonisothermal/problem_conduction.hh | 6 +-
.../nonisothermal/problem_convection.hh | 4 +-
.../implicit/nonisothermal/spatialparams.hh | 4 +-
.../1p/implicit/periodicbc/main.cc | 18 ++---
.../1p/implicit/periodicbc/problem.hh | 4 +-
.../1p/implicit/periodicbc/spatialparams.hh | 4 +-
.../1p/implicit/pointsources/spatialparams.hh | 4 +-
.../pointsources/timedependent/main.cc | 14 ++--
.../pointsources/timedependent/problem.hh | 4 +-
.../pointsources/timeindependent/main.cc | 14 ++--
.../pointsources/timeindependent/problem.hh | 4 +-
.../1pnc/implicit/1p2c/isothermal/main.cc | 12 +--
.../1pnc/implicit/1p2c/isothermal/problem.hh | 4 +-
.../isothermal/saltwaterintrusion/main.cc | 12 +--
.../isothermal/saltwaterintrusion/problem.hh | 4 +-
.../1p2c/nonisothermal/conduction/main.cc | 12 +--
.../1p2c/nonisothermal/conduction/problem.hh | 6 +-
.../1p2c/nonisothermal/convection/main.cc | 12 +--
.../1p2c/nonisothermal/convection/problem.hh | 6 +-
.../1p2c/nonisothermal/transientbc/main.cc | 12 +--
.../1p2c/nonisothermal/transientbc/problem.hh | 4 +-
.../1pnc/implicit/1p2c/spatialparams.hh | 4 +-
.../1pnc/implicit/1p3c/main.cc | 12 +--
.../1pnc/implicit/1p3c/problem.hh | 4 +-
.../1pnc/implicit/nonequilibrium/main.cc | 12 +--
.../1pnc/implicit/nonequilibrium/problem.hh | 4 +-
.../implicit/nonequilibrium/spatialparams.hh | 4 +-
.../1pncmin/implicit/nonisothermal/main.cc | 12 +--
.../1pncmin/implicit/nonisothermal/problem.hh | 10 +--
.../implicit/nonisothermal/spatialparams.hh | 4 +-
.../2p/implicit/adaptive/main.cc | 20 ++---
.../2p/implicit/adaptive/problem.hh | 4 +-
.../2p/implicit/boxdfm/main.cc | 12 +--
.../2p/implicit/boxdfm/problem.hh | 4 +-
.../2p/implicit/boxdfm/spatialparams.hh | 2 +-
.../2p/implicit/cornerpoint/main.cc | 16 ++--
.../2p/implicit/cornerpoint/problem.hh | 4 +-
.../2p/implicit/cornerpoint/spatialparams.hh | 4 +-
.../2p/implicit/fracture/main.cc | 14 ++--
.../2p/implicit/fracture/problem.hh | 4 +-
.../2p/implicit/fracture/spatialparams.hh | 4 +-
.../2p/implicit/incompressible/main.cc | 16 ++--
.../2p/implicit/incompressible/problem.hh | 4 +-
.../implicit/incompressible/spatialparams.hh | 4 +-
.../2p/implicit/nonisothermal/main.cc | 14 ++--
.../2p/implicit/nonisothermal/problem.hh | 4 +-
test/porousmediumflow/2p1c/implicit/main.cc | 12 +--
.../porousmediumflow/2p1c/implicit/problem.hh | 4 +-
.../2p1c/implicit/spatialparams.hh | 4 +-
.../implicit/chemicalnonequilibrium/main.cc | 14 ++--
.../chemicalnonequilibrium/problem.hh | 4 +-
.../chemicalnonequilibrium/spatialparams.hh | 4 +-
.../2p2c/implicit/injection/main.cc | 16 ++--
.../2p2c/implicit/injection/problem.hh | 4 +-
.../2p2c/implicit/injection/spatialparams.hh | 4 +-
.../2p2c/implicit/mpnccomparison/main.cc | 14 ++--
.../2p2c/implicit/mpnccomparison/problem.hh | 4 +-
.../implicit/mpnccomparison/spatialparams.hh | 2 +-
.../2p2c/implicit/waterair/main.cc | 16 ++--
.../2p2c/implicit/waterair/problem.hh | 4 +-
.../2p2c/implicit/waterair/spatialparams.hh | 2 +-
.../2pnc/implicit/diffusion/main.cc | 14 ++--
.../2pnc/implicit/diffusion/problem.hh | 4 +-
.../2pnc/implicit/diffusion/spatialparams.hh | 4 +-
.../2pnc/implicit/fuelcell/main.cc | 14 ++--
.../2pnc/implicit/fuelcell/problem.hh | 4 +-
.../2pnc/implicit/fuelcell/spatialparams.hh | 4 +-
.../2pncmin/implicit/isothermal/main.cc | 16 ++--
.../2pncmin/implicit/isothermal/problem.hh | 6 +-
.../implicit/isothermal/spatialparams.hh | 4 +-
.../3p/implicit/conduction/main.cc | 14 ++--
.../3p/implicit/conduction/problem.hh | 6 +-
.../3p/implicit/conduction/spatialparams.hh | 4 +-
.../3p/implicit/convection/main.cc | 14 ++--
.../3p/implicit/convection/problem.hh | 4 +-
.../3p/implicit/infiltration/main.cc | 14 ++--
.../3p/implicit/infiltration/problem.hh | 4 +-
.../3p/implicit/infiltration/spatialparams.hh | 4 +-
.../3p3c/implicit/columnxylol/main.cc | 14 ++--
.../3p3c/implicit/columnxylol/problem.hh | 4 +-
.../implicit/columnxylol/spatialparams.hh | 4 +-
.../3p3c/implicit/infiltration/main.cc | 14 ++--
.../3p3c/implicit/infiltration/problem.hh | 4 +-
.../implicit/infiltration/spatialparams.hh | 4 +-
.../3p3c/implicit/kuevette/main.cc | 14 ++--
.../3p3c/implicit/kuevette/problem.hh | 4 +-
.../3p3c/implicit/kuevette/spatialparams.hh | 4 +-
.../3pwateroil/implicit/main.cc | 14 ++--
.../3pwateroil/implicit/problem.hh | 4 +-
.../3pwateroil/implicit/spatialparams.hh | 4 +-
test/porousmediumflow/co2/implicit/main.cc | 16 ++--
test/porousmediumflow/co2/implicit/problem.hh | 4 +-
.../co2/implicit/spatialparams.hh | 4 +-
.../mpnc/implicit/2p2ccomparison/main.cc | 14 ++--
.../mpnc/implicit/2p2ccomparison/problem.hh | 4 +-
.../implicit/2p2ccomparison/spatialparams.hh | 2 +-
.../mpnc/implicit/kinetic/main.cc | 12 +--
.../mpnc/implicit/kinetic/spatialparams.hh | 4 +-
.../mpnc/implicit/obstacle/main.cc | 14 ++--
.../mpnc/implicit/obstacle/problem.hh | 4 +-
.../mpnc/implicit/obstacle/spatialparams.hh | 2 +-
.../implicit/thermalnonequilibrium/main.cc | 14 ++--
.../thermalnonequilibrium/spatialparams.hh | 2 +-
.../richards/implicit/analytical/main.cc | 12 +--
.../richards/implicit/analytical/problem.hh | 4 +-
.../implicit/analytical/spatialparams.hh | 4 +-
.../richards/implicit/lens/main.cc | 16 ++--
.../richards/implicit/lens/problem.hh | 4 +-
.../richards/implicit/lens/spatialparams.hh | 4 +-
.../implicit/nonisothermal/conduction/main.cc | 12 +--
.../nonisothermal/conduction/problem.hh | 6 +-
.../implicit/nonisothermal/convection/main.cc | 12 +--
.../nonisothermal/convection/problem.hh | 6 +-
.../nonisothermal/evaporation/main.cc | 12 +--
.../nonisothermal/evaporation/problem.hh | 4 +-
.../implicit/nonisothermal/spatialparams.hh | 4 +-
.../richardsnc/implicit/main.cc | 12 +--
.../richardsnc/implicit/problem.hh | 4 +-
.../richardsnc/implicit/spatialparams.hh | 4 +-
test/porousmediumflow/solidenergy/main.cc | 12 +--
test/porousmediumflow/solidenergy/problem.hh | 4 +-
.../solidenergy/spatialparams.hh | 4 +-
test/porousmediumflow/tracer/1ptracer/main.cc | 20 ++---
.../tracer/1ptracer/problem_1p.hh | 4 +-
.../tracer/1ptracer/spatialparams_1p.hh | 8 +-
.../tracer/1ptracer/spatialparams_tracer.hh | 4 +-
test/porousmediumflow/tracer/2ptracer/main.cc | 30 ++++----
.../tracer/2ptracer/problem_tracer.hh | 4 +-
.../tracer/2ptracer/spatialparams_tracer.hh | 4 +-
test/porousmediumflow/tracer/constvel/main.cc | 12 +--
.../tracer/constvel/spatialparams.hh | 4 +-
.../porousmediumflow/tracer/multicomp/main.cc | 14 ++--
.../tracer/multicomp/problem.hh | 4 +-
.../tracer/multicomp/spatialparams.hh | 4 +-
338 files changed, 1525 insertions(+), 1525 deletions(-)
diff --git a/dumux/adaptive/initializationindicator.hh b/dumux/adaptive/initializationindicator.hh
index 0a171991b0..079a63de27 100644
--- a/dumux/adaptive/initializationindicator.hh
+++ b/dumux/adaptive/initializationindicator.hh
@@ -66,14 +66,14 @@ public:
* - Adaptive.RefineAtSource If to refine where source terms are specified (default: true)
* - Adaptive.BCRefinementThreshold The threshold above which fluxes are treated as non-zero (default: 1e-10)
* \param problem The problem object
- * \param fvGridGeometry The finite volume geometry of the grid
+ * \param gridGeometry The finite volume geometry of the grid
* \param gridVariables The secondary variables on the grid
*/
GridAdaptInitializationIndicator(std::shared_ptr<const Problem> problem,
- std::shared_ptr<const GridGeometry> fvGridGeometry,
+ std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<const GridVariables> gridVariables)
: problem_(problem)
- , fvGridGeometry_(fvGridGeometry)
+ , fvGridGeometry_(gridGeometry)
, gridVariables_(gridVariables)
, minLevel_(getParamFromGroup<int>(problem->paramGroup(), "Adaptive.MinLevel"))
, maxLevel_(getParamFromGroup<int>(problem->paramGroup(), "Adaptive.MaxLevel"))
diff --git a/dumux/assembly/cclocalassembler.hh b/dumux/assembly/cclocalassembler.hh
index a97ab7eaba..025f89feb6 100644
--- a/dumux/assembly/cclocalassembler.hh
+++ b/dumux/assembly/cclocalassembler.hh
@@ -170,13 +170,13 @@ public:
// get some aliases for convenience
const auto& element = this->element();
const auto& fvGeometry = this->fvGeometry();
- const auto& fvGridGeometry = this->assembler().gridGeometry();
+ const auto& gridGeometry = this->assembler().gridGeometry();
auto&& curElemVolVars = this->curElemVolVars();
auto&& elemFluxVarsCache = this->elemFluxVarsCache();
// get stencil informations
- const auto globalI = fvGridGeometry.elementMapper().index(element);
- const auto& connectivityMap = fvGridGeometry.connectivityMap();
+ const auto globalI = gridGeometry.elementMapper().index(element);
+ const auto& connectivityMap = gridGeometry.connectivityMap();
const auto numNeighbors = connectivityMap[globalI].size();
// container to store the neighboring elements
@@ -203,7 +203,7 @@ public:
unsigned int j = 1;
for (const auto& dataJ : connectivityMap[globalI])
{
- neighborElements[j-1] = fvGridGeometry.element(dataJ.globalJ);
+ neighborElements[j-1] = gridGeometry.element(dataJ.globalJ);
for (const auto scvfIdx : dataJ.scvfsJ)
origResiduals[j] += evalNeighborFlux(neighborElements[j-1], fvGeometry.scvf(scvfIdx));
@@ -221,7 +221,7 @@ public:
const auto origVolVars = curVolVars;
// element solution container to be deflected
- auto elemSol = elementSolution(element, curSol, fvGridGeometry);
+ auto elemSol = elementSolution(element, curSol, gridGeometry);
// derivatives in the neighbors with repect to the current elements
// in index 0 we save the derivative of the element residual with respect to it's own dofs
@@ -349,11 +349,11 @@ public:
// get some aliases for convenience
const auto& element = this->element();
const auto& fvGeometry = this->fvGeometry();
- const auto& fvGridGeometry = this->assembler().gridGeometry();
+ const auto& gridGeometry = this->assembler().gridGeometry();
auto&& curElemVolVars = this->curElemVolVars();
// reference to the element's scv (needed later) and corresponding vol vars
- const auto globalI = fvGridGeometry.elementMapper().index(element);
+ const auto globalI = gridGeometry.elementMapper().index(element);
const auto& scv = fvGeometry.scv(globalI);
auto& curVolVars = ParentType::getVolVarAccess(gridVariables.curGridVolVars(), curElemVolVars, scv);
@@ -364,7 +364,7 @@ public:
const auto origVolVars = curVolVars;
// element solution container to be deflected
- auto elemSol = elementSolution(element, curSol, fvGridGeometry);
+ auto elemSol = elementSolution(element, curSol, gridGeometry);
NumEqVector partialDeriv;
diff --git a/dumux/assembly/fvlocalresidual.hh b/dumux/assembly/fvlocalresidual.hh
index 23065a0856..22ed0e4e98 100644
--- a/dumux/assembly/fvlocalresidual.hh
+++ b/dumux/assembly/fvlocalresidual.hh
@@ -88,18 +88,18 @@ public:
* \param problem The problem to solve
* \param element The DUNE Codim<0> entity for which the storage
* term ought to be calculated
- * \param fvGridGeometry The finite-volume grid geometry
+ * \param gridGeometry The finite-volume grid geometry
* \param gridVariables The grid variables (volume and flux variables)
* \param sol The solution vector
*/
ElementResidualVector evalStorage(const Problem& problem,
const Element &element,
- const GridGeometry& fvGridGeometry,
+ const GridGeometry& gridGeometry,
const GridVariables& gridVariables,
const SolutionVector& sol) const
{
// make sure FVElementGeometry and volume variables are bound to the element
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bind(element);
auto elemVolVars = localView(gridVariables.curGridVolVars());
diff --git a/dumux/assembly/partialreassembler.hh b/dumux/assembly/partialreassembler.hh
index 4f8dee1d8a..f164191967 100644
--- a/dumux/assembly/partialreassembler.hh
+++ b/dumux/assembly/partialreassembler.hh
@@ -115,10 +115,10 @@ public:
const std::vector<Scalar>& distanceFromLastLinearization,
Scalar threshold)
{
- const auto& fvGridGeometry = assembler.gridGeometry();
- const auto& gridView = fvGridGeometry.gridView();
- const auto& elementMapper = fvGridGeometry.elementMapper();
- const auto& vertexMapper = fvGridGeometry.vertexMapper();
+ const auto& gridGeometry = assembler.gridGeometry();
+ const auto& gridView = gridGeometry.gridView();
+ const auto& elementMapper = gridGeometry.elementMapper();
+ const auto& vertexMapper = gridGeometry.vertexMapper();
// set all vertices to green
vertexColor_.assign(vertexColor_.size(), EntityColor::green);
@@ -318,9 +318,9 @@ public:
const std::vector<Scalar>& distanceFromLastLinearization,
Scalar threshold)
{
- const auto& fvGridGeometry = assembler.gridGeometry();
- const auto& gridView = fvGridGeometry.gridView();
- const auto& elementMapper = fvGridGeometry.elementMapper();
+ const auto& gridGeometry = assembler.gridGeometry();
+ const auto& gridView = gridGeometry.gridView();
+ const auto& elementMapper = gridGeometry.elementMapper();
// mark the red elements
for (const auto& element : elements(gridView))
@@ -340,7 +340,7 @@ public:
}
// mark the neighbors also red
- const auto& connectivityMap = fvGridGeometry.connectivityMap();
+ const auto& connectivityMap = gridGeometry.connectivityMap();
for (unsigned eIdx = 0; eIdx < elementColor_.size(); ++eIdx)
{
if (elementColor_[eIdx] == EntityColor::red)
@@ -440,9 +440,9 @@ public:
: engine_(assembler)
, greenElems_(0)
{
- const auto& fvGridGeometry = assembler.gridGeometry();
- totalElems_ = fvGridGeometry.elementMapper().size();
- totalElems_ = fvGridGeometry.gridView().comm().sum(totalElems_);
+ const auto& gridGeometry = assembler.gridGeometry();
+ totalElems_ = gridGeometry.elementMapper().size();
+ totalElems_ = gridGeometry.gridView().comm().sum(totalElems_);
}
/*!
diff --git a/dumux/common/pointsource.hh b/dumux/common/pointsource.hh
index 527c9dfa40..e7c7a9f093 100644
--- a/dumux/common/pointsource.hh
+++ b/dumux/common/pointsource.hh
@@ -277,13 +277,13 @@ class BoundingBoxTreePointSourceHelper
public:
//! calculate a DOF index to point source map from given vector of point sources
template<class GridGeometry, class PointSource, class PointSourceMap>
- static void computePointSourceMap(const GridGeometry& fvGridGeometry,
+ static void computePointSourceMap(const GridGeometry& gridGeometry,
std::vector<PointSource>& sources,
PointSourceMap& pointSourceMap)
{
constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
- const auto& boundingBoxTree = fvGridGeometry.boundingBoxTree();
+ const auto& boundingBoxTree = gridGeometry.boundingBoxTree();
for (auto&& source : sources)
{
@@ -298,7 +298,7 @@ public:
{
// check in which subcontrolvolume(s) we are
const auto element = boundingBoxTree.entitySet().entity(eIdx);
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
const auto globalPos = source.position();
diff --git a/dumux/common/staggeredfvproblem.hh b/dumux/common/staggeredfvproblem.hh
index 74adc5043a..49eb564b6f 100644
--- a/dumux/common/staggeredfvproblem.hh
+++ b/dumux/common/staggeredfvproblem.hh
@@ -73,11 +73,11 @@ class StaggeredFVProblem : public FVProblem<TypeTag>
public:
/*!
* \brief Constructor
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param paramGroup The parameter group in which to look for runtime parameters first (default is "")
*/
- StaggeredFVProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ StaggeredFVProblem(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry, paramGroup)
{ }
/*!
diff --git a/dumux/discretization/box/elementsolution.hh b/dumux/discretization/box/elementsolution.hh
index f0b5a79b56..bc7b800514 100644
--- a/dumux/discretization/box/elementsolution.hh
+++ b/dumux/discretization/box/elementsolution.hh
@@ -51,9 +51,9 @@ public:
//! Constructor with element and solution and grid geometry
template<class SolutionVector>
BoxElementSolution(const Element& element, const SolutionVector& sol,
- const GridGeometry& fvGridGeometry)
+ const GridGeometry& gridGeometry)
{
- update(element, sol, fvGridGeometry);
+ update(element, sol, gridGeometry);
}
//! Constructor with element and elemVolVars and fvGeometry
@@ -70,12 +70,12 @@ public:
//! extract the element solution from the solution vector using a mapper
template<class SolutionVector>
void update(const Element& element, const SolutionVector& sol,
- const GridGeometry& fvGridGeometry)
+ const GridGeometry& gridGeometry)
{
const auto numVert = element.subEntities(GridView::dimension);
priVars_.resize(numVert);
for (int vIdx = 0; vIdx < numVert; ++vIdx)
- priVars_[vIdx] = sol[fvGridGeometry.vertexMapper().subIndex(element, vIdx, GridView::dimension)];
+ priVars_[vIdx] = sol[gridGeometry.vertexMapper().subIndex(element, vIdx, GridView::dimension)];
}
//! extract the element solution from the solution vector using a local fv geometry
diff --git a/dumux/discretization/box/gridfluxvariablescache.hh b/dumux/discretization/box/gridfluxvariablescache.hh
index a5803f48ee..90d6079e80 100644
--- a/dumux/discretization/box/gridfluxvariablescache.hh
+++ b/dumux/discretization/box/gridfluxvariablescache.hh
@@ -79,7 +79,7 @@ public:
BoxGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
template<class GridGeometry, class GridVolumeVariables, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry,
+ void update(const GridGeometry& gridGeometry,
const GridVolumeVariables& gridVolVars,
const SolutionVector& sol,
bool forceUpdate = false)
@@ -87,12 +87,12 @@ public:
// Here, we do not do anything unless it is a forced update
if (forceUpdate)
{
- fluxVarsCache_.resize(fvGridGeometry.gridView().size(0));
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ fluxVarsCache_.resize(gridGeometry.gridView().size(0));
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- auto eIdx = fvGridGeometry.elementMapper().index(element);
+ auto eIdx = gridGeometry.elementMapper().index(element);
// bind the geometries and volume variables to the element (all the elements in stencil)
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bind(element);
auto elemVolVars = localView(gridVolVars);
@@ -145,7 +145,7 @@ public:
BoxGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
template<class GridGeometry, class GridVolumeVariables, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry,
+ void update(const GridGeometry& gridGeometry,
const GridVolumeVariables& gridVolVars,
const SolutionVector& sol,
bool forceUpdate = false) {}
diff --git a/dumux/discretization/box/gridvolumevariables.hh b/dumux/discretization/box/gridvolumevariables.hh
index cae6119802..9a54ece6e4 100644
--- a/dumux/discretization/box/gridvolumevariables.hh
+++ b/dumux/discretization/box/gridvolumevariables.hh
@@ -75,18 +75,18 @@ public:
BoxGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
template<class GridGeometry, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol)
+ void update(const GridGeometry& gridGeometry, const SolutionVector& sol)
{
- volumeVariables_.resize(fvGridGeometry.gridView().size(0));
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ volumeVariables_.resize(gridGeometry.gridView().size(0));
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- auto eIdx = fvGridGeometry.elementMapper().index(element);
+ auto eIdx = gridGeometry.elementMapper().index(element);
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
// get the element solution
- auto elemSol = elementSolution(element, sol, fvGridGeometry);
+ auto elemSol = elementSolution(element, sol, gridGeometry);
// update the volvars of the element
volumeVariables_[eIdx].resize(fvGeometry.numScv());
@@ -140,7 +140,7 @@ public:
BoxGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
template<class GridGeometry, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) {}
+ void update(const GridGeometry& gridGeometry, const SolutionVector& sol) {}
const Problem& problem() const
{ return *problemPtr_;}
diff --git a/dumux/discretization/box/scvftoscvboundarytypes.hh b/dumux/discretization/box/scvftoscvboundarytypes.hh
index b7f511c1cf..569fb6c4f9 100644
--- a/dumux/discretization/box/scvftoscvboundarytypes.hh
+++ b/dumux/discretization/box/scvftoscvboundarytypes.hh
@@ -46,16 +46,16 @@ public:
// only do something for box
if (discMethod == DiscretizationMethod::box)
{
- const auto& fvGridGeometry = problem.gridGeometry();
- scvBoundaryTypes.resize(fvGridGeometry.vertexMapper().size());
+ const auto& gridGeometry = problem.gridGeometry();
+ scvBoundaryTypes.resize(gridGeometry.vertexMapper().size());
// set all equations to Neumann by default
for (std::size_t vIdx = 0; vIdx < scvBoundaryTypes.size(); vIdx++)
scvBoundaryTypes[vIdx].setAllNeumann();
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
// iterate over the scvfs
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
for (const auto& scvf : scvfs(fvGeometry))
diff --git a/dumux/discretization/cellcentered/connectivitymap.hh b/dumux/discretization/cellcentered/connectivitymap.hh
index b4e3332cdc..707ba3f09e 100644
--- a/dumux/discretization/cellcentered/connectivitymap.hh
+++ b/dumux/discretization/cellcentered/connectivitymap.hh
@@ -73,22 +73,22 @@ public:
/*!
* \brief Initialize the ConnectivityMap object.
*
- * \param fvGridGeometry The grid's finite volume geometry.
+ * \param gridGeometry The grid's finite volume geometry.
*/
- void update(const GridGeometry& fvGridGeometry)
+ void update(const GridGeometry& gridGeometry)
{
map_.clear();
- map_.resize(fvGridGeometry.gridView().size(0));
+ map_.resize(gridGeometry.gridView().size(0));
// container to store for each element J the elements I which have J in their flux stencil
Dune::ReservedVector<std::pair<GridIndexType, DataJ>, maxElemStencilSize> dataJForI;
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
// We are looking for the elements I, for which this element J is in the flux stencil
- const auto globalJ = fvGridGeometry.elementMapper().index(element);
+ const auto globalJ = gridGeometry.elementMapper().index(element);
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
// obtain the data of J in elements I
diff --git a/dumux/discretization/cellcentered/elementsolution.hh b/dumux/discretization/cellcentered/elementsolution.hh
index f0d65ffc33..5aabd0934e 100644
--- a/dumux/discretization/cellcentered/elementsolution.hh
+++ b/dumux/discretization/cellcentered/elementsolution.hh
@@ -52,8 +52,8 @@ public:
//! Constructor with element, solution vector and grid geometry
template<class SolutionVector>
CCElementSolution(const Element& element, const SolutionVector& sol,
- const GridGeometry& fvGridGeometry)
- : CCElementSolution(sol[fvGridGeometry.elementMapper().index(element)])
+ const GridGeometry& gridGeometry)
+ : CCElementSolution(sol[gridGeometry.elementMapper().index(element)])
{}
//! Constructor with element, element volume variables and fv element geometry
@@ -76,9 +76,9 @@ public:
//! extract the element solution from the solution vector using a mapper
template<class SolutionVector>
void update(const Element& element, const SolutionVector& sol,
- const GridGeometry& fvGridGeometry)
+ const GridGeometry& gridGeometry)
{
- priVars_ = sol[fvGridGeometry.elementMapper().index(element)];
+ priVars_ = sol[gridGeometry.elementMapper().index(element)];
}
//! return the size of the element solution
diff --git a/dumux/discretization/cellcentered/gridvolumevariables.hh b/dumux/discretization/cellcentered/gridvolumevariables.hh
index 0e2739e7e1..62897f109b 100644
--- a/dumux/discretization/cellcentered/gridvolumevariables.hh
+++ b/dumux/discretization/cellcentered/gridvolumevariables.hh
@@ -65,19 +65,19 @@ public:
CCGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
template<class GridGeometry, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol)
+ void update(const GridGeometry& gridGeometry, const SolutionVector& sol)
{
- const auto numScv = fvGridGeometry.numScv();
+ const auto numScv = gridGeometry.numScv();
volumeVariables_.resize(numScv);
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
{
- const auto elemSol = elementSolution(element, sol, fvGridGeometry);
+ const auto elemSol = elementSolution(element, sol, gridGeometry);
volumeVariables_[scv.dofIndex()].update(elemSol, problem(), element, scv);
}
}
@@ -137,7 +137,7 @@ public:
CCGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
template<class GridGeometry, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) {}
+ void update(const GridGeometry& gridGeometry, const SolutionVector& sol) {}
//! The problem we are solving
const Problem& problem() const
diff --git a/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh b/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
index 3c6940f60e..3c3485c53c 100644
--- a/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
@@ -162,8 +162,8 @@ public:
std::size_t numSecondaryIv; numSecondaryIv = 0;
std::size_t numCaches; numCaches = 0;
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
- const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets();
+ const auto& gridGeometry = fvGeometry.gridGeometry();
+ const auto& gridIvIndexSets = gridGeometry.gridInteractionVolumeIndexSets();
// lambda to check if a scvf was handled already
auto scvfHandled = [&] (auto idx)
@@ -191,21 +191,21 @@ public:
// search for ivs at boundary vertices
for (const auto& scvf : scvfs(fvGeometry))
- fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()) ?
+ gridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()) ?
handleScvf(scvf, gridIvIndexSets.secondaryIndexSet(scvf), true) :
handleScvf(scvf, gridIvIndexSets.primaryIndexSet(scvf), false) ;
// skip the rest if there are no boundary caches to be created
if (numCaches > 0)
{
- const auto& assemblyMapI = fvGridGeometry.connectivityMap()[fvGridGeometry.elementMapper().index(element)];
+ const auto& assemblyMapI = gridGeometry.connectivityMap()[gridGeometry.elementMapper().index(element)];
for (const auto& dataJ : assemblyMapI)
{
for (const auto& scvfJIdx : dataJ.scvfsJ)
{
const auto& scvfJ = fvGeometry.scvf(scvfJIdx);
- if (fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvfJ.vertexIndex()))
+ if (gridGeometry.vertexUsesSecondaryInteractionVolume(scvfJ.vertexIndex()))
handleScvf(scvfJ, gridIvIndexSets.secondaryIndexSet(scvfJ), true);
else
handleScvf(scvfJ, gridIvIndexSets.primaryIndexSet(scvfJ), false);
@@ -320,9 +320,9 @@ private:
template<class SubControlVolumeFace>
bool isEmbeddedInBoundaryIV_(const SubControlVolumeFace& scvf) const
{
- const auto& fvGridGeometry = gridFluxVarsCachePtr_->problem().gridGeometry();
- const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets();
- if (fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
+ const auto& gridGeometry = gridFluxVarsCachePtr_->problem().gridGeometry();
+ const auto& gridIvIndexSets = gridGeometry.gridInteractionVolumeIndexSets();
+ if (gridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
return gridIvIndexSets.secondaryIndexSet(scvf).nodalIndexSet().numBoundaryScvfs() > 0;
else
return gridIvIndexSets.primaryIndexSet(scvf).nodalIndexSet().numBoundaryScvfs() > 0;
@@ -397,10 +397,10 @@ public:
// some references for convenience
const auto& problem = gridFluxVarsCache().problem();
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
+ const auto& gridGeometry = fvGeometry.gridGeometry();
// the assembly map of the given element
- const auto& assemblyMapI = fvGridGeometry.connectivityMap()[fvGridGeometry.elementMapper().index(element)];
+ const auto& assemblyMapI = gridGeometry.connectivityMap()[gridGeometry.elementMapper().index(element)];
// reserve memory for scvf index container
unsigned int numNeighborScvfs = 0;
@@ -445,7 +445,7 @@ public:
for (const auto& dataJ : assemblyMapI)
{
- const auto elementJ = fvGridGeometry.element(dataJ.globalJ);
+ const auto elementJ = gridGeometry.element(dataJ.globalJ);
for (const auto scvfIdx : dataJ.scvfsJ)
{
auto& scvfCache = fluxVarsCache_[i++];
@@ -485,8 +485,8 @@ public:
if (FluxVariablesCacheFiller::isSolDependent)
{
const auto& problem = gridFluxVarsCache().problem();
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
- const auto& assemblyMapI = fvGridGeometry.connectivityMap()[fvGridGeometry.elementMapper().index(element)];
+ const auto& gridGeometry = fvGeometry.gridGeometry();
+ const auto& assemblyMapI = gridGeometry.connectivityMap()[gridGeometry.elementMapper().index(element)];
// helper class to fill flux variables caches
FluxVariablesCacheFiller filler(problem);
@@ -506,7 +506,7 @@ public:
for (const auto& dataJ : assemblyMapI)
{
- const auto elementJ = fvGridGeometry.element(dataJ.globalJ);
+ const auto elementJ = gridGeometry.element(dataJ.globalJ);
for (const auto scvfIdx : dataJ.scvfsJ)
{
auto& scvfCache = fluxVarsCache_[i++];
diff --git a/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh b/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
index 8d3ba2f196..83b6b3a93a 100644
--- a/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
+++ b/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
@@ -48,13 +48,13 @@ namespace CCMpfa {
template<class FVElementGeometry>
std::size_t maxNumBoundaryVolVars(const FVElementGeometry& fvGeometry)
{
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
- const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets();
+ const auto& gridGeometry = fvGeometry.gridGeometry();
+ const auto& gridIvIndexSets = gridGeometry.gridInteractionVolumeIndexSets();
std::size_t numBoundaryVolVars = 0;
for (const auto& scvf : scvfs(fvGeometry))
{
- if (!fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
+ if (!gridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
numBoundaryVolVars += gridIvIndexSets.primaryIndexSet(scvf).nodalIndexSet().numBoundaryScvfs();
else
numBoundaryVolVars += gridIvIndexSets.secondaryIndexSet(scvf).nodalIndexSet().numBoundaryScvfs();
@@ -138,12 +138,12 @@ namespace CCMpfa {
const typename FVElemGeom::GridGeometry::GridView::template Codim<0>::Entity& element,
const FVElemGeom& fvGeometry)
{
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
+ const auto& gridGeometry = fvGeometry.gridGeometry();
// treat the BCs inside the element
if (fvGeometry.hasBoundaryScvf())
{
- const auto boundElemIdx = fvGridGeometry.elementMapper().index(element);
+ const auto boundElemIdx = gridGeometry.elementMapper().index(element);
const auto& scvI = fvGeometry.scv(boundElemIdx);
for (const auto& scvf : scvfs(fvGeometry))
@@ -168,10 +168,10 @@ namespace CCMpfa {
}
// Update boundary volume variables in the neighbors
- const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets();
+ const auto& gridIvIndexSets = gridGeometry.gridInteractionVolumeIndexSets();
for (const auto& scvf : scvfs(fvGeometry))
{
- if (!fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
+ if (!gridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
addBoundaryVolVarsAtNode( volVars, volVarIndices, problem, element, fvGeometry,
gridIvIndexSets.primaryIndexSet(scvf).nodalIndexSet() );
else
@@ -307,11 +307,11 @@ public:
clear();
const auto& problem = gridVolVars().problem();
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
+ const auto& gridGeometry = fvGeometry.gridGeometry();
// stencil information
- const auto globalI = fvGridGeometry.elementMapper().index(element);
- const auto& assemblyMapI = fvGridGeometry.connectivityMap()[globalI];
+ const auto globalI = gridGeometry.elementMapper().index(element);
+ const auto& assemblyMapI = gridGeometry.connectivityMap()[globalI];
const auto numVolVars = assemblyMapI.size() + 1;
// resize local containers to the required size (for internal elements)
@@ -321,7 +321,7 @@ public:
VolumeVariables volVars;
const auto& scvI = fvGeometry.scv(globalI);
- volVars.update(elementSolution(element, sol, fvGridGeometry),
+ volVars.update(elementSolution(element, sol, gridGeometry),
problem,
element,
scvI);
@@ -332,10 +332,10 @@ public:
// Update the volume variables of the neighboring elements
for (auto&& dataJ : assemblyMapI)
{
- const auto& elementJ = fvGridGeometry.element(dataJ.globalJ);
+ const auto& elementJ = gridGeometry.element(dataJ.globalJ);
const auto& scvJ = fvGeometry.scv(dataJ.globalJ);
VolumeVariables volVarsJ;
- volVarsJ.update(elementSolution(elementJ, sol, fvGridGeometry),
+ volVarsJ.update(elementSolution(elementJ, sol, gridGeometry),
problem,
elementJ,
scvJ);
@@ -357,11 +357,11 @@ public:
// volVarIndices_.reserve(volVarIndices_.size() + additionalDofDependencies.size());
// for (auto globalJ : additionalDofDependencies)
// {
- // const auto& elementJ = fvGridGeometry.element(globalJ);
+ // const auto& elementJ = gridGeometry.element(globalJ);
// const auto& scvJ = fvGeometry.scv(globalJ);
// VolumeVariables additionalVolVars;
- // additionalVolVars.update(elementSolution(elementJ, sol, fvGridGeometry),
+ // additionalVolVars.update(elementSolution(elementJ, sol, gridGeometry),
// problem,
// elementJ,
// scvJ);
@@ -380,14 +380,14 @@ public:
{
clear();
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
- auto eIdx = fvGridGeometry.elementMapper().index(element);
+ const auto& gridGeometry = fvGeometry.gridGeometry();
+ auto eIdx = gridGeometry.elementMapper().index(element);
volumeVariables_.resize(1);
volVarIndices_.resize(1);
// update the volume variables of the element
const auto& scv = fvGeometry.scv(eIdx);
- volumeVariables_[0].update(elementSolution(element, sol, fvGridGeometry),
+ volumeVariables_[0].update(elementSolution(element, sol, gridGeometry),
gridVolVars().problem(),
element,
scv);
diff --git a/dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh b/dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh
index 5065db9def..0b1a77744d 100644
--- a/dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh
@@ -125,7 +125,7 @@ public:
//! When global caching is enabled, precompute transmissibilities for all scv faces
template<class GridGeometry, class GridVolumeVariables, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry,
+ void update(const GridGeometry& gridGeometry,
const GridVolumeVariables& gridVolVars,
const SolutionVector& sol,
bool forceUpdate = false)
@@ -139,7 +139,7 @@ public:
{
clear_();
- const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets();
+ const auto& gridIvIndexSets = gridGeometry.gridInteractionVolumeIndexSets();
const auto numPrimaryIvs = gridIvIndexSets.numPrimaryInteractionVolumes();
const auto numSecondaryIVs = gridIvIndexSets.numSecondaryInteractionVolumes();
ivDataStorage_.primaryInteractionVolumes.reserve(numPrimaryIvs);
@@ -148,7 +148,7 @@ public:
ivDataStorage_.secondaryDataHandles.reserve(numSecondaryIVs);
// reserve memory estimate for caches, interaction volumes and corresponding data
- fluxVarsCache_.resize(fvGridGeometry.numScvf());
+ fluxVarsCache_.resize(gridGeometry.numScvf());
}
// instantiate helper class to fill the caches
@@ -158,9 +158,9 @@ public:
for (auto& cache : fluxVarsCache_)
cache.setUpdateStatus(false);
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bind(element);
auto elemVolVars = localView(gridVolVars);
@@ -169,7 +169,7 @@ public:
// Prepare all caches of the scvfs inside the corresponding interaction volume. Skip
// those ivs that are touching a boundary, we only store the data on interior ivs here.
for (const auto& scvf : scvfs(fvGeometry))
- if (!isEmbeddedInBoundaryIV_(scvf, fvGridGeometry) && !fluxVarsCache_[scvf.index()].isUpdated())
+ if (!isEmbeddedInBoundaryIV_(scvf, gridGeometry) && !fluxVarsCache_[scvf.index()].isUpdated())
filler.fill(*this, fluxVarsCache_[scvf.index()], ivDataStorage_, element, fvGeometry, elemVolVars, scvf, forceUpdate);
}
}
@@ -184,8 +184,8 @@ public:
// solution-dependent stuff into the caches
if (FluxVariablesCacheFiller::isSolDependent)
{
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
- const auto& assemblyMapI = fvGridGeometry.connectivityMap()[fvGridGeometry.elementMapper().index(element)];
+ const auto& gridGeometry = fvGeometry.gridGeometry();
+ const auto& assemblyMapI = gridGeometry.connectivityMap()[gridGeometry.elementMapper().index(element)];
// helper class to fill flux variables caches
FluxVariablesCacheFiller filler(problem());
@@ -201,18 +201,18 @@ public:
for (const auto& scvf : scvfs(fvGeometry))
{
auto& scvfCache = fluxVarsCache_[scvf.index()];
- if (!isEmbeddedInBoundaryIV_(scvf, fvGridGeometry) && !scvfCache.isUpdated())
+ if (!isEmbeddedInBoundaryIV_(scvf, gridGeometry) && !scvfCache.isUpdated())
filler.fill(*this, scvfCache, ivDataStorage_, element, fvGeometry, elemVolVars, scvf);
}
for (const auto& dataJ : assemblyMapI)
{
- const auto elementJ = fvGridGeometry.element(dataJ.globalJ);
+ const auto elementJ = gridGeometry.element(dataJ.globalJ);
for (const auto scvfIdx : dataJ.scvfsJ)
{
auto& scvfCache = fluxVarsCache_[scvfIdx];
const auto& scvf = fvGeometry.scvf(scvfIdx);
- if (!isEmbeddedInBoundaryIV_(scvf, fvGridGeometry) && !scvfCache.isUpdated())
+ if (!isEmbeddedInBoundaryIV_(scvf, gridGeometry) && !scvfCache.isUpdated())
filler.fill(*this, scvfCache, ivDataStorage_, elementJ, fvGeometry, elemVolVars, scvf);
}
}
@@ -255,10 +255,10 @@ public:
private:
//! returns true if an scvf is contained in an interaction volume that touches the boundary
template<class SubControlVolumeFace, class GridGeometry>
- bool isEmbeddedInBoundaryIV_(const SubControlVolumeFace& scvf, const GridGeometry& fvGridGeometry) const
+ bool isEmbeddedInBoundaryIV_(const SubControlVolumeFace& scvf, const GridGeometry& gridGeometry) const
{
- const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets();
- if (fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
+ const auto& gridIvIndexSets = gridGeometry.gridInteractionVolumeIndexSets();
+ if (gridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
return gridIvIndexSets.secondaryIndexSet(scvf).nodalIndexSet().numBoundaryScvfs() > 0;
else
return gridIvIndexSets.primaryIndexSet(scvf).nodalIndexSet().numBoundaryScvfs() > 0;
@@ -323,7 +323,7 @@ public:
//! When global flux variables caching is disabled, we don't need to update the cache
template<class GridGeometry, class GridVolumeVariables, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry,
+ void update(const GridGeometry& gridGeometry,
const GridVolumeVariables& gridVolVars,
const SolutionVector& sol,
bool forceUpdate = false) {}
diff --git a/dumux/discretization/cellcentered/mpfa/gridinteractionvolumeindexsets.hh b/dumux/discretization/cellcentered/mpfa/gridinteractionvolumeindexsets.hh
index 9a56ecddb4..81c5e4e96d 100644
--- a/dumux/discretization/cellcentered/mpfa/gridinteractionvolumeindexsets.hh
+++ b/dumux/discretization/cellcentered/mpfa/gridinteractionvolumeindexsets.hh
@@ -57,10 +57,10 @@ public:
/*!
* \brief Construct all interaction volume index sets on the grid view
*
- * \param fvGridGeometry The finite volume geometry on the grid view
+ * \param gridGeometry The finite volume geometry on the grid view
* \param dualGridIdSet The index sets of the dual grid on the grid view
*/
- void update(GridGeometry& fvGridGeometry, DualGridIndexSet&& dualGridIdSet)
+ void update(GridGeometry& gridGeometry, DualGridIndexSet&& dualGridIdSet)
{
dualGridIndexSet_ = std::make_unique<DualGridIndexSet>(std::move(dualGridIdSet));
@@ -72,10 +72,10 @@ public:
// find out how many primary & secondary interaction volumes are needed
numPrimaryIV_ = 0;
numSecondaryIV_ = 0;
- for (const auto& vertex : vertices(fvGridGeometry.gridView()))
+ for (const auto& vertex : vertices(gridGeometry.gridView()))
{
- const auto vIdxGlobal = fvGridGeometry.vertexMapper().index(vertex);
- if (!fvGridGeometry.vertexUsesSecondaryInteractionVolume(vIdxGlobal))
+ const auto vIdxGlobal = gridGeometry.vertexMapper().index(vertex);
+ if (!gridGeometry.vertexUsesSecondaryInteractionVolume(vIdxGlobal))
numPrimaryIV_ += PrimaryInteractionVolume::numIVAtVertex((*dualGridIndexSet_)[vIdxGlobal]);
else
numSecondaryIV_ += SecondaryInteractionVolume::numIVAtVertex((*dualGridIndexSet_)[vIdxGlobal]);
@@ -84,22 +84,22 @@ public:
// reserve memory
primaryIVIndexSets_.reserve(numPrimaryIV_);
secondaryIVIndexSets_.reserve(numSecondaryIV_);
- scvfIndexMap_.resize(fvGridGeometry.numScvf());
+ scvfIndexMap_.resize(gridGeometry.numScvf());
// create interaction volume index sets around each vertex
- for (const auto& vertex : vertices(fvGridGeometry.gridView()))
+ for (const auto& vertex : vertices(gridGeometry.gridView()))
{
- const auto vIdxGlobal = fvGridGeometry.vertexMapper().index(vertex);
- if (!fvGridGeometry.vertexUsesSecondaryInteractionVolume(vIdxGlobal))
+ const auto vIdxGlobal = gridGeometry.vertexMapper().index(vertex);
+ if (!gridGeometry.vertexUsesSecondaryInteractionVolume(vIdxGlobal))
PrimaryInteractionVolume::addIVIndexSets(primaryIVIndexSets_,
scvfIndexMap_,
(*dualGridIndexSet_)[vIdxGlobal],
- fvGridGeometry.flipScvfIndexSet());
+ gridGeometry.flipScvfIndexSet());
else
SecondaryInteractionVolume::addIVIndexSets(secondaryIVIndexSets_,
scvfIndexMap_,
(*dualGridIndexSet_)[vIdxGlobal],
- fvGridGeometry.flipScvfIndexSet());
+ gridGeometry.flipScvfIndexSet());
}
}
diff --git a/dumux/discretization/cellcentered/mpfa/scvgradients.hh b/dumux/discretization/cellcentered/mpfa/scvgradients.hh
index eb783e6a6e..bb4f4c9ddc 100644
--- a/dumux/discretization/cellcentered/mpfa/scvgradients.hh
+++ b/dumux/discretization/cellcentered/mpfa/scvgradients.hh
@@ -53,14 +53,14 @@ public:
/*!
* \brief Computes the phase velocities in the scvs of the grid.
*
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param gridVariables The variables living on the grid
* \param x The vector containing the solution
* \param phaseIdx The index of the fluid phase to be considered
*/
template<class GridGeometry, class GridVariables, class SolutionVector>
static ResultPair<GridGeometry, typename GridVariables::Scalar>
- computeVelocities(const GridGeometry& fvGridGeometry,
+ computeVelocities(const GridGeometry& gridGeometry,
const GridVariables& gridVariables,
const SolutionVector& x,
unsigned int phaseIdx)
@@ -72,32 +72,32 @@ public:
return vel;
};
- return computePressureGradients(fvGridGeometry, gridVariables, x, phaseIdx, gradToVelocity);
+ return computePressureGradients(gridGeometry, gridVariables, x, phaseIdx, gradToVelocity);
}
/*!
* \brief Computes the pressure gradients in the scvs of the grid.
*
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param gridVariables The variables living on the grid
* \param x The vector containing the solution
* \param phaseIdx The index of the fluid phase to be considered
*/
template<class GridGeometry, class GridVariables, class SolutionVector>
static ResultPair<GridGeometry, typename GridVariables::Scalar>
- computePressureGradients(const GridGeometry& fvGridGeometry,
+ computePressureGradients(const GridGeometry& gridGeometry,
const GridVariables& gridVariables,
const SolutionVector& x,
unsigned int phaseIdx)
{
auto f = [] (const auto& grad, const auto& volVars) { return grad; };
- return computePressureGradients(fvGridGeometry, gridVariables, x, phaseIdx, f);
+ return computePressureGradients(gridGeometry, gridVariables, x, phaseIdx, f);
}
/*!
* \brief Computes the pressure gradients in the scvs of the grid.
*
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param gridVariables The variables living on the grid
* \param x The vector containing the solution
* \param phaseIdx The index of the fluid phase to be considered
@@ -112,7 +112,7 @@ public:
*/
template<class GridGeometry, class GridVariables, class SolutionVector, class F>
static ResultPair<GridGeometry, typename GridVariables::Scalar>
- computePressureGradients(const GridGeometry& fvGridGeometry,
+ computePressureGradients(const GridGeometry& gridGeometry,
const GridVariables& gridVariables,
const SolutionVector& x,
unsigned int phaseIdx,
@@ -138,7 +138,7 @@ public:
}
};
- return computeGradients_(fvGridGeometry, gridVariables, x, handleFunction);
+ return computeGradients_(gridGeometry, gridVariables, x, handleFunction);
}
private:
@@ -148,7 +148,7 @@ private:
*/
template<class GridGeometry, class GridVariables, class SolutionVector, class HandleFunction>
static ResultPair<GridGeometry, typename GridVariables::Scalar>
- computeGradients_(const GridGeometry& fvGridGeometry,
+ computeGradients_(const GridGeometry& gridGeometry,
const GridVariables& gridVariables,
const SolutionVector& x,
const HandleFunction& handleFunction)
@@ -158,7 +158,7 @@ private:
// first, find out how many scvs live on this grid
std::size_t numScvs = 0;
- const auto& gridView = fvGridGeometry.gridView();
+ const auto& gridView = gridGeometry.gridView();
for (const auto& element : elements(gridView))
numScvs += element.subEntities(dim);
@@ -171,7 +171,7 @@ private:
{
bool allFinished = true;
for (int i = 0; i < element.subEntities(dim); ++i)
- if (!vertexHandled[fvGridGeometry.vertexMapper().subIndex(element, i, dim)])
+ if (!vertexHandled[gridGeometry.vertexMapper().subIndex(element, i, dim)])
allFinished = false;
// bind views only if there is unfinished buisness
@@ -179,7 +179,7 @@ private:
continue;
// compute gradients in all scvs of all interaction volumes in this element
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
auto elemVolVars = localView(gridVariables.curGridVolVars());
auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
fvGeometry.bind(element);
@@ -191,7 +191,7 @@ private:
if (vertexHandled[scvf.vertexIndex()])
continue;
- if (fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
+ if (gridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
{
const auto& iv = elemFluxVarsCache.secondaryInteractionVolume(scvf);
const auto& handle = elemFluxVarsCache.secondaryDataHandle(scvf);
diff --git a/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh b/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
index b6686a5dd5..44afab9f1e 100644
--- a/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
@@ -159,9 +159,9 @@ public:
const ElementVolumeVariables& elemVolVars)
{
const auto& problem = gridFluxVarsCache().problem();
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
- const auto globalI = fvGridGeometry.elementMapper().index(element);
- const auto& connectivityMapI = fvGridGeometry.connectivityMap()[globalI];
+ const auto& gridGeometry = fvGeometry.gridGeometry();
+ const auto globalI = gridGeometry.elementMapper().index(element);
+ const auto& connectivityMapI = gridGeometry.connectivityMap()[globalI];
const auto numNeighbors = connectivityMapI.size();
// instantiate helper class to fill the caches
@@ -186,7 +186,7 @@ public:
// add required data on the scv faces in the neighboring elements
for (unsigned int localIdxJ = 0; localIdxJ < numNeighbors; ++localIdxJ)
{
- const auto elementJ = fvGridGeometry.element(connectivityMapI[localIdxJ].globalJ);
+ const auto elementJ = gridGeometry.element(connectivityMapI[localIdxJ].globalJ);
for (auto scvfIdx : connectivityMapI[localIdxJ].scvfsJ)
{
auto&& scvfJ = fvGeometry.scvf(scvfIdx);
diff --git a/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh b/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
index 4344892d3f..e10d37ac5c 100644
--- a/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
+++ b/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
@@ -182,9 +182,9 @@ public:
clear_();
const auto& problem = gridVolVars().problem();
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
- const auto globalI = fvGridGeometry.elementMapper().index(element);
- const auto& connectivityMapI = fvGridGeometry.connectivityMap()[globalI];
+ const auto& gridGeometry = fvGeometry.gridGeometry();
+ const auto globalI = gridGeometry.elementMapper().index(element);
+ const auto& connectivityMapI = gridGeometry.connectivityMap()[globalI];
const auto numDofs = connectivityMapI.size() + 1;
// resize local containers to the required size (for internal elements)
@@ -194,7 +194,7 @@ public:
// update the volume variables of the element at hand
auto&& scvI = fvGeometry.scv(globalI);
- volumeVariables_[localIdx].update(elementSolution(element, sol, fvGridGeometry),
+ volumeVariables_[localIdx].update(elementSolution(element, sol, gridGeometry),
problem,
element,
scvI);
@@ -204,9 +204,9 @@ public:
// Update the volume variables of the neighboring elements
for (const auto& dataJ : connectivityMapI)
{
- const auto& elementJ = fvGridGeometry.element(dataJ.globalJ);
+ const auto& elementJ = gridGeometry.element(dataJ.globalJ);
auto&& scvJ = fvGeometry.scv(dataJ.globalJ);
- volumeVariables_[localIdx].update(elementSolution(elementJ, sol, fvGridGeometry),
+ volumeVariables_[localIdx].update(elementSolution(elementJ, sol, gridGeometry),
problem,
elementJ,
scvJ);
@@ -250,10 +250,10 @@ public:
// volVarIndices_.resize(volVarIndices_.size() + additionalDofDependencies.size());
// for (auto globalJ : additionalDofDependencies)
// {
- // const auto& elementJ = fvGridGeometry.element(globalJ);
+ // const auto& elementJ = gridGeometry.element(globalJ);
// auto&& scvJ = fvGeometry.scv(globalJ);
- // volumeVariables_[localIdx].update(elementSolution(elementJ, sol, fvGridGeometry),
+ // volumeVariables_[localIdx].update(elementSolution(elementJ, sol, gridGeometry),
// problem,
// elementJ,
// scvJ);
diff --git a/dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh b/dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh
index 6bdc744e92..f368da20db 100644
--- a/dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh
@@ -88,7 +88,7 @@ public:
// When global caching is enabled, precompute transmissibilities and stencils for all the scv faces
template<class GridGeometry, class GridVolumeVariables, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry,
+ void update(const GridGeometry& gridGeometry,
const GridVolumeVariables& gridVolVars,
const SolutionVector& sol,
bool forceUpdate = false)
@@ -99,11 +99,11 @@ public:
// instantiate helper class to fill the caches
FluxVariablesCacheFiller filler(problem());
- fluxVarsCache_.resize(fvGridGeometry.numScvf());
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ fluxVarsCache_.resize(gridGeometry.numScvf());
+ for (const auto& element : elements(gridGeometry.gridView()))
{
// Prepare the geometries within the elements of the stencil
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bind(element);
auto elemVolVars = localView(gridVolVars);
@@ -195,7 +195,7 @@ public:
//! When global flux variables caching is disabled, we don't need to update the cache
template<class GridGeometry, class GridVolumeVariables, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry,
+ void update(const GridGeometry& gridGeometry,
const GridVolumeVariables& gridVolVars,
const SolutionVector& sol,
bool forceUpdate = false) {}
diff --git a/dumux/discretization/evalgradients.hh b/dumux/discretization/evalgradients.hh
index 555dc8a350..e891f65957 100644
--- a/dumux/discretization/evalgradients.hh
+++ b/dumux/discretization/evalgradients.hh
@@ -42,7 +42,7 @@ namespace Dumux {
*
* \param element The element
* \param geometry The element geometry
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param elemSol The primary variables at the dofs of the element
* \param globalPos The global position
* \param ignoreState If true, the state of primary variables is ignored
@@ -54,7 +54,7 @@ namespace Dumux {
template<class Element, class FVElementGeometry, class PrimaryVariables>
auto evalGradients(const Element& element,
const typename Element::Geometry& geometry,
- const typename FVElementGeometry::GridGeometry& fvGridGeometry,
+ const typename FVElementGeometry::GridGeometry& gridGeometry,
const BoxElementSolution<FVElementGeometry, PrimaryVariables>& elemSol,
const typename Element::Geometry::GlobalCoordinate& globalPos,
bool ignoreState = false)
@@ -68,7 +68,7 @@ auto evalGradients(const Element& element,
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
// evaluate gradients using the local finite element basis
- const auto& localBasis = fvGridGeometry.feCache().get(geometry.type()).localBasis();
+ const auto& localBasis = gridGeometry.feCache().get(geometry.type()).localBasis();
// evaluate the shape function gradients at the scv center
using ShapeJacobian = typename std::decay_t< decltype(localBasis) >::Traits::JacobianType;
@@ -114,7 +114,7 @@ auto evalGradients(const Element& element,
*
* \param element The element
* \param geometry The element geometry
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param elemSol The primary variables at the dofs of the element
* \param globalPos The global position
* \throws Dune::NotImplemented
@@ -127,7 +127,7 @@ template<class Element, class FVElementGeometry, class PrimaryVariables>
Dune::FieldVector<typename Element::Geometry::GlobalCoordinate, PrimaryVariables::dimension>
evalGradients(const Element& element,
const typename Element::Geometry& geometry,
- const typename FVElementGeometry::GridGeometry& fvGridGeometry,
+ const typename FVElementGeometry::GridGeometry& gridGeometry,
const CCElementSolution<FVElementGeometry, PrimaryVariables>& elemSol,
const typename Element::Geometry::GlobalCoordinate& globalPos)
{ DUNE_THROW(Dune::NotImplemented, "General gradient evaluation for cell-centered methods"); }
diff --git a/dumux/discretization/evalsolution.hh b/dumux/discretization/evalsolution.hh
index 56cc98e815..bfe27da98b 100644
--- a/dumux/discretization/evalsolution.hh
+++ b/dumux/discretization/evalsolution.hh
@@ -86,7 +86,7 @@ auto minDistVertexSol(const Geometry& geometry, const typename Geometry::GlobalC
* \return the interpolated primary variables
* \param element The element
* \param geometry The element geometry
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param elemSol The primary variables at the dofs of the element
* \param globalPos The global position
* \param ignoreState If true, the state of primary variables is ignored
@@ -94,7 +94,7 @@ auto minDistVertexSol(const Geometry& geometry, const typename Geometry::GlobalC
template<class Element, class FVElementGeometry, class PrimaryVariables>
PrimaryVariables evalSolution(const Element& element,
const typename Element::Geometry& geometry,
- const typename FVElementGeometry::GridGeometry& fvGridGeometry,
+ const typename FVElementGeometry::GridGeometry& gridGeometry,
const BoxElementSolution<FVElementGeometry, PrimaryVariables>& elemSol,
const typename Element::Geometry::GlobalCoordinate& globalPos,
bool ignoreState = false)
@@ -108,7 +108,7 @@ PrimaryVariables evalSolution(const Element& element,
using Scalar = typename PrimaryVariables::value_type;
// interpolate the solution
- const auto& localBasis = fvGridGeometry.feCache().get(geometry.type()).localBasis();
+ const auto& localBasis = gridGeometry.feCache().get(geometry.type()).localBasis();
// evaluate the shape functions at the scv center
const auto localPos = geometry.local(globalPos);
@@ -150,7 +150,7 @@ PrimaryVariables evalSolution(const Element& element,
* \ingroup Discretization
* \brief Interpolates a given box element solution at a given global position.
*
- * Overload of the above evalSolution() function without a given fvGridGeometry.
+ * Overload of the above evalSolution() function without a given gridGeometry.
* The local basis is computed on the fly.
*
* \return the interpolated primary variables
@@ -228,7 +228,7 @@ PrimaryVariables evalSolution(const Element& element,
* \return the primary variables (constant over the element)
* \param element The element
* \param geometry The element geometry
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param elemSol The primary variables at the dofs of the element
* \param globalPos The global position
* \param ignoreState If true, the state of primary variables is ignored
@@ -236,7 +236,7 @@ PrimaryVariables evalSolution(const Element& element,
template<class Element, class FVElementGeometry, class PrimaryVariables>
PrimaryVariables evalSolution(const Element& element,
const typename Element::Geometry& geometry,
- const typename FVElementGeometry::GridGeometry& fvGridGeometry,
+ const typename FVElementGeometry::GridGeometry& gridGeometry,
const CCElementSolution<FVElementGeometry, PrimaryVariables>& elemSol,
const typename Element::Geometry::GlobalCoordinate& globalPos,
bool ignoreState = false)
@@ -246,7 +246,7 @@ PrimaryVariables evalSolution(const Element& element,
/*!
* \brief Interpolates a given cell-centered element solution at a given global position.
- * Overload of the above evalSolution() function without a given fvGridGeometry.
+ * Overload of the above evalSolution() function without a given gridGeometry.
* For compatibility reasons with the box scheme.
* \ingroup Discretization
*
diff --git a/dumux/discretization/fluxstencil.hh b/dumux/discretization/fluxstencil.hh
index 9d0169466b..f671e143b3 100644
--- a/dumux/discretization/fluxstencil.hh
+++ b/dumux/discretization/fluxstencil.hh
@@ -113,13 +113,13 @@ public:
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf)
{
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
+ const auto& gridGeometry = fvGeometry.gridGeometry();
// return the scv (element) indices in the interaction region
- if (fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
- return fvGridGeometry.gridInteractionVolumeIndexSets().secondaryIndexSet(scvf).gridScvIndices();
+ if (gridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
+ return gridGeometry.gridInteractionVolumeIndexSets().secondaryIndexSet(scvf).gridScvIndices();
else
- return fvGridGeometry.gridInteractionVolumeIndexSets().primaryIndexSet(scvf).gridScvIndices();
+ return gridGeometry.gridInteractionVolumeIndexSets().primaryIndexSet(scvf).gridScvIndices();
}
};
diff --git a/dumux/discretization/staggered/facesolution.hh b/dumux/discretization/staggered/facesolution.hh
index de9db2aeb0..58aa36181e 100644
--- a/dumux/discretization/staggered/facesolution.hh
+++ b/dumux/discretization/staggered/facesolution.hh
@@ -44,10 +44,10 @@ public:
template<class SubControlVolumeFace, class GridGeometry>
StaggeredFaceSolution(const SubControlVolumeFace& scvf, const FaceSolutionVector& sol,
- const GridGeometry& fvGridGeometry)
+ const GridGeometry& gridGeometry)
{
- const auto& connectivityMap = fvGridGeometry.connectivityMap();
+ const auto& connectivityMap = gridGeometry.connectivityMap();
const auto& stencil = connectivityMap(GridGeometry::faceIdx(), GridGeometry::faceIdx(), scvf.index());
facePriVars_.reserve(stencil.size()+1);
diff --git a/dumux/discretization/staggered/freeflow/connectivitymap.hh b/dumux/discretization/staggered/freeflow/connectivitymap.hh
index 295ddd1b2d..c9a06874f9 100644
--- a/dumux/discretization/staggered/freeflow/connectivitymap.hh
+++ b/dumux/discretization/staggered/freeflow/connectivitymap.hh
@@ -58,27 +58,27 @@ class StaggeredFreeFlowConnectivityMap
public:
//! Update the map and prepare the stencils
- void update(const GridGeometry& fvGridGeometry)
+ void update(const GridGeometry& gridGeometry)
{
- const auto numDofsCC = fvGridGeometry.gridView().size(0);
- const auto numDofsFace = fvGridGeometry.gridView().size(1);
- const auto numBoundaryFacets = fvGridGeometry.numBoundaryScvf();
+ const auto numDofsCC = gridGeometry.gridView().size(0);
+ const auto numDofsFace = gridGeometry.gridView().size(1);
+ const auto numBoundaryFacets = gridGeometry.numBoundaryScvf();
cellCenterToCellCenterMap_.resize(numDofsCC);
cellCenterToFaceMap_.resize(numDofsCC);
faceToCellCenterMap_.resize(2*numDofsFace - numBoundaryFacets);
faceToFaceMap_.resize(2*numDofsFace - numBoundaryFacets);
- for(auto&& element: elements(fvGridGeometry.gridView()))
+ for(auto&& element: elements(gridGeometry.gridView()))
{
// restrict the FvGeometry locally and bind to the element
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
// loop over sub control faces
for (auto&& scvf : scvfs(fvGeometry))
{
// handle the cell center dof stencils first
- const auto dofIdxCellCenter = fvGridGeometry.elementMapper().index(element);
+ const auto dofIdxCellCenter = gridGeometry.elementMapper().index(element);
// the stencil for cell center dofs w.r.t. to other cell center dofs,
// includes all neighboring element indices
diff --git a/dumux/discretization/staggered/freeflow/elementvolumevariables.hh b/dumux/discretization/staggered/freeflow/elementvolumevariables.hh
index 7c57103a7c..67b0acd3fc 100644
--- a/dumux/discretization/staggered/freeflow/elementvolumevariables.hh
+++ b/dumux/discretization/staggered/freeflow/elementvolumevariables.hh
@@ -209,9 +209,9 @@ public:
clear_();
const auto& problem = gridVolVars().problem();
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
- const auto globalI = fvGridGeometry.elementMapper().index(element);
- const auto& map = fvGridGeometry.connectivityMap();
+ const auto& gridGeometry = fvGeometry.gridGeometry();
+ const auto globalI = gridGeometry.elementMapper().index(element);
+ const auto& map = gridGeometry.connectivityMap();
constexpr auto cellCenterIdx = FVElementGeometry::GridGeometry::cellCenterIdx();
const auto& connectivityMapI = map(cellCenterIdx, cellCenterIdx, globalI);
const auto numDofs = connectivityMapI.size();
@@ -226,7 +226,7 @@ public:
// Lambda to update the volume variables of the given index
auto doVolVarUpdate = [&](int globalJ)
{
- const auto& elementJ = fvGridGeometry.element(globalJ);
+ const auto& elementJ = gridGeometry.element(globalJ);
auto&& scvJ = fvGeometry.scv(globalJ);
const auto elemSol = makeElementSolutionFromCellCenterPrivars<PrimaryVariables>(sol[globalJ]);
volumeVariables_[localIdx].update(elemSol,
diff --git a/dumux/discretization/staggered/freeflow/gridvolumevariables.hh b/dumux/discretization/staggered/freeflow/gridvolumevariables.hh
index 2a50ea4608..7170c40cd6 100644
--- a/dumux/discretization/staggered/freeflow/gridvolumevariables.hh
+++ b/dumux/discretization/staggered/freeflow/gridvolumevariables.hh
@@ -160,14 +160,14 @@ public:
//! Update all volume variables
template<class GridGeometry, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol)
+ void update(const GridGeometry& gridGeometry, const SolutionVector& sol)
{
- auto numScv = fvGridGeometry.numScv();
+ auto numScv = gridGeometry.numScv();
volumeVariables_.resize(numScv);
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
@@ -240,7 +240,7 @@ public:
StaggeredGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
template<class GridGeometry, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) {}
+ void update(const GridGeometry& gridGeometry, const SolutionVector& sol) {}
const Problem& problem() const
{ return *problemPtr_;}
diff --git a/dumux/discretization/staggered/fvgridgeometry.hh b/dumux/discretization/staggered/fvgridgeometry.hh
index ac8bc79ccb..72f1f40ea1 100644
--- a/dumux/discretization/staggered/fvgridgeometry.hh
+++ b/dumux/discretization/staggered/fvgridgeometry.hh
@@ -34,7 +34,7 @@ namespace Dumux {
/*!
* \ingroup StaggeredDiscretization
* \brief Base class for cell center of face specific auxiliary FvGridGeometry classes.
- * Provides a common interface and a pointer to the actual fvGridGeometry.
+ * Provides a common interface and a pointer to the actual gridGeometry.
*/
template<class ActualFVGridGeometry>
class GridGeometryView
@@ -97,7 +97,7 @@ public:
{ return fvGridGeometry_->elementMapper(); }
/*!
- * \brief Returns the actual fvGridGeometry we are a restriction of
+ * \brief Returns the actual gridGeometry we are a restriction of
*/
const ActualFVGridGeometry& actualfvGridGeometry() const
{ return *fvGridGeometry_; }
diff --git a/dumux/discretization/staggered/gridfacevariables.hh b/dumux/discretization/staggered/gridfacevariables.hh
index 6ba564f6b5..f6c5eb6315 100644
--- a/dumux/discretization/staggered/gridfacevariables.hh
+++ b/dumux/discretization/staggered/gridfacevariables.hh
@@ -82,14 +82,14 @@ public:
//! Update all face variables
template<class GridGeometry, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry, const SolutionVector& faceSol)
+ void update(const GridGeometry& gridGeometry, const SolutionVector& faceSol)
{
- faceVariables_.resize(fvGridGeometry.numScvf());
+ faceVariables_.resize(gridGeometry.numScvf());
- for(auto&& element : elements(fvGridGeometry.gridView()))
+ for(auto&& element : elements(gridGeometry.gridView()))
{
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
for(auto&& scvf : scvfs(fvGeometry))
@@ -138,7 +138,7 @@ public:
//! Do nothing here.
template<class GridGeometry, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) {}
+ void update(const GridGeometry& gridGeometry, const SolutionVector& sol) {}
const Problem& problem() const
{ return *problemPtr_; }
diff --git a/dumux/discretization/staggered/gridfluxvariablescache.hh b/dumux/discretization/staggered/gridfluxvariablescache.hh
index c95f7679b1..ff6d9273bc 100644
--- a/dumux/discretization/staggered/gridfluxvariablescache.hh
+++ b/dumux/discretization/staggered/gridfluxvariablescache.hh
@@ -98,7 +98,7 @@ public:
// When global caching is enabled, precompute transmissibilities and stencils for all the scv faces
template<class GridGeometry, class GridVolumeVariables, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry,
+ void update(const GridGeometry& gridGeometry,
const GridVolumeVariables& gridVolVars,
const SolutionVector& sol,
bool forceUpdate = false)
@@ -110,11 +110,11 @@ public:
// FluxVariablesCacheFiller filler(problem()); TODO: use proper ctor
FluxVariablesCacheFiller filler(problem());
- fluxVarsCache_.resize(fvGridGeometry.numScvf());
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ fluxVarsCache_.resize(gridGeometry.numScvf());
+ for (const auto& element : elements(gridGeometry.gridView()))
{
// Prepare the geometries within the elements of the stencil
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bind(element);
auto elemVolVars = localView(gridVolVars);
@@ -188,7 +188,7 @@ public:
// When global caching is enabled, precompute transmissibilities and stencils for all the scv faces
template<class GridGeometry, class GridVolumeVariables, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry,
+ void update(const GridGeometry& gridGeometry,
const GridVolumeVariables& gridVolVars,
const SolutionVector& sol,
bool forceUpdate = false) {}
diff --git a/dumux/freeflow/navierstokes/problem.hh b/dumux/freeflow/navierstokes/problem.hh
index c71fa0c2f9..6887765131 100644
--- a/dumux/freeflow/navierstokes/problem.hh
+++ b/dumux/freeflow/navierstokes/problem.hh
@@ -93,11 +93,11 @@ class NavierStokesProblem : public NavierStokesParentProblem<TypeTag>
public:
/*!
* \brief The constructor
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param paramGroup The parameter group in which to look for runtime parameters first (default is "")
*/
- NavierStokesProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ NavierStokesProblem(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry, paramGroup)
, gravity_(0.0)
{
if (getParamFromGroup<bool>(paramGroup, "Problem.EnableGravity"))
diff --git a/dumux/freeflow/rans/oneeq/problem.hh b/dumux/freeflow/rans/oneeq/problem.hh
index 24cefd36ec..3b7d889cc8 100644
--- a/dumux/freeflow/rans/oneeq/problem.hh
+++ b/dumux/freeflow/rans/oneeq/problem.hh
@@ -66,8 +66,8 @@ class RANSProblemImpl<TypeTag, TurbulenceModel::oneeq> : public RANSProblemBase<
public:
//! The constructor sets the gravity, if desired by the user.
- RANSProblemImpl(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ RANSProblemImpl(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry, paramGroup)
{
useStoredEddyViscosity_ = getParamFromGroup<bool>(this->paramGroup(),
"RANS.UseStoredEddyViscosity", false);
diff --git a/dumux/freeflow/rans/problem.hh b/dumux/freeflow/rans/problem.hh
index 4bf26f17f9..1ba65564b5 100644
--- a/dumux/freeflow/rans/problem.hh
+++ b/dumux/freeflow/rans/problem.hh
@@ -82,11 +82,11 @@ class RANSProblemBase : public NavierStokesProblem<TypeTag>
public:
/*!
* \brief The constructor
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param paramGroup The parameter group in which to look for runtime parameters first (default is "")
*/
- RANSProblemBase(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ RANSProblemBase(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry, paramGroup)
{ }
/*!
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
index dedcfbcfe2..40fccef2c3 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
@@ -83,8 +83,8 @@ class RANSProblemImpl<TypeTag, TurbulenceModel::kepsilon> : public RANSProblemBa
public:
//! The constructor sets the gravity, if desired by the user.
- RANSProblemImpl(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ RANSProblemImpl(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry, paramGroup)
{
yPlusThreshold_ = getParamFromGroup<Scalar>(this->paramGroup(), "KEpsilon.YPlusThreshold", 30);
useStoredEddyViscosity_ = getParamFromGroup<bool>(this->paramGroup(), "RANS.UseStoredEddyViscosity", false);
diff --git a/dumux/freeflow/rans/twoeq/komega/problem.hh b/dumux/freeflow/rans/twoeq/komega/problem.hh
index ea4f67949d..808d86be29 100644
--- a/dumux/freeflow/rans/twoeq/komega/problem.hh
+++ b/dumux/freeflow/rans/twoeq/komega/problem.hh
@@ -62,8 +62,8 @@ class RANSProblemImpl<TypeTag, TurbulenceModel::komega> : public RANSProblemBase
using DimVector = typename Element::Geometry::GlobalCoordinate;
public:
- RANSProblemImpl(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ RANSProblemImpl(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry, paramGroup)
{
useStoredEddyViscosity_ = getParamFromGroup<bool>(this->paramGroup(), "RANS.UseStoredEddyViscosity", false);
}
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/problem.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/problem.hh
index 0166607d99..0119d0792a 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/problem.hh
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/problem.hh
@@ -60,8 +60,8 @@ class RANSProblemImpl<TypeTag, TurbulenceModel::lowrekepsilon> : public RANSProb
public:
//! The constructor sets the gravity, if desired by the user.
- RANSProblemImpl(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ RANSProblemImpl(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry, paramGroup)
{
useStoredEddyViscosity_ = getParamFromGroup<bool>(this->paramGroup(), "RANS.UseStoredEddyViscosity", true);
}
diff --git a/dumux/freeflow/rans/zeroeq/problem.hh b/dumux/freeflow/rans/zeroeq/problem.hh
index c421ddd91b..0a439a5828 100644
--- a/dumux/freeflow/rans/zeroeq/problem.hh
+++ b/dumux/freeflow/rans/zeroeq/problem.hh
@@ -72,11 +72,11 @@ class RANSProblemImpl<TypeTag, TurbulenceModel::zeroeq> : public RANSProblemBase
public:
/*!
* \brief The constructor
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param paramGroup The parameter group in which to look for runtime parameters first (default is "")
*/
- RANSProblemImpl(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ RANSProblemImpl(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry, paramGroup)
{
eddyViscosityModel_ = getParamFromGroup<std::string>(paramGroup, "RANS.EddyViscosityModel", "vanDriest");
}
diff --git a/dumux/freeflow/shallowwater/problem.hh b/dumux/freeflow/shallowwater/problem.hh
index f088dcde47..f10bb09849 100644
--- a/dumux/freeflow/shallowwater/problem.hh
+++ b/dumux/freeflow/shallowwater/problem.hh
@@ -46,27 +46,27 @@ public:
/*!
* \brief Constructor, passing the spatial parameters
*
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param spatialParams The spatial parameter class
* \param paramGroup The parameter group in which to look for runtime parameters first (default is "")
*/
- ShallowWaterProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ ShallowWaterProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<SpatialParams> spatialParams,
const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ : ParentType(gridGeometry, paramGroup)
, spatialParams_(spatialParams)
{}
/*!
* \brief Constructor, constructing the spatial parameters
*
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param paramGroup The parameter group in which to look for runtime parameters first (default is "")
*/
- ShallowWaterProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ ShallowWaterProblem(std::shared_ptr<const GridGeometry> gridGeometry,
const std::string& paramGroup = "")
- : ShallowWaterProblem(fvGridGeometry,
- std::make_shared<SpatialParams>(fvGridGeometry),
+ : ShallowWaterProblem(gridGeometry,
+ std::make_shared<SpatialParams>(gridGeometry),
paramGroup)
{}
diff --git a/dumux/io/loadsolution.hh b/dumux/io/loadsolution.hh
index 69dc499ebf..224254c1cb 100644
--- a/dumux/io/loadsolution.hh
+++ b/dumux/io/loadsolution.hh
@@ -102,7 +102,7 @@ template <class SolutionVector, class PvNameFunc, class GridGeometry>
auto loadSolutionFromVtkFile(SolutionVector& sol,
const std::string fileName,
PvNameFunc&& pvNameFunc,
- const GridGeometry& fvGridGeometry,
+ const GridGeometry& gridGeometry,
const VTKReader::DataType& dataType)
-> typename std::enable_if_t<!decltype(isValid(Detail::hasState())(sol[0]))::value, void>
{
@@ -119,9 +119,9 @@ auto loadSolutionFromVtkFile(SolutionVector& sol,
if (dataType == VTKReader::DataType::cellData)
{
std::size_t i = 0;
- for (const auto& element : elements(fvGridGeometry.gridView(), Dune::Partitions::interior))
+ for (const auto& element : elements(gridGeometry.gridView(), Dune::Partitions::interior))
{
- const auto eIdx = fvGridGeometry.elementMapper().index(element);
+ const auto eIdx = gridGeometry.elementMapper().index(element);
sol[eIdx][pvIdx] = vec[i++];
}
}
@@ -137,12 +137,12 @@ auto loadSolutionFromVtkFile(SolutionVector& sol,
else
{
std::size_t i = 0;
- std::vector<bool> visited(fvGridGeometry.gridView().size(dim), false);
- for (const auto& element : elements(fvGridGeometry.gridView(), Dune::Partitions::interior))
+ std::vector<bool> visited(gridGeometry.gridView().size(dim), false);
+ for (const auto& element : elements(gridGeometry.gridView(), Dune::Partitions::interior))
{
for (int vIdxLocal = 0; vIdxLocal < element.subEntities(dim); ++vIdxLocal)
{
- const auto vIdxGlobal = fvGridGeometry.vertexMapper().subIndex(element, vIdxLocal, dim);
+ const auto vIdxGlobal = gridGeometry.vertexMapper().subIndex(element, vIdxLocal, dim);
if (!visited[vIdxGlobal])
{
sol[vIdxGlobal][pvIdx] = vec[i++];
@@ -162,7 +162,7 @@ template <class SolutionVector, class PvNameFunc, class GridGeometry>
auto loadSolutionFromVtkFile(SolutionVector& sol,
const std::string fileName,
PvNameFunc&& pvNameFunc,
- const GridGeometry& fvGridGeometry,
+ const GridGeometry& gridGeometry,
const VTKReader::DataType& dataType)
-> typename std::enable_if_t<decltype(isValid(Detail::hasState())(sol[0]))::value, void>
{
@@ -187,9 +187,9 @@ auto loadSolutionFromVtkFile(SolutionVector& sol,
if (dataType == VTKReader::DataType::cellData)
{
std::size_t i = 0;
- for (const auto& element : elements(fvGridGeometry.gridView(), Dune::Partitions::interior))
+ for (const auto& element : elements(gridGeometry.gridView(), Dune::Partitions::interior))
{
- const auto eIdx = fvGridGeometry.elementMapper().index(element);
+ const auto eIdx = gridGeometry.elementMapper().index(element);
const auto state = stateAtDof[i];
sol[eIdx][pvIdx] = data[state][i++];
sol[eIdx].setState(state);
@@ -199,12 +199,12 @@ auto loadSolutionFromVtkFile(SolutionVector& sol,
{
std::size_t i = 0;
constexpr int dim = GridGeometry::GridView::dimension;
- std::vector<bool> visited(fvGridGeometry.gridView().size(dim), false);
- for (const auto& element : elements(fvGridGeometry.gridView(), Dune::Partitions::interior))
+ std::vector<bool> visited(gridGeometry.gridView().size(dim), false);
+ for (const auto& element : elements(gridGeometry.gridView(), Dune::Partitions::interior))
{
for (int vIdxLocal = 0; vIdxLocal < element.subEntities(dim); ++vIdxLocal)
{
- const auto vIdxGlobal = fvGridGeometry.vertexMapper().subIndex(element, vIdxLocal, dim);
+ const auto vIdxGlobal = gridGeometry.vertexMapper().subIndex(element, vIdxLocal, dim);
if (!visited[vIdxGlobal])
{
const auto state = stateAtDof[i];
@@ -272,13 +272,13 @@ auto createPVNameFunction(const std::string& paramGroup = "")
* \param fileName the file name of the file to read from
* \param pvNameFunc a function with the signature std::string(int pvIdx)
* in case the primary variables have a state the signature is std::string(int pvIdx, int state)
- * \param fvGridGeometry the grid geometry of the discretization method used
+ * \param gridGeometry the grid geometry of the discretization method used
*/
template <class SolutionVector, class PvNameFunc, class GridGeometry>
void loadSolution(SolutionVector& sol,
const std::string& fileName,
PvNameFunc&& pvNameFunc,
- const GridGeometry& fvGridGeometry)
+ const GridGeometry& gridGeometry)
{
const auto extension = fileName.substr(fileName.find_last_of(".") + 1);
auto dataType = GridGeometry::discMethod == DiscretizationMethod::box ?
@@ -289,35 +289,35 @@ void loadSolution(SolutionVector& sol,
if (GridGeometry::discMethod == DiscretizationMethod::staggered && extension == "vtp")
dataType = VTKReader::DataType::pointData;
- loadSolutionFromVtkFile(sol, fileName, pvNameFunc, fvGridGeometry, dataType);
+ loadSolutionFromVtkFile(sol, fileName, pvNameFunc, gridGeometry, dataType);
}
else if (extension == "pvtu" || extension == "pvtp")
{
if (GridGeometry::discMethod == DiscretizationMethod::staggered)
DUNE_THROW(Dune::NotImplemented, "reading staggered solution from a parallel vtk file");
- loadSolutionFromVtkFile(sol, fileName, pvNameFunc, fvGridGeometry, dataType);
+ loadSolutionFromVtkFile(sol, fileName, pvNameFunc, gridGeometry, dataType);
}
else
DUNE_THROW(Dune::NotImplemented, "loadSolution for file with extension " << extension);
// communicate solution on ghost and overlap dofs
- if (fvGridGeometry.gridView().comm().size() > 1)
+ if (gridGeometry.gridView().comm().size() > 1)
{
using GridView = typename GridGeometry::GridView;
if (dataType == VTKReader::DataType::cellData)
{
LoadSolutionDataHandle<SolutionVector, typename GridGeometry::ElementMapper, 0>
- dataHandle(sol, fvGridGeometry.elementMapper());
- fvGridGeometry.gridView().communicate(dataHandle,
+ dataHandle(sol, gridGeometry.elementMapper());
+ gridGeometry.gridView().communicate(dataHandle,
Dune::InteriorBorder_All_Interface,
Dune::ForwardCommunication);
}
else
{
LoadSolutionDataHandle<SolutionVector, typename GridGeometry::VertexMapper, GridView::dimension>
- dataHandle(sol, fvGridGeometry.vertexMapper());
- fvGridGeometry.gridView().communicate(dataHandle,
+ dataHandle(sol, gridGeometry.vertexMapper());
+ gridGeometry.gridView().communicate(dataHandle,
Dune::InteriorBorder_All_Interface,
Dune::ForwardCommunication);
}
diff --git a/dumux/io/staggeredvtkoutputmodule.hh b/dumux/io/staggeredvtkoutputmodule.hh
index d5eabc3727..54a3d54be0 100644
--- a/dumux/io/staggeredvtkoutputmodule.hh
+++ b/dumux/io/staggeredvtkoutputmodule.hh
@@ -111,7 +111,7 @@ public:
//! \param name The name of the vtk field
void addFaceField(const std::vector<Scalar>& v, const std::string& name)
{
- if (v.size() == this->fvGridGeometry().gridView().size(1))
+ if (v.size() == this->gridGeometry().gridView().size(1))
faceFieldScalarDataInfo_.emplace_back(v, name);
else
DUNE_THROW(Dune::RangeError, "Size mismatch of added field!");
@@ -122,7 +122,7 @@ public:
//! \param name The name of the vtk field
void addFaceField(const std::vector<GlobalPosition>& v, const std::string& name)
{
- if (v.size() == this->fvGridGeometry().gridView().size(1))
+ if (v.size() == this->gridGeometry().gridView().size(1))
faceFieldVectorDataInfo_.emplace_back(v, name);
else
DUNE_THROW(Dune::RangeError, "Size mismatch of added field!");
@@ -160,10 +160,10 @@ private:
//! Update the coordinates (the face centers)
void updateCoordinates_()
{
- coordinates_.resize(this->fvGridGeometry().numFaceDofs());
- for(auto&& facet : facets(this->fvGridGeometry().gridView()))
+ coordinates_.resize(this->gridGeometry().numFaceDofs());
+ for(auto&& facet : facets(this->gridGeometry().gridView()))
{
- const int dofIdxGlobal = this->fvGridGeometry().gridView().indexSet().index(facet);
+ const int dofIdxGlobal = this->gridGeometry().gridView().indexSet().index(facet);
coordinates_[dofIdxGlobal] = facet.geometry().center();
}
coordinatesInitialized_ = true;
@@ -173,7 +173,7 @@ private:
//! \param time The current time
void getFaceDataAndWrite_(const Scalar time)
{
- const auto numPoints = this->fvGridGeometry().numFaceDofs();
+ const auto numPoints = this->gridGeometry().numFaceDofs();
// make sure not to iterate over the same dofs twice
std::vector<bool> dofVisited(numPoints, false);
@@ -192,9 +192,9 @@ private:
if(!faceVarVectorDataInfo_.empty())
faceVarVectorData.resize(faceVarVectorDataInfo_.size(), std::vector<GlobalPosition>(numPoints));
- for (const auto& element : elements(this->fvGridGeometry().gridView(), Dune::Partitions::interior))
+ for (const auto& element : elements(this->gridGeometry().gridView(), Dune::Partitions::interior))
{
- auto fvGeometry = localView(this->fvGridGeometry());
+ auto fvGeometry = localView(this->gridGeometry());
auto elemFaceVars = localView(this->gridVariables().curGridFaceVars());
if (!faceVarScalarDataInfo_.empty() || !faceVarVectorDataInfo_.empty())
diff --git a/dumux/io/vtkoutputmodule.hh b/dumux/io/vtkoutputmodule.hh
index 6915e8b5b6..3584f0c9c6 100644
--- a/dumux/io/vtkoutputmodule.hh
+++ b/dumux/io/vtkoutputmodule.hh
@@ -163,8 +163,8 @@ public:
// Deduce the number of components from the given vector type
const auto nComp = getNumberOfComponents_(v);
- const auto numElemDofs = fvGridGeometry().elementMapper().size();
- const auto numVertexDofs = fvGridGeometry().vertexMapper().size();
+ const auto numElemDofs = gridGeometry().elementMapper().size();
+ const auto numVertexDofs = gridGeometry().vertexMapper().size();
// Automatically deduce the field type ...
if(fieldType == FieldType::automatic)
@@ -193,9 +193,9 @@ public:
// add the appropriate field
if (fieldType == FieldType::element)
- fields_.emplace_back(fvGridGeometry().gridView(), fvGridGeometry().elementMapper(), v, name, nComp, 0);
+ fields_.emplace_back(gridGeometry().gridView(), gridGeometry().elementMapper(), v, name, nComp, 0);
else
- fields_.emplace_back(fvGridGeometry().gridView(), fvGridGeometry().vertexMapper(), v, name, nComp, dim);
+ fields_.emplace_back(gridGeometry().gridView(), gridGeometry().vertexMapper(), v, name, nComp, dim);
}
//////////////////////////////////////////////////////////////////////////////////////////////
@@ -230,7 +230,7 @@ public:
protected:
// some return functions for differing implementations to use
const auto& problem() const { return gridVariables_.curGridVolVars().problem(); }
- const GridGeometry& fvGridGeometry() const { return gridVariables_.gridGeometry(); }
+ const GridGeometry& gridGeometry() const { return gridVariables_.gridGeometry(); }
const GridVariables& gridVariables() const { return gridVariables_; }
const SolutionVector& sol() const { return sol_; }
@@ -276,7 +276,7 @@ private:
|| velocityOutput_->enableOutput()
|| addProcessRank)
{
- const auto numCells = fvGridGeometry().gridView().size(0);
+ const auto numCells = gridGeometry().gridView().size(0);
const auto numDofs = numDofs_();
// get fields for all volume variables
@@ -299,11 +299,11 @@ private:
// maybe allocate space for the process rank
if (addProcessRank) rank.resize(numCells);
- for (const auto& element : elements(fvGridGeometry().gridView(), Dune::Partitions::interior))
+ for (const auto& element : elements(gridGeometry().gridView(), Dune::Partitions::interior))
{
- const auto eIdxGlobal = fvGridGeometry().elementMapper().index(element);
+ const auto eIdxGlobal = gridGeometry().elementMapper().index(element);
- auto fvGeometry = localView(fvGridGeometry());
+ auto fvGeometry = localView(gridGeometry());
auto elemVolVars = localView(gridVariables_.curGridVolVars());
// If velocity output is enabled we need to bind to the whole stencil
@@ -349,7 +349,7 @@ private:
//! the rank
if (addProcessRank)
- rank[eIdxGlobal] = static_cast<double>(fvGridGeometry().gridView().comm().rank());
+ rank[eIdxGlobal] = static_cast<double>(gridGeometry().gridView().comm().rank());
}
//////////////////////////////////////////////////////////////
@@ -360,19 +360,19 @@ private:
if (isBox)
{
for (std::size_t i = 0; i < volVarScalarDataInfo_.size(); ++i)
- sequenceWriter_.addVertexData( Field(fvGridGeometry().gridView(), fvGridGeometry().vertexMapper(), volVarScalarData[i],
+ sequenceWriter_.addVertexData( Field(gridGeometry().gridView(), gridGeometry().vertexMapper(), volVarScalarData[i],
volVarScalarDataInfo_[i].name, /*numComp*/1, /*codim*/dim).get() );
for (std::size_t i = 0; i < volVarVectorDataInfo_.size(); ++i)
- sequenceWriter_.addVertexData( Field(fvGridGeometry().gridView(), fvGridGeometry().vertexMapper(), volVarVectorData[i],
+ sequenceWriter_.addVertexData( Field(gridGeometry().gridView(), gridGeometry().vertexMapper(), volVarVectorData[i],
volVarVectorDataInfo_[i].name, /*numComp*/dimWorld, /*codim*/dim).get() );
}
else
{
for (std::size_t i = 0; i < volVarScalarDataInfo_.size(); ++i)
- sequenceWriter_.addCellData( Field(fvGridGeometry().gridView(), fvGridGeometry().elementMapper(), volVarScalarData[i],
+ sequenceWriter_.addCellData( Field(gridGeometry().gridView(), gridGeometry().elementMapper(), volVarScalarData[i],
volVarScalarDataInfo_[i].name, /*numComp*/1, /*codim*/0).get() );
for (std::size_t i = 0; i < volVarVectorDataInfo_.size(); ++i)
- sequenceWriter_.addCellData( Field(fvGridGeometry().gridView(), fvGridGeometry().elementMapper(), volVarVectorData[i],
+ sequenceWriter_.addCellData( Field(gridGeometry().gridView(), gridGeometry().elementMapper(), volVarVectorData[i],
volVarVectorDataInfo_[i].name, /*numComp*/dimWorld, /*codim*/0).get() );
}
@@ -382,7 +382,7 @@ private:
if (isBox && dim > 1)
{
for (int phaseIdx = 0; phaseIdx < velocityOutput_->numFluidPhases(); ++phaseIdx)
- sequenceWriter_.addVertexData( Field(fvGridGeometry().gridView(), fvGridGeometry().vertexMapper(), velocity[phaseIdx],
+ sequenceWriter_.addVertexData( Field(gridGeometry().gridView(), gridGeometry().vertexMapper(), velocity[phaseIdx],
"velocity_" + velocityOutput_->phaseName(phaseIdx) + " (m/s)",
/*numComp*/dimWorld, /*codim*/dim).get() );
}
@@ -390,7 +390,7 @@ private:
else
{
for (int phaseIdx = 0; phaseIdx < velocityOutput_->numFluidPhases(); ++phaseIdx)
- sequenceWriter_.addCellData( Field(fvGridGeometry().gridView(), fvGridGeometry().elementMapper(), velocity[phaseIdx],
+ sequenceWriter_.addCellData( Field(gridGeometry().gridView(), gridGeometry().elementMapper(), velocity[phaseIdx],
"velocity_" + velocityOutput_->phaseName(phaseIdx) + " (m/s)",
/*numComp*/dimWorld, /*codim*/0).get() );
}
@@ -398,7 +398,7 @@ private:
// the process rank
if (addProcessRank)
- sequenceWriter_.addCellData(Field(fvGridGeometry().gridView(), fvGridGeometry().elementMapper(), rank, "process rank", 1, 0).get());
+ sequenceWriter_.addCellData(Field(gridGeometry().gridView(), gridGeometry().elementMapper(), rank, "process rank", 1, 0).get());
// also register additional (non-standardized) user fields if any
for (auto&& field : fields_)
@@ -460,7 +460,7 @@ private:
|| velocityOutput_->enableOutput()
|| addProcessRank)
{
- const auto numCells = fvGridGeometry().gridView().size(0);
+ const auto numCells = gridGeometry().gridView().size(0);
const auto numDofs = numDofs_();
// get fields for all volume variables
@@ -483,12 +483,12 @@ private:
// maybe allocate space for the process rank
if (addProcessRank) rank.resize(numCells);
- for (const auto& element : elements(fvGridGeometry().gridView(), Dune::Partitions::interior))
+ for (const auto& element : elements(gridGeometry().gridView(), Dune::Partitions::interior))
{
- const auto eIdxGlobal = fvGridGeometry().elementMapper().index(element);
+ const auto eIdxGlobal = gridGeometry().elementMapper().index(element);
const auto numCorners = element.subEntities(dim);
- auto fvGeometry = localView(fvGridGeometry());
+ auto fvGeometry = localView(gridGeometry());
auto elemVolVars = localView(gridVariables_.curGridVolVars());
// resize element-local data containers
@@ -539,7 +539,7 @@ private:
//! the rank
if (addProcessRank)
- rank[eIdxGlobal] = static_cast<double>(fvGridGeometry().gridView().comm().rank());
+ rank[eIdxGlobal] = static_cast<double>(gridGeometry().gridView().comm().rank());
}
//////////////////////////////////////////////////////////////
@@ -548,11 +548,11 @@ private:
// volume variables if any
for (std::size_t i = 0; i < volVarScalarDataInfo_.size(); ++i)
- sequenceWriter_.addVertexData( Field(fvGridGeometry().gridView(), fvGridGeometry().elementMapper(), volVarScalarData[i],
+ sequenceWriter_.addVertexData( Field(gridGeometry().gridView(), gridGeometry().elementMapper(), volVarScalarData[i],
volVarScalarDataInfo_[i].name, /*numComp*/1, /*codim*/dim, /*nonconforming*/dm_).get() );
for (std::size_t i = 0; i < volVarVectorDataInfo_.size(); ++i)
- sequenceWriter_.addVertexData( Field(fvGridGeometry().gridView(), fvGridGeometry().elementMapper(), volVarVectorData[i],
+ sequenceWriter_.addVertexData( Field(gridGeometry().gridView(), gridGeometry().elementMapper(), volVarVectorData[i],
volVarVectorDataInfo_[i].name, /*numComp*/dimWorld, /*codim*/dim, /*nonconforming*/dm_).get() );
// the velocity field
@@ -561,21 +561,21 @@ private:
// node-wise velocities
if (dim > 1)
for (int phaseIdx = 0; phaseIdx < velocityOutput_->numFluidPhases(); ++phaseIdx)
- sequenceWriter_.addVertexData( Field(fvGridGeometry().gridView(), fvGridGeometry().vertexMapper(), velocity[phaseIdx],
+ sequenceWriter_.addVertexData( Field(gridGeometry().gridView(), gridGeometry().vertexMapper(), velocity[phaseIdx],
"velocity_" + velocityOutput_->phaseName(phaseIdx) + " (m/s)",
/*numComp*/dimWorld, /*codim*/dim).get() );
// cell-wise velocities
else
for (int phaseIdx = 0; phaseIdx < velocityOutput_->numFluidPhases(); ++phaseIdx)
- sequenceWriter_.addCellData( Field(fvGridGeometry().gridView(), fvGridGeometry().elementMapper(), velocity[phaseIdx],
+ sequenceWriter_.addCellData( Field(gridGeometry().gridView(), gridGeometry().elementMapper(), velocity[phaseIdx],
"velocity_" + velocityOutput_->phaseName(phaseIdx) + " (m/s)",
/*numComp*/dimWorld, /*codim*/0).get() );
}
// the process rank
if (addProcessRank)
- sequenceWriter_.addCellData( Field(fvGridGeometry().gridView(), fvGridGeometry().elementMapper(), rank, "process rank", 1, 0).get() );
+ sequenceWriter_.addCellData( Field(gridGeometry().gridView(), gridGeometry().elementMapper(), rank, "process rank", 1, 0).get() );
// also register additional (non-standardized) user fields if any
for (auto&& field : fields_)
@@ -609,7 +609,7 @@ private:
std::size_t getNumberOfComponents_(const Vector& v) { return 1; }
//! return the number of dofs, we only support vertex and cell data
- std::size_t numDofs_() const { return dofCodim == dim ? fvGridGeometry().vertexMapper().size() : fvGridGeometry().elementMapper().size(); }
+ std::size_t numDofs_() const { return dofCodim == dim ? gridGeometry().vertexMapper().size() : gridGeometry().elementMapper().size(); }
const GridVariables& gridVariables_;
const SolutionVector& sol_;
diff --git a/dumux/material/fluidmatrixinteractions/porositydeformation.hh b/dumux/material/fluidmatrixinteractions/porositydeformation.hh
index e1304dda7a..2389db780a 100644
--- a/dumux/material/fluidmatrixinteractions/porositydeformation.hh
+++ b/dumux/material/fluidmatrixinteractions/porositydeformation.hh
@@ -44,7 +44,7 @@ public:
* the displacements in the different grid directions are stored
* in the first entries of the primary variable vector.
*
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param element The finite element
* \param elemSol The element solution
* \param globalPos The global position (in the element)
@@ -62,7 +62,7 @@ public:
* \f$\phi = \frac{\phi_0 + \text{div} \mathbf{u}}{1 + \text{div} \mathbf{u}}\f$.
*/
template< class FVGridGeom, class ElemSol >
- static Scalar evaluatePorosity(const FVGridGeom& fvGridGeometry,
+ static Scalar evaluatePorosity(const FVGridGeom& gridGeometry,
const typename FVGridGeom::GridView::template Codim<0>::Entity& element,
const typename FVGridGeom::GridView::template Codim<0>::Entity::Geometry::GlobalCoordinate& globalPos,
const ElemSol& elemSol,
@@ -72,7 +72,7 @@ public:
{
// compute divergence of displacement at the given position
Scalar divU = 0.0;
- const auto gradU = evalGradients(element, element.geometry(), fvGridGeometry, elemSol, globalPos);
+ const auto gradU = evalGradients(element, element.geometry(), gridGeometry, elemSol, globalPos);
for (int dir = 0; dir < FVGridGeom::GridView::dimension; ++dir)
divU += gradU[dir][dir];
@@ -88,7 +88,7 @@ public:
* in the first entries of the primary variable vector.
*
*
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param element The finite element
* \param elemSol The element solution
* \param scv The sub-control volume
@@ -96,7 +96,7 @@ public:
* \param minPoro A minimum porosity value
*/
template< class FVGridGeom, class ElemSol >
- static Scalar evaluatePorosity(const FVGridGeom& fvGridGeometry,
+ static Scalar evaluatePorosity(const FVGridGeom& gridGeometry,
const typename FVGridGeom::GridView::template Codim<0>::Entity& element,
const typename FVGridGeom::SubControlVolume& scv,
const ElemSol& elemSol,
@@ -104,7 +104,7 @@ public:
Scalar minPoro = 0.0)
{
// evaluate the porosity at the scv center
- return evaluatePorosity(fvGridGeometry, element, scv.center(), elemSol, refPoro, minPoro);
+ return evaluatePorosity(gridGeometry, element, scv.center(), elemSol, refPoro, minPoro);
}
};
diff --git a/dumux/material/spatialparams/fv.hh b/dumux/material/spatialparams/fv.hh
index 28f55f634d..4fb8c097b5 100644
--- a/dumux/material/spatialparams/fv.hh
+++ b/dumux/material/spatialparams/fv.hh
@@ -64,8 +64,8 @@ class FVSpatialParams : public FVSpatialParamsOneP<GridGeometry, Scalar, Impleme
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- FVSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ FVSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{}
/*!
diff --git a/dumux/material/spatialparams/fv1p.hh b/dumux/material/spatialparams/fv1p.hh
index fc6eb70a86..c058c4804d 100644
--- a/dumux/material/spatialparams/fv1p.hh
+++ b/dumux/material/spatialparams/fv1p.hh
@@ -88,8 +88,8 @@ class FVSpatialParamsOneP
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- FVSpatialParamsOneP(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : fvGridGeometry_(fvGridGeometry)
+ FVSpatialParamsOneP(std::shared_ptr<const GridGeometry> gridGeometry)
+ : fvGridGeometry_(gridGeometry)
, gravity_(0.0)
{
const bool enableGravity = getParam<bool>("Problem.EnableGravity");
@@ -326,7 +326,7 @@ public:
}
//! The finite volume grid geometry
- [[deprecated("Use more general GridGeometry instead. GridGeometry will be removed after 3.1!")]]
+ [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
const GridGeometry& fvGridGeometry() const
{ return *fvGridGeometry_; }
diff --git a/dumux/material/spatialparams/fvelastic.hh b/dumux/material/spatialparams/fvelastic.hh
index 65ecf08ced..e13dcad2dc 100644
--- a/dumux/material/spatialparams/fvelastic.hh
+++ b/dumux/material/spatialparams/fvelastic.hh
@@ -66,8 +66,8 @@ class FVSpatialParamsElastic
public:
//! The constructor
- FVSpatialParamsElastic(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : fvGridGeometry_(fvGridGeometry)
+ FVSpatialParamsElastic(std::shared_ptr<const GridGeometry> gridGeometry)
+ : fvGridGeometry_(gridGeometry)
, gravity_(0.0)
{
const bool enableGravity = getParam<bool>("Problem.EnableGravity");
@@ -159,7 +159,7 @@ public:
}
//! The finite volume grid geometry
- [[deprecated("Use more general GridGeometry instead. GridGeometry will be removed after 3.1!")]]
+ [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
const GridGeometry& fvGridGeometry() const
{ return *fvGridGeometry_; }
diff --git a/dumux/material/spatialparams/fvnonequilibrium.hh b/dumux/material/spatialparams/fvnonequilibrium.hh
index e98e774935..492d18d248 100644
--- a/dumux/material/spatialparams/fvnonequilibrium.hh
+++ b/dumux/material/spatialparams/fvnonequilibrium.hh
@@ -50,8 +50,8 @@ public:
using AwsSurfaceParams = Scalar;
using AnsSurfaceParams = Scalar;
- FVNonEquilibriumSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ FVNonEquilibriumSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{ }
/*!
diff --git a/dumux/material/spatialparams/fvporoelastic.hh b/dumux/material/spatialparams/fvporoelastic.hh
index 55809edfa7..26df014c13 100644
--- a/dumux/material/spatialparams/fvporoelastic.hh
+++ b/dumux/material/spatialparams/fvporoelastic.hh
@@ -87,8 +87,8 @@ class FVSpatialParamsPoroElastic
public:
//! The constructor
- FVSpatialParamsPoroElastic(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : fvGridGeometry_(fvGridGeometry)
+ FVSpatialParamsPoroElastic(std::shared_ptr<const GridGeometry> gridGeometry)
+ : fvGridGeometry_(gridGeometry)
, gravity_(0.0)
{
const bool enableGravity = getParam<bool>("Problem.EnableGravity");
@@ -314,7 +314,7 @@ public:
}
//! The finite volume grid geometry
- [[deprecated("Use more general GridGeometry instead. GridGeometry will be removed after 3.1!")]]
+ [[deprecated("Use gridGeometry() instead. fvGridGeometry() will be removed after 3.1!")]]
const GridGeometry& fvGridGeometry() const
{ return *fvGridGeometry_; }
diff --git a/dumux/multidomain/embedded/couplingmanagerbase.hh b/dumux/multidomain/embedded/couplingmanagerbase.hh
index 1999c2e75d..f64b47db97 100644
--- a/dumux/multidomain/embedded/couplingmanagerbase.hh
+++ b/dumux/multidomain/embedded/couplingmanagerbase.hh
@@ -446,7 +446,7 @@ protected:
//! compute the shape function for a given point and geometry
template<std::size_t i, class FVGG, class Geometry, class ShapeValues, typename std::enable_if_t<FVGG::discMethod == DiscretizationMethod::box, int> = 0>
- void getShapeValues(Dune::index_constant<i> domainI, const FVGG& fvGridGeometry, const Geometry& geo, const GlobalPosition& globalPos, ShapeValues& shapeValues)
+ void getShapeValues(Dune::index_constant<i> domainI, const FVGG& gridGeometry, const Geometry& geo, const GlobalPosition& globalPos, ShapeValues& shapeValues)
{
const auto ipLocal = geo.local(globalPos);
const auto& localBasis = this->problem(domainI).gridGeometry().feCache().get(geo.type()).localBasis();
@@ -455,7 +455,7 @@ protected:
//! compute the shape function for a given point and geometry
template<std::size_t i, class FVGG, class Geometry, class ShapeValues, typename std::enable_if_t<FVGG::discMethod != DiscretizationMethod::box, int> = 0>
- void getShapeValues(Dune::index_constant<i> domainI, const FVGG& fvGridGeometry, const Geometry& geo, const GlobalPosition& globalPos, ShapeValues& shapeValues)
+ void getShapeValues(Dune::index_constant<i> domainI, const FVGG& gridGeometry, const Geometry& geo, const GlobalPosition& globalPos, ShapeValues& shapeValues)
{
DUNE_THROW(Dune::InvalidStateException, "Shape values requested for other discretization than box!");
}
diff --git a/dumux/multidomain/embedded/integrationpointsource.hh b/dumux/multidomain/embedded/integrationpointsource.hh
index 0f712fcd57..74ac494c9f 100644
--- a/dumux/multidomain/embedded/integrationpointsource.hh
+++ b/dumux/multidomain/embedded/integrationpointsource.hh
@@ -109,7 +109,7 @@ class IntegrationPointSourceHelper
public:
//! calculate a DOF index to point source map from given vector of point sources
template<class GridGeometry, class PointSource, class PointSourceMap>
- static void computePointSourceMap(const GridGeometry& fvGridGeometry,
+ static void computePointSourceMap(const GridGeometry& gridGeometry,
std::vector<PointSource>& sources,
PointSourceMap& pointSourceMap)
{
@@ -125,8 +125,8 @@ public:
if (GridGeometry::discMethod == DiscretizationMethod::box)
{
// check in which subcontrolvolume(s) we are
- const auto element = fvGridGeometry.boundingBoxTree().entitySet().entity(eIdx);
- auto fvGeometry = localView(fvGridGeometry);
+ const auto element = gridGeometry.boundingBoxTree().entitySet().entity(eIdx);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
const auto globalPos = source.position();
// loop over all sub control volumes and check if the point source is inside
diff --git a/dumux/multidomain/facet/couplingmapperbase.hh b/dumux/multidomain/facet/couplingmapperbase.hh
index 286d051661..df6bac359a 100644
--- a/dumux/multidomain/facet/couplingmapperbase.hh
+++ b/dumux/multidomain/facet/couplingmapperbase.hh
@@ -208,7 +208,7 @@ protected:
template< class GridGeometry>
std::vector< typename IndexTraits<typename GridGeometry::GridView>::GridIndex >
extractNodalDofs_(const typename GridGeometry::GridView::template Codim<0>::Entity& element,
- const GridGeometry& fvGridGeometry)
+ const GridGeometry& gridGeometry)
{
static constexpr int dim = GridGeometry::GridView::dimension;
using GridIndexType = typename IndexTraits<typename GridGeometry::GridView>::GridIndex;
@@ -216,7 +216,7 @@ protected:
const auto numCorners = element.subEntities(dim);
std::vector< GridIndexType > nodalDofs(numCorners);
for (unsigned int i = 0; i < numCorners; ++i)
- nodalDofs[i] = fvGridGeometry.vertexMapper().subIndex(element, i, dim);
+ nodalDofs[i] = gridGeometry.vertexMapper().subIndex(element, i, dim);
return nodalDofs;
}
@@ -234,13 +234,13 @@ private:
//! Creates the map from element insertion index to grid element index
template< class Embeddings, class GridGeometry>
std::unordered_map< typename IndexTraits<typename GridGeometry::GridView>::GridIndex, typename IndexTraits<typename GridGeometry::GridView>::GridIndex >
- makeInsertionToGridIndexMap_(std::shared_ptr<const Embeddings> embeddings, const GridGeometry& fvGridGeometry) const
+ makeInsertionToGridIndexMap_(std::shared_ptr<const Embeddings> embeddings, const GridGeometry& gridGeometry) const
{
using GridIndexType = typename IndexTraits<typename GridGeometry::GridView>::GridIndex;
std::unordered_map< GridIndexType, GridIndexType > map;
- for (const auto& e : elements(fvGridGeometry.gridView()))
- map.insert( std::make_pair( embeddings->template insertionIndex<bulkId>(e), fvGridGeometry.elementMapper().index(e) ) );
+ for (const auto& e : elements(gridGeometry.gridView()))
+ map.insert( std::make_pair( embeddings->template insertionIndex<bulkId>(e), gridGeometry.elementMapper().index(e) ) );
return map;
}
diff --git a/dumux/multidomain/newtonsolver.hh b/dumux/multidomain/newtonsolver.hh
index c9daad5580..5d55512404 100644
--- a/dumux/multidomain/newtonsolver.hh
+++ b/dumux/multidomain/newtonsolver.hh
@@ -165,9 +165,9 @@ private:
priVarsSwitchedInLastIteration_[i] = false;
const auto& problem = this->assembler().problem(id);
- const auto& fvGridGeometry = this->assembler().gridGeometry(id);
+ const auto& gridGeometry = this->assembler().gridGeometry(id);
auto& gridVariables = this->assembler().gridVariables(id);
- priVarSwitch.updateBoundary(problem, fvGridGeometry, gridVariables, sol[id]);
+ priVarSwitch.updateBoundary(problem, gridGeometry, gridVariables, sol[id]);
}
/*!
@@ -184,7 +184,7 @@ private:
{
// update the variable switch (returns true if the pri vars at at least one dof were switched)
// for disabled grid variable caching
- const auto& fvGridGeometry = this->assembler().gridGeometry(id);
+ const auto& gridGeometry = this->assembler().gridGeometry(id);
const auto& problem = this->assembler().problem(id);
auto& gridVariables = this->assembler().gridVariables(id);
@@ -193,17 +193,17 @@ private:
// invoke the primary variable switch
priVarsSwitchedInLastIteration_[i] = priVarSwitch.update(uCurrentIter, gridVariables,
- problem, fvGridGeometry);
+ problem, gridGeometry);
if (priVarsSwitchedInLastIteration_[i])
{
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
// if the volume variables are cached globally, we need to update those where the primary variables have been switched
- priVarSwitch.updateSwitchedVolVars(problem, element, fvGridGeometry, gridVariables, uCurrentIter);
+ priVarSwitch.updateSwitchedVolVars(problem, element, gridGeometry, gridVariables, uCurrentIter);
// if the flux variables are cached globally, we need to update those where the primary variables have been switched
- priVarSwitch.updateSwitchedFluxVarsCache(problem, element, fvGridGeometry, gridVariables, uCurrentIter);
+ priVarSwitch.updateSwitchedFluxVarsCache(problem, element, gridGeometry, gridVariables, uCurrentIter);
}
}
}
diff --git a/dumux/multidomain/subdomaincclocalassembler.hh b/dumux/multidomain/subdomaincclocalassembler.hh
index 4f19a4f326..5d1dd8784d 100644
--- a/dumux/multidomain/subdomaincclocalassembler.hh
+++ b/dumux/multidomain/subdomaincclocalassembler.hh
@@ -318,13 +318,13 @@ public:
// get some aliases for convenience
const auto& element = this->element();
const auto& fvGeometry = this->fvGeometry();
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
+ const auto& gridGeometry = fvGeometry.gridGeometry();
auto&& curElemVolVars = this->curElemVolVars();
auto&& elemFluxVarsCache = this->elemFluxVarsCache();
// get stencil informations
- const auto globalI = fvGridGeometry.elementMapper().index(element);
- const auto& connectivityMap = fvGridGeometry.connectivityMap();
+ const auto globalI = gridGeometry.elementMapper().index(element);
+ const auto& connectivityMap = gridGeometry.connectivityMap();
const auto numNeighbors = connectivityMap[globalI].size();
// container to store the neighboring elements
@@ -341,7 +341,7 @@ public:
unsigned int j = 1;
for (const auto& dataJ : connectivityMap[globalI])
{
- neighborElements[j-1] = fvGridGeometry.element(dataJ.globalJ);
+ neighborElements[j-1] = gridGeometry.element(dataJ.globalJ);
for (const auto scvfIdx : dataJ.scvfsJ)
origResiduals[j] += this->evalFluxResidual(neighborElements[j-1], fvGeometry.scvf(scvfIdx));
@@ -457,12 +457,12 @@ public:
// get some aliases for convenience
const auto& element = this->element();
const auto& fvGeometry = this->fvGeometry();
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
+ const auto& gridGeometry = fvGeometry.gridGeometry();
auto&& curElemVolVars = this->curElemVolVars();
auto&& elemFluxVarsCache = this->elemFluxVarsCache();
// get stencil informations
- const auto globalI = fvGridGeometry.elementMapper().index(element);
+ const auto globalI = gridGeometry.elementMapper().index(element);
const auto& stencil = this->couplingManager().couplingStencil(domainI, element, domainJ);
const auto& curSolJ = this->curSol()[domainJ];
@@ -594,11 +594,11 @@ public:
// get some aliases for convenience
const auto& element = this->element();
const auto& fvGeometry = this->fvGeometry();
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
+ const auto& gridGeometry = fvGeometry.gridGeometry();
auto&& curElemVolVars = this->curElemVolVars();
// reference to the element's scv (needed later) and corresponding vol vars
- const auto globalI = fvGridGeometry.elementMapper().index(element);
+ const auto globalI = gridGeometry.elementMapper().index(element);
const auto& scv = fvGeometry.scv(globalI);
auto& curVolVars = ParentType::getVolVarAccess(gridVariables.curGridVolVars(), curElemVolVars, scv);
@@ -609,7 +609,7 @@ public:
const auto origVolVars = curVolVars;
// element solution container to be deflected
- auto elemSol = elementSolution(element, curSol, fvGridGeometry);
+ auto elemSol = elementSolution(element, curSol, gridGeometry);
// derivatives in the neighbors with repect to the current elements
LocalResidualValues partialDeriv;
@@ -768,12 +768,12 @@ public:
// get some aliases for convenience
const auto& element = this->element();
const auto& fvGeometry = this->fvGeometry();
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
+ const auto& gridGeometry = fvGeometry.gridGeometry();
auto&& curElemVolVars = this->curElemVolVars();
// auto&& elemFluxVarsCache = this->elemFluxVarsCache();
// get stencil informations
- const auto globalI = fvGridGeometry.elementMapper().index(element);
+ const auto globalI = gridGeometry.elementMapper().index(element);
const auto& stencil = this->couplingManager().couplingStencil(domainI, element, domainJ);
for (const auto globalJ : stencil)
diff --git a/dumux/multidomain/subdomainstaggeredlocalassembler.hh b/dumux/multidomain/subdomainstaggeredlocalassembler.hh
index 005200fc3b..c14390b471 100644
--- a/dumux/multidomain/subdomainstaggeredlocalassembler.hh
+++ b/dumux/multidomain/subdomainstaggeredlocalassembler.hh
@@ -543,10 +543,10 @@ public:
const auto& element = this->element();
const auto& fvGeometry = this->fvGeometry();
auto&& curElemVolVars = this->curElemVolVars();
- const auto& fvGridGeometry = this->problem().gridGeometry();
+ const auto& gridGeometry = this->problem().gridGeometry();
const auto& curSol = this->curSol()[domainI];
- const auto cellCenterGlobalI = fvGridGeometry.elementMapper().index(element);
+ const auto cellCenterGlobalI = gridGeometry.elementMapper().index(element);
const auto origResidual = this->evalLocalResidualForCellCenter();
/////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -607,7 +607,7 @@ public:
};
// get the list of cell center dofs that have an influence on the cell center resdiual of the current element
- const auto& connectivityMap = fvGridGeometry.connectivityMap();
+ const auto& connectivityMap = gridGeometry.connectivityMap();
// evaluate derivatives w.r.t. own dof
evaluateCellCenterDerivatives(cellCenterGlobalI);
@@ -634,7 +634,7 @@ public:
const auto& problem = this->problem();
const auto& element = this->element();
const auto& fvGeometry = this->fvGeometry();
- const auto& fvGridGeometry = this->problem().gridGeometry();
+ const auto& gridGeometry = this->problem().gridGeometry();
const auto& curSol = this->curSol()[domainI];
using FaceSolutionVector = GetPropType<TypeTag, Properties::FaceSolutionVector>; // TODO: use reserved vector
@@ -659,7 +659,7 @@ public:
const auto faceGlobalI = scvf.dofIndex();
using FaceSolution = GetPropType<TypeTag, Properties::StaggeredFaceSolution>;
- const auto origFaceSolution = FaceSolution(scvf, curSol, fvGridGeometry);
+ const auto origFaceSolution = FaceSolution(scvf, curSol, gridGeometry);
// Lambda to evaluate the derivatives for faces
auto evaluateFaceDerivatives = [&](const std::size_t globalJ)
@@ -708,7 +708,7 @@ public:
evaluateFaceDerivatives(scvf.dofIndex());
// get the list of face dofs that have an influence on the resdiual of the current face
- const auto& connectivityMap = fvGridGeometry.connectivityMap();
+ const auto& connectivityMap = gridGeometry.connectivityMap();
// evaluate derivatives w.r.t. all other related face dofs
for (const auto& globalJ : connectivityMap(faceId, faceId, scvf.index()))
@@ -735,10 +735,10 @@ public:
// get some aliases for convenience
const auto& element = this->element();
const auto& fvGeometry = this->fvGeometry();
- const auto& fvGridGeometry = this->problem().gridGeometry();
+ const auto& gridGeometry = this->problem().gridGeometry();
const auto& curSol = this->curSol()[domainJ];
// build derivatives with for cell center dofs w.r.t. cell center dofs
- const auto cellCenterGlobalI = fvGridGeometry.elementMapper().index(element);
+ const auto cellCenterGlobalI = gridGeometry.elementMapper().index(element);
for (const auto& scvfJ : scvfs(fvGeometry))
{
@@ -857,8 +857,8 @@ public:
// get some aliases for convenience
const auto& problem = this->problem();
const auto& fvGeometry = this->fvGeometry();
- const auto& fvGridGeometry = this->problem().gridGeometry();
- const auto& connectivityMap = fvGridGeometry.connectivityMap();
+ const auto& gridGeometry = this->problem().gridGeometry();
+ const auto& connectivityMap = gridGeometry.connectivityMap();
const auto& curSol = this->curSol()[domainJ];
// build derivatives with for cell center dofs w.r.t. cell center dofs
diff --git a/dumux/nonlinear/newtonconvergencewriter.hh b/dumux/nonlinear/newtonconvergencewriter.hh
index 3035263f40..c3c25469b1 100644
--- a/dumux/nonlinear/newtonconvergencewriter.hh
+++ b/dumux/nonlinear/newtonconvergencewriter.hh
@@ -62,13 +62,13 @@ class NewtonConvergenceWriter : public ConvergenceWriterInterface<SolutionVector
public:
/*!
* \brief Constructor
- * \param fvGridGeometry The finite-volume grid geometry
+ * \param gridGeometry The finite-volume grid geometry
* \param name Base name of the vtk output
*/
- NewtonConvergenceWriter(const GridGeometry& fvGridGeometry,
+ NewtonConvergenceWriter(const GridGeometry& gridGeometry,
const std::string& name = "newton_convergence")
- : fvGridGeometry_(fvGridGeometry)
- , writer_(fvGridGeometry.gridView(), name, "", "")
+ : fvGridGeometry_(gridGeometry)
+ , writer_(gridGeometry.gridView(), name, "", "")
{
resize();
diff --git a/dumux/nonlinear/newtonsolver.hh b/dumux/nonlinear/newtonsolver.hh
index 30660b5023..823ede7e52 100644
--- a/dumux/nonlinear/newtonsolver.hh
+++ b/dumux/nonlinear/newtonsolver.hh
@@ -747,9 +747,9 @@ protected:
priVarsSwitchedInLastIteration_ = false;
const auto& problem = this->assembler().problem();
- const auto& fvGridGeometry = this->assembler().gridGeometry();
+ const auto& gridGeometry = this->assembler().gridGeometry();
auto& gridVariables = this->assembler().gridVariables();
- priVarSwitch_->updateBoundary(problem, fvGridGeometry, gridVariables, sol);
+ priVarSwitch_->updateBoundary(problem, gridGeometry, gridVariables, sol);
}
/*!
@@ -764,23 +764,23 @@ protected:
{
// update the variable switch (returns true if the pri vars at at least one dof were switched)
// for disabled grid variable caching
- const auto& fvGridGeometry = this->assembler().gridGeometry();
+ const auto& gridGeometry = this->assembler().gridGeometry();
const auto& problem = this->assembler().problem();
auto& gridVariables = this->assembler().gridVariables();
// invoke the primary variable switch
priVarsSwitchedInLastIteration_ = priVarSwitch_->update(uCurrentIter, gridVariables,
- problem, fvGridGeometry);
+ problem, gridGeometry);
if (priVarsSwitchedInLastIteration_)
{
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
// if the volume variables are cached globally, we need to update those where the primary variables have been switched
- priVarSwitch_->updateSwitchedVolVars(problem, element, fvGridGeometry, gridVariables, uCurrentIter);
+ priVarSwitch_->updateSwitchedVolVars(problem, element, gridGeometry, gridVariables, uCurrentIter);
// if the flux variables are cached globally, we need to update those where the primary variables have been switched
- priVarSwitch_->updateSwitchedFluxVarsCache(problem, element, fvGridGeometry, gridVariables, uCurrentIter);
+ priVarSwitch_->updateSwitchedFluxVarsCache(problem, element, gridGeometry, gridVariables, uCurrentIter);
}
}
}
diff --git a/dumux/nonlinear/staggerednewtonconvergencewriter.hh b/dumux/nonlinear/staggerednewtonconvergencewriter.hh
index 01657cfb64..e8d09157ce 100644
--- a/dumux/nonlinear/staggerednewtonconvergencewriter.hh
+++ b/dumux/nonlinear/staggerednewtonconvergencewriter.hh
@@ -64,17 +64,17 @@ class StaggeredNewtonConvergenceWriter : public ConvergenceWriterInterface<Solut
public:
/*!
* \brief Constructor
- * \param fvGridGeometry The finite volume geometry on the grid view
+ * \param gridGeometry The finite volume geometry on the grid view
* \param name Base name of the vtk output
*/
- StaggeredNewtonConvergenceWriter(const GridGeometry& fvGridGeometry,
+ StaggeredNewtonConvergenceWriter(const GridGeometry& gridGeometry,
const std::string& name = "newton_convergence")
- : fvGridGeometry_(fvGridGeometry)
- , ccWriter_(fvGridGeometry.gridView(), name, "", "")
+ : fvGridGeometry_(gridGeometry)
+ , ccWriter_(gridGeometry.gridView(), name, "", "")
, faceWriter_(std::make_shared<PointCloudVtkWriter<Scalar, GlobalPosition>>(coordinates_))
, faceSequenceWriter_(faceWriter_, name + "-face", "","",
- fvGridGeometry.gridView().comm().rank(),
- fvGridGeometry.gridView().comm().size())
+ gridGeometry.gridView().comm().rank(),
+ gridGeometry.gridView().comm().size())
{
resize();
diff --git a/dumux/porousmediumflow/2p/boxmaterialinterfaceparams.hh b/dumux/porousmediumflow/2p/boxmaterialinterfaceparams.hh
index 876b22f1da..63dad808af 100644
--- a/dumux/porousmediumflow/2p/boxmaterialinterfaceparams.hh
+++ b/dumux/porousmediumflow/2p/boxmaterialinterfaceparams.hh
@@ -51,12 +51,12 @@ public:
/*!
* \brief Updates the scv -> dofparameter map
*
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param spatialParams Class encapsulating the spatial parameters
* \param x The current state of the solution vector
*/
template<class GridGeometry, class SolutionVector>
- void update(const GridGeometry& fvGridGeometry,
+ void update(const GridGeometry& gridGeometry,
const SpatialParams& spatialParams,
const SolutionVector& x)
{
@@ -64,7 +64,7 @@ public:
// Make sure the spatial params return a const ref and no copy!
using Elem = typename GridGeometry::GridView::template Codim<0>::Entity;
- using ElemSol = decltype( elementSolution(Elem(), x, fvGridGeometry) );
+ using ElemSol = decltype( elementSolution(Elem(), x, gridGeometry) );
using Scv = typename GridGeometry::SubControlVolume;
using ReturnType = decltype(spatialParams.materialLawParams(Elem(), Scv(), ElemSol()));
static_assert(std::is_lvalue_reference<ReturnType>::value,
@@ -77,13 +77,13 @@ public:
"this class only makes sense when using the box method!");
isUpdated_ = true;
- isOnMaterialInterface_.resize(fvGridGeometry.numDofs(), false);
- dofParams_.resize(fvGridGeometry.numDofs(), nullptr);
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ isOnMaterialInterface_.resize(gridGeometry.numDofs(), false);
+ dofParams_.resize(gridGeometry.numDofs(), nullptr);
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- const auto elemSol = elementSolution(element, x, fvGridGeometry);
+ const auto elemSol = elementSolution(element, x, gridGeometry);
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bind(element);
for (const auto& scv : scvs(fvGeometry))
{
diff --git a/dumux/porousmediumflow/2p/gridadaptindicator.hh b/dumux/porousmediumflow/2p/gridadaptindicator.hh
index 35cb5faf69..08dbb21ec8 100644
--- a/dumux/porousmediumflow/2p/gridadaptindicator.hh
+++ b/dumux/porousmediumflow/2p/gridadaptindicator.hh
@@ -56,15 +56,15 @@ public:
/*!
* \brief The Constructor
*
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param paramGroup The parameter group in which to look for runtime parameters first (default is "")
*
* Note: refineBound_, coarsenBound_ & maxSaturationDelta_ are chosen
* in a way such that the indicator returns false for all elements
* before having been calculated.
*/
- TwoPGridAdaptIndicator(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : fvGridGeometry_(fvGridGeometry)
+ TwoPGridAdaptIndicator(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : fvGridGeometry_(gridGeometry)
, refineBound_(std::numeric_limits<Scalar>::max())
, coarsenBound_(std::numeric_limits<Scalar>::lowest())
, maxSaturationDelta_(fvGridGeometry_->gridView().size(0), 0.0)
diff --git a/dumux/porousmediumflow/2p/griddatatransfer.hh b/dumux/porousmediumflow/2p/griddatatransfer.hh
index 94d614bf72..9dbf6bf9f7 100644
--- a/dumux/porousmediumflow/2p/griddatatransfer.hh
+++ b/dumux/porousmediumflow/2p/griddatatransfer.hh
@@ -109,20 +109,20 @@ public:
* \brief Constructor
*
* \param problem The DuMuX problem to be solved
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param gridVariables The secondary variables on the grid
* \param sol The solution (primary variables) on the grid
*/
TwoPGridDataTransfer(std::shared_ptr<const Problem> problem,
- std::shared_ptr<GridGeometry> fvGridGeometry,
+ std::shared_ptr<GridGeometry> gridGeometry,
std::shared_ptr<const GridVariables> gridVariables,
SolutionVector& sol)
: GridDataTransfer()
, problem_(problem)
- , fvGridGeometry_(fvGridGeometry)
+ , fvGridGeometry_(gridGeometry)
, gridVariables_(gridVariables)
, sol_(sol)
- , adaptionMap_(fvGridGeometry->gridView().grid(), 0)
+ , adaptionMap_(gridGeometry->gridView().grid(), 0)
{}
/*!
diff --git a/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh b/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh
index 3fce08c75c..1b90c61a5c 100644
--- a/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh
+++ b/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh
@@ -150,7 +150,7 @@ private:
std::vector<std::vector<GlobalPosition>> volVarVectorDataFracture;
// some references for convenience
- const auto& gridView = this->fvGridGeometry().gridView();
+ const auto& gridView = this->gridGeometry().gridView();
const auto& fractureGridView = fractureGrid_->leafGridView();
const auto& volVarScalarDataInfo = this->volVarScalarDataInfo();
const auto& volVarVectorDataInfo = this->volVarVectorDataInfo();
@@ -187,9 +187,9 @@ private:
for (const auto& element : elements(gridView, Dune::Partitions::interior))
{
- const auto eIdxGlobal = this->fvGridGeometry().elementMapper().index(element);
+ const auto eIdxGlobal = this->gridGeometry().elementMapper().index(element);
- auto fvGeometry = localView(this->fvGridGeometry());
+ auto fvGeometry = localView(this->gridGeometry());
auto elemVolVars = localView(this->gridVariables().curGridVolVars());
// If velocity output is enabled we need to bind to the whole stencil
@@ -257,7 +257,7 @@ private:
for (std::size_t i = 0; i < volVarVectorDataInfo.size(); ++i)
{
- this->sequenceWriter().addVertexData( Field(gridView, this->fvGridGeometry().vertexMapper(), volVarVectorData[i],
+ this->sequenceWriter().addVertexData( Field(gridView, this->gridGeometry().vertexMapper(), volVarVectorData[i],
volVarVectorDataInfo[i].name, /*numComp*/dimWorld, /*codim*/dim).get() );
fractureSequenceWriter_->addVertexData( FractureField(fractureGridView, *fractureVertexMapper_, volVarVectorDataFracture[i],
volVarVectorDataInfo[i].name, /*numComp*/dimWorld, /*codim*/dim-1).get() );
@@ -267,14 +267,14 @@ private:
if (this->velocityOutput().enableOutput())
{
for (int phaseIdx = 0; phaseIdx < this->velocityOutput().numFluidPhases(); ++phaseIdx)
- this->sequenceWriter().addVertexData( Field(gridView, this->fvGridGeometry().vertexMapper(), velocity[phaseIdx],
+ this->sequenceWriter().addVertexData( Field(gridView, this->gridGeometry().vertexMapper(), velocity[phaseIdx],
"velocity_" + std::string(this->velocityOutput().phaseName(phaseIdx)) + " (m/s)",
/*numComp*/dimWorld, /*codim*/dim).get() );
}
// the process rank
if (addProcessRank)
- this->sequenceWriter().addCellData( Field(gridView, this->fvGridGeometry().elementMapper(), rank,
+ this->sequenceWriter().addCellData( Field(gridView, this->gridGeometry().elementMapper(), rank,
"process rank", /*numComp*/1, /*codim*/0).get() );
// also register additional (non-standardized) user fields if any (only on matrix grid)
@@ -325,7 +325,7 @@ private:
std::vector< VectorDataContainer > volVarVectorDataFracture;
// some references for convenience
- const auto& gridView = this->fvGridGeometry().gridView();
+ const auto& gridView = this->gridGeometry().gridView();
const auto& fractureGridView = fractureGrid_->leafGridView();
const auto& volVarScalarDataInfo = this->volVarScalarDataInfo();
const auto& volVarVectorDataInfo = this->volVarVectorDataInfo();
@@ -362,10 +362,10 @@ private:
for (const auto& element : elements(gridView, Dune::Partitions::interior))
{
- const auto eIdxGlobal = this->fvGridGeometry().elementMapper().index(element);
+ const auto eIdxGlobal = this->gridGeometry().elementMapper().index(element);
const auto numCorners = element.subEntities(dim);
- auto fvGeometry = localView(this->fvGridGeometry());
+ auto fvGeometry = localView(this->gridGeometry());
auto elemVolVars = localView(this->gridVariables().curGridVolVars());
// resize element-local data containers (for bulk grid)
@@ -435,7 +435,7 @@ private:
// volume variables if any
for (std::size_t i = 0; i < volVarScalarDataInfo.size(); ++i)
{
- this->sequenceWriter().addVertexData( Field(gridView, this->fvGridGeometry().elementMapper(), volVarScalarData[i],
+ this->sequenceWriter().addVertexData( Field(gridView, this->gridGeometry().elementMapper(), volVarScalarData[i],
volVarScalarDataInfo[i].name, /*numComp*/1, /*codim*/dim,
/*nonconforming*/this->dataMode()).get() );
fractureSequenceWriter_->addVertexData( FractureField(fractureGridView, *fractureElementMapper_, volVarScalarDataFracture[i],
@@ -445,7 +445,7 @@ private:
for (std::size_t i = 0; i < volVarVectorDataInfo.size(); ++i)
{
- this->sequenceWriter().addVertexData( Field(gridView, this->fvGridGeometry().elementMapper(), volVarVectorData[i],
+ this->sequenceWriter().addVertexData( Field(gridView, this->gridGeometry().elementMapper(), volVarVectorData[i],
volVarVectorDataInfo[i].name, /*numComp*/dimWorld, /*codim*/dim,
/*nonconforming*/this->dataMode()).get() );
fractureSequenceWriter_->addVertexData( FractureField(fractureGridView, *fractureElementMapper_, volVarVectorDataFracture[i],
@@ -457,14 +457,14 @@ private:
if (this->velocityOutput().enableOutput())
{
for (int phaseIdx = 0; phaseIdx < this->velocityOutput().numFluidPhases(); ++phaseIdx)
- this->sequenceWriter().addVertexData( Field(gridView, this->fvGridGeometry().vertexMapper(), velocity[phaseIdx],
+ this->sequenceWriter().addVertexData( Field(gridView, this->gridGeometry().vertexMapper(), velocity[phaseIdx],
"velocity_" + std::string(this->velocityOutput().phaseName(phaseIdx)) + " (m/s)",
/*numComp*/dimWorld, /*codim*/dim).get() );
}
// the process rank
if (addProcessRank)
- this->sequenceWriter().addCellData( Field(gridView, this->fvGridGeometry().elementMapper(), rank,
+ this->sequenceWriter().addCellData( Field(gridView, this->gridGeometry().elementMapper(), rank,
"process rank", /*numComp*/1, /*codim*/0).get() );
// also register additional (non-standardized) user fields if any (only on matrix grid)
@@ -496,8 +496,8 @@ private:
template< class FractureGridAdapter >
void initializeFracture_(const FractureGridAdapter& fractureGridAdapter)
{
- const auto& fvGridGeometry = this->fvGridGeometry();
- const auto& gridView = fvGridGeometry.gridView();
+ const auto& gridGeometry = this->gridGeometry();
+ const auto& gridView = gridGeometry.gridView();
Dune::GridFactory<FractureGrid> gridFactory;
// insert fracture vertices
@@ -508,7 +508,7 @@ private:
if (fractureGridAdapter.isOnFacetGrid(v))
{
gridFactory.insertVertex(v.geometry().center());
- vertexToFractureVertexIdx_[fvGridGeometry.vertexMapper().index(v)] = fracVertexCount++;
+ vertexToFractureVertexIdx_[gridGeometry.vertexMapper().index(v)] = fracVertexCount++;
}
}
@@ -518,7 +518,7 @@ private:
std::set< std::pair<GridIndexType, unsigned int> > handledFacets;
for (const auto& element : elements(gridView))
{
- const auto eIdxGlobal = fvGridGeometry.elementMapper().index(element);
+ const auto eIdxGlobal = gridGeometry.elementMapper().index(element);
const auto referenceElement = ReferenceElements::general(element.type());
for (const auto& is : intersections(gridView, element))
@@ -530,7 +530,7 @@ private:
std::vector<GridIndexType> isVertexIndices(numCorners);
for (unsigned int i = 0; i < numCorners; ++i)
- isVertexIndices[i] = fvGridGeometry.vertexMapper().subIndex(element,
+ isVertexIndices[i] = gridGeometry.vertexMapper().subIndex(element,
referenceElement.subEntity(indexInInside, 1, i, dim),
dim);
@@ -542,7 +542,7 @@ private:
if (!is.boundary())
{
// only proceed if facet has not been handled yet
- const auto outsideEIdx = fvGridGeometry.elementMapper().index(is.outside());
+ const auto outsideEIdx = gridGeometry.elementMapper().index(is.outside());
const auto idxInOutside = is.indexInOutside();
const auto pair = std::make_pair(outsideEIdx, idxInOutside);
if (handledFacets.count( pair ) != 0)
@@ -591,7 +591,7 @@ private:
// update vertex index map
for (GridIndexType dofIdx = 0; dofIdx < gridView.size(GridView::dimension); ++dofIdx)
- if (fvGridGeometry.dofOnFracture(dofIdx))
+ if (gridGeometry.dofOnFracture(dofIdx))
vertexToFractureVertexIdx_[dofIdx] = insToVertexIdx[ vertexToFractureVertexIdx_[dofIdx] ];
// update fracture element map
diff --git a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
index 9112ecd129..70318d4d68 100644
--- a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
@@ -81,27 +81,27 @@ public:
* \param curSol The current solution to be updated / modified
* \param gridVariables The secondary variables on the grid
* \param problem The problem
- * \param fvGridGeometry The finite-volume grid geometry
+ * \param gridGeometry The finite-volume grid geometry
*/
template<class SolutionVector, class GridVariables, class Problem>
bool update(SolutionVector& curSol,
GridVariables& gridVariables,
const Problem& problem,
- const typename GridVariables::GridGeometry& fvGridGeometry)
+ const typename GridVariables::GridGeometry& gridGeometry)
{
bool switched = false;
visited_.assign(wasSwitched_.size(), false);
std::size_t countSwitched = 0;
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
// make sure FVElementGeometry is bound to the element
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
auto elemVolVars = localView(gridVariables.curGridVolVars());
elemVolVars.bindElement(element, fvGeometry, curSol);
- const auto curElemSol = elementSolution(element, curSol, fvGridGeometry);
+ const auto curElemSol = elementSolution(element, curSol, gridGeometry);
for (auto&& scv : scvs(fvGeometry))
{
auto dofIdxGlobal = scv.dofIndex();
@@ -126,12 +126,12 @@ public:
if (verbosity_ > 0 && countSwitched > 0)
std::cout << "Switched primary variables at " << countSwitched << " dof locations on processor "
- << fvGridGeometry.gridView().comm().rank() << "." << std::endl;
+ << gridGeometry.gridView().comm().rank() << "." << std::endl;
// make sure that if there was a variable switch in an
// other partition we will also set the switch flag for our partition.
- if (fvGridGeometry.gridView().comm().size() > 1)
- switched = fvGridGeometry.gridView().comm().max(switched);
+ if (gridGeometry.gridView().comm().size() > 1)
+ switched = gridGeometry.gridView().comm().max(switched);
return switched;
}
@@ -146,12 +146,12 @@ public:
std::enable_if_t<GridVariables::GridVolumeVariables::cachingEnabled, int> = 0>
void updateSwitchedVolVars(const Problem& problem,
const typename GridVariables::GridGeometry::GridView::template Codim<0>::Entity& element,
- const typename GridVariables::GridGeometry& fvGridGeometry,
+ const typename GridVariables::GridGeometry& gridGeometry,
GridVariables& gridVariables,
const SolutionVector& sol)
{
// make sure FVElementGeometry is bound to the element
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
// update the secondary variables if global caching is enabled
@@ -160,7 +160,7 @@ public:
const auto dofIdxGlobal = scv.dofIndex();
if (asImp_().wasSwitched(dofIdxGlobal))
{
- const auto elemSol = elementSolution(element, sol, fvGridGeometry);
+ const auto elemSol = elementSolution(element, sol, gridGeometry);
auto& volVars = gridVariables.curGridVolVars().volVars(scv);
volVars.update(elemSol, problem, element, scv);
}
@@ -178,17 +178,17 @@ public:
GridVariables::GridGeometry::discMethod != DiscretizationMethod::box), int> = 0>
void updateSwitchedFluxVarsCache(const Problem& problem,
const typename GridVariables::GridGeometry::GridView::template Codim<0>::Entity& element,
- const typename GridVariables::GridGeometry& fvGridGeometry,
+ const typename GridVariables::GridGeometry& gridGeometry,
GridVariables& gridVariables,
const SolutionVector& sol)
{
// update the flux variables if global caching is enabled
- const auto dofIdxGlobal = fvGridGeometry.dofMapper().index(element);
+ const auto dofIdxGlobal = gridGeometry.dofMapper().index(element);
if (asImp_().wasSwitched(dofIdxGlobal))
{
// make sure FVElementGeometry and the volume variables are bound
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bind(element);
auto curElemVolVars = localView(gridVariables.curGridVolVars());
curElemVolVars.bind(element, fvGeometry, sol);
@@ -204,16 +204,16 @@ public:
template<class Problem, class GridVariables, class SolutionVector,
std::enable_if_t<(GridVariables::GridGeometry::discMethod == DiscretizationMethod::box), int> = 0>
void updateBoundary(const Problem& problem,
- const typename GridVariables::GridGeometry& fvGridGeometry,
+ const typename GridVariables::GridGeometry& gridGeometry,
GridVariables& gridVariables,
SolutionVector& sol)
{
std::vector<bool> stateChanged(sol.size(), false);
std::size_t countChanged = 0;
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
// skip if the element is not at a boundary
@@ -227,7 +227,7 @@ public:
{
// this implies that state is set equal for all scvs associated with the dof
const auto dofIdx = scv.dofIndex();
- if (!fvGridGeometry.dofOnBoundary(dofIdx) || stateChanged[dofIdx])
+ if (!gridGeometry.dofOnBoundary(dofIdx) || stateChanged[dofIdx])
continue;
const auto bcTypes = problem.boundaryTypes(element, scv);
@@ -264,7 +264,7 @@ public:
// update the volVars if caching is enabled
if (GridVariables::GridVolumeVariables::cachingEnabled && countChanged > 0)
{
- const auto curElemSol = elementSolution(element, sol, fvGridGeometry);
+ const auto curElemSol = elementSolution(element, sol, gridGeometry);
for (const auto& scv : scvs(fvGeometry))
{
if (stateChanged[scv.dofIndex()])
@@ -278,7 +278,7 @@ public:
if (verbosity_ > 0 && countChanged > 0)
std::cout << "Changed primary variable states and solution values at boundary to Dirichlet states and values at " << countChanged << " dof locations on processor "
- << fvGridGeometry.gridView().comm().rank() << "." << std::endl;
+ << gridGeometry.gridView().comm().rank() << "." << std::endl;
}
//! Do nothing when volume variables are not cached globally.
@@ -286,7 +286,7 @@ public:
std::enable_if_t<!GridVariables::GridVolumeVariables::cachingEnabled, int> = 0>
void updateSwitchedVolVars(const Problem& problem,
const typename GridVariables::GridGeometry::GridView::template Codim<0>::Entity& element,
- const typename GridVariables::GridGeometry& fvGridGeometry,
+ const typename GridVariables::GridGeometry& gridGeometry,
GridVariables& gridVariables,
const SolutionVector &uCurrentIter) const {}
@@ -296,7 +296,7 @@ public:
GridVariables::GridGeometry::discMethod == DiscretizationMethod::box), int> = 0>
void updateSwitchedFluxVarsCache(const Problem& problem,
const typename GridVariables::GridGeometry::GridView::template Codim<0>::Entity& element,
- const typename GridVariables::GridGeometry& fvGridGeometry,
+ const typename GridVariables::GridGeometry& gridGeometry,
GridVariables& gridVariables,
const SolutionVector& sol) const {}
@@ -304,7 +304,7 @@ public:
template<class Problem, class GridVariables, class SolutionVector,
std::enable_if_t<(GridVariables::GridGeometry::discMethod != DiscretizationMethod::box), int> = 0>
void updateBoundary(const Problem& problem,
- const typename GridVariables::GridGeometry& fvGridGeometry,
+ const typename GridVariables::GridGeometry& gridGeometry,
GridVariables& gridVariables,
SolutionVector& sol) const {}
diff --git a/dumux/porousmediumflow/fluxvariablescachefiller.hh b/dumux/porousmediumflow/fluxvariablescachefiller.hh
index c3f5579cb1..8693779f71 100644
--- a/dumux/porousmediumflow/fluxvariablescachefiller.hh
+++ b/dumux/porousmediumflow/fluxvariablescachefiller.hh
@@ -281,8 +281,8 @@ public:
elemVolVarsPtr_ = &elemVolVars;
// prepare interaction volume and fill caches of all the scvfs connected to it
- const auto& fvGridGeometry = fvGeometry.gridGeometry();
- if (fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
+ const auto& gridGeometry = fvGeometry.gridGeometry();
+ if (gridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
{
if (forceUpdateAll)
{
@@ -290,7 +290,7 @@ public:
const auto ivIndexInContainer = ivDataStorage.secondaryInteractionVolumes.size();
// prepare the locally cached boundary interaction volume
- const auto& indexSet = fvGridGeometry.gridInteractionVolumeIndexSets().secondaryIndexSet(scvf);
+ const auto& indexSet = gridGeometry.gridInteractionVolumeIndexSets().secondaryIndexSet(scvf);
ivDataStorage.secondaryInteractionVolumes.emplace_back();
secondaryIv_ = &ivDataStorage.secondaryInteractionVolumes.back();
secondaryIv_->bind(indexSet, problem(), fvGeometry);
@@ -320,7 +320,7 @@ public:
const auto ivIndexInContainer = ivDataStorage.primaryInteractionVolumes.size();
// prepare the locally cached boundary interaction volume
- const auto& indexSet = fvGridGeometry.gridInteractionVolumeIndexSets().primaryIndexSet(scvf);
+ const auto& indexSet = gridGeometry.gridInteractionVolumeIndexSets().primaryIndexSet(scvf);
ivDataStorage.primaryInteractionVolumes.emplace_back();
primaryIv_ = &ivDataStorage.primaryInteractionVolumes.back();
primaryIv_->bind(indexSet, problem(), fvGeometry);
diff --git a/dumux/porousmediumflow/problem.hh b/dumux/porousmediumflow/problem.hh
index e80b65b01f..03c55997a9 100644
--- a/dumux/porousmediumflow/problem.hh
+++ b/dumux/porousmediumflow/problem.hh
@@ -60,14 +60,14 @@ public:
/*!
* \brief Constructor, passing the spatial parameters.
*
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param spatialParams The spatial parameter class
* \param paramGroup The parameter group in which to look for runtime parameters first (default is "")
*/
- PorousMediumFlowProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ PorousMediumFlowProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<SpatialParams> spatialParams,
const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ : ParentType(gridGeometry, paramGroup)
, gravity_(0.0)
, spatialParams_(spatialParams)
{
@@ -79,13 +79,13 @@ public:
/*!
* \brief Constructor, constructing the spatial parameters.
*
- * \param fvGridGeometry The finite volume grid geometry
+ * \param gridGeometry The finite volume grid geometry
* \param paramGroup The parameter group in which to look for runtime parameters first (default is "")
*/
- PorousMediumFlowProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ PorousMediumFlowProblem(std::shared_ptr<const GridGeometry> gridGeometry,
const std::string& paramGroup = "")
- : PorousMediumFlowProblem(fvGridGeometry,
- std::make_shared<SpatialParams>(fvGridGeometry),
+ : PorousMediumFlowProblem(gridGeometry,
+ std::make_shared<SpatialParams>(gridGeometry),
paramGroup)
{}
diff --git a/dumux/porousmediumflow/richards/newtonsolver.hh b/dumux/porousmediumflow/richards/newtonsolver.hh
index ffb72218fa..bafc188d17 100644
--- a/dumux/porousmediumflow/richards/newtonsolver.hh
+++ b/dumux/porousmediumflow/richards/newtonsolver.hh
@@ -75,10 +75,10 @@ private:
if (this->numSteps_ <= 4)
{
// clamp saturation change to at most 20% per iteration
- const auto& fvGridGeometry = this->assembler().gridGeometry();
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ const auto& gridGeometry = this->assembler().gridGeometry();
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
@@ -87,7 +87,7 @@ private:
// calculate the old wetting phase saturation
const auto& spatialParams = this->assembler().problem().spatialParams();
- const auto elemSol = elementSolution(element, uCurrentIter, fvGridGeometry);
+ const auto elemSol = elementSolution(element, uCurrentIter, gridGeometry);
const auto& materialLawParams = spatialParams.materialLawParams(element, scv, elemSol);
const Scalar pcMin = MaterialLaw::pc(materialLawParams, 1.0);
const Scalar pw = uLastIter[dofIdxGlobal][pressureIdx];
diff --git a/examples/1ptracer/main.cc b/examples/1ptracer/main.cc
index 9baf89af4b..0325eeac46 100644
--- a/examples/1ptracer/main.cc
+++ b/examples/1ptracer/main.cc
@@ -88,12 +88,12 @@ int main(int argc, char** argv) try
// We create and initialize the finite volume grid geometry, the problem, the linear system, including the jacobian matrix, the residual and the solution vector and the gridvariables.
// We need the finite volume geometry to build up the subcontrolvolumes (scv) and subcontrolvolume faces (scvf) for each element of the grid partition.
using GridGeometry = GetPropType<OnePTypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// In the problem, we define the boundary and initial conditions.
using OnePProblem = GetPropType<OnePTypeTag, Properties::Problem>;
- auto problemOneP = std::make_shared<OnePProblem>(fvGridGeometry);
+ auto problemOneP = std::make_shared<OnePProblem>(gridGeometry);
// The jacobian matrix (`A`), the solution vector (`p`) and the residual (`r`) are parts of the linear system.
using JacobianMatrix = GetPropType<OnePTypeTag, Properties::JacobianMatrix>;
@@ -105,13 +105,13 @@ int main(int argc, char** argv) try
// The grid variables store variables on scv and scvf (volume and flux variables).
using OnePGridVariables = GetPropType<OnePTypeTag, Properties::GridVariables>;
- auto onePGridVariables = std::make_shared<OnePGridVariables>(problemOneP, fvGridGeometry);
+ auto onePGridVariables = std::make_shared<OnePGridVariables>(problemOneP, gridGeometry);
onePGridVariables->init(p);
// #### Assembling the linear system
// We created and inizialize the assembler.
using OnePAssembler = FVAssembler<OnePTypeTag, DiffMethod::analytic>;
- auto assemblerOneP = std::make_shared<OnePAssembler>(problemOneP, fvGridGeometry, onePGridVariables);
+ auto assemblerOneP = std::make_shared<OnePAssembler>(problemOneP, gridGeometry, onePGridVariables);
assemblerOneP->setLinearSystem(A, r);
// We assemble the local jacobian and the residual and stop the time needed, which is displayed in the terminal output, using the `assemblyTimer`. Further, we start the timer to evaluate the total time of the assembly, solving and updating.
@@ -159,7 +159,7 @@ int main(int argc, char** argv) try
// We use the results of the 1p problem to calculate the volume fluxes in the model domain.
using Scalar = GetPropType<OnePTypeTag, Properties::Scalar>;
- std::vector<Scalar> volumeFlux(fvGridGeometry->numScvf(), 0.0);
+ std::vector<Scalar> volumeFlux(gridGeometry->numScvf(), 0.0);
using FluxVariables = GetPropType<OnePTypeTag, Properties::FluxVariables>;
auto upwindTerm = [](const auto& volVars) { return volVars.mobility(0); };
@@ -167,7 +167,7 @@ int main(int argc, char** argv) try
// We iterate over all elements.
for (const auto& element : elements(leafGridView))
{
- auto fvGeometry = localView(*fvGridGeometry);
+ auto fvGeometry = localView(*gridGeometry);
fvGeometry.bind(element);
auto elemVolVars = localView(onePGridVariables->curGridVolVars());
@@ -206,7 +206,7 @@ int main(int argc, char** argv) try
// #### Set-up
// Similar to the 1p problem, we first create and initialize the problem.
using TracerProblem = GetPropType<TracerTypeTag, Properties::Problem>;
- auto tracerProblem = std::make_shared<TracerProblem>(fvGridGeometry);
+ auto tracerProblem = std::make_shared<TracerProblem>(gridGeometry);
// We use the volume fluxes calculated in the previous section as input for the tracer model.
tracerProblem->spatialParams().setVolumeFlux(volumeFlux);
@@ -218,7 +218,7 @@ int main(int argc, char** argv) try
// We create and initialize the grid variables.
using GridVariables = GetPropType<TracerTypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(tracerProblem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(tracerProblem, gridGeometry);
gridVariables->init(x);
// We read in some time loop parameters from the input file. The parameter `tEnd` defines the duration of the simulation, dt the initial time step size and `maxDt` the maximal time step size.
@@ -232,7 +232,7 @@ int main(int argc, char** argv) try
// We create and inizialize the assembler with time loop for the instationary problem.
using TracerAssembler = FVAssembler<TracerTypeTag, DiffMethod::analytic, /*implicit=*/false>;
- auto assembler = std::make_shared<TracerAssembler>(tracerProblem, fvGridGeometry, gridVariables, timeLoop);
+ auto assembler = std::make_shared<TracerAssembler>(tracerProblem, gridGeometry, gridVariables, timeLoop);
assembler->setLinearSystem(A, r);
// We initialize the vtk output module and add a velocity output.
diff --git a/examples/1ptracer/problem_1p.hh b/examples/1ptracer/problem_1p.hh
index c56bab36eb..cd8caedb33 100644
--- a/examples/1ptracer/problem_1p.hh
+++ b/examples/1ptracer/problem_1p.hh
@@ -127,8 +127,8 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
public:
// This is the constructor of our problem class:
- OnePTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ OnePTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry) {}
// First, we define the type of boundary conditions depending on location. Two types of boundary conditions
// can be specified: Dirichlet or Neumann boundary condition. On a Dirichlet boundary, the values of the
diff --git a/examples/1ptracer/spatialparams_1p.hh b/examples/1ptracer/spatialparams_1p.hh
index 5096115b4c..38d22f0fba 100644
--- a/examples/1ptracer/spatialparams_1p.hh
+++ b/examples/1ptracer/spatialparams_1p.hh
@@ -52,8 +52,8 @@ class OnePTestSpatialParams
public:
using PermeabilityType = Scalar;
- OnePTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), K_(fvGridGeometry->gridView().size(0), 0.0)
+ OnePTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), K_(gridGeometry->gridView().size(0), 0.0)
{
// ### Generation of the random permeability field
// We get the permeability of the domain and the lens from the `params.input` file.
@@ -68,9 +68,9 @@ public:
std::mt19937 rand(0);
std::lognormal_distribution<Scalar> K(std::log(permeability_), std::log(permeability_)*0.1);
std::lognormal_distribution<Scalar> KLens(std::log(permeabilityLens_), std::log(permeabilityLens_)*0.1);
- for (const auto& element : elements(fvGridGeometry->gridView()))
+ for (const auto& element : elements(gridGeometry->gridView()))
{
- const auto eIdx = fvGridGeometry->elementMapper().index(element);
+ const auto eIdx = gridGeometry->elementMapper().index(element);
const auto globalPos = element.geometry().center();
K_[eIdx] = isInLens_(globalPos) ? KLens(rand) : K(rand);
}
diff --git a/examples/1ptracer/spatialparams_tracer.hh b/examples/1ptracer/spatialparams_tracer.hh
index 3959ff40a3..00bedcae4c 100644
--- a/examples/1ptracer/spatialparams_tracer.hh
+++ b/examples/1ptracer/spatialparams_tracer.hh
@@ -51,8 +51,8 @@ class TracerTestSpatialParams
public:
- TracerTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ TracerTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry) {}
// ### Properties of the porous matrix
// We define the same porosity for the whole domain as in the 1p spatialparams.
diff --git a/examples/2pinfiltration/main.cc b/examples/2pinfiltration/main.cc
index 471286b6fe..8d5f1dc50f 100644
--- a/examples/2pinfiltration/main.cc
+++ b/examples/2pinfiltration/main.cc
@@ -103,24 +103,24 @@ int main(int argc, char** argv) try
//
// We need the finite volume geometry to build up the subcontrolvolumes (scv) and subcontrolvolume faces (scvf) for each element of the grid partition.
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// In the problem, we define the boundary and initial conditions.
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// We call the `computePointSourceMap` method to compute the point sources. The `computePointSourceMap` method is inherited from the fvproblem and therefore specified in the `dumux/common/fvproblem.hh`. It calls the `addPointSources` method specified in the `problem.hh` file.
problem->computePointSourceMap();
// We initialize the solution vector,
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// and then use the solution vector to intialize the `gridVariables`.
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
//We instantiate the indicator for grid adaption & the data transfer, we read some parameters for indicator from the input file.
@@ -128,12 +128,12 @@ int main(int argc, char** argv) try
const Scalar refineTol = getParam<Scalar>("Adaptive.RefineTolerance");
const Scalar coarsenTol = getParam<Scalar>("Adaptive.CoarsenTolerance");
// We use an indicator for a two-phase flow problem that is saturation-dependent and defined in the file `dumux/porousmediumflow/2p/gridadaptindicator.hh.` It allows to set the minimum and maximum allowed refinement levels via the input parameters.
- TwoPGridAdaptIndicator<TypeTag> indicator(fvGridGeometry);
+ TwoPGridAdaptIndicator<TypeTag> indicator(gridGeometry);
// The data transfer performs the transfer of data on a grid from before to after adaptation and is defined in the file `dumux/porousmediumflow/2p/griddatatransfer.hh`. Its main functions are to store and reconstruct the primary variables.
- TwoPGridDataTransfer<TypeTag> dataTransfer(problem, fvGridGeometry, gridVariables, x);
+ TwoPGridDataTransfer<TypeTag> dataTransfer(problem, gridGeometry, gridVariables, x);
// We do an initial refinement around sources/BCs. We use the `GridAdaptInitializationIndicator` defined in `dumux/adaptive/initializationindicator.hh` for that.
- GridAdaptInitializationIndicator<TypeTag> initIndicator(problem, fvGridGeometry, gridVariables);
+ GridAdaptInitializationIndicator<TypeTag> initIndicator(problem, gridGeometry, gridVariables);
//We refine up to the maximum level. For every level, the indicator used for the refinement/coarsening is calculated. If any grid cells have to be adapted, the gridvariables and the pointsourcemap are updated.
const auto maxLevel = getParam<std::size_t>("Adaptive.MaxLevel", 0);
@@ -198,11 +198,11 @@ int main(int argc, char** argv) try
//we set the assembler with the time loop because we have an instationary problem
using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop);
// we set the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// additionally we set the non-linear solver.
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/examples/2pinfiltration/problem.hh b/examples/2pinfiltration/problem.hh
index 34d35e08ed..f7ddfceef0 100644
--- a/examples/2pinfiltration/problem.hh
+++ b/examples/2pinfiltration/problem.hh
@@ -157,8 +157,8 @@ class PointSourceProblem : public PorousMediumFlowProblem<TypeTag>
public:
// This is the constructor of our problem class:
- PointSourceProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ PointSourceProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// We read in the values for the initial condition of our simulation:
initialValues_ = readFileToContainer<std::vector<PrimaryVariables>>("initialsolutioncc.txt");
diff --git a/examples/2pinfiltration/spatialparams.hh b/examples/2pinfiltration/spatialparams.hh
index ec0402c039..4bcb5292d0 100644
--- a/examples/2pinfiltration/spatialparams.hh
+++ b/examples/2pinfiltration/spatialparams.hh
@@ -54,8 +54,8 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = Scalar;
- TwoPTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TwoPTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
//we get the position of the lens from the params.input file. The lens is defined by the position of the lower left and the upper right corner
lensLowerLeft_ = getParam<GlobalPosition>("SpatialParams.LensLowerLeft");
diff --git a/examples/shallowwaterfriction/problem.hh b/examples/shallowwaterfriction/problem.hh
index c9349e9d35..8d7c55f968 100644
--- a/examples/shallowwaterfriction/problem.hh
+++ b/examples/shallowwaterfriction/problem.hh
@@ -119,8 +119,8 @@ class RoughChannelProblem : public ShallowWaterProblem<TypeTag>
public:
// This is the constructor of our problem class.
- RoughChannelProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RoughChannelProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// We read the parameters from the params.input file.
name_ = getParam<std::string>("Problem.Name");
@@ -130,8 +130,8 @@ public:
// We calculate the outflow boundary condition using the Gauckler-Manning-Strickler formula.
hBoundary_ = this->gauklerManningStrickler(discharge_,constManningN_,bedSlope_);
// We initialize the analytic solution to a verctor of the appropriate size filled with zeros.
- exactWaterDepth_.resize(fvGridGeometry->numDofs(), 0.0);
- exactVelocityX_.resize(fvGridGeometry->numDofs(), 0.0);
+ exactWaterDepth_.resize(gridGeometry->numDofs(), 0.0);
+ exactVelocityX_.resize(gridGeometry->numDofs(), 0.0);
}
// Get the analytical water depth
diff --git a/examples/shallowwaterfriction/spatialparams.hh b/examples/shallowwaterfriction/spatialparams.hh
index 16f013e04e..17bca79fee 100644
--- a/examples/shallowwaterfriction/spatialparams.hh
+++ b/examples/shallowwaterfriction/spatialparams.hh
@@ -50,8 +50,8 @@ class RoughChannelSpatialParams
public:
// In the constructor be read some values from the `params.input` and initialize the friciton law.
- RoughChannelSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RoughChannelSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
gravity_ = getParam<Scalar>("Problem.Gravity");
bedSlope_ = getParam<Scalar>("Problem.BedSlope");
diff --git a/test/discretization/box/test_boxfvgeometry.cc b/test/discretization/box/test_boxfvgeometry.cc
index f70e09c228..6e6688f9e4 100644
--- a/test/discretization/box/test_boxfvgeometry.cc
+++ b/test/discretization/box/test_boxfvgeometry.cc
@@ -72,15 +72,15 @@ int main (int argc, char *argv[]) try
std::shared_ptr<Grid> grid = Dune::StructuredGridFactory<Grid>::createCubeGrid(lower, upper, els);
auto leafGridView = grid->leafGridView();
- GridGeometry fvGridGeometry(leafGridView);
- fvGridGeometry.update();
+ GridGeometry gridGeometry(leafGridView);
+ gridGeometry.update();
// iterate over elements. For every element get fv geometry and loop over scvs and scvfaces
for (const auto& element : elements(leafGridView))
{
- auto eIdx = fvGridGeometry.elementMapper().index(element);
+ auto eIdx = gridGeometry.elementMapper().index(element);
std::cout << std::endl << "Checking fvGeometry of element " << eIdx << std::endl;
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bind(element);
auto range = scvs(fvGeometry);
diff --git a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc
index 5b507a531c..856b3f6517 100644
--- a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc
+++ b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc
@@ -73,15 +73,15 @@ int main (int argc, char *argv[]) try
// obtain leaf and make GridGeometry
auto leafGridView = grid->leafGridView();
- GridGeometry fvGridGeometry(leafGridView);
- fvGridGeometry.update();
+ GridGeometry gridGeometry(leafGridView);
+ gridGeometry.update();
// iterate over elements. For every element get fv geometry and loop over scvs and scvfaces
for (const auto& element : elements(leafGridView))
{
- auto eIdx = fvGridGeometry.elementMapper().index(element);
+ auto eIdx = gridGeometry.elementMapper().index(element);
std::cout << std::endl << "Checking fvGeometry of element " << eIdx << std::endl;
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bind(element);
auto range = scvs(fvGeometry);
diff --git a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc
index 4904a1a67f..ffbed2d4b5 100644
--- a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc
+++ b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc
@@ -141,22 +141,22 @@ int main (int argc, char *argv[]) try
if (leafGridView.size(0) != 12)
DUNE_THROW(Dune::InvalidStateException, "Refined grid does not have exactly 12 elements!");
- //! instantiate and update fvGridGeometry
- GridGeometry fvGridGeometry(leafGridView);
- fvGridGeometry.update();
+ //! instantiate and update gridGeometry
+ GridGeometry gridGeometry(leafGridView);
+ gridGeometry.update();
//! We should have constructed 12 scvfs
- if (fvGridGeometry.numScv() != 12)
+ if (gridGeometry.numScv() != 12)
DUNE_THROW(Dune::InvalidStateException, "FvGridGeometry does not have exactly 12 scvs!");
//! We should have constructed 52 scvfs
- if (fvGridGeometry.numScvf() != 52)
+ if (gridGeometry.numScvf() != 52)
DUNE_THROW(Dune::InvalidStateException, "FvGridGeometry does not have exactly 52 scvfs!");
//! iterate over elements and check for each element the number of scvfs
for (const auto& element : elements(leafGridView))
{
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bind(element);
//! For the tpfa scheme there is always one scv per element
@@ -224,7 +224,7 @@ int main (int argc, char *argv[]) try
//! check levels of neighbors
if (!scvf.boundary())
{
- const auto outsideElement = fvGridGeometry.element(scvf.outsideScvIdx());
+ const auto outsideElement = gridGeometry.element(scvf.outsideScvIdx());
const auto outsideCenter = outsideElement.geometry().center();
if (isInCentralElement(outsideCenter))
diff --git a/test/discretization/staggered/test_staggered_free_flow_geometry.cc b/test/discretization/staggered/test_staggered_free_flow_geometry.cc
index 20078191bc..b1cdde06fc 100644
--- a/test/discretization/staggered/test_staggered_free_flow_geometry.cc
+++ b/test/discretization/staggered/test_staggered_free_flow_geometry.cc
@@ -109,8 +109,8 @@ int main (int argc, char *argv[]) try
std::shared_ptr<Grid> grid = Dune::StructuredGridFactory<Grid>::createCubeGrid(lower, upper, els);
auto leafGridView = grid->leafGridView();
- GridGeometry fvGridGeometry(leafGridView);
- fvGridGeometry.update();
+ GridGeometry gridGeometry(leafGridView);
+ gridGeometry.update();
std::cout << "Abbreviatons:\n"
<< "pos - postition of face center\n"
@@ -125,11 +125,11 @@ int main (int argc, char *argv[]) try
// iterate over elements. For every element get fv geometry and loop over scvs and scvfaces
for (const auto& element : elements(leafGridView))
{
- auto eIdx = fvGridGeometry.elementMapper().index(element);
+ auto eIdx = gridGeometry.elementMapper().index(element);
if(eIdx == 12 || eIdx == 0)
{
std::cout << std::endl << "Checking fvGeometry of element " << eIdx << std::endl;
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bind(element);
auto range = scvs(fvGeometry);
@@ -162,11 +162,11 @@ int main (int argc, char *argv[]) try
std::cout << std::fixed << std::left << std::setprecision(2);
std::cout << " On Axis Dof Index: \n";
- if(fvGridGeometry.upwindStencilOrder() > 1)
+ if(gridGeometry.upwindStencilOrder() > 1)
{std::cout << " | Forward dofIdx : " << std::setw(3) << scvf.axisData().inAxisForwardDofs[0] << "\n";}
std::cout << " | Self dofIdx : " << std::setw(3) << scvf.dofIndex() << "\n";
std::cout << " | Opposite dofIdx : " << std::setw(3) << scvf.dofIndexOpposingFace() << "\n";
- if(fvGridGeometry.upwindStencilOrder() > 1)
+ if(gridGeometry.upwindStencilOrder() > 1)
{std::cout << " | Backward dofIdx : " << std::setw(3) << scvf.axisData().inAxisBackwardDofs[0] << "\n";}
std::cout << " Normal Dof Index: \n";
@@ -179,22 +179,22 @@ int main (int argc, char *argv[]) try
std::cout << " Parallel Dof Index: \n";
for(int i = 0; i < scvf.pairData().size(); i++)
{
- for(int j = 0; j < fvGridGeometry.upwindStencilOrder(); j++)
+ for(int j = 0; j < gridGeometry.upwindStencilOrder(); j++)
{
std::cout << " | Parallel Dof "<< j << " on axis " << i << ": "<< std::setw(3) << scvf.pairData(i).parallelDofs[j] << "\n";
}
}
std::cout << " Distances: \n";
- if(fvGridGeometry.upwindStencilOrder() > 1)
+ if(gridGeometry.upwindStencilOrder() > 1)
{std::cout << " | Opposite To Backwards Face Dist : " << std::setw(3) << scvf.axisData().inAxisBackwardDistances[0] << "\n";}
std::cout << " | self To Opposite Dist : " << std::setw(3) << scvf.selfToOppositeDistance() << "\n";
- if(fvGridGeometry.upwindStencilOrder() > 1)
+ if(gridGeometry.upwindStencilOrder() > 1)
{std::cout << " | self To Forwards Face Dist : " << std::setw(3) << scvf.axisData().inAxisForwardDistances[0] << "\n";}
for(int i = 0; i < scvf.pairData().size(); i++)
{
- for(int j = 0; j < fvGridGeometry.upwindStencilOrder(); j++)
+ for(int j = 0; j < gridGeometry.upwindStencilOrder(); j++)
{
std::cout << " | Parallel Cell Widths "<< j << " on axis " << i << ": "<< std::setw(3) << scvf.pairData(i).parallelCellWidths[j] << "\n";
}
@@ -202,7 +202,7 @@ int main (int argc, char *argv[]) try
for(int i = 0; i < scvf.pairData().size(); i++)
{
- for(int j = 0; j < fvGridGeometry.upwindStencilOrder(); j++)
+ for(int j = 0; j < gridGeometry.upwindStencilOrder(); j++)
{
std::cout << " | Cell Centered Parallel Distance "<< j << " on axis " << i << ": "<< std::setw(3) << scvf.parallelDofsDistance(i,j) << "\n";
}
diff --git a/test/discretization/staggered/test_staggeredfvgeometry.cc b/test/discretization/staggered/test_staggeredfvgeometry.cc
index a6b9f69ada..e8a067704c 100644
--- a/test/discretization/staggered/test_staggeredfvgeometry.cc
+++ b/test/discretization/staggered/test_staggeredfvgeometry.cc
@@ -69,7 +69,7 @@ struct TestFVGGTraits : public DefaultMapperTraits<GridView>
template<class GridGeometry>
struct MockConnectivityMap
{
- void update(const GridGeometry& fvGridGeometry) {}
+ void update(const GridGeometry& gridGeometry) {}
void setStencilOrder(const int order) {}
};
@@ -114,15 +114,15 @@ int main (int argc, char *argv[]) try
std::shared_ptr<Grid> grid = Dune::StructuredGridFactory<Grid>::createCubeGrid(lower, upper, els);
auto leafGridView = grid->leafGridView();
- GridGeometry fvGridGeometry(leafGridView);
- fvGridGeometry.update();
+ GridGeometry gridGeometry(leafGridView);
+ gridGeometry.update();
// iterate over elements. For every element get fv geometry and loop over scvs and scvfaces
for (const auto& element : elements(leafGridView))
{
- auto eIdx = fvGridGeometry.elementMapper().index(element);
+ auto eIdx = gridGeometry.elementMapper().index(element);
std::cout << std::endl << "Checking fvGeometry of element " << eIdx << std::endl;
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bind(element);
auto range = scvs(fvGeometry);
diff --git a/test/freeflow/navierstokes/angeli/main.cc b/test/freeflow/navierstokes/angeli/main.cc
index ac05314106..cfce492f44 100644
--- a/test/freeflow/navierstokes/angeli/main.cc
+++ b/test/freeflow/navierstokes/angeli/main.cc
@@ -57,8 +57,8 @@
template<class Scalar, class Problem>
auto createAnalyticalSolution(const Scalar time, const Problem& problem)
{
- const auto& fvGridGeometry = problem.gridGeometry();
- using GridView = typename std::decay_t<decltype(fvGridGeometry)>::GridView;
+ const auto& gridGeometry = problem.gridGeometry();
+ using GridView = typename std::decay_t<decltype(gridGeometry)>::GridView;
static constexpr auto dim = GridView::dimension;
static constexpr auto dimWorld = GridView::dimensionworld;
@@ -69,14 +69,14 @@ auto createAnalyticalSolution(const Scalar time, const Problem& problem)
std::vector<VelocityVector> analyticalVelocity;
std::vector<VelocityVector> analyticalVelocityOnFace;
- analyticalPressure.resize(fvGridGeometry.numCellCenterDofs());
- analyticalVelocity.resize(fvGridGeometry.numCellCenterDofs());
- analyticalVelocityOnFace.resize(fvGridGeometry.numFaceDofs());
+ analyticalPressure.resize(gridGeometry.numCellCenterDofs());
+ analyticalVelocity.resize(gridGeometry.numCellCenterDofs());
+ analyticalVelocityOnFace.resize(gridGeometry.numFaceDofs());
using Indices = typename Problem::Indices;
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
{
@@ -134,8 +134,8 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -149,20 +149,20 @@ int main(int argc, char** argv) try
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
problem->updateTimeStepSize(timeLoop->timeStepSize());
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// initialize the vtk output module
@@ -178,7 +178,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
@@ -207,8 +207,8 @@ int main(int argc, char** argv) try
using L2Error = NavierStokesTestL2Error<Scalar, ModelTraits, PrimaryVariables>;
const auto l2error = L2Error::calculateL2Error(*problem, x);
- const int numCellCenterDofs = fvGridGeometry->numCellCenterDofs();
- const int numFaceDofs = fvGridGeometry->numFaceDofs();
+ const int numCellCenterDofs = gridGeometry->numCellCenterDofs();
+ const int numFaceDofs = gridGeometry->numFaceDofs();
std::cout << std::setprecision(8) << "** L2 error (abs/rel) for "
<< std::setw(6) << numCellCenterDofs << " cc dofs and " << numFaceDofs << " face dofs (total: " << numCellCenterDofs + numFaceDofs << "): "
<< std::scientific
diff --git a/test/freeflow/navierstokes/angeli/problem.hh b/test/freeflow/navierstokes/angeli/problem.hh
index 4848ed86d8..18d1f9090b 100644
--- a/test/freeflow/navierstokes/angeli/problem.hh
+++ b/test/freeflow/navierstokes/angeli/problem.hh
@@ -104,8 +104,8 @@ class AngeliTestProblem : public NavierStokesProblem<TypeTag>
public:
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
- AngeliTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ AngeliTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
kinematicViscosity_ = getParam<Scalar>("Component.LiquidKinematicViscosity", 1.0);
}
diff --git a/test/freeflow/navierstokes/channel/1d/main.cc b/test/freeflow/navierstokes/channel/1d/main.cc
index 82302e3344..2880b03269 100644
--- a/test/freeflow/navierstokes/channel/1d/main.cc
+++ b/test/freeflow/navierstokes/channel/1d/main.cc
@@ -76,22 +76,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -105,7 +105,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
diff --git a/test/freeflow/navierstokes/channel/1d/problem.hh b/test/freeflow/navierstokes/channel/1d/problem.hh
index 9c2672bcf8..de84b08752 100644
--- a/test/freeflow/navierstokes/channel/1d/problem.hh
+++ b/test/freeflow/navierstokes/channel/1d/problem.hh
@@ -105,8 +105,8 @@ class NavierStokesAnalyticProblem : public NavierStokesProblem<TypeTag>
using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
public:
- NavierStokesAnalyticProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), eps_(1e-6)
+ NavierStokesAnalyticProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), eps_(1e-6)
{
printL2Error_ = getParam<bool>("Problem.PrintL2Error");
density_ = getParam<Scalar>("Component.LiquidDensity");
diff --git a/test/freeflow/navierstokes/channel/2d/main.cc b/test/freeflow/navierstokes/channel/2d/main.cc
index ff469a1358..cd95b48b04 100644
--- a/test/freeflow/navierstokes/channel/2d/main.cc
+++ b/test/freeflow/navierstokes/channel/2d/main.cc
@@ -77,12 +77,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -96,8 +96,8 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
problem->applyInitialSolution(x);
auto xOld = x;
@@ -108,7 +108,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// initialize the vtk output module
@@ -119,7 +119,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
@@ -139,10 +139,10 @@ int main(int argc, char** argv) try
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- const Scalar xMin = fvGridGeometry->bBoxMin()[0];
- const Scalar xMax = fvGridGeometry->bBoxMax()[0];
- const Scalar yMin = fvGridGeometry->bBoxMin()[1];
- const Scalar yMax = fvGridGeometry->bBoxMax()[1];
+ const Scalar xMin = gridGeometry->bBoxMin()[0];
+ const Scalar xMax = gridGeometry->bBoxMax()[0];
+ const Scalar yMin = gridGeometry->bBoxMin()[1];
+ const Scalar yMax = gridGeometry->bBoxMax()[1];
// The first surface shall be placed at the middle of the channel.
// If we have an odd number of cells in x-direction, there would not be any cell faces
diff --git a/test/freeflow/navierstokes/channel/2d/problem.hh b/test/freeflow/navierstokes/channel/2d/problem.hh
index bea0d03277..759ad3bb97 100644
--- a/test/freeflow/navierstokes/channel/2d/problem.hh
+++ b/test/freeflow/navierstokes/channel/2d/problem.hh
@@ -115,8 +115,8 @@ class ChannelTestProblem : public NavierStokesProblem<TypeTag>
};
public:
- ChannelTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), eps_(1e-6)
+ ChannelTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), eps_(1e-6)
{
inletVelocity_ = getParam<Scalar>("Problem.InletVelocity");
const auto tmp = getParam<std::string>("Problem.OutletCondition", "Outflow");
diff --git a/test/freeflow/navierstokes/channel/3d/main.cc b/test/freeflow/navierstokes/channel/3d/main.cc
index b5e316241c..30f792820e 100644
--- a/test/freeflow/navierstokes/channel/3d/main.cc
+++ b/test/freeflow/navierstokes/channel/3d/main.cc
@@ -77,22 +77,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -103,7 +103,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
@@ -122,13 +122,13 @@ int main(int argc, char** argv) try
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimensionworld>;
- const Scalar xMin = fvGridGeometry->bBoxMin()[0];
- const Scalar xMax = fvGridGeometry->bBoxMax()[0];
- const Scalar yMin = fvGridGeometry->bBoxMin()[1];
- const Scalar yMax = fvGridGeometry->bBoxMax()[1];
+ const Scalar xMin = gridGeometry->bBoxMin()[0];
+ const Scalar xMax = gridGeometry->bBoxMax()[0];
+ const Scalar yMin = gridGeometry->bBoxMin()[1];
+ const Scalar yMax = gridGeometry->bBoxMax()[1];
#if DIM_3D
- const Scalar zMin = fvGridGeometry->bBoxMin()[2];
- const Scalar zMax = fvGridGeometry->bBoxMax()[2];
+ const Scalar zMin = gridGeometry->bBoxMin()[2];
+ const Scalar zMax = gridGeometry->bBoxMax()[2];
#endif
// The first plane shall be placed at the middle of the channel.
diff --git a/test/freeflow/navierstokes/channel/3d/problem.hh b/test/freeflow/navierstokes/channel/3d/problem.hh
index 63110c831e..dd5d68fdac 100644
--- a/test/freeflow/navierstokes/channel/3d/problem.hh
+++ b/test/freeflow/navierstokes/channel/3d/problem.hh
@@ -123,8 +123,8 @@ class ThreeDChannelTestProblem : public NavierStokesProblem<TypeTag>
static constexpr bool enablePseudoThreeDWallFriction = !DIM_3D;
public:
- ThreeDChannelTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), eps_(1e-6)
+ ThreeDChannelTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), eps_(1e-6)
{
deltaP_ = getParam<Scalar>("Problem.DeltaP");
height_ = getParam<Scalar>("Problem.Height");
diff --git a/test/freeflow/navierstokes/closedsystem/main.cc b/test/freeflow/navierstokes/closedsystem/main.cc
index e860a62ffc..5e1a20d7a9 100644
--- a/test/freeflow/navierstokes/closedsystem/main.cc
+++ b/test/freeflow/navierstokes/closedsystem/main.cc
@@ -76,24 +76,24 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -114,7 +114,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
diff --git a/test/freeflow/navierstokes/closedsystem/problem.hh b/test/freeflow/navierstokes/closedsystem/problem.hh
index 803b9e888d..97153af6fa 100644
--- a/test/freeflow/navierstokes/closedsystem/problem.hh
+++ b/test/freeflow/navierstokes/closedsystem/problem.hh
@@ -97,8 +97,8 @@ class ClosedSystemTestProblem : public NavierStokesProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- ClosedSystemTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), eps_(1e-6)
+ ClosedSystemTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), eps_(1e-6)
{
lidVelocity_ = getParam<Scalar>("Problem.LidVelocity");
}
diff --git a/test/freeflow/navierstokes/donea/main.cc b/test/freeflow/navierstokes/donea/main.cc
index 6f23214919..1db594dacb 100644
--- a/test/freeflow/navierstokes/donea/main.cc
+++ b/test/freeflow/navierstokes/donea/main.cc
@@ -78,22 +78,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -107,7 +107,7 @@ int main(int argc, char** argv) try
// use the staggered FV assembler
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
@@ -118,7 +118,7 @@ int main(int argc, char** argv) try
NewtonSolver nonLinearSolver(assembler, linearSolver);
using NewtonConvergenceWriter = StaggeredNewtonConvergenceWriter<GridGeometry, SolutionVector>;
- auto convergenceWriter = std::make_shared<NewtonConvergenceWriter>(*fvGridGeometry);
+ auto convergenceWriter = std::make_shared<NewtonConvergenceWriter>(*gridGeometry);
nonLinearSolver.attachConvergenceWriter(convergenceWriter);
// linearize & solve
diff --git a/test/freeflow/navierstokes/donea/problem.hh b/test/freeflow/navierstokes/donea/problem.hh
index 3fb28b3a76..75026d4e98 100644
--- a/test/freeflow/navierstokes/donea/problem.hh
+++ b/test/freeflow/navierstokes/donea/problem.hh
@@ -105,8 +105,8 @@ class DoneaTestProblem : public NavierStokesProblem<TypeTag>
using VelocityVector = Dune::FieldVector<Scalar, dimWorld>;
public:
- DoneaTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), eps_(1e-6)
+ DoneaTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), eps_(1e-6)
{
printL2Error_ = getParam<bool>("Problem.PrintL2Error");
createAnalyticalSolution_();
diff --git a/test/freeflow/navierstokes/kovasznay/main.cc b/test/freeflow/navierstokes/kovasznay/main.cc
index f02242e733..c21d9a0936 100644
--- a/test/freeflow/navierstokes/kovasznay/main.cc
+++ b/test/freeflow/navierstokes/kovasznay/main.cc
@@ -76,22 +76,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -105,7 +105,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
diff --git a/test/freeflow/navierstokes/kovasznay/problem.hh b/test/freeflow/navierstokes/kovasznay/problem.hh
index fc64fac118..5144114791 100644
--- a/test/freeflow/navierstokes/kovasznay/problem.hh
+++ b/test/freeflow/navierstokes/kovasznay/problem.hh
@@ -109,8 +109,8 @@ class KovasznayTestProblem : public NavierStokesProblem<TypeTag>
static constexpr auto upwindSchemeOrder = getPropValue<TypeTag, Properties::UpwindSchemeOrder>();
public:
- KovasznayTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), eps_(1e-6)
+ KovasznayTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), eps_(1e-6)
{
printL2Error_ = getParam<bool>("Problem.PrintL2Error");
std::cout<< "upwindSchemeOrder is: " << GridGeometry::upwindStencilOrder() << "\n";
diff --git a/test/freeflow/navierstokes/sincos/main.cc b/test/freeflow/navierstokes/sincos/main.cc
index ad61fc6312..507ff765ca 100644
--- a/test/freeflow/navierstokes/sincos/main.cc
+++ b/test/freeflow/navierstokes/sincos/main.cc
@@ -57,8 +57,8 @@
template<class Scalar, class Problem>
auto createAnalyticalSolution(const Scalar time, const Problem& problem)
{
- const auto& fvGridGeometry = problem.gridGeometry();
- using GridView = typename std::decay_t<decltype(fvGridGeometry)>::GridView;
+ const auto& gridGeometry = problem.gridGeometry();
+ using GridView = typename std::decay_t<decltype(gridGeometry)>::GridView;
static constexpr auto dim = GridView::dimension;
static constexpr auto dimWorld = GridView::dimensionworld;
@@ -69,14 +69,14 @@ auto createAnalyticalSolution(const Scalar time, const Problem& problem)
std::vector<VelocityVector> analyticalVelocity;
std::vector<VelocityVector> analyticalVelocityOnFace;
- analyticalPressure.resize(fvGridGeometry.numCellCenterDofs());
- analyticalVelocity.resize(fvGridGeometry.numCellCenterDofs());
- analyticalVelocityOnFace.resize(fvGridGeometry.numFaceDofs());
+ analyticalPressure.resize(gridGeometry.numCellCenterDofs());
+ analyticalVelocity.resize(gridGeometry.numCellCenterDofs());
+ analyticalVelocityOnFace.resize(gridGeometry.numFaceDofs());
using Indices = typename Problem::Indices;
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
{
@@ -110,17 +110,17 @@ auto createSource(const Problem& problem)
using Scalar = double;
using Indices = typename Problem::Indices;
- const auto& fvGridGeometry = problem.gridGeometry();
+ const auto& gridGeometry = problem.gridGeometry();
std::array<std::vector<Scalar>, Problem::ModelTraits::numEq()> source;
for (auto& component : source)
{
- component.resize(fvGridGeometry.numCellCenterDofs());
+ component.resize(gridGeometry.numCellCenterDofs());
}
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
{
@@ -138,7 +138,7 @@ auto createSource(const Problem& problem)
}
template<class Problem, class SolutionVector, class GridGeometry>
-void printL2Error(const Problem& problem, const SolutionVector& x, const GridGeometry& fvGridGeometry)
+void printL2Error(const Problem& problem, const SolutionVector& x, const GridGeometry& gridGeometry)
{
using namespace Dumux;
using Scalar = double;
@@ -149,8 +149,8 @@ void printL2Error(const Problem& problem, const SolutionVector& x, const GridGeo
using L2Error = NavierStokesTestL2Error<Scalar, ModelTraits, PrimaryVariables>;
const auto l2error = L2Error::calculateL2Error(*problem, x);
- const int numCellCenterDofs = fvGridGeometry->numCellCenterDofs();
- const int numFaceDofs = fvGridGeometry->numFaceDofs();
+ const int numCellCenterDofs = gridGeometry->numCellCenterDofs();
+ const int numFaceDofs = gridGeometry->numFaceDofs();
std::cout << std::setprecision(8) << "** L2 error (abs/rel) for "
<< std::setw(6) << numCellCenterDofs << " cc dofs and " << numFaceDofs << " face dofs (total: " << numCellCenterDofs + numFaceDofs << "): "
<< std::scientific
@@ -196,8 +196,8 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -211,20 +211,20 @@ int main(int argc, char** argv) try
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
problem->updateTimeStepSize(timeLoop->timeStepSize());
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// initialize the vtk output module
@@ -248,8 +248,8 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = isStationary ? std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables)
- : std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = isStationary ? std::make_shared<Assembler>(problem, gridGeometry, gridVariables)
+ : std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
@@ -269,7 +269,7 @@ int main(int argc, char** argv) try
if (shouldPrintL2Error)
{
- printL2Error(problem, x, fvGridGeometry);
+ printL2Error(problem, x, gridGeometry);
}
// write vtk output
@@ -297,7 +297,7 @@ int main(int argc, char** argv) try
if (shouldPrintL2Error)
{
- printL2Error(problem, x, fvGridGeometry);
+ printL2Error(problem, x, gridGeometry);
}
// advance to the time loop to the next step
diff --git a/test/freeflow/navierstokes/sincos/problem.hh b/test/freeflow/navierstokes/sincos/problem.hh
index 80eb1801dc..bef74ad581 100644
--- a/test/freeflow/navierstokes/sincos/problem.hh
+++ b/test/freeflow/navierstokes/sincos/problem.hh
@@ -104,8 +104,8 @@ public:
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
- SincosTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), time_(0.0), timeStepSize_(0.0)
+ SincosTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), time_(0.0), timeStepSize_(0.0)
{
isStationary_ = getParam<bool>("Problem.IsStationary");
enableInertiaTerms_ = getParam<bool>("Problem.EnableInertiaTerms");
diff --git a/test/freeflow/navierstokesnc/channel/main.cc b/test/freeflow/navierstokesnc/channel/main.cc
index cf4050af27..d4df7d267b 100644
--- a/test/freeflow/navierstokesnc/channel/main.cc
+++ b/test/freeflow/navierstokesnc/channel/main.cc
@@ -76,12 +76,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -97,14 +97,14 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -116,7 +116,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
diff --git a/test/freeflow/navierstokesnc/channel/problem.hh b/test/freeflow/navierstokesnc/channel/problem.hh
index da8fead4aa..4cf2ab0824 100644
--- a/test/freeflow/navierstokesnc/channel/problem.hh
+++ b/test/freeflow/navierstokesnc/channel/problem.hh
@@ -127,8 +127,8 @@ class ChannelNCTestProblem : public NavierStokesProblem<TypeTag>
static constexpr auto transportEqIdx = Indices::conti0EqIdx + compIdx;
public:
- ChannelNCTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), eps_(1e-6)
+ ChannelNCTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), eps_(1e-6)
{
inletVelocity_ = getParam<Scalar>("Problem.InletVelocity");
FluidSystem::init();
diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/main.cc b/test/freeflow/navierstokesnc/densitydrivenflow/main.cc
index 9a2829b6ae..59f53534bd 100644
--- a/test/freeflow/navierstokesnc/densitydrivenflow/main.cc
+++ b/test/freeflow/navierstokesnc/densitydrivenflow/main.cc
@@ -76,12 +76,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -96,14 +96,14 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -115,7 +115,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh
index c2c8abcd07..f40cd66ff7 100644
--- a/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh
+++ b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh
@@ -115,8 +115,8 @@ class DensityDrivenFlowProblem : public NavierStokesProblem<TypeTag>
static constexpr auto transportEqIdx = Indices::conti0EqIdx + 1;
public:
- DensityDrivenFlowProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), eps_(1e-6)
+ DensityDrivenFlowProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), eps_(1e-6)
{
useWholeLength_ = getParam<bool>("Problem.UseWholeLength");
FluidSystem::init();
diff --git a/test/freeflow/navierstokesnc/maxwellstefan/main.cc b/test/freeflow/navierstokesnc/maxwellstefan/main.cc
index 40d19b24f6..d38fbe455e 100644
--- a/test/freeflow/navierstokesnc/maxwellstefan/main.cc
+++ b/test/freeflow/navierstokesnc/maxwellstefan/main.cc
@@ -76,12 +76,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -96,14 +96,14 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -114,7 +114,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
diff --git a/test/freeflow/navierstokesnc/maxwellstefan/problem.hh b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
index 93ec739b78..7611da93aa 100644
--- a/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
+++ b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh
@@ -226,8 +226,8 @@ class MaxwellStefanNCTestProblem : public NavierStokesProblem<TypeTag>
};
public:
- MaxwellStefanNCTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ MaxwellStefanNCTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
plotOutput_ = getParam<bool>("Problem.PlotOutput", false);
}
diff --git a/test/freeflow/rans/main.cc b/test/freeflow/rans/main.cc
index 0c5f901ac6..3af7593cbb 100644
--- a/test/freeflow/rans/main.cc
+++ b/test/freeflow/rans/main.cc
@@ -100,12 +100,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -121,8 +121,8 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
problem->applyInitialSolution(x);
problem->updateStaticWallProperties();
problem->updateDynamicWallProperties(x);
@@ -130,7 +130,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -141,7 +141,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
diff --git a/test/freeflow/rans/problem.hh b/test/freeflow/rans/problem.hh
index f2a035cc8e..653711cb32 100644
--- a/test/freeflow/rans/problem.hh
+++ b/test/freeflow/rans/problem.hh
@@ -133,8 +133,8 @@ class PipeLauferProblem : public RANSProblem<TypeTag>
static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld;
public:
- PipeLauferProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), eps_(1e-6)
+ PipeLauferProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), eps_(1e-6)
{
inletVelocity_ = getParam<Scalar>("Problem.InletVelocity");
inletTemperature_ = getParam<Scalar>("Problem.InletTemperature", 283.15);
diff --git a/test/freeflow/ransnc/main.cc b/test/freeflow/ransnc/main.cc
index 2d56c71930..af8ae9117d 100644
--- a/test/freeflow/ransnc/main.cc
+++ b/test/freeflow/ransnc/main.cc
@@ -97,12 +97,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -118,8 +118,8 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector x;
- x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ x[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ x[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
problem->applyInitialSolution(x);
problem->updateStaticWallProperties();
problem->updateDynamicWallProperties(x);
@@ -127,7 +127,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -138,7 +138,7 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::UMFPackBackend;
diff --git a/test/freeflow/ransnc/problem.hh b/test/freeflow/ransnc/problem.hh
index eda84e0880..ad36aa8a1f 100644
--- a/test/freeflow/ransnc/problem.hh
+++ b/test/freeflow/ransnc/problem.hh
@@ -142,8 +142,8 @@ class FlatPlateNCTestProblem : public RANSProblem<TypeTag>
static constexpr auto transportCompIdx = Indices::conti0EqIdx + 1;
public:
- FlatPlateNCTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), eps_(1e-6)
+ FlatPlateNCTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), eps_(1e-6)
{
inletVelocity_ = getParam<Scalar>("Problem.InletVelocity", 0.1);
inletTemperature_ = getParam<Scalar>("Problem.InletTemperature", 283.15);
diff --git a/test/freeflow/shallowwater/dambreak/main.cc b/test/freeflow/shallowwater/dambreak/main.cc
index 49c0fac1ac..cacc8c9b33 100644
--- a/test/freeflow/shallowwater/dambreak/main.cc
+++ b/test/freeflow/shallowwater/dambreak/main.cc
@@ -79,22 +79,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -119,11 +119,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/freeflow/shallowwater/dambreak/problem.hh b/test/freeflow/shallowwater/dambreak/problem.hh
index 35071a7bc2..4b23aa6db7 100644
--- a/test/freeflow/shallowwater/dambreak/problem.hh
+++ b/test/freeflow/shallowwater/dambreak/problem.hh
@@ -126,12 +126,12 @@ class DamBreakProblem : public ShallowWaterProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- DamBreakProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ DamBreakProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
name_ = getParam<std::string>("Problem.Name");
- exactWaterDepth_.resize(fvGridGeometry->numDofs(), 0.0);
- exactVelocityX_.resize(fvGridGeometry->numDofs(), 0.0);
+ exactWaterDepth_.resize(gridGeometry->numDofs(), 0.0);
+ exactVelocityX_.resize(gridGeometry->numDofs(), 0.0);
}
//! Get the analytical water depth
diff --git a/test/freeflow/shallowwater/dambreak/spatialparams.hh b/test/freeflow/shallowwater/dambreak/spatialparams.hh
index 8208960388..8b2a832b30 100644
--- a/test/freeflow/shallowwater/dambreak/spatialparams.hh
+++ b/test/freeflow/shallowwater/dambreak/spatialparams.hh
@@ -47,8 +47,8 @@ class DamBreakSpatialParams
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- DamBreakSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ DamBreakSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{}
/*! \brief Define the porosity in [-].
diff --git a/test/freeflow/shallowwater/roughchannel/main.cc b/test/freeflow/shallowwater/roughchannel/main.cc
index 2b7ec29d8f..7931a8393c 100644
--- a/test/freeflow/shallowwater/roughchannel/main.cc
+++ b/test/freeflow/shallowwater/roughchannel/main.cc
@@ -77,22 +77,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -117,11 +117,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/freeflow/shallowwater/roughchannel/problem.hh b/test/freeflow/shallowwater/roughchannel/problem.hh
index 8aaf7735e8..33cce2afbe 100644
--- a/test/freeflow/shallowwater/roughchannel/problem.hh
+++ b/test/freeflow/shallowwater/roughchannel/problem.hh
@@ -131,12 +131,12 @@ class RoughChannelProblem : public ShallowWaterProblem<TypeTag>
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
public:
- RoughChannelProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RoughChannelProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
name_ = getParam<std::string>("Problem.Name");
- exactWaterDepth_.resize(fvGridGeometry->numDofs(), 0.0);
- exactVelocityX_.resize(fvGridGeometry->numDofs(), 0.0);
+ exactWaterDepth_.resize(gridGeometry->numDofs(), 0.0);
+ exactVelocityX_.resize(gridGeometry->numDofs(), 0.0);
constManningN_ = getParam<Scalar>("Problem.ManningN");
bedSlope_ = getParam<Scalar>("Problem.BedSlope");
discharge_ = getParam<Scalar>("Problem.Discharge");
diff --git a/test/freeflow/shallowwater/roughchannel/spatialparams.hh b/test/freeflow/shallowwater/roughchannel/spatialparams.hh
index e9b36cdd33..73864db30e 100644
--- a/test/freeflow/shallowwater/roughchannel/spatialparams.hh
+++ b/test/freeflow/shallowwater/roughchannel/spatialparams.hh
@@ -51,8 +51,8 @@ class RoughChannelSpatialParams
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- RoughChannelSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RoughChannelSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
gravity_ = getParam<Scalar>("Problem.Gravity");
bedSlope_ = getParam<Scalar>("Problem.BedSlope");
diff --git a/test/geomechanics/elastic/main.cc b/test/geomechanics/elastic/main.cc
index aaed4af39b..f30d53280f 100644
--- a/test/geomechanics/elastic/main.cc
+++ b/test/geomechanics/elastic/main.cc
@@ -83,21 +83,21 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module and add displacement
@@ -105,9 +105,9 @@ int main(int argc, char** argv) try
vtkWriter.addField(x, "u");
// also, add exact solution to the output
- SolutionVector xExact(fvGridGeometry->numDofs());
+ SolutionVector xExact(gridGeometry->numDofs());
for (const auto& v : vertices(leafGridView))
- xExact[ fvGridGeometry->vertexMapper().index(v) ] = problem->exactSolution(v.geometry().center());
+ xExact[ gridGeometry->vertexMapper().index(v) ] = problem->exactSolution(v.geometry().center());
vtkWriter.addField(xExact, "u_exact");
// write initial solution
@@ -115,11 +115,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, fvGridGeometry, gridVariables);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/geomechanics/elastic/problem.hh b/test/geomechanics/elastic/problem.hh
index 886d3ef615..3a33fc0fc7 100644
--- a/test/geomechanics/elastic/problem.hh
+++ b/test/geomechanics/elastic/problem.hh
@@ -92,8 +92,8 @@ class ElasticProblem : public GeomechanicsFVProblem<TypeTag>
using GradU = Dune::FieldMatrix<Scalar, dim, dimWorld>;
public:
- ElasticProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ ElasticProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry) {}
//! Returns the temperature in the domain.
static constexpr Scalar temperature()
diff --git a/test/geomechanics/elastic/spatialparams.hh b/test/geomechanics/elastic/spatialparams.hh
index fb2ce79e4d..c0f4b8104c 100644
--- a/test/geomechanics/elastic/spatialparams.hh
+++ b/test/geomechanics/elastic/spatialparams.hh
@@ -51,8 +51,8 @@ public:
//! Export the type of the lame parameters
using LameParams = Dumux::LameParams<Scalar>;
- ElasticSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ ElasticSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
lameParams_.setLambda(3e9);
lameParams_.setMu(3e9);
diff --git a/test/geomechanics/poroelastic/main.cc b/test/geomechanics/poroelastic/main.cc
index 72570168f9..f1210550eb 100644
--- a/test/geomechanics/poroelastic/main.cc
+++ b/test/geomechanics/poroelastic/main.cc
@@ -60,13 +60,13 @@ template< class StressType,
void assembleElementStresses(SigmaStorage& sigmaStorage,
SigmaStorage& effSigmaStorage,
const Problem& problem,
- const typename GridVariables::GridGeometry& fvGridGeometry,
+ const typename GridVariables::GridGeometry& gridGeometry,
const GridVariables& gridVariables,
const SolutionVector& x)
{
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
auto elemVolVars = localView(gridVariables.curGridVolVars());
fvGeometry.bind(element);
@@ -85,7 +85,7 @@ void assembleElementStresses(SigmaStorage& sigmaStorage,
using GridGeometry = typename GridVariables::GridGeometry;
for (int dir = 0; dir < GridGeometry::GridView::dimension; ++dir)
{
- const auto eIdx = fvGridGeometry.elementMapper().index(element);
+ const auto eIdx = gridGeometry.elementMapper().index(element);
sigmaStorage[dir][eIdx] = sigma[dir];
effSigmaStorage[dir][eIdx] = effSigma[dir];
}
@@ -126,21 +126,21 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module and output fields
@@ -150,9 +150,9 @@ int main(int argc, char** argv) try
IOFields::initOutputModule(vtkWriter);
// also, add exact solution to the output
- SolutionVector xExact(fvGridGeometry->numDofs());
+ SolutionVector xExact(gridGeometry->numDofs());
for (const auto& v : vertices(leafGridView))
- xExact[ fvGridGeometry->vertexMapper().index(v) ] = problem->exactSolution(v.geometry().center());
+ xExact[ gridGeometry->vertexMapper().index(v) ] = problem->exactSolution(v.geometry().center());
vtkWriter.addField(xExact, "u_exact");
// Furthermore, write out element stress tensors
@@ -165,7 +165,7 @@ int main(int argc, char** argv) try
std::array< std::vector<ForceVector>, dim > sigmaStorage;
std::array< std::vector<ForceVector>, dim > effSigmaStorage;
- const auto numCells = fvGridGeometry->gridView().size(0);
+ const auto numCells = gridGeometry->gridView().size(0);
std::for_each(sigmaStorage.begin(), sigmaStorage.end(), [numCells] (auto& sigma) { sigma.resize(numCells); });
std::for_each(effSigmaStorage.begin(), effSigmaStorage.end(), [numCells] (auto& effSigma) { effSigma.resize(numCells); });
@@ -177,18 +177,18 @@ int main(int argc, char** argv) try
// use convenience function to compute stresses
using StressType = GetPropType<TypeTag, Properties::StressType>;
- assembleElementStresses<StressType>(sigmaStorage, effSigmaStorage, *problem, *fvGridGeometry, *gridVariables, x);
+ assembleElementStresses<StressType>(sigmaStorage, effSigmaStorage, *problem, *gridGeometry, *gridVariables, x);
// write initial solution
vtkWriter.write(0.0);
// the assembler with time loop for instationary problem
using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
@@ -201,7 +201,7 @@ int main(int argc, char** argv) try
gridVariables->update(x);
// write vtk output
- assembleElementStresses<StressType>(sigmaStorage, effSigmaStorage, *problem, *fvGridGeometry, *gridVariables, x);
+ assembleElementStresses<StressType>(sigmaStorage, effSigmaStorage, *problem, *gridGeometry, *gridVariables, x);
vtkWriter.write(1.0);
// print time and say goodbye
diff --git a/test/geomechanics/poroelastic/problem.hh b/test/geomechanics/poroelastic/problem.hh
index bebef6fc1f..350491a600 100644
--- a/test/geomechanics/poroelastic/problem.hh
+++ b/test/geomechanics/poroelastic/problem.hh
@@ -100,8 +100,8 @@ class PoroElasticProblem : public GeomechanicsFVProblem<TypeTag>
using GradU = Dune::FieldMatrix<Scalar, dim, dimWorld>;
public:
- PoroElasticProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ PoroElasticProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{}
//! Returns the temperature in the domain.
diff --git a/test/geomechanics/poroelastic/spatialparams.hh b/test/geomechanics/poroelastic/spatialparams.hh
index aed04c1680..dbfb9541b5 100644
--- a/test/geomechanics/poroelastic/spatialparams.hh
+++ b/test/geomechanics/poroelastic/spatialparams.hh
@@ -52,8 +52,8 @@ public:
//! Export the type of the lame parameters
using LameParams = Dumux::LameParams<Scalar>;
- PoroElasticSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ PoroElasticSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
lameParams_.setLambda(2);
lameParams_.setMu(2);
diff --git a/test/io/gridmanager/gmshboundaryflagtest.hh b/test/io/gridmanager/gmshboundaryflagtest.hh
index c9d332b8f8..4d242a469b 100644
--- a/test/io/gridmanager/gmshboundaryflagtest.hh
+++ b/test/io/gridmanager/gmshboundaryflagtest.hh
@@ -46,13 +46,13 @@ public:
template<class GridGeometry>
static void testGmshBoundaryFlag(const GridView& leafGridView,
- std::shared_ptr<const GridGeometry> fvGridGeometry,
+ std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<const GridData<Grid>> gridData)
{
for(const auto& element : elements(leafGridView))
{
- auto fvGeometry = localView(*fvGridGeometry);
+ auto fvGeometry = localView(*gridGeometry);
fvGeometry.bind(element);
for (auto&& scvf : scvfs(fvGeometry))
diff --git a/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc b/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
index 64ed178fad..58ab07b2be 100644
--- a/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
+++ b/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc
@@ -189,7 +189,7 @@ void assignValues(SolutionVector& sol, Values values)
}
template<class TypeTag, class GridGeometry, std::size_t numValues>
-void testWriteAndReadVtk(std::shared_ptr<GridGeometry> fvGridGeometry,
+void testWriteAndReadVtk(std::shared_ptr<GridGeometry> gridGeometry,
const std::array<Dumux::GetPropType<TypeTag, Dumux::Properties::Scalar>, numValues>& values,
const std::string& fileName,
bool verbose = false,
@@ -201,14 +201,14 @@ void testWriteAndReadVtk(std::shared_ptr<GridGeometry> fvGridGeometry,
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
SolutionVector writeFrom;
- writeFrom[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs());
- writeFrom[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs());
+ writeFrom[GridGeometry::cellCenterIdx()].resize(gridGeometry->numCellCenterDofs());
+ writeFrom[GridGeometry::faceIdx()].resize(gridGeometry->numFaceDofs());
SolutionVector readTo = writeFrom;
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
assignValues(writeFrom[GridGeometry::cellCenterIdx()], values);
assignValues(writeFrom[GridGeometry::faceIdx()], std::array<GetPropType<TypeTag, Properties::Scalar>, 1>{1.0});
@@ -218,7 +218,7 @@ void testWriteAndReadVtk(std::shared_ptr<GridGeometry> fvGridGeometry,
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(writeFrom);
// initialize the vtk output module
@@ -237,7 +237,7 @@ void testWriteAndReadVtk(std::shared_ptr<GridGeometry> fvGridGeometry,
// cc dofs
loadSolution(readTo[GridGeometry::cellCenterIdx()], fileName + "-00000.vtu",
createCellCenterPVNameFunction<IOFields, CellCenterPrimaryVariables, ModelTraits, FluidSystem>(),
- *fvGridGeometry);
+ *gridGeometry);
if (verbose)
{
@@ -259,7 +259,7 @@ void testWriteAndReadVtk(std::shared_ptr<GridGeometry> fvGridGeometry,
// face dofs
loadSolution(readTo[GridGeometry::faceIdx()], fileName + "-face-00000.vtp",
createFacePVNameFunction<IOFields, FacePrimaryVariables, ModelTraits, FluidSystem>(),
- *fvGridGeometry);
+ *gridGeometry);
if (verbose)
{
@@ -324,41 +324,41 @@ int main(int argc, char** argv) try
const auto grid = Dune::StructuredGridFactory<Grid>::createCubeGrid(lowerLeft, upperRight, cells);
const auto gridView = grid->leafGridView();
- auto fvGridGeometry = std::make_shared<GridGeometry>(gridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(gridView);
+ gridGeometry->update();
using FluidSystem = GetPropType<CommonTypeTag, Properties::FluidSystem>;
FluidSystem::init();
- testWriteAndReadVtk<Properties::TTag::NavierStokesPVNameTypeTag>(fvGridGeometry, std::array<Scalar, 1>{1e5}, "navierstokes");
- testWriteAndReadVtk<Properties::TTag::NavierStokesNIPVNameTypeTag>(fvGridGeometry, std::array<Scalar, 2>{1e5, 300.0}, "navierstokesni");
- testWriteAndReadVtk<Properties::TTag::NavierStokesNCPVNameTypeTag>(fvGridGeometry, std::array<Scalar, 2>{1e5, 1e-3}, "navierstokesnc");
- testWriteAndReadVtk<Properties::TTag::NavierStokesNCNIPVNameTypeTag>(fvGridGeometry, std::array<Scalar, 3>{1e5, 1e-3, 300.0}, "navierstokesncni");
-
- testWriteAndReadVtk<Properties::TTag::ZeroEqNameTestTypeTag>(fvGridGeometry, std::array<Scalar, 1>{1e5}, "zeroeq");
- testWriteAndReadVtk<Properties::TTag::ZeroEqNINameTestTypeTag>(fvGridGeometry, std::array<Scalar, 2>{1e5, 300.0}, "zeroeqni");
- testWriteAndReadVtk<Properties::TTag::ZeroEqNCNameTestTypeTag>(fvGridGeometry, std::array<Scalar, 2>{1e5, 1e-3}, "zeroeqnc");
- testWriteAndReadVtk<Properties::TTag::ZeroEqNCNINameTestTypeTag>(fvGridGeometry, std::array<Scalar, 3>{1e5, 1e-3, 300.0}, "zeroeqncni");
-
- testWriteAndReadVtk<Properties::TTag::OneEqNameTestTypeTag>(fvGridGeometry, std::array<Scalar, 2>{1e5, 1.0}, "oneeq");
- testWriteAndReadVtk<Properties::TTag::OneEqNINameTestTypeTag>(fvGridGeometry, std::array<Scalar, 3>{1e5, 1.0, 300.0}, "oneeqni");
- testWriteAndReadVtk<Properties::TTag::OneEqNCNameTestTypeTag>(fvGridGeometry, std::array<Scalar, 3>{1e5, 1e-3, 1.0}, "oneeqnc");
- testWriteAndReadVtk<Properties::TTag::OneEqNCNINameTestTypeTag>(fvGridGeometry, std::array<Scalar, 4>{1e5, 1e-3, 1.0, 300.0}, "oneeqncni");
-
- testWriteAndReadVtk<Properties::TTag::KEpsilonNameTestTypeTag>(fvGridGeometry, std::array<Scalar, 3>{1e5, 1.1, 1.2}, "kepsilon");
- testWriteAndReadVtk<Properties::TTag::KEpsilonNINameTestTypeTag>(fvGridGeometry, std::array<Scalar, 4>{1e5, 1.1, 1.2, 300.0}, "kepsilonni");
- testWriteAndReadVtk<Properties::TTag::KEpsilonNCNameTestTypeTag>(fvGridGeometry, std::array<Scalar, 4>{1e5, 1e-3, 1.1, 1.2}, "kepsilonnc");
- testWriteAndReadVtk<Properties::TTag::KEpsilonNCNINameTestTypeTag>(fvGridGeometry, std::array<Scalar, 5>{1e5, 1e-3, 1.1, 1.2, 300.0}, "kepsilonncni");
-
- testWriteAndReadVtk<Properties::TTag::LowReKEpsilonNameTestTypeTag>(fvGridGeometry, std::array<Scalar, 3>{1e5, 1.1, 1.2}, "lowrekepsilon");
- testWriteAndReadVtk<Properties::TTag::LowReKEpsilonNINameTestTypeTag>(fvGridGeometry, std::array<Scalar, 4>{1e5, 1.1, 1.2, 300.0}, "lowrekepsilonni");
- testWriteAndReadVtk<Properties::TTag::LowReKEpsilonNCNameTestTypeTag>(fvGridGeometry, std::array<Scalar, 4>{1e5, 1e-3, 1.1, 1.2}, "lowrekepsilonnc");
- testWriteAndReadVtk<Properties::TTag::LowReKEpsilonNCNINameTestTypeTag>(fvGridGeometry, std::array<Scalar, 5>{1e5, 1e-3, 1.1, 1.2, 300.0}, "lowrekepsilonncni");
-
- testWriteAndReadVtk<Properties::TTag::KOmegaNameTestTypeTag>(fvGridGeometry, std::array<Scalar, 3>{1e5, 1.1, 1.2}, "komega");
- testWriteAndReadVtk<Properties::TTag::KOmegaNINameTestTypeTag>(fvGridGeometry, std::array<Scalar, 4>{1e5, 1.1, 1.2, 300.0}, "komegani");
- testWriteAndReadVtk<Properties::TTag::KOmegaNCNameTestTypeTag>(fvGridGeometry, std::array<Scalar, 4>{1e5, 1e-3, 1.1, 1.2}, "komeganc");
- testWriteAndReadVtk<Properties::TTag::KOmegaNCNINameTestTypeTag>(fvGridGeometry, std::array<Scalar, 5>{1e5, 1e-3, 1.1, 1.2, 300.0}, "komegancni");
+ testWriteAndReadVtk<Properties::TTag::NavierStokesPVNameTypeTag>(gridGeometry, std::array<Scalar, 1>{1e5}, "navierstokes");
+ testWriteAndReadVtk<Properties::TTag::NavierStokesNIPVNameTypeTag>(gridGeometry, std::array<Scalar, 2>{1e5, 300.0}, "navierstokesni");
+ testWriteAndReadVtk<Properties::TTag::NavierStokesNCPVNameTypeTag>(gridGeometry, std::array<Scalar, 2>{1e5, 1e-3}, "navierstokesnc");
+ testWriteAndReadVtk<Properties::TTag::NavierStokesNCNIPVNameTypeTag>(gridGeometry, std::array<Scalar, 3>{1e5, 1e-3, 300.0}, "navierstokesncni");
+
+ testWriteAndReadVtk<Properties::TTag::ZeroEqNameTestTypeTag>(gridGeometry, std::array<Scalar, 1>{1e5}, "zeroeq");
+ testWriteAndReadVtk<Properties::TTag::ZeroEqNINameTestTypeTag>(gridGeometry, std::array<Scalar, 2>{1e5, 300.0}, "zeroeqni");
+ testWriteAndReadVtk<Properties::TTag::ZeroEqNCNameTestTypeTag>(gridGeometry, std::array<Scalar, 2>{1e5, 1e-3}, "zeroeqnc");
+ testWriteAndReadVtk<Properties::TTag::ZeroEqNCNINameTestTypeTag>(gridGeometry, std::array<Scalar, 3>{1e5, 1e-3, 300.0}, "zeroeqncni");
+
+ testWriteAndReadVtk<Properties::TTag::OneEqNameTestTypeTag>(gridGeometry, std::array<Scalar, 2>{1e5, 1.0}, "oneeq");
+ testWriteAndReadVtk<Properties::TTag::OneEqNINameTestTypeTag>(gridGeometry, std::array<Scalar, 3>{1e5, 1.0, 300.0}, "oneeqni");
+ testWriteAndReadVtk<Properties::TTag::OneEqNCNameTestTypeTag>(gridGeometry, std::array<Scalar, 3>{1e5, 1e-3, 1.0}, "oneeqnc");
+ testWriteAndReadVtk<Properties::TTag::OneEqNCNINameTestTypeTag>(gridGeometry, std::array<Scalar, 4>{1e5, 1e-3, 1.0, 300.0}, "oneeqncni");
+
+ testWriteAndReadVtk<Properties::TTag::KEpsilonNameTestTypeTag>(gridGeometry, std::array<Scalar, 3>{1e5, 1.1, 1.2}, "kepsilon");
+ testWriteAndReadVtk<Properties::TTag::KEpsilonNINameTestTypeTag>(gridGeometry, std::array<Scalar, 4>{1e5, 1.1, 1.2, 300.0}, "kepsilonni");
+ testWriteAndReadVtk<Properties::TTag::KEpsilonNCNameTestTypeTag>(gridGeometry, std::array<Scalar, 4>{1e5, 1e-3, 1.1, 1.2}, "kepsilonnc");
+ testWriteAndReadVtk<Properties::TTag::KEpsilonNCNINameTestTypeTag>(gridGeometry, std::array<Scalar, 5>{1e5, 1e-3, 1.1, 1.2, 300.0}, "kepsilonncni");
+
+ testWriteAndReadVtk<Properties::TTag::LowReKEpsilonNameTestTypeTag>(gridGeometry, std::array<Scalar, 3>{1e5, 1.1, 1.2}, "lowrekepsilon");
+ testWriteAndReadVtk<Properties::TTag::LowReKEpsilonNINameTestTypeTag>(gridGeometry, std::array<Scalar, 4>{1e5, 1.1, 1.2, 300.0}, "lowrekepsilonni");
+ testWriteAndReadVtk<Properties::TTag::LowReKEpsilonNCNameTestTypeTag>(gridGeometry, std::array<Scalar, 4>{1e5, 1e-3, 1.1, 1.2}, "lowrekepsilonnc");
+ testWriteAndReadVtk<Properties::TTag::LowReKEpsilonNCNINameTestTypeTag>(gridGeometry, std::array<Scalar, 5>{1e5, 1e-3, 1.1, 1.2, 300.0}, "lowrekepsilonncni");
+
+ testWriteAndReadVtk<Properties::TTag::KOmegaNameTestTypeTag>(gridGeometry, std::array<Scalar, 3>{1e5, 1.1, 1.2}, "komega");
+ testWriteAndReadVtk<Properties::TTag::KOmegaNINameTestTypeTag>(gridGeometry, std::array<Scalar, 4>{1e5, 1.1, 1.2, 300.0}, "komegani");
+ testWriteAndReadVtk<Properties::TTag::KOmegaNCNameTestTypeTag>(gridGeometry, std::array<Scalar, 4>{1e5, 1e-3, 1.1, 1.2}, "komeganc");
+ testWriteAndReadVtk<Properties::TTag::KOmegaNCNINameTestTypeTag>(gridGeometry, std::array<Scalar, 5>{1e5, 1e-3, 1.1, 1.2, 300.0}, "komegancni");
////////////////////////////////////////////////////////////
// finalize, print dumux message to say goodbye
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/main.cc b/test/multidomain/boundary/darcydarcy/1p_1p/main.cc
index 91e55f2cfa..5457baed25 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/main.cc
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/main.cc
@@ -299,8 +299,8 @@ int main(int argc, char** argv) try
//////////////////////////////////////////////////////////////////////////
const auto& gridView = gridManager.grid().leafGridView();
- CCTpfaFVGridGeometry<typename FullDomainGrid::LeafGridView> fvGridGeometry(gridView);
- const auto& bBoxTree = fvGridGeometry.boundingBoxTree();
+ CCTpfaFVGridGeometry<typename FullDomainGrid::LeafGridView> gridGeometry(gridView);
+ const auto& bBoxTree = gridGeometry.boundingBoxTree();
// copy data from the subdomains to full domain data vectors
std::vector<int> processRank(gridView.size(0), 0); // sequential simulation
std::vector<int> pressure(gridView.size(0));
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh b/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
index 7b5c5395d8..287f1b1940 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh
@@ -60,10 +60,10 @@ class OnePTestProblem
static constexpr auto domainIdx = Dune::index_constant<tag>{};
public:
- OnePTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePTestProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManager,
const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ : ParentType(gridGeometry, paramGroup)
, couplingManager_(couplingManager)
{
// set a default name for the problem
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/spatialparams.hh b/test/multidomain/boundary/darcydarcy/1p_1p/spatialparams.hh
index 2162733a7c..67abf4af09 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/spatialparams.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/spatialparams.hh
@@ -72,8 +72,8 @@ class OnePTestSpatialParams
public:
using PermeabilityType = Scalar;
- OnePTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
, lensLowerLeft_(std::numeric_limits<Scalar>::max())
, lensUpperRight_(std::numeric_limits<Scalar>::lowest())
{
diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh b/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
index c20d7497e2..90a0063990 100644
--- a/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh
@@ -62,10 +62,10 @@ class OnePTestProblem
static constexpr auto domainIdx = Dune::index_constant<tag>{};
public:
- OnePTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePTestProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManager,
const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ : ParentType(gridGeometry, paramGroup)
, couplingManager_(couplingManager)
{
injectionRate_ = getParam<double>("Problem.InjectionRate");
diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/spatialparams.hh b/test/multidomain/boundary/darcydarcy/1p_2p/spatialparams.hh
index 7ab343bf5f..7cf67002da 100644
--- a/test/multidomain/boundary/darcydarcy/1p_2p/spatialparams.hh
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/spatialparams.hh
@@ -56,8 +56,8 @@ public:
using PermeabilityType = Scalar;
- TestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
materialParams_.setSwr(0.05);
materialParams_.setSnr(0.0);
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
index a9dc0436e7..16415514d1 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
@@ -135,9 +135,9 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- DarcySubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ DarcySubProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
+ : ParentType(gridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
{
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure");
initialMoleFraction_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.InitialMoleFraction");
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
index 45d5929dd2..bc60c5b72b 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh
@@ -122,8 +122,8 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using DiffusionCoefficientAveragingType = typename StokesDarcyCouplingOptions::DiffusionCoefficientAveragingType;
public:
- StokesSubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), injectionState_(false), couplingManager_(couplingManager)
+ StokesSubProblem(std::shared_ptr<const GridGeometry> gridGeometry, std::shared_ptr<CouplingManager> couplingManager)
+ : ParentType(gridGeometry, "Stokes"), eps_(1e-6), injectionState_(false), couplingManager_(couplingManager)
{
inletVelocity_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Velocity");
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure");
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
index 0a2be28a9e..f536c2dbf1 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
@@ -110,9 +110,9 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using TimeLoopPtr = std::shared_ptr<TimeLoop<Scalar>>;
public:
- DarcySubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ DarcySubProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
+ : ParentType(gridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
{
problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
index 7e1a9b855d..2b82b15921 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh
@@ -104,8 +104,8 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using TimeLoopPtr = std::shared_ptr<TimeLoop<Scalar>>;
public:
- StokesSubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager)
+ StokesSubProblem(std::shared_ptr<const GridGeometry> gridGeometry, std::shared_ptr<CouplingManager> couplingManager)
+ : ParentType(gridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager)
{
problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/spatialparams.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/spatialparams.hh
index 1f0a32cb26..71c0b03c09 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/spatialparams.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/spatialparams.hh
@@ -50,8 +50,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- OnePSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = getParam<Scalar>("SpatialParams.Permeability");
porosity_ = getParam<Scalar>("SpatialParams.Porosity");
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
index bc0917a386..9b33da50be 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
@@ -124,9 +124,9 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using DiffusionCoefficientAveragingType = typename StokesDarcyCouplingOptions::DiffusionCoefficientAveragingType;
public:
- DarcySubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ DarcySubProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
+ : ParentType(gridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
{
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure");
initialSw_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Saturation");
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
index 8dc5a4e30f..462476374a 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh
@@ -120,8 +120,8 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
static constexpr bool useMoles = GetPropType<TypeTag, Properties::ModelTraits>::useMoles();
public:
- StokesSubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager)
+ StokesSubProblem(std::shared_ptr<const GridGeometry> gridGeometry, std::shared_ptr<CouplingManager> couplingManager)
+ : ParentType(gridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager)
{
refVelocity_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.RefVelocity");
refPressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.RefPressure");
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/spatialparams.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/spatialparams.hh
index bcfa06ec50..670788f6dc 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/spatialparams.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/spatialparams.hh
@@ -56,8 +56,8 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = Scalar;
- TwoPTwoCSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TwoPTwoCSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = getParam<Scalar>("SpatialParams.Permeability");
porosity_ = getParam<Scalar>("SpatialParams.Porosity");
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
index 146015619a..9fdb6227b7 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
@@ -126,9 +126,9 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- DarcySubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ DarcySubProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
+ : ParentType(gridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
{
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure");
initialMoleFractionN2_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.InitialMoleFractionN2");
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
index e11ab4459f..72d391174b 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh
@@ -107,8 +107,8 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- StokesSubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6),
+ StokesSubProblem(std::shared_ptr<const GridGeometry> gridGeometry, std::shared_ptr<CouplingManager> couplingManager)
+ : ParentType(gridGeometry, "Stokes"), eps_(1e-6),
couplingManager_(couplingManager)
{
inletVelocity_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Velocity");
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
index d7f5c00ec6..fbd698133f 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
@@ -95,9 +95,9 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- DarcySubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ DarcySubProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
+ : ParentType(gridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
{
problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
index 10da293bf3..41ab898ad2 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh
@@ -99,8 +99,8 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- StokesSubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager)
+ StokesSubProblem(std::shared_ptr<const GridGeometry> gridGeometry, std::shared_ptr<CouplingManager> couplingManager)
+ : ParentType(gridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager)
{
problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/spatialparams.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/spatialparams.hh
index bfc9a37f28..3ef8c3b286 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/spatialparams.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/spatialparams.hh
@@ -51,8 +51,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- OnePSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = getParam<Scalar>("Darcy.SpatialParams.Permeability");
alphaBJ_ = getParam<Scalar>("Darcy.SpatialParams.AlphaBeaversJoseph");
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
index 5bb71d5cd3..1450aafa40 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
@@ -110,9 +110,9 @@ class DarcySubProblem : public PorousMediumFlowProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- DarcySubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ DarcySubProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
+ : ParentType(gridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager)
{
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure");
saturation_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Saturation");
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
index fb08d873d5..043344b909 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh
@@ -92,8 +92,8 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- StokesSubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager)
+ StokesSubProblem(std::shared_ptr<const GridGeometry> gridGeometry, std::shared_ptr<CouplingManager> couplingManager)
+ : ParentType(gridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager)
{
inletVelocity_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Velocity");
pressure_ = getParamFromGroup<Scalar>(this->paramGroup(), "Problem.Pressure");
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/spatialparams.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/spatialparams.hh
index 8b7ebce666..46405bb904 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/spatialparams.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/spatialparams.hh
@@ -58,8 +58,8 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = Scalar;
- ConservationSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ ConservationSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = getParam<Scalar>("SpatialParams.Permeability");
porosity_ = getParam<Scalar>("SpatialParams.Porosity");
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
index 4d6a38cfac..9ced92e868 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
@@ -137,10 +137,10 @@ public:
};
template<class SpatialParams>
- RootProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ RootProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, spatialParams, "Root")
+ : ParentType(gridGeometry, spatialParams, "Root")
, couplingManager_(couplingManager)
{
// read parameters from input file
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
index 25c9e5ffdb..9f8f7ad228 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
@@ -147,9 +147,9 @@ public:
liquidPhaseIdx = FluidSystem::liquidPhaseIdx
};
- SoilProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ SoilProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Soil")
+ : ParentType(gridGeometry, "Soil")
, couplingManager_(couplingManager)
{
//read parameters from input file
@@ -159,7 +159,7 @@ public:
// for initial conditions
const Scalar sw = getParam<Scalar>("Problem.InitTopSaturation", 0.3); // start with 30% saturation on top
using MaterialLaw = typename GetPropType<TypeTag, Properties::SpatialParams>::MaterialLaw;
- pcTop_ = MaterialLaw::pc(this->spatialParams().materialLawParamsAtPos(fvGridGeometry->bBoxMax()), sw);
+ pcTop_ = MaterialLaw::pc(this->spatialParams().materialLawParamsAtPos(gridGeometry->bBoxMax()), sw);
}
/*!
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_root.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_root.hh
index a1d5226a11..ea54f7846e 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_root.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_root.hh
@@ -61,15 +61,15 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- RootSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ RootSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<const GridData<Grid>> gridData)
- : ParentType(fvGridGeometry), gridData_(gridData)
+ : ParentType(gridGeometry), gridData_(gridData)
{
porosity_ = getParam<Scalar>("Root.SpatialParams.Porosity", 0.4);
constantKx_ = getParam<Scalar>("Root.SpatialParams.Kx", 5.0968e-17);
constantKr_ = getParam<Scalar>("Root.SpatialParams.Kr", 2.04e-13);
- const auto& gv = fvGridGeometry->gridView();
+ const auto& gv = gridGeometry->gridView();
radii_.resize(gv.size(0));
for (const auto& element : elements(gv))
{
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_soil.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_soil.hh
index 4aa4bd2dc0..342eb9079e 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_soil.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_soil.hh
@@ -55,8 +55,8 @@ public:
// export material law params
using MaterialLawParams = typename MaterialLaw::Params;
- SoilSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ SoilSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// residual saturations
materialParams_.setSwr(0.05);
diff --git a/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
index e2f54004d1..d1fb0288d3 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
@@ -123,9 +123,9 @@ class BloodFlowProblem : public PorousMediumFlowProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- BloodFlowProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ BloodFlowProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Vessel")
+ : ParentType(gridGeometry, "Vessel")
, couplingManager_(couplingManager)
{
//read parameters from input file
diff --git a/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
index 66aac1469b..6515785add 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
@@ -133,9 +133,9 @@ class TissueProblem : public PorousMediumFlowProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- TissueProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ TissueProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Tissue")
+ : ParentType(gridGeometry, "Tissue")
, couplingManager_(couplingManager)
{
// read parameters from input file
diff --git a/test/multidomain/embedded/1d3d/1p_1p/spatialparams_bloodflow.hh b/test/multidomain/embedded/1d3d/1p_1p/spatialparams_bloodflow.hh
index 84c6f2f0e9..358c6f16c0 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/spatialparams_bloodflow.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/spatialparams_bloodflow.hh
@@ -45,8 +45,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- BloodFlowSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ BloodFlowSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
radius_ = getParam<Scalar>("SpatialParams.Radius");
}
diff --git a/test/multidomain/embedded/1d3d/1p_1p/spatialparams_tissue.hh b/test/multidomain/embedded/1d3d/1p_1p/spatialparams_tissue.hh
index 7e84bfea3b..b9e6ab9445 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/spatialparams_tissue.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/spatialparams_tissue.hh
@@ -46,8 +46,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- TissueSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TissueSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = getParam<Scalar>("SpatialParams.PermeabilityTissue");
porosity_ = 1.0;
diff --git a/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
index bd7b9bde94..6697969231 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
@@ -122,10 +122,10 @@ class RootProblem : public PorousMediumFlowProblem<TypeTag>
public:
template<class SpatialParams>
- RootProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ RootProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, spatialParams, "Root")
+ : ParentType(gridGeometry, spatialParams, "Root")
, couplingManager_(couplingManager)
{
// read parameters from input file
diff --git a/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
index 1e0bc11dcf..a44d3824bd 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
@@ -112,9 +112,9 @@ class SoilProblem : public PorousMediumFlowProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- SoilProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ SoilProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManager)
- : ParentType(fvGridGeometry, "Soil")
+ : ParentType(gridGeometry, "Soil")
, couplingManager_(couplingManager)
{
// read parameters from input file
diff --git a/test/multidomain/embedded/1d3d/1p_richards/spatialparams_root.hh b/test/multidomain/embedded/1d3d/1p_richards/spatialparams_root.hh
index f7d0d2de7a..d580b693c5 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/spatialparams_root.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/spatialparams_root.hh
@@ -61,15 +61,15 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- RootSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ RootSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<const GridData<Grid>> gridData)
- : ParentType(fvGridGeometry), gridData_(gridData)
+ : ParentType(gridGeometry), gridData_(gridData)
{
porosity_ = getParam<Scalar>("Root.SpatialParams.Porosity", 0.4);
constantKx_ = getParam<Scalar>("SpatialParams.Kx", 5.0968e-17);
constantKr_ = getParam<Scalar>("SpatialParams.Kr", 2.04e-13);
- const auto& gv = fvGridGeometry->gridView();
+ const auto& gv = gridGeometry->gridView();
radii_.resize(gv.size(0));
for (const auto& element : elements(gv))
{
diff --git a/test/multidomain/embedded/1d3d/1p_richards/spatialparams_soil.hh b/test/multidomain/embedded/1d3d/1p_richards/spatialparams_soil.hh
index a1b68cea6b..f2baa36fd3 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/spatialparams_soil.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/spatialparams_soil.hh
@@ -55,8 +55,8 @@ public:
// export material law params
using MaterialLawParams = typename MaterialLaw::Params;
- SoilSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ SoilSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// residual saturations
materialParams_.setSwr(0.05);
diff --git a/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh b/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
index 086ec2e66b..bb0b529523 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
+++ b/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
@@ -119,11 +119,11 @@ class FractureProblem : public PorousMediumFlowProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- FractureProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ FractureProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager,
const std::string& paramGroup = "Fracture")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManager_(couplingManager)
{
// read parameters from input file
diff --git a/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh b/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
index b3f589de85..c078d8deaf 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
+++ b/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
@@ -132,11 +132,11 @@ class MatrixProblem : public PorousMediumFlowProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- MatrixProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ MatrixProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager,
const std::string& paramGroup = "Matrix")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManager_(couplingManager)
{
// read parameters from input file
diff --git a/test/multidomain/embedded/2d3d/1p_1p/spatialparams.hh b/test/multidomain/embedded/2d3d/1p_1p/spatialparams.hh
index e9143bde73..9118a933d8 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/spatialparams.hh
+++ b/test/multidomain/embedded/2d3d/1p_1p/spatialparams.hh
@@ -47,9 +47,9 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- MatrixFractureSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ MatrixFractureSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry,
const std::string& paramGroup = "")
- : ParentType(fvGridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Permeability");
porosity_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Porosity", 1.0);
diff --git a/test/multidomain/facet/1p_1p/analytical/main.cc b/test/multidomain/facet/1p_1p/analytical/main.cc
index 709fdebb57..26644b774b 100644
--- a/test/multidomain/facet/1p_1p/analytical/main.cc
+++ b/test/multidomain/facet/1p_1p/analytical/main.cc
@@ -164,13 +164,13 @@ template< class GridGeometry,
class GridManager,
class LowDimGridView,
std::enable_if_t<GridGeometry::discMethod == Dumux::DiscretizationMethod::box, int> = 0 >
-void updateBulkFVGridGeometry(GridGeometry& fvGridGeometry,
+void updateBulkFVGridGeometry(GridGeometry& gridGeometry,
const GridManager& gridManager,
const LowDimGridView& lowDimGridView)
{
using BulkFacetGridAdapter = Dumux::CodimOneGridAdapter<typename GridManager::Embeddings>;
BulkFacetGridAdapter facetGridAdapter(gridManager.getEmbeddings());
- fvGridGeometry.update(lowDimGridView, facetGridAdapter);
+ gridGeometry.update(lowDimGridView, facetGridAdapter);
}
/*!
@@ -180,11 +180,11 @@ template< class GridGeometry,
class GridManager,
class LowDimGridView,
std::enable_if_t<GridGeometry::discMethod != Dumux::DiscretizationMethod::box, int> = 0 >
-void updateBulkFVGridGeometry(GridGeometry& fvGridGeometry,
+void updateBulkFVGridGeometry(GridGeometry& gridGeometry,
const GridManager& gridManager,
const LowDimGridView& lowDimGridView)
{
- fvGridGeometry.update();
+ gridGeometry.update();
}
// main program
diff --git a/test/multidomain/facet/1p_1p/analytical/problem_bulk.hh b/test/multidomain/facet/1p_1p/analytical/problem_bulk.hh
index 6daa335fe4..8071cdbf2a 100644
--- a/test/multidomain/facet/1p_1p/analytical/problem_bulk.hh
+++ b/test/multidomain/facet/1p_1p/analytical/problem_bulk.hh
@@ -104,11 +104,11 @@ class OnePBulkProblem : public PorousMediumFlowProblem<TypeTag>
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
public:
- OnePBulkProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePBulkProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManagerPtr,
const std::string& paramGroup = "Bulk")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManagerPtr_(couplingManagerPtr)
, lowDimPermeability_(getParam<Scalar>("LowDim.SpatialParams.Permeability"))
, aperture_(getParam<Scalar>("Problem.FractureAperture"))
diff --git a/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh b/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh
index 68929f7177..93e0307bb8 100644
--- a/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh
+++ b/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh
@@ -103,11 +103,11 @@ class OnePLowDimProblem : public PorousMediumFlowProblem<TypeTag>
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
public:
- OnePLowDimProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePLowDimProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManagerPtr,
const std::string& paramGroup = "LowDim")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManagerPtr_(couplingManagerPtr)
, aperture_(getParam<Scalar>("Problem.FractureAperture"))
{
diff --git a/test/multidomain/facet/1p_1p/analytical/spatialparams.hh b/test/multidomain/facet/1p_1p/analytical/spatialparams.hh
index 36db5e96f3..d99a2de765 100644
--- a/test/multidomain/facet/1p_1p/analytical/spatialparams.hh
+++ b/test/multidomain/facet/1p_1p/analytical/spatialparams.hh
@@ -48,8 +48,8 @@ public:
//! Export the type used for permeabilities
using PermeabilityType = Scalar;
- OnePSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry)
+ OnePSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry)
{
permeability_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Permeability");
}
diff --git a/test/multidomain/facet/1p_1p/gravity/problem_bulk.hh b/test/multidomain/facet/1p_1p/gravity/problem_bulk.hh
index 59c8ed7175..60e29e7ffc 100644
--- a/test/multidomain/facet/1p_1p/gravity/problem_bulk.hh
+++ b/test/multidomain/facet/1p_1p/gravity/problem_bulk.hh
@@ -110,11 +110,11 @@ class OnePBulkProblem : public PorousMediumFlowProblem<TypeTag>
static constexpr int dimWorld = GridView::dimensionworld;
public:
- OnePBulkProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePBulkProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager,
const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManagerPtr_(couplingManager)
{
problemName_ = getParam<std::string>("Vtk.OutputName") + "_" +
diff --git a/test/multidomain/facet/1p_1p/gravity/problem_lowdim.hh b/test/multidomain/facet/1p_1p/gravity/problem_lowdim.hh
index c98e422ae4..39163d0e1a 100644
--- a/test/multidomain/facet/1p_1p/gravity/problem_lowdim.hh
+++ b/test/multidomain/facet/1p_1p/gravity/problem_lowdim.hh
@@ -111,11 +111,11 @@ class OnePLowDimProblem : public PorousMediumFlowProblem<TypeTag>
static constexpr int dimWorld = GridView::dimensionworld;
public:
- OnePLowDimProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePLowDimProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager,
const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManagerPtr_(couplingManager)
, aperture_(getParam<Scalar>("Problem.FractureAperture"))
{
diff --git a/test/multidomain/facet/1p_1p/gravity/spatialparams.hh b/test/multidomain/facet/1p_1p/gravity/spatialparams.hh
index 28e730e6fd..a56a110a14 100644
--- a/test/multidomain/facet/1p_1p/gravity/spatialparams.hh
+++ b/test/multidomain/facet/1p_1p/gravity/spatialparams.hh
@@ -47,8 +47,8 @@ public:
//! Export the type used for permeabilities
using PermeabilityType = Scalar;
- OnePSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry)
+ OnePSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry)
{
permeability_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Permeability");
}
diff --git a/test/multidomain/facet/1p_1p/linearprofile/problem_bulk.hh b/test/multidomain/facet/1p_1p/linearprofile/problem_bulk.hh
index d279fa15fe..783ac21ac7 100644
--- a/test/multidomain/facet/1p_1p/linearprofile/problem_bulk.hh
+++ b/test/multidomain/facet/1p_1p/linearprofile/problem_bulk.hh
@@ -109,11 +109,11 @@ class OnePBulkProblem : public PorousMediumFlowProblem<TypeTag>
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
public:
- OnePBulkProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePBulkProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager,
const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManagerPtr_(couplingManager)
{
problemName_ = getParam<std::string>("Vtk.OutputName") + "_" +
diff --git a/test/multidomain/facet/1p_1p/linearprofile/problem_lowdim.hh b/test/multidomain/facet/1p_1p/linearprofile/problem_lowdim.hh
index 2babdd1543..8fb742a17f 100644
--- a/test/multidomain/facet/1p_1p/linearprofile/problem_lowdim.hh
+++ b/test/multidomain/facet/1p_1p/linearprofile/problem_lowdim.hh
@@ -109,11 +109,11 @@ class OnePLowDimProblem : public PorousMediumFlowProblem<TypeTag>
using NumEqVector = GetPropType<TypeTag, Properties::NumEqVector>;
public:
- OnePLowDimProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePLowDimProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager,
const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManagerPtr_(couplingManager)
, aperture_(getParam<Scalar>("Problem.FractureAperture"))
{
diff --git a/test/multidomain/facet/1p_1p/linearprofile/spatialparams.hh b/test/multidomain/facet/1p_1p/linearprofile/spatialparams.hh
index 36db5e96f3..d99a2de765 100644
--- a/test/multidomain/facet/1p_1p/linearprofile/spatialparams.hh
+++ b/test/multidomain/facet/1p_1p/linearprofile/spatialparams.hh
@@ -48,8 +48,8 @@ public:
//! Export the type used for permeabilities
using PermeabilityType = Scalar;
- OnePSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry)
+ OnePSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry)
{
permeability_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Permeability");
}
diff --git a/test/multidomain/facet/1p_1p/threedomain/main.cc b/test/multidomain/facet/1p_1p/threedomain/main.cc
index 3a9cb39c6a..85de4b83f5 100644
--- a/test/multidomain/facet/1p_1p/threedomain/main.cc
+++ b/test/multidomain/facet/1p_1p/threedomain/main.cc
@@ -109,14 +109,14 @@ template< class GridGeometry,
class GridManager,
class LowDimGridView,
std::enable_if_t<GridGeometry::discMethod == Dumux::DiscretizationMethod::box, int> = 0 >
-void updateFVGridGeometry(GridGeometry& fvGridGeometry,
+void updateFVGridGeometry(GridGeometry& gridGeometry,
const GridManager& gridManager,
const LowDimGridView& lowDimGridView)
{
static constexpr int higherGridId = int(GridGeometry::GridView::dimension) == 3 ? 0 : 1;
using BulkFacetGridAdapter = Dumux::CodimOneGridAdapter<typename GridManager::Embeddings, higherGridId, higherGridId+1>;
BulkFacetGridAdapter facetGridAdapter(gridManager.getEmbeddings());
- fvGridGeometry.update(lowDimGridView, facetGridAdapter);
+ gridGeometry.update(lowDimGridView, facetGridAdapter);
}
/*!
@@ -126,11 +126,11 @@ template< class GridGeometry,
class GridManager,
class LowDimGridView,
std::enable_if_t<GridGeometry::discMethod != Dumux::DiscretizationMethod::box, int> = 0 >
-void updateFVGridGeometry(GridGeometry& fvGridGeometry,
+void updateFVGridGeometry(GridGeometry& gridGeometry,
const GridManager& gridManager,
const LowDimGridView& lowDimGridView)
{
- fvGridGeometry.update();
+ gridGeometry.update();
}
int main(int argc, char** argv) try
@@ -180,10 +180,10 @@ int main(int argc, char** argv) try
const auto& edgeGridView = gridManager.template grid<edgeId>().leafGridView();
// create the finite volume grid geometries
- MultiDomainFVGridGeometry<Traits> fvGridGeometry(std::make_tuple(bulkGridView, facetGridView, edgeGridView));
- updateFVGridGeometry(fvGridGeometry[bulkId], gridManager, facetGridView);
- updateFVGridGeometry(fvGridGeometry[facetId], gridManager, edgeGridView);
- fvGridGeometry[edgeId].update();
+ MultiDomainFVGridGeometry<Traits> gridGeometry(std::make_tuple(bulkGridView, facetGridView, edgeGridView));
+ updateFVGridGeometry(gridGeometry[bulkId], gridManager, facetGridView);
+ updateFVGridGeometry(gridGeometry[facetId], gridManager, edgeGridView);
+ gridGeometry[edgeId].update();
// the coupling manager
using CouplingManager = typename ThisTestTraits::CouplingManager;
@@ -196,13 +196,13 @@ int main(int argc, char** argv) try
using FacetProblem = MultiDomainFVProblem<Traits>::template Type<facetId>;
using EdgeProblem = MultiDomainFVProblem<Traits>::template Type<edgeId>;
- auto bulkSpatialParams = std::make_shared<typename BulkProblem::SpatialParams>(fvGridGeometry.get(bulkId), "Bulk");
- auto facetSpatialParams = std::make_shared<typename FacetProblem::SpatialParams>(fvGridGeometry.get(facetId), "Facet");
- auto edgeSpatialParams = std::make_shared<typename EdgeProblem::SpatialParams>(fvGridGeometry.get(edgeId), "Edge");
+ auto bulkSpatialParams = std::make_shared<typename BulkProblem::SpatialParams>(gridGeometry.get(bulkId), "Bulk");
+ auto facetSpatialParams = std::make_shared<typename FacetProblem::SpatialParams>(gridGeometry.get(facetId), "Facet");
+ auto edgeSpatialParams = std::make_shared<typename EdgeProblem::SpatialParams>(gridGeometry.get(edgeId), "Edge");
- problem.set(std::make_shared<BulkProblem>(fvGridGeometry.get(bulkId), bulkSpatialParams, couplingManager, "Bulk"), bulkId);
- problem.set(std::make_shared<FacetProblem>(fvGridGeometry.get(facetId), facetSpatialParams, couplingManager, "Facet"), facetId);
- problem.set(std::make_shared<EdgeProblem>(fvGridGeometry.get(edgeId), edgeSpatialParams, couplingManager, "Edge"), edgeId);
+ problem.set(std::make_shared<BulkProblem>(gridGeometry.get(bulkId), bulkSpatialParams, couplingManager, "Bulk"), bulkId);
+ problem.set(std::make_shared<FacetProblem>(gridGeometry.get(facetId), facetSpatialParams, couplingManager, "Facet"), facetId);
+ problem.set(std::make_shared<EdgeProblem>(gridGeometry.get(edgeId), edgeSpatialParams, couplingManager, "Edge"), edgeId);
// the solution vector
typename Traits::SolutionVector x;
@@ -211,14 +211,14 @@ int main(int argc, char** argv) try
// the coupling mapper
using CouplingMapper = typename ThisTestTraits::CouplingMapper;
auto couplingMapper = std::make_shared<CouplingMapper>();
- couplingMapper->update(fvGridGeometry[bulkId], fvGridGeometry[facetId], fvGridGeometry[edgeId], gridManager.getEmbeddings());
+ couplingMapper->update(gridGeometry[bulkId], gridGeometry[facetId], gridGeometry[edgeId], gridManager.getEmbeddings());
// initialize the coupling manager
couplingManager->init(problem.get(bulkId), problem.get(facetId), problem.get(edgeId), couplingMapper, x);
// the grid variables
using GridVariables = MultiDomainFVGridVariables<Traits>;
- GridVariables gridVars(fvGridGeometry.getTuple(), problem.getTuple());
+ GridVariables gridVars(gridGeometry.getTuple(), problem.getTuple());
gridVars.init(x);
// intialize the vtk output module
@@ -229,7 +229,7 @@ int main(int argc, char** argv) try
// the assembler
using Assembler = MultiDomainFVAssembler<Traits, CouplingManager, DiffMethod::numeric, /*implicit?*/true>;
- auto assembler = std::make_shared<Assembler>( problem.getTuple(), fvGridGeometry.getTuple(), gridVars.getTuple(), couplingManager);
+ auto assembler = std::make_shared<Assembler>( problem.getTuple(), gridGeometry.getTuple(), gridVars.getTuple(), couplingManager);
// the linear solver
using LinearSolver = ILU0BiCGSTABBackend;
diff --git a/test/multidomain/facet/1p_1p/threedomain/problem_bulk.hh b/test/multidomain/facet/1p_1p/threedomain/problem_bulk.hh
index bb82fae592..4d77a6a716 100644
--- a/test/multidomain/facet/1p_1p/threedomain/problem_bulk.hh
+++ b/test/multidomain/facet/1p_1p/threedomain/problem_bulk.hh
@@ -105,11 +105,11 @@ class OnePBulkProblem : public PorousMediumFlowProblem<TypeTag>
public:
//! The constructor
- OnePBulkProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePBulkProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManagerPtr,
const std::string& paramGroup = "Bulk")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManagerPtr_(couplingManagerPtr)
{
problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
diff --git a/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh b/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh
index 7f64f99888..6f47d87b4f 100644
--- a/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh
+++ b/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh
@@ -109,11 +109,11 @@ class OnePEdgeProblem : public PorousMediumFlowProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- OnePEdgeProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePEdgeProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManagerPtr,
const std::string& paramGroup = "Edge")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManagerPtr_(couplingManagerPtr)
{
const auto a = getParam<Scalar>("Extrusion.Aperture");
diff --git a/test/multidomain/facet/1p_1p/threedomain/problem_facet.hh b/test/multidomain/facet/1p_1p/threedomain/problem_facet.hh
index 7dc5355856..bce69a373c 100644
--- a/test/multidomain/facet/1p_1p/threedomain/problem_facet.hh
+++ b/test/multidomain/facet/1p_1p/threedomain/problem_facet.hh
@@ -108,11 +108,11 @@ class OnePFacetProblem : public PorousMediumFlowProblem<TypeTag>
using CouplingManager = GetPropType<TypeTag, Properties::CouplingManager>;
public:
- OnePFacetProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePFacetProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManagerPtr,
const std::string& paramGroup = "Facet")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManagerPtr_(couplingManagerPtr)
, aperture_(getParam<Scalar>("Extrusion.Aperture"))
{
diff --git a/test/multidomain/facet/1p_1p/threedomain/spatialparams.hh b/test/multidomain/facet/1p_1p/threedomain/spatialparams.hh
index 87f0c010c3..8a1485932c 100644
--- a/test/multidomain/facet/1p_1p/threedomain/spatialparams.hh
+++ b/test/multidomain/facet/1p_1p/threedomain/spatialparams.hh
@@ -48,8 +48,8 @@ public:
//! Export the type used for permeability
using PermeabilityType = Scalar;
- OnePSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry)
+ OnePSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry)
{
permeability_ = getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Permeability");
}
diff --git a/test/multidomain/facet/tracer_tracer/main.cc b/test/multidomain/facet/tracer_tracer/main.cc
index 7e72b989bf..e71e4427b7 100644
--- a/test/multidomain/facet/tracer_tracer/main.cc
+++ b/test/multidomain/facet/tracer_tracer/main.cc
@@ -123,13 +123,13 @@ template< class GridGeometry,
class GridManager,
class LowDimGridView,
std::enable_if_t<GridGeometry::discMethod == Dumux::DiscretizationMethod::box, int> = 0 >
-void updateBulkFVGridGeometry(GridGeometry& fvGridGeometry,
+void updateBulkFVGridGeometry(GridGeometry& gridGeometry,
const GridManager& gridManager,
const LowDimGridView& lowDimGridView)
{
using BulkFacetGridAdapter = Dumux::CodimOneGridAdapter<typename GridManager::Embeddings>;
BulkFacetGridAdapter facetGridAdapter(gridManager.getEmbeddings());
- fvGridGeometry.update(lowDimGridView, facetGridAdapter);
+ gridGeometry.update(lowDimGridView, facetGridAdapter);
}
/*!
@@ -139,11 +139,11 @@ void updateBulkFVGridGeometry(GridGeometry& fvGridGeometry,
class GridManager,
class LowDimGridView,
std::enable_if_t<GridGeometry::discMethod != Dumux::DiscretizationMethod::box, int> = 0 >
-void updateBulkFVGridGeometry(GridGeometry& fvGridGeometry,
+void updateBulkFVGridGeometry(GridGeometry& gridGeometry,
const GridManager& gridManager,
const LowDimGridView& lowDimGridView)
{
- fvGridGeometry.update();
+ gridGeometry.update();
}
//! Computes the volume fluxes on all scvfs for a sub-domain.
@@ -152,7 +152,7 @@ void computeVolumeFluxes(Storage& volumeFluxes,
CM& couplingManager,
const Assembler& assembler,
const Prob& problem,
- const typename GV::GridGeometry& fvGridGeometry,
+ const typename GV::GridGeometry& gridGeometry,
const GV& gridVariables,
const Sol& sol,
Dune::index_constant<id> domainId)
@@ -160,17 +160,17 @@ void computeVolumeFluxes(Storage& volumeFluxes,
static constexpr bool isBox = GV::GridGeometry::discMethod == Dumux::DiscretizationMethod::box;
// resize depending on the scheme
- if (!isBox) volumeFluxes.assign(fvGridGeometry.numScvf(), {0.0});
- else volumeFluxes.assign(fvGridGeometry.gridView().size(0), {0.0});
+ if (!isBox) volumeFluxes.assign(gridGeometry.numScvf(), {0.0});
+ else volumeFluxes.assign(gridGeometry.gridView().size(0), {0.0});
auto upwindTerm = [](const auto& volVars) { return volVars.mobility(0); };
- for (const auto& element : elements(fvGridGeometry.gridView()))
+ for (const auto& element : elements(gridGeometry.gridView()))
{
- const auto eIdx = fvGridGeometry.elementMapper().index(element);
+ const auto eIdx = gridGeometry.elementMapper().index(element);
// bind local views
couplingManager.bindCouplingContext(domainId, element, assembler);
- auto fvGeometry = localView(fvGridGeometry);
+ auto fvGeometry = localView(gridGeometry);
auto elemVolVars = localView(gridVariables.curGridVolVars());
auto elemFluxVars = localView(gridVariables.gridFluxVarsCache());
fvGeometry.bind(element);
@@ -194,10 +194,10 @@ void computeVolumeFluxes(Storage& volumeFluxes,
&& problem.boundaryTypes(element, fvGeometry.scv(scvf.insideScvIdx())).hasOnlyDirichlet())
{
// reconstruct flux
- const auto elemSol = elementSolution(element, sol, fvGridGeometry);
+ const auto elemSol = elementSolution(element, sol, gridGeometry);
const auto gradP = evalGradients(element,
element.geometry(),
- fvGridGeometry,
+ gridGeometry,
elemSol,
scvf.ipGlobal())[0];
const auto& insideVolVars = elemVolVars[fvGeometry.scv(scvf.insideScvIdx())];
diff --git a/test/multidomain/facet/tracer_tracer/problem_1p_bulk.hh b/test/multidomain/facet/tracer_tracer/problem_1p_bulk.hh
index 60869ee180..9c4f4f4aec 100644
--- a/test/multidomain/facet/tracer_tracer/problem_1p_bulk.hh
+++ b/test/multidomain/facet/tracer_tracer/problem_1p_bulk.hh
@@ -108,11 +108,11 @@ class OnePBulkProblem : public PorousMediumFlowProblem<TypeTag>
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
public:
- OnePBulkProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePBulkProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager,
const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManagerPtr_(couplingManager)
, overPressure_(getParamFromGroup<Scalar>(paramGroup, "Problem.BoundaryOverpressure"))
{
diff --git a/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh b/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh
index 4b45702eb1..5147486dae 100644
--- a/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh
+++ b/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh
@@ -106,11 +106,11 @@ class OnePLowDimProblem : public PorousMediumFlowProblem<TypeTag>
using Indices = typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
public:
- OnePLowDimProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePLowDimProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
std::shared_ptr<CouplingManager> couplingManager,
const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
, couplingManagerPtr_(couplingManager)
, aperture_(getParamFromGroup<Scalar>(paramGroup, "Problem.FractureAperture"))
{
diff --git a/test/multidomain/facet/tracer_tracer/spatialparams_1p.hh b/test/multidomain/facet/tracer_tracer/spatialparams_1p.hh
index caee636d19..041d4d0494 100644
--- a/test/multidomain/facet/tracer_tracer/spatialparams_1p.hh
+++ b/test/multidomain/facet/tracer_tracer/spatialparams_1p.hh
@@ -51,8 +51,8 @@ public:
//! Export the type used for permeabilities
using PermeabilityType = Scalar;
- OnePSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry)
+ OnePSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry)
, permeability_(getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Permeability"))
, porosity_(getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Porosity"))
{}
diff --git a/test/multidomain/facet/tracer_tracer/spatialparams_tracer.hh b/test/multidomain/facet/tracer_tracer/spatialparams_tracer.hh
index a8202283b0..a1472f565e 100644
--- a/test/multidomain/facet/tracer_tracer/spatialparams_tracer.hh
+++ b/test/multidomain/facet/tracer_tracer/spatialparams_tracer.hh
@@ -53,10 +53,10 @@ class TracerSpatialParams
public:
- TracerSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ TracerSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry,
const std::vector< std::vector<Scalar> >& volumeFluxes,
const std::string& paramGroup = "")
- : ParentType(fvGridGeometry)
+ : ParentType(gridGeometry)
, volumeFlux_(volumeFluxes)
, porosity_(getParamFromGroup<Scalar>(paramGroup, "SpatialParams.Porosity"))
{}
diff --git a/test/multidomain/poromechanics/el1p/problem_1p.hh b/test/multidomain/poromechanics/el1p/problem_1p.hh
index 9a771594a4..478ef62a95 100644
--- a/test/multidomain/poromechanics/el1p/problem_1p.hh
+++ b/test/multidomain/poromechanics/el1p/problem_1p.hh
@@ -97,10 +97,10 @@ class OnePSubProblem : public PorousMediumFlowProblem<TypeTag>
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
public:
- OnePSubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePSubProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<GetPropType<TypeTag, Properties::SpatialParams>> spatialParams,
const std::string& paramGroup = "OneP")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
{
problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
}
diff --git a/test/multidomain/poromechanics/el1p/problem_poroelastic.hh b/test/multidomain/poromechanics/el1p/problem_poroelastic.hh
index 99e4623bf2..7fbe2e2c6e 100644
--- a/test/multidomain/poromechanics/el1p/problem_poroelastic.hh
+++ b/test/multidomain/poromechanics/el1p/problem_poroelastic.hh
@@ -100,10 +100,10 @@ class PoroElasticSubProblem : public GeomechanicsFVProblem<TypeTag>
using GradU = Dune::FieldMatrix<Scalar, dim, dimWorld>;
public:
- PoroElasticSubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ PoroElasticSubProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManagerPtr,
const std::string& paramGroup = "PoroElastic")
- : ParentType(fvGridGeometry, paramGroup)
+ : ParentType(gridGeometry, paramGroup)
, couplingManagerPtr_(couplingManagerPtr)
{
problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
diff --git a/test/multidomain/poromechanics/el1p/spatialparams_1p.hh b/test/multidomain/poromechanics/el1p/spatialparams_1p.hh
index 72a8cf6b9f..ddff0f7dca 100644
--- a/test/multidomain/poromechanics/el1p/spatialparams_1p.hh
+++ b/test/multidomain/poromechanics/el1p/spatialparams_1p.hh
@@ -55,9 +55,9 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- OnePSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ OnePSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManagerPtr)
- : ParentType(fvGridGeometry)
+ : ParentType(gridGeometry)
, couplingManagerPtr_(couplingManagerPtr)
, permeability_(getParam<Scalar>("SpatialParams.Permeability"))
, initPorosity_(getParam<Scalar>("SpatialParams.InitialPorosity"))
diff --git a/test/multidomain/poromechanics/el1p/spatialparams_poroelastic.hh b/test/multidomain/poromechanics/el1p/spatialparams_poroelastic.hh
index dc4aa2b84d..fa9b37fbf6 100644
--- a/test/multidomain/poromechanics/el1p/spatialparams_poroelastic.hh
+++ b/test/multidomain/poromechanics/el1p/spatialparams_poroelastic.hh
@@ -52,8 +52,8 @@ public:
//! Export the type of the lame parameters
using LameParams = Dumux::LameParams<Scalar>;
- PoroElasticSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ PoroElasticSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
, initPorosity_(getParam<Scalar>("SpatialParams.InitialPorosity"))
{
// Young's modulus [Pa]
diff --git a/test/multidomain/poromechanics/el2p/problem_2p.hh b/test/multidomain/poromechanics/el2p/problem_2p.hh
index 20463475e1..60abeddcd5 100644
--- a/test/multidomain/poromechanics/el2p/problem_2p.hh
+++ b/test/multidomain/poromechanics/el2p/problem_2p.hh
@@ -105,10 +105,10 @@ class TwoPSubProblem : public PorousMediumFlowProblem<TypeTag>
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
public:
- TwoPSubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ TwoPSubProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<GetPropType<TypeTag, Properties::SpatialParams>> spatialParams,
const std::string& paramGroup = "TwoP")
- : ParentType(fvGridGeometry, spatialParams, paramGroup)
+ : ParentType(gridGeometry, spatialParams, paramGroup)
{
FluidSystem::init();
problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
diff --git a/test/multidomain/poromechanics/el2p/problem_poroelastic.hh b/test/multidomain/poromechanics/el2p/problem_poroelastic.hh
index 73ebfbef40..c7fa0cab71 100644
--- a/test/multidomain/poromechanics/el2p/problem_poroelastic.hh
+++ b/test/multidomain/poromechanics/el2p/problem_poroelastic.hh
@@ -102,10 +102,10 @@ class PoroElasticSubProblem : public GeomechanicsFVProblem<TypeTag>
using GradU = Dune::FieldMatrix<Scalar, dim, dimWorld>;
public:
- PoroElasticSubProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ PoroElasticSubProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManagerPtr,
const std::string& paramGroup = "PoroElastic")
- : ParentType(fvGridGeometry, paramGroup)
+ : ParentType(gridGeometry, paramGroup)
, couplingManagerPtr_(couplingManagerPtr)
{
problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name");
diff --git a/test/multidomain/poromechanics/el2p/spatialparams_2p.hh b/test/multidomain/poromechanics/el2p/spatialparams_2p.hh
index ef3c14d3eb..543c5660b0 100644
--- a/test/multidomain/poromechanics/el2p/spatialparams_2p.hh
+++ b/test/multidomain/poromechanics/el2p/spatialparams_2p.hh
@@ -59,9 +59,9 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- TwoPSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ TwoPSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<CouplingManager> couplingManagerPtr)
- : ParentType(fvGridGeometry)
+ : ParentType(gridGeometry)
, couplingManagerPtr_(couplingManagerPtr)
, initPermeability_(getParam<Scalar>("SpatialParams.Permeability"))
, initPorosity_(getParam<Scalar>("SpatialParams.InitialPorosity"))
diff --git a/test/multidomain/poromechanics/el2p/spatialparams_poroelastic.hh b/test/multidomain/poromechanics/el2p/spatialparams_poroelastic.hh
index dc4aa2b84d..fa9b37fbf6 100644
--- a/test/multidomain/poromechanics/el2p/spatialparams_poroelastic.hh
+++ b/test/multidomain/poromechanics/el2p/spatialparams_poroelastic.hh
@@ -52,8 +52,8 @@ public:
//! Export the type of the lame parameters
using LameParams = Dumux::LameParams<Scalar>;
- PoroElasticSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ PoroElasticSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
, initPorosity_(getParam<Scalar>("SpatialParams.InitialPorosity"))
{
// Young's modulus [Pa]
diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/main.cc b/test/porousmediumflow/1p/implicit/compressible/instationary/main.cc
index 53079d6905..ddf18f5305 100644
--- a/test/porousmediumflow/1p/implicit/compressible/instationary/main.cc
+++ b/test/porousmediumflow/1p/implicit/compressible/instationary/main.cc
@@ -85,22 +85,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -123,7 +123,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh b/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh
index e62e6bf02a..e3c2ae728f 100644
--- a/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh
+++ b/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh
@@ -111,8 +111,8 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- OnePTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
Components::TabulatedComponent<Components::H2O<Scalar>>::init(272.15, 294.15, 10,
1.0e4, 1.0e6, 200);
diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/spatialparams.hh b/test/porousmediumflow/1p/implicit/compressible/instationary/spatialparams.hh
index bd71ffded3..870426b054 100644
--- a/test/porousmediumflow/1p/implicit/compressible/instationary/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/compressible/instationary/spatialparams.hh
@@ -52,8 +52,8 @@ class OnePTestSpatialParams
public:
using PermeabilityType = Scalar;
- OnePTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = getParam<Scalar>("SpatialParams.Permeability");
permeabilityLens_ = getParam<Scalar>("SpatialParams.PermeabilityLens");
diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/main.cc b/test/porousmediumflow/1p/implicit/compressible/stationary/main.cc
index dbe4b417f8..6e9e6c3bbb 100644
--- a/test/porousmediumflow/1p/implicit/compressible/stationary/main.cc
+++ b/test/porousmediumflow/1p/implicit/compressible/stationary/main.cc
@@ -83,20 +83,20 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -109,7 +109,7 @@ 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, fvGridGeometry, gridVariables);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables);
// the linear solver
using LinearSolver = ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh b/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh
index e62e6bf02a..e3c2ae728f 100644
--- a/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh
+++ b/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh
@@ -111,8 +111,8 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- OnePTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
Components::TabulatedComponent<Components::H2O<Scalar>>::init(272.15, 294.15, 10,
1.0e4, 1.0e6, 200);
diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/spatialparams.hh b/test/porousmediumflow/1p/implicit/compressible/stationary/spatialparams.hh
index 4900b4839b..c34f9bf6ad 100644
--- a/test/porousmediumflow/1p/implicit/compressible/stationary/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/compressible/stationary/spatialparams.hh
@@ -52,8 +52,8 @@ class OnePTestSpatialParams
public:
using PermeabilityType = Scalar;
- OnePTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = getParam<Scalar>("SpatialParams.Permeability");
permeabilityLens_ = getParam<Scalar>("SpatialParams.PermeabilityLens");
diff --git a/test/porousmediumflow/1p/implicit/convergence/problem.hh b/test/porousmediumflow/1p/implicit/convergence/problem.hh
index 91a9457494..a1bfcceeb2 100644
--- a/test/porousmediumflow/1p/implicit/convergence/problem.hh
+++ b/test/porousmediumflow/1p/implicit/convergence/problem.hh
@@ -110,10 +110,10 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
public:
/*!
* \brief The constructor.
- * \param fvGridGeometry The finite-volume grid geometry
+ * \param gridGeometry The finite-volume grid geometry
*/
- OnePTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{}
/*!
diff --git a/test/porousmediumflow/1p/implicit/convergence/solver.hh b/test/porousmediumflow/1p/implicit/convergence/solver.hh
index ff5ea1a510..371324473a 100644
--- a/test/porousmediumflow/1p/implicit/convergence/solver.hh
+++ b/test/porousmediumflow/1p/implicit/convergence/solver.hh
@@ -89,25 +89,25 @@ SolutionStorage<TypeTag> solveRefinementLevel(int numCells)
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- auto x = std::make_shared<SolutionVector>(fvGridGeometry->numDofs());
+ auto x = std::make_shared<SolutionVector>(gridGeometry->numDofs());
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(*x);
// create assembler & linear solver
using Assembler = FVAssembler<TypeTag, DiffMethod::analytic>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables);
using LinearSolver = ILU0BiCGSTABBackend;
auto linearSolver = std::make_shared<LinearSolver>();
@@ -125,11 +125,11 @@ SolutionStorage<TypeTag> solveRefinementLevel(int numCells)
// add exact solution
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
- std::vector<Scalar> exact(fvGridGeometry->numDofs());
+ std::vector<Scalar> exact(gridGeometry->numDofs());
- for (const auto& element : elements(fvGridGeometry->gridView()))
+ for (const auto& element : elements(gridGeometry->gridView()))
{
- auto fvGeometry = localView(*fvGridGeometry);
+ auto fvGeometry = localView(*gridGeometry);
fvGeometry.bindElement(element);
for (const auto& scv : scvs(fvGeometry))
@@ -141,7 +141,7 @@ SolutionStorage<TypeTag> solveRefinementLevel(int numCells)
}
// fill storage and return
- storage.gridGeometry = fvGridGeometry;
+ storage.gridGeometry = gridGeometry;
storage.solution = x;
return storage;
}
diff --git a/test/porousmediumflow/1p/implicit/convergence/spatialparams.hh b/test/porousmediumflow/1p/implicit/convergence/spatialparams.hh
index 5cc1980262..af69b25b1a 100644
--- a/test/porousmediumflow/1p/implicit/convergence/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/convergence/spatialparams.hh
@@ -49,10 +49,10 @@ public:
/*!
* \brief The constructor.
- * \param fvGridGeometry The finite-volume grid geometry
+ * \param gridGeometry The finite-volume grid geometry
*/
- OnePTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{}
/*!
diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/main.cc b/test/porousmediumflow/1p/implicit/fracture2d3d/main.cc
index 95c50632af..592f892d80 100644
--- a/test/porousmediumflow/1p/implicit/fracture2d3d/main.cc
+++ b/test/porousmediumflow/1p/implicit/fracture2d3d/main.cc
@@ -106,22 +106,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -144,11 +144,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh b/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh
index a47b0ac78b..94894add8a 100644
--- a/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh
+++ b/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh
@@ -120,8 +120,8 @@ class FractureProblem : public PorousMediumFlowProblem<TypeTag>
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
public:
- FractureProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ FractureProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
name_ = getParam<std::string>("Problem.Name");
}
diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/spatialparams.hh b/test/porousmediumflow/1p/implicit/fracture2d3d/spatialparams.hh
index cb932a102d..edbb0617e2 100644
--- a/test/porousmediumflow/1p/implicit/fracture2d3d/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/fracture2d3d/spatialparams.hh
@@ -52,8 +52,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- FractureSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ FractureSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{}
/*!
diff --git a/test/porousmediumflow/1p/implicit/incompressible/main.cc b/test/porousmediumflow/1p/implicit/incompressible/main.cc
index 469c9c9476..22ef9abbd3 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/main.cc
+++ b/test/porousmediumflow/1p/implicit/incompressible/main.cc
@@ -59,14 +59,14 @@
//! Function to write out the scv-wise velocities (overload for mpfa)
template<class GridGeometry, class GridVariables, class Sol,
std::enable_if_t<GridGeometry::discMethod == Dumux::DiscretizationMethod::ccmpfa, int> = 0>
-void writeMpfaVelocities(const GridGeometry& fvGridGeometry,
+void writeMpfaVelocities(const GridGeometry& gridGeometry,
const GridVariables& gridVariables,
const Sol& x)
{
using Scalar = typename GridVariables::Scalar;
using GlobalPos = typename GridGeometry::SubControlVolume::GlobalPosition;
- const auto velocities = Dumux::CCMpfaScvGradients::computeVelocities(fvGridGeometry, gridVariables, x, /*phaseIdx*/0);
+ const auto velocities = Dumux::CCMpfaScvGradients::computeVelocities(gridGeometry, gridVariables, x, /*phaseIdx*/0);
Dumux::PointCloudVtkWriter<Scalar, GlobalPos> writer(velocities.first);
writer.addPointData(velocities.second, "velocity (m/s)");
writer.write("mpfa_scv_velocities");
@@ -75,7 +75,7 @@ void writeMpfaVelocities(const GridGeometry& fvGridGeometry,
//! Function to write out the scv-wise velocities (overload for NOT mpfa)
template<class GridGeometry, class GridVariables, class Sol,
std::enable_if_t<GridGeometry::discMethod != Dumux::DiscretizationMethod::ccmpfa, int> = 0>
-void writeMpfaVelocities(const GridGeometry& fvGridGeometry,
+void writeMpfaVelocities(const GridGeometry& gridGeometry,
const GridVariables& gridVariables,
const Sol& x)
{}
@@ -115,20 +115,20 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -141,7 +141,7 @@ int main(int argc, char** argv) try
// create assembler & linear solver
using Assembler = FVAssembler<TypeTag, NUMDIFFMETHOD>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables);
using LinearSolver = SSORCGBackend;
auto linearSolver = std::make_shared<LinearSolver>();
@@ -166,7 +166,7 @@ int main(int argc, char** argv) try
constexpr bool isBox = GridGeometry::discMethod == Dumux::DiscretizationMethod::box;
constexpr int dimWorld = GridGeometry::GridView::dimensionworld;
const auto numCells = leafGridView.size(0);
- const auto numDofs = fvGridGeometry->numDofs();
+ const auto numDofs = gridGeometry->numDofs();
auto numVelocities = (isBox && dimWorld == 1) ? numCells : numDofs;
velocity.resize(numVelocities);
@@ -175,9 +175,9 @@ int main(int argc, char** argv) try
for (const auto& element : elements(leafGridView, Dune::Partitions::interior))
{
- const auto eIdx = fvGridGeometry->elementMapper().index(element);
+ const auto eIdx = gridGeometry->elementMapper().index(element);
- auto fvGeometry = localView(*fvGridGeometry);
+ auto fvGeometry = localView(*gridGeometry);
auto elemVolVars = localView(gridVariables->curGridVolVars());
auto elemFluxVarsCache = localView(gridVariables->gridFluxVarsCache());
@@ -205,7 +205,7 @@ int main(int argc, char** argv) try
// For the mpfa test, write out the gradients in the scv centers
if (getParam<bool>("IO.WriteMpfaVelocities", false))
- writeMpfaVelocities(*fvGridGeometry, *gridVariables, x);
+ writeMpfaVelocities(*gridGeometry, *gridVariables, x);
if (mpiHelper.rank() == 0)
Parameters::print();
diff --git a/test/porousmediumflow/1p/implicit/incompressible/problem.hh b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
index 37b90d117c..c6b430a9aa 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
@@ -127,8 +127,8 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar,dimWorld>;
public:
- OnePTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), velocity_(0.0)
+ OnePTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), velocity_(0.0)
{
extrusionFactor_ = getParam<Scalar>("Problem.ExtrusionFactor");
Scalar permeability = getParam<Scalar>("SpatialParams.Permeability");
diff --git a/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
index 4859730fcf..bfaf1baeec 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
@@ -52,8 +52,8 @@ class OnePTestSpatialParams
public:
using PermeabilityType = Scalar;
- OnePTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = getParam<Scalar>("SpatialParams.Permeability");
permeabilityLens_ = getParam<Scalar>("SpatialParams.PermeabilityLens");
diff --git a/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh b/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh
index 2ddb54a9e8..67fd704f16 100644
--- a/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh
+++ b/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh
@@ -66,8 +66,8 @@ class OnePTestProblemInternalDirichlet : public OnePTestProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- OnePTestProblemInternalDirichlet(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTestProblemInternalDirichlet(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{}
/*!
diff --git a/test/porousmediumflow/1p/implicit/isothermal/main.cc b/test/porousmediumflow/1p/implicit/isothermal/main.cc
index 37e5d4ac10..3b9bea6e65 100644
--- a/test/porousmediumflow/1p/implicit/isothermal/main.cc
+++ b/test/porousmediumflow/1p/implicit/isothermal/main.cc
@@ -112,22 +112,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -155,11 +155,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/1p/implicit/isothermal/spatialparams.hh b/test/porousmediumflow/1p/implicit/isothermal/spatialparams.hh
index ca3157aa11..35239e43e7 100644
--- a/test/porousmediumflow/1p/implicit/isothermal/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/isothermal/spatialparams.hh
@@ -61,17 +61,17 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- OnePTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry),
- randomPermeability_(fvGridGeometry->gridView().size(dim), 0.0),
- indexSet_(fvGridGeometry->gridView().indexSet())
+ OnePTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry),
+ randomPermeability_(gridGeometry->gridView().size(dim), 0.0),
+ indexSet_(gridGeometry->gridView().indexSet())
{
randomField_ = getParam<bool>("SpatialParams.RandomField", false);
permeability_ = getParam<Scalar>("SpatialParams.Permeability");
if(!randomField_)
permeabilityLens_ = getParam<Scalar>("SpatialParams.PermeabilityLens");
else
- initRandomField(*fvGridGeometry);
+ initRandomField(*gridGeometry);
lensLowerLeft_ = getParam<GlobalPosition>("SpatialParams.LensLowerLeft");
lensUpperRight_ = getParam<GlobalPosition>("SpatialParams.LensUpperRight");
diff --git a/test/porousmediumflow/1p/implicit/network1d3d/main.cc b/test/porousmediumflow/1p/implicit/network1d3d/main.cc
index 323e728fd3..2827e8b95c 100644
--- a/test/porousmediumflow/1p/implicit/network1d3d/main.cc
+++ b/test/porousmediumflow/1p/implicit/network1d3d/main.cc
@@ -106,22 +106,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -144,11 +144,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/1p/implicit/network1d3d/spatialparams.hh b/test/porousmediumflow/1p/implicit/network1d3d/spatialparams.hh
index 4df6fd6eb1..3d2383faeb 100644
--- a/test/porousmediumflow/1p/implicit/network1d3d/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/network1d3d/spatialparams.hh
@@ -54,8 +54,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- TubesTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TubesTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
radius_ = 1.0;
diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/main.cc b/test/porousmediumflow/1p/implicit/nonisothermal/main.cc
index 705c7d19f4..e4ad2594c0 100644
--- a/test/porousmediumflow/1p/implicit/nonisothermal/main.cc
+++ b/test/porousmediumflow/1p/implicit/nonisothermal/main.cc
@@ -109,13 +109,13 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
const std::string paramGroup = GridGeometry::discMethod == DiscretizationMethod::ccmpfa ? "MpfaTest" : "";
- auto problem = std::make_shared<Problem>(fvGridGeometry, paramGroup);
+ auto problem = std::make_shared<Problem>(gridGeometry, paramGroup);
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -128,14 +128,14 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
if (restartTime > 0)
{
using IOFields = GetPropType<TypeTag, Properties::IOFields>;
using PrimaryVariables = GetPropType<TypeTag, Properties::PrimaryVariables>;
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
const auto fileName = getParam<std::string>("Restart.File");
- loadSolution(x, fileName, createPVNameFunction<IOFields, PrimaryVariables, ModelTraits>(), *fvGridGeometry);
+ loadSolution(x, fileName, createPVNameFunction<IOFields, PrimaryVariables, ModelTraits>(), *gridGeometry);
}
else
problem->applyInitialSolution(x);
@@ -143,7 +143,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -164,11 +164,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh b/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh
index 3b12308da3..22ae3df812 100644
--- a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh
+++ b/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh
@@ -134,15 +134,15 @@ class OnePNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
public:
- OnePNIConductionProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup)
- : ParentType(fvGridGeometry, paramGroup)
+ OnePNIConductionProblem(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup)
+ : ParentType(gridGeometry, paramGroup)
{
//initialize fluid system
FluidSystem::init();
name_ = getParam<std::string>("Problem.Name");
temperatureHigh_ = 300.0;
- temperatureExact_.resize(fvGridGeometry->numDofs());
+ temperatureExact_.resize(gridGeometry->numDofs());
}
//! Get the analytical temperature
diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh b/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh
index 19ea05429c..fd99103799 100644
--- a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh
+++ b/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh
@@ -146,8 +146,8 @@ class OnePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
public:
- OnePNIConvectionProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup)
- : ParentType(fvGridGeometry, paramGroup)
+ OnePNIConvectionProblem(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup)
+ : ParentType(gridGeometry, paramGroup)
{
//initialize fluid system
FluidSystem::init();
diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/spatialparams.hh b/test/porousmediumflow/1p/implicit/nonisothermal/spatialparams.hh
index 8fd254bd47..860a13b715 100644
--- a/test/porousmediumflow/1p/implicit/nonisothermal/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/nonisothermal/spatialparams.hh
@@ -51,8 +51,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- OnePNISpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ OnePNISpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry) {}
/*!
* \brief Defines the intrinsic permeability \f$\mathrm{[m^2]}\f$.
diff --git a/test/porousmediumflow/1p/implicit/periodicbc/main.cc b/test/porousmediumflow/1p/implicit/periodicbc/main.cc
index 89aff7811d..cfc8188336 100644
--- a/test/porousmediumflow/1p/implicit/periodicbc/main.cc
+++ b/test/porousmediumflow/1p/implicit/periodicbc/main.cc
@@ -78,26 +78,26 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry (and make it periodic)
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
- bool periodic = fvGridGeometry->isPeriodic();
- periodic = fvGridGeometry->gridView().comm().max(periodic);
+ bool periodic = gridGeometry->isPeriodic();
+ periodic = gridGeometry->gridView().comm().max(periodic);
if (!periodic)
DUNE_THROW(Dune::GridError, "Your grid is not periodic. Maybe the grid manager doesn't support periodic boundaries.");
// the problem (boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
problem->computePointSourceMap();
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -108,7 +108,7 @@ int main(int argc, char** argv) try
// make assemble and attach linear system
using Assembler = FVAssembler<TypeTag, DiffMethod::analytic>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables);
using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
auto A = std::make_shared<JacobianMatrix>();
auto r = std::make_shared<SolutionVector>();
@@ -128,7 +128,7 @@ int main(int argc, char** argv) try
// solve the linear system
Dune::Timer solverTimer;
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(fvGridGeometry->gridView(), fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(gridGeometry->gridView(), gridGeometry->dofMapper());
if (mpiHelper.rank() == 0) std::cout << "Solving linear system using " + linearSolver->name() + "..." << std::flush;
linearSolver->solve(*A, x, *r);
diff --git a/test/porousmediumflow/1p/implicit/periodicbc/problem.hh b/test/porousmediumflow/1p/implicit/periodicbc/problem.hh
index ba8a167028..41a50d7feb 100644
--- a/test/porousmediumflow/1p/implicit/periodicbc/problem.hh
+++ b/test/porousmediumflow/1p/implicit/periodicbc/problem.hh
@@ -119,8 +119,8 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- OnePTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
sourcePosition_ = getParam<GlobalPosition>("Source.Position");
sourceValues_ = getParam<SourceValues>("Source.Values");
diff --git a/test/porousmediumflow/1p/implicit/periodicbc/spatialparams.hh b/test/porousmediumflow/1p/implicit/periodicbc/spatialparams.hh
index c1b2c8893a..c677ea1f9e 100644
--- a/test/porousmediumflow/1p/implicit/periodicbc/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/periodicbc/spatialparams.hh
@@ -53,8 +53,8 @@ class OnePTestSpatialParams
public:
using PermeabilityType = Scalar;
- OnePTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = getParam<Scalar>("SpatialParams.Permeability");
permeabilityLens_ = getParam<Scalar>("SpatialParams.PermeabilityLens");
diff --git a/test/porousmediumflow/1p/implicit/pointsources/spatialparams.hh b/test/porousmediumflow/1p/implicit/pointsources/spatialparams.hh
index 7c805f3fe8..03ef1b3845 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/spatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/spatialparams.hh
@@ -53,8 +53,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- OnePSingularitySpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePSingularitySpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = getParam<Scalar>("SpatialParams.Permeability");
porosity_= getParam<Scalar>("SpatialParams.Porosity");
diff --git a/test/porousmediumflow/1p/implicit/pointsources/timedependent/main.cc b/test/porousmediumflow/1p/implicit/pointsources/timedependent/main.cc
index 2f865a88fc..23a5a542c8 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/timedependent/main.cc
+++ b/test/porousmediumflow/1p/implicit/pointsources/timedependent/main.cc
@@ -81,23 +81,23 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
problem->computePointSourceMap(); // enable point sources
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -120,11 +120,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh b/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh
index cccb3f7abb..902f784774 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh
@@ -78,8 +78,8 @@ class OnePSingularityProblemTimeDependent : public OnePSingularityProblem<TypeTa
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
public:
- OnePSingularityProblemTimeDependent(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePSingularityProblemTimeDependent(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{}
/*!
diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/main.cc b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/main.cc
index e6dae4cf56..c5789a9f47 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/main.cc
+++ b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/main.cc
@@ -81,23 +81,23 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
problem->computePointSourceMap(); // enable point sources
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -120,11 +120,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh
index c3166854ec..3f2acb0d76 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh
@@ -117,8 +117,8 @@ class OnePSingularityProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- OnePSingularityProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePSingularityProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
name_ = getParam<std::string>("Problem.Name");
}
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/main.cc b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/main.cc
index 6933d093a2..2664ba957c 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/main.cc
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/main.cc
@@ -85,22 +85,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -123,7 +123,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh
index 37044d23a5..f187f283da 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh
@@ -167,8 +167,8 @@ class OnePTwoCTestProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename SubControlVolumeFace::GlobalPosition;
public:
- OnePTwoCTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), useNitscheTypeBc_(getParam<bool>("Problem.UseNitscheTypeBc", false))
+ OnePTwoCTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), useNitscheTypeBc_(getParam<bool>("Problem.UseNitscheTypeBc", false))
{
//initialize fluid system
FluidSystem::init();
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/main.cc b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/main.cc
index c4df15bbb0..f55bc9d610 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/main.cc
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/main.cc
@@ -85,22 +85,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -123,7 +123,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh
index 295f60debd..1f6e4eec60 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh
@@ -106,8 +106,8 @@ class SaltWaterIntrusionTestProblem : public PorousMediumFlowProblem<TypeTag>
static_assert(!getPropValue<TypeTag, Properties::UseMoles>(), "This test uses mass fractions!");
public:
- SaltWaterIntrusionTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ SaltWaterIntrusionTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
//initialize fluid system
FluidSystem::init();
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/main.cc b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/main.cc
index 1cd87fc71c..50835dea1b 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/main.cc
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/main.cc
@@ -85,22 +85,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -126,7 +126,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
// using LinearSolver = UMFPackBackend;
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh
index e639650005..460e7b8ebf 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh
@@ -152,8 +152,8 @@ class OnePTwoCNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- OnePTwoCNIConductionProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), temperatureHigh_(300.0)
+ OnePTwoCNIConductionProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), temperatureHigh_(300.0)
{
//initialize fluid system
FluidSystem::init();
@@ -164,7 +164,7 @@ public:
else
std::cout<<"problem uses mass fractions"<<std::endl;
- temperatureExact_.resize(fvGridGeometry->numDofs(), 290.0);
+ temperatureExact_.resize(gridGeometry->numDofs(), 290.0);
}
//! Get the analytical temperature
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/main.cc b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/main.cc
index 29c9dd5e5e..203a5a63fc 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/main.cc
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/main.cc
@@ -85,22 +85,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -126,7 +126,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
// using LinearSolver = UMFPackBackend;
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh
index 4c0469c5cc..726c81f496 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh
@@ -167,8 +167,8 @@ class OnePTwoCNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename SubControlVolumeFace::GlobalPosition;
public:
- OnePTwoCNIConvectionProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTwoCNIConvectionProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
//initialize fluid system
FluidSystem::init();
@@ -179,7 +179,7 @@ public:
else
std::cout<<"problem uses mass fractions"<<std::endl;
- temperatureExact_.resize(fvGridGeometry->numDofs(), 290.0);
+ temperatureExact_.resize(gridGeometry->numDofs(), 290.0);
darcyVelocity_ = getParam<Scalar>("Problem.DarcyVelocity");
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/main.cc b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/main.cc
index 84087c60f1..2f9d576471 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/main.cc
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/main.cc
@@ -85,22 +85,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -125,7 +125,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh
index c9017f19e0..4a9113505d 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh
@@ -174,8 +174,8 @@ class OnePTwoCNITransientBCProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename SubControlVolumeFace::GlobalPosition;
public:
- OnePTwoCNITransientBCProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTwoCNITransientBCProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
//initialize fluid system
FluidSystem::init();
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/spatialparams.hh b/test/porousmediumflow/1pnc/implicit/1p2c/spatialparams.hh
index 677d798739..a4d16e26d0 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/spatialparams.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/spatialparams.hh
@@ -53,8 +53,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- OnePNCTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePNCTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = 1e-10;
porosity_ = 0.4;
diff --git a/test/porousmediumflow/1pnc/implicit/1p3c/main.cc b/test/porousmediumflow/1pnc/implicit/1p3c/main.cc
index 54698a27f8..d39483e874 100644
--- a/test/porousmediumflow/1pnc/implicit/1p3c/main.cc
+++ b/test/porousmediumflow/1pnc/implicit/1p3c/main.cc
@@ -86,22 +86,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -124,7 +124,7 @@ 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, fvGridGeometry, gridVariables, timeLoop);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop);
// the linear solver
using LinearSolver = ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh b/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh
index d240e5ecfc..3b236cdc66 100644
--- a/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh
@@ -259,8 +259,8 @@ class MaxwellStefanOnePThreeCTestProblem : public PorousMediumFlowProblem<TypeTa
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- MaxwellStefanOnePThreeCTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ MaxwellStefanOnePThreeCTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
name_ = getParam<std::string>("Problem.Name");
diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/main.cc b/test/porousmediumflow/1pnc/implicit/nonequilibrium/main.cc
index 012398a7a8..d1d0638572 100644
--- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/main.cc
+++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/main.cc
@@ -85,22 +85,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
problem->setGridVariables(gridVariables);
@@ -124,7 +124,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
// using LinearSolver = UMFPackBackend;
diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh b/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh
index b657378584..c89e04bbfd 100644
--- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh
@@ -152,8 +152,8 @@ class OnePTwoCThermalNonequilibriumProblem : public PorousMediumFlowProblem<Type
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- OnePTwoCThermalNonequilibriumProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePTwoCThermalNonequilibriumProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
//initialize fluid system
FluidSystem::init();
diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/spatialparams.hh b/test/porousmediumflow/1pnc/implicit/nonequilibrium/spatialparams.hh
index 0fbdc7a45a..2835d16ed6 100644
--- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/spatialparams.hh
+++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/spatialparams.hh
@@ -56,8 +56,8 @@ public:
using PermeabilityType = Scalar;
using FluidSolidInterfacialAreaFormulation = FluidSolidInterfacialAreaShiWang<Scalar>;
- OnePNCNonequilibriumTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ OnePNCNonequilibriumTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = 1e-11;
porosity_ = 0.4;
diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc b/test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc
index 74b60e1055..07157a6e5f 100644
--- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc
@@ -111,22 +111,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -155,7 +155,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh
index 268c0d11bb..54255c0aee 100644
--- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh
@@ -164,8 +164,8 @@ class ThermoChemProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename SubControlVolumeFace::GlobalPosition;
public:
- ThermoChemProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ ThermoChemProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
name_ = getParam<std::string>("Problem.Name");
FluidSystem::init(/*tempMin=*/473.15,
@@ -181,9 +181,9 @@ public:
boundaryTemperature_ = getParam<Scalar>("Problem.BoundaryTemperature");
unsigned int codim = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box ? dim : 0;
- permeability_.resize(fvGridGeometry->gridView().size(codim));
- porosity_.resize(fvGridGeometry->gridView().size(codim));
- reactionRate_.resize(fvGridGeometry->gridView().size(codim));
+ permeability_.resize(gridGeometry->gridView().size(codim));
+ porosity_.resize(gridGeometry->gridView().size(codim));
+ reactionRate_.resize(gridGeometry->gridView().size(codim));
}
/*!
diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/spatialparams.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/spatialparams.hh
index 005a6027d8..2bd4d6ece0 100644
--- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/spatialparams.hh
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/spatialparams.hh
@@ -55,8 +55,8 @@ public:
// type used for the permeability (i.e. tensor or scalar)
using PermeabilityType = Scalar;
- ThermoChemSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ ThermoChemSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{}
/*!
diff --git a/test/porousmediumflow/2p/implicit/adaptive/main.cc b/test/porousmediumflow/2p/implicit/adaptive/main.cc
index 06deb12dc9..43b0ccba98 100644
--- a/test/porousmediumflow/2p/implicit/adaptive/main.cc
+++ b/test/porousmediumflow/2p/implicit/adaptive/main.cc
@@ -124,34 +124,34 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
problem->computePointSourceMap(); // enable point sources
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// instantiate indicator & data transfer, read parameters for indicator
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
const Scalar refineTol = getParam<Scalar>("Adaptive.RefineTolerance");
const Scalar coarsenTol = getParam<Scalar>("Adaptive.CoarsenTolerance");
- TwoPGridAdaptIndicator<TypeTag> indicator(fvGridGeometry);
- TwoPGridDataTransfer<TypeTag> dataTransfer(problem, fvGridGeometry, gridVariables, x);
+ TwoPGridAdaptIndicator<TypeTag> indicator(gridGeometry);
+ TwoPGridDataTransfer<TypeTag> dataTransfer(problem, gridGeometry, gridVariables, x);
// Do initial refinement around sources/BCs
- GridAdaptInitializationIndicator<TypeTag> initIndicator(problem, fvGridGeometry, gridVariables);
+ GridAdaptInitializationIndicator<TypeTag> initIndicator(problem, gridGeometry, gridVariables);
// refine up to the maximum level
const auto maxLevel = getParam<std::size_t>("Adaptive.MaxLevel", 0);
@@ -207,11 +207,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/2p/implicit/adaptive/problem.hh b/test/porousmediumflow/2p/implicit/adaptive/problem.hh
index 97342d55b9..ad937e92d4 100644
--- a/test/porousmediumflow/2p/implicit/adaptive/problem.hh
+++ b/test/porousmediumflow/2p/implicit/adaptive/problem.hh
@@ -51,8 +51,8 @@ class TwoPTestProblemAdaptive : public TwoPTestProblem<TypeTag>
static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
public:
- TwoPTestProblemAdaptive(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TwoPTestProblemAdaptive(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
if(!isBox)
initialValues_ = readFileToContainer<std::vector<PrimaryVariables>>("initialsolutioncc.txt");
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/main.cc b/test/porousmediumflow/2p/implicit/boxdfm/main.cc
index 3637d8771f..7ba60bfd88 100644
--- a/test/porousmediumflow/2p/implicit/boxdfm/main.cc
+++ b/test/porousmediumflow/2p/implicit/boxdfm/main.cc
@@ -118,16 +118,16 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update(fractureGridAdapter);
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update(fractureGridAdapter);
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
@@ -136,7 +136,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -158,7 +158,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/problem.hh b/test/porousmediumflow/2p/implicit/boxdfm/problem.hh
index 16df8efc1b..e2d04c208d 100644
--- a/test/porousmediumflow/2p/implicit/boxdfm/problem.hh
+++ b/test/porousmediumflow/2p/implicit/boxdfm/problem.hh
@@ -144,8 +144,8 @@ class TwoPTestProblem : public PorousMediumFlowProblem<TypeTag>
static constexpr int dimWorld = GridView::dimensionworld;
public:
- TwoPTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TwoPTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{}
/*!
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh b/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh
index 0e06f1c19e..21e983c73e 100644
--- a/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh
@@ -59,7 +59,7 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = Scalar;
- TwoPTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry) : ParentType(fvGridGeometry)
+ TwoPTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry) : ParentType(gridGeometry)
{
// residual saturations
matrixMaterialParams_.setSwr(0.18);
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/main.cc b/test/porousmediumflow/2p/implicit/cornerpoint/main.cc
index c21f4242df..fc6fe48521 100644
--- a/test/porousmediumflow/2p/implicit/cornerpoint/main.cc
+++ b/test/porousmediumflow/2p/implicit/cornerpoint/main.cc
@@ -119,23 +119,23 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto spatialParams = std::make_shared<typename Problem::SpatialParams>(fvGridGeometry, gridManager.getDeck());
- auto problem = std::make_shared<Problem>(fvGridGeometry, spatialParams);
+ auto spatialParams = std::make_shared<typename Problem::SpatialParams>(gridGeometry, gridManager.getDeck());
+ auto problem = std::make_shared<Problem>(gridGeometry, spatialParams);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -160,11 +160,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh b/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh
index dc651cabdc..586810ce73 100644
--- a/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh
+++ b/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh
@@ -117,9 +117,9 @@ class TwoPCornerPointTestProblem : public PorousMediumFlowProblem<TypeTag>
enum { dimWorld = GridView::dimensionworld };
public:
- TwoPCornerPointTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ TwoPCornerPointTestProblem(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<typename ParentType::SpatialParams> spatialParams)
- : ParentType(fvGridGeometry, spatialParams)
+ : ParentType(gridGeometry, spatialParams)
{
gravity_ = {0, 0, 9.81};
injectionElement_ = getParam<int>("Problem.InjectionElement");
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh b/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh
index 1c349d65be..e01602f206 100644
--- a/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh
@@ -60,9 +60,9 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = DimWorldMatrix;
- TwoPCornerPointTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ TwoPCornerPointTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<const Opm::Deck> deck)
- : ParentType(fvGridGeometry)
+ : ParentType(gridGeometry)
, deck_(deck)
{
homogeneous_ = getParam<bool>("Problem.Homogeneous");
diff --git a/test/porousmediumflow/2p/implicit/fracture/main.cc b/test/porousmediumflow/2p/implicit/fracture/main.cc
index 034a08bb10..9953b25784 100644
--- a/test/porousmediumflow/2p/implicit/fracture/main.cc
+++ b/test/porousmediumflow/2p/implicit/fracture/main.cc
@@ -94,22 +94,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -133,11 +133,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/2p/implicit/fracture/problem.hh b/test/porousmediumflow/2p/implicit/fracture/problem.hh
index 8a7a734879..99dd4c6722 100644
--- a/test/porousmediumflow/2p/implicit/fracture/problem.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/problem.hh
@@ -133,8 +133,8 @@ class FractureProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- FractureProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ FractureProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry) {}
/*!
* \name Problem parameters
diff --git a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
index 1d43996a6d..d9d13cedc8 100644
--- a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
@@ -63,8 +63,8 @@ public:
using MaterialLaw = EffToAbsLaw<EffectiveLaw>;
using MaterialLawParams = typename MaterialLaw::Params;
- FractureSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ FractureSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// residual saturations
materialParams_.setSwr(0.05);
diff --git a/test/porousmediumflow/2p/implicit/incompressible/main.cc b/test/porousmediumflow/2p/implicit/incompressible/main.cc
index f5b2640ea6..676ac8e40e 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/main.cc
+++ b/test/porousmediumflow/2p/implicit/incompressible/main.cc
@@ -114,12 +114,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -132,7 +132,7 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
if (restartTime > 0)
{
using IOFields = GetPropType<TypeTag, Properties::IOFields>;
@@ -140,7 +140,7 @@ int main(int argc, char** argv) try
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
const auto fileName = getParam<std::string>("Restart.File");
- loadSolution(x, fileName, createPVNameFunction<IOFields, PrimaryVariables, ModelTraits, FluidSystem>(), *fvGridGeometry);
+ loadSolution(x, fileName, createPVNameFunction<IOFields, PrimaryVariables, ModelTraits, FluidSystem>(), *gridGeometry);
}
else
problem->applyInitialSolution(x);
@@ -152,7 +152,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -173,11 +173,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/2p/implicit/incompressible/problem.hh b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
index 04552265d6..1b64ca9dc5 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
@@ -130,8 +130,8 @@ class TwoPTestProblem : public PorousMediumFlowProblem<TypeTag>
};
public:
- TwoPTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ TwoPTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry) {}
/*!
* \brief Specifies which kind of boundary condition should be
diff --git a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
index b9c9c70c35..d0912b6fee 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
@@ -57,8 +57,8 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = Scalar;
- TwoPTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TwoPTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
lensIsOilWet_ = getParam<bool>("SpatialParams.LensIsOilWet", false);
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/main.cc b/test/porousmediumflow/2p/implicit/nonisothermal/main.cc
index facefead0e..27c2bbb504 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/main.cc
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/main.cc
@@ -105,22 +105,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -143,7 +143,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::ILU0BiCGSTABBackend;
@@ -155,7 +155,7 @@ int main(int argc, char** argv) try
//the convergence writer
using NewtonConvergenceWriter = Dumux::NewtonConvergenceWriter<GridGeometry, SolutionVector>;
- auto convergenceWriter = std::make_shared<NewtonConvergenceWriter>(*fvGridGeometry);
+ auto convergenceWriter = std::make_shared<NewtonConvergenceWriter>(*gridGeometry);
nonLinearSolver.attachConvergenceWriter(convergenceWriter);
// time loop
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
index eb05dbd319..bbd97e0d70 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
@@ -158,8 +158,8 @@ class InjectionProblem2PNI : public PorousMediumFlowProblem<TypeTag>
using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
public:
- InjectionProblem2PNI(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ InjectionProblem2PNI(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
maxDepth_ = 2700.0; // [m]
diff --git a/test/porousmediumflow/2p1c/implicit/main.cc b/test/porousmediumflow/2p1c/implicit/main.cc
index e19de9ef41..beb0ebb083 100644
--- a/test/porousmediumflow/2p1c/implicit/main.cc
+++ b/test/porousmediumflow/2p1c/implicit/main.cc
@@ -85,22 +85,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -121,7 +121,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/2p1c/implicit/problem.hh b/test/porousmediumflow/2p1c/implicit/problem.hh
index 1ad59462fc..e779b9732c 100644
--- a/test/porousmediumflow/2p1c/implicit/problem.hh
+++ b/test/porousmediumflow/2p1c/implicit/problem.hh
@@ -129,8 +129,8 @@ class InjectionProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- InjectionProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ InjectionProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{ FluidSystem::init(); }
/*!
diff --git a/test/porousmediumflow/2p1c/implicit/spatialparams.hh b/test/porousmediumflow/2p1c/implicit/spatialparams.hh
index 3546b4766d..b298ab78a1 100644
--- a/test/porousmediumflow/2p1c/implicit/spatialparams.hh
+++ b/test/porousmediumflow/2p1c/implicit/spatialparams.hh
@@ -60,8 +60,8 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = DimWorldMatrix;
- InjectionProblemSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ InjectionProblemSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
gasWetting_ = getParam<bool>("SpatialParams.GasWetting", false);
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/main.cc b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/main.cc
index 722452b0ce..4b9a47339a 100644
--- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/main.cc
+++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/main.cc
@@ -106,22 +106,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
problem->setGridVariables(gridVariables);
@@ -148,11 +148,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NonEquilibriumNewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh
index 92686f722c..0994bf5b9e 100644
--- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh
+++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh
@@ -150,8 +150,8 @@ class TwoPTwoCChemicalNonequilibriumProblem : public PorousMediumFlowProblem<Typ
static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box;
enum { dofCodim = isBox ? dim : 0 };
public:
- TwoPTwoCChemicalNonequilibriumProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TwoPTwoCChemicalNonequilibriumProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
temperature_ = 273.15 + 25; // -> 25°C
diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
index 3c5062537b..a8fb9a3f61 100644
--- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh
@@ -73,8 +73,8 @@ public:
using AwnSurface = EffToAbsLawIA<EffectiveIALawAwn, MaterialLawParams>;
using AwnSurfaceParams = typename AwnSurface::Params;
- TwoPTwoCChemicalNonequilibriumSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TwoPTwoCChemicalNonequilibriumSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// intrinsic permeabilities
coarseK_ = 1e-11;
diff --git a/test/porousmediumflow/2p2c/implicit/injection/main.cc b/test/porousmediumflow/2p2c/implicit/injection/main.cc
index da8ea2b73d..94f5f62a1b 100644
--- a/test/porousmediumflow/2p2c/implicit/injection/main.cc
+++ b/test/porousmediumflow/2p2c/implicit/injection/main.cc
@@ -81,12 +81,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -99,7 +99,7 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
if (restartTime > 0)
{
using IOFields = GetPropType<TypeTag, Properties::IOFields>;
@@ -108,7 +108,7 @@ int main(int argc, char** argv) try
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
const auto fileName = getParam<std::string>("Restart.File");
const auto pvName = createPVNameFunction<IOFields, PrimaryVariables, ModelTraits, FluidSystem>();
- loadSolution(x, fileName, pvName, *fvGridGeometry);
+ loadSolution(x, fileName, pvName, *gridGeometry);
}
else
problem->applyInitialSolution(x);
@@ -116,7 +116,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -133,11 +133,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/2p2c/implicit/injection/problem.hh b/test/porousmediumflow/2p2c/implicit/injection/problem.hh
index cf014371a9..5f2db92770 100644
--- a/test/porousmediumflow/2p2c/implicit/injection/problem.hh
+++ b/test/porousmediumflow/2p2c/implicit/injection/problem.hh
@@ -190,8 +190,8 @@ class InjectionProblem : public PorousMediumFlowProblem<TypeTag>
static constexpr bool useMoles = ModelTraits::useMoles();
public:
- InjectionProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ InjectionProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
nTemperature_ = getParam<int>("Problem.NTemperature");
nPressure_ = getParam<int>("Problem.NPressure");
diff --git a/test/porousmediumflow/2p2c/implicit/injection/spatialparams.hh b/test/porousmediumflow/2p2c/implicit/injection/spatialparams.hh
index 7e75bbe245..d23d12282e 100644
--- a/test/porousmediumflow/2p2c/implicit/injection/spatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/injection/spatialparams.hh
@@ -62,8 +62,8 @@ public:
using MaterialLaw = EffToAbsLaw<EffectiveLaw>;
using MaterialLawParams = typename MaterialLaw::Params;
- InjectionSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ InjectionSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
layerBottom_ = 22.5;
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/main.cc b/test/porousmediumflow/2p2c/implicit/mpnccomparison/main.cc
index 045ef40e2b..bafd1a872c 100644
--- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/main.cc
+++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/main.cc
@@ -106,22 +106,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -144,11 +144,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh b/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh
index d12b6958f6..2d9cc9fec1 100644
--- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh
+++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh
@@ -124,8 +124,8 @@ class TwoPTwoCComparisonProblem : public PorousMediumFlowProblem<TypeTag>
using Indices = typename ModelTraits::Indices;
public:
- TwoPTwoCComparisonProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TwoPTwoCComparisonProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
temperature_ = 273.15 + 25; // -> 25°C
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/spatialparams.hh b/test/porousmediumflow/2p2c/implicit/mpnccomparison/spatialparams.hh
index 547afc6f3d..d984c54cb9 100644
--- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/spatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/spatialparams.hh
@@ -65,7 +65,7 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
- TwoPTwoCComparisonSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry) : ParentType(fvGridGeometry)
+ TwoPTwoCComparisonSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry) : ParentType(gridGeometry)
{
// intrinsic permeabilities
coarseK_ = 1e-12;
diff --git a/test/porousmediumflow/2p2c/implicit/waterair/main.cc b/test/porousmediumflow/2p2c/implicit/waterair/main.cc
index 2fcac08c63..c3d685aac6 100644
--- a/test/porousmediumflow/2p2c/implicit/waterair/main.cc
+++ b/test/porousmediumflow/2p2c/implicit/waterair/main.cc
@@ -81,12 +81,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -99,7 +99,7 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
if (restartTime > 0)
{
using IOFields = GetPropType<TypeTag, Properties::IOFields>;
@@ -108,7 +108,7 @@ int main(int argc, char** argv) try
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
const auto fileName = getParam<std::string>("Restart.File");
const auto pvName = createPVNameFunction<IOFields, PrimaryVariables, ModelTraits, FluidSystem>();
- loadSolution(x, fileName, pvName, *fvGridGeometry);
+ loadSolution(x, fileName, pvName, *gridGeometry);
}
else
problem->applyInitialSolution(x);
@@ -116,7 +116,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -133,11 +133,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/2p2c/implicit/waterair/problem.hh b/test/porousmediumflow/2p2c/implicit/waterair/problem.hh
index 4650937469..9a7cd74fea 100644
--- a/test/porousmediumflow/2p2c/implicit/waterair/problem.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterair/problem.hh
@@ -158,8 +158,8 @@ class WaterAirProblem : public PorousMediumFlowProblem<TypeTag>
static constexpr bool useMoles = ModelTraits::useMoles();
public:
- WaterAirProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ WaterAirProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
maxDepth_ = 1000.0; // [m]
diff --git a/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh b/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh
index d0d99ef0c4..ed0bbe01f9 100644
--- a/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh
@@ -64,7 +64,7 @@ public:
using MaterialLaw = EffToAbsLaw<EffectiveLaw>;
using MaterialLawParams = typename MaterialLaw::Params;
- WaterAirSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry) : ParentType(fvGridGeometry)
+ WaterAirSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry) : ParentType(gridGeometry)
{
layerBottom_ = 22.0;
diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/main.cc b/test/porousmediumflow/2pnc/implicit/diffusion/main.cc
index e40c4e32c9..7e980f260b 100644
--- a/test/porousmediumflow/2pnc/implicit/diffusion/main.cc
+++ b/test/porousmediumflow/2pnc/implicit/diffusion/main.cc
@@ -103,22 +103,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -141,11 +141,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh b/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh
index be54a705e0..91dbd1d199 100644
--- a/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh
+++ b/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh
@@ -122,8 +122,8 @@ class TwoPNCDiffusionProblem : public PorousMediumFlowProblem<TypeTag>
static constexpr bool useMoles = getPropValue<TypeTag, Properties::UseMoles>();
public:
- TwoPNCDiffusionProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TwoPNCDiffusionProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// initialize the tables of the fluid system
FluidSystem::init();
diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/spatialparams.hh b/test/porousmediumflow/2pnc/implicit/diffusion/spatialparams.hh
index 898b6666a0..dcbcfce6cf 100644
--- a/test/porousmediumflow/2pnc/implicit/diffusion/spatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/diffusion/spatialparams.hh
@@ -63,8 +63,8 @@ public:
using MaterialLaw = EffToAbsLaw<EffectiveLaw>;
using MaterialLawParams = typename MaterialLaw::Params;
- TwoPNCDiffusionSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), K_(0)
+ TwoPNCDiffusionSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), K_(0)
{
// intrinsic permeabilities
K_[0][0] = 5e-11;
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/main.cc b/test/porousmediumflow/2pnc/implicit/fuelcell/main.cc
index 1ff8919f43..9aad61b7fb 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcell/main.cc
+++ b/test/porousmediumflow/2pnc/implicit/fuelcell/main.cc
@@ -103,22 +103,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -142,11 +142,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh b/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh
index 8a1fdf72e0..5d8843c106 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh
@@ -134,8 +134,8 @@ class FuelCellProblem : public PorousMediumFlowProblem<TypeTag>
enum { dofCodim = isBox ? dim : 0 };
public:
- FuelCellProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ FuelCellProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
nTemperature_ = getParam<int>("Problem.NTemperature");
nPressure_ = getParam<int>("Problem.NPressure");
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh b/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh
index 525a4383e9..668a1cde91 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh
@@ -62,8 +62,8 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = DimWorldMatrix;
- FuelCellSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), K_(0)
+ FuelCellSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), K_(0)
{
// intrinsic permeabilities
K_[0][0] = 5e-11;
diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/main.cc b/test/porousmediumflow/2pncmin/implicit/isothermal/main.cc
index a8295d74d4..3e0868b320 100644
--- a/test/porousmediumflow/2pncmin/implicit/isothermal/main.cc
+++ b/test/porousmediumflow/2pncmin/implicit/isothermal/main.cc
@@ -104,12 +104,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -122,7 +122,7 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
if (restartTime > 0)
{
using IOFields = GetPropType<TypeTag, Properties::IOFields>;
@@ -132,7 +132,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, *fvGridGeometry);
+ loadSolution(x, fileName, pvName, *gridGeometry);
}
else
problem->applyInitialSolution(x);
@@ -140,7 +140,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// initialize the vtk output module
@@ -161,11 +161,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh b/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh
index ea699d4ba9..c69c5ca7f1 100644
--- a/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh
+++ b/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh
@@ -185,8 +185,8 @@ class DissolutionProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename SubControlVolume::GlobalPosition;
public:
- DissolutionProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ DissolutionProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
outerSalinity_ = getParam<Scalar>("Problem.OuterSalinity");
temperature_ = getParam<Scalar>("Problem.Temperature");
@@ -210,7 +210,7 @@ public:
name_ = getParam<std::string>("Problem.Name");
unsigned int codim = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box ? dim : 0;
- permeability_.resize(fvGridGeometry->gridView().size(codim));
+ permeability_.resize(gridGeometry->gridView().size(codim));
FluidSystem::init(/*Tmin=*/temperatureLow_,
/*Tmax=*/temperatureHigh_,
diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh b/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh
index 0318990555..bcdb15a870 100644
--- a/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh
+++ b/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh
@@ -64,8 +64,8 @@ public:
using MaterialLaw = EffToAbsLaw<EffectiveLaw>;
using MaterialLawParams = typename MaterialLaw::Params;
- DissolutionSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ DissolutionSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
solubilityLimit_ = getParam<Scalar>("SpatialParams.SolubilityLimit", 0.26);
referencePorosity_ = getParam<Scalar>("SpatialParams.referencePorosity", 0.11);
diff --git a/test/porousmediumflow/3p/implicit/conduction/main.cc b/test/porousmediumflow/3p/implicit/conduction/main.cc
index 8091e6b5b3..43232452cc 100644
--- a/test/porousmediumflow/3p/implicit/conduction/main.cc
+++ b/test/porousmediumflow/3p/implicit/conduction/main.cc
@@ -110,22 +110,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -151,11 +151,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/3p/implicit/conduction/problem.hh b/test/porousmediumflow/3p/implicit/conduction/problem.hh
index f7e5c36383..162ed18bc5 100644
--- a/test/porousmediumflow/3p/implicit/conduction/problem.hh
+++ b/test/porousmediumflow/3p/implicit/conduction/problem.hh
@@ -139,15 +139,15 @@ class ThreePNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- ThreePNIConductionProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ ThreePNIConductionProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
//initialize fluid system
FluidSystem::init();
name_ = getParam<std::string>("Problem.Name");
temperatureHigh_ = 300.0;
- temperatureExact_.resize(fvGridGeometry->numDofs());
+ temperatureExact_.resize(gridGeometry->numDofs());
}
//! Get the analytical temperature
diff --git a/test/porousmediumflow/3p/implicit/conduction/spatialparams.hh b/test/porousmediumflow/3p/implicit/conduction/spatialparams.hh
index d9a8a10180..6fa0971a8e 100644
--- a/test/porousmediumflow/3p/implicit/conduction/spatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/conduction/spatialparams.hh
@@ -60,8 +60,8 @@ public:
using MaterialLaw = EffToAbsLaw<EffectiveLaw>;
using MaterialLawParams = typename MaterialLaw::Params;
- ThreePNISpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ ThreePNISpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = 1e-10;
porosity_ = 0.4;
diff --git a/test/porousmediumflow/3p/implicit/convection/main.cc b/test/porousmediumflow/3p/implicit/convection/main.cc
index 902cc808e6..9262a76fea 100644
--- a/test/porousmediumflow/3p/implicit/convection/main.cc
+++ b/test/porousmediumflow/3p/implicit/convection/main.cc
@@ -110,22 +110,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -151,11 +151,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/3p/implicit/convection/problem.hh b/test/porousmediumflow/3p/implicit/convection/problem.hh
index a820d7c060..ac7f00a36e 100644
--- a/test/porousmediumflow/3p/implicit/convection/problem.hh
+++ b/test/porousmediumflow/3p/implicit/convection/problem.hh
@@ -149,8 +149,8 @@ class ThreePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename SubControlVolumeFace::GlobalPosition;
public:
- ThreePNIConvectionProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ ThreePNIConvectionProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
//initialize fluid system
FluidSystem::init();
diff --git a/test/porousmediumflow/3p/implicit/infiltration/main.cc b/test/porousmediumflow/3p/implicit/infiltration/main.cc
index 2a24e03a46..9aed50b55f 100644
--- a/test/porousmediumflow/3p/implicit/infiltration/main.cc
+++ b/test/porousmediumflow/3p/implicit/infiltration/main.cc
@@ -110,22 +110,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -148,11 +148,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/3p/implicit/infiltration/problem.hh b/test/porousmediumflow/3p/implicit/infiltration/problem.hh
index 226118fa6d..8c936d70a3 100644
--- a/test/porousmediumflow/3p/implicit/infiltration/problem.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration/problem.hh
@@ -147,8 +147,8 @@ class InfiltrationThreePProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- InfiltrationThreePProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ InfiltrationThreePProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
temperature_ = 273.15 + 10.0; // -> 10 degrees Celsius
FluidSystem::init(282.15, 284.15, 3, 8e4, 3e5, 200);
diff --git a/test/porousmediumflow/3p/implicit/infiltration/spatialparams.hh b/test/porousmediumflow/3p/implicit/infiltration/spatialparams.hh
index db13edc0fb..6fe052f318 100644
--- a/test/porousmediumflow/3p/implicit/infiltration/spatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration/spatialparams.hh
@@ -63,8 +63,8 @@ public:
using MaterialLaw = EffToAbsLaw<EffectiveLaw>;
using MaterialLawParams = typename MaterialLaw::Params;
- InfiltrationThreePSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ InfiltrationThreePSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// intrinsic permeabilities
fineK_ = getParam<Scalar>("SpatialParams.permeability");
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/main.cc b/test/porousmediumflow/3p3c/implicit/columnxylol/main.cc
index 6b88ed62dc..ea6edcb404 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylol/main.cc
+++ b/test/porousmediumflow/3p3c/implicit/columnxylol/main.cc
@@ -108,22 +108,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -147,11 +147,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh b/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh
index d6510a0a59..4b372c502e 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh
@@ -166,8 +166,8 @@ class ColumnProblem : public PorousMediumFlowProblem<TypeTag>
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
public:
- ColumnProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ ColumnProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
FluidSystem::init();
name_ = getParam<std::string>("Problem.Name");
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/spatialparams.hh b/test/porousmediumflow/3p3c/implicit/columnxylol/spatialparams.hh
index 6fb15ea397..4de10b8032 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylol/spatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylol/spatialparams.hh
@@ -57,8 +57,8 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = Scalar;
- ColumnSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ ColumnSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// intrinsic permeabilities
fineK_ = 1.4e-11;
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/main.cc b/test/porousmediumflow/3p3c/implicit/infiltration/main.cc
index 6b88ed62dc..ea6edcb404 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltration/main.cc
+++ b/test/porousmediumflow/3p3c/implicit/infiltration/main.cc
@@ -108,22 +108,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -147,11 +147,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh b/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh
index 99dfcbc5c7..5190809698 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh
@@ -144,8 +144,8 @@ class InfiltrationThreePThreeCProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- InfiltrationThreePThreeCProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ InfiltrationThreePThreeCProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
temperature_ = 273.15 + 10.0; // -> 10 degrees Celsius
FluidSystem::init(/*tempMin=*/temperature_ - 1,
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/spatialparams.hh b/test/porousmediumflow/3p3c/implicit/infiltration/spatialparams.hh
index d9c74b0bf5..2b7f665c55 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltration/spatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltration/spatialparams.hh
@@ -60,8 +60,8 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = Scalar;
- InfiltrationThreePThreeCSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ InfiltrationThreePThreeCSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// intrinsic permeabilities
fineK_ = 1.e-11;
diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/main.cc b/test/porousmediumflow/3p3c/implicit/kuevette/main.cc
index 6b88ed62dc..ea6edcb404 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevette/main.cc
+++ b/test/porousmediumflow/3p3c/implicit/kuevette/main.cc
@@ -108,22 +108,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -147,11 +147,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh b/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh
index 752d26f862..dbda4c15f6 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh
@@ -155,8 +155,8 @@ class KuevetteProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename SubControlVolumeFace::GlobalPosition;
public:
- KuevetteProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ KuevetteProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
FluidSystem::init();
name_ = getParam<std::string>("Problem.Name");
diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/spatialparams.hh b/test/porousmediumflow/3p3c/implicit/kuevette/spatialparams.hh
index 3ae61646f2..4f9bb865bb 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevette/spatialparams.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevette/spatialparams.hh
@@ -61,8 +61,8 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = Scalar;
- KuevetteSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ KuevetteSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// intrinsic permeabilities
fineK_ = 6.28e-12;
diff --git a/test/porousmediumflow/3pwateroil/implicit/main.cc b/test/porousmediumflow/3pwateroil/implicit/main.cc
index eb8f4b99a4..6733382473 100644
--- a/test/porousmediumflow/3pwateroil/implicit/main.cc
+++ b/test/porousmediumflow/3pwateroil/implicit/main.cc
@@ -108,22 +108,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -147,11 +147,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/3pwateroil/implicit/problem.hh b/test/porousmediumflow/3pwateroil/implicit/problem.hh
index 861806972b..2e7baddc8b 100644
--- a/test/porousmediumflow/3pwateroil/implicit/problem.hh
+++ b/test/porousmediumflow/3pwateroil/implicit/problem.hh
@@ -136,8 +136,8 @@ class SagdProblem : public PorousMediumFlowProblem<TypeTag>
public:
- SagdProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), pOut_(4e6)
+ SagdProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), pOut_(4e6)
{
maxDepth_ = 400.0; // [m]
FluidSystem::init();
diff --git a/test/porousmediumflow/3pwateroil/implicit/spatialparams.hh b/test/porousmediumflow/3pwateroil/implicit/spatialparams.hh
index 61adfae29b..94790c0357 100644
--- a/test/porousmediumflow/3pwateroil/implicit/spatialparams.hh
+++ b/test/porousmediumflow/3pwateroil/implicit/spatialparams.hh
@@ -64,8 +64,8 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = Scalar;
- SagdSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), eps_(1e-6)
+ SagdSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), eps_(1e-6)
{
layerBottom_ = 35.0;
diff --git a/test/porousmediumflow/co2/implicit/main.cc b/test/porousmediumflow/co2/implicit/main.cc
index 55f579dac8..7c18c0909d 100644
--- a/test/porousmediumflow/co2/implicit/main.cc
+++ b/test/porousmediumflow/co2/implicit/main.cc
@@ -80,26 +80,26 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the spatial parameters
using SpatialParams = GetPropType<TypeTag, Properties::SpatialParams>;
- auto spatialParams = std::make_shared<SpatialParams>(fvGridGeometry, gridManager.getGridData());
+ auto spatialParams = std::make_shared<SpatialParams>(gridGeometry, gridManager.getGridData());
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry, spatialParams);
+ auto problem = std::make_shared<Problem>(gridGeometry, spatialParams);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -123,11 +123,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/co2/implicit/problem.hh b/test/porousmediumflow/co2/implicit/problem.hh
index ce0f819baa..cbeb37669a 100644
--- a/test/porousmediumflow/co2/implicit/problem.hh
+++ b/test/porousmediumflow/co2/implicit/problem.hh
@@ -223,8 +223,8 @@ class HeterogeneousProblem : public PorousMediumFlowProblem<TypeTag>
public:
template<class SpatialParams>
- HeterogeneousProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, std::shared_ptr<SpatialParams> spatialParams)
- : ParentType(fvGridGeometry, spatialParams)
+ HeterogeneousProblem(std::shared_ptr<const GridGeometry> gridGeometry, std::shared_ptr<SpatialParams> spatialParams)
+ : ParentType(gridGeometry, spatialParams)
, injectionTop_(1)
, injectionBottom_(2)
, dirichletBoundary_(3)
diff --git a/test/porousmediumflow/co2/implicit/spatialparams.hh b/test/porousmediumflow/co2/implicit/spatialparams.hh
index b37079e7fc..d858b2dab7 100644
--- a/test/porousmediumflow/co2/implicit/spatialparams.hh
+++ b/test/porousmediumflow/co2/implicit/spatialparams.hh
@@ -64,9 +64,9 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using PermeabilityType = Scalar;
- HeterogeneousSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry,
+ HeterogeneousSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry,
std::shared_ptr<const GridData<Grid>> gridData)
- : ParentType(fvGridGeometry), gridData_(gridData)
+ : ParentType(gridGeometry), gridData_(gridData)
{
// Set the permeability for the layers
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc
index 610e9e6d2a..2bae1e10dc 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc
@@ -112,22 +112,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -150,11 +150,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
index 374ce741bb..64d20457b4 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
@@ -137,8 +137,8 @@ class MPNCComparisonProblem
static constexpr bool isBox = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box;
public:
- MPNCComparisonProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ MPNCComparisonProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
temperature_ = 273.15 + 25; // -> 25°C
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/spatialparams.hh
index cac4a0c330..b3697ee9d1 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/spatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/spatialparams.hh
@@ -60,7 +60,7 @@ public:
using MaterialLaw = EffToAbsLaw<EffectiveLaw>;
using MaterialLawParams = typename MaterialLaw::Params;
- MPNCComparisonSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry) : ParentType(fvGridGeometry)
+ MPNCComparisonSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry) : ParentType(gridGeometry)
{
// intrinsic permeabilities
coarseK_ = 1e-12;
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/main.cc b/test/porousmediumflow/mpnc/implicit/kinetic/main.cc
index c3bc2cfdc5..9daf38b6e3 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/main.cc
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/main.cc
@@ -109,12 +109,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using GridView = GetPropType<TypeTag, Properties::GridView>;
@@ -125,7 +125,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
problem->setGridVariables(gridVariables);
@@ -149,11 +149,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NonEquilibriumNewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
index 718f5cb03b..c7cc923f72 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh
@@ -81,8 +81,8 @@ public:
using AwsSurfaceParams = typename AwsSurface::Params;
using AnsSurfaceParams = typename AnsSurface::Params;
- EvaporationAtmosphereSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ EvaporationAtmosphereSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
heightPM_ = getParam<std::vector<Scalar>>("Grid.Positions1")[1];
heightDomain_ = getParam<std::vector<Scalar>>("Grid.Positions1")[2];
diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/main.cc b/test/porousmediumflow/mpnc/implicit/obstacle/main.cc
index 610e9e6d2a..2bae1e10dc 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacle/main.cc
+++ b/test/porousmediumflow/mpnc/implicit/obstacle/main.cc
@@ -112,22 +112,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -150,11 +150,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
index 1a494e4ff0..6f6ab94d2d 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
@@ -161,8 +161,8 @@ class ObstacleProblem
using PhaseVector = Dune::FieldVector<Scalar, numPhases>;
public:
- ObstacleProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ ObstacleProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
temperature_ = 273.15 + 25; // -> 25°C
diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh
index f123a03d22..1272af0a7e 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh
@@ -60,7 +60,7 @@ public:
using MaterialLaw = EffToAbsLaw<EffectiveLaw>;
using MaterialLawParams = typename MaterialLaw::Params;
- ObstacleSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry) : ParentType(fvGridGeometry)
+ ObstacleSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry) : ParentType(gridGeometry)
{
// intrinsic permeabilities
coarseK_ = 1e-12;
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc
index 673229c28a..9f8d215c76 100644
--- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc
@@ -109,22 +109,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
problem->setGridVariables(gridVariables);
@@ -148,11 +148,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NonEquilibriumNewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
index 70fe4bcc15..47999c82dd 100644
--- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh
@@ -67,7 +67,7 @@ public:
using MaterialLawParams = typename MaterialLaw::Params;
using FluidSolidInterfacialAreaFormulation = FluidSolidInterfacialAreaShiWang<Scalar>;
- CombustionSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry) : ParentType(fvGridGeometry)
+ CombustionSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry) : ParentType(gridGeometry)
{
// this is the parameter value from file part
porosity_ = getParam<Scalar>("SpatialParams.PorousMedium.porosity");
diff --git a/test/porousmediumflow/richards/implicit/analytical/main.cc b/test/porousmediumflow/richards/implicit/analytical/main.cc
index 1d2d805cd9..4769399d66 100644
--- a/test/porousmediumflow/richards/implicit/analytical/main.cc
+++ b/test/porousmediumflow/richards/implicit/analytical/main.cc
@@ -106,22 +106,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -144,7 +144,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/richards/implicit/analytical/problem.hh b/test/porousmediumflow/richards/implicit/analytical/problem.hh
index 65ec54aa06..5f240079e2 100644
--- a/test/porousmediumflow/richards/implicit/analytical/problem.hh
+++ b/test/porousmediumflow/richards/implicit/analytical/problem.hh
@@ -125,8 +125,8 @@ class RichardsAnalyticalProblem : public PorousMediumFlowProblem<TypeTag>
using Geometry = typename GridView::template Codim<0>::Entity::Geometry;
public:
- RichardsAnalyticalProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RichardsAnalyticalProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
pnRef_ = 1e5; // air pressure
name_ = getParam<std::string>("Problem.Name");
diff --git a/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh b/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh
index 94036ca671..3f384608b2 100644
--- a/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh
@@ -64,8 +64,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- RichardsAnalyticalSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RichardsAnalyticalSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
K_ = 5e-12;
materialParams_.setSwr(0.0);
diff --git a/test/porousmediumflow/richards/implicit/lens/main.cc b/test/porousmediumflow/richards/implicit/lens/main.cc
index 1b69831cf2..3c461e469a 100644
--- a/test/porousmediumflow/richards/implicit/lens/main.cc
+++ b/test/porousmediumflow/richards/implicit/lens/main.cc
@@ -86,12 +86,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// check if we are about to restart a previously interrupted simulation
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -99,7 +99,7 @@ int main(int argc, char** argv) try
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
if (restartTime > 0)
{
using IOFields = GetPropType<TypeTag, Properties::IOFields>;
@@ -107,7 +107,7 @@ int main(int argc, char** argv) try
using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
using FluidSystem = GetPropType<TypeTag, Properties::FluidSystem>;
const auto fileName = getParam<std::string>("Restart.File");
- loadSolution(x, fileName, createPVNameFunction<IOFields, PrimaryVariables, ModelTraits, FluidSystem>(), *fvGridGeometry);
+ loadSolution(x, fileName, createPVNameFunction<IOFields, PrimaryVariables, ModelTraits, FluidSystem>(), *gridGeometry);
}
else
{
@@ -118,7 +118,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -140,11 +140,11 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using Assembler = FVAssembler<TypeTag, DIFFMETHOD>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::RichardsNewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/richards/implicit/lens/problem.hh b/test/porousmediumflow/richards/implicit/lens/problem.hh
index f689ed692c..779e80aeeb 100644
--- a/test/porousmediumflow/richards/implicit/lens/problem.hh
+++ b/test/porousmediumflow/richards/implicit/lens/problem.hh
@@ -133,8 +133,8 @@ class RichardsLensProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- RichardsLensProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RichardsLensProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
name_ = getParam<std::string>("Problem.Name");
}
diff --git a/test/porousmediumflow/richards/implicit/lens/spatialparams.hh b/test/porousmediumflow/richards/implicit/lens/spatialparams.hh
index d804f09e61..100ecb90da 100644
--- a/test/porousmediumflow/richards/implicit/lens/spatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/lens/spatialparams.hh
@@ -57,8 +57,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- RichardsLensSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RichardsLensSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
lensLowerLeft_ = {1.0, 2.0};
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc
index f050cffb18..0655c611bc 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc
@@ -106,22 +106,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -145,7 +145,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
index 3b982ffe59..50168159a9 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
@@ -133,15 +133,15 @@ class RichardsNIConductionProblem :public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- RichardsNIConductionProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RichardsNIConductionProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
//initialize fluid system
FluidSystem::init();
name_ = getParam<std::string>("Problem.Name");
temperatureHigh_ = 300.;
- temperatureExact_.resize(fvGridGeometry->numDofs());
+ temperatureExact_.resize(gridGeometry->numDofs());
}
//! Get the analytical temperature
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc b/test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc
index f050cffb18..0655c611bc 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc
@@ -106,22 +106,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -145,7 +145,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
index f911940436..ef57233b77 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
@@ -141,8 +141,8 @@ class RichardsNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename SubControlVolumeFace::GlobalPosition;
public:
- RichardsNIConvectionProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RichardsNIConvectionProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// initialize fluid system
FluidSystem::init();
@@ -153,7 +153,7 @@ public:
temperatureLow_ = 290.;
pressureHigh_ = 2e5;
pressureLow_ = 1e5;
- temperatureExact_.resize(fvGridGeometry->numDofs());
+ temperatureExact_.resize(gridGeometry->numDofs());
}
//! Get the analytical temperature
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc
index f5f26f2dd1..7fa13f7e18 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc
@@ -80,22 +80,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -118,7 +118,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh
index b40e3b6de0..cadba22725 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh
@@ -130,8 +130,8 @@ class RichardsNIEvaporationProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename SubControlVolumeFace::GlobalPosition;
public:
- RichardsNIEvaporationProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RichardsNIEvaporationProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// initialize fluid system
FluidSystem::init();
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh b/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh
index 09fd0e6850..6b6da0eb44 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh
@@ -58,8 +58,8 @@ public:
using MaterialLaw = EffToAbsLaw<EffectiveLaw>;
using MaterialLawParams = typename MaterialLaw::Params;
- RichardsNISpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RichardsNISpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
permeability_ = 1e-10;
porosity_ = 0.4;
diff --git a/test/porousmediumflow/richardsnc/implicit/main.cc b/test/porousmediumflow/richardsnc/implicit/main.cc
index a594379949..584db772ad 100644
--- a/test/porousmediumflow/richardsnc/implicit/main.cc
+++ b/test/porousmediumflow/richardsnc/implicit/main.cc
@@ -106,23 +106,23 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
problem->computePointSourceMap(); // enable point sources
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -145,7 +145,7 @@ 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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = Dumux::ILU0BiCGSTABBackend;
diff --git a/test/porousmediumflow/richardsnc/implicit/problem.hh b/test/porousmediumflow/richardsnc/implicit/problem.hh
index 429e1a779e..9020c3d496 100644
--- a/test/porousmediumflow/richardsnc/implicit/problem.hh
+++ b/test/porousmediumflow/richardsnc/implicit/problem.hh
@@ -134,8 +134,8 @@ class RichardsWellTracerProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename SubControlVolume::GlobalPosition;
public:
- RichardsWellTracerProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RichardsWellTracerProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
name_ = getParam<std::string>("Problem.Name");
contaminantMoleFraction_ = getParam<Scalar>("Problem.ContaminantMoleFraction");
diff --git a/test/porousmediumflow/richardsnc/implicit/spatialparams.hh b/test/porousmediumflow/richardsnc/implicit/spatialparams.hh
index 4878489ec5..a1ce847777 100644
--- a/test/porousmediumflow/richardsnc/implicit/spatialparams.hh
+++ b/test/porousmediumflow/richardsnc/implicit/spatialparams.hh
@@ -62,8 +62,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- RichardsWellTracerSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ RichardsWellTracerSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
lensLowerLeft_ = getParam<GlobalPosition>("Problem.LensLowerLeft");
diff --git a/test/porousmediumflow/solidenergy/main.cc b/test/porousmediumflow/solidenergy/main.cc
index 43ae5042b1..b21bd4ea4e 100644
--- a/test/porousmediumflow/solidenergy/main.cc
+++ b/test/porousmediumflow/solidenergy/main.cc
@@ -108,12 +108,12 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// get some time loop parameters
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -128,7 +128,7 @@ int main(int argc, char** argv) try
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// intialize the vtk output module
@@ -147,11 +147,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/solidenergy/problem.hh b/test/porousmediumflow/solidenergy/problem.hh
index 896b4243f9..997439d4e8 100644
--- a/test/porousmediumflow/solidenergy/problem.hh
+++ b/test/porousmediumflow/solidenergy/problem.hh
@@ -59,8 +59,8 @@ class SolidEnergyProblem : public PorousMediumFlowProblem<TypeTag>
using PointSource = GetPropType<TypeTag, Properties::PointSource>;
public:
- SolidEnergyProblem(std::shared_ptr<const GridGeometry> fvGridGeometry, const std::string& paramGroup = "")
- : ParentType(fvGridGeometry, paramGroup)
+ SolidEnergyProblem(std::shared_ptr<const GridGeometry> gridGeometry, const std::string& paramGroup = "")
+ : ParentType(gridGeometry, paramGroup)
{
name_ = getParam<std::string>("Problem.Name");
temperatureHigh_ = getParam<Scalar>("Problem.TemperatureHigh");
diff --git a/test/porousmediumflow/solidenergy/spatialparams.hh b/test/porousmediumflow/solidenergy/spatialparams.hh
index 7090dee1a5..5e6bcd332f 100644
--- a/test/porousmediumflow/solidenergy/spatialparams.hh
+++ b/test/porousmediumflow/solidenergy/spatialparams.hh
@@ -45,8 +45,8 @@ class SolidEnergySpatialParams
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- SolidEnergySpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ SolidEnergySpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry) {}
/*!
* \brief Define the porosity \f$\mathrm{[-]}\f$.
diff --git a/test/porousmediumflow/tracer/1ptracer/main.cc b/test/porousmediumflow/tracer/1ptracer/main.cc
index b6ee7b9578..c9ad6c6e4e 100644
--- a/test/porousmediumflow/tracer/1ptracer/main.cc
+++ b/test/porousmediumflow/tracer/1ptracer/main.cc
@@ -88,12 +88,12 @@ int main(int argc, char** argv) try
//! create the finite volume grid geometry
using GridGeometry = GetPropType<OnePTypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
//! the problem (boundary conditions)
using OnePProblem = GetPropType<OnePTypeTag, Properties::Problem>;
- auto problemOneP = std::make_shared<OnePProblem>(fvGridGeometry);
+ auto problemOneP = std::make_shared<OnePProblem>(gridGeometry);
//! the solution vector
using SolutionVector = GetPropType<OnePTypeTag, Properties::SolutionVector>;
@@ -101,12 +101,12 @@ int main(int argc, char** argv) try
//! the grid variables
using OnePGridVariables = GetPropType<OnePTypeTag, Properties::GridVariables>;
- auto onePGridVariables = std::make_shared<OnePGridVariables>(problemOneP, fvGridGeometry);
+ auto onePGridVariables = std::make_shared<OnePGridVariables>(problemOneP, gridGeometry);
onePGridVariables->init(p);
//! the assembler
using OnePAssembler = FVAssembler<OnePTypeTag, DiffMethod::analytic>;
- auto assemblerOneP = std::make_shared<OnePAssembler>(problemOneP, fvGridGeometry, onePGridVariables);
+ auto assemblerOneP = std::make_shared<OnePAssembler>(problemOneP, gridGeometry, onePGridVariables);
//! the linear solver
using OnePLinearSolver = UMFPackBackend;
@@ -135,13 +135,13 @@ int main(int argc, char** argv) try
// compute volume fluxes for the tracer model
////////////////////////////////////////////////////////////
using Scalar = GetPropType<OnePTypeTag, Properties::Scalar>;
- std::vector<Scalar> volumeFlux(fvGridGeometry->numScvf(), 0.0);
+ std::vector<Scalar> volumeFlux(gridGeometry->numScvf(), 0.0);
using FluxVariables = GetPropType<OnePTypeTag, Properties::FluxVariables>;
auto upwindTerm = [](const auto& volVars) { return volVars.mobility(0); };
for (const auto& element : elements(leafGridView))
{
- auto fvGeometry = localView(*fvGridGeometry);
+ auto fvGeometry = localView(*gridGeometry);
fvGeometry.bind(element);
auto elemVolVars = localView(onePGridVariables->curGridVolVars());
@@ -179,7 +179,7 @@ int main(int argc, char** argv) try
//! the problem (initial and boundary conditions)
using TracerProblem = GetPropType<TracerTypeTag, Properties::Problem>;
- auto tracerProblem = std::make_shared<TracerProblem>(fvGridGeometry);
+ auto tracerProblem = std::make_shared<TracerProblem>(gridGeometry);
// set the flux from the 1p problem
tracerProblem->spatialParams().setVolumeFlux(volumeFlux);
@@ -191,7 +191,7 @@ int main(int argc, char** argv) try
//! the grid variables
using GridVariables = GetPropType<TracerTypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(tracerProblem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(tracerProblem, gridGeometry);
gridVariables->init(x);
//! intialize the vtk output module
@@ -213,7 +213,7 @@ int main(int argc, char** argv) try
//! the assembler with time loop for instationary problem
using TracerAssembler = FVAssembler<TracerTypeTag, DiffMethod::analytic, /*implicit=*/false>;
- auto assembler = std::make_shared<TracerAssembler>(tracerProblem, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<TracerAssembler>(tracerProblem, gridGeometry, gridVariables, timeLoop, xOld);
//! the linear solver
using TracerLinearSolver = ExplicitDiagonalSolver;
diff --git a/test/porousmediumflow/tracer/1ptracer/problem_1p.hh b/test/porousmediumflow/tracer/1ptracer/problem_1p.hh
index f559e045bc..93182d269c 100644
--- a/test/porousmediumflow/tracer/1ptracer/problem_1p.hh
+++ b/test/porousmediumflow/tracer/1ptracer/problem_1p.hh
@@ -104,8 +104,8 @@ class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
static constexpr int dimWorld = GridView::dimensionworld;
public:
- OnePTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ OnePTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry) {}
/*!
* \brief Specifies which kind of boundary condition should be
diff --git a/test/porousmediumflow/tracer/1ptracer/spatialparams_1p.hh b/test/porousmediumflow/tracer/1ptracer/spatialparams_1p.hh
index 4d4237bbac..c3ee14993f 100644
--- a/test/porousmediumflow/tracer/1ptracer/spatialparams_1p.hh
+++ b/test/porousmediumflow/tracer/1ptracer/spatialparams_1p.hh
@@ -52,8 +52,8 @@ class OnePTestSpatialParams
public:
using PermeabilityType = Scalar;
- OnePTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry), K_(fvGridGeometry->gridView().size(0), 0.0)
+ OnePTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry), K_(gridGeometry->gridView().size(0), 0.0)
{
permeability_ = getParam<Scalar>("SpatialParams.Permeability");
permeabilityLens_ = getParam<Scalar>("SpatialParams.PermeabilityLens");
@@ -65,9 +65,9 @@ public:
std::mt19937 rand(0);
std::lognormal_distribution<Scalar> K(std::log(permeability_), std::log(permeability_)*0.1);
std::lognormal_distribution<Scalar> KLens(std::log(permeabilityLens_), std::log(permeabilityLens_)*0.1);
- for (const auto& element : elements(fvGridGeometry->gridView()))
+ for (const auto& element : elements(gridGeometry->gridView()))
{
- const auto eIdx = fvGridGeometry->elementMapper().index(element);
+ const auto eIdx = gridGeometry->elementMapper().index(element);
const auto globalPos = element.geometry().center();
K_[eIdx] = isInLens_(globalPos) ? KLens(rand) : K(rand);
}
diff --git a/test/porousmediumflow/tracer/1ptracer/spatialparams_tracer.hh b/test/porousmediumflow/tracer/1ptracer/spatialparams_tracer.hh
index 053c4ebdc2..24b5180654 100644
--- a/test/porousmediumflow/tracer/1ptracer/spatialparams_tracer.hh
+++ b/test/porousmediumflow/tracer/1ptracer/spatialparams_tracer.hh
@@ -52,8 +52,8 @@ class TracerTestSpatialParams
public:
- TracerTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ TracerTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry) {}
/*!
* \brief Defines the porosity \f$\mathrm{[-]}\f$.
diff --git a/test/porousmediumflow/tracer/2ptracer/main.cc b/test/porousmediumflow/tracer/2ptracer/main.cc
index 15eb8dfde8..e746a0dd2d 100644
--- a/test/porousmediumflow/tracer/2ptracer/main.cc
+++ b/test/porousmediumflow/tracer/2ptracer/main.cc
@@ -93,16 +93,16 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TwoPTypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using TwoPProblem = GetPropType<TwoPTypeTag, Properties::Problem>;
- auto twoPProblem = std::make_shared<TwoPProblem>(fvGridGeometry);
+ auto twoPProblem = std::make_shared<TwoPProblem>(gridGeometry);
// the solution vector
using TwoPSolutionVector = GetPropType<TwoPTypeTag, Properties::SolutionVector>;
- TwoPSolutionVector p(fvGridGeometry->numDofs());
+ TwoPSolutionVector p(gridGeometry->numDofs());
twoPProblem->applyInitialSolution(p);
auto pOld = p;
@@ -112,7 +112,7 @@ int main(int argc, char** argv) try
// the grid variables
using TwoPGridVariables = GetPropType<TwoPTypeTag, Properties::GridVariables>;
- auto twoPGridVariables = std::make_shared<TwoPGridVariables>(twoPProblem, fvGridGeometry);
+ auto twoPGridVariables = std::make_shared<TwoPGridVariables>(twoPProblem, gridGeometry);
twoPGridVariables->init(p);
// intialize the vtk output module
@@ -128,11 +128,11 @@ int main(int argc, char** argv) try
// the assembler with time loop for instationary problem
using TwoPAssembler = FVAssembler<TwoPTypeTag, DiffMethod::numeric>;
- auto twoPAssembler = std::make_shared<TwoPAssembler>(twoPProblem, fvGridGeometry, twoPGridVariables, timeLoop, pOld);
+ auto twoPAssembler = std::make_shared<TwoPAssembler>(twoPProblem, gridGeometry, twoPGridVariables, timeLoop, pOld);
// the linear solver
using TwoPLinearSolver = AMGBackend<TwoPTypeTag>;
- auto twoPLinearSolver = std::make_shared<TwoPLinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto twoPLinearSolver = std::make_shared<TwoPLinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<TwoPAssembler, TwoPLinearSolver>;
@@ -144,7 +144,7 @@ int main(int argc, char** argv) try
//! the problem (initial and boundary conditions)
using TracerProblem = GetPropType<TracerTypeTag, Properties::Problem>;
- auto tracerProblem = std::make_shared<TracerProblem>(fvGridGeometry);
+ auto tracerProblem = std::make_shared<TracerProblem>(gridGeometry);
//! the solution vector
using TracerSolutionVector = GetPropType<TracerTypeTag, Properties::SolutionVector>;
@@ -153,18 +153,18 @@ int main(int argc, char** argv) try
auto xOld = x;
//! initialize the flux, density and saturation vectors
- std::vector<Scalar> volumeFlux_(fvGridGeometry->numScvf(), 0.0);
- std::vector<Scalar> density_(fvGridGeometry->numScv(), 0.0);
- std::vector<Scalar> saturation_(fvGridGeometry->numScv(), 0.0);
+ std::vector<Scalar> volumeFlux_(gridGeometry->numScvf(), 0.0);
+ std::vector<Scalar> density_(gridGeometry->numScv(), 0.0);
+ std::vector<Scalar> saturation_(gridGeometry->numScv(), 0.0);
//! the grid variables
using TracerGridVariables = GetPropType<TracerTypeTag, Properties::GridVariables>;
- auto tracerGridVariables = std::make_shared<TracerGridVariables>(tracerProblem, fvGridGeometry);
+ auto tracerGridVariables = std::make_shared<TracerGridVariables>(tracerProblem, gridGeometry);
tracerGridVariables->init(x);
// the linear solver
using TracerLinearSolver = AMGBackend<TracerTypeTag>;
- auto tracerLinearSolver = std::make_shared<TracerLinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto tracerLinearSolver = std::make_shared<TracerLinearSolver>(leafGridView, gridGeometry->dofMapper());
//! the linear system
using JacobianMatrix = GetPropType<TracerTypeTag, Properties::JacobianMatrix>;
@@ -173,7 +173,7 @@ int main(int argc, char** argv) try
//! the assembler with time loop for instationary problem
using TracerAssembler = FVAssembler<TracerTypeTag, DiffMethod::analytic, /*implicit=*/false>;
- auto tracerAssembler = std::make_shared<TracerAssembler>(tracerProblem, fvGridGeometry, tracerGridVariables, timeLoop, xOld);
+ auto tracerAssembler = std::make_shared<TracerAssembler>(tracerProblem, gridGeometry, tracerGridVariables, timeLoop, xOld);
tracerAssembler->setLinearSystem(A, r);
// set the flux, density and saturation from the 2p problem
@@ -225,7 +225,7 @@ int main(int argc, char** argv) try
// compute volume fluxes for the tracer model
///////////////////////////////////////////////////////////
- auto fvGeometry = localView(*fvGridGeometry);
+ auto fvGeometry = localView(*gridGeometry);
fvGeometry.bind(element);
auto elemVolVars = localView(twoPGridVariables->curGridVolVars());
diff --git a/test/porousmediumflow/tracer/2ptracer/problem_tracer.hh b/test/porousmediumflow/tracer/2ptracer/problem_tracer.hh
index 61a23010bd..eade9d7821 100644
--- a/test/porousmediumflow/tracer/2ptracer/problem_tracer.hh
+++ b/test/porousmediumflow/tracer/2ptracer/problem_tracer.hh
@@ -153,8 +153,8 @@ class TwoPTracerTestProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- TwoPTracerTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ TwoPTracerTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
// stating in the console whether mole or mass fractions are used
if(useMoles)
diff --git a/test/porousmediumflow/tracer/2ptracer/spatialparams_tracer.hh b/test/porousmediumflow/tracer/2ptracer/spatialparams_tracer.hh
index 95187219c2..c4a8695833 100644
--- a/test/porousmediumflow/tracer/2ptracer/spatialparams_tracer.hh
+++ b/test/porousmediumflow/tracer/2ptracer/spatialparams_tracer.hh
@@ -53,8 +53,8 @@ class TwoPTracerTestSpatialParams
public:
- TwoPTracerTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ TwoPTracerTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry) {}
/*!
* \brief Defines the porosity \f$\mathrm{[-]}\f$.
diff --git a/test/porousmediumflow/tracer/constvel/main.cc b/test/porousmediumflow/tracer/constvel/main.cc
index c14ae6f0ec..e6aaa863dc 100644
--- a/test/porousmediumflow/tracer/constvel/main.cc
+++ b/test/porousmediumflow/tracer/constvel/main.cc
@@ -77,22 +77,22 @@ int main(int argc, char** argv) try
//! create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
//! the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
//! the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
//! the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
//! get some time loop parameters
@@ -107,7 +107,7 @@ int main(int argc, char** argv) try
//! the assembler with time loop for instationary problem
using Assembler = FVAssembler<TypeTag, DiffMethod::analytic, IMPLICIT>;
- auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
using JacobianMatrix = GetPropType<TypeTag, Properties::JacobianMatrix>;
auto A = std::make_shared<JacobianMatrix>();
auto r = std::make_shared<SolutionVector>();
diff --git a/test/porousmediumflow/tracer/constvel/spatialparams.hh b/test/porousmediumflow/tracer/constvel/spatialparams.hh
index eb0f1682bc..f73db8a99b 100644
--- a/test/porousmediumflow/tracer/constvel/spatialparams.hh
+++ b/test/porousmediumflow/tracer/constvel/spatialparams.hh
@@ -52,8 +52,8 @@ class TracerTestSpatialParams
public:
- TracerTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ TracerTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry) {}
/*!
* \brief Defines the porosity \f$\mathrm{[-]}\f$.
diff --git a/test/porousmediumflow/tracer/multicomp/main.cc b/test/porousmediumflow/tracer/multicomp/main.cc
index 759f890fa9..efbb447f58 100644
--- a/test/porousmediumflow/tracer/multicomp/main.cc
+++ b/test/porousmediumflow/tracer/multicomp/main.cc
@@ -112,22 +112,22 @@ int main(int argc, char** argv) try
// create the finite volume grid geometry
using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
- auto fvGridGeometry = std::make_shared<GridGeometry>(leafGridView);
- fvGridGeometry->update();
+ auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+ gridGeometry->update();
// the problem (initial and boundary conditions)
using Problem = GetPropType<TypeTag, Properties::Problem>;
- auto problem = std::make_shared<Problem>(fvGridGeometry);
+ auto problem = std::make_shared<Problem>(gridGeometry);
// the solution vector
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
- SolutionVector x(fvGridGeometry->numDofs());
+ SolutionVector x(gridGeometry->numDofs());
problem->applyInitialSolution(x);
auto xOld = x;
// the grid variables
using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
- auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
gridVariables->init(x);
// get some time loop parameters
@@ -150,11 +150,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, fvGridGeometry, gridVariables, timeLoop, xOld);
+ auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop, xOld);
// the linear solver
using LinearSolver = AMGBackend<TypeTag>;
- auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
// the non-linear solver
using NewtonSolver = Dumux::NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/tracer/multicomp/problem.hh b/test/porousmediumflow/tracer/multicomp/problem.hh
index 458349e121..ce400e1e61 100644
--- a/test/porousmediumflow/tracer/multicomp/problem.hh
+++ b/test/porousmediumflow/tracer/multicomp/problem.hh
@@ -219,8 +219,8 @@ class MaxwellStefanTestProblem : public PorousMediumFlowProblem<TypeTag>
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
public:
- MaxwellStefanTestProblem(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry)
+ MaxwellStefanTestProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry)
{
name_ = getParam<std::string>("Problem.Name");
diff --git a/test/porousmediumflow/tracer/multicomp/spatialparams.hh b/test/porousmediumflow/tracer/multicomp/spatialparams.hh
index dc371c833d..bc1a258f8c 100644
--- a/test/porousmediumflow/tracer/multicomp/spatialparams.hh
+++ b/test/porousmediumflow/tracer/multicomp/spatialparams.hh
@@ -52,8 +52,8 @@ class MaxwellStefanTestSpatialParams
public:
- MaxwellStefanTestSpatialParams(std::shared_ptr<const GridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ MaxwellStefanTestSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+ : ParentType(gridGeometry) {}
/*!
* \brief Defines the porosity \f$\mathrm{[-]}\f$.
--
GitLab