From f6facb285bf0ae6bd8b6646f49c36fd693b15bfe Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Thu, 16 Apr 2009 12:04:59 +0000
Subject: [PATCH] use subIndex methods with dynamic codimension to avoid
compiler warnings
[[Imported from SVN: r3998]]
---
src/planarrodassembler.cc | 21 ++++++++-------------
src/rodassembler.cc | 18 +++++++++---------
2 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/src/planarrodassembler.cc b/src/planarrodassembler.cc
index 13202237..2c305a76 100644
--- a/src/planarrodassembler.cc
+++ b/src/planarrodassembler.cc
@@ -28,10 +28,8 @@ getNeighborsPerVertex(MatrixIndexSet& nb) const
for (j=0; j<it->template count<gridDim>(); j++) {
- //int iIdx = it->template subIndex<gridDim>(i);
- //int jIdx = it->template subIndex<gridDim>(j);
- int iIdx = indexSet.template subIndex<gridDim>(*it,i);
- int jIdx = indexSet.template subIndex<gridDim>(*it,j);
+ int iIdx = indexSet.subIndex(*it,i,gridDim);
+ int jIdx = indexSet.subIndex(*it,j,gridDim);
nb.add(iIdx, jIdx);
@@ -73,8 +71,7 @@ assembleMatrix(const BlockVector<FieldVector<double, blocksize> >& sol,
BlockVector<FieldVector<double, blocksize> > localSolution(numOfBaseFct);
for (int i=0; i<numOfBaseFct; i++)
- //localSolution[i] = sol[functionSpace_.mapToGlobal(*it,i)];
- localSolution[i] = sol[indexSet.template subIndex<gridDim>(*it,i)];
+ localSolution[i] = sol[indexSet.subIndex(*it,i,gridDim)];
// setup matrix
getLocalMatrix( *it, localSolution, numOfBaseFct, mat);
@@ -82,13 +79,11 @@ assembleMatrix(const BlockVector<FieldVector<double, blocksize> >& sol,
// Add element matrix to global stiffness matrix
for(int i=0; i<numOfBaseFct; i++) {
- //int row = functionSpace_.mapToGlobal( *it , i );
- int row = indexSet.template subIndex<gridDim>(*it,i);
+ int row = indexSet.subIndex(*it,i,gridDim);
for (int j=0; j<numOfBaseFct; j++ ) {
- //int col = functionSpace_.mapToGlobal( *it , j );
- int col = indexSet.template subIndex<gridDim>(*it,j);
+ int col = indexSet.subIndex(*it,j,gridDim);
matrix[row][col] += mat[i][j];
}
@@ -293,7 +288,7 @@ assembleGradient(const BlockVector<FieldVector<double, blocksize> >& sol,
FieldVector<double, blocksize> localSolution[numOfBaseFct];
for (int i=0; i<numOfBaseFct; i++)
- localSolution[i] = sol[indexSet.template subIndex<gridDim>(*it,i)];
+ localSolution[i] = sol[indexSet.subIndex(*it,i,gridDim)];
// Get quadrature rule
const QuadratureRule<double, gridDim>& quad = QuadratureRules<double, gridDim>::rule(it->geometry().type(), polOrd);
@@ -349,7 +344,7 @@ assembleGradient(const BlockVector<FieldVector<double, blocksize> >& sol,
for (int dof=0; dof<numOfBaseFct; dof++) {
- int globalDof = indexSet.template subIndex<gridDim>(*it,dof);
+ int globalDof = indexSet.subIndex(*it,dof,gridDim);
//printf("globalDof: %d partA1: %g partA3: %g\n", globalDof, partA1, partA3);
@@ -400,7 +395,7 @@ computeEnergy(const BlockVector<FieldVector<double, blocksize> >& sol) const
FieldVector<double, blocksize> localSolution[numOfBaseFct];
for (int i=0; i<numOfBaseFct; i++)
- localSolution[i] = sol[indexSet.template subIndex<gridDim>(*it,i)];
+ localSolution[i] = sol[indexSet.subIndex(*it,i,gridDim)];
// Get quadrature rule
const QuadratureRule<double, gridDim>& quad = QuadratureRules<double, gridDim>::rule(it->geometry().type(), polOrd);
diff --git a/src/rodassembler.cc b/src/rodassembler.cc
index cfd9d5fd..027dd9c2 100644
--- a/src/rodassembler.cc
+++ b/src/rodassembler.cc
@@ -568,8 +568,8 @@ getNeighborsPerVertex(Dune::MatrixIndexSet& nb) const
for (j=0; j<it->template count<gridDim>(); j++) {
- int iIdx = indexSet.template subIndex<gridDim>(*it,i);
- int jIdx = indexSet.template subIndex<gridDim>(*it,j);
+ int iIdx = indexSet.subIndex(*it,i,gridDim);
+ int jIdx = indexSet.subIndex(*it,j,gridDim);
nb.add(iIdx, jIdx);
@@ -924,13 +924,13 @@ assembleGradient(const std::vector<Configuration>& sol,
array<Configuration,nDofs> localSolution;
for (int i=0; i<nDofs; i++)
- localSolution[i] = sol[indexSet.template subIndex<gridDim>(*it,i)];
+ localSolution[i] = sol[indexSet.subIndex(*it,i,gridDim)];
// Extract local reference configuration
array<Configuration,nDofs> localReferenceConfiguration;
for (int i=0; i<nDofs; i++)
- localReferenceConfiguration[i] = referenceConfiguration_[indexSet.template subIndex<gridDim>(*it,i)];
+ localReferenceConfiguration[i] = referenceConfiguration_[indexSet.subIndex(*it,i,gridDim)];
// Assemble local gradient
array<FieldVector<double,blocksize>, nDofs> localGradient;
@@ -939,7 +939,7 @@ assembleGradient(const std::vector<Configuration>& sol,
// Add to global gradient
for (int i=0; i<nDofs; i++)
- grad[indexSet.template subIndex<gridDim>(*it,i)] += localGradient[i];
+ grad[indexSet.subIndex(*it,i,gridDim)] += localGradient[i];
}
@@ -978,8 +978,8 @@ computeEnergy(const std::vector<Configuration>& sol) const
for (int i=0; i<2; i++) {
- localReferenceConfiguration[i] = referenceConfiguration_[indexSet.template subIndex<gridDim>(*it,i)];
- localSolution[i] = sol[indexSet.template subIndex<gridDim>(*it,i)];
+ localReferenceConfiguration[i] = referenceConfiguration_[indexSet.subIndex(*it,i,gridDim)];
+ localSolution[i] = sol[indexSet.subIndex(*it,i,gridDim)];
}
@@ -1032,7 +1032,7 @@ getStrain(const std::vector<Configuration>& sol,
array<Configuration,2> localSolution;
for (int i=0; i<numOfBaseFct; i++)
- localSolution[i] = sol[indexSet.template subIndex<gridDim>(*it,i)];
+ localSolution[i] = sol[indexSet.subIndex(*it,i,gridDim)];
// Get quadrature rule
const int polOrd = 2;
@@ -1119,7 +1119,7 @@ getResultantForce(const BoundaryPatch<GridType>& boundary,
for (; nIt!=nEndIt; ++nIt) {
- if (!boundary.contains(*eIt, nIt->numberInSelf()))
+ if (!boundary.contains(*eIt, nIt->indexInInside()))
continue;
// //////////////////////////////////////////////
--
GitLab