From 0b515145fe2e553f15335318584fc21ccf8e486a Mon Sep 17 00:00:00 2001
From: Hao Wu <wuhao@sife@gmail.com>
Date: Fri, 16 Jan 2015 12:31:05 +0000
Subject: [PATCH] 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
---
 test/implicit/3p3c/columnxylolproblem.hh              | 5 +++++
 test/implicit/3p3c/infiltrationproblem.hh             | 5 +++++
 test/implicit/3p3c/kuevetteproblem.hh                 | 5 +++++
 test/implicit/richards/richardsniconductionproblem.hh | 5 +++++
 test/implicit/richards/richardsniconvectionproblem.hh | 5 +++++
 5 files changed, 25 insertions(+)

diff --git a/test/implicit/3p3c/columnxylolproblem.hh b/test/implicit/3p3c/columnxylolproblem.hh
index 7b7be4e61e..76a370c1bf 100644
--- a/test/implicit/3p3c/columnxylolproblem.hh
+++ b/test/implicit/3p3c/columnxylolproblem.hh
@@ -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);
             }
         }
diff --git a/test/implicit/3p3c/infiltrationproblem.hh b/test/implicit/3p3c/infiltrationproblem.hh
index c81438bdc0..04e69b62ac 100644
--- a/test/implicit/3p3c/infiltrationproblem.hh
+++ b/test/implicit/3p3c/infiltrationproblem.hh
@@ -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);
             }
         }
diff --git a/test/implicit/3p3c/kuevetteproblem.hh b/test/implicit/3p3c/kuevetteproblem.hh
index 21313afceb..aeaa6232ea 100644
--- a/test/implicit/3p3c/kuevetteproblem.hh
+++ b/test/implicit/3p3c/kuevetteproblem.hh
@@ -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);
             }
         }
diff --git a/test/implicit/richards/richardsniconductionproblem.hh b/test/implicit/richards/richardsniconductionproblem.hh
index 40bd451f6d..7d2f50e951 100644
--- a/test/implicit/richards/richardsniconductionproblem.hh
+++ b/test/implicit/richards/richardsniconductionproblem.hh
@@ -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
diff --git a/test/implicit/richards/richardsniconvectionproblem.hh b/test/implicit/richards/richardsniconvectionproblem.hh
index 60a46c594f..36717bfc29 100644
--- a/test/implicit/richards/richardsniconvectionproblem.hh
+++ b/test/implicit/richards/richardsniconvectionproblem.hh
@@ -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
-- 
GitLab