From 63f4c8620e9286b37fab525bae8e90ad332b857d Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 1 Oct 2013 17:46:10 +0000
Subject: [PATCH] implement naming convention numCorners, cornerNum ->
numVertices, vIdx
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11597 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../fvmpfa/lmethod/fvmpfal3dpressure2p.hh | 12 ++++++------
.../fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh | 14 +++++++-------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh
index 91c56e8dfb..7dd3e72d94 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2p.hh
@@ -506,11 +506,11 @@ void FvMpfaL3dPressure2p<TypeTag>::initializeMatrixRowSize()
std::set<int> neighborIndices;
- int numCorners = eIt->geometry().corners();
+ int numVertices = eIt->geometry().corners();
- for (int cornerNum = 0; cornerNum < numCorners; cornerNum++)
+ for (int vIdx = 0; vIdx < numVertices; vIdx++)
{
- int globalVertIdx = problem_.variables().vertexMapper().map(*eIt, cornerNum, dim);
+ int globalVertIdx = problem_.variables().vertexMapper().map(*eIt, vIdx, dim);
InteractionVolume& interactionVolume = interactionVolumes_.interactionVolume(globalVertIdx);
@@ -546,11 +546,11 @@ void FvMpfaL3dPressure2p<TypeTag>::initializeMatrixIndices()
// add diagonal index
this->A_.addindex(globalIdxI, globalIdxI);
- int numCorners = eIt->geometry().corners();
+ int numVertices = eIt->geometry().corners();
- for (int cornerNum = 0; cornerNum < numCorners; cornerNum++)
+ for (int vIdx = 0; vIdx < numVertices; vIdx++)
{
- int globalVertIdx = problem_.variables().vertexMapper().map(*eIt, cornerNum, dim);
+ int globalVertIdx = problem_.variables().vertexMapper().map(*eIt, vIdx, dim);
InteractionVolume& interactionVolume = interactionVolumes_.interactionVolume(globalVertIdx);
for (int subVolumeIdx = 0; subVolumeIdx < InteractionVolume::subVolumeTotalNum; subVolumeIdx++)
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
index fffc4234b7..e300fcd601 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal3dpressure2padaptive.hh
@@ -263,11 +263,11 @@ void FvMpfaL3dPressure2pAdaptive<TypeTag>::initializeMatrixRowSize()
std::set<int> neighborIndices;
- int numCorners = eIt->geometry().corners();
+ int numVertices = eIt->geometry().corners();
- for (int cornerNum = 0; cornerNum < numCorners; cornerNum++)
+ for (int vIdx = 0; vIdx < numVertices; vIdx++)
{
- int globalVertIdx = problem_.variables().vertexMapper().map(*eIt, cornerNum, dim);
+ int globalVertIdx = problem_.variables().vertexMapper().map(*eIt, vIdx, dim);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(globalVertIdx);
@@ -284,7 +284,7 @@ void FvMpfaL3dPressure2pAdaptive<TypeTag>::initializeMatrixRowSize()
{
if (neighbor->level() == levelI + 2)
{
- for (int vIdx = 0; vIdx < numCorners; vIdx++)
+ for (int vIdx = 0; vIdx < numVertices; vIdx++)
{
int globalVertIdxJ = problem_.variables().vertexMapper().map(*neighbor, vIdx, dim);
@@ -351,11 +351,11 @@ void FvMpfaL3dPressure2pAdaptive<TypeTag>::initializeMatrixIndices()
// add diagonal index
this->A_.addindex(globalIdxI, globalIdxI);
- int numCorners = eIt->geometry().corners();
+ int numVertices = eIt->geometry().corners();
- for (int cornerNum = 0; cornerNum < numCorners; cornerNum++)
+ for (int vIdx = 0; vIdx < numVertices; vIdx++)
{
- int globalVertIdx = problem_.variables().vertexMapper().map(*eIt, cornerNum, dim);
+ int globalVertIdx = problem_.variables().vertexMapper().map(*eIt, vIdx, dim);
InteractionVolume& interactionVolume = this->interactionVolumes_.interactionVolume(globalVertIdx);
for (int subVolumeIdx = 0; subVolumeIdx < InteractionVolume::subVolumeTotalNum; subVolumeIdx++)
--
GitLab