From 7cd5d094f5a06beb9228c99e100ed87fe5de93b9 Mon Sep 17 00:00:00 2001 From: Bernd Flemisch Date: Wed, 9 Oct 2019 11:55:55 +0200 Subject: [PATCH 1/7] [cleanup] replace local names `FVGridGeometry` by `GridGeometry` --- dumux/adaptive/initializationindicator.hh | 6 +- dumux/assembly/cclocalassembler.hh | 6 +- dumux/assembly/fvlocalresidual.hh | 4 +- dumux/assembly/partialreassembler.hh | 14 ++-- dumux/common/pointsource.hh | 6 +- dumux/common/staggeredfvproblem.hh | 10 +-- .../box/elementboundarytypes.hh | 4 +- dumux/discretization/box/elementsolution.hh | 18 ++--- .../discretization/box/fluxvariablescache.hh | 8 +-- dumux/discretization/box/fvgridgeometry.hh | 4 +- .../box/gridfluxvariablescache.hh | 8 +-- .../discretization/box/gridvolumevariables.hh | 8 +-- .../cellcentered/connectivitymap.hh | 12 ++-- .../cellcentered/elementsolution.hh | 20 +++--- .../cellcentered/gridvolumevariables.hh | 8 +-- .../cellcentered/mpfa/connectivitymap.hh | 6 +- .../cellcentered/mpfa/fvgridgeometrytraits.hh | 2 +- .../mpfa/gridfluxvariablescache.hh | 12 ++-- .../mpfa/gridinteractionvolumeindexsets.hh | 4 +- .../cellcentered/mpfa/helper.hh | 46 ++++++------ .../cellcentered/mpfa/scvgradients.hh | 36 +++++----- .../cellcentered/tpfa/fvgridgeometry.hh | 8 +-- .../tpfa/gridfluxvariablescache.hh | 8 +-- dumux/discretization/fluxstencil.hh | 14 ++-- dumux/discretization/localview.hh | 2 +- .../discretization/staggered/facesolution.hh | 6 +- .../staggered/freeflow/connectivitymap.hh | 16 ++--- .../freeflow/fvgridgeometrytraits.hh | 8 +-- .../staggered/freeflow/gridvolumevariables.hh | 10 +-- .../staggered/freeflow/velocityoutput.hh | 8 +-- .../staggered/gridfacevariables.hh | 8 +-- .../staggered/gridfluxvariablescache.hh | 8 +-- dumux/flux/box/darcyslaw.hh | 10 +-- dumux/flux/box/effectivestresslaw.hh | 10 +-- dumux/flux/box/hookeslaw.hh | 10 +-- dumux/flux/ccmpfa/darcyslaw.hh | 6 +- dumux/flux/ccmpfa/fickslaw.hh | 6 +- dumux/flux/ccmpfa/fourierslaw.hh | 6 +- dumux/flux/cctpfa/darcyslaw.hh | 54 +++++++------- dumux/flux/cctpfa/forchheimerslaw.hh | 46 ++++++------ dumux/flux/effectivestresslaw.hh | 2 +- dumux/flux/hookeslaw.hh | 2 +- dumux/flux/staggered/freeflow/fickslaw.hh | 6 +- dumux/flux/staggered/freeflow/fourierslaw.hh | 6 +- .../staggered/freeflow/maxwellstefanslaw.hh | 6 +- dumux/flux/upwindscheme.hh | 22 +++--- .../compositional/staggered/fluxvariables.hh | 6 +- .../compositional/staggered/localresidual.hh | 4 +- dumux/freeflow/navierstokes/problem.hh | 14 ++-- .../navierstokes/staggered/fluxoversurface.hh | 8 +-- .../navierstokes/staggered/fluxvariables.hh | 12 ++-- .../navierstokes/staggered/localresidual.hh | 8 +-- .../staggered/staggeredupwindfluxvariables.hh | 8 +-- .../staggered/velocitygradients.hh | 6 +- dumux/freeflow/nonisothermal/localresidual.hh | 32 ++++----- dumux/freeflow/rans/oneeq/problem.hh | 8 +-- dumux/freeflow/rans/problem.hh | 14 ++-- dumux/freeflow/rans/twoeq/kepsilon/problem.hh | 10 +-- dumux/freeflow/rans/twoeq/komega/problem.hh | 10 +-- .../rans/twoeq/lowrekepsilon/problem.hh | 8 +-- dumux/freeflow/rans/zeroeq/problem.hh | 8 +-- dumux/freeflow/shallowwater/fluxvariables.hh | 6 +- dumux/freeflow/shallowwater/problem.hh | 6 +- dumux/geomechanics/fvproblem.hh | 6 +- .../poroelastic/couplingmanager.hh | 12 ++-- dumux/geomechanics/poroelastic/model.hh | 6 +- dumux/geomechanics/stressvariablescache.hh | 18 ++--- dumux/io/loadsolution.hh | 30 ++++---- dumux/io/staggeredvtkoutputmodule.hh | 6 +- dumux/io/vtkoutputmodule.hh | 8 +-- dumux/linear/amgtraits.hh | 28 ++++---- .../electrochemistry/electrochemistry.hh | 6 +- .../electrochemistry/electrochemistryni.hh | 10 +-- dumux/material/spatialparams/fv.hh | 14 ++-- dumux/material/spatialparams/fv1p.hh | 20 +++--- dumux/material/spatialparams/fvelastic.hh | 18 ++--- .../spatialparams/fvnonequilibrium.hh | 14 ++-- dumux/material/spatialparams/fvporoelastic.hh | 18 ++--- .../boundary/darcydarcy/couplingmanager.hh | 12 ++-- .../boundary/darcydarcy/couplingmapper.hh | 8 +-- .../boundary/stokesdarcy/couplingdata.hh | 32 ++++----- .../boundary/stokesdarcy/couplingmanager.hh | 8 +-- .../embedded/couplingmanager1d3d.hh | 26 +++---- .../embedded/couplingmanagerbase.hh | 20 +++--- .../embedded/extendedsourcestencil.hh | 6 +- .../embedded/integrationpointsource.hh | 8 +-- .../multidomain/facet/box/couplingmanager.hh | 12 ++-- dumux/multidomain/facet/box/darcyslaw.hh | 8 +-- .../facet/box/elementboundarytypes.hh | 4 +- dumux/multidomain/facet/box/fvgridgeometry.hh | 4 +- dumux/multidomain/facet/box/upwindscheme.hh | 2 +- .../facet/cellcentered/localresidual.hh | 8 +-- .../cellcentered/mpfa/couplingmanager.hh | 12 ++-- .../cellcentered/tpfa/couplingmanager.hh | 12 ++-- .../facet/cellcentered/tpfa/darcyslaw.hh | 70 +++++++++---------- .../facet/cellcentered/upwindscheme.hh | 4 +- dumux/multidomain/facet/couplingmanager.hh | 10 +-- dumux/multidomain/facet/couplingmapperbase.hh | 20 +++--- dumux/multidomain/staggeredcouplingmanager.hh | 16 ++--- .../multidomain/subdomainboxlocalassembler.hh | 20 +++--- .../multidomain/subdomaincclocalassembler.hh | 16 ++--- .../subdomainstaggeredlocalassembler.hh | 12 ++-- dumux/nonlinear/newtonconvergencewriter.hh | 12 ++-- .../staggerednewtonconvergencewriter.hh | 30 ++++---- .../2p/boxmaterialinterfaceparams.hh | 10 +-- .../porousmediumflow/2p/gridadaptindicator.hh | 6 +- dumux/porousmediumflow/2p/griddatatransfer.hh | 10 +-- .../2p/incompressiblelocalresidual.hh | 4 +- .../porousmediumflow/boxdfm/fvgridgeometry.hh | 6 +- .../boxdfm/vtkoutputmodule.hh | 6 +- dumux/porousmediumflow/fluxvariables.hh | 6 +- .../fluxvariablescachefiller.hh | 6 +- dumux/porousmediumflow/problem.hh | 6 +- dumux/porousmediumflow/velocity.hh | 16 ++--- dumux/porousmediumflow/velocityoutput.hh | 12 ++-- test/discretization/box/test_boxfvgeometry.cc | 6 +- .../cellcentered/tpfa/test_tpfafvgeometry.cc | 8 +-- .../tpfa/test_tpfafvgeometry_nonconforming.cc | 6 +- .../test_staggered_free_flow_geometry.cc | 14 ++-- .../staggered/test_staggeredfvgeometry.cc | 20 +++--- test/freeflow/navierstokes/angeli/main.cc | 8 +-- test/freeflow/navierstokes/angeli/problem.hh | 10 +-- test/freeflow/navierstokes/channel/1d/main.cc | 8 +-- .../navierstokes/channel/1d/problem.hh | 10 +-- test/freeflow/navierstokes/channel/2d/main.cc | 8 +-- .../navierstokes/channel/2d/problem.hh | 10 +-- test/freeflow/navierstokes/channel/3d/main.cc | 8 +-- .../navierstokes/channel/3d/problem.hh | 6 +- .../navierstokes/closedsystem/main.cc | 8 +-- .../navierstokes/closedsystem/problem.hh | 10 +-- test/freeflow/navierstokes/donea/main.cc | 10 +-- test/freeflow/navierstokes/donea/problem.hh | 10 +-- test/freeflow/navierstokes/kovasznay/main.cc | 8 +-- .../navierstokes/kovasznay/problem.hh | 12 ++-- test/freeflow/navierstokes/l2error.hh | 6 +- test/freeflow/navierstokes/sincos/main.cc | 12 ++-- test/freeflow/navierstokes/sincos/problem.hh | 10 +-- test/freeflow/navierstokesnc/channel/main.cc | 8 +-- .../navierstokesnc/channel/problem.hh | 4 +- .../navierstokesnc/densitydrivenflow/main.cc | 8 +-- .../densitydrivenflow/problem.hh | 6 +- .../navierstokesnc/maxwellstefan/main.cc | 8 +-- .../navierstokesnc/maxwellstefan/problem.hh | 6 +- test/freeflow/rans/main.cc | 8 +-- test/freeflow/rans/problem.hh | 8 +-- test/freeflow/ransnc/main.cc | 8 +-- test/freeflow/ransnc/problem.hh | 6 +- test/freeflow/shallowwater/dambreak/main.cc | 4 +- .../freeflow/shallowwater/dambreak/problem.hh | 8 +-- .../shallowwater/dambreak/spatialparams.hh | 16 ++--- .../shallowwater/roughchannel/main.cc | 4 +- .../shallowwater/roughchannel/problem.hh | 8 +-- .../roughchannel/spatialparams.hh | 16 ++--- test/geomechanics/elastic/main.cc | 4 +- test/geomechanics/elastic/problem.hh | 10 +-- test/geomechanics/elastic/spatialparams.hh | 16 ++--- test/geomechanics/poroelastic/main.cc | 12 ++-- test/geomechanics/poroelastic/problem.hh | 10 +-- .../geomechanics/poroelastic/spatialparams.hh | 16 ++--- test/io/gridmanager/gmshboundaryflagtest.hh | 4 +- .../vtk/test_vtk_staggeredfreeflowpvnames.cc | 40 +++++------ .../boundary/darcydarcy/1p_1p/main.cc | 6 +- .../boundary/darcydarcy/1p_1p/problem.hh | 10 +-- .../darcydarcy/1p_1p/spatialparams.hh | 14 ++-- .../boundary/darcydarcy/1p_2p/main.cc | 6 +- .../boundary/darcydarcy/1p_2p/problem.hh | 10 +-- .../darcydarcy/1p_2p/spatialparams.hh | 14 ++-- .../diffusionlawcomparison/problem_darcy.hh | 8 +-- .../diffusionlawcomparison/problem_stokes.hh | 6 +- .../stokesdarcy/1p2c_1p2c/problem_darcy.hh | 10 +-- .../stokesdarcy/1p2c_1p2c/problem_stokes.hh | 6 +- .../stokesdarcy/1p2c_1p2c/spatialparams.hh | 14 ++-- .../stokesdarcy/1p2c_2p2c/problem_darcy.hh | 8 +-- .../stokesdarcy/1p2c_2p2c/problem_stokes.hh | 6 +- .../stokesdarcy/1p2c_2p2c/spatialparams.hh | 12 ++-- .../stokesdarcy/1p3c_1p3c/problem_darcy.hh | 8 +-- .../stokesdarcy/1p3c_1p3c/problem_stokes.hh | 6 +- .../stokesdarcy/1p_1p/problem_darcy.hh | 8 +-- .../stokesdarcy/1p_1p/problem_stokes.hh | 6 +- .../stokesdarcy/1p_1p/spatialparams.hh | 14 ++-- .../stokesdarcy/1p_2p/problem_darcy.hh | 8 +-- .../stokesdarcy/1p_2p/problem_stokes.hh | 6 +- .../stokesdarcy/1p_2p/spatialparams.hh | 16 ++--- .../1d3d/1p2c_richards2c/problem_root.hh | 14 ++-- .../1d3d/1p2c_richards2c/problem_soil.hh | 12 ++-- .../1p2c_richards2c/spatialparams_root.hh | 16 ++--- .../1p2c_richards2c/spatialparams_soil.hh | 14 ++-- .../embedded/1d3d/1p_1p/problem_bloodflow.hh | 12 ++-- .../embedded/1d3d/1p_1p/problem_tissue.hh | 12 ++-- .../1d3d/1p_1p/spatialparams_bloodflow.hh | 12 ++-- .../1d3d/1p_1p/spatialparams_tissue.hh | 14 ++-- .../embedded/1d3d/1p_richards/problem_root.hh | 14 ++-- .../embedded/1d3d/1p_richards/problem_soil.hh | 12 ++-- .../1d3d/1p_richards/spatialparams_root.hh | 16 ++--- .../1d3d/1p_richards/spatialparams_soil.hh | 14 ++-- .../embedded/2d3d/1p_1p/problem_fracture.hh | 10 +-- .../embedded/2d3d/1p_1p/problem_matrix.hh | 10 +-- .../embedded/2d3d/1p_1p/spatialparams.hh | 14 ++-- .../facet/1p_1p/analytical/main.cc | 12 ++-- .../facet/1p_1p/analytical/problem_bulk.hh | 12 ++-- .../facet/1p_1p/analytical/problem_lowdim.hh | 10 +-- .../facet/1p_1p/analytical/spatialparams.hh | 12 ++-- .../facet/1p_1p/gravity/problem_bulk.hh | 12 ++-- .../facet/1p_1p/gravity/problem_lowdim.hh | 10 +-- .../facet/1p_1p/gravity/spatialparams.hh | 12 ++-- .../facet/1p_1p/linearprofile/problem_bulk.hh | 12 ++-- .../1p_1p/linearprofile/problem_lowdim.hh | 10 +-- .../1p_1p/linearprofile/spatialparams.hh | 12 ++-- .../facet/1p_1p/threedomain/main.cc | 14 ++-- .../facet/1p_1p/threedomain/problem_bulk.hh | 12 ++-- .../facet/1p_1p/threedomain/problem_edge.hh | 16 ++--- .../facet/1p_1p/threedomain/problem_facet.hh | 16 ++--- .../facet/1p_1p/threedomain/spatialparams.hh | 14 ++-- test/multidomain/facet/tracer_tracer/main.cc | 12 ++-- .../facet/tracer_tracer/problem_1p_bulk.hh | 12 ++-- .../facet/tracer_tracer/problem_1p_lowdim.hh | 10 +-- .../tracer_tracer/problem_tracer_bulk.hh | 14 ++-- .../tracer_tracer/problem_tracer_lowdim.hh | 12 ++-- .../facet/tracer_tracer/spatialparams_1p.hh | 12 ++-- .../tracer_tracer/spatialparams_tracer.hh | 18 ++--- .../poromechanics/el1p/problem_1p.hh | 8 +-- .../poromechanics/el1p/problem_poroelastic.hh | 8 +-- .../poromechanics/el1p/spatialparams_1p.hh | 16 ++--- .../el1p/spatialparams_poroelastic.hh | 16 ++--- .../poromechanics/el2p/problem_2p.hh | 8 +-- .../poromechanics/el2p/problem_poroelastic.hh | 8 +-- .../poromechanics/el2p/spatialparams_2p.hh | 16 ++--- .../el2p/spatialparams_poroelastic.hh | 16 ++--- .../compressible/instationary/main.cc | 4 +- .../compressible/instationary/problem.hh | 8 +-- .../instationary/spatialparams.hh | 16 ++--- .../implicit/compressible/stationary/main.cc | 4 +- .../compressible/stationary/problem.hh | 8 +-- .../compressible/stationary/spatialparams.hh | 16 ++--- .../1p/implicit/convergence/problem.hh | 14 ++-- .../1p/implicit/convergence/solver.hh | 4 +- .../1p/implicit/convergence/spatialparams.hh | 14 ++-- .../1p/implicit/fracture2d3d/main.cc | 4 +- .../1p/implicit/fracture2d3d/problem.hh | 8 +-- .../1p/implicit/fracture2d3d/spatialparams.hh | 14 ++-- .../1p/implicit/incompressible/main.cc | 22 +++--- .../1p/implicit/incompressible/problem.hh | 8 +-- .../implicit/incompressible/spatialparams.hh | 16 ++--- .../1p/implicit/internaldirichlet/problem.hh | 6 +- .../1p/implicit/isothermal/main.cc | 4 +- .../1p/implicit/isothermal/spatialparams.hh | 18 ++--- .../1p/implicit/network1d3d/main.cc | 4 +- .../1p/implicit/network1d3d/spatialparams.hh | 16 ++--- .../1p/implicit/nonisothermal/main.cc | 6 +- .../nonisothermal/problem_conduction.hh | 8 +-- .../nonisothermal/problem_convection.hh | 8 +-- .../implicit/nonisothermal/spatialparams.hh | 14 ++-- .../1p/implicit/periodicbc/main.cc | 4 +- .../1p/implicit/periodicbc/problem.hh | 4 +- .../1p/implicit/periodicbc/spatialparams.hh | 10 +-- .../1p/implicit/pointsources/spatialparams.hh | 16 ++--- .../pointsources/timedependent/main.cc | 4 +- .../pointsources/timedependent/problem.hh | 4 +- .../pointsources/timeindependent/main.cc | 4 +- .../pointsources/timeindependent/problem.hh | 10 +-- .../1pnc/implicit/1p2c/isothermal/main.cc | 4 +- .../1pnc/implicit/1p2c/isothermal/problem.hh | 8 +-- .../isothermal/saltwaterintrusion/main.cc | 4 +- .../isothermal/saltwaterintrusion/problem.hh | 8 +-- .../1p2c/nonisothermal/conduction/main.cc | 4 +- .../1p2c/nonisothermal/conduction/problem.hh | 8 +-- .../1p2c/nonisothermal/convection/main.cc | 4 +- .../1p2c/nonisothermal/convection/problem.hh | 8 +-- .../1p2c/nonisothermal/transientbc/main.cc | 4 +- .../1p2c/nonisothermal/transientbc/problem.hh | 8 +-- .../1pnc/implicit/1p2c/spatialparams.hh | 16 ++--- .../1pnc/implicit/1p3c/main.cc | 4 +- .../1pnc/implicit/1p3c/problem.hh | 10 +-- .../1pnc/implicit/nonequilibrium/main.cc | 4 +- .../1pnc/implicit/nonequilibrium/problem.hh | 8 +-- .../implicit/nonequilibrium/spatialparams.hh | 16 ++--- .../1pncmin/implicit/nonisothermal/main.cc | 4 +- .../1pncmin/implicit/nonisothermal/problem.hh | 8 +-- .../implicit/nonisothermal/spatialparams.hh | 16 ++--- .../2p/implicit/adaptive/main.cc | 4 +- .../2p/implicit/adaptive/problem.hh | 6 +- .../2p/implicit/boxdfm/main.cc | 4 +- .../2p/implicit/boxdfm/problem.hh | 6 +- .../2p/implicit/boxdfm/spatialparams.hh | 14 ++-- .../2p/implicit/cornerpoint/main.cc | 4 +- .../2p/implicit/cornerpoint/problem.hh | 12 ++-- .../2p/implicit/cornerpoint/spatialparams.hh | 14 ++-- .../2p/implicit/fracture/main.cc | 4 +- .../2p/implicit/fracture/problem.hh | 8 +-- .../2p/implicit/fracture/spatialparams.hh | 16 ++--- .../2p/implicit/incompressible/main.cc | 4 +- .../2p/implicit/incompressible/problem.hh | 8 +-- .../implicit/incompressible/spatialparams.hh | 16 ++--- .../2p/implicit/nonisothermal/main.cc | 6 +- .../2p/implicit/nonisothermal/problem.hh | 8 +-- test/porousmediumflow/2p1c/implicit/main.cc | 4 +- .../porousmediumflow/2p1c/implicit/problem.hh | 8 +-- .../2p1c/implicit/spatialparams.hh | 16 ++--- .../implicit/chemicalnonequilibrium/main.cc | 4 +- .../chemicalnonequilibrium/problem.hh | 10 +-- .../chemicalnonequilibrium/spatialparams.hh | 16 ++--- .../2p2c/implicit/injection/main.cc | 4 +- .../2p2c/implicit/injection/problem.hh | 8 +-- .../2p2c/implicit/injection/spatialparams.hh | 14 ++-- .../2p2c/implicit/mpnccomparison/main.cc | 4 +- .../2p2c/implicit/mpnccomparison/problem.hh | 8 +-- .../implicit/mpnccomparison/spatialparams.hh | 16 ++--- .../2p2c/implicit/waterair/main.cc | 4 +- .../2p2c/implicit/waterair/problem.hh | 8 +-- .../2p2c/implicit/waterair/spatialparams.hh | 16 ++--- .../2pnc/implicit/diffusion/main.cc | 4 +- .../2pnc/implicit/diffusion/problem.hh | 8 +-- .../2pnc/implicit/diffusion/spatialparams.hh | 14 ++-- .../2pnc/implicit/fuelcell/main.cc | 4 +- .../2pnc/implicit/fuelcell/problem.hh | 14 ++-- .../2pnc/implicit/fuelcell/spatialparams.hh | 16 ++--- .../2pncmin/implicit/isothermal/main.cc | 4 +- .../2pncmin/implicit/isothermal/problem.hh | 8 +-- .../implicit/isothermal/spatialparams.hh | 16 ++--- .../3p/implicit/conduction/main.cc | 4 +- .../3p/implicit/conduction/problem.hh | 8 +-- .../3p/implicit/conduction/spatialparams.hh | 16 ++--- .../3p/implicit/convection/main.cc | 4 +- .../3p/implicit/convection/problem.hh | 8 +-- .../3p/implicit/infiltration/main.cc | 4 +- .../3p/implicit/infiltration/problem.hh | 8 +-- .../3p/implicit/infiltration/spatialparams.hh | 16 ++--- .../3p3c/implicit/columnxylol/main.cc | 4 +- .../3p3c/implicit/columnxylol/problem.hh | 8 +-- .../implicit/columnxylol/spatialparams.hh | 16 ++--- .../3p3c/implicit/infiltration/main.cc | 4 +- .../3p3c/implicit/infiltration/problem.hh | 8 +-- .../implicit/infiltration/spatialparams.hh | 16 ++--- .../3p3c/implicit/kuevette/main.cc | 4 +- .../3p3c/implicit/kuevette/problem.hh | 8 +-- .../3p3c/implicit/kuevette/spatialparams.hh | 16 ++--- .../3pwateroil/implicit/main.cc | 4 +- .../3pwateroil/implicit/problem.hh | 8 +-- .../3pwateroil/implicit/spatialparams.hh | 16 ++--- test/porousmediumflow/co2/implicit/main.cc | 4 +- test/porousmediumflow/co2/implicit/problem.hh | 4 +- .../co2/implicit/spatialparams.hh | 16 ++--- .../mpnc/implicit/2p2ccomparison/main.cc | 4 +- .../mpnc/implicit/2p2ccomparison/problem.hh | 8 +-- .../implicit/2p2ccomparison/spatialparams.hh | 16 ++--- .../mpnc/implicit/kinetic/main.cc | 4 +- .../mpnc/implicit/kinetic/spatialparams.hh | 16 ++--- .../mpnc/implicit/obstacle/main.cc | 4 +- .../mpnc/implicit/obstacle/problem.hh | 8 +-- .../mpnc/implicit/obstacle/spatialparams.hh | 16 ++--- .../implicit/thermalnonequilibrium/main.cc | 4 +- .../thermalnonequilibrium/spatialparams.hh | 16 ++--- .../richards/implicit/analytical/main.cc | 4 +- .../richards/implicit/analytical/problem.hh | 8 +-- .../implicit/analytical/spatialparams.hh | 14 ++-- .../richards/implicit/lens/main.cc | 4 +- .../richards/implicit/lens/problem.hh | 4 +- .../richards/implicit/lens/spatialparams.hh | 14 ++-- .../implicit/nonisothermal/conduction/main.cc | 4 +- .../nonisothermal/conduction/problem.hh | 8 +-- .../implicit/nonisothermal/convection/main.cc | 4 +- .../nonisothermal/convection/problem.hh | 8 +-- .../nonisothermal/evaporation/main.cc | 4 +- .../nonisothermal/evaporation/problem.hh | 12 ++-- .../implicit/nonisothermal/spatialparams.hh | 16 ++--- .../richardsnc/implicit/main.cc | 4 +- .../richardsnc/implicit/problem.hh | 8 +-- .../richardsnc/implicit/spatialparams.hh | 14 ++-- test/porousmediumflow/solidenergy/main.cc | 8 +-- test/porousmediumflow/solidenergy/problem.hh | 10 +-- .../solidenergy/spatialparams.hh | 14 ++-- test/porousmediumflow/tracer/1ptracer/main.cc | 4 +- .../tracer/1ptracer/problem_1p.hh | 8 +-- .../tracer/1ptracer/problem_tracer.hh | 10 +-- .../tracer/1ptracer/spatialparams_1p.hh | 16 ++--- .../tracer/1ptracer/spatialparams_tracer.hh | 16 ++--- test/porousmediumflow/tracer/2ptracer/main.cc | 4 +- .../tracer/2ptracer/problem_tracer.hh | 10 +-- .../tracer/2ptracer/spatialparams_tracer.hh | 16 ++--- test/porousmediumflow/tracer/constvel/main.cc | 4 +- .../tracer/constvel/problem.hh | 10 +-- .../tracer/constvel/spatialparams.hh | 16 ++--- .../porousmediumflow/tracer/multicomp/main.cc | 4 +- .../tracer/multicomp/problem.hh | 10 +-- .../tracer/multicomp/spatialparams.hh | 16 ++--- 385 files changed, 2011 insertions(+), 2011 deletions(-) diff --git a/dumux/adaptive/initializationindicator.hh b/dumux/adaptive/initializationindicator.hh index c073f9d2ff..0a171991b0 100644 --- a/dumux/adaptive/initializationindicator.hh +++ b/dumux/adaptive/initializationindicator.hh @@ -49,7 +49,7 @@ class GridAdaptInitializationIndicator using Element = typename GridView::Traits::template Codim<0>::Entity; using GridVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; static constexpr bool isBox = GetPropType::discMethod == DiscretizationMethod::box; @@ -70,7 +70,7 @@ public: * \param gridVariables The secondary variables on the grid */ GridAdaptInitializationIndicator(std::shared_ptr problem, - std::shared_ptr fvGridGeometry, + std::shared_ptr fvGridGeometry, std::shared_ptr gridVariables) : problem_(problem) , fvGridGeometry_(fvGridGeometry) @@ -281,7 +281,7 @@ public: private: std::shared_ptr problem_; //!< The problem to be solved - std::shared_ptr fvGridGeometry_; //!< The finite volume grid geometry + std::shared_ptr fvGridGeometry_; //!< The finite volume grid geometry std::shared_ptr gridVariables_; //!< The secondary variables on the grid std::vector indicatorVector_; //!< Indicator for BCs/sources diff --git a/dumux/assembly/cclocalassembler.hh b/dumux/assembly/cclocalassembler.hh index 633f8668b7..a97ab7eaba 100644 --- a/dumux/assembly/cclocalassembler.hh +++ b/dumux/assembly/cclocalassembler.hh @@ -137,8 +137,8 @@ class CCLocalAssembler; using NumEqVector = GetPropType; using Element = typename GetPropType::template Codim<0>::Entity; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using GridVariables = GetPropType; using JacobianMatrix = GetPropType; @@ -146,7 +146,7 @@ class CCLocalAssembler::dimension }; using FluxStencil = Dumux::FluxStencil; - static constexpr int maxElementStencilSize = FVGridGeometry::maxElementStencilSize; + static constexpr int maxElementStencilSize = GridGeometry::maxElementStencilSize; static constexpr bool enableGridFluxVarsCache = getPropValue(); public: diff --git a/dumux/assembly/fvlocalresidual.hh b/dumux/assembly/fvlocalresidual.hh index b933a7d7d0..23065a0856 100644 --- a/dumux/assembly/fvlocalresidual.hh +++ b/dumux/assembly/fvlocalresidual.hh @@ -50,7 +50,7 @@ class FVLocalResidual using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using GridVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using NumEqVector = GetPropType; @@ -94,7 +94,7 @@ public: */ ElementResidualVector evalStorage(const Problem& problem, const Element &element, - const FVGridGeometry& fvGridGeometry, + const GridGeometry& fvGridGeometry, const GridVariables& gridVariables, const SolutionVector& sol) const { diff --git a/dumux/assembly/partialreassembler.hh b/dumux/assembly/partialreassembler.hh index 9e986758b8..4f8dee1d8a 100644 --- a/dumux/assembly/partialreassembler.hh +++ b/dumux/assembly/partialreassembler.hh @@ -99,10 +99,10 @@ template class PartialReassemblerEngine { using Scalar = typename Assembler::Scalar; - using FVGridGeometry = typename Assembler::GridGeometry; + using GridGeometry = typename Assembler::GridGeometry; using JacobianMatrix = typename Assembler::JacobianMatrix; - using VertexMapper = typename FVGridGeometry::VertexMapper; - static constexpr int dim = FVGridGeometry::GridView::dimension; + using VertexMapper = typename GridGeometry::VertexMapper; + static constexpr int dim = GridGeometry::GridView::dimension; public: PartialReassemblerEngine(const Assembler& assembler) @@ -305,7 +305,7 @@ template class PartialReassemblerEngine { using Scalar = typename Assembler::Scalar; - using FVGridGeometry = typename Assembler::GridGeometry; + using GridGeometry = typename Assembler::GridGeometry; using JacobianMatrix = typename Assembler::JacobianMatrix; public: @@ -423,11 +423,11 @@ template class PartialReassembler { using Scalar = typename Assembler::Scalar; - using FVGridGeometry = typename Assembler::GridGeometry; + using GridGeometry = typename Assembler::GridGeometry; using JacobianMatrix = typename Assembler::JacobianMatrix; - using VertexMapper = typename FVGridGeometry::VertexMapper; + using VertexMapper = typename GridGeometry::VertexMapper; - static constexpr DiscretizationMethod discMethod = FVGridGeometry::discMethod; + static constexpr DiscretizationMethod discMethod = GridGeometry::discMethod; using Engine = PartialReassemblerEngine; public: diff --git a/dumux/common/pointsource.hh b/dumux/common/pointsource.hh index 7123186fc4..527c9dfa40 100644 --- a/dumux/common/pointsource.hh +++ b/dumux/common/pointsource.hh @@ -276,12 +276,12 @@ class BoundingBoxTreePointSourceHelper { public: //! calculate a DOF index to point source map from given vector of point sources - template - static void computePointSourceMap(const FVGridGeometry& fvGridGeometry, + template + static void computePointSourceMap(const GridGeometry& fvGridGeometry, std::vector& sources, PointSourceMap& pointSourceMap) { - constexpr bool isBox = FVGridGeometry::discMethod == DiscretizationMethod::box; + constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box; const auto& boundingBoxTree = fvGridGeometry.boundingBoxTree(); diff --git a/dumux/common/staggeredfvproblem.hh b/dumux/common/staggeredfvproblem.hh index 8ce229b555..74adc5043a 100644 --- a/dumux/common/staggeredfvproblem.hh +++ b/dumux/common/staggeredfvproblem.hh @@ -55,8 +55,8 @@ class StaggeredFVProblem : public FVProblem using ElementFaceVariables = typename GridFaceVariables::LocalView; using PrimaryVariables = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using NumEqVector = GetPropType; @@ -64,8 +64,8 @@ class StaggeredFVProblem : public FVProblem using CoordScalar = typename GridView::ctype; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - static constexpr auto cellCenterIdx = FVGridGeometry::cellCenterIdx(); - static constexpr auto faceIdx = FVGridGeometry::faceIdx(); + static constexpr auto cellCenterIdx = GridGeometry::cellCenterIdx(); + static constexpr auto faceIdx = GridGeometry::faceIdx(); static constexpr auto numEqCellCenter = getPropValue(); static constexpr auto numEqFace = getPropValue(); @@ -76,7 +76,7 @@ public: * \param fvGridGeometry The finite volume grid geometry * \param paramGroup The parameter group in which to look for runtime parameters first (default is "") */ - StaggeredFVProblem(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + StaggeredFVProblem(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) { } diff --git a/dumux/discretization/box/elementboundarytypes.hh b/dumux/discretization/box/elementboundarytypes.hh index aff498420f..ac9422771d 100644 --- a/dumux/discretization/box/elementboundarytypes.hh +++ b/dumux/discretization/box/elementboundarytypes.hh @@ -52,8 +52,8 @@ public: const Element &element, const FVElementGeometry &fvGeometry) { - using FVGridGeometry = typename FVElementGeometry::GridGeometry; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename FVElementGeometry::GridGeometry; + using GridView = typename GridGeometry::GridView; vertexBCTypes_.resize( element.subEntities(GridView::dimension) ); diff --git a/dumux/discretization/box/elementsolution.hh b/dumux/discretization/box/elementsolution.hh index 68e3bc3628..f0b5a79b56 100644 --- a/dumux/discretization/box/elementsolution.hh +++ b/dumux/discretization/box/elementsolution.hh @@ -37,8 +37,8 @@ namespace Dumux { template class BoxElementSolution { - using FVGridGeometry = typename FVElementGeometry::GridGeometry; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename FVElementGeometry::GridGeometry; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; public: @@ -51,7 +51,7 @@ public: //! Constructor with element and solution and grid geometry template BoxElementSolution(const Element& element, const SolutionVector& sol, - const FVGridGeometry& fvGridGeometry) + const GridGeometry& fvGridGeometry) { update(element, sol, fvGridGeometry); } @@ -70,7 +70,7 @@ public: //! extract the element solution from the solution vector using a mapper template void update(const Element& element, const SolutionVector& sol, - const FVGridGeometry& fvGridGeometry) + const GridGeometry& fvGridGeometry) { const auto numVert = element.subEntities(GridView::dimension); priVars_.resize(numVert); @@ -111,15 +111,15 @@ private: * \ingroup BoxDiscretization * \brief Make an element solution for box schemes */ -template -auto elementSolution(const Element& element, const SolutionVector& sol, const FVGridGeometry& gg) --> std::enable_if_t +auto elementSolution(const Element& element, const SolutionVector& sol, const GridGeometry& gg) +-> std::enable_if_t()[0])>> > { using PrimaryVariables = std::decay_t()[0])>; - return BoxElementSolution(element, sol, gg); + return BoxElementSolution(element, sol, gg); } /*! diff --git a/dumux/discretization/box/fluxvariablescache.hh b/dumux/discretization/box/fluxvariablescache.hh index 96ca21a14c..c401321714 100644 --- a/dumux/discretization/box/fluxvariablescache.hh +++ b/dumux/discretization/box/fluxvariablescache.hh @@ -35,15 +35,15 @@ namespace Dumux { * For the box scheme, this class does not contain any physics-/process-dependent * data. It solely stores disretization-/grid-related data. */ -template< class Scalar, class FVGridGeometry > +template< class Scalar, class GridGeometry > class BoxFluxVariablesCache { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; static const int dim = GridView::dimension; static const int dimWorld = GridView::dimensionworld; diff --git a/dumux/discretization/box/fvgridgeometry.hh b/dumux/discretization/box/fvgridgeometry.hh index 2e6cb065bf..6c320b2606 100644 --- a/dumux/discretization/box/fvgridgeometry.hh +++ b/dumux/discretization/box/fvgridgeometry.hh @@ -56,8 +56,8 @@ struct BoxDefaultGridGeometryTraits using SubControlVolume = BoxSubControlVolume; using SubControlVolumeFace = BoxSubControlVolumeFace; - template - using LocalView = BoxFVElementGeometry; + template + using LocalView = BoxFVElementGeometry; }; /*! diff --git a/dumux/discretization/box/gridfluxvariablescache.hh b/dumux/discretization/box/gridfluxvariablescache.hh index e28010b95f..a5803f48ee 100644 --- a/dumux/discretization/box/gridfluxvariablescache.hh +++ b/dumux/discretization/box/gridfluxvariablescache.hh @@ -78,8 +78,8 @@ public: BoxGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {} - template - void update(const FVGridGeometry& fvGridGeometry, + template + void update(const GridGeometry& fvGridGeometry, const GridVolumeVariables& gridVolVars, const SolutionVector& sol, bool forceUpdate = false) @@ -144,8 +144,8 @@ public: BoxGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {} - template - void update(const FVGridGeometry& fvGridGeometry, + template + void update(const GridGeometry& fvGridGeometry, const GridVolumeVariables& gridVolVars, const SolutionVector& sol, bool forceUpdate = false) {} diff --git a/dumux/discretization/box/gridvolumevariables.hh b/dumux/discretization/box/gridvolumevariables.hh index 74bc2117ec..cae6119802 100644 --- a/dumux/discretization/box/gridvolumevariables.hh +++ b/dumux/discretization/box/gridvolumevariables.hh @@ -74,8 +74,8 @@ public: BoxGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {} - template - void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol) + template + void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) { volumeVariables_.resize(fvGridGeometry.gridView().size(0)); for (const auto& element : elements(fvGridGeometry.gridView())) @@ -139,8 +139,8 @@ public: BoxGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {} - template - void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol) {} + template + void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) {} const Problem& problem() const { return *problemPtr_;} diff --git a/dumux/discretization/cellcentered/connectivitymap.hh b/dumux/discretization/cellcentered/connectivitymap.hh index 2e775c698b..b4e3332cdc 100644 --- a/dumux/discretization/cellcentered/connectivitymap.hh +++ b/dumux/discretization/cellcentered/connectivitymap.hh @@ -48,14 +48,14 @@ namespace Dumux { * to compute these fluxes. The same holds for scvfs in the cells J, i.e. we need only those * scvfs in the cells J in which the cell I is in the stencil. */ -template +template class CCSimpleConnectivityMap { - using FVElementGeometry = typename FVGridGeometry::LocalView; - using GridView = typename FVGridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; using GridIndexType = typename IndexTraits::GridIndex; using FluxStencil = Dumux::FluxStencil; - static constexpr int maxElemStencilSize = FVGridGeometry::maxElementStencilSize; + static constexpr int maxElemStencilSize = GridGeometry::maxElementStencilSize; struct DataJ { @@ -75,7 +75,7 @@ public: * * \param fvGridGeometry The grid's finite volume geometry. */ - void update(const FVGridGeometry& fvGridGeometry) + void update(const GridGeometry& fvGridGeometry) { map_.clear(); map_.resize(fvGridGeometry.gridView().size(0)); @@ -115,7 +115,7 @@ public: if (dataJForI.size() > maxElemStencilSize - 1) DUNE_THROW(Dune::InvalidStateException, "Maximum admissible stencil size (" << maxElemStencilSize-1 << ") is surpassed (" << dataJForI.size() << "). " - << "Please adjust the FVGridGeometry traits accordingly!"); + << "Please adjust the GridGeometry traits accordingly!"); dataJForI.push_back(std::make_pair(globalI, DataJ({globalJ, {scvf.index()}, {}}))); } diff --git a/dumux/discretization/cellcentered/elementsolution.hh b/dumux/discretization/cellcentered/elementsolution.hh index abf1a0bad7..f0d65ffc33 100644 --- a/dumux/discretization/cellcentered/elementsolution.hh +++ b/dumux/discretization/cellcentered/elementsolution.hh @@ -38,8 +38,8 @@ namespace Dumux { template class CCElementSolution { - using FVGridGeometry = typename FVElementGeometry::GridGeometry; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename FVElementGeometry::GridGeometry; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; public: @@ -52,7 +52,7 @@ public: //! Constructor with element, solution vector and grid geometry template CCElementSolution(const Element& element, const SolutionVector& sol, - const FVGridGeometry& fvGridGeometry) + const GridGeometry& fvGridGeometry) : CCElementSolution(sol[fvGridGeometry.elementMapper().index(element)]) {} @@ -76,7 +76,7 @@ public: //! extract the element solution from the solution vector using a mapper template void update(const Element& element, const SolutionVector& sol, - const FVGridGeometry& fvGridGeometry) + const GridGeometry& fvGridGeometry) { priVars_ = sol[fvGridGeometry.elementMapper().index(element)]; } @@ -109,16 +109,16 @@ private: * \ingroup CCDiscretization * \brief Make an element solution for cell-centered schemes */ -template -auto elementSolution(const Element& element, const SolutionVector& sol, const FVGridGeometry& gg) --> std::enable_if_t +auto elementSolution(const Element& element, const SolutionVector& sol, const GridGeometry& gg) +-> std::enable_if_t()[0])>> > { using PrimaryVariables = std::decay_t()[0])>; - return CCElementSolution(element, sol, gg); + return CCElementSolution(element, sol, gg); } /*! diff --git a/dumux/discretization/cellcentered/gridvolumevariables.hh b/dumux/discretization/cellcentered/gridvolumevariables.hh index e1f69e7086..0e2739e7e1 100644 --- a/dumux/discretization/cellcentered/gridvolumevariables.hh +++ b/dumux/discretization/cellcentered/gridvolumevariables.hh @@ -64,8 +64,8 @@ public: CCGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {} - template - void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol) + template + void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) { const auto numScv = fvGridGeometry.numScv(); volumeVariables_.resize(numScv); @@ -136,8 +136,8 @@ public: CCGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {} - template - void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol) {} + template + void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) {} //! The problem we are solving const Problem& problem() const diff --git a/dumux/discretization/cellcentered/mpfa/connectivitymap.hh b/dumux/discretization/cellcentered/mpfa/connectivitymap.hh index 8365acb2e6..8fcab2ddb4 100644 --- a/dumux/discretization/cellcentered/mpfa/connectivitymap.hh +++ b/dumux/discretization/cellcentered/mpfa/connectivitymap.hh @@ -33,12 +33,12 @@ namespace Dumux { //! Forward declaration of method specific implementation of the assembly map -template +template class CCMpfaConnectivityMap; //! The o-method can use the simple (symmetric) assembly map -template -class CCMpfaConnectivityMap : public CCSimpleConnectivityMap {}; +template +class CCMpfaConnectivityMap : public CCSimpleConnectivityMap {}; } // end namespace Dumux #endif diff --git a/dumux/discretization/cellcentered/mpfa/fvgridgeometrytraits.hh b/dumux/discretization/cellcentered/mpfa/fvgridgeometrytraits.hh index 6e9b2aa53a..ad4620916a 100644 --- a/dumux/discretization/cellcentered/mpfa/fvgridgeometrytraits.hh +++ b/dumux/discretization/cellcentered/mpfa/fvgridgeometrytraits.hh @@ -56,7 +56,7 @@ struct CCMpfaFVGridGeometryTraits : public DefaultMapperTraits //! We assume simplex grids where stencils can get quite large but the size is unknown static constexpr int maxElementStencilSize = int(GV::dimension) == 3 ? 150 : (int(GV::dimension) using MpfaHelper = CCMpfaHelper< FVGridGeom >; template< class FVGridGeom > diff --git a/dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh b/dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh index a0c3cbb396..5065db9def 100644 --- a/dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh +++ b/dumux/discretization/cellcentered/mpfa/gridfluxvariablescache.hh @@ -124,8 +124,8 @@ public: {} //! When global caching is enabled, precompute transmissibilities for all scv faces - template - void update(const FVGridGeometry& fvGridGeometry, + template + void update(const GridGeometry& fvGridGeometry, const GridVolumeVariables& gridVolVars, const SolutionVector& sol, bool forceUpdate = false) @@ -254,8 +254,8 @@ public: private: //! returns true if an scvf is contained in an interaction volume that touches the boundary - template - bool isEmbeddedInBoundaryIV_(const SubControlVolumeFace& scvf, const FVGridGeometry& fvGridGeometry) const + template + bool isEmbeddedInBoundaryIV_(const SubControlVolumeFace& scvf, const GridGeometry& fvGridGeometry) const { const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets(); if (fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex())) @@ -322,8 +322,8 @@ public: CCMpfaGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {} //! When global flux variables caching is disabled, we don't need to update the cache - template - void update(const FVGridGeometry& fvGridGeometry, + template + void update(const GridGeometry& fvGridGeometry, 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 5a90d9e4e5..9a56ecddb4 100644 --- a/dumux/discretization/cellcentered/mpfa/gridinteractionvolumeindexsets.hh +++ b/dumux/discretization/cellcentered/mpfa/gridinteractionvolumeindexsets.hh @@ -47,7 +47,7 @@ class CCMpfaGridInteractionVolumeIndexSets using SecondaryIVIndexSet = typename SI::Traits::IndexSet; public: - using FVGridGeometry = FVG; + using GridGeometry = FVG; using PrimaryInteractionVolume = PI; using SecondaryInteractionVolume = SI; @@ -60,7 +60,7 @@ public: * \param fvGridGeometry The finite volume geometry on the grid view * \param dualGridIdSet The index sets of the dual grid on the grid view */ - void update(FVGridGeometry& fvGridGeometry, DualGridIndexSet&& dualGridIdSet) + void update(GridGeometry& fvGridGeometry, DualGridIndexSet&& dualGridIdSet) { dualGridIndexSet_ = std::make_unique(std::move(dualGridIdSet)); diff --git a/dumux/discretization/cellcentered/mpfa/helper.hh b/dumux/discretization/cellcentered/mpfa/helper.hh index 8181a30ab7..4acc361fcb 100644 --- a/dumux/discretization/cellcentered/mpfa/helper.hh +++ b/dumux/discretization/cellcentered/mpfa/helper.hh @@ -39,23 +39,23 @@ namespace Dumux { * \ingroup CCMpfaDiscretization * \brief Dimension-specific helper class to get data required for mpfa scheme. */ -template +template class MpfaDimensionHelper; /*! * \ingroup CCMpfaDiscretization * \brief Dimension-specific mpfa helper class for dim == 2 & dimWorld == 2 */ -template -class MpfaDimensionHelper +template +class MpfaDimensionHelper { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using CoordScalar = typename GridView::ctype; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; using ScvfCornerVector = typename SubControlVolumeFace::Traits::CornerStorage; // Container to store the positions of intersections required for scvf @@ -199,11 +199,11 @@ public: * \brief Dimension-specific mpfa helper class for dim == 2 & dimWorld == 2. * Reuses some functionality of the specialization for dim = dimWorld = 2 */ -template -class MpfaDimensionHelper -: public MpfaDimensionHelper +template +class MpfaDimensionHelper +: public MpfaDimensionHelper { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using CoordScalar = typename GridView::ctype; public: @@ -260,14 +260,14 @@ public: * \brief Dimension-specific mpfa helper class for dim == 3 & dimWorld == 3. * */ -template -class MpfaDimensionHelper +template +class MpfaDimensionHelper { - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; using ScvfCornerVector = typename SubControlVolumeFace::Traits::CornerStorage; // Be picky about the dimensions - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using CoordScalar = typename GridView::ctype; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -498,22 +498,22 @@ public: * \ingroup CCMpfaDiscretization * \brief Helper class to get the required information on an interaction volume. * - * \tparam FVGridGeometry The finite volume grid geometry + * \tparam GridGeometry The finite volume grid geometry */ -template -class CCMpfaHelper : public MpfaDimensionHelper +template +class CCMpfaHelper : public MpfaDimensionHelper { - using PrimaryInteractionVolume = typename FVGridGeometry::GridIVIndexSets::PrimaryInteractionVolume; - using SecondaryInteractionVolume = typename FVGridGeometry::GridIVIndexSets::SecondaryInteractionVolume; + using PrimaryInteractionVolume = typename GridGeometry::GridIVIndexSets::PrimaryInteractionVolume; + using SecondaryInteractionVolume = typename GridGeometry::GridIVIndexSets::SecondaryInteractionVolume; - using VertexMapper = typename FVGridGeometry::VertexMapper; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using VertexMapper = typename GridGeometry::VertexMapper; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using ScvfCornerVector = typename SubControlVolumeFace::Traits::CornerStorage; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; static constexpr int dim = GridView::dimension; using Element = typename GridView::template Codim<0>::Entity; diff --git a/dumux/discretization/cellcentered/mpfa/scvgradients.hh b/dumux/discretization/cellcentered/mpfa/scvgradients.hh index dca568965e..eb783e6a6e 100644 --- a/dumux/discretization/cellcentered/mpfa/scvgradients.hh +++ b/dumux/discretization/cellcentered/mpfa/scvgradients.hh @@ -44,9 +44,9 @@ namespace Dumux { class CCMpfaScvGradients { //! Return type of the gradient computation function (pair of scv centers and corresponding gradients) - template - using ResultPair = std::pair< std::vector, - std::vector> >; + template + using ResultPair = std::pair< std::vector, + std::vector> >; public: @@ -58,9 +58,9 @@ public: * \param x The vector containing the solution * \param phaseIdx The index of the fluid phase to be considered */ - template - static ResultPair - computeVelocities(const FVGridGeometry& fvGridGeometry, + template + static ResultPair + computeVelocities(const GridGeometry& fvGridGeometry, const GridVariables& gridVariables, const SolutionVector& x, unsigned int phaseIdx) @@ -83,9 +83,9 @@ public: * \param x The vector containing the solution * \param phaseIdx The index of the fluid phase to be considered */ - template - static ResultPair - computePressureGradients(const FVGridGeometry& fvGridGeometry, + template + static ResultPair + computePressureGradients(const GridGeometry& fvGridGeometry, const GridVariables& gridVariables, const SolutionVector& x, unsigned int phaseIdx) @@ -110,16 +110,16 @@ public: * variables and returns the modified gradient. This can be * used e.g. to turn the pressure gradients into velocities. */ - template - static ResultPair - computePressureGradients(const FVGridGeometry& fvGridGeometry, + template + static ResultPair + computePressureGradients(const GridGeometry& fvGridGeometry, const GridVariables& gridVariables, const SolutionVector& x, unsigned int phaseIdx, F& f) { using ElemVolVars = typename GridVariables::GridVolumeVariables::LocalView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; auto handleFunction = [&] (auto& result, const auto& handle, @@ -146,14 +146,14 @@ private: * \brief Computes the gradients executing the provided function * on an interaction volume / data handle pair. */ - template - static ResultPair - computeGradients_(const FVGridGeometry& fvGridGeometry, + template + static ResultPair + computeGradients_(const GridGeometry& fvGridGeometry, const GridVariables& gridVariables, const SolutionVector& x, const HandleFunction& handleFunction) { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; static constexpr int dim = GridView::dimension; // first, find out how many scvs live on this grid @@ -162,7 +162,7 @@ private: for (const auto& element : elements(gridView)) numScvs += element.subEntities(dim); - ResultPair result; + ResultPair result; result.first.reserve(numScvs); result.second.reserve(numScvs); std::vector vertexHandled(gridView.size(dim), false); diff --git a/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh b/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh index 6e91c8b4f1..5ec25e498c 100644 --- a/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh +++ b/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh @@ -54,11 +54,11 @@ struct CCTpfaDefaultGridGeometryTraits using SubControlVolume = CCSubControlVolume; using SubControlVolumeFace = CCTpfaSubControlVolumeFace; - template - using ConnectivityMap = CCSimpleConnectivityMap; + template + using ConnectivityMap = CCSimpleConnectivityMap; - template - using LocalView = CCTpfaFVElementGeometry; + template + using LocalView = CCTpfaFVElementGeometry; //! State the maximum admissible number of neighbors per scvf //! Per default, we allow for 8 branches on network/surface grids, where diff --git a/dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh b/dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh index fce7d81ec3..6bdc744e92 100644 --- a/dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh +++ b/dumux/discretization/cellcentered/tpfa/gridfluxvariablescache.hh @@ -87,8 +87,8 @@ public: CCTpfaGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {} // When global caching is enabled, precompute transmissibilities and stencils for all the scv faces - template - void update(const FVGridGeometry& fvGridGeometry, + template + void update(const GridGeometry& fvGridGeometry, const GridVolumeVariables& gridVolVars, const SolutionVector& sol, bool forceUpdate = false) @@ -194,8 +194,8 @@ public: CCTpfaGridFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {} //! When global flux variables caching is disabled, we don't need to update the cache - template - void update(const FVGridGeometry& fvGridGeometry, + template + void update(const GridGeometry& fvGridGeometry, const GridVolumeVariables& gridVolVars, const SolutionVector& sol, bool forceUpdate = false) {} diff --git a/dumux/discretization/fluxstencil.hh b/dumux/discretization/fluxstencil.hh index c892fef6da..9d0169466b 100644 --- a/dumux/discretization/fluxstencil.hh +++ b/dumux/discretization/fluxstencil.hh @@ -52,9 +52,9 @@ class FluxStencil; template class FluxStencil { - using FVGridGeometry = typename FVElementGeometry::GridGeometry; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename FVElementGeometry::GridGeometry; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridIndexType = typename IndexTraits::GridIndex; @@ -92,14 +92,14 @@ public: template class FluxStencil { - using FVGridGeometry = typename FVElementGeometry::GridGeometry; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename FVElementGeometry::GridGeometry; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridIndexType = typename IndexTraits::GridIndex; // Use the stencil type of the primary interaction volume - using NodalIndexSet = typename FVGridGeometry::GridIVIndexSets::DualGridIndexSet::NodalIndexSet; + using NodalIndexSet = typename GridGeometry::GridIVIndexSets::DualGridIndexSet::NodalIndexSet; public: //! We don't know yet how many faces couple to a neighboring element diff --git a/dumux/discretization/localview.hh b/dumux/discretization/localview.hh index d05420ee8d..fc230e8b5d 100644 --- a/dumux/discretization/localview.hh +++ b/dumux/discretization/localview.hh @@ -31,7 +31,7 @@ namespace Dumux { * \ingroup Discretization * \brief Free function to get the local view of a grid cache object * \note A local object is only functional after calling its bind/bindElement method. - * \tparam GridCache the grid caching type (such as FVGridGeometry) + * \tparam GridCache the grid caching type (such as GridGeometry) * \param gridCache the grid caching object we want to localView from */ template diff --git a/dumux/discretization/staggered/facesolution.hh b/dumux/discretization/staggered/facesolution.hh index 29d3bad86c..de9db2aeb0 100644 --- a/dumux/discretization/staggered/facesolution.hh +++ b/dumux/discretization/staggered/facesolution.hh @@ -42,13 +42,13 @@ class StaggeredFaceSolution public: - template + template StaggeredFaceSolution(const SubControlVolumeFace& scvf, const FaceSolutionVector& sol, - const FVGridGeometry& fvGridGeometry) + const GridGeometry& fvGridGeometry) { const auto& connectivityMap = fvGridGeometry.connectivityMap(); - const auto& stencil = connectivityMap(FVGridGeometry::faceIdx(), FVGridGeometry::faceIdx(), scvf.index()); + const auto& stencil = connectivityMap(GridGeometry::faceIdx(), GridGeometry::faceIdx(), scvf.index()); facePriVars_.reserve(stencil.size()+1); map_.reserve(stencil.size()+1); diff --git a/dumux/discretization/staggered/freeflow/connectivitymap.hh b/dumux/discretization/staggered/freeflow/connectivitymap.hh index 23981f35b3..295ddd1b2d 100644 --- a/dumux/discretization/staggered/freeflow/connectivitymap.hh +++ b/dumux/discretization/staggered/freeflow/connectivitymap.hh @@ -34,31 +34,31 @@ namespace Dumux { * \brief Stores the dof indices corresponding to the neighboring cell centers and faces * that contribute to the derivative calculation. Specialization for the staggered free flow model. */ -template +template class StaggeredFreeFlowConnectivityMap { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; using Element = typename GridView::template Codim<0>::Entity; using GridIndexType = typename IndexTraits::GridIndex; - using CellCenterIdxType = typename FVGridGeometry::DofTypeIndices::CellCenterIdx; - using FaceIdxType = typename FVGridGeometry::DofTypeIndices::FaceIdx; + using CellCenterIdxType = typename GridGeometry::DofTypeIndices::CellCenterIdx; + using FaceIdxType = typename GridGeometry::DofTypeIndices::FaceIdx; using SmallLocalIndex = typename IndexTraits::SmallLocalIndex; using Stencil = std::vector; using Map = std::vector; - static constexpr SmallLocalIndex upwindSchemeOrder = FVGridGeometry::upwindSchemeOrder; + static constexpr SmallLocalIndex upwindSchemeOrder = GridGeometry::upwindSchemeOrder; static constexpr bool useHigherOrder = upwindSchemeOrder > 1; public: //! Update the map and prepare the stencils - void update(const FVGridGeometry& fvGridGeometry) + void update(const GridGeometry& fvGridGeometry) { const auto numDofsCC = fvGridGeometry.gridView().size(0); const auto numDofsFace = fvGridGeometry.gridView().size(1); diff --git a/dumux/discretization/staggered/freeflow/fvgridgeometrytraits.hh b/dumux/discretization/staggered/freeflow/fvgridgeometrytraits.hh index c9e8853506..f321e56e2c 100644 --- a/dumux/discretization/staggered/freeflow/fvgridgeometrytraits.hh +++ b/dumux/discretization/staggered/freeflow/fvgridgeometrytraits.hh @@ -55,11 +55,11 @@ struct StaggeredFreeFlowDefaultFVGridGeometryTraits using FaceIdx = Dune::index_constant<1>; }; - template - using ConnectivityMap = StaggeredFreeFlowConnectivityMap; + template + using ConnectivityMap = StaggeredFreeFlowConnectivityMap; - template - using LocalView = StaggeredFVElementGeometry; + template + using LocalView = StaggeredFVElementGeometry; }; } //end namespace Dumux diff --git a/dumux/discretization/staggered/freeflow/gridvolumevariables.hh b/dumux/discretization/staggered/freeflow/gridvolumevariables.hh index 580dbae39d..2a50ea4608 100644 --- a/dumux/discretization/staggered/freeflow/gridvolumevariables.hh +++ b/dumux/discretization/staggered/freeflow/gridvolumevariables.hh @@ -159,8 +159,8 @@ public: StaggeredGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {} //! Update all volume variables - template - void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol) + template + void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) { auto numScv = fvGridGeometry.numScv(); volumeVariables_.resize(numScv); @@ -176,7 +176,7 @@ public: const auto& cellCenterPriVars = sol[scv.dofIndex()]; PrimaryVariables priVars = makePriVarsFromCellCenterPriVars(cellCenterPriVars); - auto elemSol = elementSolution(std::move(priVars)); + auto elemSol = elementSolution(std::move(priVars)); volumeVariables_[scv.dofIndex()].update(elemSol, problem(), element, scv); } } @@ -239,8 +239,8 @@ public: StaggeredGridVolumeVariables(const Problem& problem) : problemPtr_(&problem) {} - template - void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol) {} + template + void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) {} const Problem& problem() const { return *problemPtr_;} diff --git a/dumux/discretization/staggered/freeflow/velocityoutput.hh b/dumux/discretization/staggered/freeflow/velocityoutput.hh index 1d4354093c..cb9b0e9a5c 100644 --- a/dumux/discretization/staggered/freeflow/velocityoutput.hh +++ b/dumux/discretization/staggered/freeflow/velocityoutput.hh @@ -37,16 +37,16 @@ template class StaggeredFreeFlowVelocityOutput : public VelocityOutput { using ParentType = VelocityOutput; - using FVGridGeometry = typename GridVariables::GridGeometry; + using GridGeometry = typename GridVariables::GridGeometry; using Scalar = typename GridVariables::Scalar; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; using GridVolumeVariables = typename GridVariables::GridVolumeVariables; using ElementVolumeVariables = typename GridVolumeVariables::LocalView; using ElementFluxVarsCache = typename GridVariables::GridFluxVariablesCache::LocalView; using VolumeVariables = typename GridVariables::VolumeVariables; using FluidSystem = typename VolumeVariables::FluidSystem; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; // TODO: should be possible to get this somehow using Problem = typename std::decay_t().problem())>; using Element = typename GridView::template Codim<0>::Entity; diff --git a/dumux/discretization/staggered/gridfacevariables.hh b/dumux/discretization/staggered/gridfacevariables.hh index 109f742f91..6ba564f6b5 100644 --- a/dumux/discretization/staggered/gridfacevariables.hh +++ b/dumux/discretization/staggered/gridfacevariables.hh @@ -81,8 +81,8 @@ public: StaggeredGridFaceVariables(const Problem& problem) : problemPtr_(&problem) {} //! Update all face variables - template - void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& faceSol) + template + void update(const GridGeometry& fvGridGeometry, const SolutionVector& faceSol) { faceVariables_.resize(fvGridGeometry.numScvf()); @@ -137,8 +137,8 @@ public: StaggeredGridFaceVariables(const Problem& problem) : problemPtr_(&problem) {} //! Do nothing here. - template - void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol) {} + template + void update(const GridGeometry& fvGridGeometry, const SolutionVector& sol) {} const Problem& problem() const { return *problemPtr_; } diff --git a/dumux/discretization/staggered/gridfluxvariablescache.hh b/dumux/discretization/staggered/gridfluxvariablescache.hh index 980da348d5..c95f7679b1 100644 --- a/dumux/discretization/staggered/gridfluxvariablescache.hh +++ b/dumux/discretization/staggered/gridfluxvariablescache.hh @@ -97,8 +97,8 @@ public: {} // When global caching is enabled, precompute transmissibilities and stencils for all the scv faces - template - void update(const FVGridGeometry& fvGridGeometry, + template + void update(const GridGeometry& fvGridGeometry, const GridVolumeVariables& gridVolVars, const SolutionVector& sol, bool forceUpdate = false) @@ -187,8 +187,8 @@ public: {} // When global caching is enabled, precompute transmissibilities and stencils for all the scv faces - template - void update(const FVGridGeometry& fvGridGeometry, + template + void update(const GridGeometry& fvGridGeometry, const GridVolumeVariables& gridVolVars, const SolutionVector& sol, bool forceUpdate = false) {} diff --git a/dumux/flux/box/darcyslaw.hh b/dumux/flux/box/darcyslaw.hh index d97dc02378..fdf0f2ccff 100644 --- a/dumux/flux/box/darcyslaw.hh +++ b/dumux/flux/box/darcyslaw.hh @@ -40,7 +40,7 @@ template class DarcysLawImplementation; // forward declaration -template +template class BoxDarcysLaw; /*! @@ -56,15 +56,15 @@ class DarcysLawImplementation * \ingroup BoxFlux * \brief Darcy's law for box schemes * \tparam Scalar the scalar type for scalar physical quantities - * \tparam FVGridGeometry the grid geometry + * \tparam GridGeometry the grid geometry */ -template +template class BoxDarcysLaw { - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using CoordScalar = typename GridView::ctype; diff --git a/dumux/flux/box/effectivestresslaw.hh b/dumux/flux/box/effectivestresslaw.hh index c51c2dad79..524d5cf294 100644 --- a/dumux/flux/box/effectivestresslaw.hh +++ b/dumux/flux/box/effectivestresslaw.hh @@ -35,16 +35,16 @@ namespace Dumux { * \brief Effective stress law for box scheme * \tparam StressType type used for the computation of * purely mechanical stresses (i.e. material law) - * \tparam FVGridGeometry the finite volume grid geometry + * \tparam GridGeometry the finite volume grid geometry */ -template -class EffectiveStressLaw +template +class EffectiveStressLaw { - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; static constexpr int dim = GridView::dimension; diff --git a/dumux/flux/box/hookeslaw.hh b/dumux/flux/box/hookeslaw.hh index 3a8a404c63..3a15e59d3e 100644 --- a/dumux/flux/box/hookeslaw.hh +++ b/dumux/flux/box/hookeslaw.hh @@ -37,16 +37,16 @@ namespace Dumux { * \ingroup BoxFlux * \brief Hooke's law for box scheme * \tparam ScalarType the scalar type for scalar physical quantities - * \tparam FVGridGeometry the grid geometry + * \tparam GridGeometry the grid geometry */ -template -class HookesLaw +template +class HookesLaw { - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; static constexpr int dim = GridView::dimension; diff --git a/dumux/flux/ccmpfa/darcyslaw.hh b/dumux/flux/ccmpfa/darcyslaw.hh index d2558effe8..61fb874476 100644 --- a/dumux/flux/ccmpfa/darcyslaw.hh +++ b/dumux/flux/ccmpfa/darcyslaw.hh @@ -54,8 +54,8 @@ class DarcysLawImplementation static constexpr int dim = GridView::dimension; static constexpr int dimWorld = GridView::dimensionworld; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using ElementVolumeVariables = typename GetPropType::LocalView; @@ -94,7 +94,7 @@ class DarcysLawImplementation using Stencil = typename DualGridNodalIndexSet::NodalGridStencilType; - static constexpr bool considerSecondaryIVs = FVGridGeometry::MpfaHelper::considerSecondaryIVs(); + static constexpr bool considerSecondaryIVs = GridGeometry::MpfaHelper::considerSecondaryIVs(); using PrimaryDataHandle = typename ElementFluxVariablesCache::PrimaryIvDataHandle::AdvectionHandle; using SecondaryDataHandle = typename ElementFluxVariablesCache::SecondaryIvDataHandle::AdvectionHandle; diff --git a/dumux/flux/ccmpfa/fickslaw.hh b/dumux/flux/ccmpfa/fickslaw.hh index c17384152c..ba45b0ab13 100644 --- a/dumux/flux/ccmpfa/fickslaw.hh +++ b/dumux/flux/ccmpfa/fickslaw.hh @@ -51,8 +51,8 @@ class FicksLawImplementation; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using FluidSystem = GetPropType; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using ElementVolumeVariables = typename GetPropType::LocalView; @@ -100,7 +100,7 @@ class FicksLawImplementation::numFluidPhases(); - static constexpr bool considerSecondaryIVs = FVGridGeometry::MpfaHelper::considerSecondaryIVs(); + static constexpr bool considerSecondaryIVs = GridGeometry::MpfaHelper::considerSecondaryIVs(); using PrimaryDataHandle = typename ElementFluxVariablesCache::PrimaryIvDataHandle::DiffusionHandle; using SecondaryDataHandle = typename ElementFluxVariablesCache::SecondaryIvDataHandle::DiffusionHandle; diff --git a/dumux/flux/ccmpfa/fourierslaw.hh b/dumux/flux/ccmpfa/fourierslaw.hh index fcb8ec28a5..b0ba06012f 100644 --- a/dumux/flux/ccmpfa/fourierslaw.hh +++ b/dumux/flux/ccmpfa/fourierslaw.hh @@ -51,8 +51,8 @@ class FouriersLawImplementation static constexpr int dim = GridView::dimension; static constexpr int dimWorld = GridView::dimensionworld; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using ElementVolumeVariables = typename GetPropType::LocalView; using ElementFluxVarsCache = typename GetPropType::LocalView; @@ -92,7 +92,7 @@ class FouriersLawImplementation using DualGridNodalIndexSet = GetPropType; using Stencil = typename DualGridNodalIndexSet::NodalGridStencilType; - static constexpr bool considerSecondaryIVs = FVGridGeometry::MpfaHelper::considerSecondaryIVs(); + static constexpr bool considerSecondaryIVs = GridGeometry::MpfaHelper::considerSecondaryIVs(); using PrimaryDataHandle = typename ElementFluxVarsCache::PrimaryIvDataHandle::HeatConductionHandle; using SecondaryDataHandle = typename ElementFluxVarsCache::SecondaryIvDataHandle::HeatConductionHandle; diff --git a/dumux/flux/cctpfa/darcyslaw.hh b/dumux/flux/cctpfa/darcyslaw.hh index 80d949f5ca..61eb7b6f83 100644 --- a/dumux/flux/cctpfa/darcyslaw.hh +++ b/dumux/flux/cctpfa/darcyslaw.hh @@ -42,10 +42,10 @@ class DarcysLawImplementation; * \brief Darcy's law for cell-centered finite volume schemes with two-point flux approximation * \note Darcy's law is specialized for network and surface grids (i.e. if grid dim < dimWorld) * \tparam Scalar the scalar type for scalar physical quantities - * \tparam FVGridGeometry the grid geometry + * \tparam GridGeometry the grid geometry * \tparam isNetwork whether we are computing on a network grid embedded in a higher world dimension */ -template +template class CCTpfaDarcysLaw; /*! @@ -64,12 +64,12 @@ class DarcysLawImplementation * \ingroup CCTpfaFlux * \brief Class that fills the cache corresponding to tpfa Darcy's Law */ -template +template class TpfaDarcysLawCacheFiller { - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; public: //! Function to fill a TpfaDarcysLawCache of a given scvf @@ -92,16 +92,16 @@ public: * \ingroup CCTpfaFlux * \brief The cache corresponding to tpfa Darcy's Law */ -template +template class TpfaDarcysLawCache { using Scalar = typename AdvectionType::Scalar; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; public: - using Filler = TpfaDarcysLawCacheFiller; + using Filler = TpfaDarcysLawCacheFiller; template void updateAdvection(const Problem& problem, @@ -124,14 +124,14 @@ private: * \ingroup CCTpfaFlux * \brief Specialization of the CCTpfaDarcysLaw grids where dim=dimWorld */ -template -class CCTpfaDarcysLaw +template +class CCTpfaDarcysLaw { - using ThisType = CCTpfaDarcysLaw; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using ThisType = CCTpfaDarcysLaw; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; static constexpr int dim = GridView::dimension; @@ -147,7 +147,7 @@ class CCTpfaDarcysLaw static const DiscretizationMethod discMethod = DiscretizationMethod::cctpfa; //! state the type for the corresponding cache - using Cache = TpfaDarcysLawCache; + using Cache = TpfaDarcysLawCache; //! Compute the advective flux template @@ -278,14 +278,14 @@ private: * \ingroup CCTpfaFlux * \brief Specialization of the CCTpfaDarcysLaw grids where dim < dimWorld (network/surface grids) */ -template -class CCTpfaDarcysLaw +template +class CCTpfaDarcysLaw { - using ThisType = CCTpfaDarcysLaw; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using ThisType = CCTpfaDarcysLaw; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; static constexpr int dim = GridView::dimension; @@ -301,7 +301,7 @@ public: static const DiscretizationMethod discMethod = DiscretizationMethod::cctpfa; //! state the type for the corresponding cache - using Cache = TpfaDarcysLawCache; + using Cache = TpfaDarcysLawCache; //! Compute the advective flux template diff --git a/dumux/flux/cctpfa/forchheimerslaw.hh b/dumux/flux/cctpfa/forchheimerslaw.hh index b721a1c12d..75203037c4 100644 --- a/dumux/flux/cctpfa/forchheimerslaw.hh +++ b/dumux/flux/cctpfa/forchheimerslaw.hh @@ -46,10 +46,10 @@ class ForchheimersLawImplementation; * \brief Forchheimer's law for cell-centered finite volume schemes with two-point flux approximation * \note Forchheimer's law is specialized for network and surface grids (i.e. if grid dim < dimWorld) * \tparam Scalar the scalar type for scalar physical quantities - * \tparam FVGridGeometry the grid geometry + * \tparam GridGeometry the grid geometry * \tparam isNetwork whether we are computing on a network grid embedded in a higher world dimension */ -template +template class CCTpfaForchheimersLaw; /*! @@ -68,12 +68,12 @@ class ForchheimersLawImplementation * \ingroup CCTpfaFlux * \brief Class that fills the cache corresponding to tpfa Forchheimer's Law */ -template +template class TpfaForchheimersLawCacheFiller { - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; public: //! Function to fill a TpfaForchheimersLawCache of a given scvf @@ -96,18 +96,18 @@ public: * \ingroup CCTpfaFlux * \brief The cache corresponding to tpfa Forchheimer's Law */ -template +template class TpfaForchheimersLawCache { using Scalar = typename AdvectionType::Scalar; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; - static constexpr int dimWorld = FVGridGeometry::GridView::dimensionworld; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; + static constexpr int dimWorld = GridGeometry::GridView::dimensionworld; using DimWorldMatrix = Dune::FieldMatrix; public: - using Filler = TpfaForchheimersLawCacheFiller; + using Filler = TpfaForchheimersLawCacheFiller; template void updateAdvection(const Problem& problem, @@ -135,14 +135,14 @@ private: * \ingroup CCTpfaFlux * \brief Specialization of the CCTpfaForchheimersLaw grids where dim=dimWorld */ -template -class CCTpfaForchheimersLaw +template +class CCTpfaForchheimersLaw { - using ThisType = CCTpfaForchheimersLaw; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using ThisType = CCTpfaForchheimersLaw; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; static constexpr int dim = GridView::dimension; @@ -152,7 +152,7 @@ class CCTpfaForchheimersLaw using DimWorldVector = Dune::FieldVector; using DimWorldMatrix = Dune::FieldMatrix; - using DarcysLaw = CCTpfaDarcysLaw; + using DarcysLaw = CCTpfaDarcysLaw; public: //! state the scalar type of the law @@ -162,7 +162,7 @@ class CCTpfaForchheimersLaw static const DiscretizationMethod discMethod = DiscretizationMethod::cctpfa; //! state the type for the corresponding cache - using Cache = TpfaForchheimersLawCache; + using Cache = TpfaForchheimersLawCache; /*! \brief Compute the advective flux using the Forchheimer equation * @@ -547,8 +547,8 @@ private: * \ingroup CCTpfaFlux * \brief Specialization of the CCTpfaForchheimersLaw grids where dim -class CCTpfaForchheimersLaw +template +class CCTpfaForchheimersLaw { static_assert(AlwaysFalse::value, "Forchheimer not implemented for network grids"); }; diff --git a/dumux/flux/effectivestresslaw.hh b/dumux/flux/effectivestresslaw.hh index 4779166566..4ec9a0b6fb 100644 --- a/dumux/flux/effectivestresslaw.hh +++ b/dumux/flux/effectivestresslaw.hh @@ -35,7 +35,7 @@ namespace Dumux { * \note Specializations are provided for the different discretization methods. * These specializations are found in the headers included below. */ -template +template class EffectiveStressLaw; } // end namespace Dumux diff --git a/dumux/flux/hookeslaw.hh b/dumux/flux/hookeslaw.hh index a7a7e35e5c..a194ea95c0 100644 --- a/dumux/flux/hookeslaw.hh +++ b/dumux/flux/hookeslaw.hh @@ -35,7 +35,7 @@ namespace Dumux { * \note Specializations are provided for the different discretization methods. * These specializations are found in the headers included below. */ -template +template class HookesLaw; } // end namespace Dumux diff --git a/dumux/flux/staggered/freeflow/fickslaw.hh b/dumux/flux/staggered/freeflow/fickslaw.hh index 2f47965913..68c00c76da 100644 --- a/dumux/flux/staggered/freeflow/fickslaw.hh +++ b/dumux/flux/staggered/freeflow/fickslaw.hh @@ -50,10 +50,10 @@ template class FicksLawImplementation { using Scalar = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; using ModelTraits = GetPropType; diff --git a/dumux/flux/staggered/freeflow/fourierslaw.hh b/dumux/flux/staggered/freeflow/fourierslaw.hh index d810450d01..436b411095 100644 --- a/dumux/flux/staggered/freeflow/fourierslaw.hh +++ b/dumux/flux/staggered/freeflow/fourierslaw.hh @@ -44,11 +44,11 @@ template class FouriersLawImplementation { using Scalar = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using ElementVolumeVariables = typename GetPropType::LocalView; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using Indices = typename GetPropType::Indices; public: diff --git a/dumux/flux/staggered/freeflow/maxwellstefanslaw.hh b/dumux/flux/staggered/freeflow/maxwellstefanslaw.hh index 175c5f5345..965039346f 100644 --- a/dumux/flux/staggered/freeflow/maxwellstefanslaw.hh +++ b/dumux/flux/staggered/freeflow/maxwellstefanslaw.hh @@ -48,10 +48,10 @@ class MaxwellStefansLawImplementation; using Problem = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; using VolumeVariables = GetPropType; diff --git a/dumux/flux/upwindscheme.hh b/dumux/flux/upwindscheme.hh index a292d5bc4e..fae491c222 100644 --- a/dumux/flux/upwindscheme.hh +++ b/dumux/flux/upwindscheme.hh @@ -30,7 +30,7 @@ namespace Dumux { //! Forward declaration of the upwind scheme implementation -template +template class UpwindSchemeImpl; /*! @@ -38,12 +38,12 @@ class UpwindSchemeImpl; * \brief The upwind scheme used for the advective fluxes. * This depends on the chosen discretization method. */ -template -using UpwindScheme = UpwindSchemeImpl; +template +using UpwindScheme = UpwindSchemeImpl; //! Upwind scheme for the box method -template -class UpwindSchemeImpl +template +class UpwindSchemeImpl { public: // applies a simple upwind scheme to the precalculated advective flux @@ -72,10 +72,10 @@ public: }; //! Upwind scheme for the cell-centered tpfa scheme -template -class UpwindSchemeImpl +template +class UpwindSchemeImpl { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; static constexpr int dim = GridView::dimension; static constexpr int dimWorld = GridView::dimensionworld; @@ -183,9 +183,9 @@ public: }; //! Upwind scheme for cell-centered mpfa schemes -template -class UpwindSchemeImpl -: public UpwindSchemeImpl {}; +template +class UpwindSchemeImpl +: public UpwindSchemeImpl {}; } // end namespace Dumux diff --git a/dumux/freeflow/compositional/staggered/fluxvariables.hh b/dumux/freeflow/compositional/staggered/fluxvariables.hh index d122c7eca7..f1b5212a82 100644 --- a/dumux/freeflow/compositional/staggered/fluxvariables.hh +++ b/dumux/freeflow/compositional/staggered/fluxvariables.hh @@ -47,9 +47,9 @@ class FreeflowNCFluxVariablesImpl { using ParentType = NavierStokesFluxVariables; using Problem = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using CellCenterPrimaryVariables = GetPropType; using FluidSystem = GetPropType; diff --git a/dumux/freeflow/compositional/staggered/localresidual.hh b/dumux/freeflow/compositional/staggered/localresidual.hh index 4821df6825..d7883e8b3f 100644 --- a/dumux/freeflow/compositional/staggered/localresidual.hh +++ b/dumux/freeflow/compositional/staggered/localresidual.hh @@ -46,8 +46,8 @@ class FreeflowNCResidualImpl using Scalar = GetPropType; using Problem = GetPropType; - using FVGridGeometry = GetPropType; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; diff --git a/dumux/freeflow/navierstokes/problem.hh b/dumux/freeflow/navierstokes/problem.hh index 16da4bc530..c71fa0c2f9 100644 --- a/dumux/freeflow/navierstokes/problem.hh +++ b/dumux/freeflow/navierstokes/problem.hh @@ -64,8 +64,8 @@ class NavierStokesProblem : public NavierStokesParentProblem using ParentType = NavierStokesParentProblem; using Implementation = GetPropType; - using FVGridGeometry = GetPropType; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridVariables = GetPropType; @@ -76,7 +76,7 @@ class NavierStokesProblem : public NavierStokesParentProblem using ElementVolumeVariables = typename GridVolumeVariables::LocalView; using Scalar = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using PrimaryVariables = GetPropType; @@ -96,7 +96,7 @@ public: * \param fvGridGeometry The finite volume grid geometry * \param paramGroup The parameter group in which to look for runtime parameters first (default is "") */ - NavierStokesProblem(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + NavierStokesProblem(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) , gravity_(0.0) { @@ -141,13 +141,13 @@ public: { return enableInertiaTerms_; } //! Applys the initial face solution (velocities on the faces). Specialization for staggered grid discretization. - template + template typename std::enable_if::type applyInitialFaceSolution(SolutionVector& sol, const SubControlVolumeFace& scvf, const PrimaryVariables& initSol) const { - sol[FVGridGeometry::faceIdx()][scvf.dofIndex()][0] = initSol[Indices::velocity(scvf.directionIndex())]; + sol[GridGeometry::faceIdx()][scvf.dofIndex()][0] = initSol[Indices::velocity(scvf.directionIndex())]; } @@ -174,7 +174,7 @@ public: } //! Convenience function for staggered grid implementation. - template + template typename std::enable_if::type pseudo3DWallFriction(const SubControlVolumeFace& scvf, const ElementVolumeVariables& elemVolVars, diff --git a/dumux/freeflow/navierstokes/staggered/fluxoversurface.hh b/dumux/freeflow/navierstokes/staggered/fluxoversurface.hh index 5e3bdcad24..30d3e638ec 100644 --- a/dumux/freeflow/navierstokes/staggered/fluxoversurface.hh +++ b/dumux/freeflow/navierstokes/staggered/fluxoversurface.hh @@ -49,14 +49,14 @@ template::Entity; - using CellCenterPrimaryVariables = std::decay_t()[FVGridGeometry::cellCenterIdx()][0])>; + using CellCenterPrimaryVariables = std::decay_t()[GridGeometry::cellCenterIdx()][0])>; enum { // Grid and world dimension diff --git a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh index 7a1431ad5b..180170856f 100644 --- a/dumux/freeflow/navierstokes/staggered/fluxvariables.hh +++ b/dumux/freeflow/navierstokes/staggered/fluxvariables.hh @@ -70,9 +70,9 @@ class NavierStokesFluxVariablesImpl using FaceVariables = typename GridFaceVariables::FaceVariables; using Problem = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using ModelTraits = GetPropType; @@ -81,14 +81,14 @@ class NavierStokesFluxVariablesImpl using CellCenterPrimaryVariables = GetPropType; using FacePrimaryVariables = GetPropType; using BoundaryTypes = GetPropType; - using VelocityGradients = StaggeredVelocityGradients; + using VelocityGradients = StaggeredVelocityGradients; static constexpr bool normalizePressure = getPropValue(); using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - static constexpr auto cellCenterIdx = FVGridGeometry::cellCenterIdx(); - static constexpr auto faceIdx = FVGridGeometry::faceIdx(); + static constexpr auto cellCenterIdx = GridGeometry::cellCenterIdx(); + static constexpr auto faceIdx = GridGeometry::faceIdx(); static constexpr int upwindSchemeOrder = getPropValue(); static constexpr bool useHigherOrder = upwindSchemeOrder > 1; diff --git a/dumux/freeflow/navierstokes/staggered/localresidual.hh b/dumux/freeflow/navierstokes/staggered/localresidual.hh index b80121ce26..7a57d81386 100644 --- a/dumux/freeflow/navierstokes/staggered/localresidual.hh +++ b/dumux/freeflow/navierstokes/staggered/localresidual.hh @@ -62,9 +62,9 @@ class NavierStokesResidualImpl using Scalar = GetPropType; using Implementation = GetPropType; using Problem = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; @@ -80,7 +80,7 @@ class NavierStokesResidualImpl using ModelTraits = GetPropType; public: - using EnergyLocalResidual = FreeFlowEnergyLocalResidual 1)>; + using EnergyLocalResidual = FreeFlowEnergyLocalResidual 1)>; // account for the offset of the cell center privars within the PrimaryVariables container static constexpr auto cellCenterOffset = ModelTraits::numEq() - CellCenterPrimaryVariables::dimension; diff --git a/dumux/freeflow/navierstokes/staggered/staggeredupwindfluxvariables.hh b/dumux/freeflow/navierstokes/staggered/staggeredupwindfluxvariables.hh index 06580bedeb..4e31009d9f 100644 --- a/dumux/freeflow/navierstokes/staggered/staggeredupwindfluxvariables.hh +++ b/dumux/freeflow/navierstokes/staggered/staggeredupwindfluxvariables.hh @@ -58,9 +58,9 @@ class StaggeredUpwindFluxVariables using FaceVariables = typename GridFaceVariables::FaceVariables; using Problem = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using ModelTraits = GetPropType; @@ -70,7 +70,7 @@ class StaggeredUpwindFluxVariables using CellCenterPrimaryVariables = GetPropType; using FacePrimaryVariables = GetPropType; using BoundaryTypes = GetPropType; - using VelocityGradients = StaggeredVelocityGradients; + using VelocityGradients = StaggeredVelocityGradients; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; static constexpr bool useHigherOrder = upwindSchemeOrder > 1; diff --git a/dumux/freeflow/navierstokes/staggered/velocitygradients.hh b/dumux/freeflow/navierstokes/staggered/velocitygradients.hh index 6b81f1e4f5..f9d7a58edc 100644 --- a/dumux/freeflow/navierstokes/staggered/velocitygradients.hh +++ b/dumux/freeflow/navierstokes/staggered/velocitygradients.hh @@ -34,11 +34,11 @@ namespace Dumux { * \ingroup NavierStokesModel * \brief Helper class for calculating the velocity gradients for the Navier-Stokes model using the staggered grid discretization. */ -template +template class StaggeredVelocityGradients { - using FVElementGeometry = typename FVGridGeometry::LocalView; - using GridView = typename FVGridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/dumux/freeflow/nonisothermal/localresidual.hh b/dumux/freeflow/nonisothermal/localresidual.hh index abb3676f68..1a681c5ddd 100644 --- a/dumux/freeflow/nonisothermal/localresidual.hh +++ b/dumux/freeflow/nonisothermal/localresidual.hh @@ -30,7 +30,7 @@ namespace Dumux { // forward declaration -template +template class FreeFlowEnergyLocalResidualImplementation; /*! @@ -38,19 +38,19 @@ class FreeFlowEnergyLocalResidualImplementation; * \brief Element-wise calculation of the local residual for non-isothermal * free-flow models */ -template +template using FreeFlowEnergyLocalResidual = - FreeFlowEnergyLocalResidualImplementation; /*! * \ingroup FreeflowNIModel * \brief Specialization for isothermal models, does nothing */ -template -class FreeFlowEnergyLocalResidualImplementation +template +class FreeFlowEnergyLocalResidualImplementation { public: @@ -69,14 +69,14 @@ public: * \ingroup FreeflowNIModel * \brief Specialization for staggered one-phase, non-isothermal models */ -template -class FreeFlowEnergyLocalResidualImplementation +class FreeFlowEnergyLocalResidualImplementation { - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; public: @@ -121,22 +121,22 @@ public: * \ingroup FreeflowNIModel * \brief Specialization for staggered compositional, non-isothermal models */ -template -class FreeFlowEnergyLocalResidualImplementation +class FreeFlowEnergyLocalResidualImplementation - : public FreeFlowEnergyLocalResidualImplementation { - using ParentType = FreeFlowEnergyLocalResidualImplementation; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; public: diff --git a/dumux/freeflow/rans/oneeq/problem.hh b/dumux/freeflow/rans/oneeq/problem.hh index fb549c7d9b..24cefd36ec 100644 --- a/dumux/freeflow/rans/oneeq/problem.hh +++ b/dumux/freeflow/rans/oneeq/problem.hh @@ -54,7 +54,7 @@ class RANSProblemImpl : public RANSProblemBase< using Scalar = GetPropType; using DimVector = Dune::FieldVector; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; @@ -66,7 +66,7 @@ class RANSProblemImpl : public RANSProblemBase< public: //! The constructor sets the gravity, if desired by the user. - RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) { useStoredEddyViscosity_ = getParamFromGroup(this->paramGroup(), @@ -104,9 +104,9 @@ public: for (auto&& scv : scvs(fvGeometry)) { const int dofIdx = scv.dofIndex(); - const auto& cellCenterPriVars = curSol[FVGridGeometry::cellCenterIdx()][dofIdx]; + const auto& cellCenterPriVars = curSol[GridGeometry::cellCenterIdx()][dofIdx]; PrimaryVariables priVars = makePriVarsFromCellCenterPriVars(cellCenterPriVars); - auto elemSol = elementSolution(std::move(priVars)); + auto elemSol = elementSolution(std::move(priVars)); // NOTE: first update the turbulence quantities storedViscosityTilde_[elementIdx] = elemSol[0][Indices::viscosityTildeIdx]; // NOTE: then update the volVars diff --git a/dumux/freeflow/rans/problem.hh b/dumux/freeflow/rans/problem.hh index 1eec0b8023..4bf26f17f9 100644 --- a/dumux/freeflow/rans/problem.hh +++ b/dumux/freeflow/rans/problem.hh @@ -60,9 +60,9 @@ class RANSProblemBase : public NavierStokesProblem using Scalar = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; @@ -85,7 +85,7 @@ public: * \param fvGridGeometry The finite volume grid geometry * \param paramGroup The parameter group in which to look for runtime parameters first (default is "") */ - RANSProblemBase(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + RANSProblemBase(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) { } @@ -251,7 +251,7 @@ public: for (auto&& scvf : scvfs(fvGeometry)) { const int dofIdxFace = scvf.dofIndex(); - const auto numericalSolutionFace = curSol[FVGridGeometry::faceIdx()][dofIdxFace][Indices::velocity(scvf.directionIndex())]; + const auto numericalSolutionFace = curSol[GridGeometry::faceIdx()][dofIdxFace][Indices::velocity(scvf.directionIndex())]; velocityTemp[scvf.directionIndex()] += numericalSolutionFace; } for (unsigned int dimIdx = 0; dimIdx < dim; ++dimIdx) @@ -416,9 +416,9 @@ public: const int dofIdx = scv.dofIndex(); // construct a privars object from the cell center solution vector - const auto& cellCenterPriVars = curSol[FVGridGeometry::cellCenterIdx()][dofIdx]; + const auto& cellCenterPriVars = curSol[GridGeometry::cellCenterIdx()][dofIdx]; PrimaryVariables priVars = makePriVarsFromCellCenterPriVars(cellCenterPriVars); - auto elemSol = elementSolution(std::move(priVars)); + auto elemSol = elementSolution(std::move(priVars)); VolumeVariables volVars; volVars.update(elemSol, asImp_(), element, scv); diff --git a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh index e56c56fb2a..dedcfbcfe2 100644 --- a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh +++ b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh @@ -51,8 +51,8 @@ class RANSProblemImpl : public RANSProblemBa using Implementation = GetPropType; using Scalar = GetPropType; - using FVGridGeometry = GetPropType; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridVariables = GetPropType; @@ -83,7 +83,7 @@ class RANSProblemImpl : public RANSProblemBa public: //! The constructor sets the gravity, if desired by the user. - RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) { yPlusThreshold_ = getParamFromGroup(this->paramGroup(), "KEpsilon.YPlusThreshold", 30); @@ -125,9 +125,9 @@ public: for (auto&& scv : scvs(fvGeometry)) { const int dofIdx = scv.dofIndex(); - const auto& cellCenterPriVars = curSol[FVGridGeometry::cellCenterIdx()][dofIdx]; + const auto& cellCenterPriVars = curSol[GridGeometry::cellCenterIdx()][dofIdx]; PrimaryVariables priVars = makePriVarsFromCellCenterPriVars(cellCenterPriVars); - auto elemSol = elementSolution(std::move(priVars)); + auto elemSol = elementSolution(std::move(priVars)); // NOTE: first update the turbulence quantities storedDissipation_[elementIdx] = elemSol[0][Indices::dissipationEqIdx]; storedTurbulentKineticEnergy_[elementIdx] = elemSol[0][Indices::turbulentKineticEnergyEqIdx]; diff --git a/dumux/freeflow/rans/twoeq/komega/problem.hh b/dumux/freeflow/rans/twoeq/komega/problem.hh index 98b08b3b6f..ea4f67949d 100644 --- a/dumux/freeflow/rans/twoeq/komega/problem.hh +++ b/dumux/freeflow/rans/twoeq/komega/problem.hh @@ -49,7 +49,7 @@ class RANSProblemImpl : public RANSProblemBase using Implementation = GetPropType; using Scalar = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using VolumeVariables = GetPropType; @@ -58,11 +58,11 @@ class RANSProblemImpl : public RANSProblemBase using CellCenterPrimaryVariables = GetPropType; using Indices = typename GetPropType::Indices; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using DimVector = typename Element::Geometry::GlobalCoordinate; public: - RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) { useStoredEddyViscosity_ = getParamFromGroup(this->paramGroup(), "RANS.UseStoredEddyViscosity", false); @@ -101,9 +101,9 @@ public: for (auto&& scv : scvs(fvGeometry)) { const int dofIdx = scv.dofIndex(); - const auto& cellCenterPriVars = curSol[FVGridGeometry::cellCenterIdx()][dofIdx]; + const auto& cellCenterPriVars = curSol[GridGeometry::cellCenterIdx()][dofIdx]; PrimaryVariables priVars = makePriVarsFromCellCenterPriVars(cellCenterPriVars); - auto elemSol = elementSolution(std::move(priVars)); + auto elemSol = elementSolution(std::move(priVars)); // NOTE: first update the turbulence quantities storedDissipation_[elementIdx] = elemSol[0][Indices::dissipationEqIdx]; storedTurbulentKineticEnergy_[elementIdx] = elemSol[0][Indices::turbulentKineticEnergyEqIdx]; diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/problem.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/problem.hh index ac72248784..0166607d99 100644 --- a/dumux/freeflow/rans/twoeq/lowrekepsilon/problem.hh +++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/problem.hh @@ -49,7 +49,7 @@ class RANSProblemImpl : public RANSProb using Implementation = GetPropType; using Scalar = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using VolumeVariables = GetPropType; @@ -60,7 +60,7 @@ class RANSProblemImpl : public RANSProb public: //! The constructor sets the gravity, if desired by the user. - RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) { useStoredEddyViscosity_ = getParamFromGroup(this->paramGroup(), "RANS.UseStoredEddyViscosity", true); @@ -97,9 +97,9 @@ public: for (auto&& scv : scvs(fvGeometry)) { const int dofIdx = scv.dofIndex(); - const auto& cellCenterPriVars = curSol[FVGridGeometry::cellCenterIdx()][dofIdx]; + const auto& cellCenterPriVars = curSol[GridGeometry::cellCenterIdx()][dofIdx]; PrimaryVariables priVars = makePriVarsFromCellCenterPriVars(cellCenterPriVars); - auto elemSol = elementSolution(std::move(priVars)); + auto elemSol = elementSolution(std::move(priVars)); // NOTE: first update the turbulence quantities storedDissipationTilde_[elementIdx] = elemSol[0][Indices::dissipationEqIdx]; storedTurbulentKineticEnergy_[elementIdx] = elemSol[0][Indices::turbulentKineticEnergyEqIdx]; diff --git a/dumux/freeflow/rans/zeroeq/problem.hh b/dumux/freeflow/rans/zeroeq/problem.hh index dc2a5d0b55..c421ddd91b 100644 --- a/dumux/freeflow/rans/zeroeq/problem.hh +++ b/dumux/freeflow/rans/zeroeq/problem.hh @@ -54,7 +54,7 @@ class RANSProblemImpl : public RANSProblemBase using Grid = typename GridView::Grid; using Scalar = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using VolumeVariables = GetPropType; @@ -75,7 +75,7 @@ public: * \param fvGridGeometry The finite volume grid geometry * \param paramGroup The parameter group in which to look for runtime parameters first (default is "") */ - RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) { eddyViscosityModel_ = getParamFromGroup(paramGroup, "RANS.EddyViscosityModel", "vanDriest"); @@ -120,9 +120,9 @@ public: const int dofIdx = scv.dofIndex(); // construct a privars object from the cell center solution vector - const auto& cellCenterPriVars = curSol[FVGridGeometry::cellCenterIdx()][dofIdx]; + const auto& cellCenterPriVars = curSol[GridGeometry::cellCenterIdx()][dofIdx]; PrimaryVariables priVars = makePriVarsFromCellCenterPriVars(cellCenterPriVars); - auto elemSol = elementSolution(std::move(priVars)); + auto elemSol = elementSolution(std::move(priVars)); VolumeVariables volVars; volVars.update(elemSol, asImp_(), element, scv); diff --git a/dumux/freeflow/shallowwater/fluxvariables.hh b/dumux/freeflow/shallowwater/fluxvariables.hh index d37861c6f0..57daf7e066 100644 --- a/dumux/freeflow/shallowwater/fluxvariables.hh +++ b/dumux/freeflow/shallowwater/fluxvariables.hh @@ -49,9 +49,9 @@ class ShallowWaterFluxVariables using GridVariables = GetPropType; using GridVolumeVariables = typename GridVariables::GridVolumeVariables; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GridVolumeVariables::LocalView; diff --git a/dumux/freeflow/shallowwater/problem.hh b/dumux/freeflow/shallowwater/problem.hh index d05e4bf4f0..f088dcde47 100644 --- a/dumux/freeflow/shallowwater/problem.hh +++ b/dumux/freeflow/shallowwater/problem.hh @@ -38,7 +38,7 @@ template class ShallowWaterProblem : public FVProblem { using ParentType = FVProblem; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; public: using SpatialParams = GetPropType; @@ -50,7 +50,7 @@ public: * \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 fvGridGeometry, + ShallowWaterProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) @@ -63,7 +63,7 @@ public: * \param fvGridGeometry The finite volume grid geometry * \param paramGroup The parameter group in which to look for runtime parameters first (default is "") */ - ShallowWaterProblem(std::shared_ptr fvGridGeometry, + ShallowWaterProblem(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ShallowWaterProblem(fvGridGeometry, std::make_shared(fvGridGeometry), diff --git a/dumux/geomechanics/fvproblem.hh b/dumux/geomechanics/fvproblem.hh index daa8b22923..6329fa7db9 100644 --- a/dumux/geomechanics/fvproblem.hh +++ b/dumux/geomechanics/fvproblem.hh @@ -69,9 +69,9 @@ class GeomechanicsFVProblem : public PorousMediumFlowProblem using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; using GridView = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/dumux/geomechanics/poroelastic/couplingmanager.hh b/dumux/geomechanics/poroelastic/couplingmanager.hh index 7f981653e0..a25a897edf 100644 --- a/dumux/geomechanics/poroelastic/couplingmanager.hh +++ b/dumux/geomechanics/poroelastic/couplingmanager.hh @@ -67,9 +67,9 @@ class PoroMechanicsCouplingManager : public virtual CouplingManager< MDTraits > template using GridVolumeVariables = typename GridVariables::GridVolumeVariables; template using ElementVolumeVariables = typename GridVolumeVariables::LocalView; template using VolumeVariables = typename GridVolumeVariables::VolumeVariables; - template using FVGridGeometry = typename GridVariables::GridGeometry; - template using FVElementGeometry = typename FVGridGeometry::LocalView; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = typename GridVariables::GridGeometry; + template using FVElementGeometry = typename GridGeometry::LocalView; + template using GridView = typename GridGeometry::GridView; template using GridIndexType = typename GridView::IndexSet::IndexType; template using Element = typename GridView::template Codim<0>::Entity; template using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -79,11 +79,11 @@ class PoroMechanicsCouplingManager : public virtual CouplingManager< MDTraits > "The grid types of the two sub-problems have to be equal!"); //! this coupling manager is for cc - box only - static_assert(FVGridGeometry::discMethod == DiscretizationMethod::box, + static_assert(GridGeometry::discMethod == DiscretizationMethod::box, "Poro-mechanical problem must be discretized with the box scheme for this coupling manager!"); - static_assert(FVGridGeometry::discMethod == DiscretizationMethod::cctpfa || - FVGridGeometry::discMethod == DiscretizationMethod::ccmpfa, + static_assert(GridGeometry::discMethod == DiscretizationMethod::cctpfa || + GridGeometry::discMethod == DiscretizationMethod::ccmpfa, "Porous medium flow problem must be discretized with a cell-centered scheme for this coupling manager!"); //! this does not work for enabled grid volume variables caching (update of local view in context has no effect) diff --git a/dumux/geomechanics/poroelastic/model.hh b/dumux/geomechanics/poroelastic/model.hh index ef4c337e51..5bd888dacb 100644 --- a/dumux/geomechanics/poroelastic/model.hh +++ b/dumux/geomechanics/poroelastic/model.hh @@ -115,10 +115,10 @@ struct StressType { private: using Scalar = GetPropType; - using FVGridGeometry = GetPropType; - using ElasticStressType = HookesLaw< Scalar, FVGridGeometry >; + using GridGeometry = GetPropType; + using ElasticStressType = HookesLaw< Scalar, GridGeometry >; public: - using type = EffectiveStressLaw< ElasticStressType, FVGridGeometry >; + using type = EffectiveStressLaw< ElasticStressType, GridGeometry >; }; } // namespace Properties diff --git a/dumux/geomechanics/stressvariablescache.hh b/dumux/geomechanics/stressvariablescache.hh index e1c79f34cb..f32d48abe6 100644 --- a/dumux/geomechanics/stressvariablescache.hh +++ b/dumux/geomechanics/stressvariablescache.hh @@ -37,18 +37,18 @@ namespace Dumux { * \brief The stress variables cache classes for models involving geomechanics. * Store data required for stress calculation. */ -template< class Scalar, class FVGridGeometry, DiscretizationMethod dm = FVGridGeometry::discMethod > +template< class Scalar, class GridGeometry, DiscretizationMethod dm = GridGeometry::discMethod > class StressVariablesCache; //! We only store discretization-related quantities for the box method. -template< class Scalar, class FVGridGeometry > -class StressVariablesCache -: public BoxFluxVariablesCache< Scalar, FVGridGeometry > +template< class Scalar, class GridGeometry > +class StressVariablesCache +: public BoxFluxVariablesCache< Scalar, GridGeometry > {}; // specialization for the cell centered tpfa method -template< class Scalar, class FVGridGeometry > -class StressVariablesCache +template< class Scalar, class GridGeometry > +class StressVariablesCache : public FluxVariablesCaching::_EmptyCache { public: @@ -75,9 +75,9 @@ public: }; // specialization for the cell centered mpfa method -template< class Scalar, class FVGridGeometry > -class StressVariablesCache -: public StressVariablesCache +template< class Scalar, class GridGeometry > +class StressVariablesCache +: public StressVariablesCache {}; } // end namespace Dumux diff --git a/dumux/io/loadsolution.hh b/dumux/io/loadsolution.hh index 2653367833..69dc499ebf 100644 --- a/dumux/io/loadsolution.hh +++ b/dumux/io/loadsolution.hh @@ -98,18 +98,18 @@ private: * \ingroup InputOutput * \brief read from a vtk file into a solution vector with primary variables without state */ -template +template auto loadSolutionFromVtkFile(SolutionVector& sol, const std::string fileName, PvNameFunc&& pvNameFunc, - const FVGridGeometry& fvGridGeometry, + const GridGeometry& fvGridGeometry, const VTKReader::DataType& dataType) -> typename std::enable_if_t { VTKReader vtu(fileName); using PrimaryVariables = typename SolutionVector::block_type; using Scalar = typename PrimaryVariables::field_type; - constexpr auto dim = FVGridGeometry::GridView::dimension; + constexpr auto dim = GridGeometry::GridView::dimension; for (size_t pvIdx = 0; pvIdx < PrimaryVariables::dimension; ++pvIdx) { @@ -126,7 +126,7 @@ auto loadSolutionFromVtkFile(SolutionVector& sol, } } // for staggered face data (which is written out as VTK point data) we just read in the vector - else if (dataType == VTKReader::DataType::pointData && FVGridGeometry::discMethod == DiscretizationMethod::staggered) + else if (dataType == VTKReader::DataType::pointData && GridGeometry::discMethod == DiscretizationMethod::staggered) { if (sol.size() != vec.size()) DUNE_THROW(Dune::InvalidStateException, "Solution size (" << sol.size() << ") does not match input size (" << vec.size() << ")!"); @@ -158,11 +158,11 @@ auto loadSolutionFromVtkFile(SolutionVector& sol, * \ingroup InputOutput * \brief read from a sequential file into a solution vector with primary variables with state */ -template +template auto loadSolutionFromVtkFile(SolutionVector& sol, const std::string fileName, PvNameFunc&& pvNameFunc, - const FVGridGeometry& fvGridGeometry, + const GridGeometry& fvGridGeometry, const VTKReader::DataType& dataType) -> typename std::enable_if_t { @@ -198,7 +198,7 @@ auto loadSolutionFromVtkFile(SolutionVector& sol, else { std::size_t i = 0; - constexpr int dim = FVGridGeometry::GridView::dimension; + constexpr int dim = GridGeometry::GridView::dimension; std::vector visited(fvGridGeometry.gridView().size(dim), false); for (const auto& element : elements(fvGridGeometry.gridView(), Dune::Partitions::interior)) { @@ -274,26 +274,26 @@ auto createPVNameFunction(const std::string& paramGroup = "") * 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 */ -template +template void loadSolution(SolutionVector& sol, const std::string& fileName, PvNameFunc&& pvNameFunc, - const FVGridGeometry& fvGridGeometry) + const GridGeometry& fvGridGeometry) { const auto extension = fileName.substr(fileName.find_last_of(".") + 1); - auto dataType = FVGridGeometry::discMethod == DiscretizationMethod::box ? + auto dataType = GridGeometry::discMethod == DiscretizationMethod::box ? VTKReader::DataType::pointData : VTKReader::DataType::cellData; if (extension == "vtu" || extension == "vtp") { - if (FVGridGeometry::discMethod == DiscretizationMethod::staggered && extension == "vtp") + if (GridGeometry::discMethod == DiscretizationMethod::staggered && extension == "vtp") dataType = VTKReader::DataType::pointData; loadSolutionFromVtkFile(sol, fileName, pvNameFunc, fvGridGeometry, dataType); } else if (extension == "pvtu" || extension == "pvtp") { - if (FVGridGeometry::discMethod == DiscretizationMethod::staggered) + if (GridGeometry::discMethod == DiscretizationMethod::staggered) DUNE_THROW(Dune::NotImplemented, "reading staggered solution from a parallel vtk file"); loadSolutionFromVtkFile(sol, fileName, pvNameFunc, fvGridGeometry, dataType); @@ -304,10 +304,10 @@ void loadSolution(SolutionVector& sol, // communicate solution on ghost and overlap dofs if (fvGridGeometry.gridView().comm().size() > 1) { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; if (dataType == VTKReader::DataType::cellData) { - LoadSolutionDataHandle + LoadSolutionDataHandle dataHandle(sol, fvGridGeometry.elementMapper()); fvGridGeometry.gridView().communicate(dataHandle, Dune::InteriorBorder_All_Interface, @@ -315,7 +315,7 @@ void loadSolution(SolutionVector& sol, } else { - LoadSolutionDataHandle + LoadSolutionDataHandle dataHandle(sol, fvGridGeometry.vertexMapper()); fvGridGeometry.gridView().communicate(dataHandle, Dune::InteriorBorder_All_Interface, diff --git a/dumux/io/staggeredvtkoutputmodule.hh b/dumux/io/staggeredvtkoutputmodule.hh index 020dcfaf4c..d5eabc3727 100644 --- a/dumux/io/staggeredvtkoutputmodule.hh +++ b/dumux/io/staggeredvtkoutputmodule.hh @@ -49,11 +49,11 @@ class StaggeredVtkOutputModule : public VtkOutputModule { using ParentType = VtkOutputModule; - using FVGridGeometry = typename GridVariables::GridGeometry; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using GridView = typename GridGeometry::GridView; using Scalar = typename GridVariables::Scalar; using FaceVariables = typename GridVariables::GridFaceVariables::FaceVariables; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using Element = typename GridView::template Codim<0>::Entity; diff --git a/dumux/io/vtkoutputmodule.hh b/dumux/io/vtkoutputmodule.hh index 2c4cb087b3..6915e8b5b6 100644 --- a/dumux/io/vtkoutputmodule.hh +++ b/dumux/io/vtkoutputmodule.hh @@ -64,12 +64,12 @@ namespace Dumux { template class VtkOutputModule { - using FVGridGeometry = typename GridVariables::GridGeometry; + using GridGeometry = typename GridVariables::GridGeometry; using VV = typename GridVariables::VolumeVariables; using Scalar = typename GridVariables::Scalar; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; enum { dim = GridView::dimension, @@ -79,7 +79,7 @@ class VtkOutputModule using Element = typename GridView::template Codim<0>::Entity; using VolVarsVector = Dune::FieldVector; - static constexpr bool isBox = FVGridGeometry::discMethod == DiscretizationMethod::box; + static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box; static constexpr int dofCodim = isBox ? dim : 0; struct VolVarScalarDataInfo { std::function get; std::string name; }; @@ -230,7 +230,7 @@ public: protected: // some return functions for differing implementations to use const auto& problem() const { return gridVariables_.curGridVolVars().problem(); } - const FVGridGeometry& fvGridGeometry() const { return gridVariables_.gridGeometry(); } + const GridGeometry& fvGridGeometry() const { return gridVariables_.gridGeometry(); } const GridVariables& gridVariables() const { return gridVariables_; } const SolutionVector& sol() const { return sol_; } diff --git a/dumux/linear/amgtraits.hh b/dumux/linear/amgtraits.hh index a1c66c527f..942f68ee65 100644 --- a/dumux/linear/amgtraits.hh +++ b/dumux/linear/amgtraits.hh @@ -68,11 +68,11 @@ struct canCommunicate, codim> namespace Dumux { //! The implementation is specialized for the different discretizations -template struct AmgTraitsImpl; +template struct AmgTraitsImpl; //! The type traits required for using the AMG backend -template -using AmgTraits = AmgTraitsImpl; +template +using AmgTraits = AmgTraitsImpl; //! NonoverlappingSolverTraits used by discretization with non-overlapping parallel model template @@ -98,10 +98,10 @@ public: #endif //! Box: use the non-overlapping AMG -template -struct AmgTraitsImpl +template +struct AmgTraitsImpl { - using Grid = typename FVGridGeometry::GridView::Traits::Grid; + using Grid = typename GridGeometry::GridView::Traits::Grid; enum { dofCodim = Grid::dimension, isNonOverlapping = true, @@ -117,7 +117,7 @@ struct AmgTraitsImpl using ScalarProduct = typename SolverTraits::ScalarProduct; using Smoother = typename SolverTraits::Smoother; - using DofMapper = typename FVGridGeometry::VertexMapper; + using DofMapper = typename GridGeometry::VertexMapper; }; //! OverlappingSolverTraits used by discretization with overlapping parallel model @@ -144,10 +144,10 @@ public: #endif //! Cell-centered tpfa: use the overlapping AMG -template -struct AmgTraitsImpl +template +struct AmgTraitsImpl { - using Grid = typename FVGridGeometry::GridView::Traits::Grid; + using Grid = typename GridGeometry::GridView::Traits::Grid; enum { dofCodim = 0, isNonOverlapping = false, @@ -163,12 +163,12 @@ struct AmgTraitsImpl -struct AmgTraitsImpl -: public AmgTraitsImpl {}; +template +struct AmgTraitsImpl +: public AmgTraitsImpl {}; } // end namespace Dumux diff --git a/dumux/material/chemistry/electrochemistry/electrochemistry.hh b/dumux/material/chemistry/electrochemistry/electrochemistry.hh index 081acfd941..9fe071ef33 100644 --- a/dumux/material/chemistry/electrochemistry/electrochemistry.hh +++ b/dumux/material/chemistry/electrochemistry/electrochemistry.hh @@ -48,7 +48,7 @@ enum ElectroChemistryModel { Ochs, Acosta }; * \todo TODO: Scalar type should be extracted from VolumeVariables! * \todo TODO: This shouldn't depend on grid and discretization!! */ -template +template class ElectroChemistry { @@ -74,8 +74,8 @@ class ElectroChemistry gasPhaseIdx = FluidSystem::gasPhaseIdx }; - using GridView = typename FVGridGeometry::GridView; - static constexpr bool isBox = FVGridGeometry::discMethod == DiscretizationMethod::box; + using GridView = typename GridGeometry::GridView; + static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box; using GlobalPosition = typename Dune::FieldVector; public: diff --git a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh index f2a4b8f6d8..d4d31de82e 100644 --- a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh +++ b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh @@ -37,10 +37,10 @@ namespace Dumux { * \todo TODO: Scalar type should be extracted from VolumeVariables! * \todo TODO: This shouldn't depend on discretization and grid!! */ -template -class ElectroChemistryNI : public ElectroChemistry +template +class ElectroChemistryNI : public ElectroChemistry { - using ParentType = ElectroChemistry; + using ParentType = ElectroChemistry; using Constant = Constants; enum { @@ -50,8 +50,8 @@ class ElectroChemistryNI : public ElectroChemistry; using CellVector = typename Dune::FieldVector; diff --git a/dumux/material/spatialparams/fv.hh b/dumux/material/spatialparams/fv.hh index 3ff1cf17d4..28f55f634d 100644 --- a/dumux/material/spatialparams/fv.hh +++ b/dumux/material/spatialparams/fv.hh @@ -52,19 +52,19 @@ struct hasMaterialLawParamsAtPos * \brief The base class for spatial parameters of multi-phase problems * using a fully implicit discretization method. */ -template -class FVSpatialParams : public FVSpatialParamsOneP +template +class FVSpatialParams : public FVSpatialParamsOneP { - using ParentType = FVSpatialParamsOneP; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using ParentType = FVSpatialParamsOneP; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - FVSpatialParams(std::shared_ptr fvGridGeometry) + FVSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} diff --git a/dumux/material/spatialparams/fv1p.hh b/dumux/material/spatialparams/fv1p.hh index 7bd4bd020c..fc6eb70a86 100644 --- a/dumux/material/spatialparams/fv1p.hh +++ b/dumux/material/spatialparams/fv1p.hh @@ -72,13 +72,13 @@ struct hasPorosityAtPos * \brief The base class for spatial parameters of one-phase problems * using a fully implicit discretization method. */ -template +template class FVSpatialParamsOneP { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; using Element = typename GridView::template Codim<0>::Entity; enum { dim = GridView::dimension }; @@ -88,7 +88,7 @@ class FVSpatialParamsOneP using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - FVSpatialParamsOneP(std::shared_ptr fvGridGeometry) + FVSpatialParamsOneP(std::shared_ptr fvGridGeometry) : fvGridGeometry_(fvGridGeometry) , gravity_(0.0) { @@ -326,12 +326,12 @@ public: } //! The finite volume grid geometry - [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] - const FVGridGeometry& fvGridGeometry() const + [[deprecated("Use more general GridGeometry instead. GridGeometry will be removed after 3.1!")]] + const GridGeometry& fvGridGeometry() const { return *fvGridGeometry_; } //! The finite volume grid geometry - const FVGridGeometry& gridGeometry() const + const GridGeometry& gridGeometry() const { return *fvGridGeometry_; } @@ -343,7 +343,7 @@ protected: { return *static_cast(this); } private: - std::shared_ptr fvGridGeometry_; + std::shared_ptr fvGridGeometry_; GlobalPosition gravity_; //!< The gravity vector Scalar forchCoeffDefault_; }; diff --git a/dumux/material/spatialparams/fvelastic.hh b/dumux/material/spatialparams/fvelastic.hh index e864051cfb..65ecf08ced 100644 --- a/dumux/material/spatialparams/fvelastic.hh +++ b/dumux/material/spatialparams/fvelastic.hh @@ -53,12 +53,12 @@ struct hasLameParamsAtPos * \ingroup SpatialParameters * \brief The base class for spatial parameters of linear elastic geomechanical problems */ -template +template class FVSpatialParamsElastic { - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -66,7 +66,7 @@ class FVSpatialParamsElastic public: //! The constructor - FVSpatialParamsElastic(std::shared_ptr fvGridGeometry) + FVSpatialParamsElastic(std::shared_ptr fvGridGeometry) : fvGridGeometry_(fvGridGeometry) , gravity_(0.0) { @@ -159,12 +159,12 @@ public: } //! The finite volume grid geometry - [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] - const FVGridGeometry& fvGridGeometry() const + [[deprecated("Use more general GridGeometry instead. GridGeometry will be removed after 3.1!")]] + const GridGeometry& fvGridGeometry() const { return *fvGridGeometry_; } //! The finite volume grid geometry - const FVGridGeometry& gridGeometry() const + const GridGeometry& gridGeometry() const { return *fvGridGeometry_; } protected: @@ -175,7 +175,7 @@ protected: { return *static_cast(this); } private: - std::shared_ptr fvGridGeometry_; + std::shared_ptr fvGridGeometry_; GlobalPosition gravity_; //!< The gravity vector }; } // end namespace Dumuxs diff --git a/dumux/material/spatialparams/fvnonequilibrium.hh b/dumux/material/spatialparams/fvnonequilibrium.hh index 576fb89182..e98e774935 100644 --- a/dumux/material/spatialparams/fvnonequilibrium.hh +++ b/dumux/material/spatialparams/fvnonequilibrium.hh @@ -33,14 +33,14 @@ namespace Dumux { * \ingroup SpatialParameters * \brief Definition of the spatial parameters for non-equilibrium */ -template +template class FVNonEquilibriumSpatialParams -: public FVSpatialParams +: public FVSpatialParams { - using ParentType = FVSpatialParams; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using ParentType = FVSpatialParams; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -50,7 +50,7 @@ public: using AwsSurfaceParams = Scalar; using AnsSurfaceParams = Scalar; - FVNonEquilibriumSpatialParams(std::shared_ptr fvGridGeometry) + FVNonEquilibriumSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { } diff --git a/dumux/material/spatialparams/fvporoelastic.hh b/dumux/material/spatialparams/fvporoelastic.hh index df29df7836..55809edfa7 100644 --- a/dumux/material/spatialparams/fvporoelastic.hh +++ b/dumux/material/spatialparams/fvporoelastic.hh @@ -74,12 +74,12 @@ struct hasBiotCoeffAtPos * \ingroup SpatialParameters * \brief The base class for spatial parameters of poro-elastic geomechanical problems */ -template +template class FVSpatialParamsPoroElastic { - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -87,7 +87,7 @@ class FVSpatialParamsPoroElastic public: //! The constructor - FVSpatialParamsPoroElastic(std::shared_ptr fvGridGeometry) + FVSpatialParamsPoroElastic(std::shared_ptr fvGridGeometry) : fvGridGeometry_(fvGridGeometry) , gravity_(0.0) { @@ -314,12 +314,12 @@ public: } //! The finite volume grid geometry - [[deprecated("Use more general GridGeometry instead. FVGridGeometry will be removed after 3.1!")]] - const FVGridGeometry& fvGridGeometry() const + [[deprecated("Use more general GridGeometry instead. GridGeometry will be removed after 3.1!")]] + const GridGeometry& fvGridGeometry() const { return *fvGridGeometry_; } //! The finite volume grid geometry - const FVGridGeometry& gridGeometry() const + const GridGeometry& gridGeometry() const { return *fvGridGeometry_; } protected: @@ -330,7 +330,7 @@ protected: { return *static_cast(this); } private: - std::shared_ptr fvGridGeometry_; + std::shared_ptr fvGridGeometry_; GlobalPosition gravity_; //!< The gravity vector }; } // end namespace Dumux diff --git a/dumux/multidomain/boundary/darcydarcy/couplingmanager.hh b/dumux/multidomain/boundary/darcydarcy/couplingmanager.hh index 56064912fa..206299bec2 100644 --- a/dumux/multidomain/boundary/darcydarcy/couplingmanager.hh +++ b/dumux/multidomain/boundary/darcydarcy/couplingmanager.hh @@ -60,11 +60,11 @@ class DarcyDarcyBoundaryCouplingManager template using NumEqVector = GetPropType, Properties::NumEqVector>; template using ElementVolumeVariables = typename GetPropType, Properties::GridVolumeVariables>::LocalView; template using VolumeVariables = typename GetPropType, Properties::GridVolumeVariables>::VolumeVariables; - template using FVGridGeometry = typename MDTraits::template SubDomain::GridGeometry; - template using FVElementGeometry = typename FVGridGeometry::LocalView; - template using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - template using SubControlVolume = typename FVGridGeometry::SubControlVolume; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = typename MDTraits::template SubDomain::GridGeometry; + template using FVElementGeometry = typename GridGeometry::LocalView; + template using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + template using SubControlVolume = typename GridGeometry::SubControlVolume; + template using GridView = typename GridGeometry::GridView; template using Element = typename GridView::template Codim<0>::Entity; template @@ -73,7 +73,7 @@ class DarcyDarcyBoundaryCouplingManager template static constexpr bool isCCTpfa() - { return FVGridGeometry::discMethod == DiscretizationMethod::cctpfa; } + { return GridGeometry::discMethod == DiscretizationMethod::cctpfa; } using CouplingStencil = std::vector; public: diff --git a/dumux/multidomain/boundary/darcydarcy/couplingmapper.hh b/dumux/multidomain/boundary/darcydarcy/couplingmapper.hh index fe76048091..f13d1cc848 100644 --- a/dumux/multidomain/boundary/darcydarcy/couplingmapper.hh +++ b/dumux/multidomain/boundary/darcydarcy/couplingmapper.hh @@ -49,9 +49,9 @@ class DarcyDarcyBoundaryCouplingMapper { using Scalar = typename MDTraits::Scalar; - template using FVGridGeometry = typename MDTraits::template SubDomain::GridGeometry; - template using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = typename MDTraits::template SubDomain::GridGeometry; + template using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + template using GridView = typename GridGeometry::GridView; template using Element = typename GridView::template Codim<0>::Entity; template @@ -60,7 +60,7 @@ class DarcyDarcyBoundaryCouplingMapper template static constexpr bool isCCTpfa() - { return FVGridGeometry::discMethod == DiscretizationMethod::cctpfa; } + { return GridGeometry::discMethod == DiscretizationMethod::cctpfa; } struct ScvfInfo { diff --git a/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh b/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh index fd03a4eb5f..c54991c45a 100644 --- a/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh +++ b/dumux/multidomain/boundary/stokesdarcy/couplingdata.hh @@ -225,11 +225,11 @@ class StokesDarcyCouplingDataImplementationBase using Scalar = typename MDTraits::Scalar; template using SubDomainTypeTag = typename MDTraits::template SubDomain::TypeTag; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; - template using FVElementGeometry = typename FVGridGeometry::LocalView; - template using SubControlVolumeFace = typename FVGridGeometry::LocalView::SubControlVolumeFace; - template using SubControlVolume = typename FVGridGeometry::LocalView::SubControlVolume; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using Element = typename GridGeometry::GridView::template Codim<0>::Entity; + template using FVElementGeometry = typename GridGeometry::LocalView; + template using SubControlVolumeFace = typename GridGeometry::LocalView::SubControlVolumeFace; + template using SubControlVolume = typename GridGeometry::LocalView::SubControlVolume; template using Indices = typename GetPropType, Properties::ModelTraits>::Indices; template using ElementVolumeVariables = typename GetPropType, Properties::GridVolumeVariables>::LocalView; template using VolumeVariables = typename GetPropType, Properties::GridVolumeVariables>::VolumeVariables; @@ -241,8 +241,8 @@ class StokesDarcyCouplingDataImplementationBase static constexpr auto darcyIdx = CouplingManager::darcyIdx; using AdvectionType = GetPropType, Properties::AdvectionType>; - using DarcysLaw = DarcysLawImplementation, FVGridGeometry::discMethod>; - using ForchheimersLaw = ForchheimersLawImplementation, FVGridGeometry::discMethod>; + using DarcysLaw = DarcysLawImplementation, GridGeometry::discMethod>; + using ForchheimersLaw = ForchheimersLawImplementation, GridGeometry::discMethod>; static constexpr bool adapterUsed = ModelTraits::numFluidPhases() > 1; using IndexHelper = Dumux::IndexHelper, adapterUsed>; @@ -525,11 +525,11 @@ class StokesDarcyCouplingDataImplementation using SubDomainTypeTag = typename MDTraits::template SubDomain::TypeTag; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; - template using FVElementGeometry = typename FVGridGeometry::LocalView; - template using SubControlVolumeFace = typename FVGridGeometry::LocalView::SubControlVolumeFace; - template using SubControlVolume = typename FVGridGeometry::LocalView::SubControlVolume; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using Element = typename GridGeometry::GridView::template Codim<0>::Entity; + template using FVElementGeometry = typename GridGeometry::LocalView; + template using SubControlVolumeFace = typename GridGeometry::LocalView::SubControlVolumeFace; + template using SubControlVolume = typename GridGeometry::LocalView::SubControlVolume; template using Indices = typename GetPropType, Properties::ModelTraits>::Indices; template using ElementVolumeVariables = typename GetPropType, Properties::GridVolumeVariables>::LocalView; template using ElementFaceVariables = typename GetPropType, Properties::GridFaceVariables>::LocalView; @@ -687,11 +687,11 @@ class StokesDarcyCouplingDataImplementation using SubDomainTypeTag = typename MDTraits::template SubDomain::TypeTag; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; - template using FVElementGeometry = typename FVGridGeometry::LocalView; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using Element = typename GridGeometry::GridView::template Codim<0>::Entity; + template using FVElementGeometry = typename GridGeometry::LocalView; template using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - template using SubControlVolume = typename FVGridGeometry::LocalView::SubControlVolume; + template using SubControlVolume = typename GridGeometry::LocalView::SubControlVolume; template using Indices = typename GetPropType, Properties::ModelTraits>::Indices; template using ElementVolumeVariables = typename GetPropType, Properties::GridVolumeVariables>::LocalView; template using ElementFaceVariables = typename GetPropType, Properties::GridFaceVariables>::LocalView; diff --git a/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh b/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh index 7636ae7d21..e453df942d 100644 --- a/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh +++ b/dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh @@ -81,8 +81,8 @@ private: template using ElementVolumeVariables = typename GetPropType, Properties::GridVolumeVariables>::LocalView; template using GridVolumeVariables = GetPropType, Properties::GridVolumeVariables>; template using VolumeVariables = typename GetPropType, Properties::GridVolumeVariables>::VolumeVariables; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using FVElementGeometry = typename FVGridGeometry::LocalView; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using FVElementGeometry = typename GridGeometry::LocalView; template using ElementBoundaryTypes = GetPropType, Properties::ElementBoundaryTypes>; template using ElementFluxVariablesCache = typename GetPropType, Properties::GridFluxVariablesCache>::LocalView; template using GridVariables = GetPropType, Properties::GridVariables>; @@ -121,8 +121,8 @@ public: using CouplingData = StokesDarcyCouplingData>; //! Constructor - StokesDarcyCouplingManager(std::shared_ptr> stokesFvGridGeometry, - std::shared_ptr> darcyFvGridGeometry) : couplingMapper_(*this) + StokesDarcyCouplingManager(std::shared_ptr> stokesFvGridGeometry, + std::shared_ptr> darcyFvGridGeometry) : couplingMapper_(*this) { } /*! diff --git a/dumux/multidomain/embedded/couplingmanager1d3d.hh b/dumux/multidomain/embedded/couplingmanager1d3d.hh index 0c16d200ed..d40c1485a6 100644 --- a/dumux/multidomain/embedded/couplingmanager1d3d.hh +++ b/dumux/multidomain/embedded/couplingmanager1d3d.hh @@ -53,12 +53,12 @@ struct CircleAveragePointSourceTraits { private: template using SubDomainTypeTag = typename MDTraits::template SubDomain::TypeTag; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; + template using GridGeometry = GetPropType, Properties::GridGeometry>; template using NumEqVector = GetPropType, Properties::NumEqVector>; public: //! export the point source type for domain i template - using PointSource = IntegrationPointSource::GlobalCoordinate, NumEqVector>; + using PointSource = IntegrationPointSource::GlobalCoordinate, NumEqVector>; //! export the point source helper type for domain i template @@ -100,8 +100,8 @@ class EmbeddedCouplingManager1d3d // the sub domain type aliases template using SubDomainTypeTag = typename MDTraits::template SubDomain::TypeTag; template using Problem = GetPropType, Properties::Problem>; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using GridView = typename GridGeometry::GridView; template using Element = typename GridView::template Codim<0>::Entity; public: @@ -200,15 +200,15 @@ class EmbeddedCouplingManager1d3d // the sub domain type aliases template using SubDomainTypeTag = typename MDTraits::template SubDomain::TypeTag; template using Problem = GetPropType, Properties::Problem>; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using GridView = typename GridGeometry::GridView; template using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; template static constexpr bool isBox() - { return FVGridGeometry::discMethod == DiscretizationMethod::box; } + { return GridGeometry::discMethod == DiscretizationMethod::box; } public: @@ -577,15 +577,15 @@ class EmbeddedCouplingManager1d3d using SubDomainTypeTag = typename MDTraits::template SubDomain::TypeTag; template using Problem = GetPropType, Properties::Problem>; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using GridView = typename GridGeometry::GridView; template using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; template static constexpr bool isBox() - { return FVGridGeometry::discMethod == DiscretizationMethod::box; } + { return GridGeometry::discMethod == DiscretizationMethod::box; } enum { bulkDim = GridView::dimension, @@ -853,15 +853,15 @@ class EmbeddedCouplingManager1d3d // the sub domain type aliases template using SubDomainTypeTag = typename MDTraits::template SubDomain::TypeTag; template using Problem = GetPropType, Properties::Problem>; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using GridView = typename GridGeometry::GridView; template using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; template static constexpr bool isBox() - { return FVGridGeometry::discMethod == DiscretizationMethod::box; } + { return GridGeometry::discMethod == DiscretizationMethod::box; } enum { bulkDim = GridView::dimension, diff --git a/dumux/multidomain/embedded/couplingmanagerbase.hh b/dumux/multidomain/embedded/couplingmanagerbase.hh index b50a5e5371..1999c2e75d 100644 --- a/dumux/multidomain/embedded/couplingmanagerbase.hh +++ b/dumux/multidomain/embedded/couplingmanagerbase.hh @@ -51,12 +51,12 @@ struct DefaultPointSourceTraits { private: template using SubDomainTypeTag = typename MDTraits::template SubDomain::TypeTag; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; + template using GridGeometry = GetPropType, Properties::GridGeometry>; template using NumEqVector = GetPropType, Properties::NumEqVector>; public: //! export the point source type for domain i template - using PointSource = IntegrationPointSource::GlobalCoordinate, NumEqVector>; + using PointSource = IntegrationPointSource::GlobalCoordinate, NumEqVector>; //! export the point source helper type for domain i template @@ -87,9 +87,9 @@ class EmbeddedCouplingManagerBase template using SubDomainTypeTag = typename MDTraits::template SubDomain::TypeTag; template using Problem = GetPropType, Properties::Problem>; template using PrimaryVariables = GetPropType, Properties::PrimaryVariables>; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using GridView = typename FVGridGeometry::GridView; - template using ElementMapper = typename FVGridGeometry::ElementMapper; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using GridView = typename GridGeometry::GridView; + template using ElementMapper = typename GridGeometry::ElementMapper; template using Element = typename GridView::template Codim<0>::Entity; enum { @@ -100,7 +100,7 @@ class EmbeddedCouplingManagerBase template static constexpr bool isBox() - { return FVGridGeometry::discMethod == DiscretizationMethod::box; } + { return GridGeometry::discMethod == DiscretizationMethod::box; } using CouplingStencil = std::vector; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -117,8 +117,8 @@ public: /*! * \brief call this after grid adaption */ - void updateAfterGridAdaption(std::shared_ptr> bulkFvGridGeometry, - std::shared_ptr> lowDimFvGridGeometry) + void updateAfterGridAdaption(std::shared_ptr> bulkFvGridGeometry, + std::shared_ptr> lowDimFvGridGeometry) { glue_ = std::make_shared(); } @@ -126,8 +126,8 @@ public: /*! * \brief Constructor */ - EmbeddedCouplingManagerBase(std::shared_ptr> bulkFvGridGeometry, - std::shared_ptr> lowDimFvGridGeometry) + EmbeddedCouplingManagerBase(std::shared_ptr> bulkFvGridGeometry, + std::shared_ptr> lowDimFvGridGeometry) { updateAfterGridAdaption(bulkFvGridGeometry, lowDimFvGridGeometry); } diff --git a/dumux/multidomain/embedded/extendedsourcestencil.hh b/dumux/multidomain/embedded/extendedsourcestencil.hh index 7e90408154..9d1baae3e6 100644 --- a/dumux/multidomain/embedded/extendedsourcestencil.hh +++ b/dumux/multidomain/embedded/extendedsourcestencil.hh @@ -49,8 +49,8 @@ class ExtendedSourceStencil using Scalar = typename MDTraits::Scalar; template using SubDomainTypeTag = typename MDTraits::template SubDomain::TypeTag; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using GridView = typename GridGeometry::GridView; template using Element = typename GridView::template Codim<0>::Entity; static constexpr auto bulkIdx = typename MDTraits::template SubDomain<0>::Index(); @@ -58,7 +58,7 @@ class ExtendedSourceStencil template static constexpr bool isBox() - { return FVGridGeometry::discMethod == DiscretizationMethod::box; } + { return GridGeometry::discMethod == DiscretizationMethod::box; } public: /*! * \brief extend the jacobian pattern of the diagonal block of domain i diff --git a/dumux/multidomain/embedded/integrationpointsource.hh b/dumux/multidomain/embedded/integrationpointsource.hh index 4569845609..0f712fcd57 100644 --- a/dumux/multidomain/embedded/integrationpointsource.hh +++ b/dumux/multidomain/embedded/integrationpointsource.hh @@ -108,8 +108,8 @@ class IntegrationPointSourceHelper public: //! calculate a DOF index to point source map from given vector of point sources - template - static void computePointSourceMap(const FVGridGeometry& fvGridGeometry, + template + static void computePointSourceMap(const GridGeometry& fvGridGeometry, std::vector& sources, PointSourceMap& pointSourceMap) { @@ -122,7 +122,7 @@ public: // loop over all intersected elements for (unsigned int eIdx : entities) { - if (FVGridGeometry::discMethod == DiscretizationMethod::box) + if (GridGeometry::discMethod == DiscretizationMethod::box) { // check in which subcontrolvolume(s) we are const auto element = fvGridGeometry.boundingBoxTree().entitySet().entity(eIdx); @@ -130,7 +130,7 @@ public: fvGeometry.bindElement(element); const auto globalPos = source.position(); // loop over all sub control volumes and check if the point source is inside - constexpr int dim = FVGridGeometry::GridView::dimension; + constexpr int dim = GridGeometry::GridView::dimension; Dune::ReservedVector scvIndices; for (auto&& scv : scvs(fvGeometry)) if (intersectsPointGeometry(globalPos, scv.geometry())) diff --git a/dumux/multidomain/facet/box/couplingmanager.hh b/dumux/multidomain/facet/box/couplingmanager.hh index 8022db1793..601212f606 100644 --- a/dumux/multidomain/facet/box/couplingmanager.hh +++ b/dumux/multidomain/facet/box/couplingmanager.hh @@ -68,11 +68,11 @@ class FacetCouplingManager using ElementBoundaryTypes = GetPropType, Properties::ElementBoundaryTypes>; template using LocalResidual = GetPropType, Properties::LocalResidual>; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using FVElementGeometry = typename FVGridGeometry::LocalView; - template using SubControlVolume = typename FVGridGeometry::SubControlVolume; - template using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using FVElementGeometry = typename GridGeometry::LocalView; + template using SubControlVolume = typename GridGeometry::SubControlVolume; + template using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + template using GridView = typename GridGeometry::GridView; template using Element = typename GridView::template Codim<0>::Entity; template using GridIndexType = typename GridView::IndexSet::IndexType; @@ -89,7 +89,7 @@ class FacetCouplingManager(); static constexpr auto lowDimGridId = CouplingMapper::template gridId(); - static constexpr bool lowDimUsesBox = FVGridGeometry::discMethod == DiscretizationMethod::box; + static constexpr bool lowDimUsesBox = GridGeometry::discMethod == DiscretizationMethod::box; /*! * \brief The coupling context of the bulk domain. Contains all data of the lower- diff --git a/dumux/multidomain/facet/box/darcyslaw.hh b/dumux/multidomain/facet/box/darcyslaw.hh index 85e1d70340..a7f06d4f27 100644 --- a/dumux/multidomain/facet/box/darcyslaw.hh +++ b/dumux/multidomain/facet/box/darcyslaw.hh @@ -46,15 +46,15 @@ namespace Dumux { * where coupling occurs across the facets of the bulk domain elements * with a lower-dimensional domain living on these facets. */ -template +template class BoxFacetCouplingDarcysLaw { - using DefaultBoxDarcysLaw = BoxDarcysLaw; + using DefaultBoxDarcysLaw = BoxDarcysLaw; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using CoordScalar = typename GridView::ctype; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/dumux/multidomain/facet/box/elementboundarytypes.hh b/dumux/multidomain/facet/box/elementboundarytypes.hh index 5093d4290a..e4384855d8 100644 --- a/dumux/multidomain/facet/box/elementboundarytypes.hh +++ b/dumux/multidomain/facet/box/elementboundarytypes.hh @@ -59,8 +59,8 @@ public: const Element &element, const FVElementGeometry &fvGeometry) { - using FVGridGeometry = typename FVElementGeometry::GridGeometry; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename FVElementGeometry::GridGeometry; + using GridView = typename GridGeometry::GridView; this->vertexBCTypes_.resize( element.subEntities(GridView::dimension) ); diff --git a/dumux/multidomain/facet/box/fvgridgeometry.hh b/dumux/multidomain/facet/box/fvgridgeometry.hh index c8385ecabd..3569aac8d0 100644 --- a/dumux/multidomain/facet/box/fvgridgeometry.hh +++ b/dumux/multidomain/facet/box/fvgridgeometry.hh @@ -59,8 +59,8 @@ struct BoxFacetCouplingDefaultGridGeometryTraits using SubControlVolume = BoxSubControlVolume; using SubControlVolumeFace = BoxFacetCouplingSubControlVolumeFace; - template - using LocalView = BoxFacetCouplingFVElementGeometry; + template + using LocalView = BoxFacetCouplingFVElementGeometry; // per default we use an mcmg mapper for the elements using ElementMapper = Dune::MultipleCodimMultipleGeomTypeMapper; diff --git a/dumux/multidomain/facet/box/upwindscheme.hh b/dumux/multidomain/facet/box/upwindscheme.hh index 8ce7d7f19d..f03dbb2744 100644 --- a/dumux/multidomain/facet/box/upwindscheme.hh +++ b/dumux/multidomain/facet/box/upwindscheme.hh @@ -36,7 +36,7 @@ namespace Dumux { * This is a modified scheme for models involving coupling * with a lower-dimensional domain across the element facets. */ -template +template class BoxFacetCouplingUpwindScheme { public: diff --git a/dumux/multidomain/facet/cellcentered/localresidual.hh b/dumux/multidomain/facet/cellcentered/localresidual.hh index 46da82281d..77819a5918 100644 --- a/dumux/multidomain/facet/cellcentered/localresidual.hh +++ b/dumux/multidomain/facet/cellcentered/localresidual.hh @@ -48,10 +48,10 @@ class CCFacetCouplingLocalResidual : public CCLocalResidual using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView; using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView; - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using NumEqVector = GetPropType; diff --git a/dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh b/dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh index 1b667da08f..73c1707a4d 100644 --- a/dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh +++ b/dumux/multidomain/facet/cellcentered/mpfa/couplingmanager.hh @@ -69,11 +69,11 @@ class FacetCouplingManager using Scalar = GetPropType, Properties::Scalar>; template using Problem = GetPropType, Properties::Problem>; template using NumEqVector = GetPropType, Properties::NumEqVector>; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using FVElementGeometry = typename FVGridGeometry::LocalView; - template using SubControlVolume = typename FVGridGeometry::SubControlVolume; - template using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using FVElementGeometry = typename GridGeometry::LocalView; + template using SubControlVolume = typename GridGeometry::SubControlVolume; + template using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + template using GridView = typename GridGeometry::GridView; template using GridIndexType = typename IndexTraits< GridView >::GridIndex; template using Element = typename GridView::template Codim<0>::Entity; template using LocalResidual = GetPropType, Properties::LocalResidual>; @@ -88,7 +88,7 @@ class FacetCouplingManager(); static constexpr auto lowDimGridId = CouplingMapper::template gridId(); - static constexpr bool lowDimUsesBox = FVGridGeometry::discMethod == DiscretizationMethod::box; + static constexpr bool lowDimUsesBox = GridGeometry::discMethod == DiscretizationMethod::box; public: diff --git a/dumux/multidomain/facet/cellcentered/tpfa/couplingmanager.hh b/dumux/multidomain/facet/cellcentered/tpfa/couplingmanager.hh index 24b29a478b..19fca678a6 100644 --- a/dumux/multidomain/facet/cellcentered/tpfa/couplingmanager.hh +++ b/dumux/multidomain/facet/cellcentered/tpfa/couplingmanager.hh @@ -68,11 +68,11 @@ class FacetCouplingManager using NumEqVector = GetPropType, Properties::NumEqVector>; template using LocalResidual = GetPropType, Properties::LocalResidual>; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using FVElementGeometry = typename FVGridGeometry::LocalView; - template using SubControlVolume = typename FVGridGeometry::SubControlVolume; - template using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using FVElementGeometry = typename GridGeometry::LocalView; + template using SubControlVolume = typename GridGeometry::SubControlVolume; + template using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + template using GridView = typename GridGeometry::GridView; template using Element = typename GridView::template Codim<0>::Entity; template using GridIndexType = typename IndexTraits< GridView >::GridIndex; @@ -97,7 +97,7 @@ class FacetCouplingManager(); static constexpr auto lowDimGridId = CouplingMapper::template gridId(); - static constexpr bool lowDimUsesBox = FVGridGeometry::discMethod == DiscretizationMethod::box; + static constexpr bool lowDimUsesBox = GridGeometry::discMethod == DiscretizationMethod::box; /*! * \brief The coupling context of the bulk domain. Contains all data of the lower- diff --git a/dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh b/dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh index fe782aba49..27d5265961 100644 --- a/dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh +++ b/dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh @@ -42,7 +42,7 @@ namespace Dumux { //! Forward declaration of the implementation -template +template class CCTpfaFacetCouplingDarcysLawImpl; /*! @@ -51,7 +51,7 @@ class CCTpfaFacetCouplingDarcysLawImpl; * \note We distinguish between network and non-network grids here. Specializations * for the two cases can be found below. */ -template +template class CCTpfaFacetCouplingDarcysLawCache; /*! @@ -60,26 +60,26 @@ class CCTpfaFacetCouplingDarcysLawCache; * in the context of coupled models where the coupling occurs across the facets of the bulk * domain elements with a lower-dimensional domain living on these facets. */ -template +template using CCTpfaFacetCouplingDarcysLaw = - CCTpfaFacetCouplingDarcysLawImpl< ScalarType, FVGridGeometry, ( int(FVGridGeometry::GridView::dimension) < - int(FVGridGeometry::GridView::dimensionworld) ) >; + CCTpfaFacetCouplingDarcysLawImpl< ScalarType, GridGeometry, ( int(GridGeometry::GridView::dimension) < + int(GridGeometry::GridView::dimensionworld) ) >; /*! * \ingroup FacetCoupling * \brief Specialization of the FacetCouplingTpfaDarcysLawCache for non-network grids. */ -template -class CCTpfaFacetCouplingDarcysLawCache +template +class CCTpfaFacetCouplingDarcysLawCache { using Scalar = typename AdvectionType::Scalar; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; public: //! export the corresponding filler class - using Filler = TpfaDarcysLawCacheFiller; + using Filler = TpfaDarcysLawCacheFiller; //! we store the transmissibilities associated with the interior //! cell, outside cell, and the fracture facet in an array. Access @@ -137,17 +137,17 @@ private: * \ingroup FacetCoupling * \brief Specialization of the CCTpfaDarcysLaw grids where dim=dimWorld */ -template -class CCTpfaFacetCouplingDarcysLawImpl +template +class CCTpfaFacetCouplingDarcysLawImpl { - using ThisType = CCTpfaFacetCouplingDarcysLawImpl; - using TpfaDarcysLaw = CCTpfaDarcysLaw; + using ThisType = CCTpfaFacetCouplingDarcysLawImpl; + using TpfaDarcysLaw = CCTpfaDarcysLaw; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -168,7 +168,7 @@ class CCTpfaFacetCouplingDarcysLawImpl; + using Cache = CCTpfaFacetCouplingDarcysLawCache; //! export the type used to store transmissibilities using TijContainer = typename Cache::AdvectionTransmissibilityContainer; @@ -355,17 +355,17 @@ class CCTpfaFacetCouplingDarcysLawImpl -class CCTpfaFacetCouplingDarcysLawCache +template +class CCTpfaFacetCouplingDarcysLawCache { using Scalar = typename AdvectionType::Scalar; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; public: //! export the corresponding filler class - using Filler = TpfaDarcysLawCacheFiller; + using Filler = TpfaDarcysLawCacheFiller; //! we store the transmissibilities associated with the interior //! cell and the fracture facet in an array. Access to this array @@ -410,17 +410,17 @@ private: * \ingroup FacetCoupling * \brief Specialization of the CCTpfaDarcysLaw grids where dim -class CCTpfaFacetCouplingDarcysLawImpl +template +class CCTpfaFacetCouplingDarcysLawImpl { - using ThisType = CCTpfaFacetCouplingDarcysLawImpl; - using TpfaDarcysLaw = CCTpfaDarcysLaw; + using ThisType = CCTpfaFacetCouplingDarcysLawImpl; + using TpfaDarcysLaw = CCTpfaDarcysLaw; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -430,7 +430,7 @@ class CCTpfaFacetCouplingDarcysLawImpl; + using Cache = CCTpfaFacetCouplingDarcysLawCache; //! export the type used to store transmissibilities using TijContainer = typename Cache::AdvectionTransmissibilityContainer; diff --git a/dumux/multidomain/facet/cellcentered/upwindscheme.hh b/dumux/multidomain/facet/cellcentered/upwindscheme.hh index cfe8f1d875..c19bfb17c2 100644 --- a/dumux/multidomain/facet/cellcentered/upwindscheme.hh +++ b/dumux/multidomain/facet/cellcentered/upwindscheme.hh @@ -37,10 +37,10 @@ namespace Dumux { * This is a modified scheme for models involving coupling * with a lower-dimensional domain across the element facets. */ -template +template class CCFacetCouplingUpwindScheme { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; static constexpr int dim = GridView::dimension; static constexpr int dimWorld = GridView::dimensionworld; diff --git a/dumux/multidomain/facet/couplingmanager.hh b/dumux/multidomain/facet/couplingmanager.hh index 77860003fc..03b2ea07b3 100644 --- a/dumux/multidomain/facet/couplingmanager.hh +++ b/dumux/multidomain/facet/couplingmanager.hh @@ -134,10 +134,10 @@ class FacetCouplingThreeDomainManager template using PrimaryVariables = GetPropType, Properties::PrimaryVariables>; template using Problem = GetPropType, Properties::Problem>; - template using FVGridGeometry = GetPropType, Properties::GridGeometry>; - template using FVElementGeometry = typename FVGridGeometry::LocalView; - template using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = GetPropType, Properties::GridGeometry>; + template using FVElementGeometry = typename GridGeometry::LocalView; + template using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + template using GridView = typename GridGeometry::GridView; template using GridIndexType = typename IndexTraits>::GridIndex; template using Element = typename GridView::template Codim<0>::Entity; @@ -148,7 +148,7 @@ class FacetCouplingThreeDomainManager // helper function to check if a domain uses mpfa template static constexpr bool usesMpfa(Dune::index_constant domainId) - { return FVGridGeometry::discMethod == DiscretizationMethod::ccmpfa; } + { return GridGeometry::discMethod == DiscretizationMethod::ccmpfa; } public: //! types used for coupling stencils diff --git a/dumux/multidomain/facet/couplingmapperbase.hh b/dumux/multidomain/facet/couplingmapperbase.hh index 42aab8a658..286d051661 100644 --- a/dumux/multidomain/facet/couplingmapperbase.hh +++ b/dumux/multidomain/facet/couplingmapperbase.hh @@ -205,13 +205,13 @@ protected: } //! Creates a container with the nodal dofs within an element - template< class FVGridGeometry> - std::vector< typename IndexTraits::GridIndex > - extractNodalDofs_(const typename FVGridGeometry::GridView::template Codim<0>::Entity& element, - const FVGridGeometry& fvGridGeometry) + template< class GridGeometry> + std::vector< typename IndexTraits::GridIndex > + extractNodalDofs_(const typename GridGeometry::GridView::template Codim<0>::Entity& element, + const GridGeometry& fvGridGeometry) { - static constexpr int dim = FVGridGeometry::GridView::dimension; - using GridIndexType = typename IndexTraits::GridIndex; + static constexpr int dim = GridGeometry::GridView::dimension; + using GridIndexType = typename IndexTraits::GridIndex; const auto numCorners = element.subEntities(dim); std::vector< GridIndexType > nodalDofs(numCorners); @@ -232,11 +232,11 @@ protected: private: //! Creates the map from element insertion index to grid element index - template< class Embeddings, class FVGridGeometry> - std::unordered_map< typename IndexTraits::GridIndex, typename IndexTraits::GridIndex > - makeInsertionToGridIndexMap_(std::shared_ptr embeddings, const FVGridGeometry& fvGridGeometry) const + template< class Embeddings, class GridGeometry> + std::unordered_map< typename IndexTraits::GridIndex, typename IndexTraits::GridIndex > + makeInsertionToGridIndexMap_(std::shared_ptr embeddings, const GridGeometry& fvGridGeometry) const { - using GridIndexType = typename IndexTraits::GridIndex; + using GridIndexType = typename IndexTraits::GridIndex; std::unordered_map< GridIndexType, GridIndexType > map; for (const auto& e : elements(fvGridGeometry.gridView())) diff --git a/dumux/multidomain/staggeredcouplingmanager.hh b/dumux/multidomain/staggeredcouplingmanager.hh index e154281c79..fe75d64c4f 100644 --- a/dumux/multidomain/staggeredcouplingmanager.hh +++ b/dumux/multidomain/staggeredcouplingmanager.hh @@ -42,10 +42,10 @@ class StaggeredCouplingManager: virtual public CouplingManager { using ParentType = CouplingManager; - template using FVGridGeometry = typename MDTraits::template SubDomain::GridGeometry; - template using GridView = typename FVGridGeometry::GridView; + template using GridGeometry = typename MDTraits::template SubDomain::GridGeometry; + template using GridView = typename GridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry<0>::LocalView; + using FVElementGeometry = typename GridGeometry<0>::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using Element = typename GridView<0>::template Codim<0>::Entity; @@ -58,8 +58,8 @@ public: using Traits = MDTraits; - static constexpr auto cellCenterIdx = FVGridGeometry<0>::cellCenterIdx(); - static constexpr auto faceIdx = FVGridGeometry<0>::faceIdx(); + static constexpr auto cellCenterIdx = GridGeometry<0>::cellCenterIdx(); + static constexpr auto faceIdx = GridGeometry<0>::faceIdx(); /*! * \copydoc Dumux::CouplingManager::updateCouplingContext() @@ -186,7 +186,7 @@ public: * \brief return the numeric epsilon used for deflecting primary variables of coupled domain i. * \note specialization for non-staggered schemes */ - template::discMethod != DiscretizationMethod::staggered), int> = 0> + template::discMethod != DiscretizationMethod::staggered), int> = 0> decltype(auto) numericEpsilon(Dune::index_constant id, const std::string& paramGroup) const { @@ -197,13 +197,13 @@ public: * \brief return the numeric epsilon used for deflecting primary variables of coupled domain i. * \note specialization for non-staggered schemes */ - template::discMethod == DiscretizationMethod::staggered), int> = 0> + template::discMethod == DiscretizationMethod::staggered), int> = 0> decltype(auto) numericEpsilon(Dune::index_constant, const std::string& paramGroup) const { constexpr std::size_t numEqCellCenter = Traits::template SubDomain::PrimaryVariables::dimension; constexpr std::size_t numEqFace = Traits::template SubDomain::PrimaryVariables::dimension; - constexpr bool isCellCenter = FVGridGeometry::isCellCenter(); + constexpr bool isCellCenter = GridGeometry::isCellCenter(); constexpr std::size_t numEq = isCellCenter ? numEqCellCenter : numEqFace; constexpr auto prefix = isCellCenter ? "CellCenter" : "Face"; diff --git a/dumux/multidomain/subdomainboxlocalassembler.hh b/dumux/multidomain/subdomainboxlocalassembler.hh index f267475a6f..f8e068c60d 100644 --- a/dumux/multidomain/subdomainboxlocalassembler.hh +++ b/dumux/multidomain/subdomainboxlocalassembler.hh @@ -72,10 +72,10 @@ class SubDomainBoxLocalAssemblerBase : public FVLocalAssemblerBase; using Element = typename GridView::template Codim<0>::Entity; @@ -347,9 +347,9 @@ class SubDomainBoxLocalAssembler::LocalView; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; enum { numEq = GetPropType::numEq() }; @@ -582,9 +582,9 @@ class SubDomainBoxLocalAssembler; using ElementResidualVector = typename ParentType::LocalResidual::ElementResidualVector; using ElementVolumeVariables = typename GetPropType::LocalView; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; enum { numEq = GetPropType::numEq() }; diff --git a/dumux/multidomain/subdomaincclocalassembler.hh b/dumux/multidomain/subdomaincclocalassembler.hh index e07c42fbf6..4f19a4f326 100644 --- a/dumux/multidomain/subdomaincclocalassembler.hh +++ b/dumux/multidomain/subdomaincclocalassembler.hh @@ -72,10 +72,10 @@ class SubDomainCCLocalAssemblerBase : public FVLocalAssemblerBase; using Element = typename GridView::template Codim<0>::Entity; @@ -284,9 +284,9 @@ class SubDomainCCLocalAssembler; using LocalResidualValues = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; enum { numEq = GetPropType::numEq() }; @@ -294,7 +294,7 @@ class SubDomainCCLocalAssembler(); static constexpr bool enableGridVolVarsCache = getPropValue(); - static constexpr int maxElementStencilSize = FVGridGeometry::maxElementStencilSize; + static constexpr int maxElementStencilSize = GridGeometry::maxElementStencilSize; static constexpr auto domainI = Dune::index_constant(); public: diff --git a/dumux/multidomain/subdomainstaggeredlocalassembler.hh b/dumux/multidomain/subdomainstaggeredlocalassembler.hh index faab9bebe8..005200fc3b 100644 --- a/dumux/multidomain/subdomainstaggeredlocalassembler.hh +++ b/dumux/multidomain/subdomainstaggeredlocalassembler.hh @@ -71,9 +71,9 @@ class SubDomainStaggeredLocalAssemblerBase : public FVLocalAssemblerBase; using Element = typename GridView::template Codim<0>::Entity; @@ -497,9 +497,9 @@ class SubDomainStaggeredLocalAssembler; using ElementFaceVariables = typename GetPropType::LocalView; using FaceVariables = typename ElementFaceVariables::FaceVariables; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; using VolumeVariables = GetPropType; using CellCenterPrimaryVariables = GetPropType; using FacePrimaryVariables = GetPropType; diff --git a/dumux/nonlinear/newtonconvergencewriter.hh b/dumux/nonlinear/newtonconvergencewriter.hh index ac5c7cd783..3035263f40 100644 --- a/dumux/nonlinear/newtonconvergencewriter.hh +++ b/dumux/nonlinear/newtonconvergencewriter.hh @@ -50,14 +50,14 @@ struct ConvergenceWriterInterface * to write out multiple Newton solves with a unique id, if you don't call use all * Newton iterations just come after each other in the pvd file. */ -template +template class NewtonConvergenceWriter : public ConvergenceWriterInterface { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; static constexpr auto numEq = SolutionVector::block_type::dimension; using Scalar = typename SolutionVector::block_type::value_type; - static_assert(FVGridGeometry::discMethod != DiscretizationMethod::staggered, + static_assert(GridGeometry::discMethod != DiscretizationMethod::staggered, "This convergence writer does not work for the staggered method, use the StaggeredNewtonConvergenceWriter instead"); public: /*! @@ -65,14 +65,14 @@ public: * \param fvGridGeometry The finite-volume grid geometry * \param name Base name of the vtk output */ - NewtonConvergenceWriter(const FVGridGeometry& fvGridGeometry, + NewtonConvergenceWriter(const GridGeometry& fvGridGeometry, const std::string& name = "newton_convergence") : fvGridGeometry_(fvGridGeometry) , writer_(fvGridGeometry.gridView(), name, "", "") { resize(); - if (FVGridGeometry::discMethod == DiscretizationMethod::box) + if (GridGeometry::discMethod == DiscretizationMethod::box) { for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) { @@ -135,7 +135,7 @@ private: std::size_t id_ = 0UL; std::size_t iteration_ = 0UL; - const FVGridGeometry& fvGridGeometry_; + const GridGeometry& fvGridGeometry_; Dune::VTKSequenceWriter writer_; diff --git a/dumux/nonlinear/staggerednewtonconvergencewriter.hh b/dumux/nonlinear/staggerednewtonconvergencewriter.hh index 1cb85da200..01657cfb64 100644 --- a/dumux/nonlinear/staggerednewtonconvergencewriter.hh +++ b/dumux/nonlinear/staggerednewtonconvergencewriter.hh @@ -43,13 +43,13 @@ namespace Dumux { * to write out multiple Newton solves with a unique id, if you don't call use all * Newton iterations just come after each other in the pvd file. */ -template +template class StaggeredNewtonConvergenceWriter : public ConvergenceWriterInterface { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; - using CellCenterSolutionVector = typename std::decay_t()[FVGridGeometry::cellCenterIdx()])>; - using FaceSolutionVector = typename std::decay_t()[FVGridGeometry::faceIdx()])>; + using CellCenterSolutionVector = typename std::decay_t()[GridGeometry::cellCenterIdx()])>; + using FaceSolutionVector = typename std::decay_t()[GridGeometry::faceIdx()])>; using Scalar = typename CellCenterSolutionVector::block_type::value_type; @@ -59,7 +59,7 @@ class StaggeredNewtonConvergenceWriter : public ConvergenceWriterInterface::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - static_assert(FVGridGeometry::discMethod == DiscretizationMethod::staggered, + static_assert(GridGeometry::discMethod == DiscretizationMethod::staggered, "This convergence writer does only work for the staggered method, use the NewtonConvergenceWriter instead"); public: /*! @@ -67,7 +67,7 @@ public: * \param fvGridGeometry The finite volume geometry on the grid view * \param name Base name of the vtk output */ - StaggeredNewtonConvergenceWriter(const FVGridGeometry& fvGridGeometry, + StaggeredNewtonConvergenceWriter(const GridGeometry& fvGridGeometry, const std::string& name = "newton_convergence") : fvGridGeometry_(fvGridGeometry) , ccWriter_(fvGridGeometry.gridView(), name, "", "") @@ -127,13 +127,13 @@ public: { assert(uLastIter.size() == deltaU.size() && uLastIter.size() == residual.size()); - for (std::size_t dofIdxGlobal = 0; dofIdxGlobal < deltaU[FVGridGeometry::cellCenterIdx()].size(); ++dofIdxGlobal) + for (std::size_t dofIdxGlobal = 0; dofIdxGlobal < deltaU[GridGeometry::cellCenterIdx()].size(); ++dofIdxGlobal) { for (int eqIdx = 0; eqIdx < numEqCellCenter; ++eqIdx) { - xCellCenter_[eqIdx][dofIdxGlobal] = uLastIter[FVGridGeometry::cellCenterIdx()][dofIdxGlobal][eqIdx]; - deltaCellCenter_[eqIdx][dofIdxGlobal] = - deltaU[FVGridGeometry::cellCenterIdx()][dofIdxGlobal][eqIdx]; - defCellCenter_[eqIdx][dofIdxGlobal] = residual[FVGridGeometry::cellCenterIdx()][dofIdxGlobal][eqIdx]; + xCellCenter_[eqIdx][dofIdxGlobal] = uLastIter[GridGeometry::cellCenterIdx()][dofIdxGlobal][eqIdx]; + deltaCellCenter_[eqIdx][dofIdxGlobal] = - deltaU[GridGeometry::cellCenterIdx()][dofIdxGlobal][eqIdx]; + defCellCenter_[eqIdx][dofIdxGlobal] = residual[GridGeometry::cellCenterIdx()][dofIdxGlobal][eqIdx]; } } @@ -144,13 +144,13 @@ public: faceWriter_->addPointData(defFace_[eqIdx], "defect_" + std::to_string(eqIdx)); } - for (std::size_t dofIdxGlobal = 0; dofIdxGlobal < deltaU[FVGridGeometry::faceIdx()].size(); ++dofIdxGlobal) + for (std::size_t dofIdxGlobal = 0; dofIdxGlobal < deltaU[GridGeometry::faceIdx()].size(); ++dofIdxGlobal) { for (int eqIdx = 0; eqIdx < numEqFace; ++eqIdx) { - xFace_[eqIdx][dofIdxGlobal] = uLastIter[FVGridGeometry::faceIdx()][dofIdxGlobal][eqIdx]; - deltaFace_[eqIdx][dofIdxGlobal] = - deltaU[FVGridGeometry::faceIdx()][dofIdxGlobal][eqIdx]; - defFace_[eqIdx][dofIdxGlobal] = residual[FVGridGeometry::faceIdx()][dofIdxGlobal][eqIdx]; + xFace_[eqIdx][dofIdxGlobal] = uLastIter[GridGeometry::faceIdx()][dofIdxGlobal][eqIdx]; + deltaFace_[eqIdx][dofIdxGlobal] = - deltaU[GridGeometry::faceIdx()][dofIdxGlobal][eqIdx]; + defFace_[eqIdx][dofIdxGlobal] = residual[GridGeometry::faceIdx()][dofIdxGlobal][eqIdx]; } } @@ -163,7 +163,7 @@ private: std::size_t id_ = 0UL; std::size_t iteration_ = 0UL; - const FVGridGeometry& fvGridGeometry_; + const GridGeometry& fvGridGeometry_; Dune::VTKSequenceWriter ccWriter_; diff --git a/dumux/porousmediumflow/2p/boxmaterialinterfaceparams.hh b/dumux/porousmediumflow/2p/boxmaterialinterfaceparams.hh index 4a825532d5..876b22f1da 100644 --- a/dumux/porousmediumflow/2p/boxmaterialinterfaceparams.hh +++ b/dumux/porousmediumflow/2p/boxmaterialinterfaceparams.hh @@ -55,24 +55,24 @@ public: * \param spatialParams Class encapsulating the spatial parameters * \param x The current state of the solution vector */ - template - void update(const FVGridGeometry& fvGridGeometry, + template + void update(const GridGeometry& fvGridGeometry, const SpatialParams& spatialParams, const SolutionVector& x) { using MaterialLaw = typename SpatialParams::MaterialLaw; // Make sure the spatial params return a const ref and no copy! - using Elem = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Elem = typename GridGeometry::GridView::template Codim<0>::Entity; using ElemSol = decltype( elementSolution(Elem(), x, fvGridGeometry) ); - using Scv = typename FVGridGeometry::SubControlVolume; + using Scv = typename GridGeometry::SubControlVolume; using ReturnType = decltype(spatialParams.materialLawParams(Elem(), Scv(), ElemSol())); static_assert(std::is_lvalue_reference::value, "In order to use the box-interface solver please provide access " "to the material law parameters via returning (const) references"); // make sure this is only called for geometries of the box method! - if (FVGridGeometry::discMethod != DiscretizationMethod::box) + if (GridGeometry::discMethod != DiscretizationMethod::box) DUNE_THROW(Dune::InvalidStateException, "Determination of the interface material parameters with " "this class only makes sense when using the box method!"); diff --git a/dumux/porousmediumflow/2p/gridadaptindicator.hh b/dumux/porousmediumflow/2p/gridadaptindicator.hh index 28d174ebf1..35cb5faf69 100644 --- a/dumux/porousmediumflow/2p/gridadaptindicator.hh +++ b/dumux/porousmediumflow/2p/gridadaptindicator.hh @@ -43,7 +43,7 @@ namespace Dumux { template class TwoPGridAdaptIndicator { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using GridView = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; @@ -63,7 +63,7 @@ public: * in a way such that the indicator returns false for all elements * before having been calculated. */ - TwoPGridAdaptIndicator(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + TwoPGridAdaptIndicator(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : fvGridGeometry_(fvGridGeometry) , refineBound_(std::numeric_limits::max()) , coarsenBound_(std::numeric_limits::lowest()) @@ -269,7 +269,7 @@ private: return true; } - std::shared_ptr fvGridGeometry_; + std::shared_ptr fvGridGeometry_; Scalar refineBound_; Scalar coarsenBound_; diff --git a/dumux/porousmediumflow/2p/griddatatransfer.hh b/dumux/porousmediumflow/2p/griddatatransfer.hh index b89fd3fc6a..94d614bf72 100644 --- a/dumux/porousmediumflow/2p/griddatatransfer.hh +++ b/dumux/porousmediumflow/2p/griddatatransfer.hh @@ -49,8 +49,8 @@ class TwoPGridDataTransfer : public GridDataTransfer using Grid = GetPropType; using Scalar = GetPropType; using Problem = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using GridVariables = GetPropType; using VolumeVariables = GetPropType; @@ -59,7 +59,7 @@ class TwoPGridDataTransfer : public GridDataTransfer using Element = typename Grid::template Codim<0>::Entity; using ElementSolution = std::decay_t(), std::declval(), - std::declval()))>; + std::declval()))>; using FluidSystem = GetPropType; using ModelTraits = GetPropType; using Indices = typename ModelTraits::Indices; @@ -114,7 +114,7 @@ public: * \param sol The solution (primary variables) on the grid */ TwoPGridDataTransfer(std::shared_ptr problem, - std::shared_ptr fvGridGeometry, + std::shared_ptr fvGridGeometry, std::shared_ptr gridVariables, SolutionVector& sol) : GridDataTransfer() @@ -434,7 +434,7 @@ public: } std::shared_ptr problem_; - std::shared_ptr fvGridGeometry_; + std::shared_ptr fvGridGeometry_; std::shared_ptr gridVariables_; SolutionVector& sol_; PersistentContainer adaptionMap_; diff --git a/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh b/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh index 54396316e4..05f2a24c02 100644 --- a/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh +++ b/dumux/porousmediumflow/2p/incompressiblelocalresidual.hh @@ -56,8 +56,8 @@ class TwoPIncompressibleLocalResidual : public ImmiscibleLocalResidual using FluxVariables = GetPropType; using ElementFluxVariablesCache = typename GetPropType::LocalView; using SolutionVector = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GridView = GetPropType; diff --git a/dumux/porousmediumflow/boxdfm/fvgridgeometry.hh b/dumux/porousmediumflow/boxdfm/fvgridgeometry.hh index cdebc859d2..43fc6ad27c 100644 --- a/dumux/porousmediumflow/boxdfm/fvgridgeometry.hh +++ b/dumux/porousmediumflow/boxdfm/fvgridgeometry.hh @@ -63,8 +63,8 @@ struct BoxDfmDefaultGridGeometryTraits using SubControlVolume = BoxDfmSubControlVolume; using SubControlVolumeFace = BoxDfmSubControlVolumeFace; - template - using LocalView = BoxDfmFVElementGeometry; + template + using LocalView = BoxDfmFVElementGeometry; // Mapper type for mapping edges using FacetMapper = Dune::MultipleCodimMultipleGeomTypeMapper; @@ -106,7 +106,7 @@ class BoxDfmFVGridGeometry using CoordScalar = typename GV::ctype; static const int dim = GV::dimension; static const int dimWorld = GV::dimensionworld; - static_assert(dim == 2 || dim == 3, "The box-dfm FVGridGeometry is only implemented in 2 or 3 dimensions."); + static_assert(dim == 2 || dim == 3, "The box-dfm GridGeometry is only implemented in 2 or 3 dimensions."); using ReferenceElements = typename Dune::ReferenceElements; using FaceReferenceElements = typename Dune::ReferenceElements; diff --git a/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh b/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh index 3933dd65a0..3fce08c75c 100644 --- a/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh +++ b/dumux/porousmediumflow/boxdfm/vtkoutputmodule.hh @@ -56,12 +56,12 @@ template class BoxDfmVtkOutputModule : public VtkOutputModule { using ParentType = VtkOutputModule; - using FVGridGeometry = typename GridVariables::GridGeometry; + using GridGeometry = typename GridVariables::GridGeometry; using VV = typename GridVariables::VolumeVariables; using FluidSystem = typename VV::FluidSystem; using Scalar = typename GridVariables::Scalar; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using FractureGridView = typename FractureGrid::LeafGridView; using FractureMapper = Dune::MultipleCodimMultipleGeomTypeMapper; @@ -82,7 +82,7 @@ class BoxDfmVtkOutputModule : public VtkOutputModule 1, "Box-Dfm output only works for dim > 1"); static_assert(FractureGrid::dimension == int(dim-1), "Fracture grid must be of codimension one!"); static_assert(FractureGrid::dimensionworld == int(dimWorld), "Fracture grid has to has the same coordinate dimension!"); - static_assert(FVGridGeometry::discMethod == DiscretizationMethod::box, "Box-Dfm output module can only be used with the box scheme!"); + static_assert(GridGeometry::discMethod == DiscretizationMethod::box, "Box-Dfm output module can only be used with the box scheme!"); public: //! The constructor diff --git a/dumux/porousmediumflow/fluxvariables.hh b/dumux/porousmediumflow/fluxvariables.hh index 1838524d4f..60f7cd3c5f 100644 --- a/dumux/porousmediumflow/fluxvariables.hh +++ b/dumux/porousmediumflow/fluxvariables.hh @@ -53,9 +53,9 @@ class PorousMediumFluxVariables { using Scalar = GetPropType; using ModelTraits = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; diff --git a/dumux/porousmediumflow/fluxvariablescachefiller.hh b/dumux/porousmediumflow/fluxvariablescachefiller.hh index 916ceff5b2..c3f5579cb1 100644 --- a/dumux/porousmediumflow/fluxvariablescachefiller.hh +++ b/dumux/porousmediumflow/fluxvariablescachefiller.hh @@ -218,9 +218,9 @@ class PorousMediumFluxVariablesCacheFillerImplementation; using Element = typename GridView::template Codim<0>::Entity; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using MpfaHelper = typename FVGridGeometry::MpfaHelper; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using MpfaHelper = typename GridGeometry::MpfaHelper; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using ElementVolumeVariables = typename GetPropType::LocalView; using ElementFluxVariablesCache = typename GetPropType::LocalView; diff --git a/dumux/porousmediumflow/problem.hh b/dumux/porousmediumflow/problem.hh index 384dd51794..e80b65b01f 100644 --- a/dumux/porousmediumflow/problem.hh +++ b/dumux/porousmediumflow/problem.hh @@ -38,7 +38,7 @@ template class PorousMediumFlowProblem : public FVProblem { using ParentType = FVProblem; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using GridView = GetPropType; enum { @@ -64,7 +64,7 @@ public: * \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 fvGridGeometry, + PorousMediumFlowProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) @@ -82,7 +82,7 @@ public: * \param fvGridGeometry The finite volume grid geometry * \param paramGroup The parameter group in which to look for runtime parameters first (default is "") */ - PorousMediumFlowProblem(std::shared_ptr fvGridGeometry, + PorousMediumFlowProblem(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : PorousMediumFlowProblem(fvGridGeometry, std::make_shared(fvGridGeometry), diff --git a/dumux/porousmediumflow/velocity.hh b/dumux/porousmediumflow/velocity.hh index 28e9d3affa..4bae490fe2 100644 --- a/dumux/porousmediumflow/velocity.hh +++ b/dumux/porousmediumflow/velocity.hh @@ -45,11 +45,11 @@ namespace Dumux { template class PorousMediumFlowVelocity { - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridVolumeVariables = typename GridVariables::GridVolumeVariables; using ElementFluxVarsCache = typename GridVariables::GridFluxVariablesCache::LocalView; @@ -60,7 +60,7 @@ class PorousMediumFlowVelocity static constexpr int dim = GridView::dimension; static constexpr int dimWorld = GridView::dimensionworld; - static constexpr bool isBox = FVGridGeometry::discMethod == DiscretizationMethod::box; + static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box; static constexpr int dofCodim = isBox ? dim : 0; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -205,7 +205,7 @@ public: // For the number of scvfs per facet (mpfa) we simply obtain the number of // corners of the first facet as prisms/pyramids are not supported here anyway // -> for prisms/pyramids the number of scvfs would differ from facet to facet - static constexpr bool isMpfa = FVGridGeometry::discMethod == DiscretizationMethod::ccmpfa; + static constexpr bool isMpfa = GridGeometry::discMethod == DiscretizationMethod::ccmpfa; const int numScvfsPerFace = isMpfa ? element.template subEntity<1>(0).geometry().corners() : 1; if (fvGeometry.numScvf() != element.subEntities(1)*numScvfsPerFace) @@ -420,7 +420,7 @@ private: { return BoundaryTypes(); } const Problem& problem_; - const FVGridGeometry& fvGridGeometry_; + const GridGeometry& fvGridGeometry_; const GridVariables& gridVariables_; std::vector cellNum_; diff --git a/dumux/porousmediumflow/velocityoutput.hh b/dumux/porousmediumflow/velocityoutput.hh index 0d04c5b578..d9aff469c4 100644 --- a/dumux/porousmediumflow/velocityoutput.hh +++ b/dumux/porousmediumflow/velocityoutput.hh @@ -46,11 +46,11 @@ template class PorousMediumFlowVelocityOutput : public VelocityOutput { using ParentType = VelocityOutput; - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GridVolumeVariables = typename GridVariables::GridVolumeVariables; using ElementFluxVarsCache = typename GridVariables::GridFluxVariablesCache::LocalView; @@ -61,7 +61,7 @@ class PorousMediumFlowVelocityOutput : public VelocityOutput static constexpr int dim = GridView::dimension; static constexpr int dimWorld = GridView::dimensionworld; - static constexpr bool isBox = FVGridGeometry::discMethod == DiscretizationMethod::box; + static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box; static constexpr int dofCodim = isBox ? dim : 0; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; diff --git a/test/discretization/box/test_boxfvgeometry.cc b/test/discretization/box/test_boxfvgeometry.cc index 17b719f0ae..f70e09c228 100644 --- a/test/discretization/box/test_boxfvgeometry.cc +++ b/test/discretization/box/test_boxfvgeometry.cc @@ -59,8 +59,8 @@ int main (int argc, char *argv[]) try constexpr int dim = Grid::dimension; - using FVGridGeometry = BoxFVGridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = BoxFVGridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GlobalPosition = typename SubControlVolume::GlobalPosition; @@ -72,7 +72,7 @@ int main (int argc, char *argv[]) try std::shared_ptr grid = Dune::StructuredGridFactory::createCubeGrid(lower, upper, els); auto leafGridView = grid->leafGridView(); - FVGridGeometry fvGridGeometry(leafGridView); + GridGeometry fvGridGeometry(leafGridView); fvGridGeometry.update(); // iterate over elements. For every element get fv geometry and loop over scvs and scvfaces diff --git a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc index 5c95f2d5e6..5b507a531c 100644 --- a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc +++ b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc @@ -59,8 +59,8 @@ int main (int argc, char *argv[]) try constexpr int dim = Grid::dimension; - using FVGridGeometry = CCTpfaFVGridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = CCTpfaFVGridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GlobalPosition = typename SubControlVolume::GlobalPosition; @@ -71,9 +71,9 @@ int main (int argc, char *argv[]) try std::array els{{2, 2}}; std::shared_ptr grid = Dune::StructuredGridFactory::createCubeGrid(lower, upper, els); - // obtain leaf and make FVGridGeometry + // obtain leaf and make GridGeometry auto leafGridView = grid->leafGridView(); - FVGridGeometry fvGridGeometry(leafGridView); + GridGeometry fvGridGeometry(leafGridView); fvGridGeometry.update(); // iterate over elements. For every element get fv geometry and loop over scvs and scvfaces diff --git a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc index c515990287..4904a1a67f 100644 --- a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc +++ b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry_nonconforming.cc @@ -120,8 +120,8 @@ int main (int argc, char *argv[]) try constexpr int dim = Grid::dimension; - using FVGridGeometry = CCTpfaFVGridGeometry; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using GridGeometry = CCTpfaFVGridGeometry; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; //! make a grid @@ -142,7 +142,7 @@ int main (int argc, char *argv[]) try DUNE_THROW(Dune::InvalidStateException, "Refined grid does not have exactly 12 elements!"); //! instantiate and update fvGridGeometry - FVGridGeometry fvGridGeometry(leafGridView); + GridGeometry fvGridGeometry(leafGridView); fvGridGeometry.update(); //! We should have constructed 12 scvfs diff --git a/test/discretization/staggered/test_staggered_free_flow_geometry.cc b/test/discretization/staggered/test_staggered_free_flow_geometry.cc index d0e703c8b6..20078191bc 100644 --- a/test/discretization/staggered/test_staggered_free_flow_geometry.cc +++ b/test/discretization/staggered/test_staggered_free_flow_geometry.cc @@ -68,11 +68,11 @@ struct TestFVGGTraits : public DefaultMapperTraits using FaceIdx = Dune::index_constant<1>; }; - template - using ConnectivityMap = StaggeredFreeFlowConnectivityMap; + template + using ConnectivityMap = StaggeredFreeFlowConnectivityMap; - template - using LocalView = StaggeredFVElementGeometry; + template + using LocalView = StaggeredFVElementGeometry; }; } // end namespace Dumux @@ -95,9 +95,9 @@ int main (int argc, char *argv[]) try static constexpr int upwindSchemeOrder = 2; - using FVGridGeometry = StaggeredFVGridGeometry >; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GlobalPosition = typename SubControlVolume::GlobalPosition; @@ -109,7 +109,7 @@ int main (int argc, char *argv[]) try std::shared_ptr grid = Dune::StructuredGridFactory::createCubeGrid(lower, upper, els); auto leafGridView = grid->leafGridView(); - FVGridGeometry fvGridGeometry(leafGridView); + GridGeometry fvGridGeometry(leafGridView); fvGridGeometry.update(); std::cout << "Abbreviatons:\n" diff --git a/test/discretization/staggered/test_staggeredfvgeometry.cc b/test/discretization/staggered/test_staggeredfvgeometry.cc index 3296aca99c..a6b9f69ada 100644 --- a/test/discretization/staggered/test_staggeredfvgeometry.cc +++ b/test/discretization/staggered/test_staggeredfvgeometry.cc @@ -65,19 +65,19 @@ struct TestFVGGTraits : public DefaultMapperTraits using FaceIdx = Dune::index_constant<1>; }; - //! Dummy connectivity map, required by FVGridGeometry - template + //! Dummy connectivity map, required by GridGeometry + template struct MockConnectivityMap { - void update(const FVGridGeometry& fvGridGeometry) {} + void update(const GridGeometry& fvGridGeometry) {} void setStencilOrder(const int order) {} }; - template - using ConnectivityMap = MockConnectivityMap; + template + using ConnectivityMap = MockConnectivityMap; - template - using LocalView = StaggeredFVElementGeometry; + template + using LocalView = StaggeredFVElementGeometry; }; } // end namespace Dumux @@ -101,9 +101,9 @@ int main (int argc, char *argv[]) try constexpr int dimworld = Grid::dimensionworld; using GlobalPosition = typename Dune::FieldVector; - using FVGridGeometry = StaggeredFVGridGeometry >; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; @@ -114,7 +114,7 @@ int main (int argc, char *argv[]) try std::shared_ptr grid = Dune::StructuredGridFactory::createCubeGrid(lower, upper, els); auto leafGridView = grid->leafGridView(); - FVGridGeometry fvGridGeometry(leafGridView); + GridGeometry fvGridGeometry(leafGridView); fvGridGeometry.update(); // iterate over elements. For every element get fv geometry and loop over scvs and scvfaces diff --git a/test/freeflow/navierstokes/angeli/main.cc b/test/freeflow/navierstokes/angeli/main.cc index 4da3af1cca..ac05314106 100644 --- a/test/freeflow/navierstokes/angeli/main.cc +++ b/test/freeflow/navierstokes/angeli/main.cc @@ -133,8 +133,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // get some time loop parameters @@ -155,8 +155,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; diff --git a/test/freeflow/navierstokes/angeli/problem.hh b/test/freeflow/navierstokes/angeli/problem.hh index 2e2f7bd820..4848ed86d8 100644 --- a/test/freeflow/navierstokes/angeli/problem.hh +++ b/test/freeflow/navierstokes/angeli/problem.hh @@ -88,7 +88,7 @@ class AngeliTestProblem : public NavierStokesProblem using ParentType = NavierStokesProblem; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using ModelTraits = GetPropType; using NumEqVector = GetPropType; using PrimaryVariables = GetPropType; @@ -97,14 +97,14 @@ class AngeliTestProblem : public NavierStokesProblem using TimeLoopPtr = std::shared_ptr>; static constexpr auto dimWorld = GetPropType::dimensionworld; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using VelocityVector = Dune::FieldVector; public: using Indices = typename GetPropType::Indices; - AngeliTestProblem(std::shared_ptr fvGridGeometry) + AngeliTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { kinematicViscosity_ = getParam("Component.LiquidKinematicViscosity", 1.0); @@ -150,8 +150,8 @@ public: * \param pvIdx The primary variable index in the solution vector */ bool isDirichletCell(const Element& element, - const typename FVGridGeometry::LocalView& fvGeometry, - const typename FVGridGeometry::SubControlVolume& scv, + const typename GridGeometry::LocalView& fvGeometry, + const typename GridGeometry::SubControlVolume& scv, int pvIdx) const { // set a fixed pressure in all cells at the boundary diff --git a/test/freeflow/navierstokes/channel/1d/main.cc b/test/freeflow/navierstokes/channel/1d/main.cc index 249474a69e..82302e3344 100644 --- a/test/freeflow/navierstokes/channel/1d/main.cc +++ b/test/freeflow/navierstokes/channel/1d/main.cc @@ -75,8 +75,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (boundary conditions) @@ -86,8 +86,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); // the grid variables using GridVariables = GetPropType; diff --git a/test/freeflow/navierstokes/channel/1d/problem.hh b/test/freeflow/navierstokes/channel/1d/problem.hh index 4e171491d2..9c2672bcf8 100644 --- a/test/freeflow/navierstokes/channel/1d/problem.hh +++ b/test/freeflow/navierstokes/channel/1d/problem.hh @@ -90,7 +90,7 @@ class NavierStokesAnalyticProblem : public NavierStokesProblem using ParentType = NavierStokesProblem; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Indices = typename GetPropType::Indices; using NumEqVector = GetPropType; using ModelTraits = GetPropType; @@ -99,13 +99,13 @@ class NavierStokesAnalyticProblem : public NavierStokesProblem using SolutionVector = GetPropType; static constexpr auto dimWorld = GetPropType::dimensionworld; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using DimVector = GlobalPosition; using DimMatrix = Dune::FieldMatrix; public: - NavierStokesAnalyticProblem(std::shared_ptr fvGridGeometry) + NavierStokesAnalyticProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), eps_(1e-6) { printL2Error_ = getParam("Problem.PrintL2Error"); @@ -224,8 +224,8 @@ public: * \param pvIdx The primary variable index in the solution vector */ bool isDirichletCell(const Element& element, - const typename FVGridGeometry::LocalView& fvGeometry, - const typename FVGridGeometry::SubControlVolume& scv, + const typename GridGeometry::LocalView& fvGeometry, + const typename GridGeometry::SubControlVolume& scv, int pvIdx) const { // set a fixed pressure in all cells at the boundary diff --git a/test/freeflow/navierstokes/channel/2d/main.cc b/test/freeflow/navierstokes/channel/2d/main.cc index 43da72d5e9..ff469a1358 100644 --- a/test/freeflow/navierstokes/channel/2d/main.cc +++ b/test/freeflow/navierstokes/channel/2d/main.cc @@ -76,8 +76,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) @@ -96,8 +96,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; diff --git a/test/freeflow/navierstokes/channel/2d/problem.hh b/test/freeflow/navierstokes/channel/2d/problem.hh index d3b47821a7..bea0d03277 100644 --- a/test/freeflow/navierstokes/channel/2d/problem.hh +++ b/test/freeflow/navierstokes/channel/2d/problem.hh @@ -95,15 +95,15 @@ class ChannelTestProblem : public NavierStokesProblem using ParentType = NavierStokesProblem; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; using Indices = typename GetPropType::Indices; using NumEqVector = GetPropType; using PrimaryVariables = GetPropType; using Scalar = GetPropType; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using TimeLoopPtr = std::shared_ptr>; @@ -115,7 +115,7 @@ class ChannelTestProblem : public NavierStokesProblem }; public: - ChannelTestProblem(std::shared_ptr fvGridGeometry) + ChannelTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), eps_(1e-6) { inletVelocity_ = getParam("Problem.InletVelocity"); diff --git a/test/freeflow/navierstokes/channel/3d/main.cc b/test/freeflow/navierstokes/channel/3d/main.cc index be17fa9846..b5e316241c 100644 --- a/test/freeflow/navierstokes/channel/3d/main.cc +++ b/test/freeflow/navierstokes/channel/3d/main.cc @@ -76,8 +76,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (boundary conditions) @@ -87,8 +87,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); // the grid variables using GridVariables = GetPropType; diff --git a/test/freeflow/navierstokes/channel/3d/problem.hh b/test/freeflow/navierstokes/channel/3d/problem.hh index c9d4f908ec..63110c831e 100644 --- a/test/freeflow/navierstokes/channel/3d/problem.hh +++ b/test/freeflow/navierstokes/channel/3d/problem.hh @@ -105,8 +105,8 @@ class ThreeDChannelTestProblem : public NavierStokesProblem using BoundaryTypes = GetPropType; using Element = typename GridView::template Codim<0>::Entity; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; @@ -123,7 +123,7 @@ class ThreeDChannelTestProblem : public NavierStokesProblem static constexpr bool enablePseudoThreeDWallFriction = !DIM_3D; public: - ThreeDChannelTestProblem(std::shared_ptr fvGridGeometry) + ThreeDChannelTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), eps_(1e-6) { deltaP_ = getParam("Problem.DeltaP"); diff --git a/test/freeflow/navierstokes/closedsystem/main.cc b/test/freeflow/navierstokes/closedsystem/main.cc index 35e2f9ff8b..e860a62ffc 100644 --- a/test/freeflow/navierstokes/closedsystem/main.cc +++ b/test/freeflow/navierstokes/closedsystem/main.cc @@ -75,8 +75,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) @@ -86,8 +86,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; diff --git a/test/freeflow/navierstokes/closedsystem/problem.hh b/test/freeflow/navierstokes/closedsystem/problem.hh index 3e2054b388..803b9e888d 100644 --- a/test/freeflow/navierstokes/closedsystem/problem.hh +++ b/test/freeflow/navierstokes/closedsystem/problem.hh @@ -84,20 +84,20 @@ class ClosedSystemTestProblem : public NavierStokesProblem using ParentType = NavierStokesProblem; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; using Indices = typename GetPropType::Indices; using NumEqVector = GetPropType; using PrimaryVariables = GetPropType; using Scalar = GetPropType; static constexpr auto dimWorld = GetPropType::dimensionworld; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - ClosedSystemTestProblem(std::shared_ptr fvGridGeometry) + ClosedSystemTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), eps_(1e-6) { lidVelocity_ = getParam("Problem.LidVelocity"); diff --git a/test/freeflow/navierstokes/donea/main.cc b/test/freeflow/navierstokes/donea/main.cc index c4acd223c0..6f23214919 100644 --- a/test/freeflow/navierstokes/donea/main.cc +++ b/test/freeflow/navierstokes/donea/main.cc @@ -77,8 +77,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (boundary conditions) @@ -88,8 +88,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); // the grid variables using GridVariables = GetPropType; @@ -117,7 +117,7 @@ int main(int argc, char** argv) try using NewtonSolver = Dumux::NewtonSolver; NewtonSolver nonLinearSolver(assembler, linearSolver); - using NewtonConvergenceWriter = StaggeredNewtonConvergenceWriter; + using NewtonConvergenceWriter = StaggeredNewtonConvergenceWriter; auto convergenceWriter = std::make_shared(*fvGridGeometry); nonLinearSolver.attachConvergenceWriter(convergenceWriter); diff --git a/test/freeflow/navierstokes/donea/problem.hh b/test/freeflow/navierstokes/donea/problem.hh index 9765de2584..3fb28b3a76 100644 --- a/test/freeflow/navierstokes/donea/problem.hh +++ b/test/freeflow/navierstokes/donea/problem.hh @@ -91,7 +91,7 @@ class DoneaTestProblem : public NavierStokesProblem using ParentType = NavierStokesProblem; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Indices = typename GetPropType::Indices; using NumEqVector = GetPropType; using ModelTraits = GetPropType; @@ -100,12 +100,12 @@ class DoneaTestProblem : public NavierStokesProblem using SolutionVector = GetPropType; static constexpr auto dimWorld = GetPropType::dimensionworld; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using VelocityVector = Dune::FieldVector; public: - DoneaTestProblem(std::shared_ptr fvGridGeometry) + DoneaTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), eps_(1e-6) { printL2Error_ = getParam("Problem.PrintL2Error"); @@ -200,8 +200,8 @@ public: * \param pvIdx The primary variable index in the solution vector */ bool isDirichletCell(const Element& element, - const typename FVGridGeometry::LocalView& fvGeometry, - const typename FVGridGeometry::SubControlVolume& scv, + const typename GridGeometry::LocalView& fvGeometry, + const typename GridGeometry::SubControlVolume& scv, int pvIdx) const { bool onBoundary = false; diff --git a/test/freeflow/navierstokes/kovasznay/main.cc b/test/freeflow/navierstokes/kovasznay/main.cc index b60f0d98c0..f02242e733 100644 --- a/test/freeflow/navierstokes/kovasznay/main.cc +++ b/test/freeflow/navierstokes/kovasznay/main.cc @@ -75,8 +75,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (boundary conditions) @@ -86,8 +86,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); // the grid variables using GridVariables = GetPropType; diff --git a/test/freeflow/navierstokes/kovasznay/problem.hh b/test/freeflow/navierstokes/kovasznay/problem.hh index 813b605210..fc64fac118 100644 --- a/test/freeflow/navierstokes/kovasznay/problem.hh +++ b/test/freeflow/navierstokes/kovasznay/problem.hh @@ -91,9 +91,9 @@ class KovasznayTestProblem : public NavierStokesProblem using ParentType = NavierStokesProblem; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; using Indices = typename GetPropType::Indices; using ModelTraits = GetPropType; using NumEqVector = GetPropType; @@ -102,18 +102,18 @@ class KovasznayTestProblem : public NavierStokesProblem using SolutionVector = GetPropType; static constexpr auto dimWorld = GetPropType::dimensionworld; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using VelocityVector = Dune::FieldVector; static constexpr auto upwindSchemeOrder = getPropValue(); public: - KovasznayTestProblem(std::shared_ptr fvGridGeometry) + KovasznayTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), eps_(1e-6) { printL2Error_ = getParam("Problem.PrintL2Error"); - std::cout<< "upwindSchemeOrder is: " << FVGridGeometry::upwindStencilOrder() << "\n"; + std::cout<< "upwindSchemeOrder is: " << GridGeometry::upwindStencilOrder() << "\n"; kinematicViscosity_ = getParam("Component.LiquidKinematicViscosity", 1.0); Scalar reynoldsNumber = 1.0 / kinematicViscosity_; lambda_ = 0.5 * reynoldsNumber diff --git a/test/freeflow/navierstokes/l2error.hh b/test/freeflow/navierstokes/l2error.hh index 5d19b80104..21b0006afe 100644 --- a/test/freeflow/navierstokes/l2error.hh +++ b/test/freeflow/navierstokes/l2error.hh @@ -49,7 +49,7 @@ public: template static auto calculateL2Error(const Problem& problem, const SolutionVector& curSol) { - using FVGridGeometry = std::decay_t; + using GridGeometry = std::decay_t; PrimaryVariables sumError(0.0), sumReference(0.0), l2NormAbs(0.0), l2NormRel(0.0); const int numFaceDofs = problem.gridGeometry().numFaceDofs(); @@ -72,7 +72,7 @@ public: const auto dofIdxCellCenter = scv.dofIndex(); const auto& posCellCenter = scv.dofPosition(); const auto analyticalSolutionCellCenter = problem.dirichletAtPos(posCellCenter)[Indices::pressureIdx]; - const auto numericalSolutionCellCenter = curSol[FVGridGeometry::cellCenterIdx()][dofIdxCellCenter][Indices::pressureIdx - ModelTraits::dim()]; + const auto numericalSolutionCellCenter = curSol[GridGeometry::cellCenterIdx()][dofIdxCellCenter][Indices::pressureIdx - ModelTraits::dim()]; sumError[Indices::pressureIdx] += squaredDiff_(analyticalSolutionCellCenter, numericalSolutionCellCenter) * scv.volume(); sumReference[Indices::pressureIdx] += analyticalSolutionCellCenter * analyticalSolutionCellCenter * scv.volume(); totalVolume += scv.volume(); @@ -83,7 +83,7 @@ public: const int dofIdxFace = scvf.dofIndex(); const int dirIdx = scvf.directionIndex(); const auto analyticalSolutionFace = problem.dirichletAtPos(scvf.center())[Indices::velocity(dirIdx)]; - const auto numericalSolutionFace = curSol[FVGridGeometry::faceIdx()][dofIdxFace][0]; + const auto numericalSolutionFace = curSol[GridGeometry::faceIdx()][dofIdxFace][0]; directionIndex[dofIdxFace] = dirIdx; errorVelocity[dofIdxFace] = squaredDiff_(analyticalSolutionFace, numericalSolutionFace); velocityReference[dofIdxFace] = squaredDiff_(analyticalSolutionFace, 0.0); diff --git a/test/freeflow/navierstokes/sincos/main.cc b/test/freeflow/navierstokes/sincos/main.cc index 5437aaa6c8..ad61fc6312 100644 --- a/test/freeflow/navierstokes/sincos/main.cc +++ b/test/freeflow/navierstokes/sincos/main.cc @@ -137,8 +137,8 @@ auto createSource(const Problem& problem) return source; } -template -void printL2Error(const Problem& problem, const SolutionVector& x, const FVGridGeometry& fvGridGeometry) +template +void printL2Error(const Problem& problem, const SolutionVector& x, const GridGeometry& fvGridGeometry) { using namespace Dumux; using Scalar = double; @@ -195,8 +195,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // get some time loop parameters @@ -217,8 +217,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; diff --git a/test/freeflow/navierstokes/sincos/problem.hh b/test/freeflow/navierstokes/sincos/problem.hh index d4d1d407eb..80eb1801dc 100644 --- a/test/freeflow/navierstokes/sincos/problem.hh +++ b/test/freeflow/navierstokes/sincos/problem.hh @@ -86,17 +86,17 @@ class SincosTestProblem : public NavierStokesProblem using ParentType = NavierStokesProblem; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using NumEqVector = GetPropType; using PrimaryVariables = GetPropType; using Scalar = GetPropType; using SolutionVector = GetPropType; using TimeLoopPtr = std::shared_ptr>; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using FVElementGeometry = typename GridGeometry::LocalView; static constexpr auto dimWorld = GetPropType::dimensionworld; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using VelocityVector = Dune::FieldVector; @@ -104,7 +104,7 @@ public: using ModelTraits = GetPropType; using Indices = typename GetPropType::Indices; - SincosTestProblem(std::shared_ptr fvGridGeometry) + SincosTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), time_(0.0), timeStepSize_(0.0) { isStationary_ = getParam("Problem.IsStationary"); diff --git a/test/freeflow/navierstokesnc/channel/main.cc b/test/freeflow/navierstokesnc/channel/main.cc index a50a3442d2..cf4050af27 100644 --- a/test/freeflow/navierstokesnc/channel/main.cc +++ b/test/freeflow/navierstokesnc/channel/main.cc @@ -75,8 +75,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) @@ -97,8 +97,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; diff --git a/test/freeflow/navierstokesnc/channel/problem.hh b/test/freeflow/navierstokesnc/channel/problem.hh index 6e66aab472..da8fead4aa 100644 --- a/test/freeflow/navierstokesnc/channel/problem.hh +++ b/test/freeflow/navierstokesnc/channel/problem.hh @@ -111,7 +111,7 @@ class ChannelNCTestProblem : public NavierStokesProblem using BoundaryTypes = GetPropType; using FluidSystem = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Indices = typename GetPropType::Indices; using NumEqVector = GetPropType; using PrimaryVariables = GetPropType; @@ -127,7 +127,7 @@ class ChannelNCTestProblem : public NavierStokesProblem static constexpr auto transportEqIdx = Indices::conti0EqIdx + compIdx; public: - ChannelNCTestProblem(std::shared_ptr fvGridGeometry) + ChannelNCTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), eps_(1e-6) { inletVelocity_ = getParam("Problem.InletVelocity"); diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/main.cc b/test/freeflow/navierstokesnc/densitydrivenflow/main.cc index be73aafd03..9a2829b6ae 100644 --- a/test/freeflow/navierstokesnc/densitydrivenflow/main.cc +++ b/test/freeflow/navierstokesnc/densitydrivenflow/main.cc @@ -75,8 +75,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) @@ -96,8 +96,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh index 3cf9146102..c2c8abcd07 100644 --- a/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh +++ b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh @@ -98,13 +98,13 @@ class DensityDrivenFlowProblem : public NavierStokesProblem using BoundaryTypes = GetPropType; using FluidSystem = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Indices = typename GetPropType::Indices; using NumEqVector = GetPropType; using PrimaryVariables = GetPropType; using Scalar = GetPropType; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using TimeLoopPtr = std::shared_ptr>; @@ -115,7 +115,7 @@ class DensityDrivenFlowProblem : public NavierStokesProblem static constexpr auto transportEqIdx = Indices::conti0EqIdx + 1; public: - DensityDrivenFlowProblem(std::shared_ptr fvGridGeometry) + DensityDrivenFlowProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), eps_(1e-6) { useWholeLength_ = getParam("Problem.UseWholeLength"); diff --git a/test/freeflow/navierstokesnc/maxwellstefan/main.cc b/test/freeflow/navierstokesnc/maxwellstefan/main.cc index 0c54f21448..40d19b24f6 100644 --- a/test/freeflow/navierstokesnc/maxwellstefan/main.cc +++ b/test/freeflow/navierstokesnc/maxwellstefan/main.cc @@ -75,8 +75,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) @@ -96,8 +96,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; diff --git a/test/freeflow/navierstokesnc/maxwellstefan/problem.hh b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh index f708da444c..93ec739b78 100644 --- a/test/freeflow/navierstokesnc/maxwellstefan/problem.hh +++ b/test/freeflow/navierstokesnc/maxwellstefan/problem.hh @@ -209,13 +209,13 @@ class MaxwellStefanNCTestProblem : public NavierStokesProblem using BoundaryTypes = GetPropType; using FluidSystem = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Indices = typename GetPropType::Indices; using NumEqVector = GetPropType; using PrimaryVariables = GetPropType; using Scalar = GetPropType; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using TimeLoopPtr = std::shared_ptr>; @@ -226,7 +226,7 @@ class MaxwellStefanNCTestProblem : public NavierStokesProblem }; public: - MaxwellStefanNCTestProblem(std::shared_ptr fvGridGeometry) + MaxwellStefanNCTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { plotOutput_ = getParam("Problem.PlotOutput", false); diff --git a/test/freeflow/rans/main.cc b/test/freeflow/rans/main.cc index 2146a1810d..0c5f901ac6 100644 --- a/test/freeflow/rans/main.cc +++ b/test/freeflow/rans/main.cc @@ -99,8 +99,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) @@ -121,8 +121,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); problem->updateStaticWallProperties(); problem->updateDynamicWallProperties(x); diff --git a/test/freeflow/rans/problem.hh b/test/freeflow/rans/problem.hh index 472090c824..f2a035cc8e 100644 --- a/test/freeflow/rans/problem.hh +++ b/test/freeflow/rans/problem.hh @@ -115,14 +115,14 @@ class PipeLauferProblem : public RANSProblem using BoundaryTypes = GetPropType; using FluidSystem = GetPropType; using FluidState = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Indices = typename GetPropType::Indices; using NumEqVector = GetPropType; using PrimaryVariables = GetPropType; using Scalar = GetPropType; using ModelTraits = GetPropType; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; @@ -130,10 +130,10 @@ class PipeLauferProblem : public RANSProblem using TimeLoopPtr = std::shared_ptr>; - static constexpr auto dimWorld = FVGridGeometry::GridView::dimensionworld; + static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld; public: - PipeLauferProblem(std::shared_ptr fvGridGeometry) + PipeLauferProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), eps_(1e-6) { inletVelocity_ = getParam("Problem.InletVelocity"); diff --git a/test/freeflow/ransnc/main.cc b/test/freeflow/ransnc/main.cc index ca5605684f..2d56c71930 100644 --- a/test/freeflow/ransnc/main.cc +++ b/test/freeflow/ransnc/main.cc @@ -96,8 +96,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) @@ -118,8 +118,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + x[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); problem->updateStaticWallProperties(); problem->updateDynamicWallProperties(x); diff --git a/test/freeflow/ransnc/problem.hh b/test/freeflow/ransnc/problem.hh index 15e111ed59..eda84e0880 100644 --- a/test/freeflow/ransnc/problem.hh +++ b/test/freeflow/ransnc/problem.hh @@ -122,14 +122,14 @@ class FlatPlateNCTestProblem : public RANSProblem using BoundaryTypes = GetPropType; using FluidSystem = GetPropType; using FluidState = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Indices = typename GetPropType::Indices; using NumEqVector = GetPropType; using PrimaryVariables = GetPropType; using Scalar = GetPropType; using ModelTraits = GetPropType; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; @@ -142,7 +142,7 @@ class FlatPlateNCTestProblem : public RANSProblem static constexpr auto transportCompIdx = Indices::conti0EqIdx + 1; public: - FlatPlateNCTestProblem(std::shared_ptr fvGridGeometry) + FlatPlateNCTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), eps_(1e-6) { inletVelocity_ = getParam("Problem.InletVelocity", 0.1); diff --git a/test/freeflow/shallowwater/dambreak/main.cc b/test/freeflow/shallowwater/dambreak/main.cc index 28a9a56ffe..49c0fac1ac 100644 --- a/test/freeflow/shallowwater/dambreak/main.cc +++ b/test/freeflow/shallowwater/dambreak/main.cc @@ -78,8 +78,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/freeflow/shallowwater/dambreak/problem.hh b/test/freeflow/shallowwater/dambreak/problem.hh index bd69eebd1c..35071a7bc2 100644 --- a/test/freeflow/shallowwater/dambreak/problem.hh +++ b/test/freeflow/shallowwater/dambreak/problem.hh @@ -66,10 +66,10 @@ template struct SpatialParams { private: - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; public: - using type = DamBreakSpatialParams; + using type = DamBreakSpatialParams; }; template @@ -113,7 +113,7 @@ class DamBreakProblem : public ShallowWaterProblem using BoundaryTypes = GetPropType; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using NeumannFluxes = GetPropType; using GridVariables = GetPropType; @@ -126,7 +126,7 @@ class DamBreakProblem : public ShallowWaterProblem using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - DamBreakProblem(std::shared_ptr fvGridGeometry) + DamBreakProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { name_ = getParam("Problem.Name"); diff --git a/test/freeflow/shallowwater/dambreak/spatialparams.hh b/test/freeflow/shallowwater/dambreak/spatialparams.hh index c5c32c5440..8208960388 100644 --- a/test/freeflow/shallowwater/dambreak/spatialparams.hh +++ b/test/freeflow/shallowwater/dambreak/spatialparams.hh @@ -33,21 +33,21 @@ namespace Dumux { * \brief The spatial parameters class for the dam break test. * */ -template +template class DamBreakSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using ThisType = DamBreakSpatialParams; - using ParentType = FVSpatialParams; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using ThisType = DamBreakSpatialParams; + using ParentType = FVSpatialParams; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - DamBreakSpatialParams(std::shared_ptr fvGridGeometry) + DamBreakSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} diff --git a/test/freeflow/shallowwater/roughchannel/main.cc b/test/freeflow/shallowwater/roughchannel/main.cc index 1cd061ce57..2b7ec29d8f 100644 --- a/test/freeflow/shallowwater/roughchannel/main.cc +++ b/test/freeflow/shallowwater/roughchannel/main.cc @@ -76,8 +76,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/freeflow/shallowwater/roughchannel/problem.hh b/test/freeflow/shallowwater/roughchannel/problem.hh index c8d973ae4d..8aaf7735e8 100644 --- a/test/freeflow/shallowwater/roughchannel/problem.hh +++ b/test/freeflow/shallowwater/roughchannel/problem.hh @@ -60,12 +60,12 @@ template struct SpatialParams { private: - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; using VolumeVariables = typename ElementVolumeVariables::VolumeVariables; public: - using type = RoughChannelSpatialParams; + using type = RoughChannelSpatialParams; }; template @@ -116,7 +116,7 @@ class RoughChannelProblem : public ShallowWaterProblem using BoundaryTypes = GetPropType; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using NeumannFluxes = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; using GridVariables = GetPropType; @@ -131,7 +131,7 @@ class RoughChannelProblem : public ShallowWaterProblem using SubControlVolume = typename FVElementGeometry::SubControlVolume; public: - RoughChannelProblem(std::shared_ptr fvGridGeometry) + RoughChannelProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { name_ = getParam("Problem.Name"); diff --git a/test/freeflow/shallowwater/roughchannel/spatialparams.hh b/test/freeflow/shallowwater/roughchannel/spatialparams.hh index 87bea05d50..e9b36cdd33 100644 --- a/test/freeflow/shallowwater/roughchannel/spatialparams.hh +++ b/test/freeflow/shallowwater/roughchannel/spatialparams.hh @@ -37,21 +37,21 @@ namespace Dumux { * \brief The spatial parameters class for the rough channel test. * */ -template +template class RoughChannelSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using ThisType = RoughChannelSpatialParams; - using ParentType = FVSpatialParams; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using ThisType = RoughChannelSpatialParams; + using ParentType = FVSpatialParams; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - RoughChannelSpatialParams(std::shared_ptr fvGridGeometry) + RoughChannelSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { gravity_ = getParam("Problem.Gravity"); diff --git a/test/geomechanics/elastic/main.cc b/test/geomechanics/elastic/main.cc index 20d19c55dd..aaed4af39b 100644 --- a/test/geomechanics/elastic/main.cc +++ b/test/geomechanics/elastic/main.cc @@ -82,8 +82,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/geomechanics/elastic/problem.hh b/test/geomechanics/elastic/problem.hh index cb73e24845..886d3ef615 100644 --- a/test/geomechanics/elastic/problem.hh +++ b/test/geomechanics/elastic/problem.hh @@ -77,10 +77,10 @@ class ElasticProblem : public GeomechanicsFVProblem using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView; using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; using GridView = GetPropType; using Element = typename GridView::template Codim<0>::Entity; @@ -92,7 +92,7 @@ class ElasticProblem : public GeomechanicsFVProblem using GradU = Dune::FieldMatrix; public: - ElasticProblem(std::shared_ptr fvGridGeometry) + ElasticProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} //! Returns the temperature in the domain. diff --git a/test/geomechanics/elastic/spatialparams.hh b/test/geomechanics/elastic/spatialparams.hh index edc588bf7f..fb2ce79e4d 100644 --- a/test/geomechanics/elastic/spatialparams.hh +++ b/test/geomechanics/elastic/spatialparams.hh @@ -34,16 +34,16 @@ namespace Dumux { * \ingroup GeomechanicsTests * \brief Definition of the spatial parameters for the linear elasticity problem. */ -template +template class ElasticSpatialParams : public FVSpatialParamsElastic< Scalar, - FVGridGeometry, - ElasticSpatialParams > + GridGeometry, + ElasticSpatialParams > { - using ThisType = ElasticSpatialParams; - using ParentType = FVSpatialParamsElastic; + using ThisType = ElasticSpatialParams; + using ParentType = FVSpatialParamsElastic; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -51,7 +51,7 @@ public: //! Export the type of the lame parameters using LameParams = Dumux::LameParams; - ElasticSpatialParams(std::shared_ptr fvGridGeometry) + ElasticSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { lameParams_.setLambda(3e9); diff --git a/test/geomechanics/poroelastic/main.cc b/test/geomechanics/poroelastic/main.cc index f6f61d3990..72570168f9 100644 --- a/test/geomechanics/poroelastic/main.cc +++ b/test/geomechanics/poroelastic/main.cc @@ -82,8 +82,8 @@ void assembleElementStresses(SigmaStorage& sigmaStorage, const auto effSigma = StressType::effectiveStressTensor(problem, element, fvGeometry, elemVolVars, fluxVarsCache); // pass values into storage container - using FVGridGeometry = typename GridVariables::GridGeometry; - for (int dir = 0; dir < FVGridGeometry::GridView::dimension; ++dir) + using GridGeometry = typename GridVariables::GridGeometry; + for (int dir = 0; dir < GridGeometry::GridView::dimension; ++dir) { const auto eIdx = fvGridGeometry.elementMapper().index(element); sigmaStorage[dir][eIdx] = sigma[dir]; @@ -125,8 +125,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) @@ -156,8 +156,8 @@ int main(int argc, char** argv) try vtkWriter.addField(xExact, "u_exact"); // Furthermore, write out element stress tensors - static constexpr int dim = FVGridGeometry::GridView::dimension; - static constexpr int dimWorld = FVGridGeometry::GridView::dimensionworld; + static constexpr int dim = GridGeometry::GridView::dimension; + static constexpr int dimWorld = GridGeometry::GridView::dimensionworld; using Scalar = GetPropType; using ForceVector = Dune::FieldVector< Scalar, dimWorld >; diff --git a/test/geomechanics/poroelastic/problem.hh b/test/geomechanics/poroelastic/problem.hh index fffb217f91..bebef6fc1f 100644 --- a/test/geomechanics/poroelastic/problem.hh +++ b/test/geomechanics/poroelastic/problem.hh @@ -85,10 +85,10 @@ class PoroElasticProblem : public GeomechanicsFVProblem using NumEqVector = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; using GridView = GetPropType; using Element = typename GridView::template Codim<0>::Entity; @@ -100,7 +100,7 @@ class PoroElasticProblem : public GeomechanicsFVProblem using GradU = Dune::FieldMatrix; public: - PoroElasticProblem(std::shared_ptr fvGridGeometry) + PoroElasticProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} diff --git a/test/geomechanics/poroelastic/spatialparams.hh b/test/geomechanics/poroelastic/spatialparams.hh index 4cb6a97b30..aed04c1680 100644 --- a/test/geomechanics/poroelastic/spatialparams.hh +++ b/test/geomechanics/poroelastic/spatialparams.hh @@ -35,16 +35,16 @@ namespace Dumux { * \ingroup GeomechanicsTests * \brief Definition of the spatial parameters for the poro-elastic problem. */ -template +template class PoroElasticSpatialParams : public FVSpatialParamsPoroElastic< Scalar, - FVGridGeometry, - PoroElasticSpatialParams > + GridGeometry, + PoroElasticSpatialParams > { - using ThisType = PoroElasticSpatialParams; - using ParentType = FVSpatialParamsPoroElastic; + using ThisType = PoroElasticSpatialParams; + using ParentType = FVSpatialParamsPoroElastic; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -52,7 +52,7 @@ public: //! Export the type of the lame parameters using LameParams = Dumux::LameParams; - PoroElasticSpatialParams(std::shared_ptr fvGridGeometry) + PoroElasticSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { lameParams_.setLambda(2); diff --git a/test/io/gridmanager/gmshboundaryflagtest.hh b/test/io/gridmanager/gmshboundaryflagtest.hh index 6d73c3d35c..c9d332b8f8 100644 --- a/test/io/gridmanager/gmshboundaryflagtest.hh +++ b/test/io/gridmanager/gmshboundaryflagtest.hh @@ -44,9 +44,9 @@ class GmshBoundaryFlagTest public: - template + template static void testGmshBoundaryFlag(const GridView& leafGridView, - std::shared_ptr fvGridGeometry, + std::shared_ptr fvGridGeometry, std::shared_ptr> gridData) { diff --git a/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc b/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc index f02538e0a4..64ed178fad 100644 --- a/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc +++ b/test/io/vtk/test_vtk_staggeredfreeflowpvnames.cc @@ -188,8 +188,8 @@ void assignValues(SolutionVector& sol, Values values) } } -template -void testWriteAndReadVtk(std::shared_ptr fvGridGeometry, +template +void testWriteAndReadVtk(std::shared_ptr fvGridGeometry, const std::array, numValues>& values, const std::string& fileName, bool verbose = false, @@ -201,8 +201,8 @@ void testWriteAndReadVtk(std::shared_ptr fvGridGeometry, using SolutionVector = GetPropType; SolutionVector writeFrom; - writeFrom[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); - writeFrom[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); + writeFrom[GridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + writeFrom[GridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); SolutionVector readTo = writeFrom; @@ -210,8 +210,8 @@ void testWriteAndReadVtk(std::shared_ptr fvGridGeometry, using Problem = GetPropType; auto problem = std::make_shared(fvGridGeometry); - assignValues(writeFrom[FVGridGeometry::cellCenterIdx()], values); - assignValues(writeFrom[FVGridGeometry::faceIdx()], std::array, 1>{1.0}); + assignValues(writeFrom[GridGeometry::cellCenterIdx()], values); + assignValues(writeFrom[GridGeometry::faceIdx()], std::array, 1>{1.0}); problem->updateStaticWallProperties(); problem->updateDynamicWallProperties(writeFrom); @@ -235,47 +235,47 @@ void testWriteAndReadVtk(std::shared_ptr fvGridGeometry, using FacePrimaryVariables = GetPropType; // cc dofs - loadSolution(readTo[FVGridGeometry::cellCenterIdx()], fileName + "-00000.vtu", + loadSolution(readTo[GridGeometry::cellCenterIdx()], fileName + "-00000.vtu", createCellCenterPVNameFunction(), *fvGridGeometry); if (verbose) { std::cout << "reference cc " << std::endl; - for (const auto& block : writeFrom[FVGridGeometry::cellCenterIdx()]) + for (const auto& block : writeFrom[GridGeometry::cellCenterIdx()]) std::cout << block << std::endl; std::cout << "result cc " << std::endl; - for (const auto& block : readTo[FVGridGeometry::cellCenterIdx()]) + for (const auto& block : readTo[GridGeometry::cellCenterIdx()]) std::cout << block << std::endl; } - for (int i = 0; i < readTo[FVGridGeometry::cellCenterIdx()].size(); ++i) + for (int i = 0; i < readTo[GridGeometry::cellCenterIdx()].size(); ++i) { - if (Dune::FloatCmp::ne(readTo[FVGridGeometry::cellCenterIdx()][i], writeFrom[FVGridGeometry::cellCenterIdx()][i])) - DUNE_THROW(Dune::IOError, "Values don't match: new " << readTo[FVGridGeometry::cellCenterIdx()][i] << ", old " << writeFrom[FVGridGeometry::cellCenterIdx()][i]); + if (Dune::FloatCmp::ne(readTo[GridGeometry::cellCenterIdx()][i], writeFrom[GridGeometry::cellCenterIdx()][i])) + DUNE_THROW(Dune::IOError, "Values don't match: new " << readTo[GridGeometry::cellCenterIdx()][i] << ", old " << writeFrom[GridGeometry::cellCenterIdx()][i]); } // face dofs - loadSolution(readTo[FVGridGeometry::faceIdx()], fileName + "-face-00000.vtp", + loadSolution(readTo[GridGeometry::faceIdx()], fileName + "-face-00000.vtp", createFacePVNameFunction(), *fvGridGeometry); if (verbose) { std::cout << "reference face " << std::endl; - for (const auto& block : writeFrom[FVGridGeometry::faceIdx()]) + for (const auto& block : writeFrom[GridGeometry::faceIdx()]) std::cout << block << std::endl; std::cout << "result face " << std::endl; - for (const auto& block : readTo[FVGridGeometry::faceIdx()]) + for (const auto& block : readTo[GridGeometry::faceIdx()]) std::cout << block << std::endl; } - for (int i = 0; i < readTo[FVGridGeometry::faceIdx()].size(); ++i) + for (int i = 0; i < readTo[GridGeometry::faceIdx()].size(); ++i) { - if (Dune::FloatCmp::ne(readTo[FVGridGeometry::faceIdx()][i], writeFrom[FVGridGeometry::faceIdx()][i])) - DUNE_THROW(Dune::IOError, "Values don't match: new " << readTo[FVGridGeometry::faceIdx()][i] << ", old " << writeFrom[FVGridGeometry::faceIdx()][i]); + if (Dune::FloatCmp::ne(readTo[GridGeometry::faceIdx()][i], writeFrom[GridGeometry::faceIdx()][i])) + DUNE_THROW(Dune::IOError, "Values don't match: new " << readTo[GridGeometry::faceIdx()][i] << ", old " << writeFrom[GridGeometry::faceIdx()][i]); } // clean up the folder @@ -313,7 +313,7 @@ int main(int argc, char** argv) try using CommonTypeTag = Properties::TTag::StaggeredPVNamesTestTypeTag; using Grid = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; using GlobalPosition = Dune::FieldVector; @@ -324,7 +324,7 @@ int main(int argc, char** argv) try const auto grid = Dune::StructuredGridFactory::createCubeGrid(lowerLeft, upperRight, cells); const auto gridView = grid->leafGridView(); - auto fvGridGeometry = std::make_shared(gridView); + auto fvGridGeometry = std::make_shared(gridView); fvGridGeometry->update(); using FluidSystem = GetPropType; diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/main.cc b/test/multidomain/boundary/darcydarcy/1p_1p/main.cc index cf2743a374..91e55f2cfa 100644 --- a/test/multidomain/boundary/darcydarcy/1p_1p/main.cc +++ b/test/multidomain/boundary/darcydarcy/1p_1p/main.cc @@ -188,9 +188,9 @@ int main(int argc, char** argv) try //////////////////////////////////////////////// // create the finite volume grid geometries - using FVGridGeometry = GetPropType; - auto fvGridGeometry0 = std::make_shared(gridView0); - auto fvGridGeometry1 = std::make_shared(gridView1); + using GridGeometry = GetPropType; + auto fvGridGeometry0 = std::make_shared(gridView0); + auto fvGridGeometry1 = std::make_shared(gridView1); fvGridGeometry0->update(); fvGridGeometry1->update(); diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh b/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh index 274d6eeacf..7b5c5395d8 100644 --- a/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh +++ b/test/multidomain/boundary/darcydarcy/1p_1p/problem.hh @@ -45,10 +45,10 @@ class OnePTestProblem { using ParentType = PorousMediumFlowProblem; using CouplingManager = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; @@ -60,7 +60,7 @@ class OnePTestProblem static constexpr auto domainIdx = Dune::index_constant{}; public: - OnePTestProblem(std::shared_ptr fvGridGeometry, + OnePTestProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/spatialparams.hh b/test/multidomain/boundary/darcydarcy/1p_1p/spatialparams.hh index 145c91f681..2162733a7c 100644 --- a/test/multidomain/boundary/darcydarcy/1p_1p/spatialparams.hh +++ b/test/multidomain/boundary/darcydarcy/1p_1p/spatialparams.hh @@ -56,15 +56,15 @@ bool pointInLens(const GlobalPosition& globalPos, * \brief The spatial parameters class for the test problem using the * incompressible 1p model. */ -template +template class OnePTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using ThisType = OnePTestSpatialParams; - using ParentType = FVSpatialParamsOneP; - using GridView = typename FVGridGeometry::GridView; + using ThisType = OnePTestSpatialParams; + using ParentType = FVSpatialParamsOneP; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; static constexpr int dimWorld = GridView::dimensionworld; @@ -72,7 +72,7 @@ class OnePTestSpatialParams public: using PermeabilityType = Scalar; - OnePTestSpatialParams(std::shared_ptr fvGridGeometry) + OnePTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) , lensLowerLeft_(std::numeric_limits::max()) , lensUpperRight_(std::numeric_limits::lowest()) diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/main.cc b/test/multidomain/boundary/darcydarcy/1p_2p/main.cc index 536ebcadc4..2abb60e76c 100644 --- a/test/multidomain/boundary/darcydarcy/1p_2p/main.cc +++ b/test/multidomain/boundary/darcydarcy/1p_2p/main.cc @@ -174,9 +174,9 @@ int main(int argc, char** argv) try //////////////////////////////////////////////// // create the finite volume grid geometries - using FVGridGeometry = GetPropType; - auto fvGridGeometry0 = std::make_shared(gridView0); - auto fvGridGeometry1 = std::make_shared(gridView1); + using GridGeometry = GetPropType; + auto fvGridGeometry0 = std::make_shared(gridView0); + auto fvGridGeometry1 = std::make_shared(gridView1); fvGridGeometry0->update(); fvGridGeometry1->update(); diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh b/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh index addcb649a3..c20d7497e2 100644 --- a/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh +++ b/test/multidomain/boundary/darcydarcy/1p_2p/problem.hh @@ -46,10 +46,10 @@ class OnePTestProblem { using ParentType = PorousMediumFlowProblem; using CouplingManager = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; @@ -62,7 +62,7 @@ class OnePTestProblem static constexpr auto domainIdx = Dune::index_constant{}; public: - OnePTestProblem(std::shared_ptr fvGridGeometry, + OnePTestProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/spatialparams.hh b/test/multidomain/boundary/darcydarcy/1p_2p/spatialparams.hh index e9a06ed4d6..7ab343bf5f 100644 --- a/test/multidomain/boundary/darcydarcy/1p_2p/spatialparams.hh +++ b/test/multidomain/boundary/darcydarcy/1p_2p/spatialparams.hh @@ -36,15 +36,15 @@ namespace Dumux { * \brief The spatial parameters class for the test problem using the * incompressible 1p model. */ -template +template class TestSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using ThisType = TestSpatialParams; - using ParentType = FVSpatialParams; - using GridView = typename FVGridGeometry::GridView; + using ThisType = TestSpatialParams; + using ParentType = FVSpatialParams; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; static constexpr int dimWorld = GridView::dimensionworld; @@ -56,7 +56,7 @@ public: using PermeabilityType = Scalar; - TestSpatialParams(std::shared_ptr fvGridGeometry) + TestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { materialParams_.setSwr(0.05); 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 d236c9a2e0..a9dc0436e7 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh @@ -95,9 +95,9 @@ struct MolecularDiffusionType { using type = DIFFU template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePSpatialParams; + using type = OnePSpatialParams; }; } // end namespace Properties @@ -114,7 +114,7 @@ class DarcySubProblem : public PorousMediumFlowProblem using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using DiffusionCoefficientAveragingType = typename StokesDarcyCouplingOptions::DiffusionCoefficientAveragingType; // copy some indices for convenience @@ -135,7 +135,7 @@ class DarcySubProblem : public PorousMediumFlowProblem using CouplingManager = GetPropType; public: - DarcySubProblem(std::shared_ptr fvGridGeometry, + DarcySubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) { 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 e0d55c6cb9..45d5929dd2 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh @@ -109,8 +109,8 @@ class StokesSubProblem : public NavierStokesProblem using Indices = typename GetPropType::Indices; using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; @@ -122,7 +122,7 @@ class StokesSubProblem : public NavierStokesProblem using DiffusionCoefficientAveragingType = typename StokesDarcyCouplingOptions::DiffusionCoefficientAveragingType; public: - StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) + StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), injectionState_(false), couplingManager_(couplingManager) { inletVelocity_ = getParamFromGroup(this->paramGroup(), "Problem.Velocity"); diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh index b53c628daf..0a2be28a9e 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh @@ -82,9 +82,9 @@ struct Grid { using type = Dune::YaspGrid<2>; }; template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePSpatialParams; + using type = OnePSpatialParams; }; } // end namespace Dumux @@ -92,8 +92,8 @@ template class DarcySubProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; - using FVGridGeometry = GetPropType; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using GridView = typename GridGeometry::GridView; using Scalar = GetPropType; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; @@ -110,7 +110,7 @@ class DarcySubProblem : public PorousMediumFlowProblem using TimeLoopPtr = std::shared_ptr>; public: - DarcySubProblem(std::shared_ptr fvGridGeometry, + DarcySubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) { diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh index ec8a1242f2..7e1a9b855d 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_stokes.hh @@ -91,8 +91,8 @@ class StokesSubProblem : public NavierStokesProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; @@ -104,7 +104,7 @@ class StokesSubProblem : public NavierStokesProblem using TimeLoopPtr = std::shared_ptr>; public: - StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) + StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) { problemName_ = getParam("Vtk.OutputName") + "_" + getParamFromGroup(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 b4bcd82c16..1f0a32cb26 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/spatialparams.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/spatialparams.hh @@ -34,14 +34,14 @@ namespace Dumux { * \brief The spatial parameters class for the test problem using the * 1p cc model. */ -template +template class OnePSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using ParentType = FVSpatialParamsOneP>; + using GridView = typename GridGeometry::GridView; + using ParentType = FVSpatialParamsOneP>; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -50,7 +50,7 @@ public: // export permeability type using PermeabilityType = Scalar; - OnePSpatialParams(std::shared_ptr fvGridGeometry) + OnePSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = getParam("SpatialParams.Permeability"); diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh index c618dd09d9..bc0917a386 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh @@ -78,9 +78,9 @@ struct UseMoles { static constexpr bool value = tr template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = TwoPTwoCSpatialParams; + using type = TwoPTwoCSpatialParams; }; } // end namespace Properties @@ -98,7 +98,7 @@ class DarcySubProblem : public PorousMediumFlowProblem using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using GridVariables = GetPropType; using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView; using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView; @@ -124,7 +124,7 @@ class DarcySubProblem : public PorousMediumFlowProblem using DiffusionCoefficientAveragingType = typename StokesDarcyCouplingOptions::DiffusionCoefficientAveragingType; public: - DarcySubProblem(std::shared_ptr fvGridGeometry, + DarcySubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) { diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh index 4432b67103..8dc5a4e30f 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_stokes.hh @@ -99,8 +99,8 @@ class StokesSubProblem : public NavierStokesProblem using Indices = typename GetPropType::Indices; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; @@ -120,7 +120,7 @@ class StokesSubProblem : public NavierStokesProblem static constexpr bool useMoles = GetPropType::useMoles(); public: - StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) + StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) { refVelocity_ = getParamFromGroup(this->paramGroup(), "Problem.RefVelocity"); diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/spatialparams.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/spatialparams.hh index bd537c1508..bcfa06ec50 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/spatialparams.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/spatialparams.hh @@ -38,15 +38,15 @@ namespace Dumux * \brief The spatial parameters class for the test problem using the * 1p cc model. */ -template +template class TwoPTwoCSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using EffectiveLaw = RegularizedVanGenuchten; @@ -56,7 +56,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = Scalar; - TwoPTwoCSpatialParams(std::shared_ptr fvGridGeometry) + TwoPTwoCSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = getParam("SpatialParams.Permeability"); diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh index f2ee08a05f..146015619a 100644 --- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh @@ -85,9 +85,9 @@ struct MolecularDiffusionType { using type = Max template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePSpatialParams; + using type = OnePSpatialParams; }; } // end namespace Properties @@ -105,7 +105,7 @@ class DarcySubProblem : public PorousMediumFlowProblem using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using DiffusionCoefficientAveragingType = typename StokesDarcyCouplingOptions::DiffusionCoefficientAveragingType; // copy some indices for convenience @@ -126,7 +126,7 @@ class DarcySubProblem : public PorousMediumFlowProblem using CouplingManager = GetPropType; public: - DarcySubProblem(std::shared_ptr fvGridGeometry, + DarcySubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) { diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh index c6918e3ce0..e11ab4459f 100644 --- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh @@ -94,8 +94,8 @@ class StokesSubProblem : public NavierStokesProblem using Indices = typename GetPropType::Indices; using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; @@ -107,7 +107,7 @@ class StokesSubProblem : public NavierStokesProblem using CouplingManager = GetPropType; public: - StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) + StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) { diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh index 2526dbc20b..d7f5c00ec6 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh @@ -66,9 +66,9 @@ struct Grid { using type = Dune::YaspGrid<2>; }; template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePSpatialParams; + using type = OnePSpatialParams; }; } // end namespace Properties @@ -85,7 +85,7 @@ class DarcySubProblem : public PorousMediumFlowProblem using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Indices = typename GetPropType::Indices; @@ -95,7 +95,7 @@ class DarcySubProblem : public PorousMediumFlowProblem using CouplingManager = GetPropType; public: - DarcySubProblem(std::shared_ptr fvGridGeometry, + DarcySubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) { diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh index 52b9cc8ceb..10da293bf3 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_stokes.hh @@ -86,8 +86,8 @@ class StokesSubProblem : public NavierStokesProblem using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using Element = typename GridView::template Codim<0>::Entity; @@ -99,7 +99,7 @@ class StokesSubProblem : public NavierStokesProblem using CouplingManager = GetPropType; public: - StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) + StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) { problemName_ = getParam("Vtk.OutputName") + "_" + getParamFromGroup(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 fb0adabe62..bfc9a37f28 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/spatialparams.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/spatialparams.hh @@ -35,14 +35,14 @@ namespace Dumux * \brief The spatial parameters class for the test problem using the * 1p cc model. */ -template +template class OnePSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using ParentType = FVSpatialParamsOneP>; + using GridView = typename GridGeometry::GridView; + using ParentType = FVSpatialParamsOneP>; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -51,7 +51,7 @@ public: // export permeability type using PermeabilityType = Scalar; - OnePSpatialParams(std::shared_ptr fvGridGeometry) + OnePSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = getParam("Darcy.SpatialParams.Permeability"); diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh index a71e106b29..5bb71d5cd3 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh @@ -63,9 +63,9 @@ struct UseMoles { static constexpr bool value = false; template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = ConservationSpatialParams; + using type = ConservationSpatialParams; }; //! Set the default formulation to pw-Sn: This can be over written in the problem. @@ -91,7 +91,7 @@ class DarcySubProblem : public PorousMediumFlowProblem using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FluidSystem = GetPropType; @@ -110,7 +110,7 @@ class DarcySubProblem : public PorousMediumFlowProblem using CouplingManager = GetPropType; public: - DarcySubProblem(std::shared_ptr fvGridGeometry, + DarcySubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) { diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh index a07ab5eee6..fb08d873d5 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh @@ -77,8 +77,8 @@ class StokesSubProblem : public NavierStokesProblem using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using Element = typename GridView::template Codim<0>::Entity; using ElementVolumeVariables = typename GetPropType::LocalView; @@ -92,7 +92,7 @@ class StokesSubProblem : public NavierStokesProblem using CouplingManager = GetPropType; public: - StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) + StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) { inletVelocity_ = getParamFromGroup(this->paramGroup(), "Problem.Velocity"); diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/spatialparams.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/spatialparams.hh index ec1ec8d060..8b7ebce666 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/spatialparams.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/spatialparams.hh @@ -38,17 +38,17 @@ namespace Dumux { * \brief The spatial parameters class for the test problem using the * 1p cc model. */ -template +template class ConservationSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using ThisType = ConservationSpatialParams; - using ParentType = FVSpatialParams; + using ThisType = ConservationSpatialParams; + using ParentType = FVSpatialParams; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using EffectiveLaw = RegularizedVanGenuchten; @@ -58,7 +58,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = Scalar; - ConservationSpatialParams(std::shared_ptr fvGridGeometry) + ConservationSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = getParam("SpatialParams.Permeability"); diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh index f7767a1644..4d6a38cfac 100644 --- a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh +++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh @@ -108,12 +108,12 @@ class RootProblem : public PorousMediumFlowProblem using NeumannFluxes = GetPropType; using SourceValues = GetPropType; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GlobalPosition = typename FVGridGeometry::GlobalCoordinate; + using GridGeometry = GetPropType; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GlobalPosition = typename GridGeometry::GlobalCoordinate; using Element = typename GridView::template Codim<0>::Entity; using SolutionVector = GetPropType; using GridVariables = GetPropType; @@ -137,7 +137,7 @@ public: }; template - RootProblem(std::shared_ptr fvGridGeometry, + RootProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, spatialParams, "Root") diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh index e2994882e9..25c9e5ffdb 100644 --- a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh +++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh @@ -116,11 +116,11 @@ class SoilProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; - using GlobalPosition = typename FVGridGeometry::GlobalCoordinate; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; + using GlobalPosition = typename GridGeometry::GlobalCoordinate; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; using SolutionVector = GetPropType; @@ -147,7 +147,7 @@ public: liquidPhaseIdx = FluidSystem::liquidPhaseIdx }; - SoilProblem(std::shared_ptr fvGridGeometry, + SoilProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Soil") , couplingManager_(couplingManager) diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_root.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_root.hh index 9c871659b6..a1d5226a11 100644 --- a/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_root.hh +++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_root.hh @@ -36,16 +36,16 @@ namespace Dumux { * \ingroup EmbeddedTests * \brief Definition of the spatial parameters for the root xylem flow. */ -template +template class RootSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using ThisType = RootSpatialParams; - using ParentType = FVSpatialParamsOneP; - using Grid = typename FVGridGeometry::Grid; - using GridView = typename FVGridGeometry::GridView; + using ThisType = RootSpatialParams; + using ParentType = FVSpatialParamsOneP; + using Grid = typename GridGeometry::Grid; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using SubControlVolume = typename GridGeometry::SubControlVolume; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; //! Indices to access the parameters in the dgf file @@ -61,7 +61,7 @@ public: // export permeability type using PermeabilityType = Scalar; - RootSpatialParams(std::shared_ptr fvGridGeometry, + RootSpatialParams(std::shared_ptr fvGridGeometry, std::shared_ptr> gridData) : ParentType(fvGridGeometry), gridData_(gridData) { diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_soil.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_soil.hh index 618e3eeca8..4aa4bd2dc0 100644 --- a/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_soil.hh +++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/spatialparams_soil.hh @@ -36,15 +36,15 @@ namespace Dumux { * \ingroup EmbeddedTests * \brief Definition of the spatial parameters for the soil problem. */ -template +template class SoilSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using ThisType = SoilSpatialParams; - using ParentType = FVSpatialParams; - using GridView = typename FVGridGeometry::GridView; + using ThisType = SoilSpatialParams; + using ParentType = FVSpatialParams; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using SubControlVolume = typename GridGeometry::SubControlVolume; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: @@ -55,7 +55,7 @@ public: // export material law params using MaterialLawParams = typename MaterialLaw::Params; - SoilSpatialParams(std::shared_ptr fvGridGeometry) + SoilSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // residual saturations diff --git a/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh index 1fc60bc8bd..e2f54004d1 100644 --- a/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh +++ b/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh @@ -112,18 +112,18 @@ class BloodFlowProblem : public PorousMediumFlowProblem using Indices = typename GetPropType::Indices; using PrimaryVariables = GetPropType; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using GridGeometry = GetPropType; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; using SolutionVector = GetPropType; using GridVariables = GetPropType; using Element = typename GridView::template Codim<0>::Entity; - using GlobalPosition = typename FVGridGeometry::GlobalCoordinate; + using GlobalPosition = typename GridGeometry::GlobalCoordinate; using CouplingManager = GetPropType; public: - BloodFlowProblem(std::shared_ptr fvGridGeometry, + BloodFlowProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Vessel") , couplingManager_(couplingManager) diff --git a/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh index b1a255cfe7..66aac1469b 100644 --- a/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh +++ b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh @@ -116,10 +116,10 @@ class TissueProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; using SolutionVector = GetPropType; @@ -128,12 +128,12 @@ class TissueProblem : public PorousMediumFlowProblem using PointSource = GetPropType; using Indices = typename GetPropType::Indices; using Element = typename GridView::template Codim<0>::Entity; - using GlobalPosition = typename FVGridGeometry::GlobalCoordinate; + using GlobalPosition = typename GridGeometry::GlobalCoordinate; using CouplingManager = GetPropType; public: - TissueProblem(std::shared_ptr fvGridGeometry, + TissueProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Tissue") , couplingManager_(couplingManager) diff --git a/test/multidomain/embedded/1d3d/1p_1p/spatialparams_bloodflow.hh b/test/multidomain/embedded/1d3d/1p_1p/spatialparams_bloodflow.hh index 4d8f63293c..84c6f2f0e9 100644 --- a/test/multidomain/embedded/1d3d/1p_1p/spatialparams_bloodflow.hh +++ b/test/multidomain/embedded/1d3d/1p_1p/spatialparams_bloodflow.hh @@ -33,19 +33,19 @@ namespace Dumux { * \ingroup EmbeddedTests * \brief Definition of the spatial parameters for the blood flow problem. */ -template +template class BloodFlowSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using ThisType = BloodFlowSpatialParams; - using ParentType = FVSpatialParamsOneP; - using GlobalPosition = typename FVGridGeometry::GlobalCoordinate; + using ThisType = BloodFlowSpatialParams; + using ParentType = FVSpatialParamsOneP; + using GlobalPosition = typename GridGeometry::GlobalCoordinate; public: // export permeability type using PermeabilityType = Scalar; - BloodFlowSpatialParams(std::shared_ptr fvGridGeometry) + BloodFlowSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { radius_ = getParam("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 82874171dd..7e84bfea3b 100644 --- a/test/multidomain/embedded/1d3d/1p_1p/spatialparams_tissue.hh +++ b/test/multidomain/embedded/1d3d/1p_1p/spatialparams_tissue.hh @@ -33,20 +33,20 @@ namespace Dumux { * \ingroup EmbeddedTests * \brief Definition of the spatial parameters for the tissue problem. */ -template +template class TissueSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using ThisType = TissueSpatialParams; - using ParentType = FVSpatialParamsOneP; - using GridView = typename FVGridGeometry::GridView; + using ThisType = TissueSpatialParams; + using ParentType = FVSpatialParamsOneP; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using SubControlVolume = typename GridGeometry::SubControlVolume; public: // export permeability type using PermeabilityType = Scalar; - TissueSpatialParams(std::shared_ptr fvGridGeometry) + TissueSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = getParam("SpatialParams.PermeabilityTissue"); diff --git a/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh index 0a22eb6a15..bd7b9bde94 100644 --- a/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh +++ b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh @@ -108,12 +108,12 @@ class RootProblem : public PorousMediumFlowProblem using PrimaryVariables = GetPropType; using NeumannFluxes = GetPropType; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GlobalPosition = typename FVGridGeometry::GlobalCoordinate; + using GridGeometry = GetPropType; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GlobalPosition = typename GridGeometry::GlobalCoordinate; using SolutionVector = GetPropType; using GridVariables = GetPropType; using Element = typename GridView::template Codim<0>::Entity; @@ -122,7 +122,7 @@ class RootProblem : public PorousMediumFlowProblem public: template - RootProblem(std::shared_ptr fvGridGeometry, + RootProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, spatialParams, "Root") diff --git a/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh index 883f51a8bb..1e0bc11dcf 100644 --- a/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh +++ b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh @@ -97,11 +97,11 @@ class SoilProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; - using FVGridGeometry = GetPropType; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GlobalPosition = typename FVGridGeometry::GlobalCoordinate; + using GridGeometry = GetPropType; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GlobalPosition = typename GridGeometry::GlobalCoordinate; using Element = typename GridView::template Codim<0>::Entity; using PrimaryVariables = GetPropType; using SolutionVector = GetPropType; @@ -112,7 +112,7 @@ class SoilProblem : public PorousMediumFlowProblem using CouplingManager = GetPropType; public: - SoilProblem(std::shared_ptr fvGridGeometry, + SoilProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) : ParentType(fvGridGeometry, "Soil") , couplingManager_(couplingManager) diff --git a/test/multidomain/embedded/1d3d/1p_richards/spatialparams_root.hh b/test/multidomain/embedded/1d3d/1p_richards/spatialparams_root.hh index 42a3b62a17..f7d0d2de7a 100644 --- a/test/multidomain/embedded/1d3d/1p_richards/spatialparams_root.hh +++ b/test/multidomain/embedded/1d3d/1p_richards/spatialparams_root.hh @@ -36,16 +36,16 @@ namespace Dumux { * \ingroup EmbeddedTests * \brief Definition of the spatial parameters for the blood flow problem. */ -template +template class RootSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using ThisType = RootSpatialParams; - using ParentType = FVSpatialParamsOneP; - using Grid = typename FVGridGeometry::Grid; - using GridView = typename FVGridGeometry::GridView; + using ThisType = RootSpatialParams; + using ParentType = FVSpatialParamsOneP; + using Grid = typename GridGeometry::Grid; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using SubControlVolume = typename GridGeometry::SubControlVolume; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; //! Indices to access the parameters in the dgf file @@ -61,7 +61,7 @@ public: // export permeability type using PermeabilityType = Scalar; - RootSpatialParams(std::shared_ptr fvGridGeometry, + RootSpatialParams(std::shared_ptr fvGridGeometry, std::shared_ptr> gridData) : ParentType(fvGridGeometry), gridData_(gridData) { diff --git a/test/multidomain/embedded/1d3d/1p_richards/spatialparams_soil.hh b/test/multidomain/embedded/1d3d/1p_richards/spatialparams_soil.hh index e4a5504b19..a1b68cea6b 100644 --- a/test/multidomain/embedded/1d3d/1p_richards/spatialparams_soil.hh +++ b/test/multidomain/embedded/1d3d/1p_richards/spatialparams_soil.hh @@ -36,15 +36,15 @@ namespace Dumux { * \ingroup EmbeddedTests * \brief Definition of the spatial parameters for the tissue problem. */ -template +template class SoilSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using ThisType = SoilSpatialParams; - using ParentType = FVSpatialParams; - using GridView = typename FVGridGeometry::GridView; + using ThisType = SoilSpatialParams; + using ParentType = FVSpatialParams; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using SubControlVolume = typename GridGeometry::SubControlVolume; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: @@ -55,7 +55,7 @@ public: // export material law params using MaterialLawParams = typename MaterialLaw::Params; - SoilSpatialParams(std::shared_ptr fvGridGeometry) + SoilSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // residual saturations diff --git a/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh b/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh index 17fff01a7a..086ec2e66b 100644 --- a/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh +++ b/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh @@ -107,10 +107,10 @@ class FractureProblem : public PorousMediumFlowProblem using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using GridGeometry = GetPropType; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; using SolutionVector = GetPropType; using GridVariables = GetPropType; using Element = typename GridView::template Codim<0>::Entity; @@ -119,7 +119,7 @@ class FractureProblem : public PorousMediumFlowProblem using CouplingManager = GetPropType; public: - FractureProblem(std::shared_ptr fvGridGeometry, + FractureProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManager, const std::string& paramGroup = "Fracture") diff --git a/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh b/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh index e775429903..b3f589de85 100644 --- a/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh +++ b/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh @@ -108,10 +108,10 @@ class MatrixProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; using Scalar = GetPropType; - using FVGridGeometry = GetPropType; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using GridGeometry = GetPropType; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; using SolutionVector = GetPropType; @@ -132,7 +132,7 @@ class MatrixProblem : public PorousMediumFlowProblem using CouplingManager = GetPropType; public: - MatrixProblem(std::shared_ptr fvGridGeometry, + MatrixProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManager, const std::string& paramGroup = "Matrix") diff --git a/test/multidomain/embedded/2d3d/1p_1p/spatialparams.hh b/test/multidomain/embedded/2d3d/1p_1p/spatialparams.hh index 602b775ade..e9143bde73 100644 --- a/test/multidomain/embedded/2d3d/1p_1p/spatialparams.hh +++ b/test/multidomain/embedded/2d3d/1p_1p/spatialparams.hh @@ -33,21 +33,21 @@ namespace Dumux { * \ingroup EmbeddedTests * \brief Definition of the spatial parameters for the matrix and fracture problem. */ -template +template class MatrixFractureSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using ThisType = MatrixFractureSpatialParams; - using ParentType = FVSpatialParamsOneP; - using GridView = typename FVGridGeometry::GridView; + using ThisType = MatrixFractureSpatialParams; + using ParentType = FVSpatialParamsOneP; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using SubControlVolume = typename GridGeometry::SubControlVolume; public: // export permeability type using PermeabilityType = Scalar; - MatrixFractureSpatialParams(std::shared_ptr fvGridGeometry, + MatrixFractureSpatialParams(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry) { diff --git a/test/multidomain/facet/1p_1p/analytical/main.cc b/test/multidomain/facet/1p_1p/analytical/main.cc index f148770eb4..709fdebb57 100644 --- a/test/multidomain/facet/1p_1p/analytical/main.cc +++ b/test/multidomain/facet/1p_1p/analytical/main.cc @@ -160,11 +160,11 @@ computeL2Norm(const GridView& gridView, * we have to create additional faces on interior boundaries, which wouldn't be * created in the standard scheme. */ -template< class FVGridGeometry, +template< class GridGeometry, class GridManager, class LowDimGridView, - std::enable_if_t = 0 > -void updateBulkFVGridGeometry(FVGridGeometry& fvGridGeometry, + std::enable_if_t = 0 > +void updateBulkFVGridGeometry(GridGeometry& fvGridGeometry, const GridManager& gridManager, const LowDimGridView& lowDimGridView) { @@ -176,11 +176,11 @@ void updateBulkFVGridGeometry(FVGridGeometry& fvGridGeometry, /*! * \brief Updates the finite volume grid geometry for the cell-centered schemes. */ -template< class FVGridGeometry, +template< class GridGeometry, class GridManager, class LowDimGridView, - std::enable_if_t = 0 > -void updateBulkFVGridGeometry(FVGridGeometry& fvGridGeometry, + std::enable_if_t = 0 > +void updateBulkFVGridGeometry(GridGeometry& fvGridGeometry, const GridManager& gridManager, const LowDimGridView& lowDimGridView) { diff --git a/test/multidomain/facet/1p_1p/analytical/problem_bulk.hh b/test/multidomain/facet/1p_1p/analytical/problem_bulk.hh index ffde496f2c..6daa335fe4 100644 --- a/test/multidomain/facet/1p_1p/analytical/problem_bulk.hh +++ b/test/multidomain/facet/1p_1p/analytical/problem_bulk.hh @@ -91,11 +91,11 @@ class OnePBulkProblem : public PorousMediumFlowProblem using PrimaryVariables = typename GridVariables::PrimaryVariables; using Scalar = typename GridVariables::Scalar; - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -104,7 +104,7 @@ class OnePBulkProblem : public PorousMediumFlowProblem using NumEqVector = GetPropType; public: - OnePBulkProblem(std::shared_ptr fvGridGeometry, + OnePBulkProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManagerPtr, const std::string& paramGroup = "Bulk") diff --git a/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh b/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh index 76b5d56108..68929f7177 100644 --- a/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh +++ b/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh @@ -91,10 +91,10 @@ class OnePLowDimProblem : public PorousMediumFlowProblem using PrimaryVariables = typename GridVariables::PrimaryVariables; using Scalar = typename GridVariables::Scalar; - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -103,7 +103,7 @@ class OnePLowDimProblem : public PorousMediumFlowProblem using NumEqVector = GetPropType; public: - OnePLowDimProblem(std::shared_ptr fvGridGeometry, + OnePLowDimProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManagerPtr, const std::string& paramGroup = "LowDim") diff --git a/test/multidomain/facet/1p_1p/analytical/spatialparams.hh b/test/multidomain/facet/1p_1p/analytical/spatialparams.hh index 139b3ab9df..36db5e96f3 100644 --- a/test/multidomain/facet/1p_1p/analytical/spatialparams.hh +++ b/test/multidomain/facet/1p_1p/analytical/spatialparams.hh @@ -33,14 +33,14 @@ namespace Dumux { * \ingroup FacetTests * \brief The spatial parameters for the single-phase facet coupling test. */ -template< class FVGridGeometry, class Scalar > +template< class GridGeometry, class Scalar > class OnePSpatialParams -: public FVSpatialParamsOneP< FVGridGeometry, Scalar, OnePSpatialParams > +: public FVSpatialParamsOneP< GridGeometry, Scalar, OnePSpatialParams > { - using ThisType = OnePSpatialParams< FVGridGeometry, Scalar >; - using ParentType = FVSpatialParamsOneP< FVGridGeometry, Scalar, ThisType >; + using ThisType = OnePSpatialParams< GridGeometry, Scalar >; + using ParentType = FVSpatialParamsOneP< GridGeometry, Scalar, ThisType >; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -48,7 +48,7 @@ public: //! Export the type used for permeabilities using PermeabilityType = Scalar; - OnePSpatialParams(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + OnePSpatialParams(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry) { permeability_ = getParamFromGroup(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 25d145cd07..59c8ed7175 100644 --- a/test/multidomain/facet/1p_1p/gravity/problem_bulk.hh +++ b/test/multidomain/facet/1p_1p/gravity/problem_bulk.hh @@ -95,11 +95,11 @@ class OnePBulkProblem : public PorousMediumFlowProblem using PrimaryVariables = typename GridVariables::PrimaryVariables; using Scalar = typename GridVariables::Scalar; - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -110,7 +110,7 @@ class OnePBulkProblem : public PorousMediumFlowProblem static constexpr int dimWorld = GridView::dimensionworld; public: - OnePBulkProblem(std::shared_ptr fvGridGeometry, + OnePBulkProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManager, const std::string& paramGroup = "") diff --git a/test/multidomain/facet/1p_1p/gravity/problem_lowdim.hh b/test/multidomain/facet/1p_1p/gravity/problem_lowdim.hh index cab046aefb..c98e422ae4 100644 --- a/test/multidomain/facet/1p_1p/gravity/problem_lowdim.hh +++ b/test/multidomain/facet/1p_1p/gravity/problem_lowdim.hh @@ -97,10 +97,10 @@ class OnePLowDimProblem : public PorousMediumFlowProblem using PrimaryVariables = typename GridVariables::PrimaryVariables; using Scalar = typename GridVariables::Scalar; - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -111,7 +111,7 @@ class OnePLowDimProblem : public PorousMediumFlowProblem static constexpr int dimWorld = GridView::dimensionworld; public: - OnePLowDimProblem(std::shared_ptr fvGridGeometry, + OnePLowDimProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManager, const std::string& paramGroup = "") diff --git a/test/multidomain/facet/1p_1p/gravity/spatialparams.hh b/test/multidomain/facet/1p_1p/gravity/spatialparams.hh index e04fd0aae9..28e730e6fd 100644 --- a/test/multidomain/facet/1p_1p/gravity/spatialparams.hh +++ b/test/multidomain/facet/1p_1p/gravity/spatialparams.hh @@ -32,14 +32,14 @@ namespace Dumux { * \ingroup FacetTests * \brief The spatial parameters for the single-phase facet coupling test. */ -template< class FVGridGeometry, class Scalar > +template< class GridGeometry, class Scalar > class OnePSpatialParams -: public FVSpatialParamsOneP< FVGridGeometry, Scalar, OnePSpatialParams > +: public FVSpatialParamsOneP< GridGeometry, Scalar, OnePSpatialParams > { - using ThisType = OnePSpatialParams< FVGridGeometry, Scalar >; - using ParentType = FVSpatialParamsOneP< FVGridGeometry, Scalar, ThisType >; + using ThisType = OnePSpatialParams< GridGeometry, Scalar >; + using ParentType = FVSpatialParamsOneP< GridGeometry, Scalar, ThisType >; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -47,7 +47,7 @@ public: //! Export the type used for permeabilities using PermeabilityType = Scalar; - OnePSpatialParams(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + OnePSpatialParams(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry) { permeability_ = getParamFromGroup(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 dfd2fadc4c..d279fa15fe 100644 --- a/test/multidomain/facet/1p_1p/linearprofile/problem_bulk.hh +++ b/test/multidomain/facet/1p_1p/linearprofile/problem_bulk.hh @@ -96,11 +96,11 @@ class OnePBulkProblem : public PorousMediumFlowProblem using PrimaryVariables = typename GridVariables::PrimaryVariables; using Scalar = typename GridVariables::Scalar; - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -109,7 +109,7 @@ class OnePBulkProblem : public PorousMediumFlowProblem using NumEqVector = GetPropType; public: - OnePBulkProblem(std::shared_ptr fvGridGeometry, + OnePBulkProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManager, const std::string& paramGroup = "") diff --git a/test/multidomain/facet/1p_1p/linearprofile/problem_lowdim.hh b/test/multidomain/facet/1p_1p/linearprofile/problem_lowdim.hh index 793178315d..2babdd1543 100644 --- a/test/multidomain/facet/1p_1p/linearprofile/problem_lowdim.hh +++ b/test/multidomain/facet/1p_1p/linearprofile/problem_lowdim.hh @@ -97,10 +97,10 @@ class OnePLowDimProblem : public PorousMediumFlowProblem using PrimaryVariables = typename GridVariables::PrimaryVariables; using Scalar = typename GridVariables::Scalar; - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -109,7 +109,7 @@ class OnePLowDimProblem : public PorousMediumFlowProblem using NumEqVector = GetPropType; public: - OnePLowDimProblem(std::shared_ptr fvGridGeometry, + OnePLowDimProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManager, const std::string& paramGroup = "") diff --git a/test/multidomain/facet/1p_1p/linearprofile/spatialparams.hh b/test/multidomain/facet/1p_1p/linearprofile/spatialparams.hh index 139b3ab9df..36db5e96f3 100644 --- a/test/multidomain/facet/1p_1p/linearprofile/spatialparams.hh +++ b/test/multidomain/facet/1p_1p/linearprofile/spatialparams.hh @@ -33,14 +33,14 @@ namespace Dumux { * \ingroup FacetTests * \brief The spatial parameters for the single-phase facet coupling test. */ -template< class FVGridGeometry, class Scalar > +template< class GridGeometry, class Scalar > class OnePSpatialParams -: public FVSpatialParamsOneP< FVGridGeometry, Scalar, OnePSpatialParams > +: public FVSpatialParamsOneP< GridGeometry, Scalar, OnePSpatialParams > { - using ThisType = OnePSpatialParams< FVGridGeometry, Scalar >; - using ParentType = FVSpatialParamsOneP< FVGridGeometry, Scalar, ThisType >; + using ThisType = OnePSpatialParams< GridGeometry, Scalar >; + using ParentType = FVSpatialParamsOneP< GridGeometry, Scalar, ThisType >; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -48,7 +48,7 @@ public: //! Export the type used for permeabilities using PermeabilityType = Scalar; - OnePSpatialParams(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + OnePSpatialParams(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry) { permeability_ = getParamFromGroup(paramGroup, "SpatialParams.Permeability"); diff --git a/test/multidomain/facet/1p_1p/threedomain/main.cc b/test/multidomain/facet/1p_1p/threedomain/main.cc index a0de169837..3a9cb39c6a 100644 --- a/test/multidomain/facet/1p_1p/threedomain/main.cc +++ b/test/multidomain/facet/1p_1p/threedomain/main.cc @@ -105,15 +105,15 @@ struct CouplingManager { using type = typename BoxTr * we have to create additional faces on interior boundaries, which wouldn't be * created in the standard scheme. */ -template< class FVGridGeometry, +template< class GridGeometry, class GridManager, class LowDimGridView, - std::enable_if_t = 0 > -void updateFVGridGeometry(FVGridGeometry& fvGridGeometry, + std::enable_if_t = 0 > +void updateFVGridGeometry(GridGeometry& fvGridGeometry, const GridManager& gridManager, const LowDimGridView& lowDimGridView) { - static constexpr int higherGridId = int(FVGridGeometry::GridView::dimension) == 3 ? 0 : 1; + static constexpr int higherGridId = int(GridGeometry::GridView::dimension) == 3 ? 0 : 1; using BulkFacetGridAdapter = Dumux::CodimOneGridAdapter; BulkFacetGridAdapter facetGridAdapter(gridManager.getEmbeddings()); fvGridGeometry.update(lowDimGridView, facetGridAdapter); @@ -122,11 +122,11 @@ void updateFVGridGeometry(FVGridGeometry& fvGridGeometry, /*! * \brief Updates the finite volume grid geometry for the cell-centered schemes. */ -template< class FVGridGeometry, +template< class GridGeometry, class GridManager, class LowDimGridView, - std::enable_if_t = 0 > -void updateFVGridGeometry(FVGridGeometry& fvGridGeometry, + std::enable_if_t = 0 > +void updateFVGridGeometry(GridGeometry& fvGridGeometry, const GridManager& gridManager, const LowDimGridView& lowDimGridView) { diff --git a/test/multidomain/facet/1p_1p/threedomain/problem_bulk.hh b/test/multidomain/facet/1p_1p/threedomain/problem_bulk.hh index f37b45af45..bb82fae592 100644 --- a/test/multidomain/facet/1p_1p/threedomain/problem_bulk.hh +++ b/test/multidomain/facet/1p_1p/threedomain/problem_bulk.hh @@ -62,9 +62,9 @@ struct Problem { using type = OnePBulkProblem; template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePSpatialParams; + using type = OnePSpatialParams; }; // the fluid system @@ -94,9 +94,9 @@ class OnePBulkProblem : public PorousMediumFlowProblem using PrimaryVariables = typename GridVariables::PrimaryVariables; using Scalar = typename GridVariables::Scalar; - using FVGridGeometry = typename GridVariables::GridGeometry; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -105,7 +105,7 @@ class OnePBulkProblem : public PorousMediumFlowProblem public: //! The constructor - OnePBulkProblem(std::shared_ptr fvGridGeometry, + OnePBulkProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManagerPtr, const std::string& paramGroup = "Bulk") diff --git a/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh b/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh index c8423409df..7f64f99888 100644 --- a/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh +++ b/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh @@ -64,9 +64,9 @@ struct Problem { using type = OnePEdgeProblem; template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePSpatialParams; + using type = OnePSpatialParams; }; // the fluid system @@ -97,11 +97,11 @@ class OnePEdgeProblem : public PorousMediumFlowProblem using PrimaryVariables = typename GridVariables::PrimaryVariables; using Scalar = typename GridVariables::Scalar; - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -109,7 +109,7 @@ class OnePEdgeProblem : public PorousMediumFlowProblem using CouplingManager = GetPropType; public: - OnePEdgeProblem(std::shared_ptr fvGridGeometry, + OnePEdgeProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManagerPtr, const std::string& paramGroup = "Edge") diff --git a/test/multidomain/facet/1p_1p/threedomain/problem_facet.hh b/test/multidomain/facet/1p_1p/threedomain/problem_facet.hh index c52cc5ba26..7dc5355856 100644 --- a/test/multidomain/facet/1p_1p/threedomain/problem_facet.hh +++ b/test/multidomain/facet/1p_1p/threedomain/problem_facet.hh @@ -63,9 +63,9 @@ struct Problem { using type = OnePFacetProblem struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePSpatialParams; + using type = OnePSpatialParams; }; // the fluid system @@ -96,11 +96,11 @@ class OnePFacetProblem : public PorousMediumFlowProblem using PrimaryVariables = typename GridVariables::PrimaryVariables; using Scalar = typename GridVariables::Scalar; - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -108,7 +108,7 @@ class OnePFacetProblem : public PorousMediumFlowProblem using CouplingManager = GetPropType; public: - OnePFacetProblem(std::shared_ptr fvGridGeometry, + OnePFacetProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManagerPtr, const std::string& paramGroup = "Facet") diff --git a/test/multidomain/facet/1p_1p/threedomain/spatialparams.hh b/test/multidomain/facet/1p_1p/threedomain/spatialparams.hh index 47fe1a3954..87f0c010c3 100644 --- a/test/multidomain/facet/1p_1p/threedomain/spatialparams.hh +++ b/test/multidomain/facet/1p_1p/threedomain/spatialparams.hh @@ -33,22 +33,22 @@ namespace Dumux { * \ingroup FacetTests * \brief The spatial parameters for the single-phase facet coupling test. */ -template -class OnePSpatialParams : public FVSpatialParamsOneP> +template +class OnePSpatialParams : public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using ThisType = OnePSpatialParams; - using ParentType = FVSpatialParamsOneP; + using ThisType = OnePSpatialParams; + using ParentType = FVSpatialParamsOneP; public: //! Export the type used for permeability using PermeabilityType = Scalar; - OnePSpatialParams(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + OnePSpatialParams(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry) { permeability_ = getParamFromGroup(paramGroup, "SpatialParams.Permeability"); diff --git a/test/multidomain/facet/tracer_tracer/main.cc b/test/multidomain/facet/tracer_tracer/main.cc index 00b9b4a8ed..7e72b989bf 100644 --- a/test/multidomain/facet/tracer_tracer/main.cc +++ b/test/multidomain/facet/tracer_tracer/main.cc @@ -119,11 +119,11 @@ struct CouplingManager { using type = typename * have to create additional faces on interior boundaries, which wouldn't be * created in the standard scheme. */ -template< class FVGridGeometry, +template< class GridGeometry, class GridManager, class LowDimGridView, - std::enable_if_t = 0 > -void updateBulkFVGridGeometry(FVGridGeometry& fvGridGeometry, + std::enable_if_t = 0 > +void updateBulkFVGridGeometry(GridGeometry& fvGridGeometry, const GridManager& gridManager, const LowDimGridView& lowDimGridView) { @@ -135,11 +135,11 @@ void updateBulkFVGridGeometry(FVGridGeometry& fvGridGeometry, /*! * \brief Updates the finite volume grid geometry for the cell centered schemes. */ - template< class FVGridGeometry, + template< class GridGeometry, class GridManager, class LowDimGridView, - std::enable_if_t = 0 > -void updateBulkFVGridGeometry(FVGridGeometry& fvGridGeometry, + std::enable_if_t = 0 > +void updateBulkFVGridGeometry(GridGeometry& fvGridGeometry, const GridManager& gridManager, const LowDimGridView& lowDimGridView) { diff --git a/test/multidomain/facet/tracer_tracer/problem_1p_bulk.hh b/test/multidomain/facet/tracer_tracer/problem_1p_bulk.hh index 92a4b7269e..60869ee180 100644 --- a/test/multidomain/facet/tracer_tracer/problem_1p_bulk.hh +++ b/test/multidomain/facet/tracer_tracer/problem_1p_bulk.hh @@ -94,11 +94,11 @@ class OnePBulkProblem : public PorousMediumFlowProblem using PrimaryVariables = typename GridVariables::PrimaryVariables; using Scalar = typename GridVariables::Scalar; - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -108,7 +108,7 @@ class OnePBulkProblem : public PorousMediumFlowProblem using Indices = typename GetPropType::Indices; public: - OnePBulkProblem(std::shared_ptr fvGridGeometry, + OnePBulkProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManager, const std::string& paramGroup = "") diff --git a/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh b/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh index cd333643b9..4b45702eb1 100644 --- a/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh +++ b/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh @@ -93,10 +93,10 @@ class OnePLowDimProblem : public PorousMediumFlowProblem using PrimaryVariables = typename GridVariables::PrimaryVariables; using Scalar = typename GridVariables::Scalar; - using FVGridGeometry = typename GridVariables::GridGeometry; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = typename GridVariables::GridGeometry; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -106,7 +106,7 @@ class OnePLowDimProblem : public PorousMediumFlowProblem using Indices = typename GetPropType::Indices; public: - OnePLowDimProblem(std::shared_ptr fvGridGeometry, + OnePLowDimProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams, std::shared_ptr couplingManager, const std::string& paramGroup = "") diff --git a/test/multidomain/facet/tracer_tracer/problem_tracer_bulk.hh b/test/multidomain/facet/tracer_tracer/problem_tracer_bulk.hh index 04ddab7dce..ec7523847f 100644 --- a/test/multidomain/facet/tracer_tracer/problem_tracer_bulk.hh +++ b/test/multidomain/facet/tracer_tracer/problem_tracer_bulk.hh @@ -74,9 +74,9 @@ struct Problem { using type = TracerBulkProblem struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = TracerSpatialParams; + using type = TracerSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -111,9 +111,9 @@ class TracerBulkProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; using GridView = GetPropType; - using FVGridGeometry = GetPropType; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; + using FVElementGeometry = typename GridGeometry::LocalView; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; @@ -123,13 +123,13 @@ class TracerBulkProblem : public PorousMediumFlowProblem //! property that defines whether mole or mass fractions are used static constexpr bool useMoles = getPropValue(); - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: using typename ParentType::SpatialParams; - TracerBulkProblem(std::shared_ptr fvGridGeom, + TracerBulkProblem(std::shared_ptr fvGridGeom, std::shared_ptr spatialParams, std::shared_ptr couplingManager, const std::string& paramGroup = "") diff --git a/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh b/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh index 19e2db2beb..b00c784893 100644 --- a/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh +++ b/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh @@ -67,9 +67,9 @@ struct Problem { using type = TracerLowDimProbl template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = TracerSpatialParams; + using type = TracerSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -104,8 +104,8 @@ class TracerLowDimProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; using GridView = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; @@ -116,13 +116,13 @@ class TracerLowDimProblem : public PorousMediumFlowProblem //! property that defines whether mole or mass fractions are used static constexpr bool useMoles = getPropValue(); - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: using typename ParentType::SpatialParams; - TracerLowDimProblem(std::shared_ptr fvGridGeom, + TracerLowDimProblem(std::shared_ptr fvGridGeom, std::shared_ptr spatialParams, std::shared_ptr couplingManager, const std::string& paramGroup = "") diff --git a/test/multidomain/facet/tracer_tracer/spatialparams_1p.hh b/test/multidomain/facet/tracer_tracer/spatialparams_1p.hh index f5c564ebb5..caee636d19 100644 --- a/test/multidomain/facet/tracer_tracer/spatialparams_1p.hh +++ b/test/multidomain/facet/tracer_tracer/spatialparams_1p.hh @@ -36,14 +36,14 @@ namespace Dumux * \brief The spatial parameters of the single-phase problem * within the tracer facet coupling test. */ -template< class FVGridGeometry, class Scalar > +template< class GridGeometry, class Scalar > class OnePSpatialParams -: public FVSpatialParamsOneP< FVGridGeometry, Scalar, OnePSpatialParams > +: public FVSpatialParamsOneP< GridGeometry, Scalar, OnePSpatialParams > { - using ThisType = OnePSpatialParams< FVGridGeometry, Scalar >; - using ParentType = FVSpatialParamsOneP< FVGridGeometry, Scalar, ThisType >; + using ThisType = OnePSpatialParams< GridGeometry, Scalar >; + using ParentType = FVSpatialParamsOneP< GridGeometry, Scalar, ThisType >; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -51,7 +51,7 @@ public: //! Export the type used for permeabilities using PermeabilityType = Scalar; - OnePSpatialParams(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + OnePSpatialParams(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry) , permeability_(getParamFromGroup(paramGroup, "SpatialParams.Permeability")) , porosity_(getParamFromGroup(paramGroup, "SpatialParams.Porosity")) diff --git a/test/multidomain/facet/tracer_tracer/spatialparams_tracer.hh b/test/multidomain/facet/tracer_tracer/spatialparams_tracer.hh index 0b787d974d..a8202283b0 100644 --- a/test/multidomain/facet/tracer_tracer/spatialparams_tracer.hh +++ b/test/multidomain/facet/tracer_tracer/spatialparams_tracer.hh @@ -34,26 +34,26 @@ namespace Dumux { * \ingroup FacetTests * \brief Definition of the spatial parameters for the tracer problem. */ -template +template class TracerSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; - static constexpr bool isBox = FVGridGeometry::discMethod == DiscretizationMethod::box; + static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Dune::FieldVector; public: - TracerSpatialParams(std::shared_ptr fvGridGeometry, + TracerSpatialParams(std::shared_ptr fvGridGeometry, const std::vector< std::vector >& volumeFluxes, const std::string& paramGroup = "") : ParentType(fvGridGeometry) diff --git a/test/multidomain/poromechanics/el1p/problem_1p.hh b/test/multidomain/poromechanics/el1p/problem_1p.hh index 25516dac45..9a771594a4 100644 --- a/test/multidomain/poromechanics/el1p/problem_1p.hh +++ b/test/multidomain/poromechanics/el1p/problem_1p.hh @@ -67,10 +67,10 @@ struct Problem { using type = OnePSubProblem ; template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; using CouplingManager = GetPropType; - using type = OnePSpatialParams; + using type = OnePSpatialParams; }; } // end namespace Properties @@ -94,10 +94,10 @@ class OnePSubProblem : public PorousMediumFlowProblem using NumEqVector = GetPropType; using PrimaryVariables = GetPropType; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; public: - OnePSubProblem(std::shared_ptr fvGridGeometry, + OnePSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr> spatialParams, const std::string& paramGroup = "OneP") : ParentType(fvGridGeometry, spatialParams, paramGroup) diff --git a/test/multidomain/poromechanics/el1p/problem_poroelastic.hh b/test/multidomain/poromechanics/el1p/problem_poroelastic.hh index def8e598b5..99e4623bf2 100644 --- a/test/multidomain/poromechanics/el1p/problem_poroelastic.hh +++ b/test/multidomain/poromechanics/el1p/problem_poroelastic.hh @@ -87,9 +87,9 @@ class PoroElasticSubProblem : public GeomechanicsFVProblem using PrimaryVariables = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; using GridView = GetPropType; using Element = typename GridView::template Codim<0>::Entity; @@ -100,7 +100,7 @@ class PoroElasticSubProblem : public GeomechanicsFVProblem using GradU = Dune::FieldMatrix; public: - PoroElasticSubProblem(std::shared_ptr fvGridGeometry, + PoroElasticSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManagerPtr, const std::string& paramGroup = "PoroElastic") : ParentType(fvGridGeometry, paramGroup) diff --git a/test/multidomain/poromechanics/el1p/spatialparams_1p.hh b/test/multidomain/poromechanics/el1p/spatialparams_1p.hh index e5331893b2..72a8cf6b9f 100644 --- a/test/multidomain/poromechanics/el1p/spatialparams_1p.hh +++ b/test/multidomain/poromechanics/el1p/spatialparams_1p.hh @@ -39,23 +39,23 @@ namespace Dumux { * \brief The spatial parameters class for the test problem using the * 1p box model. */ -template -class OnePSpatialParams : public FVSpatialParamsOneP> +template +class OnePSpatialParams : public FVSpatialParamsOneP> { - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using ThisType = OnePSpatialParams; - using ParentType = FVSpatialParamsOneP; + using ThisType = OnePSpatialParams; + using ParentType = FVSpatialParamsOneP; public: // export permeability type using PermeabilityType = Scalar; - OnePSpatialParams(std::shared_ptr fvGridGeometry, + OnePSpatialParams(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManagerPtr) : ParentType(fvGridGeometry) , couplingManagerPtr_(couplingManagerPtr) diff --git a/test/multidomain/poromechanics/el1p/spatialparams_poroelastic.hh b/test/multidomain/poromechanics/el1p/spatialparams_poroelastic.hh index 4416db2d9e..dc4aa2b84d 100644 --- a/test/multidomain/poromechanics/el1p/spatialparams_poroelastic.hh +++ b/test/multidomain/poromechanics/el1p/spatialparams_poroelastic.hh @@ -35,16 +35,16 @@ namespace Dumux { * \brief Definition of the spatial parameters for the poro-elastic * sub-problem in the coupled poro-mechanical el1p problem. */ -template +template class PoroElasticSpatialParams : public FVSpatialParamsPoroElastic< Scalar, - FVGridGeometry, - PoroElasticSpatialParams > + GridGeometry, + PoroElasticSpatialParams > { - using ThisType = PoroElasticSpatialParams; - using ParentType = FVSpatialParamsPoroElastic; + using ThisType = PoroElasticSpatialParams; + using ParentType = FVSpatialParamsPoroElastic; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -52,7 +52,7 @@ public: //! Export the type of the lame parameters using LameParams = Dumux::LameParams; - PoroElasticSpatialParams(std::shared_ptr fvGridGeometry) + PoroElasticSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) , initPorosity_(getParam("SpatialParams.InitialPorosity")) { diff --git a/test/multidomain/poromechanics/el2p/problem_2p.hh b/test/multidomain/poromechanics/el2p/problem_2p.hh index 8db13e8e4b..20463475e1 100644 --- a/test/multidomain/poromechanics/el2p/problem_2p.hh +++ b/test/multidomain/poromechanics/el2p/problem_2p.hh @@ -68,10 +68,10 @@ struct Problem { using type = TwoPSubProblem ; template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; using CouplingManager = GetPropType; - using type = TwoPSpatialParams; + using type = TwoPSpatialParams; }; } // end namespace Properties @@ -102,10 +102,10 @@ class TwoPSubProblem : public PorousMediumFlowProblem using NumEqVector = GetPropType; using PrimaryVariables = GetPropType; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; public: - TwoPSubProblem(std::shared_ptr fvGridGeometry, + TwoPSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr> spatialParams, const std::string& paramGroup = "TwoP") : ParentType(fvGridGeometry, spatialParams, paramGroup) diff --git a/test/multidomain/poromechanics/el2p/problem_poroelastic.hh b/test/multidomain/poromechanics/el2p/problem_poroelastic.hh index 602b27628f..73ebfbef40 100644 --- a/test/multidomain/poromechanics/el2p/problem_poroelastic.hh +++ b/test/multidomain/poromechanics/el2p/problem_poroelastic.hh @@ -89,9 +89,9 @@ class PoroElasticSubProblem : public GeomechanicsFVProblem using PrimaryVariables = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; using GridView = GetPropType; using Element = typename GridView::template Codim<0>::Entity; @@ -102,7 +102,7 @@ class PoroElasticSubProblem : public GeomechanicsFVProblem using GradU = Dune::FieldMatrix; public: - PoroElasticSubProblem(std::shared_ptr fvGridGeometry, + PoroElasticSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManagerPtr, const std::string& paramGroup = "PoroElastic") : ParentType(fvGridGeometry, paramGroup) diff --git a/test/multidomain/poromechanics/el2p/spatialparams_2p.hh b/test/multidomain/poromechanics/el2p/spatialparams_2p.hh index e33c97f622..ef3c14d3eb 100644 --- a/test/multidomain/poromechanics/el2p/spatialparams_2p.hh +++ b/test/multidomain/poromechanics/el2p/spatialparams_2p.hh @@ -40,17 +40,17 @@ namespace Dumux { * \ingroup PoromechanicsTests * \brief The spatial parameters class for the two-phase sub problem in the el2p test problem. */ -template -class TwoPSpatialParams : public FVSpatialParams> +template +class TwoPSpatialParams : public FVSpatialParams> { - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using ThisType = TwoPSpatialParams; - using ParentType = FVSpatialParams; + using ThisType = TwoPSpatialParams; + using ParentType = FVSpatialParams; public: using EffectiveLaw = RegularizedBrooksCorey; @@ -59,7 +59,7 @@ public: // export permeability type using PermeabilityType = Scalar; - TwoPSpatialParams(std::shared_ptr fvGridGeometry, + TwoPSpatialParams(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManagerPtr) : ParentType(fvGridGeometry) , couplingManagerPtr_(couplingManagerPtr) diff --git a/test/multidomain/poromechanics/el2p/spatialparams_poroelastic.hh b/test/multidomain/poromechanics/el2p/spatialparams_poroelastic.hh index 4416db2d9e..dc4aa2b84d 100644 --- a/test/multidomain/poromechanics/el2p/spatialparams_poroelastic.hh +++ b/test/multidomain/poromechanics/el2p/spatialparams_poroelastic.hh @@ -35,16 +35,16 @@ namespace Dumux { * \brief Definition of the spatial parameters for the poro-elastic * sub-problem in the coupled poro-mechanical el1p problem. */ -template +template class PoroElasticSpatialParams : public FVSpatialParamsPoroElastic< Scalar, - FVGridGeometry, - PoroElasticSpatialParams > + GridGeometry, + PoroElasticSpatialParams > { - using ThisType = PoroElasticSpatialParams; - using ParentType = FVSpatialParamsPoroElastic; + using ThisType = PoroElasticSpatialParams; + using ParentType = FVSpatialParamsPoroElastic; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -52,7 +52,7 @@ public: //! Export the type of the lame parameters using LameParams = Dumux::LameParams; - PoroElasticSpatialParams(std::shared_ptr fvGridGeometry) + PoroElasticSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) , initPorosity_(getParam("SpatialParams.InitialPorosity")) { diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/main.cc b/test/porousmediumflow/1p/implicit/compressible/instationary/main.cc index 10ce65de39..53079d6905 100644 --- a/test/porousmediumflow/1p/implicit/compressible/instationary/main.cc +++ b/test/porousmediumflow/1p/implicit/compressible/instationary/main.cc @@ -84,8 +84,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh b/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh index 90b0654963..e62e6bf02a 100644 --- a/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh +++ b/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh @@ -66,9 +66,9 @@ struct Problem { using type = OnePTestProblem struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePTestSpatialParams; + using type = OnePTestSpatialParams; }; // the fluid system @@ -105,13 +105,13 @@ class OnePTestProblem : public PorousMediumFlowProblem using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - OnePTestProblem(std::shared_ptr fvGridGeometry) + OnePTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { Components::TabulatedComponent>::init(272.15, 294.15, 10, diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/spatialparams.hh b/test/porousmediumflow/1p/implicit/compressible/instationary/spatialparams.hh index 04b3baf4b7..bd71ffded3 100644 --- a/test/porousmediumflow/1p/implicit/compressible/instationary/spatialparams.hh +++ b/test/porousmediumflow/1p/implicit/compressible/instationary/spatialparams.hh @@ -35,24 +35,24 @@ namespace Dumux { * \brief The spatial parameters class for the test problem using the * compressible 1p model. */ -template +template class OnePTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: using PermeabilityType = Scalar; - OnePTestSpatialParams(std::shared_ptr fvGridGeometry) + OnePTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = getParam("SpatialParams.Permeability"); diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/main.cc b/test/porousmediumflow/1p/implicit/compressible/stationary/main.cc index 4a61085b58..dbe4b417f8 100644 --- a/test/porousmediumflow/1p/implicit/compressible/stationary/main.cc +++ b/test/porousmediumflow/1p/implicit/compressible/stationary/main.cc @@ -82,8 +82,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh b/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh index 90b0654963..e62e6bf02a 100644 --- a/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh +++ b/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh @@ -66,9 +66,9 @@ struct Problem { using type = OnePTestProblem struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePTestSpatialParams; + using type = OnePTestSpatialParams; }; // the fluid system @@ -105,13 +105,13 @@ class OnePTestProblem : public PorousMediumFlowProblem using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - OnePTestProblem(std::shared_ptr fvGridGeometry) + OnePTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { Components::TabulatedComponent>::init(272.15, 294.15, 10, diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/spatialparams.hh b/test/porousmediumflow/1p/implicit/compressible/stationary/spatialparams.hh index 90901ac692..4900b4839b 100644 --- a/test/porousmediumflow/1p/implicit/compressible/stationary/spatialparams.hh +++ b/test/porousmediumflow/1p/implicit/compressible/stationary/spatialparams.hh @@ -35,24 +35,24 @@ namespace Dumux { * \brief The spatial parameters class for the test problem using the * compressible 1p model */ -template +template class OnePTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: using PermeabilityType = Scalar; - OnePTestSpatialParams(std::shared_ptr fvGridGeometry) + OnePTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = getParam("SpatialParams.Permeability"); diff --git a/test/porousmediumflow/1p/implicit/convergence/problem.hh b/test/porousmediumflow/1p/implicit/convergence/problem.hh index 3df9ebca6c..91a9457494 100644 --- a/test/porousmediumflow/1p/implicit/convergence/problem.hh +++ b/test/porousmediumflow/1p/implicit/convergence/problem.hh @@ -67,9 +67,9 @@ struct Problem { using type = OnePTestProblem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePTestSpatialParams; + using type = OnePTestSpatialParams; }; // use the incompressible local residual (provides analytic jacobian) @@ -100,10 +100,10 @@ class OnePTestProblem : public PorousMediumFlowProblem using PrimaryVariables = GetPropType; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -112,7 +112,7 @@ public: * \brief The constructor. * \param fvGridGeometry The finite-volume grid geometry */ - OnePTestProblem(std::shared_ptr fvGridGeometry) + OnePTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} diff --git a/test/porousmediumflow/1p/implicit/convergence/solver.hh b/test/porousmediumflow/1p/implicit/convergence/solver.hh index ea178eb0d3..ff5ea1a510 100644 --- a/test/porousmediumflow/1p/implicit/convergence/solver.hh +++ b/test/porousmediumflow/1p/implicit/convergence/solver.hh @@ -88,8 +88,8 @@ SolutionStorage solveRefinementLevel(int numCells) Dune::Timer timer; // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (boundary conditions) diff --git a/test/porousmediumflow/1p/implicit/convergence/spatialparams.hh b/test/porousmediumflow/1p/implicit/convergence/spatialparams.hh index 9c245763e3..5cc1980262 100644 --- a/test/porousmediumflow/1p/implicit/convergence/spatialparams.hh +++ b/test/porousmediumflow/1p/implicit/convergence/spatialparams.hh @@ -33,15 +33,15 @@ namespace Dumux { * \ingroup OnePTests * \brief The spatial params of the incompressible single-phase convergence test */ -template +template class OnePTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using ThisType = OnePTestSpatialParams; - using ParentType = FVSpatialParamsOneP; + using ThisType = OnePTestSpatialParams; + using ParentType = FVSpatialParamsOneP; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: @@ -51,7 +51,7 @@ public: * \brief The constructor. * \param fvGridGeometry The finite-volume grid geometry */ - OnePTestSpatialParams(std::shared_ptr fvGridGeometry) + OnePTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/main.cc b/test/porousmediumflow/1p/implicit/fracture2d3d/main.cc index 15b1f32591..95c50632af 100644 --- a/test/porousmediumflow/1p/implicit/fracture2d3d/main.cc +++ b/test/porousmediumflow/1p/implicit/fracture2d3d/main.cc @@ -105,8 +105,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh b/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh index c6a4786a1a..a47b0ac78b 100644 --- a/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh +++ b/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh @@ -84,9 +84,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = FractureSpatialParams; + using type = FractureSpatialParams; }; } // end namespace Properties @@ -117,10 +117,10 @@ class FractureProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; public: - FractureProblem(std::shared_ptr fvGridGeometry) + FractureProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { name_ = getParam("Problem.Name"); diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/spatialparams.hh b/test/porousmediumflow/1p/implicit/fracture2d3d/spatialparams.hh index 696eba5112..cb932a102d 100644 --- a/test/porousmediumflow/1p/implicit/fracture2d3d/spatialparams.hh +++ b/test/porousmediumflow/1p/implicit/fracture2d3d/spatialparams.hh @@ -36,14 +36,14 @@ namespace Dumux { * \brief The spatial parameters for the LensProblem which uses the * two-phase fully implicit model. */ -template +template class FractureSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using ParentType = FVSpatialParamsOneP>; + using GridView = typename GridGeometry::GridView; + using ParentType = FVSpatialParamsOneP>; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -52,7 +52,7 @@ public: // export permeability type using PermeabilityType = Scalar; - FractureSpatialParams(std::shared_ptr fvGridGeometry) + FractureSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} diff --git a/test/porousmediumflow/1p/implicit/incompressible/main.cc b/test/porousmediumflow/1p/implicit/incompressible/main.cc index 541327d37f..469c9c9476 100644 --- a/test/porousmediumflow/1p/implicit/incompressible/main.cc +++ b/test/porousmediumflow/1p/implicit/incompressible/main.cc @@ -57,14 +57,14 @@ #include "../internaldirichlet/problem.hh" //! Function to write out the scv-wise velocities (overload for mpfa) -template = 0> -void writeMpfaVelocities(const FVGridGeometry& fvGridGeometry, +template = 0> +void writeMpfaVelocities(const GridGeometry& fvGridGeometry, const GridVariables& gridVariables, const Sol& x) { using Scalar = typename GridVariables::Scalar; - using GlobalPos = typename FVGridGeometry::SubControlVolume::GlobalPosition; + using GlobalPos = typename GridGeometry::SubControlVolume::GlobalPosition; const auto velocities = Dumux::CCMpfaScvGradients::computeVelocities(fvGridGeometry, gridVariables, x, /*phaseIdx*/0); Dumux::PointCloudVtkWriter writer(velocities.first); @@ -73,9 +73,9 @@ void writeMpfaVelocities(const FVGridGeometry& fvGridGeometry, } //! Function to write out the scv-wise velocities (overload for NOT mpfa) -template = 0> -void writeMpfaVelocities(const FVGridGeometry& fvGridGeometry, +template = 0> +void writeMpfaVelocities(const GridGeometry& fvGridGeometry, const GridVariables& gridVariables, const Sol& x) {} @@ -114,8 +114,8 @@ int main(int argc, char** argv) try Dune::Timer timer; // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (boundary conditions) @@ -163,8 +163,8 @@ int main(int argc, char** argv) try using VelocityVector = typename VelocityOutput::VelocityVector; VelocityVector velocity; - constexpr bool isBox = FVGridGeometry::discMethod == Dumux::DiscretizationMethod::box; - constexpr int dimWorld = FVGridGeometry::GridView::dimensionworld; + 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(); auto numVelocities = (isBox && dimWorld == 1) ? numCells : numDofs; diff --git a/test/porousmediumflow/1p/implicit/incompressible/problem.hh b/test/porousmediumflow/1p/implicit/incompressible/problem.hh index d7ea6a085e..37b90d117c 100644 --- a/test/porousmediumflow/1p/implicit/incompressible/problem.hh +++ b/test/porousmediumflow/1p/implicit/incompressible/problem.hh @@ -73,9 +73,9 @@ struct Problem { using type = OnePTestProblem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePTestSpatialParams; + using type = OnePTestSpatialParams; }; // use the incompressible local residual (provides analytic jacobian) @@ -120,14 +120,14 @@ class OnePTestProblem : public PorousMediumFlowProblem using Element = typename GridView::template Codim<0>::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = Dune::FieldVector; public: - OnePTestProblem(std::shared_ptr fvGridGeometry) + OnePTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), velocity_(0.0) { extrusionFactor_ = getParam("Problem.ExtrusionFactor"); diff --git a/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh index 0b0758dda3..4859730fcf 100644 --- a/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh +++ b/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh @@ -35,24 +35,24 @@ namespace Dumux { * \brief The spatial parameters class for the test problem using the * incompressible 1p model */ -template +template class OnePTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: using PermeabilityType = Scalar; - OnePTestSpatialParams(std::shared_ptr fvGridGeometry) + OnePTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = getParam("SpatialParams.Permeability"); diff --git a/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh b/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh index 6708ff689c..2ddb54a9e8 100644 --- a/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh +++ b/test/porousmediumflow/1p/implicit/internaldirichlet/problem.hh @@ -61,12 +61,12 @@ class OnePTestProblemInternalDirichlet : public OnePTestProblem using PrimaryVariables = GetPropType; using NeumannValues = GetPropType; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using GridGeometry = GetPropType; + using SubControlVolume = typename GridGeometry::SubControlVolume; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - OnePTestProblemInternalDirichlet(std::shared_ptr fvGridGeometry) + OnePTestProblemInternalDirichlet(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} diff --git a/test/porousmediumflow/1p/implicit/isothermal/main.cc b/test/porousmediumflow/1p/implicit/isothermal/main.cc index 260882ed01..37e5d4ac10 100644 --- a/test/porousmediumflow/1p/implicit/isothermal/main.cc +++ b/test/porousmediumflow/1p/implicit/isothermal/main.cc @@ -111,8 +111,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1p/implicit/isothermal/spatialparams.hh b/test/porousmediumflow/1p/implicit/isothermal/spatialparams.hh index 9a748b72dd..ca3157aa11 100644 --- a/test/porousmediumflow/1p/implicit/isothermal/spatialparams.hh +++ b/test/porousmediumflow/1p/implicit/isothermal/spatialparams.hh @@ -37,17 +37,17 @@ namespace Dumux { * \brief The spatial parameters class for the test problem using the * 1p box model. */ -template +template class OnePTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using IndexSet = typename GridView::IndexSet; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; enum { dim=GridView::dimension, @@ -61,7 +61,7 @@ public: // export permeability type using PermeabilityType = Scalar; - OnePTestSpatialParams(std::shared_ptr fvGridGeometry) + OnePTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), randomPermeability_(fvGridGeometry->gridView().size(dim), 0.0), indexSet_(fvGridGeometry->gridView().indexSet()) @@ -113,7 +113,7 @@ public: * * \param gg The finite-volume grid geometry used by the problem */ - void initRandomField(const FVGridGeometry& gg) + void initRandomField(const GridGeometry& gg) { const auto& gridView = gg.gridView(); const auto& elementMapper = gg.elementMapper(); diff --git a/test/porousmediumflow/1p/implicit/network1d3d/main.cc b/test/porousmediumflow/1p/implicit/network1d3d/main.cc index b13d508365..323e728fd3 100644 --- a/test/porousmediumflow/1p/implicit/network1d3d/main.cc +++ b/test/porousmediumflow/1p/implicit/network1d3d/main.cc @@ -105,8 +105,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1p/implicit/network1d3d/spatialparams.hh b/test/porousmediumflow/1p/implicit/network1d3d/spatialparams.hh index d5abb2fba2..4df6fd6eb1 100644 --- a/test/porousmediumflow/1p/implicit/network1d3d/spatialparams.hh +++ b/test/porousmediumflow/1p/implicit/network1d3d/spatialparams.hh @@ -36,17 +36,17 @@ namespace Dumux { * \brief A test problem for the 1p model: A pipe system with circular cross-section * and a branching point embedded in a three-dimensional world */ -template +template class TubesTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -54,7 +54,7 @@ public: // export permeability type using PermeabilityType = Scalar; - TubesTestSpatialParams(std::shared_ptr fvGridGeometry) + TubesTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { radius_ = 1.0; diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/main.cc b/test/porousmediumflow/1p/implicit/nonisothermal/main.cc index d5c20b5452..705c7d19f4 100644 --- a/test/porousmediumflow/1p/implicit/nonisothermal/main.cc +++ b/test/porousmediumflow/1p/implicit/nonisothermal/main.cc @@ -108,13 +108,13 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) using Problem = GetPropType; - const std::string paramGroup = FVGridGeometry::discMethod == DiscretizationMethod::ccmpfa ? "MpfaTest" : ""; + const std::string paramGroup = GridGeometry::discMethod == DiscretizationMethod::ccmpfa ? "MpfaTest" : ""; auto problem = std::make_shared(fvGridGeometry, paramGroup); // get some time loop parameters diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh b/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh index 64dd602a39..3b12308da3 100644 --- a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh +++ b/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh @@ -77,9 +77,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePNISpatialParams; + using type = OnePNISpatialParams; }; } @@ -131,10 +131,10 @@ class OnePNIConductionProblem : public PorousMediumFlowProblem using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; public: - OnePNIConductionProblem(std::shared_ptr fvGridGeometry, const std::string& paramGroup) + OnePNIConductionProblem(std::shared_ptr fvGridGeometry, const std::string& paramGroup) : ParentType(fvGridGeometry, paramGroup) { //initialize fluid system diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh b/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh index fc9ce339eb..19ea05429c 100644 --- a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh +++ b/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh @@ -77,9 +77,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePNISpatialParams; + using type = OnePNISpatialParams; }; } // end namespace Properties @@ -143,10 +143,10 @@ class OnePNIConvectionProblem : public PorousMediumFlowProblem using NumEqVector = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; public: - OnePNIConvectionProblem(std::shared_ptr fvGridGeometry, const std::string& paramGroup) + OnePNIConvectionProblem(std::shared_ptr fvGridGeometry, const std::string& paramGroup) : ParentType(fvGridGeometry, paramGroup) { //initialize fluid system diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/spatialparams.hh b/test/porousmediumflow/1p/implicit/nonisothermal/spatialparams.hh index 435a4095cd..8fd254bd47 100644 --- a/test/porousmediumflow/1p/implicit/nonisothermal/spatialparams.hh +++ b/test/porousmediumflow/1p/implicit/nonisothermal/spatialparams.hh @@ -34,14 +34,14 @@ namespace Dumux { * \ingroup OnePTests * \brief Definition of the spatial parameters for the 1pni problems. */ -template +template class OnePNISpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using ParentType = FVSpatialParamsOneP>; + using GridView = typename GridGeometry::GridView; + using ParentType = FVSpatialParamsOneP>; static const int dimWorld = GridView::dimensionworld; using Element = typename GridView::template Codim<0>::Entity; @@ -51,7 +51,7 @@ public: // export permeability type using PermeabilityType = Scalar; - OnePNISpatialParams(std::shared_ptr fvGridGeometry) + OnePNISpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} /*! diff --git a/test/porousmediumflow/1p/implicit/periodicbc/main.cc b/test/porousmediumflow/1p/implicit/periodicbc/main.cc index 393ca05ee9..89aff7811d 100644 --- a/test/porousmediumflow/1p/implicit/periodicbc/main.cc +++ b/test/porousmediumflow/1p/implicit/periodicbc/main.cc @@ -77,8 +77,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry (and make it periodic) - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); bool periodic = fvGridGeometry->isPeriodic(); diff --git a/test/porousmediumflow/1p/implicit/periodicbc/problem.hh b/test/porousmediumflow/1p/implicit/periodicbc/problem.hh index cb78df459f..ba8a167028 100644 --- a/test/porousmediumflow/1p/implicit/periodicbc/problem.hh +++ b/test/porousmediumflow/1p/implicit/periodicbc/problem.hh @@ -113,13 +113,13 @@ class OnePTestProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using PrimaryVariables = GetPropType; using SourceValues = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - OnePTestProblem(std::shared_ptr fvGridGeometry) + OnePTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { sourcePosition_ = getParam("Source.Position"); diff --git a/test/porousmediumflow/1p/implicit/periodicbc/spatialparams.hh b/test/porousmediumflow/1p/implicit/periodicbc/spatialparams.hh index 73a25ecd30..c1b2c8893a 100644 --- a/test/porousmediumflow/1p/implicit/periodicbc/spatialparams.hh +++ b/test/porousmediumflow/1p/implicit/periodicbc/spatialparams.hh @@ -41,19 +41,19 @@ class OnePTestSpatialParams OnePTestSpatialParams> { using Scalar = GetPropType; - using FVGridGeometry = GetPropType; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: using PermeabilityType = Scalar; - OnePTestSpatialParams(std::shared_ptr fvGridGeometry) + OnePTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = getParam("SpatialParams.Permeability"); diff --git a/test/porousmediumflow/1p/implicit/pointsources/spatialparams.hh b/test/porousmediumflow/1p/implicit/pointsources/spatialparams.hh index 642d30772e..7c805f3fe8 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/spatialparams.hh +++ b/test/porousmediumflow/1p/implicit/pointsources/spatialparams.hh @@ -36,24 +36,24 @@ namespace Dumux { * \brief The spatial parameters class for the test problem using the * 1p model with point sources. */ -template +template class OnePSingularitySpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: // export permeability type using PermeabilityType = Scalar; - OnePSingularitySpatialParams(std::shared_ptr fvGridGeometry) + OnePSingularitySpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = getParam("SpatialParams.Permeability"); diff --git a/test/porousmediumflow/1p/implicit/pointsources/timedependent/main.cc b/test/porousmediumflow/1p/implicit/pointsources/timedependent/main.cc index e1c7cafab6..2f865a88fc 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/timedependent/main.cc +++ b/test/porousmediumflow/1p/implicit/pointsources/timedependent/main.cc @@ -80,8 +80,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh b/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh index d3c9d1bd7e..cccb3f7abb 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh +++ b/test/porousmediumflow/1p/implicit/pointsources/timedependent/problem.hh @@ -75,10 +75,10 @@ class OnePSingularityProblemTimeDependent : public OnePSingularityProblem::LocalView; using ElementVolumeVariables = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; public: - OnePSingularityProblemTimeDependent(std::shared_ptr fvGridGeometry) + OnePSingularityProblemTimeDependent(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/main.cc b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/main.cc index d10892dea3..e6dae4cf56 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/main.cc +++ b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/main.cc @@ -80,8 +80,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh index 816eed96a0..c3166854ec 100644 --- a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh +++ b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh @@ -75,9 +75,9 @@ struct Problem { using type = OnePSingularityPro template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePSingularitySpatialParams; + using type = OnePSingularitySpatialParams; }; } @@ -112,12 +112,12 @@ class OnePSingularityProblem : public PorousMediumFlowProblem using PrimaryVariables = GetPropType; using BoundaryTypes = GetPropType; using PointSource = GetPropType; - using FVGridGeometry = GetPropType; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using GridGeometry = GetPropType; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - OnePSingularityProblem(std::shared_ptr fvGridGeometry) + OnePSingularityProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { name_ = getParam("Problem.Name"); diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/main.cc b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/main.cc index 0a26f5f85f..6933d093a2 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/main.cc +++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/main.cc @@ -84,8 +84,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh index ad48175083..37044d23a5 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh @@ -86,9 +86,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePNCTestSpatialParams; + using type = OnePNCTestSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -134,7 +134,7 @@ class OnePTwoCTestProblem : public PorousMediumFlowProblem using GridView = GetPropType; using Element = typename GridView::template Codim<0>::Entity; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; @@ -167,7 +167,7 @@ class OnePTwoCTestProblem : public PorousMediumFlowProblem using GlobalPosition = typename SubControlVolumeFace::GlobalPosition; public: - OnePTwoCTestProblem(std::shared_ptr fvGridGeometry) + OnePTwoCTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), useNitscheTypeBc_(getParam("Problem.UseNitscheTypeBc", false)) { //initialize fluid system diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/main.cc b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/main.cc index adbf3fb55a..c4df15bbb0 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/main.cc +++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/main.cc @@ -84,8 +84,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh index 2e96781678..295f60debd 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh @@ -63,9 +63,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePNCTestSpatialParams; + using type = OnePNCTestSpatialParams; }; // Use mass fractions to set salinity conveniently @@ -97,7 +97,7 @@ class SaltWaterIntrusionTestProblem : public PorousMediumFlowProblem using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; // copy pressure index for convenience enum { pressureIdx = Indices::pressureIdx }; @@ -106,7 +106,7 @@ class SaltWaterIntrusionTestProblem : public PorousMediumFlowProblem static_assert(!getPropValue(), "This test uses mass fractions!"); public: - SaltWaterIntrusionTestProblem(std::shared_ptr fvGridGeometry) + SaltWaterIntrusionTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { //initialize fluid system diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/main.cc b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/main.cc index fd9ad1d16d..1cd87fc71c 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/main.cc +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/main.cc @@ -84,8 +84,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh index 627739a67f..e639650005 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh @@ -83,9 +83,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePNCTestSpatialParams; + using type = OnePNCTestSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -128,7 +128,7 @@ class OnePTwoCNIConductionProblem : public PorousMediumFlowProblem using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using NumEqVector = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using ThermalConductivityModel = GetPropType; @@ -152,7 +152,7 @@ class OnePTwoCNIConductionProblem : public PorousMediumFlowProblem using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - OnePTwoCNIConductionProblem(std::shared_ptr fvGridGeometry) + OnePTwoCNIConductionProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), temperatureHigh_(300.0) { //initialize fluid system diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/main.cc b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/main.cc index c7deaed5a0..29c9dd5e5e 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/main.cc +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/main.cc @@ -84,8 +84,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh index 8002ec769d..4c0469c5cc 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh @@ -84,9 +84,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePNCTestSpatialParams; + using type = OnePNCTestSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -130,7 +130,7 @@ class OnePTwoCNIConvectionProblem : public PorousMediumFlowProblem using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using NumEqVector = GetPropType; @@ -167,7 +167,7 @@ class OnePTwoCNIConvectionProblem : public PorousMediumFlowProblem using GlobalPosition = typename SubControlVolumeFace::GlobalPosition; public: - OnePTwoCNIConvectionProblem(std::shared_ptr fvGridGeometry) + OnePTwoCNIConvectionProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { //initialize fluid system diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/main.cc b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/main.cc index f9564773e8..84087c60f1 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/main.cc +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/main.cc @@ -84,8 +84,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh index 2be743d10a..c9017f19e0 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh @@ -83,9 +83,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePNCTestSpatialParams; + using type = OnePNCTestSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -141,7 +141,7 @@ class OnePTwoCNITransientBCProblem : public PorousMediumFlowProblem using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using NumEqVector = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; @@ -174,7 +174,7 @@ class OnePTwoCNITransientBCProblem : public PorousMediumFlowProblem using GlobalPosition = typename SubControlVolumeFace::GlobalPosition; public: - OnePTwoCNITransientBCProblem(std::shared_ptr fvGridGeometry) + OnePTwoCNITransientBCProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { //initialize fluid system diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/spatialparams.hh b/test/porousmediumflow/1pnc/implicit/1p2c/spatialparams.hh index b397abab17..677d798739 100644 --- a/test/porousmediumflow/1pnc/implicit/1p2c/spatialparams.hh +++ b/test/porousmediumflow/1pnc/implicit/1p2c/spatialparams.hh @@ -34,17 +34,17 @@ namespace Dumux { * \ingroup OnePNCTests * \brief Definition of the spatial parameters for the 1pnc test problems. */ -template +template class OnePNCTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; static const int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Dune::FieldVector; @@ -53,7 +53,7 @@ public: // export permeability type using PermeabilityType = Scalar; - OnePNCTestSpatialParams(std::shared_ptr fvGridGeometry) + OnePNCTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = 1e-10; diff --git a/test/porousmediumflow/1pnc/implicit/1p3c/main.cc b/test/porousmediumflow/1pnc/implicit/1p3c/main.cc index 5d5c2cf24a..54698a27f8 100644 --- a/test/porousmediumflow/1pnc/implicit/1p3c/main.cc +++ b/test/porousmediumflow/1pnc/implicit/1p3c/main.cc @@ -85,8 +85,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh b/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh index 7bcc590505..d240e5ecfc 100644 --- a/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/1p3c/problem.hh @@ -209,9 +209,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePNCTestSpatialParams; + using type = OnePNCTestSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -248,18 +248,18 @@ class MaxwellStefanOnePThreeCTestProblem : public PorousMediumFlowProblem; using NumEqVector = GetPropType; using FluidSystem = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using SolutionVector = GetPropType; using VolumeVariables = GetPropType; //! property that defines whether mole or mass fractions are used static constexpr bool useMoles = getPropValue(); - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - MaxwellStefanOnePThreeCTestProblem(std::shared_ptr fvGridGeometry) + MaxwellStefanOnePThreeCTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { name_ = getParam("Problem.Name"); diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/main.cc b/test/porousmediumflow/1pnc/implicit/nonequilibrium/main.cc index 0b75cd7a96..012398a7a8 100644 --- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/main.cc +++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/main.cc @@ -84,8 +84,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh b/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh index ebc2a80e2f..b657378584 100644 --- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh +++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh @@ -76,9 +76,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePNCNonequilibriumTestSpatialParams; + using type = OnePNCNonequilibriumTestSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -114,7 +114,7 @@ class OnePTwoCThermalNonequilibriumProblem : public PorousMediumFlowProblem; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using NumEqVector = GetPropType; @@ -152,7 +152,7 @@ class OnePTwoCThermalNonequilibriumProblem : public PorousMediumFlowProblem fvGridGeometry) + OnePTwoCThermalNonequilibriumProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { //initialize fluid system diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/spatialparams.hh b/test/porousmediumflow/1pnc/implicit/nonequilibrium/spatialparams.hh index 98ba14f992..0fbdc7a45a 100644 --- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/spatialparams.hh +++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/spatialparams.hh @@ -36,17 +36,17 @@ namespace Dumux { * \ingroup OnePNCTests * \brief Definition of the spatial parameters for the 1pnc test problems. */ -template +template class OnePNCNonequilibriumTestSpatialParams -: public FVNonEquilibriumSpatialParams> +: public FVNonEquilibriumSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVNonEquilibriumSpatialParams>; + using ParentType = FVNonEquilibriumSpatialParams>; static const int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Dune::FieldVector; @@ -56,7 +56,7 @@ public: using PermeabilityType = Scalar; using FluidSolidInterfacialAreaFormulation = FluidSolidInterfacialAreaShiWang; - OnePNCNonequilibriumTestSpatialParams(std::shared_ptr fvGridGeometry) + OnePNCNonequilibriumTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = 1e-11; diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc b/test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc index 324908de81..74b60e1055 100644 --- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc +++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/main.cc @@ -110,8 +110,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh index 67d8627fea..268c0d11bb 100644 --- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh +++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh @@ -90,9 +90,9 @@ struct SolidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = ThermoChemSpatialParams; + using type = ThermoChemSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -134,7 +134,7 @@ class ThermoChemProblem : public PorousMediumFlowProblem using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using NumEqVector = GetPropType; using SolutionVector = GetPropType; using ReactionRate = ThermoChemReaction; @@ -164,7 +164,7 @@ class ThermoChemProblem : public PorousMediumFlowProblem using GlobalPosition = typename SubControlVolumeFace::GlobalPosition; public: - ThermoChemProblem(std::shared_ptr fvGridGeometry) + ThermoChemProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { name_ = getParam("Problem.Name"); diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/spatialparams.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/spatialparams.hh index 662fb4fe6d..005a6027d8 100644 --- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/spatialparams.hh +++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/spatialparams.hh @@ -35,17 +35,17 @@ namespace Dumux { * \brief Definition of the spatial parameters for the thermochemistry * problem which uses the non-insothermal 1pncmin model. */ -template +template class ThermoChemSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; enum { dimWorld=GridView::dimensionworld }; @@ -55,7 +55,7 @@ public: // type used for the permeability (i.e. tensor or scalar) using PermeabilityType = Scalar; - ThermoChemSpatialParams(std::shared_ptr fvGridGeometry) + ThermoChemSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} diff --git a/test/porousmediumflow/2p/implicit/adaptive/main.cc b/test/porousmediumflow/2p/implicit/adaptive/main.cc index dabb29b258..06deb12dc9 100644 --- a/test/porousmediumflow/2p/implicit/adaptive/main.cc +++ b/test/porousmediumflow/2p/implicit/adaptive/main.cc @@ -123,8 +123,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2p/implicit/adaptive/problem.hh b/test/porousmediumflow/2p/implicit/adaptive/problem.hh index 3de0f798f2..97342d55b9 100644 --- a/test/porousmediumflow/2p/implicit/adaptive/problem.hh +++ b/test/porousmediumflow/2p/implicit/adaptive/problem.hh @@ -46,12 +46,12 @@ class TwoPTestProblemAdaptive : public TwoPTestProblem using Vertex = typename GridView::template Codim::Entity; using Scalar = GetPropType; using PrimaryVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; - static constexpr bool isBox = FVGridGeometry::discMethod == DiscretizationMethod::box; + static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box; public: - TwoPTestProblemAdaptive(std::shared_ptr fvGridGeometry) + TwoPTestProblemAdaptive(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { if(!isBox) diff --git a/test/porousmediumflow/2p/implicit/boxdfm/main.cc b/test/porousmediumflow/2p/implicit/boxdfm/main.cc index 32090672e9..3637d8771f 100644 --- a/test/porousmediumflow/2p/implicit/boxdfm/main.cc +++ b/test/porousmediumflow/2p/implicit/boxdfm/main.cc @@ -117,8 +117,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.template grid<0>().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(fractureGridAdapter); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2p/implicit/boxdfm/problem.hh b/test/porousmediumflow/2p/implicit/boxdfm/problem.hh index 7e7d92ff11..16df8efc1b 100644 --- a/test/porousmediumflow/2p/implicit/boxdfm/problem.hh +++ b/test/porousmediumflow/2p/implicit/boxdfm/problem.hh @@ -125,8 +125,8 @@ class TwoPTestProblem : public PorousMediumFlowProblem using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; + using GridGeometry = GetPropType; + using SubControlVolume = typename GridGeometry::SubControlVolume; // some indices for convenience using FluidSystem = GetPropType; @@ -144,7 +144,7 @@ class TwoPTestProblem : public PorousMediumFlowProblem static constexpr int dimWorld = GridView::dimensionworld; public: - TwoPTestProblem(std::shared_ptr fvGridGeometry) + TwoPTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} diff --git a/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh b/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh index 68e4011439..0e06f1c19e 100644 --- a/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh +++ b/test/porousmediumflow/2p/implicit/boxdfm/spatialparams.hh @@ -39,17 +39,17 @@ namespace Dumux { * \ingroup TwoPTests * \brief The spatial params for the incompressible 2p test. */ -template -class TwoPTestSpatialParams : public FVSpatialParams< FVGridGeometry, Scalar, TwoPTestSpatialParams > +template +class TwoPTestSpatialParams : public FVSpatialParams< GridGeometry, Scalar, TwoPTestSpatialParams > { - using ThisType = TwoPTestSpatialParams; - using ParentType = FVSpatialParams; + using ThisType = TwoPTestSpatialParams; + using ParentType = FVSpatialParams; - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; static constexpr int dimWorld = GridView::dimensionworld; @@ -59,7 +59,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = Scalar; - TwoPTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) + TwoPTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // 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 1b55d6dd8a..c21f4242df 100644 --- a/test/porousmediumflow/2p/implicit/cornerpoint/main.cc +++ b/test/porousmediumflow/2p/implicit/cornerpoint/main.cc @@ -118,8 +118,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh b/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh index 2f31bd79a3..dc651cabdc 100644 --- a/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh +++ b/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh @@ -77,10 +77,10 @@ template struct SpatialParams { private: - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; public: - using type = TwoPCornerPointTestSpatialParams; + using type = TwoPCornerPointTestSpatialParams; }; // Enable caching @@ -104,10 +104,10 @@ class TwoPCornerPointTestProblem : public PorousMediumFlowProblem using FluidSystem = GetPropType; using PrimaryVariables = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; - using FVGridGeometry = GetPropType; - using GridView = typename FVGridGeometry::GridView; + using GridGeometry = GetPropType; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -117,7 +117,7 @@ class TwoPCornerPointTestProblem : public PorousMediumFlowProblem enum { dimWorld = GridView::dimensionworld }; public: - TwoPCornerPointTestProblem(std::shared_ptr fvGridGeometry, + TwoPCornerPointTestProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams) : ParentType(fvGridGeometry, spatialParams) { diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh b/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh index 81ef9bfcd0..1c349d65be 100644 --- a/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh +++ b/test/porousmediumflow/2p/implicit/cornerpoint/spatialparams.hh @@ -37,16 +37,16 @@ namespace Dumux { * \ingroup TwoPTests * \brief The spatial params for the incompressible 2p test. */ -template +template class TwoPCornerPointTestSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using ThisType = TwoPCornerPointTestSpatialParams; - using ParentType = FVSpatialParams; + using ThisType = TwoPCornerPointTestSpatialParams; + using ParentType = FVSpatialParams; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -60,7 +60,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = DimWorldMatrix; - TwoPCornerPointTestSpatialParams(std::shared_ptr fvGridGeometry, + TwoPCornerPointTestSpatialParams(std::shared_ptr fvGridGeometry, std::shared_ptr deck) : ParentType(fvGridGeometry) , deck_(deck) diff --git a/test/porousmediumflow/2p/implicit/fracture/main.cc b/test/porousmediumflow/2p/implicit/fracture/main.cc index 6ed7851dc1..034a08bb10 100644 --- a/test/porousmediumflow/2p/implicit/fracture/main.cc +++ b/test/porousmediumflow/2p/implicit/fracture/main.cc @@ -93,8 +93,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2p/implicit/fracture/problem.hh b/test/porousmediumflow/2p/implicit/fracture/problem.hh index 0d725b27c5..8a7a734879 100644 --- a/test/porousmediumflow/2p/implicit/fracture/problem.hh +++ b/test/porousmediumflow/2p/implicit/fracture/problem.hh @@ -82,9 +82,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = FractureSpatialParams; + using type = FractureSpatialParams; }; // Use global caching @@ -111,7 +111,7 @@ class FractureProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using GridView = GetPropType; using FluidSystem = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Indices = typename GetPropType::Indices; using PrimaryVariables = GetPropType; using BoundaryTypes = GetPropType; @@ -133,7 +133,7 @@ class FractureProblem : public PorousMediumFlowProblem using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - FractureProblem(std::shared_ptr fvGridGeometry) + FractureProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} /*! diff --git a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh index 24a019cdeb..1d43996a6d 100644 --- a/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh +++ b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh @@ -40,17 +40,17 @@ namespace Dumux { * \brief The spatial parameters for the LensProblem which uses the * two-phase fully implicit model. */ -template +template class FractureSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -63,7 +63,7 @@ public: using MaterialLaw = EffToAbsLaw; using MaterialLawParams = typename MaterialLaw::Params; - FractureSpatialParams(std::shared_ptr fvGridGeometry) + FractureSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // residual saturations diff --git a/test/porousmediumflow/2p/implicit/incompressible/main.cc b/test/porousmediumflow/2p/implicit/incompressible/main.cc index d493c01fb6..f5b2640ea6 100644 --- a/test/porousmediumflow/2p/implicit/incompressible/main.cc +++ b/test/porousmediumflow/2p/implicit/incompressible/main.cc @@ -113,8 +113,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2p/implicit/incompressible/problem.hh b/test/porousmediumflow/2p/implicit/incompressible/problem.hh index fafda26c0f..04552265d6 100644 --- a/test/porousmediumflow/2p/implicit/incompressible/problem.hh +++ b/test/porousmediumflow/2p/implicit/incompressible/problem.hh @@ -84,10 +84,10 @@ template struct SpatialParams { private: - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; public: - using type = TwoPTestSpatialParams; + using type = TwoPTestSpatialParams; }; // Enable caching @@ -116,7 +116,7 @@ class TwoPTestProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using FluidSystem = GetPropType; using PrimaryVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using NumEqVector = GetPropType; @@ -130,7 +130,7 @@ class TwoPTestProblem : public PorousMediumFlowProblem }; public: - TwoPTestProblem(std::shared_ptr fvGridGeometry) + TwoPTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} /*! diff --git a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh index 5a7558ba78..b9c9c70c35 100644 --- a/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh +++ b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh @@ -36,16 +36,16 @@ namespace Dumux { * \ingroup TwoPTests * \brief The spatial params for the incompressible 2p test. */ -template +template class TwoPTestSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using ThisType = TwoPTestSpatialParams; - using ParentType = FVSpatialParams; + using ThisType = TwoPTestSpatialParams; + using ParentType = FVSpatialParams; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -57,7 +57,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = Scalar; - TwoPTestSpatialParams(std::shared_ptr fvGridGeometry) + TwoPTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { lensIsOilWet_ = getParam("SpatialParams.LensIsOilWet", false); @@ -150,7 +150,7 @@ public: template void updateMaterialInterfaceParams(const SolutionVector& x) { - if (FVGridGeometry::discMethod == DiscretizationMethod::box) + if (GridGeometry::discMethod == DiscretizationMethod::box) materialInterfaceParams_.update(this->gridGeometry(), *this, x); } diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/main.cc b/test/porousmediumflow/2p/implicit/nonisothermal/main.cc index bcb1684233..facefead0e 100644 --- a/test/porousmediumflow/2p/implicit/nonisothermal/main.cc +++ b/test/porousmediumflow/2p/implicit/nonisothermal/main.cc @@ -104,8 +104,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) @@ -154,7 +154,7 @@ int main(int argc, char** argv) try NewtonSolver nonLinearSolver(assembler, linearSolver); //the convergence writer - using NewtonConvergenceWriter = Dumux::NewtonConvergenceWriter; + using NewtonConvergenceWriter = Dumux::NewtonConvergenceWriter; auto convergenceWriter = std::make_shared(*fvGridGeometry); nonLinearSolver.attachConvergenceWriter(convergenceWriter); diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh index 97554608aa..eb05dbd319 100644 --- a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh +++ b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh @@ -82,9 +82,9 @@ struct FluidSystem { using type = FluidSyst template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = InjectionSpatialParams; + using type = InjectionSpatialParams; }; } // namespace Properties @@ -151,14 +151,14 @@ class InjectionProblem2PNI : public PorousMediumFlowProblem using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using BoundaryTypes = GetPropType; public: - InjectionProblem2PNI(std::shared_ptr fvGridGeometry) + InjectionProblem2PNI(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { maxDepth_ = 2700.0; // [m] diff --git a/test/porousmediumflow/2p1c/implicit/main.cc b/test/porousmediumflow/2p1c/implicit/main.cc index d5516a4fdf..e19de9ef41 100644 --- a/test/porousmediumflow/2p1c/implicit/main.cc +++ b/test/porousmediumflow/2p1c/implicit/main.cc @@ -84,8 +84,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2p1c/implicit/problem.hh b/test/porousmediumflow/2p1c/implicit/problem.hh index 2708c8fa5d..1ad59462fc 100644 --- a/test/porousmediumflow/2p1c/implicit/problem.hh +++ b/test/porousmediumflow/2p1c/implicit/problem.hh @@ -74,9 +74,9 @@ public: template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = InjectionProblemSpatialParams; + using type = InjectionProblemSpatialParams; }; //Define whether spurious cold-water flow into the steam is blocked @@ -111,7 +111,7 @@ class InjectionProblem : public PorousMediumFlowProblem using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GridView = GetPropType; using Element = typename GridView::template Codim<0>::Entity; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; // copy some indices for convenience enum { @@ -129,7 +129,7 @@ class InjectionProblem : public PorousMediumFlowProblem using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - InjectionProblem(std::shared_ptr fvGridGeometry) + InjectionProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { FluidSystem::init(); } diff --git a/test/porousmediumflow/2p1c/implicit/spatialparams.hh b/test/porousmediumflow/2p1c/implicit/spatialparams.hh index 53e900fc79..3546b4766d 100644 --- a/test/porousmediumflow/2p1c/implicit/spatialparams.hh +++ b/test/porousmediumflow/2p1c/implicit/spatialparams.hh @@ -35,17 +35,17 @@ namespace Dumux { * \ingroup TwoPOneCTests * \brief Definition of the spatial parameters for various steam injection problems. */ -template +template class InjectionProblemSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; static constexpr int dimWorld = GridView::dimensionworld; @@ -60,7 +60,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = DimWorldMatrix; - InjectionProblemSpatialParams(std::shared_ptr fvGridGeometry) + InjectionProblemSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { gasWetting_ = getParam("SpatialParams.GasWetting", false); diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/main.cc b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/main.cc index 161016f4bb..722452b0ce 100644 --- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/main.cc +++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/main.cc @@ -105,8 +105,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh index a2767464f2..92686f722c 100644 --- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh +++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/problem.hh @@ -82,9 +82,9 @@ public: template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = TwoPTwoCChemicalNonequilibriumSpatialParams; + using type = TwoPTwoCChemicalNonequilibriumSpatialParams; }; // decide which type to use for floating values (double / quad) @@ -138,7 +138,7 @@ class TwoPTwoCChemicalNonequilibriumProblem : public PorousMediumFlowProblem; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using SolutionVector = GetPropType; using VolumeVariables = GetPropType; @@ -147,10 +147,10 @@ class TwoPTwoCChemicalNonequilibriumProblem : public PorousMediumFlowProblem fvGridGeometry) + TwoPTwoCChemicalNonequilibriumProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { 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 d77fb8e87d..3c5062537b 100644 --- a/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh +++ b/test/porousmediumflow/2p2c/implicit/chemicalnonequilibrium/spatialparams.hh @@ -44,18 +44,18 @@ namespace Dumux { * \ingroup TwoPTwoCTests * \brief The spatial parameters for the 2p2c chemical nonequilibrium problem. */ -template +template class TwoPTwoCChemicalNonequilibriumSpatialParams -: public FVNonEquilibriumSpatialParams> +: public FVNonEquilibriumSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVNonEquilibriumSpatialParams>; + using ParentType = FVNonEquilibriumSpatialParams>; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -73,7 +73,7 @@ public: using AwnSurface = EffToAbsLawIA; using AwnSurfaceParams = typename AwnSurface::Params; - TwoPTwoCChemicalNonequilibriumSpatialParams(std::shared_ptr fvGridGeometry) + TwoPTwoCChemicalNonequilibriumSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // intrinsic permeabilities diff --git a/test/porousmediumflow/2p2c/implicit/injection/main.cc b/test/porousmediumflow/2p2c/implicit/injection/main.cc index 61861d1c67..da8ea2b73d 100644 --- a/test/porousmediumflow/2p2c/implicit/injection/main.cc +++ b/test/porousmediumflow/2p2c/implicit/injection/main.cc @@ -80,8 +80,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2p2c/implicit/injection/problem.hh b/test/porousmediumflow/2p2c/implicit/injection/problem.hh index 19e1b09295..cf014371a9 100644 --- a/test/porousmediumflow/2p2c/implicit/injection/problem.hh +++ b/test/porousmediumflow/2p2c/implicit/injection/problem.hh @@ -76,9 +76,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = InjectionSpatialParams; + using type = InjectionSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -143,7 +143,7 @@ class InjectionProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; using GridView = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; using FluidSystem = GetPropType; @@ -190,7 +190,7 @@ class InjectionProblem : public PorousMediumFlowProblem static constexpr bool useMoles = ModelTraits::useMoles(); public: - InjectionProblem(std::shared_ptr fvGridGeometry) + InjectionProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { nTemperature_ = getParam("Problem.NTemperature"); diff --git a/test/porousmediumflow/2p2c/implicit/injection/spatialparams.hh b/test/porousmediumflow/2p2c/implicit/injection/spatialparams.hh index d1e4cbe35f..7e75bbe245 100644 --- a/test/porousmediumflow/2p2c/implicit/injection/spatialparams.hh +++ b/test/porousmediumflow/2p2c/implicit/injection/spatialparams.hh @@ -38,16 +38,16 @@ namespace Dumux { * \brief Definition of the spatial parameters for the injection problem * which uses the isothermal two-phase two-component fully implicit model. */ -template +template class InjectionSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; static constexpr int dimWorld = GridView::dimensionworld; @@ -62,7 +62,7 @@ public: using MaterialLaw = EffToAbsLaw; using MaterialLawParams = typename MaterialLaw::Params; - InjectionSpatialParams(std::shared_ptr fvGridGeometry) + InjectionSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { layerBottom_ = 22.5; diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/main.cc b/test/porousmediumflow/2p2c/implicit/mpnccomparison/main.cc index 3500d484b1..045ef40e2b 100644 --- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/main.cc +++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/main.cc @@ -105,8 +105,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh b/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh index 8b2d14ae5c..d12b6958f6 100644 --- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh +++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh @@ -76,9 +76,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = TwoPTwoCComparisonSpatialParams; + using type = TwoPTwoCComparisonSpatialParams; }; // decide which type to use for floating values (double / quad) @@ -118,13 +118,13 @@ class TwoPTwoCComparisonProblem : public PorousMediumFlowProblem using GridView = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using ModelTraits = GetPropType; using Indices = typename ModelTraits::Indices; public: - TwoPTwoCComparisonProblem(std::shared_ptr fvGridGeometry) + TwoPTwoCComparisonProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { 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 4214c894ee..547afc6f3d 100644 --- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/spatialparams.hh +++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/spatialparams.hh @@ -38,18 +38,18 @@ namespace Dumux { * \ingroup TwoPTwoCTests * \brief The spatial parameters for the 2p2c mpnc comparison problem. */ -template +template class TwoPTwoCComparisonSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -65,7 +65,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; - TwoPTwoCComparisonSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) + TwoPTwoCComparisonSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // intrinsic permeabilities coarseK_ = 1e-12; diff --git a/test/porousmediumflow/2p2c/implicit/waterair/main.cc b/test/porousmediumflow/2p2c/implicit/waterair/main.cc index a8a818205e..2fcac08c63 100644 --- a/test/porousmediumflow/2p2c/implicit/waterair/main.cc +++ b/test/porousmediumflow/2p2c/implicit/waterair/main.cc @@ -80,8 +80,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2p2c/implicit/waterair/problem.hh b/test/porousmediumflow/2p2c/implicit/waterair/problem.hh index a95f2fde01..4650937469 100644 --- a/test/porousmediumflow/2p2c/implicit/waterair/problem.hh +++ b/test/porousmediumflow/2p2c/implicit/waterair/problem.hh @@ -68,9 +68,9 @@ struct FluidSystem { using type = FluidSystems::H2ON2 struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = WaterAirSpatialParams; + using type = WaterAirSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -150,7 +150,7 @@ class WaterAirProblem : public PorousMediumFlowProblem using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using FVElementGeometry = typename GetPropType::LocalView; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using ElementVolumeVariables = typename GetPropType::LocalView; @@ -158,7 +158,7 @@ class WaterAirProblem : public PorousMediumFlowProblem static constexpr bool useMoles = ModelTraits::useMoles(); public: - WaterAirProblem(std::shared_ptr fvGridGeometry) + WaterAirProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { maxDepth_ = 1000.0; // [m] diff --git a/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh b/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh index 17d7efd06d..d0d99ef0c4 100644 --- a/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh +++ b/test/porousmediumflow/2p2c/implicit/waterair/spatialparams.hh @@ -39,17 +39,17 @@ namespace Dumux { * \ingroup TwoPTwoCModel * \brief Definition of the spatial parameters for the water-air problem. */ -template +template class WaterAirSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; static constexpr int dimWorld = GridView::dimensionworld; @@ -64,7 +64,7 @@ public: using MaterialLaw = EffToAbsLaw; using MaterialLawParams = typename MaterialLaw::Params; - WaterAirSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) + WaterAirSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { layerBottom_ = 22.0; diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/main.cc b/test/porousmediumflow/2pnc/implicit/diffusion/main.cc index ebb030d8ae..e40c4e32c9 100644 --- a/test/porousmediumflow/2pnc/implicit/diffusion/main.cc +++ b/test/porousmediumflow/2pnc/implicit/diffusion/main.cc @@ -102,8 +102,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh b/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh index 2c8a3cae7a..be54a705e0 100644 --- a/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh +++ b/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh @@ -71,9 +71,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = TwoPNCDiffusionSpatialParams; + using type = TwoPNCDiffusionSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -116,13 +116,13 @@ class TwoPNCDiffusionProblem : public PorousMediumFlowProblem using BoundaryTypes = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; //! Property that defines whether mole or mass fractions are used static constexpr bool useMoles = getPropValue(); public: - TwoPNCDiffusionProblem(std::shared_ptr fvGridGeometry) + TwoPNCDiffusionProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // initialize the tables of the fluid system diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/spatialparams.hh b/test/porousmediumflow/2pnc/implicit/diffusion/spatialparams.hh index b8ecf3fc80..898b6666a0 100644 --- a/test/porousmediumflow/2pnc/implicit/diffusion/spatialparams.hh +++ b/test/porousmediumflow/2pnc/implicit/diffusion/spatialparams.hh @@ -39,14 +39,14 @@ namespace Dumux { * \brief Definition of the spatial parameters for the TwoPNCDiffusion * problem which uses the isothermal 2p2c box model. */ -template +template class TwoPNCDiffusionSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using ParentType = FVSpatialParams>; + using GridView = typename GridGeometry::GridView; + using ParentType = FVSpatialParams>; static constexpr int dimWorld = GridView::dimensionworld; @@ -63,7 +63,7 @@ public: using MaterialLaw = EffToAbsLaw; using MaterialLawParams = typename MaterialLaw::Params; - TwoPNCDiffusionSpatialParams(std::shared_ptr fvGridGeometry) + TwoPNCDiffusionSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), K_(0) { // intrinsic permeabilities diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/main.cc b/test/porousmediumflow/2pnc/implicit/fuelcell/main.cc index 795b08881b..1ff8919f43 100644 --- a/test/porousmediumflow/2pnc/implicit/fuelcell/main.cc +++ b/test/porousmediumflow/2pnc/implicit/fuelcell/main.cc @@ -102,8 +102,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh b/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh index 6ef872e50c..8a1fdf72e0 100644 --- a/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh +++ b/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh @@ -74,9 +74,9 @@ struct Problem { using type = FuelCellProblem; template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = FuelCellSpatialParams; + using type = FuelCellSpatialParams; }; // Set the primary variable combination for the 2pnc model @@ -118,23 +118,23 @@ class FuelCellProblem : public PorousMediumFlowProblem using SubControlVolume = typename FVElementGeometry::SubControlVolume; using GridView = GetPropType; using Element = typename GridView::template Codim<0>::Entity; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using SolutionVector = GetPropType; using VolumeVariables = GetPropType; // Select the electrochemistry method #ifdef NONISOTHERMAL - using ElectroChemistry = typename Dumux::ElectroChemistryNI; + using ElectroChemistry = typename Dumux::ElectroChemistryNI; #else - using ElectroChemistry = typename Dumux::ElectroChemistry; + using ElectroChemistry = typename Dumux::ElectroChemistry; #endif static constexpr int dim = GridView::dimension; static constexpr int dimWorld = GridView::dimensionworld; - static constexpr bool isBox = FVGridGeometry::discMethod == DiscretizationMethod::box; + static constexpr bool isBox = GridGeometry::discMethod == DiscretizationMethod::box; using GlobalPosition = typename SubControlVolume::GlobalPosition; enum { dofCodim = isBox ? dim : 0 }; public: - FuelCellProblem(std::shared_ptr fvGridGeometry) + FuelCellProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { nTemperature_ = getParam("Problem.NTemperature"); diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh b/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh index d2c7714d82..525a4383e9 100644 --- a/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh +++ b/test/porousmediumflow/2pnc/implicit/fuelcell/spatialparams.hh @@ -39,18 +39,18 @@ namespace Dumux { * \brief Definition of the spatial parameters for the FuelCell * problem which uses the isothermal 2p2c box model. */ -template +template class FuelCellSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using ParentType = FVSpatialParams>; + using GridView = typename GridGeometry::GridView; + using ParentType = FVSpatialParams>; static constexpr int dimWorld = GridView::dimensionworld; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using DimWorldMatrix = Dune::FieldMatrix; @@ -62,7 +62,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = DimWorldMatrix; - FuelCellSpatialParams(std::shared_ptr fvGridGeometry) + FuelCellSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), K_(0) { // intrinsic permeabilities diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/main.cc b/test/porousmediumflow/2pncmin/implicit/isothermal/main.cc index e4a26d328b..a8295d74d4 100644 --- a/test/porousmediumflow/2pncmin/implicit/isothermal/main.cc +++ b/test/porousmediumflow/2pncmin/implicit/isothermal/main.cc @@ -103,8 +103,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh b/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh index dcac0dd491..ea699d4ba9 100644 --- a/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh +++ b/test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh @@ -86,9 +86,9 @@ struct SolidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = DissolutionSpatialParams; + using type = DissolutionSpatialParams; }; // Set properties here to override the default property settings @@ -178,14 +178,14 @@ class DissolutionProblem : public PorousMediumFlowProblem using BoundaryTypes = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; using Element = typename GridView::template Codim<0>::Entity; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using SolutionVector = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using GlobalPosition = typename SubControlVolume::GlobalPosition; public: - DissolutionProblem(std::shared_ptr fvGridGeometry) + DissolutionProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { outerSalinity_ = getParam("Problem.OuterSalinity"); diff --git a/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh b/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh index 1b0806f3c7..0318990555 100644 --- a/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh +++ b/test/porousmediumflow/2pncmin/implicit/isothermal/spatialparams.hh @@ -40,18 +40,18 @@ namespace Dumux { * \brief Spatial parameters for the dissolution problem * where water is injected in a for flushing precipitated salt clogging a gas reservoir. */ -template +template class DissolutionSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; using EffectiveLaw = RegularizedBrooksCorey; @@ -64,7 +64,7 @@ public: using MaterialLaw = EffToAbsLaw; using MaterialLawParams = typename MaterialLaw::Params; - DissolutionSpatialParams(std::shared_ptr fvGridGeometry) + DissolutionSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { solubilityLimit_ = getParam("SpatialParams.SolubilityLimit", 0.26); diff --git a/test/porousmediumflow/3p/implicit/conduction/main.cc b/test/porousmediumflow/3p/implicit/conduction/main.cc index 49cef2fc61..8091e6b5b3 100644 --- a/test/porousmediumflow/3p/implicit/conduction/main.cc +++ b/test/porousmediumflow/3p/implicit/conduction/main.cc @@ -109,8 +109,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/3p/implicit/conduction/problem.hh b/test/porousmediumflow/3p/implicit/conduction/problem.hh index 7ec8bbbfea..f7e5c36383 100644 --- a/test/porousmediumflow/3p/implicit/conduction/problem.hh +++ b/test/porousmediumflow/3p/implicit/conduction/problem.hh @@ -73,9 +73,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = ThreePNISpatialParams; + using type = ThreePNISpatialParams; }; }// end namespace Properties @@ -112,7 +112,7 @@ class ThreePNIConductionProblem : public PorousMediumFlowProblem using GridView = GetPropType; using Scalar = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using PrimaryVariables = GetPropType; using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; @@ -139,7 +139,7 @@ class ThreePNIConductionProblem : public PorousMediumFlowProblem using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - ThreePNIConductionProblem(std::shared_ptr fvGridGeometry) + ThreePNIConductionProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { //initialize fluid system diff --git a/test/porousmediumflow/3p/implicit/conduction/spatialparams.hh b/test/porousmediumflow/3p/implicit/conduction/spatialparams.hh index 20462a8339..d9a8a10180 100644 --- a/test/porousmediumflow/3p/implicit/conduction/spatialparams.hh +++ b/test/porousmediumflow/3p/implicit/conduction/spatialparams.hh @@ -37,17 +37,17 @@ namespace Dumux { * \ingroup ThreePTests * \brief Definition of the spatial parameters for the 3pni problems. */ -template +template class ThreePNISpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; using EffectiveLaw = RegularizedParkerVanGen3P; @@ -60,7 +60,7 @@ public: using MaterialLaw = EffToAbsLaw; using MaterialLawParams = typename MaterialLaw::Params; - ThreePNISpatialParams(std::shared_ptr fvGridGeometry) + ThreePNISpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = 1e-10; diff --git a/test/porousmediumflow/3p/implicit/convection/main.cc b/test/porousmediumflow/3p/implicit/convection/main.cc index 3b4ce393db..902cc808e6 100644 --- a/test/porousmediumflow/3p/implicit/convection/main.cc +++ b/test/porousmediumflow/3p/implicit/convection/main.cc @@ -109,8 +109,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/3p/implicit/convection/problem.hh b/test/porousmediumflow/3p/implicit/convection/problem.hh index bcdff72d3f..a820d7c060 100644 --- a/test/porousmediumflow/3p/implicit/convection/problem.hh +++ b/test/porousmediumflow/3p/implicit/convection/problem.hh @@ -75,9 +75,9 @@ struct FluidSystem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = ThreePNISpatialParams; + using type = ThreePNISpatialParams; }; } // end namespace Properties @@ -115,7 +115,7 @@ class ThreePNIConvectionProblem : public PorousMediumFlowProblem using GridView = GetPropType; using Scalar = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; using FluidSystem = GetPropType; @@ -149,7 +149,7 @@ class ThreePNIConvectionProblem : public PorousMediumFlowProblem using GlobalPosition = typename SubControlVolumeFace::GlobalPosition; public: - ThreePNIConvectionProblem(std::shared_ptr fvGridGeometry) + ThreePNIConvectionProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { //initialize fluid system diff --git a/test/porousmediumflow/3p/implicit/infiltration/main.cc b/test/porousmediumflow/3p/implicit/infiltration/main.cc index 7226c3ae8f..2a24e03a46 100644 --- a/test/porousmediumflow/3p/implicit/infiltration/main.cc +++ b/test/porousmediumflow/3p/implicit/infiltration/main.cc @@ -109,8 +109,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/3p/implicit/infiltration/problem.hh b/test/porousmediumflow/3p/implicit/infiltration/problem.hh index 699f999cef..226118fa6d 100644 --- a/test/porousmediumflow/3p/implicit/infiltration/problem.hh +++ b/test/porousmediumflow/3p/implicit/infiltration/problem.hh @@ -83,9 +83,9 @@ public: template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = InfiltrationThreePSpatialParams; + using type = InfiltrationThreePSpatialParams; }; }// end namespace Properties @@ -141,13 +141,13 @@ class InfiltrationThreePProblem : public PorousMediumFlowProblem using NumEqVector = GetPropType; using BoundaryTypes = GetPropType; using FluidSystem = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - InfiltrationThreePProblem(std::shared_ptr fvGridGeometry) + InfiltrationThreePProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { temperature_ = 273.15 + 10.0; // -> 10 degrees Celsius diff --git a/test/porousmediumflow/3p/implicit/infiltration/spatialparams.hh b/test/porousmediumflow/3p/implicit/infiltration/spatialparams.hh index 8b499b675c..db13edc0fb 100644 --- a/test/porousmediumflow/3p/implicit/infiltration/spatialparams.hh +++ b/test/porousmediumflow/3p/implicit/infiltration/spatialparams.hh @@ -39,17 +39,17 @@ namespace Dumux { * \ingroup ThreePTests * \brief Definition of the spatial parameters for the infiltration problem */ -template +template class InfiltrationThreePSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; using GlobalPosition = typename SubControlVolume::GlobalPosition; @@ -63,7 +63,7 @@ public: using MaterialLaw = EffToAbsLaw; using MaterialLawParams = typename MaterialLaw::Params; - InfiltrationThreePSpatialParams(std::shared_ptr fvGridGeometry) + InfiltrationThreePSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // intrinsic permeabilities diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/main.cc b/test/porousmediumflow/3p3c/implicit/columnxylol/main.cc index 32d93ba26f..6b88ed62dc 100644 --- a/test/porousmediumflow/3p3c/implicit/columnxylol/main.cc +++ b/test/porousmediumflow/3p3c/implicit/columnxylol/main.cc @@ -107,8 +107,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh b/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh index 8cea3a60ca..d6510a0a59 100644 --- a/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh +++ b/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh @@ -95,9 +95,9 @@ public: template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = ColumnSpatialParams; + using type = ColumnSpatialParams; }; } // end namespace Properties @@ -161,12 +161,12 @@ class ColumnProblem : public PorousMediumFlowProblem using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; using FVElementGeometry = typename GetPropType::LocalView; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; public: - ColumnProblem(std::shared_ptr fvGridGeometry) + ColumnProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { FluidSystem::init(); diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/spatialparams.hh b/test/porousmediumflow/3p3c/implicit/columnxylol/spatialparams.hh index cb2b187527..6fb15ea397 100644 --- a/test/porousmediumflow/3p3c/implicit/columnxylol/spatialparams.hh +++ b/test/porousmediumflow/3p3c/implicit/columnxylol/spatialparams.hh @@ -36,18 +36,18 @@ namespace Dumux { * \ingroup ThreePThreeCModel * \brief Definition of the spatial parameters for the column problem. */ -template +template class ColumnSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; using GlobalPosition = typename SubControlVolume::GlobalPosition; using EffectiveLaw = RegularizedParkerVanGen3P; @@ -57,7 +57,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = Scalar; - ColumnSpatialParams(std::shared_ptr fvGridGeometry) + ColumnSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // intrinsic permeabilities diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/main.cc b/test/porousmediumflow/3p3c/implicit/infiltration/main.cc index 32d93ba26f..6b88ed62dc 100644 --- a/test/porousmediumflow/3p3c/implicit/infiltration/main.cc +++ b/test/porousmediumflow/3p3c/implicit/infiltration/main.cc @@ -107,8 +107,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh b/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh index 35e4691d94..99dfcbc5c7 100644 --- a/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh +++ b/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh @@ -66,9 +66,9 @@ struct Problem { using type = Infiltrat template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = InfiltrationThreePThreeCSpatialParams; + using type = InfiltrationThreePThreeCSpatialParams; }; // Set the fluid system @@ -138,13 +138,13 @@ class InfiltrationThreePThreeCProblem : public PorousMediumFlowProblem using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; using BoundaryTypes = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - InfiltrationThreePThreeCProblem(std::shared_ptr fvGridGeometry) + InfiltrationThreePThreeCProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { temperature_ = 273.15 + 10.0; // -> 10 degrees Celsius diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/spatialparams.hh b/test/porousmediumflow/3p3c/implicit/infiltration/spatialparams.hh index fbb20acded..d9c74b0bf5 100644 --- a/test/porousmediumflow/3p3c/implicit/infiltration/spatialparams.hh +++ b/test/porousmediumflow/3p3c/implicit/infiltration/spatialparams.hh @@ -39,17 +39,17 @@ namespace Dumux { * \ingroup ThreePThreeCTests * \brief Definition of the spatial parameters for the infiltration problem */ -template +template class InfiltrationThreePThreeCSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; using EffectiveLaw = RegularizedParkerVanGen3P; @@ -60,7 +60,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = Scalar; - InfiltrationThreePThreeCSpatialParams(std::shared_ptr fvGridGeometry) + InfiltrationThreePThreeCSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // intrinsic permeabilities diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/main.cc b/test/porousmediumflow/3p3c/implicit/kuevette/main.cc index 32d93ba26f..6b88ed62dc 100644 --- a/test/porousmediumflow/3p3c/implicit/kuevette/main.cc +++ b/test/porousmediumflow/3p3c/implicit/kuevette/main.cc @@ -107,8 +107,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh b/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh index f73ab7dfa0..752d26f862 100644 --- a/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh +++ b/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh @@ -72,9 +72,9 @@ struct Problem { using type = KuevetteProblem; template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = KuevetteSpatialParams; + using type = KuevetteSpatialParams; }; // Set the fluid system @@ -145,7 +145,7 @@ class KuevetteProblem : public PorousMediumFlowProblem using NumEqVector = GetPropType; using BoundaryTypes = GetPropType; using Element = typename GridView::template Codim<0>::Entity; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using GridVariables = GetPropType; using ElementVolumeVariables = typename GridVariables::GridVolumeVariables::LocalView; @@ -155,7 +155,7 @@ class KuevetteProblem : public PorousMediumFlowProblem using GlobalPosition = typename SubControlVolumeFace::GlobalPosition; public: - KuevetteProblem(std::shared_ptr fvGridGeometry) + KuevetteProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { FluidSystem::init(); diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/spatialparams.hh b/test/porousmediumflow/3p3c/implicit/kuevette/spatialparams.hh index d901cb3c07..3ae61646f2 100644 --- a/test/porousmediumflow/3p3c/implicit/kuevette/spatialparams.hh +++ b/test/porousmediumflow/3p3c/implicit/kuevette/spatialparams.hh @@ -39,18 +39,18 @@ namespace Dumux { * \ingroup ThreePThreeCTests * \brief Definition of the spatial parameters for the kuevette problem */ -template +template class KuevetteSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; using GlobalPosition = typename SubControlVolume::GlobalPosition; @@ -61,7 +61,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = Scalar; - KuevetteSpatialParams(std::shared_ptr fvGridGeometry) + KuevetteSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // intrinsic permeabilities diff --git a/test/porousmediumflow/3pwateroil/implicit/main.cc b/test/porousmediumflow/3pwateroil/implicit/main.cc index 13fe934e55..eb8f4b99a4 100644 --- a/test/porousmediumflow/3pwateroil/implicit/main.cc +++ b/test/porousmediumflow/3pwateroil/implicit/main.cc @@ -107,8 +107,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/3pwateroil/implicit/problem.hh b/test/porousmediumflow/3pwateroil/implicit/problem.hh index 448a3d2ec0..861806972b 100644 --- a/test/porousmediumflow/3pwateroil/implicit/problem.hh +++ b/test/porousmediumflow/3pwateroil/implicit/problem.hh @@ -62,9 +62,9 @@ struct Problem { using type = Dumux::SagdProblem; template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = SagdSpatialParams; + using type = SagdSpatialParams; }; // Set the fluid system @@ -99,7 +99,7 @@ class SagdProblem : public PorousMediumFlowProblem { using ParentType = PorousMediumFlowProblem; using GridView = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; using FluidSystem = GetPropType; using Indices = typename GetPropType::Indices; @@ -136,7 +136,7 @@ class SagdProblem : public PorousMediumFlowProblem public: - SagdProblem(std::shared_ptr fvGridGeometry) + SagdProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), pOut_(4e6) { maxDepth_ = 400.0; // [m] diff --git a/test/porousmediumflow/3pwateroil/implicit/spatialparams.hh b/test/porousmediumflow/3pwateroil/implicit/spatialparams.hh index 543d2dd099..61adfae29b 100644 --- a/test/porousmediumflow/3pwateroil/implicit/spatialparams.hh +++ b/test/porousmediumflow/3pwateroil/implicit/spatialparams.hh @@ -40,13 +40,13 @@ namespace Dumux { * \ingroup ThreePWaterOilTests * \brief Definition of the spatial parameters for the SAGD problem */ -template +template class SagdSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; enum { dimWorld=GridView::dimensionworld }; @@ -54,8 +54,8 @@ class SagdSpatialParams using GlobalPosition = typename SubControlVolume::GlobalPosition; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; using EffectiveLaw = RegularizedParkerVanGen3P; @@ -64,7 +64,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = Scalar; - SagdSpatialParams(std::shared_ptr fvGridGeometry) + SagdSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), eps_(1e-6) { layerBottom_ = 35.0; diff --git a/test/porousmediumflow/co2/implicit/main.cc b/test/porousmediumflow/co2/implicit/main.cc index cdbc9af8b5..55f579dac8 100644 --- a/test/porousmediumflow/co2/implicit/main.cc +++ b/test/porousmediumflow/co2/implicit/main.cc @@ -79,8 +79,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the spatial parameters diff --git a/test/porousmediumflow/co2/implicit/problem.hh b/test/porousmediumflow/co2/implicit/problem.hh index 46e7a10a9c..ce0f819baa 100644 --- a/test/porousmediumflow/co2/implicit/problem.hh +++ b/test/porousmediumflow/co2/implicit/problem.hh @@ -205,7 +205,7 @@ class HeterogeneousProblem : public PorousMediumFlowProblem using BoundaryTypes = GetPropType; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using SubControlVolume = typename FVElementGeometry::SubControlVolume; @@ -223,7 +223,7 @@ class HeterogeneousProblem : public PorousMediumFlowProblem public: template - HeterogeneousProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams) + HeterogeneousProblem(std::shared_ptr fvGridGeometry, std::shared_ptr spatialParams) : ParentType(fvGridGeometry, spatialParams) , injectionTop_(1) , injectionBottom_(2) diff --git a/test/porousmediumflow/co2/implicit/spatialparams.hh b/test/porousmediumflow/co2/implicit/spatialparams.hh index 278289e223..b37079e7fc 100644 --- a/test/porousmediumflow/co2/implicit/spatialparams.hh +++ b/test/porousmediumflow/co2/implicit/spatialparams.hh @@ -42,18 +42,18 @@ namespace Dumux { * problem which uses the non-isothermal or isothermal CO2 * fully implicit model. */ -template +template class HeterogeneousSpatialParams -: public FVSpatialParams> + HeterogeneousSpatialParams> { - using Grid = typename FVGridGeometry::Grid; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using Grid = typename GridGeometry::Grid; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; using GlobalPosition = typename SubControlVolume::GlobalPosition; @@ -64,7 +64,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = Scalar; - HeterogeneousSpatialParams(std::shared_ptr fvGridGeometry, + HeterogeneousSpatialParams(std::shared_ptr fvGridGeometry, std::shared_ptr> gridData) : ParentType(fvGridGeometry), gridData_(gridData) { diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc index af5d82834f..610e9e6d2a 100644 --- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc +++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/main.cc @@ -111,8 +111,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh index d70f84ffbd..374ce741bb 100644 --- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh +++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh @@ -73,9 +73,9 @@ struct Problem { using type = MPNCComparisonProbl template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = MPNCComparisonSpatialParams; + using type = MPNCComparisonSpatialParams; }; // Set fluid configuration @@ -118,7 +118,7 @@ class MPNCComparisonProblem using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GridView = GetPropType; using Element = typename GridView::template Codim<0>::Entity; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FluidState = GetPropType; using ParameterCache = typename FluidSystem::ParameterCache; @@ -137,7 +137,7 @@ class MPNCComparisonProblem static constexpr bool isBox = GetPropType::discMethod == DiscretizationMethod::box; public: - MPNCComparisonProblem(std::shared_ptr fvGridGeometry) + MPNCComparisonProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { 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 f78aaa105f..cac4a0c330 100644 --- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/spatialparams.hh +++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/spatialparams.hh @@ -39,18 +39,18 @@ namespace Dumux { * \brief Definition of the spatial params properties for the obstacle problem * */ -template +template class MPNCComparisonSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; using GlobalPosition = typename SubControlVolume::GlobalPosition; using EffectiveLaw = RegularizedBrooksCorey; @@ -60,7 +60,7 @@ public: using MaterialLaw = EffToAbsLaw; using MaterialLawParams = typename MaterialLaw::Params; - MPNCComparisonSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) + MPNCComparisonSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // intrinsic permeabilities coarseK_ = 1e-12; diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/main.cc b/test/porousmediumflow/mpnc/implicit/kinetic/main.cc index 104d5baa29..c3bc2cfdc5 100644 --- a/test/porousmediumflow/mpnc/implicit/kinetic/main.cc +++ b/test/porousmediumflow/mpnc/implicit/kinetic/main.cc @@ -108,8 +108,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh index 092879eea3..718f5cb03b 100644 --- a/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh +++ b/test/porousmediumflow/mpnc/implicit/kinetic/spatialparams.hh @@ -46,17 +46,17 @@ namespace Dumux { /** * \brief Definition of the spatial parameters for the evaporation atmosphere Problem (using a "poor man's coupling") */ -template +template class EvaporationAtmosphereSpatialParams -: public FVNonEquilibriumSpatialParams> +: public FVNonEquilibriumSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ThisType = EvaporationAtmosphereSpatialParams; - using ParentType = FVNonEquilibriumSpatialParams; + using ThisType = EvaporationAtmosphereSpatialParams; + using ParentType = FVNonEquilibriumSpatialParams; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -81,7 +81,7 @@ public: using AwsSurfaceParams = typename AwsSurface::Params; using AnsSurfaceParams = typename AnsSurface::Params; - EvaporationAtmosphereSpatialParams(std::shared_ptr fvGridGeometry) + EvaporationAtmosphereSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { heightPM_ = getParam>("Grid.Positions1")[1]; diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/main.cc b/test/porousmediumflow/mpnc/implicit/obstacle/main.cc index af5d82834f..610e9e6d2a 100644 --- a/test/porousmediumflow/mpnc/implicit/obstacle/main.cc +++ b/test/porousmediumflow/mpnc/implicit/obstacle/main.cc @@ -111,8 +111,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh index c70f1bdc7d..1a494e4ff0 100644 --- a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh +++ b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh @@ -76,9 +76,9 @@ struct Problem { using type = ObstacleProblem; template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = ObstacleSpatialParams; + using type = ObstacleSpatialParams; }; // Set fluid configuration @@ -139,7 +139,7 @@ class ObstacleProblem using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using GridView = GetPropType; using Element = typename GridView::template Codim<0>::Entity; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using FluidState = GetPropType; using ParameterCache = typename FluidSystem::ParameterCache; @@ -161,7 +161,7 @@ class ObstacleProblem using PhaseVector = Dune::FieldVector; public: - ObstacleProblem(std::shared_ptr fvGridGeometry) + ObstacleProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { 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 fee0f4d77a..f123a03d22 100644 --- a/test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh +++ b/test/porousmediumflow/mpnc/implicit/obstacle/spatialparams.hh @@ -37,17 +37,17 @@ namespace Dumux { * \brief Definition of the spatial params properties for the obstacle problem. * */ -template +template class ObstacleSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; enum {dimWorld=GridView::dimensionworld}; using GlobalPosition = typename SubControlVolume::GlobalPosition; @@ -60,7 +60,7 @@ public: using MaterialLaw = EffToAbsLaw; using MaterialLawParams = typename MaterialLaw::Params; - ObstacleSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) + ObstacleSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // intrinsic permeabilities coarseK_ = 1e-12; diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc index e7e39d7220..673229c28a 100644 --- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc +++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/main.cc @@ -108,8 +108,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh index e02efcdd6f..70fe4bcc15 100644 --- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh +++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/spatialparams.hh @@ -42,17 +42,17 @@ namespace Dumux { /** * \brief Definition of the spatial parameters for the one component combustion problem */ -template +template class CombustionSpatialParams -: public FVNonEquilibriumSpatialParams> +: public FVNonEquilibriumSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ThisType = CombustionSpatialParams; - using ParentType = FVNonEquilibriumSpatialParams; + using ThisType = CombustionSpatialParams; + using ParentType = FVNonEquilibriumSpatialParams; enum {dimWorld = GridView::dimensionworld}; using GlobalPosition = typename SubControlVolume::GlobalPosition; @@ -67,7 +67,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using FluidSolidInterfacialAreaFormulation = FluidSolidInterfacialAreaShiWang; - CombustionSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) + CombustionSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // this is the parameter value from file part porosity_ = getParam("SpatialParams.PorousMedium.porosity"); diff --git a/test/porousmediumflow/richards/implicit/analytical/main.cc b/test/porousmediumflow/richards/implicit/analytical/main.cc index 13f69c103f..1d2d805cd9 100644 --- a/test/porousmediumflow/richards/implicit/analytical/main.cc +++ b/test/porousmediumflow/richards/implicit/analytical/main.cc @@ -105,8 +105,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/richards/implicit/analytical/problem.hh b/test/porousmediumflow/richards/implicit/analytical/problem.hh index 03620950b6..65ec54aa06 100644 --- a/test/porousmediumflow/richards/implicit/analytical/problem.hh +++ b/test/porousmediumflow/richards/implicit/analytical/problem.hh @@ -79,9 +79,9 @@ struct Problem { using type = RichardsAnalyti template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = RichardsAnalyticalSpatialParams; + using type = RichardsAnalyticalSpatialParams; }; } // end namespace Properties @@ -110,7 +110,7 @@ class RichardsAnalyticalProblem : public PorousMediumFlowProblem using NumEqVector = GetPropType; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using SolutionVector = GetPropType; enum { // copy some indices for convenience @@ -125,7 +125,7 @@ class RichardsAnalyticalProblem : public PorousMediumFlowProblem using Geometry = typename GridView::template Codim<0>::Entity::Geometry; public: - RichardsAnalyticalProblem(std::shared_ptr fvGridGeometry) + RichardsAnalyticalProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { pnRef_ = 1e5; // air pressure diff --git a/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh b/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh index 7e941f4ac2..94036ca671 100644 --- a/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh +++ b/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh @@ -41,14 +41,14 @@ namespace Dumux { * \ingroup ImplicitTestProblems * \brief The spatial parameters for the RichardsAnalyticalProblem. */ -template +template class RichardsAnalyticalSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using ParentType = FVSpatialParams>; + using GridView = typename GridGeometry::GridView; + using ParentType = FVSpatialParams>; enum { dimWorld=GridView::dimensionworld }; using Element = typename GridView::template Codim<0>::Entity; @@ -64,7 +64,7 @@ public: // export permeability type using PermeabilityType = Scalar; - RichardsAnalyticalSpatialParams(std::shared_ptr fvGridGeometry) + RichardsAnalyticalSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { K_ = 5e-12; diff --git a/test/porousmediumflow/richards/implicit/lens/main.cc b/test/porousmediumflow/richards/implicit/lens/main.cc index 868611ddb6..1b69831cf2 100644 --- a/test/porousmediumflow/richards/implicit/lens/main.cc +++ b/test/porousmediumflow/richards/implicit/lens/main.cc @@ -85,8 +85,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/richards/implicit/lens/problem.hh b/test/porousmediumflow/richards/implicit/lens/problem.hh index 3dbb14b98f..f689ed692c 100644 --- a/test/porousmediumflow/richards/implicit/lens/problem.hh +++ b/test/porousmediumflow/richards/implicit/lens/problem.hh @@ -118,7 +118,7 @@ class RichardsLensProblem : public PorousMediumFlowProblem using NumEqVector = GetPropType; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; enum { // copy some indices for convenience pressureIdx = Indices::pressureIdx, @@ -133,7 +133,7 @@ class RichardsLensProblem : public PorousMediumFlowProblem using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - RichardsLensProblem(std::shared_ptr fvGridGeometry) + RichardsLensProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { name_ = getParam("Problem.Name"); diff --git a/test/porousmediumflow/richards/implicit/lens/spatialparams.hh b/test/porousmediumflow/richards/implicit/lens/spatialparams.hh index 960739e5cc..d804f09e61 100644 --- a/test/porousmediumflow/richards/implicit/lens/spatialparams.hh +++ b/test/porousmediumflow/richards/implicit/lens/spatialparams.hh @@ -37,14 +37,14 @@ namespace Dumux { * \ingroup RichardsTests * \brief The spatial parameters for the RichardsLensProblem. */ -template +template class RichardsLensSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using ThisType = RichardsLensSpatialParams; - using ParentType = FVSpatialParams; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using ThisType = RichardsLensSpatialParams; + using ParentType = FVSpatialParams; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -57,7 +57,7 @@ public: // export permeability type using PermeabilityType = Scalar; - RichardsLensSpatialParams(std::shared_ptr fvGridGeometry) + RichardsLensSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc index 15b210a109..f050cffb18 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc +++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc @@ -105,8 +105,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh index bbf972c8d8..3b982ffe59 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh +++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh @@ -73,9 +73,9 @@ struct FluidSystem { using type = FluidSyst template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = RichardsNISpatialParams; + using type = RichardsNISpatialParams; }; } // end namespace Properties @@ -108,7 +108,7 @@ class RichardsNIConductionProblem :public PorousMediumFlowProblem using GridView = GetPropType; using Scalar = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using PrimaryVariables = GetPropType; using FluidSystem = GetPropType; using BoundaryTypes = GetPropType; @@ -133,7 +133,7 @@ class RichardsNIConductionProblem :public PorousMediumFlowProblem using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - RichardsNIConductionProblem(std::shared_ptr fvGridGeometry) + RichardsNIConductionProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { //initialize fluid system diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc b/test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc index 15b210a109..f050cffb18 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc +++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc @@ -105,8 +105,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh index 557f23e79f..f911940436 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh +++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh @@ -74,9 +74,9 @@ struct FluidSystem { using type = FluidSyst template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = RichardsNISpatialParams; + using type = RichardsNISpatialParams; }; } // end namespace Properties @@ -111,7 +111,7 @@ class RichardsNIConvectionProblem : public PorousMediumFlowProblem using GridView = GetPropType; using Scalar = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; using FluidSystem = GetPropType; @@ -141,7 +141,7 @@ class RichardsNIConvectionProblem : public PorousMediumFlowProblem using GlobalPosition = typename SubControlVolumeFace::GlobalPosition; public: - RichardsNIConvectionProblem(std::shared_ptr fvGridGeometry) + RichardsNIConvectionProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // initialize fluid system diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc index c272af7188..f5f26f2dd1 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc +++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc @@ -79,8 +79,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh index bc9a28d6fa..b40e3b6de0 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh +++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh @@ -72,9 +72,9 @@ struct FluidSystem { using type = FluidSys template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = RichardsNISpatialParams; + using type = RichardsNISpatialParams; }; template @@ -100,9 +100,9 @@ class RichardsNIEvaporationProblem : public PorousMediumFlowProblem using GridView = GetPropType; using Scalar = GetPropType; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; using PrimaryVariables = GetPropType; using NumEqVector = GetPropType; using FluidSystem = GetPropType; @@ -130,7 +130,7 @@ class RichardsNIEvaporationProblem : public PorousMediumFlowProblem using GlobalPosition = typename SubControlVolumeFace::GlobalPosition; public: - RichardsNIEvaporationProblem(std::shared_ptr fvGridGeometry) + RichardsNIEvaporationProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // initialize fluid system diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh b/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh index 93c5c9f805..09fd0e6850 100644 --- a/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh +++ b/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh @@ -33,17 +33,17 @@ namespace Dumux { -template +template class RichardsNISpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; enum { dimWorld=GridView::dimensionworld }; @@ -58,7 +58,7 @@ public: using MaterialLaw = EffToAbsLaw; using MaterialLawParams = typename MaterialLaw::Params; - RichardsNISpatialParams(std::shared_ptr fvGridGeometry) + RichardsNISpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { permeability_ = 1e-10; diff --git a/test/porousmediumflow/richardsnc/implicit/main.cc b/test/porousmediumflow/richardsnc/implicit/main.cc index 495346abe6..a594379949 100644 --- a/test/porousmediumflow/richardsnc/implicit/main.cc +++ b/test/porousmediumflow/richardsnc/implicit/main.cc @@ -105,8 +105,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/richardsnc/implicit/problem.hh b/test/porousmediumflow/richardsnc/implicit/problem.hh index 6fc6476eca..429e1a779e 100644 --- a/test/porousmediumflow/richardsnc/implicit/problem.hh +++ b/test/porousmediumflow/richardsnc/implicit/problem.hh @@ -69,9 +69,9 @@ struct Problem { using type = RichardsWellTra template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = RichardsWellTracerSpatialParams; + using type = RichardsWellTracerSpatialParams; }; // Set the physical problem to be solved @@ -121,7 +121,7 @@ class RichardsWellTracerProblem : public PorousMediumFlowProblem using FluidSystem = GetPropType; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using SolutionVector = GetPropType; using GridVariables = GetPropType; enum { @@ -134,7 +134,7 @@ class RichardsWellTracerProblem : public PorousMediumFlowProblem using GlobalPosition = typename SubControlVolume::GlobalPosition; public: - RichardsWellTracerProblem(std::shared_ptr fvGridGeometry) + RichardsWellTracerProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { name_ = getParam("Problem.Name"); diff --git a/test/porousmediumflow/richardsnc/implicit/spatialparams.hh b/test/porousmediumflow/richardsnc/implicit/spatialparams.hh index b99dcc7c42..4878489ec5 100644 --- a/test/porousmediumflow/richardsnc/implicit/spatialparams.hh +++ b/test/porousmediumflow/richardsnc/implicit/spatialparams.hh @@ -41,14 +41,14 @@ namespace Dumux { * \ingroup ImplicitTestProblems * \brief The spatial parameters for the RichardsWellTracerProblem. */ -template +template class RichardsWellTracerSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using ParentType = FVSpatialParams>; + using GridView = typename GridGeometry::GridView; + using ParentType = FVSpatialParams>; enum { dimWorld=GridView::dimensionworld }; using Element = typename GridView::template Codim<0>::Entity; @@ -62,7 +62,7 @@ public: // export permeability type using PermeabilityType = Scalar; - RichardsWellTracerSpatialParams(std::shared_ptr fvGridGeometry) + RichardsWellTracerSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { diff --git a/test/porousmediumflow/solidenergy/main.cc b/test/porousmediumflow/solidenergy/main.cc index ac220e80ea..43ae5042b1 100644 --- a/test/porousmediumflow/solidenergy/main.cc +++ b/test/porousmediumflow/solidenergy/main.cc @@ -70,9 +70,9 @@ struct Problem { using type = SolidEnergyProblem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = SolidEnergySpatialParams; + using type = SolidEnergySpatialParams; }; } // end namespace Properties @@ -107,8 +107,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/solidenergy/problem.hh b/test/porousmediumflow/solidenergy/problem.hh index 9b150b3313..896b4243f9 100644 --- a/test/porousmediumflow/solidenergy/problem.hh +++ b/test/porousmediumflow/solidenergy/problem.hh @@ -52,14 +52,14 @@ class SolidEnergyProblem : public PorousMediumFlowProblem using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; - using FVGridGeometry = GetPropType; - using FVElementGeometry = typename FVGridGeometry::LocalView; - using SubControlVolume = typename FVGridGeometry::SubControlVolume; - using SubControlVolumeFace = typename FVGridGeometry::SubControlVolumeFace; + using GridGeometry = GetPropType; + using FVElementGeometry = typename GridGeometry::LocalView; + using SubControlVolume = typename GridGeometry::SubControlVolume; + using SubControlVolumeFace = typename GridGeometry::SubControlVolumeFace; using PointSource = GetPropType; public: - SolidEnergyProblem(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") + SolidEnergyProblem(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") : ParentType(fvGridGeometry, paramGroup) { name_ = getParam("Problem.Name"); diff --git a/test/porousmediumflow/solidenergy/spatialparams.hh b/test/porousmediumflow/solidenergy/spatialparams.hh index 19f8c889eb..7090dee1a5 100644 --- a/test/porousmediumflow/solidenergy/spatialparams.hh +++ b/test/porousmediumflow/solidenergy/spatialparams.hh @@ -32,20 +32,20 @@ namespace Dumux { * \ingroup OnePTests * \brief Definition of the spatial parameters for the solid energy test */ -template +template class SolidEnergySpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using ParentType = FVSpatialParamsOneP>; + using GridView = typename GridGeometry::GridView; + using ParentType = FVSpatialParamsOneP>; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - SolidEnergySpatialParams(std::shared_ptr fvGridGeometry) + SolidEnergySpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} /*! diff --git a/test/porousmediumflow/tracer/1ptracer/main.cc b/test/porousmediumflow/tracer/1ptracer/main.cc index 648d4c3166..b6ee7b9578 100644 --- a/test/porousmediumflow/tracer/1ptracer/main.cc +++ b/test/porousmediumflow/tracer/1ptracer/main.cc @@ -87,8 +87,8 @@ int main(int argc, char** argv) try Dune::Timer timer; //! create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); //! the problem (boundary conditions) diff --git a/test/porousmediumflow/tracer/1ptracer/problem_1p.hh b/test/porousmediumflow/tracer/1ptracer/problem_1p.hh index 9cffe1e24d..f559e045bc 100644 --- a/test/porousmediumflow/tracer/1ptracer/problem_1p.hh +++ b/test/porousmediumflow/tracer/1ptracer/problem_1p.hh @@ -63,9 +63,9 @@ struct Problem { using type = OnePTestProblem template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = OnePTestSpatialParams; + using type = OnePTestSpatialParams; }; template @@ -98,13 +98,13 @@ class OnePTestProblem : public PorousMediumFlowProblem using PrimaryVariables = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; static constexpr int dimWorld = GridView::dimensionworld; public: - OnePTestProblem(std::shared_ptr fvGridGeometry) + OnePTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} /*! diff --git a/test/porousmediumflow/tracer/1ptracer/problem_tracer.hh b/test/porousmediumflow/tracer/1ptracer/problem_tracer.hh index df41db777b..8606b53f28 100644 --- a/test/porousmediumflow/tracer/1ptracer/problem_tracer.hh +++ b/test/porousmediumflow/tracer/1ptracer/problem_tracer.hh @@ -71,9 +71,9 @@ struct Problem { using type = TracerTestProblem struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = TracerTestSpatialParams; + using type = TracerTestSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -153,7 +153,7 @@ class TracerTestProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; using GridView = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; using FluidSystem = GetPropType; @@ -162,11 +162,11 @@ class TracerTestProblem : public PorousMediumFlowProblem //! property that defines whether mole or mass fractions are used static constexpr bool useMoles = getPropValue(); - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - TracerTestProblem(std::shared_ptr fvGridGeom) + TracerTestProblem(std::shared_ptr fvGridGeom) : ParentType(fvGridGeom) { // stating in the console whether mole or mass fractions are used diff --git a/test/porousmediumflow/tracer/1ptracer/spatialparams_1p.hh b/test/porousmediumflow/tracer/1ptracer/spatialparams_1p.hh index b5ba7b3e42..4d4237bbac 100644 --- a/test/porousmediumflow/tracer/1ptracer/spatialparams_1p.hh +++ b/test/porousmediumflow/tracer/1ptracer/spatialparams_1p.hh @@ -35,24 +35,24 @@ namespace Dumux { * \ingroup TracerTests * \brief The spatial parameters for the incompressible test */ -template +template class OnePTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename SubControlVolume::GlobalPosition; public: using PermeabilityType = Scalar; - OnePTestSpatialParams(std::shared_ptr fvGridGeometry) + OnePTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), K_(fvGridGeometry->gridView().size(0), 0.0) { permeability_ = getParam("SpatialParams.Permeability"); diff --git a/test/porousmediumflow/tracer/1ptracer/spatialparams_tracer.hh b/test/porousmediumflow/tracer/1ptracer/spatialparams_tracer.hh index 08760fed12..053c4ebdc2 100644 --- a/test/porousmediumflow/tracer/1ptracer/spatialparams_tracer.hh +++ b/test/porousmediumflow/tracer/1ptracer/spatialparams_tracer.hh @@ -34,25 +34,25 @@ namespace Dumux { * \ingroup TracerTests * \brief Definition of the spatial parameters for the tracer problem */ -template +template class TracerTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; static const int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Dune::FieldVector; public: - TracerTestSpatialParams(std::shared_ptr fvGridGeometry) + TracerTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} /*! diff --git a/test/porousmediumflow/tracer/2ptracer/main.cc b/test/porousmediumflow/tracer/2ptracer/main.cc index 0b5843a00a..15eb8dfde8 100644 --- a/test/porousmediumflow/tracer/2ptracer/main.cc +++ b/test/porousmediumflow/tracer/2ptracer/main.cc @@ -92,8 +92,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/tracer/2ptracer/problem_tracer.hh b/test/porousmediumflow/tracer/2ptracer/problem_tracer.hh index 3bf09f5193..61a23010bd 100644 --- a/test/porousmediumflow/tracer/2ptracer/problem_tracer.hh +++ b/test/porousmediumflow/tracer/2ptracer/problem_tracer.hh @@ -60,9 +60,9 @@ struct Problem { using type = TwoPTracerTestProbl template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = TwoPTracerTestSpatialParams; + using type = TwoPTracerTestSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -140,7 +140,7 @@ class TwoPTracerTestProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; using GridView = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; using FluidSystem = GetPropType; @@ -149,11 +149,11 @@ class TwoPTracerTestProblem : public PorousMediumFlowProblem //! property that defines whether mole or mass fractions are used static constexpr bool useMoles = getPropValue(); - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - TwoPTracerTestProblem(std::shared_ptr fvGridGeometry) + TwoPTracerTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // stating in the console whether mole or mass fractions are used diff --git a/test/porousmediumflow/tracer/2ptracer/spatialparams_tracer.hh b/test/porousmediumflow/tracer/2ptracer/spatialparams_tracer.hh index 1ec8d2e11b..95187219c2 100644 --- a/test/porousmediumflow/tracer/2ptracer/spatialparams_tracer.hh +++ b/test/porousmediumflow/tracer/2ptracer/spatialparams_tracer.hh @@ -34,18 +34,18 @@ namespace Dumux { * \ingroup TracerTests * \brief Definition of the spatial parameters for the tracer problem */ -template +template class TwoPTracerTestSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParams>; + using ParentType = FVSpatialParams>; static const int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Dune::FieldVector; @@ -53,7 +53,7 @@ class TwoPTracerTestSpatialParams public: - TwoPTracerTestSpatialParams(std::shared_ptr fvGridGeometry) + TwoPTracerTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} /*! diff --git a/test/porousmediumflow/tracer/constvel/main.cc b/test/porousmediumflow/tracer/constvel/main.cc index 5933998f94..c14ae6f0ec 100644 --- a/test/porousmediumflow/tracer/constvel/main.cc +++ b/test/porousmediumflow/tracer/constvel/main.cc @@ -76,8 +76,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); //! create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); //! the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/tracer/constvel/problem.hh b/test/porousmediumflow/tracer/constvel/problem.hh index 41a145585c..36de5ada79 100644 --- a/test/porousmediumflow/tracer/constvel/problem.hh +++ b/test/porousmediumflow/tracer/constvel/problem.hh @@ -79,9 +79,9 @@ struct Problem { using type = TracerTest; }; template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = TracerTestSpatialParams; + using type = TracerTestSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -178,7 +178,7 @@ class TracerTest : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; using GridView = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; using FluidSystem = GetPropType; @@ -186,11 +186,11 @@ class TracerTest : public PorousMediumFlowProblem //! property that defines whether mole or mass fractions are used static constexpr bool useMoles = getPropValue(); - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - TracerTest(std::shared_ptr fvGridGeom) + TracerTest(std::shared_ptr fvGridGeom) : ParentType(fvGridGeom) { // stating in the console whether mole or mass fractions are used diff --git a/test/porousmediumflow/tracer/constvel/spatialparams.hh b/test/porousmediumflow/tracer/constvel/spatialparams.hh index 77551dbd89..eb0f1682bc 100644 --- a/test/porousmediumflow/tracer/constvel/spatialparams.hh +++ b/test/porousmediumflow/tracer/constvel/spatialparams.hh @@ -34,25 +34,25 @@ namespace Dumux { * \ingroup TracerTests * \brief Definition of the spatial parameters for the tracer problem. */ -template +template class TracerTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; static const int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Dune::FieldVector; public: - TracerTestSpatialParams(std::shared_ptr fvGridGeometry) + TracerTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} /*! diff --git a/test/porousmediumflow/tracer/multicomp/main.cc b/test/porousmediumflow/tracer/multicomp/main.cc index 6b9e500ab7..759f890fa9 100644 --- a/test/porousmediumflow/tracer/multicomp/main.cc +++ b/test/porousmediumflow/tracer/multicomp/main.cc @@ -111,8 +111,8 @@ int main(int argc, char** argv) try const auto& leafGridView = gridManager.grid().leafGridView(); // create the finite volume grid geometry - using FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // the problem (initial and boundary conditions) diff --git a/test/porousmediumflow/tracer/multicomp/problem.hh b/test/porousmediumflow/tracer/multicomp/problem.hh index b1ec9294f5..458349e121 100644 --- a/test/porousmediumflow/tracer/multicomp/problem.hh +++ b/test/porousmediumflow/tracer/multicomp/problem.hh @@ -65,9 +65,9 @@ struct Problem { using type = MaxwellStefanTes template struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = MaxwellStefanTestSpatialParams; + using type = MaxwellStefanTestSpatialParams; }; // Define whether mole(true) or mass (false) fractions are used @@ -208,18 +208,18 @@ class MaxwellStefanTestProblem : public PorousMediumFlowProblem using NumEqVector = GetPropType; using FluidSystem = GetPropType; using SpatialParams = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using SolutionVector = GetPropType; using VolumeVariables = GetPropType; //! property that defines whether mole or mass fractions are used static constexpr bool useMoles = getPropValue(); - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - MaxwellStefanTestProblem(std::shared_ptr fvGridGeometry) + MaxwellStefanTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { name_ = getParam("Problem.Name"); diff --git a/test/porousmediumflow/tracer/multicomp/spatialparams.hh b/test/porousmediumflow/tracer/multicomp/spatialparams.hh index 4b4f010db1..dc371c833d 100644 --- a/test/porousmediumflow/tracer/multicomp/spatialparams.hh +++ b/test/porousmediumflow/tracer/multicomp/spatialparams.hh @@ -34,25 +34,25 @@ namespace Dumux { * \ingroup TracerTest * \brief Definition of the spatial parameters for the MaxwellStefan problem. */ -template +template class MaxwellStefanTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; static const int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Dune::FieldVector; public: - MaxwellStefanTestSpatialParams(std::shared_ptr fvGridGeometry) + MaxwellStefanTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} /*! -- GitLab From 57cdca8e8a89fe45c54a6c424be950ad13b0a0f6 Mon Sep 17 00:00:00 2001 From: Bernd Flemisch Date: Wed, 9 Oct 2019 12:30:01 +0200 Subject: [PATCH 2/7] [cleanup][examples] replace local names `FVGridGeometry` by `GridGeometry` --- examples/1ptracer/main.cc | 4 ++-- examples/1ptracer/problem_1p.hh | 8 ++++---- examples/1ptracer/problem_tracer.hh | 10 +++++----- examples/1ptracer/spatialparams_1p.hh | 16 ++++++++-------- examples/1ptracer/spatialparams_tracer.hh | 16 ++++++++-------- examples/2pinfiltration/main.cc | 4 ++-- examples/2pinfiltration/problem.hh | 8 ++++---- examples/2pinfiltration/spatialparams.hh | 14 +++++++------- examples/shallowwaterfriction/problem.hh | 10 +++++----- examples/shallowwaterfriction/spatialparams.hh | 16 ++++++++-------- 10 files changed, 53 insertions(+), 53 deletions(-) diff --git a/examples/1ptracer/main.cc b/examples/1ptracer/main.cc index ba44ca3f76..9baf89af4b 100644 --- a/examples/1ptracer/main.cc +++ b/examples/1ptracer/main.cc @@ -87,8 +87,8 @@ int main(int argc, char** argv) try // #### Set-up // 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 FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // In the problem, we define the boundary and initial conditions. diff --git a/examples/1ptracer/problem_1p.hh b/examples/1ptracer/problem_1p.hh index 82dd98a0cb..c56bab36eb 100644 --- a/examples/1ptracer/problem_1p.hh +++ b/examples/1ptracer/problem_1p.hh @@ -72,10 +72,10 @@ template struct SpatialParams { // We define convenient shortcuts to the properties `GridGeometry` and `Scalar`: - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; // Finally, we set the spatial parameters: - using type = OnePTestSpatialParams; + using type = OnePTestSpatialParams; }; // The local residual contains analytic derivative methods for incompressible flow: @@ -120,14 +120,14 @@ class OnePTestProblem : public PorousMediumFlowProblem using PrimaryVariables = GetPropType; using FVElementGeometry = typename GetPropType::LocalView; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; static constexpr int dimWorld = GridView::dimensionworld; public: // This is the constructor of our problem class: - OnePTestProblem(std::shared_ptr fvGridGeometry) + OnePTestProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} // First, we define the type of boundary conditions depending on location. Two types of boundary conditions diff --git a/examples/1ptracer/problem_tracer.hh b/examples/1ptracer/problem_tracer.hh index bebaa7abde..e7ced7bd19 100644 --- a/examples/1ptracer/problem_tracer.hh +++ b/examples/1ptracer/problem_tracer.hh @@ -73,9 +73,9 @@ struct Problem { using type = TracerTestProblem struct SpatialParams { - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; - using type = TracerTestSpatialParams; + using type = TracerTestSpatialParams; }; // We define that mass fractions are used to define the concentrations @@ -151,19 +151,19 @@ class TracerTestProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using Indices = typename GetPropType::Indices; using GridView = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using BoundaryTypes = GetPropType; using PrimaryVariables = GetPropType; using FluidSystem = GetPropType; using SpatialParams = GetPropType; - using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity; + using Element = typename GridGeometry::GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; //We create a bool saying whether mole or mass fractions are used static constexpr bool useMoles = getPropValue(); public: // This is the constructor of our problem class: - TracerTestProblem(std::shared_ptr fvGridGeom) + TracerTestProblem(std::shared_ptr fvGridGeom) : ParentType(fvGridGeom) { // We print out whether mole or mass fractions are used diff --git a/examples/1ptracer/spatialparams_1p.hh b/examples/1ptracer/spatialparams_1p.hh index 885f21d1ba..5096115b4c 100644 --- a/examples/1ptracer/spatialparams_1p.hh +++ b/examples/1ptracer/spatialparams_1p.hh @@ -34,25 +34,25 @@ namespace Dumux { // In the `OnePTestSpatialParams` class, we define all functions needed to describe the porous matrix, e.g. porosity and permeability for the 1p_problem. -template +template class OnePTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { // We introduce `using` declarations that are derived from the property system, which we need in this class. - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename SubControlVolume::GlobalPosition; public: using PermeabilityType = Scalar; - OnePTestSpatialParams(std::shared_ptr fvGridGeometry) + OnePTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry), K_(fvGridGeometry->gridView().size(0), 0.0) { // ### Generation of the random permeability field diff --git a/examples/1ptracer/spatialparams_tracer.hh b/examples/1ptracer/spatialparams_tracer.hh index 6a13799bde..3959ff40a3 100644 --- a/examples/1ptracer/spatialparams_tracer.hh +++ b/examples/1ptracer/spatialparams_tracer.hh @@ -33,25 +33,25 @@ namespace Dumux { // In the `TracerTestSpatialParams` class, we define all functions needed to describe spatially dependent parameters for the `tracer_problem`. -template +template class TracerTestSpatialParams -: public FVSpatialParamsOneP> +: public FVSpatialParamsOneP> { - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace; using Element = typename GridView::template Codim<0>::Entity; - using ParentType = FVSpatialParamsOneP>; + using ParentType = FVSpatialParamsOneP>; static const int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Dune::FieldVector; public: - TracerTestSpatialParams(std::shared_ptr fvGridGeometry) + TracerTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) {} // ### Properties of the porous matrix diff --git a/examples/2pinfiltration/main.cc b/examples/2pinfiltration/main.cc index 46b31e111b..471286b6fe 100644 --- a/examples/2pinfiltration/main.cc +++ b/examples/2pinfiltration/main.cc @@ -102,8 +102,8 @@ 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 FVGridGeometry = GetPropType; - auto fvGridGeometry = std::make_shared(leafGridView); + using GridGeometry = GetPropType; + auto fvGridGeometry = std::make_shared(leafGridView); fvGridGeometry->update(); // In the problem, we define the boundary and initial conditions. diff --git a/examples/2pinfiltration/problem.hh b/examples/2pinfiltration/problem.hh index 913962b7f8..34d35e08ed 100644 --- a/examples/2pinfiltration/problem.hh +++ b/examples/2pinfiltration/problem.hh @@ -106,11 +106,11 @@ namespace Dumux { { // We define convenient shortcuts to the properties GridGeometry and Scalar: private: - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using Scalar = GetPropType; // Finally we set the spatial parameters: public: - using type = TwoPTestSpatialParams; + using type = TwoPTestSpatialParams; }; // We enable caching for the grid volume variables, the grid flux variables and the FV grid geometry. The cache @@ -139,7 +139,7 @@ class PointSourceProblem : public PorousMediumFlowProblem using Scalar = GetPropType; using FluidSystem = GetPropType; using PrimaryVariables = GetPropType; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using PointSource = GetPropType; using BoundaryTypes = GetPropType; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -157,7 +157,7 @@ class PointSourceProblem : public PorousMediumFlowProblem public: // This is the constructor of our problem class: - PointSourceProblem(std::shared_ptr fvGridGeometry) + PointSourceProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // We read in the values for the initial condition of our simulation: diff --git a/examples/2pinfiltration/spatialparams.hh b/examples/2pinfiltration/spatialparams.hh index c261ac81e4..ec0402c039 100644 --- a/examples/2pinfiltration/spatialparams.hh +++ b/examples/2pinfiltration/spatialparams.hh @@ -32,17 +32,17 @@ namespace Dumux { //In the TwoPTestSpatialParams class we define all functions needed to describe the porous matrix, e.g. porosity and permeability -template +template class TwoPTestSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { //we introduce using declarations that are derived from the property system which we need in this class - using GridView = typename FVGridGeometry::GridView; + using GridView = typename GridGeometry::GridView; using Element = typename GridView::template Codim<0>::Entity; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; - using ThisType = TwoPTestSpatialParams; - using ParentType = FVSpatialParams; + using ThisType = TwoPTestSpatialParams; + using ParentType = FVSpatialParams; static constexpr int dimWorld = GridView::dimensionworld; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; @@ -54,7 +54,7 @@ public: using MaterialLawParams = typename MaterialLaw::Params; using PermeabilityType = Scalar; - TwoPTestSpatialParams(std::shared_ptr fvGridGeometry) + TwoPTestSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { //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 diff --git a/examples/shallowwaterfriction/problem.hh b/examples/shallowwaterfriction/problem.hh index 91f9b47cfa..c9349e9d35 100644 --- a/examples/shallowwaterfriction/problem.hh +++ b/examples/shallowwaterfriction/problem.hh @@ -68,14 +68,14 @@ template struct SpatialParams { private: - // We define convenient shortcuts to the properties FVGridGeometry, Scalar, ElementVolumeVariables and VolumeVariables: - using FVGridGeometry = GetPropType; + // We define convenient shortcuts to the properties GridGeometry, Scalar, ElementVolumeVariables and VolumeVariables: + using GridGeometry = GetPropType; using Scalar = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; using VolumeVariables = typename ElementVolumeVariables::VolumeVariables; // Finally we set the spatial parameters: public: - using type = RoughChannelSpatialParams; + using type = RoughChannelSpatialParams; }; // We enable caching for the FV grid geometry and the grid volume variables. The cache @@ -103,7 +103,7 @@ class RoughChannelProblem : public ShallowWaterProblem using BoundaryTypes = GetPropType; using Scalar = GetPropType; using Indices = typename GetPropType::Indices; - using FVGridGeometry = GetPropType; + using GridGeometry = GetPropType; using NeumannFluxes = GetPropType; using ElementVolumeVariables = typename GetPropType::LocalView; using GridVariables = GetPropType; @@ -119,7 +119,7 @@ class RoughChannelProblem : public ShallowWaterProblem public: // This is the constructor of our problem class. - RoughChannelProblem(std::shared_ptr fvGridGeometry) + RoughChannelProblem(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { // We read the parameters from the params.input file. diff --git a/examples/shallowwaterfriction/spatialparams.hh b/examples/shallowwaterfriction/spatialparams.hh index a6e6f315af..16f013e04e 100644 --- a/examples/shallowwaterfriction/spatialparams.hh +++ b/examples/shallowwaterfriction/spatialparams.hh @@ -34,23 +34,23 @@ namespace Dumux { //In the RoughChannelSpatialParams class we define all functions needed to describe the spatial distributed parameters. -template +template class RoughChannelSpatialParams -: public FVSpatialParams> +: public FVSpatialParams> { // We introduce using declarations that are derived from the property system which we need in this class - using ThisType = RoughChannelSpatialParams; - using ParentType = FVSpatialParams; - using GridView = typename FVGridGeometry::GridView; - using FVElementGeometry = typename FVGridGeometry::LocalView; + using ThisType = RoughChannelSpatialParams; + using ParentType = FVSpatialParams; + using GridView = typename GridGeometry::GridView; + using FVElementGeometry = typename GridGeometry::LocalView; using SubControlVolume = typename FVElementGeometry::SubControlVolume; using Element = typename GridView::template Codim<0>::Entity; using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: // In the constructor be read some values from the `params.input` and initialize the friciton law. - RoughChannelSpatialParams(std::shared_ptr fvGridGeometry) + RoughChannelSpatialParams(std::shared_ptr fvGridGeometry) : ParentType(fvGridGeometry) { gravity_ = getParam("Problem.Gravity"); -- GitLab From 6a59d0f8da0fd1ed0a8e4ae444d70c4136ab9891 Mon Sep 17 00:00:00 2001 From: Bernd Flemisch Date: Wed, 9 Oct 2019 17:09:24 +0200 Subject: [PATCH 3/7] [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 problem, - std::shared_ptr fvGridGeometry, + std::shared_ptr gridGeometry, std::shared_ptr gridVariables) : problem_(problem) - , fvGridGeometry_(fvGridGeometry) + , fvGridGeometry_(gridGeometry) , gridVariables_(gridVariables) , minLevel_(getParamFromGroup(problem->paramGroup(), "Adaptive.MinLevel")) , maxLevel_(getParamFromGroup(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& 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& 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 - static void computePointSourceMap(const GridGeometry& fvGridGeometry, + static void computePointSourceMap(const GridGeometry& gridGeometry, std::vector& 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 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 fvGridGeometry, const std::string& paramGroup = "") - : ParentType(fvGridGeometry, paramGroup) + StaggeredFVProblem(std::shared_ptr 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 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 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 - 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 - 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 - 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 - 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, 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 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 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 - 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 - 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 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 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 - 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 - 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 - 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(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 static ResultPair - 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 static ResultPair - 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 static ResultPair - 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 static ResultPair - 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 - 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 - 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 auto evalGradients(const Element& element, const typename Element::Geometry& geometry, - const typename FVElementGeometry::GridGeometry& fvGridGeometry, + const typename FVElementGeometry::GridGeometry& gridGeometry, const BoxElementSolution& 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 Dune::FieldVector evalGradients(const Element& element, const typename Element::Geometry& geometry, - const typename FVElementGeometry::GridGeometry& fvGridGeometry, + const typename FVElementGeometry::GridGeometry& gridGeometry, const CCElementSolution& 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 PrimaryVariables evalSolution(const Element& element, const typename Element::Geometry& geometry, - const typename FVElementGeometry::GridGeometry& fvGridGeometry, + const typename FVElementGeometry::GridGeometry& gridGeometry, const BoxElementSolution& 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 PrimaryVariables evalSolution(const Element& element, const typename Element::Geometry& geometry, - const typename FVElementGeometry::GridGeometry& fvGridGeometry, + const typename FVElementGeometry::GridGeometry& gridGeometry, const CCElementSolution& 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 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(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 - 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 - 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 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 - 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 - 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 - 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 - 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 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 fvGridGeometry, const std::string& paramGroup = "") - : ParentType(fvGridGeometry, paramGroup) + NavierStokesProblem(std::shared_ptr gridGeometry, const std::string& paramGroup = "") + : ParentType(gridGeometry, paramGroup) , gravity_(0.0) { if (getParamFromGroup(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 : public RANSProblemBase< public: //! The constructor sets the gravity, if desired by the user. - RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") - : ParentType(fvGridGeometry, paramGroup) + RANSProblemImpl(std::shared_ptr gridGeometry, const std::string& paramGroup = "") + : ParentType(gridGeometry, paramGroup) { useStoredEddyViscosity_ = getParamFromGroup(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 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 fvGridGeometry, const std::string& paramGroup = "") - : ParentType(fvGridGeometry, paramGroup) + RANSProblemBase(std::shared_ptr 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 : public RANSProblemBa public: //! The constructor sets the gravity, if desired by the user. - RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") - : ParentType(fvGridGeometry, paramGroup) + RANSProblemImpl(std::shared_ptr gridGeometry, const std::string& paramGroup = "") + : ParentType(gridGeometry, paramGroup) { yPlusThreshold_ = getParamFromGroup(this->paramGroup(), "KEpsilon.YPlusThreshold", 30); useStoredEddyViscosity_ = getParamFromGroup(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 : public RANSProblemBase using DimVector = typename Element::Geometry::GlobalCoordinate; public: - RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") - : ParentType(fvGridGeometry, paramGroup) + RANSProblemImpl(std::shared_ptr gridGeometry, const std::string& paramGroup = "") + : ParentType(gridGeometry, paramGroup) { useStoredEddyViscosity_ = getParamFromGroup(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 : public RANSProb public: //! The constructor sets the gravity, if desired by the user. - RANSProblemImpl(std::shared_ptr fvGridGeometry, const std::string& paramGroup = "") - : ParentType(fvGridGeometry, paramGroup) + RANSProblemImpl(std::shared_ptr gridGeometry, const std::string& paramGroup = "") + : ParentType(gridGeometry, paramGroup) { useStoredEddyViscosity_ = getParamFromGroup(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 : 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 fvGridGeometry, const std::string& paramGroup = "") - : ParentType(fvGridGeometry, paramGroup) + RANSProblemImpl(std::shared_ptr gridGeometry, const std::string& paramGroup = "") + : ParentType(gridGeometry, paramGroup) { eddyViscosityModel_ = getParamFromGroup(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 fvGridGeometry, + ShallowWaterProblem(std::shared_ptr gridGeometry, std::shared_ptr 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 fvGridGeometry, + ShallowWaterProblem(std::shared_ptr gridGeometry, const std::string& paramGroup = "") - : ShallowWaterProblem(fvGridGeometry, - std::make_shared(fvGridGeometry), + : ShallowWaterProblem(gridGeometry, + std::make_shared(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 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 { @@ -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 visited(fvGridGeometry.gridView().size(dim), false); - for (const auto& element : elements(fvGridGeometry.gridView(), Dune::Partitions::interior)) + std::vector 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 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 { @@ -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 visited(fvGridGeometry.gridView().size(dim), false); - for (const auto& element : elements(fvGridGeometry.gridView(), Dune::Partitions::interior)) + std::vector 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 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 - dataHandle(sol, fvGridGeometry.elementMapper()); - fvGridGeometry.gridView().communicate(dataHandle, + dataHandle(sol, gridGeometry.elementMapper()); + gridGeometry.gridView().communicate(dataHandle, Dune::InteriorBorder_All_Interface, Dune::ForwardCommunication); } else { LoadSolutionDataHandle - 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& 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& 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 dofVisited(numPoints, false); @@ -192,9 +192,9 @@ private: if(!faceVarVectorDataInfo_.empty()) faceVarVectorData.resize(faceVarVectorDataInfo_.size(), std::vector(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(fvGridGeometry().gridView().comm().rank()); + rank[eIdxGlobal] = static_cast(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(fvGridGeometry().gridView().comm().rank()); + rank[eIdxGlobal] = static_cast(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 fvGridGeometry) - : ParentType(fvGridGeometry) + FVSpatialParams(std::shared_ptr 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 fvGridGeometry) - : fvGridGeometry_(fvGridGeometry) + FVSpatialParamsOneP(std::shared_ptr gridGeometry) + : fvGridGeometry_(gridGeometry) , gravity_(0.0) { const bool enableGravity = getParam("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 fvGridGeometry) - : fvGridGeometry_(fvGridGeometry) + FVSpatialParamsElastic(std::shared_ptr gridGeometry) + : fvGridGeometry_(gridGeometry) , gravity_(0.0) { const bool enableGravity = getParam("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 fvGridGeometry) - : ParentType(fvGridGeometry) + FVNonEquilibriumSpatialParams(std::shared_ptr 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 fvGridGeometry) - : fvGridGeometry_(fvGridGeometry) + FVSpatialParamsPoroElastic(std::shared_ptr gridGeometry) + : fvGridGeometry_(gridGeometry) , gravity_(0.0) { const bool enableGravity = getParam("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 = 0> - void getShapeValues(Dune::index_constant domainI, const FVGG& fvGridGeometry, const Geometry& geo, const GlobalPosition& globalPos, ShapeValues& shapeValues) + void getShapeValues(Dune::index_constant 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 = 0> - void getShapeValues(Dune::index_constant domainI, const FVGG& fvGridGeometry, const Geometry& geo, const GlobalPosition& globalPos, ShapeValues& shapeValues) + void getShapeValues(Dune::index_constant 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 - static void computePointSourceMap(const GridGeometry& fvGridGeometry, + static void computePointSourceMap(const GridGeometry& gridGeometry, std::vector& 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::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::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::GridIndex, typename IndexTraits::GridIndex > - makeInsertionToGridIndexMap_(std::shared_ptr embeddings, const GridGeometry& fvGridGeometry) const + makeInsertionToGridIndexMap_(std::shared_ptr embeddings, const GridGeometry& gridGeometry) const { using GridIndexType = typename IndexTraits::GridIndex; std::unordered_map< GridIndexType, GridIndexType > map; - for (const auto& e : elements(fvGridGeometry.gridView())) - map.insert( std::make_pair( embeddings->template insertionIndex(e), fvGridGeometry.elementMapper().index(e) ) ); + for (const auto& e : elements(gridGeometry.gridView())) + map.insert( std::make_pair( embeddings->template insertionIndex(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; // TODO: use reserved vector @@ -659,7 +659,7 @@ public: const auto faceGlobalI = scvf.dofIndex(); using FaceSolution = GetPropType; - 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 ConvergenceWriterInterfaceassembler().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>(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 - 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::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 fvGridGeometry, const std::string& paramGroup = "") - : fvGridGeometry_(fvGridGeometry) + TwoPGridAdaptIndicator(std::shared_ptr gridGeometry, const std::string& paramGroup = "") + : fvGridGeometry_(gridGeometry) , refineBound_(std::numeric_limits::max()) , coarsenBound_(std::numeric_limits::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 problem, - std::shared_ptr fvGridGeometry, + std::shared_ptr gridGeometry, std::shared_ptr 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> 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 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 > 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 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 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 = 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 = 0> void updateBoundary(const Problem& problem, - const typename GridVariables::GridGeometry& fvGridGeometry, + const typename GridVariables::GridGeometry& gridGeometry, GridVariables& gridVariables, SolutionVector& sol) { std::vector 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 = 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 = 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 fvGridGeometry, + PorousMediumFlowProblem(std::shared_ptr gridGeometry, std::shared_ptr 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 fvGridGeometry, + PorousMediumFlowProblem(std::shared_ptr gridGeometry, const std::string& paramGroup = "") - : PorousMediumFlowProblem(fvGridGeometry, - std::make_shared(fvGridGeometry), + : PorousMediumFlowProblem(gridGeometry, + std::make_shared(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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // In the problem, we define the boundary and initial conditions. using OnePProblem = GetPropType; - auto problemOneP = std::make_shared(fvGridGeometry); + auto problemOneP = std::make_shared(gridGeometry); // The jacobian matrix (`A`), the solution vector (`p`) and the residual (`r`) are parts of the linear system. using JacobianMatrix = GetPropType; @@ -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; - auto onePGridVariables = std::make_shared(problemOneP, fvGridGeometry); + auto onePGridVariables = std::make_shared(problemOneP, gridGeometry); onePGridVariables->init(p); // #### Assembling the linear system // We created and inizialize the assembler. using OnePAssembler = FVAssembler; - auto assemblerOneP = std::make_shared(problemOneP, fvGridGeometry, onePGridVariables); + auto assemblerOneP = std::make_shared(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; - std::vector volumeFlux(fvGridGeometry->numScvf(), 0.0); + std::vector volumeFlux(gridGeometry->numScvf(), 0.0); using FluxVariables = GetPropType; 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; - auto tracerProblem = std::make_shared(fvGridGeometry); + auto tracerProblem = std::make_shared(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; - auto gridVariables = std::make_shared(tracerProblem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(tracerProblem, fvGridGeometry, gridVariables, timeLoop); + auto assembler = std::make_shared(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 public: // This is the constructor of our problem class: - OnePTestProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry) {} + OnePTestProblem(std::shared_ptr 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 fvGridGeometry) - : ParentType(fvGridGeometry), K_(fvGridGeometry->gridView().size(0), 0.0) + OnePTestSpatialParams(std::shared_ptr 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 K(std::log(permeability_), std::log(permeability_)*0.1); std::lognormal_distribution 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 fvGridGeometry) - : ParentType(fvGridGeometry) {} + TracerTestSpatialParams(std::shared_ptr 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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // In the problem, we define the boundary and initial conditions. using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(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; - 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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("Adaptive.RefineTolerance"); const Scalar coarsenTol = getParam("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 indicator(fvGridGeometry); + TwoPGridAdaptIndicator 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 dataTransfer(problem, fvGridGeometry, gridVariables, x); + TwoPGridDataTransfer 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 initIndicator(problem, fvGridGeometry, gridVariables); + GridAdaptInitializationIndicator 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("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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables, timeLoop); + auto assembler = std::make_shared(problem, gridGeometry, gridVariables, timeLoop); // we set the linear solver using LinearSolver = AMGBackend; - auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); + auto linearSolver = std::make_shared(leafGridView, gridGeometry->dofMapper()); // additionally we set the non-linear solver. using NewtonSolver = Dumux::NewtonSolver; 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 public: // This is the constructor of our problem class: - PointSourceProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry) + PointSourceProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) { // We read in the values for the initial condition of our simulation: initialValues_ = readFileToContainer>("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 fvGridGeometry) - : ParentType(fvGridGeometry) + TwoPTestSpatialParams(std::shared_ptr 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("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 public: // This is the constructor of our problem class. - RoughChannelProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry) + RoughChannelProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) { // We read the parameters from the params.input file. name_ = getParam("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 fvGridGeometry) - : ParentType(fvGridGeometry) + RoughChannelSpatialParams(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) { gravity_ = getParam("Problem.Gravity"); bedSlope_ = getParam("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 = Dune::StructuredGridFactory::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 = Dune::StructuredGridFactory::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 template 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 = Dune::StructuredGridFactory::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 auto createAnalyticalSolution(const Scalar time, const Problem& problem) { - const auto& fvGridGeometry = problem.gridGeometry(); - using GridView = typename std::decay_t::GridView; + const auto& gridGeometry = problem.gridGeometry(); + using GridView = typename std::decay_t::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 analyticalVelocity; std::vector 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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // get some time loop parameters using Scalar = GetPropType; @@ -149,20 +149,20 @@ int main(int argc, char** argv) try // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); problem->updateTimeStepSize(timeLoop->timeStepSize()); // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables, timeLoop, xOld); + auto assembler = std::make_shared(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; 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 public: using Indices = typename GetPropType::Indices; - AngeliTestProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry) + AngeliTestProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) { kinematicViscosity_ = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables); + auto assembler = std::make_shared(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 using DimMatrix = Dune::FieldMatrix; public: - NavierStokesAnalyticProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry), eps_(1e-6) + NavierStokesAnalyticProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry), eps_(1e-6) { printL2Error_ = getParam("Problem.PrintL2Error"); density_ = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // get some time loop parameters using Scalar = GetPropType; @@ -96,8 +96,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables, timeLoop, xOld); + auto assembler = std::make_shared(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 }; public: - ChannelTestProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry), eps_(1e-6) + ChannelTestProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry), eps_(1e-6) { inletVelocity_ = getParam("Problem.InletVelocity"); const auto tmp = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables); + auto assembler = std::make_shared(problem, gridGeometry, gridVariables); // the linear solver using LinearSolver = Dumux::UMFPackBackend; @@ -122,13 +122,13 @@ int main(int argc, char** argv) try using Scalar = GetPropType; using GlobalPosition = Dune::FieldVector; - 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 static constexpr bool enablePseudoThreeDWallFriction = !DIM_3D; public: - ThreeDChannelTestProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry), eps_(1e-6) + ThreeDChannelTestProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry), eps_(1e-6) { deltaP_ = getParam("Problem.DeltaP"); height_ = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables, timeLoop, xOld); + auto assembler = std::make_shared(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 using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - ClosedSystemTestProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry), eps_(1e-6) + ClosedSystemTestProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry), eps_(1e-6) { lidVelocity_ = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables); + auto assembler = std::make_shared(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; - auto convergenceWriter = std::make_shared(*fvGridGeometry); + auto convergenceWriter = std::make_shared(*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 using VelocityVector = Dune::FieldVector; public: - DoneaTestProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry), eps_(1e-6) + DoneaTestProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry), eps_(1e-6) { printL2Error_ = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables); + auto assembler = std::make_shared(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 static constexpr auto upwindSchemeOrder = getPropValue(); public: - KovasznayTestProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry), eps_(1e-6) + KovasznayTestProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry), eps_(1e-6) { printL2Error_ = getParam("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 auto createAnalyticalSolution(const Scalar time, const Problem& problem) { - const auto& fvGridGeometry = problem.gridGeometry(); - using GridView = typename std::decay_t::GridView; + const auto& gridGeometry = problem.gridGeometry(); + using GridView = typename std::decay_t::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 analyticalVelocity; std::vector 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, 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 -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; 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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // get some time loop parameters using Scalar = GetPropType; @@ -211,20 +211,20 @@ int main(int argc, char** argv) try // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); problem->updateTimeStepSize(timeLoop->timeStepSize()); // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = isStationary ? std::make_shared(problem, fvGridGeometry, gridVariables) - : std::make_shared(problem, fvGridGeometry, gridVariables, timeLoop, xOld); + auto assembler = isStationary ? std::make_shared(problem, gridGeometry, gridVariables) + : std::make_shared(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; using Indices = typename GetPropType::Indices; - SincosTestProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry), time_(0.0), timeStepSize_(0.0) + SincosTestProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry), time_(0.0), timeStepSize_(0.0) { isStationary_ = getParam("Problem.IsStationary"); enableInertiaTerms_ = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // get some time loop parameters using Scalar = GetPropType; @@ -97,14 +97,14 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables, timeLoop, xOld); + auto assembler = std::make_shared(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 static constexpr auto transportEqIdx = Indices::conti0EqIdx + compIdx; public: - ChannelNCTestProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry), eps_(1e-6) + ChannelNCTestProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry), eps_(1e-6) { inletVelocity_ = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // get some time loop parameters using Scalar = GetPropType; @@ -96,14 +96,14 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables, timeLoop, xOld); + auto assembler = std::make_shared(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 static constexpr auto transportEqIdx = Indices::conti0EqIdx + 1; public: - DensityDrivenFlowProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry), eps_(1e-6) + DensityDrivenFlowProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry), eps_(1e-6) { useWholeLength_ = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // get some time loop parameters using Scalar = GetPropType; @@ -96,14 +96,14 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables, timeLoop, xOld); + auto assembler = std::make_shared(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 }; public: - MaxwellStefanNCTestProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry) + MaxwellStefanNCTestProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) { plotOutput_ = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // get some time loop parameters using Scalar = GetPropType; @@ -121,8 +121,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables, timeLoop, xOld); + auto assembler = std::make_shared(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 static constexpr auto dimWorld = GridGeometry::GridView::dimensionworld; public: - PipeLauferProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry), eps_(1e-6) + PipeLauferProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry), eps_(1e-6) { inletVelocity_ = getParam("Problem.InletVelocity"); inletTemperature_ = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // get some time loop parameters using Scalar = GetPropType; @@ -118,8 +118,8 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; 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; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables, timeLoop, xOld); + auto assembler = std::make_shared(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 static constexpr auto transportCompIdx = Indices::conti0EqIdx + 1; public: - FlatPlateNCTestProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry), eps_(1e-6) + FlatPlateNCTestProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry), eps_(1e-6) { inletVelocity_ = getParam("Problem.InletVelocity", 0.1); inletTemperature_ = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // the solution vector using SolutionVector = GetPropType; - SolutionVector x(fvGridGeometry->numDofs()); + SolutionVector x(gridGeometry->numDofs()); problem->applyInitialSolution(x); auto xOld = x; // the grid variables using GridVariables = GetPropType; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables, timeLoop, xOld); + auto assembler = std::make_shared(problem, gridGeometry, gridVariables, timeLoop, xOld); // the linear solver using LinearSolver = Dumux::AMGBackend; - auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); + auto linearSolver = std::make_shared(leafGridView, gridGeometry->dofMapper()); // the non-linear solver using NewtonSolver = Dumux::NewtonSolver; 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 using GlobalPosition = typename Element::Geometry::GlobalCoordinate; public: - DamBreakProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry) + DamBreakProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) { name_ = getParam("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 fvGridGeometry) - : ParentType(fvGridGeometry) + DamBreakSpatialParams(std::shared_ptr 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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // the solution vector using SolutionVector = GetPropType; - SolutionVector x(fvGridGeometry->numDofs()); + SolutionVector x(gridGeometry->numDofs()); problem->applyInitialSolution(x); auto xOld = x; // the grid variables using GridVariables = GetPropType; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables, timeLoop, xOld); + auto assembler = std::make_shared(problem, gridGeometry, gridVariables, timeLoop, xOld); // the linear solver using LinearSolver = Dumux::AMGBackend; - auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); + auto linearSolver = std::make_shared(leafGridView, gridGeometry->dofMapper()); // the non-linear solver using NewtonSolver = Dumux::NewtonSolver; 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 using SubControlVolume = typename FVElementGeometry::SubControlVolume; public: - RoughChannelProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry) + RoughChannelProblem(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) { name_ = getParam("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("Problem.ManningN"); bedSlope_ = getParam("Problem.BedSlope"); discharge_ = getParam("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 fvGridGeometry) - : ParentType(fvGridGeometry) + RoughChannelSpatialParams(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) { gravity_ = getParam("Problem.Gravity"); bedSlope_ = getParam("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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // the solution vector using SolutionVector = GetPropType; - SolutionVector x(fvGridGeometry->numDofs()); + SolutionVector x(gridGeometry->numDofs()); problem->applyInitialSolution(x); // the grid variables using GridVariables = GetPropType; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables); + auto assembler = std::make_shared(problem, gridGeometry, gridVariables); // the linear solver using LinearSolver = AMGBackend; - auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); + auto linearSolver = std::make_shared(leafGridView, gridGeometry->dofMapper()); // the non-linear solver using NewtonSolver = Dumux::NewtonSolver; 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 using GradU = Dune::FieldMatrix; public: - ElasticProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry) {} + ElasticProblem(std::shared_ptr 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; - ElasticSpatialParams(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry) + ElasticSpatialParams(std::shared_ptr 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; - auto fvGridGeometry = std::make_shared(leafGridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(leafGridView); + gridGeometry->update(); // the problem (initial and boundary conditions) using Problem = GetPropType; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); // the solution vector using SolutionVector = GetPropType; - SolutionVector x(fvGridGeometry->numDofs()); + SolutionVector x(gridGeometry->numDofs()); problem->applyInitialSolution(x); // the grid variables using GridVariables = GetPropType; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(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, dim > sigmaStorage; std::array< std::vector, 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; - assembleElementStresses(sigmaStorage, effSigmaStorage, *problem, *fvGridGeometry, *gridVariables, x); + assembleElementStresses(sigmaStorage, effSigmaStorage, *problem, *gridGeometry, *gridVariables, x); // write initial solution vtkWriter.write(0.0); // the assembler with time loop for instationary problem using Assembler = FVAssembler; - auto assembler = std::make_shared(problem, fvGridGeometry, gridVariables); + auto assembler = std::make_shared(problem, gridGeometry, gridVariables); // the linear solver using LinearSolver = AMGBackend; - auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); + auto linearSolver = std::make_shared(leafGridView, gridGeometry->dofMapper()); // the non-linear solver using NewtonSolver = Dumux::NewtonSolver; @@ -201,7 +201,7 @@ int main(int argc, char** argv) try gridVariables->update(x); // write vtk output - assembleElementStresses(sigmaStorage, effSigmaStorage, *problem, *fvGridGeometry, *gridVariables, x); + assembleElementStresses(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 using GradU = Dune::FieldMatrix; public: - PoroElasticProblem(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry) + PoroElasticProblem(std::shared_ptr 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; - PoroElasticSpatialParams(std::shared_ptr fvGridGeometry) - : ParentType(fvGridGeometry) + PoroElasticSpatialParams(std::shared_ptr 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 static void testGmshBoundaryFlag(const GridView& leafGridView, - std::shared_ptr fvGridGeometry, + std::shared_ptr gridGeometry, std::shared_ptr> 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 -void testWriteAndReadVtk(std::shared_ptr fvGridGeometry, +void testWriteAndReadVtk(std::shared_ptr gridGeometry, const std::array, numValues>& values, const std::string& fileName, bool verbose = false, @@ -201,14 +201,14 @@ void testWriteAndReadVtk(std::shared_ptr fvGridGeometry, using SolutionVector = GetPropType; 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; - auto problem = std::make_shared(fvGridGeometry); + auto problem = std::make_shared(gridGeometry); assignValues(writeFrom[GridGeometry::cellCenterIdx()], values); assignValues(writeFrom[GridGeometry::faceIdx()], std::array, 1>{1.0}); @@ -218,7 +218,7 @@ void testWriteAndReadVtk(std::shared_ptr fvGridGeometry, // the grid variables using GridVariables = GetPropType; - auto gridVariables = std::make_shared(problem, fvGridGeometry); + auto gridVariables = std::make_shared(problem, gridGeometry); gridVariables->init(writeFrom); // initialize the vtk output module @@ -237,7 +237,7 @@ void testWriteAndReadVtk(std::shared_ptr fvGridGeometry, // cc dofs loadSolution(readTo[GridGeometry::cellCenterIdx()], fileName + "-00000.vtu", createCellCenterPVNameFunction(), - *fvGridGeometry); + *gridGeometry); if (verbose) { @@ -259,7 +259,7 @@ void testWriteAndReadVtk(std::shared_ptr fvGridGeometry, // face dofs loadSolution(readTo[GridGeometry::faceIdx()], fileName + "-face-00000.vtp", createFacePVNameFunction(), - *fvGridGeometry); + *gridGeometry); if (verbose) { @@ -324,41 +324,41 @@ int main(int argc, char** argv) try const auto grid = Dune::StructuredGridFactory::createCubeGrid(lowerLeft, upperRight, cells); const auto gridView = grid->leafGridView(); - auto fvGridGeometry = std::make_shared(gridView); - fvGridGeometry->update(); + auto gridGeometry = std::make_shared(gridView); + gridGeometry->update(); using FluidSystem = GetPropType; FluidSystem::init(); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5}, "navierstokes"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 300.0}, "navierstokesni"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1e-3}, "navierstokesnc"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1e-3, 300.0}, "navierstokesncni"); - - testWriteAndReadVtk(fvGridGeometry, std::array{1e5}, "zeroeq"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 300.0}, "zeroeqni"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1e-3}, "zeroeqnc"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1e-3, 300.0}, "zeroeqncni"); - - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1.0}, "oneeq"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1.0, 300.0}, "oneeqni"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1e-3, 1.0}, "oneeqnc"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1e-3, 1.0, 300.0}, "oneeqncni"); - - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1.1, 1.2}, "kepsilon"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1.1, 1.2, 300.0}, "kepsilonni"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1e-3, 1.1, 1.2}, "kepsilonnc"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1e-3, 1.1, 1.2, 300.0}, "kepsilonncni"); - - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1.1, 1.2}, "lowrekepsilon"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1.1, 1.2, 300.0}, "lowrekepsilonni"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1e-3, 1.1, 1.2}, "lowrekepsilonnc"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1e-3, 1.1, 1.2, 300.0}, "lowrekepsilonncni"); - - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1.1, 1.2}, "komega"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1.1, 1.2, 300.0}, "komegani"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1e-3, 1.1, 1.2}, "komeganc"); - testWriteAndReadVtk(fvGridGeometry, std::array{1e5, 1e-3, 1.1, 1.2, 300.0}, "komegancni"); + testWriteAndReadVtk(gridGeometry, std::array{1e5}, "navierstokes"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 300.0}, "navierstokesni"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1e-3}, "navierstokesnc"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1e-3, 300.0}, "navierstokesncni"); + + testWriteAndReadVtk(gridGeometry, std::array{1e5}, "zeroeq"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 300.0}, "zeroeqni"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1e-3}, "zeroeqnc"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1e-3, 300.0}, "zeroeqncni"); + + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1.0}, "oneeq"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1.0, 300.0}, "oneeqni"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1e-3, 1.0}, "oneeqnc"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1e-3, 1.0, 300.0}, "oneeqncni"); + + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1.1, 1.2}, "kepsilon"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1.1, 1.2, 300.0}, "kepsilonni"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1e-3, 1.1, 1.2}, "kepsilonnc"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1e-3, 1.1, 1.2, 300.0}, "kepsilonncni"); + + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1.1, 1.2}, "lowrekepsilon"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1.1, 1.2, 300.0}, "lowrekepsilonni"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1e-3, 1.1, 1.2}, "lowrekepsilonnc"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1e-3, 1.1, 1.2, 300.0}, "lowrekepsilonncni"); + + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1.1, 1.2}, "komega"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1.1, 1.2, 300.0}, "komegani"); + testWriteAndReadVtk(gridGeometry, std::array{1e5, 1e-3, 1.1, 1.2}, "komeganc"); + testWriteAndReadVtk(gridGeometry, std::array{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 fvGridGeometry(gridView); - const auto& bBoxTree = fvGridGeometry.boundingBoxTree(); + CCTpfaFVGridGeometry gridGeometry(gridView); + const auto& bBoxTree = gridGeometry.boundingBoxTree(); // copy data from the subdomains to full domain data vectors std::vector processRank(gridView.size(0), 0); // sequential simulation std::vector 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{}; public: - OnePTestProblem(std::shared_ptr fvGridGeometry, + OnePTestProblem(std::shared_ptr gridGeometry, std::shared_ptr 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 fvGridGeometry) - : ParentType(fvGridGeometry) + OnePTestSpatialParams(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) , lensLowerLeft_(std::numeric_limits::max()) , lensUpperRight_(std::numeric_limits::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{}; public: - OnePTestProblem(std::shared_ptr fvGridGeometry, + OnePTestProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager, const std::string& paramGroup = "") - : ParentType(fvGridGeometry, paramGroup) + : ParentType(gridGeometry, paramGroup) , couplingManager_(couplingManager) { injectionRate_ = getParam("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 fvGridGeometry) - : ParentType(fvGridGeometry) + TestSpatialParams(std::shared_ptr 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 using CouplingManager = GetPropType; public: - DarcySubProblem(std::shared_ptr fvGridGeometry, + DarcySubProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager) - : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) + : ParentType(gridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) { pressure_ = getParamFromGroup(this->paramGroup(), "Problem.Pressure"); initialMoleFraction_ = getParamFromGroup(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 using DiffusionCoefficientAveragingType = typename StokesDarcyCouplingOptions::DiffusionCoefficientAveragingType; public: - StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) - : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), injectionState_(false), couplingManager_(couplingManager) + StokesSubProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager) + : ParentType(gridGeometry, "Stokes"), eps_(1e-6), injectionState_(false), couplingManager_(couplingManager) { inletVelocity_ = getParamFromGroup(this->paramGroup(), "Problem.Velocity"); pressure_ = getParamFromGroup(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 using TimeLoopPtr = std::shared_ptr>; public: - DarcySubProblem(std::shared_ptr fvGridGeometry, + DarcySubProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager) - : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) + : ParentType(gridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) { problemName_ = getParam("Vtk.OutputName") + "_" + getParamFromGroup(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 using TimeLoopPtr = std::shared_ptr>; public: - StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) - : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) + StokesSubProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager) + : ParentType(gridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) { problemName_ = getParam("Vtk.OutputName") + "_" + getParamFromGroup(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 fvGridGeometry) - : ParentType(fvGridGeometry) + OnePSpatialParams(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) { permeability_ = getParam("SpatialParams.Permeability"); porosity_ = getParam("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 using DiffusionCoefficientAveragingType = typename StokesDarcyCouplingOptions::DiffusionCoefficientAveragingType; public: - DarcySubProblem(std::shared_ptr fvGridGeometry, + DarcySubProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager) - : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) + : ParentType(gridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) { pressure_ = getParamFromGroup(this->paramGroup(), "Problem.Pressure"); initialSw_ = getParamFromGroup(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 static constexpr bool useMoles = GetPropType::useMoles(); public: - StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) - : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) + StokesSubProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager) + : ParentType(gridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) { refVelocity_ = getParamFromGroup(this->paramGroup(), "Problem.RefVelocity"); refPressure_ = getParamFromGroup(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 fvGridGeometry) - : ParentType(fvGridGeometry) + TwoPTwoCSpatialParams(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) { permeability_ = getParam("SpatialParams.Permeability"); porosity_ = getParam("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 using CouplingManager = GetPropType; public: - DarcySubProblem(std::shared_ptr fvGridGeometry, + DarcySubProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager) - : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) + : ParentType(gridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) { pressure_ = getParamFromGroup(this->paramGroup(), "Problem.Pressure"); initialMoleFractionN2_ = getParamFromGroup(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 using CouplingManager = GetPropType; public: - StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) - : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), + StokesSubProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager) + : ParentType(gridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) { inletVelocity_ = getParamFromGroup(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 using CouplingManager = GetPropType; public: - DarcySubProblem(std::shared_ptr fvGridGeometry, + DarcySubProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager) - : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) + : ParentType(gridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) { problemName_ = getParam("Vtk.OutputName") + "_" + getParamFromGroup(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 using CouplingManager = GetPropType; public: - StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) - : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) + StokesSubProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager) + : ParentType(gridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) { problemName_ = getParam("Vtk.OutputName") + "_" + getParamFromGroup(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 fvGridGeometry) - : ParentType(fvGridGeometry) + OnePSpatialParams(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) { permeability_ = getParam("Darcy.SpatialParams.Permeability"); alphaBJ_ = getParam("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 using CouplingManager = GetPropType; public: - DarcySubProblem(std::shared_ptr fvGridGeometry, + DarcySubProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager) - : ParentType(fvGridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) + : ParentType(gridGeometry, "Darcy"), eps_(1e-7), couplingManager_(couplingManager) { pressure_ = getParamFromGroup(this->paramGroup(), "Problem.Pressure"); saturation_ = getParamFromGroup(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 using CouplingManager = GetPropType; public: - StokesSubProblem(std::shared_ptr fvGridGeometry, std::shared_ptr couplingManager) - : ParentType(fvGridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) + StokesSubProblem(std::shared_ptr gridGeometry, std::shared_ptr couplingManager) + : ParentType(gridGeometry, "Stokes"), eps_(1e-6), couplingManager_(couplingManager) { inletVelocity_ = getParamFromGroup(this->paramGroup(), "Problem.Velocity"); pressure_ = getParamFromGroup(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 fvGridGeometry) - : ParentType(fvGridGeometry) + ConservationSpatialParams(std::shared_ptr gridGeometry) + : ParentType(gridGeometry) { permeability_ = getParam("SpatialParams.Permeability"); porosity_ = getParam("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 - RootProblem(std::shared_ptr fvGridGeometry, + RootProblem(std::shared_ptr gridGeometry, std::shared_ptr spatialParams, std::shared_ptr 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 fvGridGeometry, + SoilProblem(std::shared_ptr gridGeometry, std::shared_ptr 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("Problem.InitTopSaturation", 0.3); // start with 30% saturation on top using MaterialLaw = typename GetPropType::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/mu