From bbfeaba36790a7be22378aee988748fbc4872fcc Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 1 Oct 2013 18:15:58 +0000
Subject: [PATCH] implement naming convention gv -> gridView
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11600 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/linear/elementborderlistfromgrid.hh | 12 ++++++------
dumux/linear/vertexborderlistfromgrid.hh | 10 +++++-----
dumux/material/spatialparams/fvspatialparams1p.hh | 2 +-
dumux/nonlinear/newtonconvergencewriter.hh | 4 ++--
test/geomechanics/el1p2c/el1p2cspatialparams.hh | 4 ++--
test/geomechanics/el2p/el2pproblem.hh | 10 +++++-----
test/geomechanics/el2p/el2pspatialparams.hh | 4 ++--
test/implicit/3p/infiltration3pspatialparams.hh | 6 +++---
test/implicit/3p3c/infiltrationspatialparameters.hh | 6 +++---
.../mpnc/evaporationatmospherespatialparams.hh | 4 ++--
10 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/dumux/linear/elementborderlistfromgrid.hh b/dumux/linear/elementborderlistfromgrid.hh
index fb1b9efc10..0d162632a0 100644
--- a/dumux/linear/elementborderlistfromgrid.hh
+++ b/dumux/linear/elementborderlistfromgrid.hh
@@ -58,17 +58,17 @@ class ElementBorderListFromGrid : public Dune::CommDataHandleIF<ElementBorderLis
typedef std::list<BorderIndex> BorderList;
public:
- ElementBorderListFromGrid(const GridView &gv,
+ ElementBorderListFromGrid(const GridView &gridView,
const ElementMapper &map)
- : gv_(gv), map_(map)
+ : gridView_(gridView), map_(map)
{
forwardComm_ = true;
- gv.communicate(*this,
+ gridView.communicate(*this,
Dune::InteriorBorder_All_Interface,
Dune::ForwardCommunication);
forwardComm_ = false;
- gv.communicate(*this,
+ gridView.communicate(*this,
Dune::InteriorBorder_All_Interface,
Dune::BackwardCommunication);
}
@@ -87,7 +87,7 @@ public:
template<class MessageBufferImp, class EntityType>
void gather(MessageBufferImp &buff, const EntityType &e) const
{
- buff.write(gv_.comm().rank());
+ buff.write(gridView_.comm().rank());
buff.write(map_.map(e));
}
@@ -127,7 +127,7 @@ public:
{ return domesticBorderList_; }
private:
- const GridView gv_;
+ const GridView gridView_;
const ElementMapper &map_;
bool forwardComm_;
BorderList foreignBorderList_;
diff --git a/dumux/linear/vertexborderlistfromgrid.hh b/dumux/linear/vertexborderlistfromgrid.hh
index d0ec7e272d..662907dece 100644
--- a/dumux/linear/vertexborderlistfromgrid.hh
+++ b/dumux/linear/vertexborderlistfromgrid.hh
@@ -57,11 +57,11 @@ class VertexBorderListFromGrid : public Dune::CommDataHandleIF<VertexBorderListF
typedef std::list<BorderIndex> BorderList;
public:
- VertexBorderListFromGrid(const GridView &gv,
+ VertexBorderListFromGrid(const GridView &gridView,
const VertexMapper &map)
- : gv_(gv), map_(map)
+ : gridView_(gridView), map_(map)
{
- gv.communicate(*this,
+ gridView.communicate(*this,
Dune::InteriorBorder_InteriorBorder_Interface,
Dune::ForwardCommunication);
};
@@ -80,7 +80,7 @@ public:
template<class MessageBufferImp, class EntityType>
void gather(MessageBufferImp &buff, const EntityType &e) const
{
- buff.write(gv_.comm().rank());
+ buff.write(gridView_.comm().rank());
buff.write(map_.map(e));
}
@@ -110,7 +110,7 @@ public:
{ return borderList_; }
private:
- const GridView gv_;
+ const GridView gridView_;
const VertexMapper &map_;
BorderList borderList_;
};
diff --git a/dumux/material/spatialparams/fvspatialparams1p.hh b/dumux/material/spatialparams/fvspatialparams1p.hh
index 27c0176bba..3bc583bd6e 100644
--- a/dumux/material/spatialparams/fvspatialparams1p.hh
+++ b/dumux/material/spatialparams/fvspatialparams1p.hh
@@ -67,7 +67,7 @@ class FVSpatialParamsOneP
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> Tensor;
public:
- FVSpatialParamsOneP(const GridView &gv)
+ FVSpatialParamsOneP(const GridView &gridView)
{
}
diff --git a/dumux/nonlinear/newtonconvergencewriter.hh b/dumux/nonlinear/newtonconvergencewriter.hh
index 543ff90c34..5755e97a7f 100644
--- a/dumux/nonlinear/newtonconvergencewriter.hh
+++ b/dumux/nonlinear/newtonconvergencewriter.hh
@@ -58,11 +58,11 @@ public:
iteration_ = 0;
}
- void beginIteration(const GridView &gv)
+ void beginIteration(const GridView &gridView)
{
++ iteration_;
if (!vtkMultiWriter_)
- vtkMultiWriter_ = Dune::make_shared<VtkMultiWriter>(gv, "convergence");
+ vtkMultiWriter_ = Dune::make_shared<VtkMultiWriter>(gridView, "convergence");
vtkMultiWriter_->beginWrite(timeStepIndex_ + iteration_ / 100.0);
}
diff --git a/test/geomechanics/el1p2c/el1p2cspatialparams.hh b/test/geomechanics/el1p2c/el1p2cspatialparams.hh
index d6635a8500..b30bc88b6b 100644
--- a/test/geomechanics/el1p2c/el1p2cspatialparams.hh
+++ b/test/geomechanics/el1p2c/el1p2cspatialparams.hh
@@ -73,8 +73,8 @@ class El1P2CSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
public:
- El1P2CSpatialParams(const GridView &gv)
- : ParentType(gv)
+ El1P2CSpatialParams(const GridView &gridView)
+ : ParentType(gridView)
{
// intrinsic permeabilities [m^2]
K_ = Scalar(0.0);
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
index 6209b0efc8..204343d999 100644
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ b/test/geomechanics/el2p/el2pproblem.hh
@@ -727,9 +727,9 @@ public:
/*!
* \brief The constructor
*
- * \param gv The grid view
+ * \param gridView The grid view
*/
- InitialDisplacement(const GridView & gv) : BaseT(gv) {}
+ InitialDisplacement(const GridView & gridView) : BaseT(gridView) {}
/*!
* \brief Evaluate initial conditions for the momentum balance equation.
@@ -794,12 +794,12 @@ public:
/*!
* \brief The constructor
*
- * \param gv The grid view
+ * \param gridView The grid view
*/
- InitialPressSat(const GridView & gv) : BaseT(gv) , gridView_(gv), vertexMapper_(gv)
+ InitialPressSat(const GridView & gridView) : BaseT(gridView) , gridView_(gridView), vertexMapper_(gridView)
{
// resize the pressure field vector with the number of vertices
- pInit_.resize(gv.size(GridView::dimension));
+ pInit_.resize(gridView.size(GridView::dimension));
// fill the pressure field vector with zeros
std::fill(pInit_.begin(), pInit_.end(), 0.0);
}
diff --git a/test/geomechanics/el2p/el2pspatialparams.hh b/test/geomechanics/el2p/el2pspatialparams.hh
index c228ac3475..12a84f0f13 100644
--- a/test/geomechanics/el2p/el2pspatialparams.hh
+++ b/test/geomechanics/el2p/el2pspatialparams.hh
@@ -90,8 +90,8 @@ public:
typedef typename MaterialLaw::Params MaterialLawParams;
- El2PSpatialParams(const GridView &gv)
- : ParentType(gv)
+ El2PSpatialParams(const GridView &gridView)
+ : ParentType(gridView)
{
// episode index
episode_ = 0;
diff --git a/test/implicit/3p/infiltration3pspatialparams.hh b/test/implicit/3p/infiltration3pspatialparams.hh
index daa6d4efb2..397a9d935f 100644
--- a/test/implicit/3p/infiltration3pspatialparams.hh
+++ b/test/implicit/3p/infiltration3pspatialparams.hh
@@ -92,10 +92,10 @@ public:
/*!
* \brief The constructor
*
- * \param gv The grid view
+ * \param gridView The grid view
*/
- InfiltrationThreePSpatialParams(const GridView &gv)
- : ParentType(gv)
+ InfiltrationThreePSpatialParams(const GridView &gridView)
+ : ParentType(gridView)
{
// intrinsic permeabilities
fineK_ = GET_RUNTIME_PARAM(TypeTag, Scalar, permeability);
diff --git a/test/implicit/3p3c/infiltrationspatialparameters.hh b/test/implicit/3p3c/infiltrationspatialparameters.hh
index 0e5fe7b10b..0fedd4e215 100644
--- a/test/implicit/3p3c/infiltrationspatialparameters.hh
+++ b/test/implicit/3p3c/infiltrationspatialparameters.hh
@@ -100,10 +100,10 @@ public:
/*!
* \brief The constructor
*
- * \param gv The grid view
+ * \param gridView The grid view
*/
- InfiltrationSpatialParams(const GridView &gv)
- : ParentType(gv)
+ InfiltrationSpatialParams(const GridView &gridView)
+ : ParentType(gridView)
{
// intrinsic permeabilities
fineK_ = 1.e-11;
diff --git a/test/implicit/mpnc/evaporationatmospherespatialparams.hh b/test/implicit/mpnc/evaporationatmospherespatialparams.hh
index 68e6672558..eee14cf95b 100644
--- a/test/implicit/mpnc/evaporationatmospherespatialparams.hh
+++ b/test/implicit/mpnc/evaporationatmospherespatialparams.hh
@@ -182,8 +182,8 @@ public:
typedef typename AnsSurface::Params AnsSurfaceParams;
- EvaporationAtmosphereSpatialParams(const GridView &gv)
- : ParentType(gv)
+ EvaporationAtmosphereSpatialParams(const GridView &gridView)
+ : ParentType(gridView)
{
}
--
GitLab