Commit 0b515145 authored by Hao Wu's avatar Hao Wu
Browse files

Replace more deprecated map with index/subIndex.

(reviewed by gruenich)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14076 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent dff8ba40
......@@ -25,6 +25,7 @@
#ifndef DUMUX_COLUMNXYLOLPROBLEM_HH
#define DUMUX_COLUMNXYLOLPROBLEM_HH
#include <dune/common/version.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dumux/material/fluidsystems/h2oairxylenefluidsystem.hh>
......@@ -314,7 +315,11 @@ public:
for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 4)
int dofIdxGlobal = this->model().dofMapper().subIndex(*eIt, scvIdx, dofCodim);
#else
int dofIdxGlobal = this->model().dofMapper().map(*eIt, scvIdx, dofCodim);
#endif
(*Kxx)[dofIdxGlobal] = this->spatialParams().intrinsicPermeability(*eIt, fvGeometry, scvIdx);
}
}
......
......@@ -25,6 +25,7 @@
#ifndef DUMUX_INFILTRATIONPROBLEM_HH
#define DUMUX_INFILTRATIONPROBLEM_HH
#include <dune/common/version.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh>
......@@ -365,7 +366,11 @@ public:
for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 4)
int dofIdxGlobal = this->model().dofMapper().subIndex(*eIt, scvIdx, dofCodim);
#else
int dofIdxGlobal = this->model().dofMapper().map(*eIt, scvIdx, dofCodim);
#endif
(*Kxx)[dofIdxGlobal] = this->spatialParams().intrinsicPermeability(*eIt, fvGeometry, scvIdx);
}
}
......
......@@ -26,6 +26,7 @@
#ifndef DUMUX_KUEVETTE3P3CNIPROBLEM_HH
#define DUMUX_KUEVETTE3P3CNIPROBLEM_HH
#include <dune/common/version.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dumux/material/fluidsystems/h2oairmesitylenefluidsystem.hh>
......@@ -333,7 +334,11 @@ public:
for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 4)
int dofIdxGlobal = this->model().dofMapper().subIndex(*eIt, scvIdx, dofCodim);
#else
int dofIdxGlobal = this->model().dofMapper().map(*eIt, scvIdx, dofCodim);
#endif
(*Kxx)[dofIdxGlobal] = this->spatialParams().intrinsicPermeability(*eIt, fvGeometry, scvIdx);
}
}
......
......@@ -26,6 +26,7 @@
#define DUMUX_RICHARDS_CONDUCTION_PROBLEM_HH
#include <math.h>
#include <dune/common/version.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
......@@ -200,7 +201,11 @@ public:
fvGeometry.update(this->gridView(), *eIt);
for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 4)
int globalIdx = this->model().dofMapper().subIndex(*eIt, scvIdx, dofCodim);
#else
int globalIdx = this->model().dofMapper().map(*eIt, scvIdx, dofCodim);
#endif
if (isBox)
globalPos = eIt->geometry().corner(scvIdx);
else
......
......@@ -27,6 +27,7 @@
#define DUMUX_1PNI_CONVECTION_PROBLEM_HH
#include <math.h>
#include <dune/common/version.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dumux/implicit/common/implicitporousmediaproblem.hh>
......@@ -211,7 +212,11 @@ public:
fvGeometry.update(this->gridView(), *eIt);
for (int scvIdx = 0; scvIdx < fvGeometry.numScv; ++scvIdx)
{
#if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 4)
int globalIdx = this->model().dofMapper().subIndex(*eIt, scvIdx, dofCodim);
#else
int globalIdx = this->model().dofMapper().map(*eIt, scvIdx, dofCodim);
#endif
if (isBox)
globalPos = eIt->geometry().corner(scvIdx);
else
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment