From 42b2aa1c8fef1fa8210316c2720fd9f5c1d046d8 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Wed, 22 Jan 2014 10:38:32 +0000
Subject: [PATCH] leafView --> leafGridView
[[Imported from SVN: r9614]]
---
cosserat-continuum.cc | 8 ++++----
dune/gfe/cosseratvtkwriter.hh | 6 +++---
dune/gfe/coupling/rodcontinuumfixedpointstep.hh | 2 +-
.../coupling/rodcontinuumsteklovpoincarestep.hh | 2 +-
dune/gfe/geodesicfefunctionadaptor.hh | 4 ++--
dune/gfe/gfedifferencenormsquared.hh | 6 +++---
dune/gfe/riemanniantrsolver.cc | 6 +++---
harmonicmaps-eoc.cc | 16 ++++++++--------
harmonicmaps.cc | 12 ++++++------
rod-eoc.cc | 6 +++---
rod3d.cc | 4 ++--
rodobstacle.cc | 2 +-
test/adolctest.cc | 4 ++--
test/frameinvariancetest.cc | 2 +-
test/globalgfetestfunctionbasistest.cc | 2 +-
test/localgeodesicfestiffnesstest.cc | 2 +-
test/rodassemblertest.cc | 4 ++--
17 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/cosserat-continuum.cc b/cosserat-continuum.cc
index 88709970..70b1a94e 100644
--- a/cosserat-continuum.cc
+++ b/cosserat-continuum.cc
@@ -215,9 +215,9 @@ int main (int argc, char *argv[]) try
//////////////////////////////////////////////////////////////////////////////
typedef P1NodalBasis<GridType::LeafGridView,double> P1Basis;
- P1Basis p1Basis(grid->leafView());
+ P1Basis p1Basis(grid->leafGridView());
- BoundaryPatch<GridType::LeafGridView> neumannBoundary(grid->leafView(), neumannNodes);
+ BoundaryPatch<GridType::LeafGridView> neumannBoundary(grid->leafGridView(), neumannNodes);
std::cout << "Neumann boundary has " << neumannBoundary.numFaces() << " faces\n";
@@ -271,7 +271,7 @@ int main (int argc, char *argv[]) try
&neumannBoundary,
neumannFunction.get());
- GeodesicFEAssembler<P1Basis,TargetSpace> assembler(grid->leafView(),
+ GeodesicFEAssembler<P1Basis,TargetSpace> assembler(grid->leafGridView(),
&cosseratEnergyLocalStiffness);
#else
@@ -285,7 +285,7 @@ int main (int argc, char *argv[]) try
P1Basis::LocalFiniteElement,
TargetSpace> localGFEADOLCStiffness(&cosseratEnergyADOLCLocalStiffness);
- GeodesicFEAssembler<P1Basis,TargetSpace> assembler(grid->leafView(),
+ GeodesicFEAssembler<P1Basis,TargetSpace> assembler(grid->leafGridView(),
&localGFEADOLCStiffness);
#endif
// /////////////////////////////////////////////////
diff --git a/dune/gfe/cosseratvtkwriter.hh b/dune/gfe/cosseratvtkwriter.hh
index 2f23dcdd..3f0f4391 100644
--- a/dune/gfe/cosseratvtkwriter.hh
+++ b/dune/gfe/cosseratvtkwriter.hh
@@ -72,15 +72,15 @@ public:
typedef Dune::GeometryGrid<GridType,DeformationFunction<typename GridType::LeafGridView> > DeformedGridType;
- DeformationFunction<typename GridType::LeafGridView> deformationFunction(grid.leafView(), configuration);
+ DeformationFunction<typename GridType::LeafGridView> deformationFunction(grid.leafGridView(), configuration);
// stupid, can't instantiate deformedGrid with a const grid
DeformedGridType deformedGrid(const_cast<GridType&>(grid), deformationFunction);
typedef P1NodalBasis<typename DeformedGridType::LeafGridView,double> P1Basis;
- P1Basis p1Basis(deformedGrid.leafView());
+ P1Basis p1Basis(deformedGrid.leafGridView());
- Dune::VTKWriter<typename DeformedGridType::LeafGridView> vtkWriter(deformedGrid.leafView());
+ Dune::VTKWriter<typename DeformedGridType::LeafGridView> vtkWriter(deformedGrid.leafGridView());
// Make three vector fields containing the directors
typedef std::vector<Dune::FieldVector<double,3> > CoefficientType;
diff --git a/dune/gfe/coupling/rodcontinuumfixedpointstep.hh b/dune/gfe/coupling/rodcontinuumfixedpointstep.hh
index 4846fb0e..b41f365a 100644
--- a/dune/gfe/coupling/rodcontinuumfixedpointstep.hh
+++ b/dune/gfe/coupling/rodcontinuumfixedpointstep.hh
@@ -351,7 +351,7 @@ rodDirichletToNeumannMap(const std::string& rodName,
////////////////////////////////////////////////////////////////////////////////
// Set initial iterate by interpolating between the Dirichlet values
- RodFactory<typename RodGridType::LeafGridView> rodFactory(this->complex_.rodGrid(rodName)->leafView());
+ RodFactory<typename RodGridType::LeafGridView> rodFactory(this->complex_.rodGrid(rodName)->leafGridView());
rodFactory.create(rodX);
rod(rodName).solver_->setInitialSolution(rodX);
diff --git a/dune/gfe/coupling/rodcontinuumsteklovpoincarestep.hh b/dune/gfe/coupling/rodcontinuumsteklovpoincarestep.hh
index e77073fe..62c72307 100644
--- a/dune/gfe/coupling/rodcontinuumsteklovpoincarestep.hh
+++ b/dune/gfe/coupling/rodcontinuumsteklovpoincarestep.hh
@@ -413,7 +413,7 @@ rodDirichletToNeumannMap(const std::string& rodName,
////////////////////////////////////////////////////////////////////////////////
// Set initial iterate by interpolating between the Dirichlet values
- RodFactory<typename RodGridType::LeafGridView> rodFactory(this->complex_.rodGrid(rodName)->leafView());
+ RodFactory<typename RodGridType::LeafGridView> rodFactory(this->complex_.rodGrid(rodName)->leafGridView());
rodFactory.create(rodX);
rod(rodName).solver_->setInitialSolution(rodX);
diff --git a/dune/gfe/geodesicfefunctionadaptor.hh b/dune/gfe/geodesicfefunctionadaptor.hh
index 8ac3bc08..eb17f1ec 100644
--- a/dune/gfe/geodesicfefunctionadaptor.hh
+++ b/dune/gfe/geodesicfefunctionadaptor.hh
@@ -50,7 +50,7 @@ static void geodesicFEFunctionAdaptor(GridType& grid, std::vector<TargetSpace>&
// Restore and interpolate the data
// /////////////////////////////////////////////////////
- P1NodalBasis<typename GridType::LeafGridView> p1Basis(grid.leafView());
+ P1NodalBasis<typename GridType::LeafGridView> p1Basis(grid.leafGridView());
x.resize(grid.size(dim));
ElementIterator eIt = grid.template leafbegin<0>();
@@ -169,7 +169,7 @@ static void higherOrderGFEFunctionAdaptor(Basis& basis,
// Restore and interpolate the data
// /////////////////////////////////////////////////////
- basis.update(grid.leafView());
+ basis.update(grid.leafGridView());
x.resize(basis.size());
diff --git a/dune/gfe/gfedifferencenormsquared.hh b/dune/gfe/gfedifferencenormsquared.hh
index 9b452e07..a6b53e61 100644
--- a/dune/gfe/gfedifferencenormsquared.hh
+++ b/dune/gfe/gfedifferencenormsquared.hh
@@ -101,10 +101,10 @@ public:
std::vector<TargetSpace>& target)
{
// Create a leaf function, which we need to be able to call 'evalall()'
- Basis sourceBasis(sourceGrid.leafView());
+ Basis sourceBasis(sourceGrid.leafGridView());
GlobalGeodesicFEFunction<Basis,TargetSpace> sourceFunction(sourceBasis, source);
- Basis targetBasis(targetGrid.leafView());
+ Basis targetBasis(targetGrid.leafGridView());
// ///////////////////////////////////////////////////////////////////////////////////////////
// Prolong the adaptive solution onto the uniform grid in order to make it comparable
@@ -232,7 +232,7 @@ public:
// ///////////////////////////////////////////////////////////////////////////////////////////
double energyNormSquared = 0;
- Basis basis(grid.leafView());
+ Basis basis(grid.leafGridView());
Dune::Matrix<Dune::FieldMatrix<double,1,1> > localMatrix;
typename GridType::template Codim<0>::LeafIterator eIt = grid.template leafbegin<0>();
diff --git a/dune/gfe/riemanniantrsolver.cc b/dune/gfe/riemanniantrsolver.cc
index 49eb5879..e40a4cf5 100644
--- a/dune/gfe/riemanniantrsolver.cc
+++ b/dune/gfe/riemanniantrsolver.cc
@@ -97,7 +97,7 @@ setup(const GridType& grid,
// Assemble a Laplace matrix to create a norm that's equivalent to the H1-norm
// //////////////////////////////////////////////////////////////////////////////////////
typedef P1NodalBasis<typename GridType::LeafGridView,double> P1Basis;
- P1Basis p1Basis(grid.leafView());
+ P1Basis p1Basis(grid.leafGridView());
OperatorAssembler<P1Basis,P1Basis> operatorAssembler(p1Basis, p1Basis);
LaplaceAssembler<GridType, typename P1Basis::LocalFiniteElement, typename P1Basis::LocalFiniteElement> laplaceStiffness;
@@ -137,7 +137,7 @@ setup(const GridType& grid,
hasObstacle_.resize(numLevels);
#if defined THIRD_ORDER || defined SECOND_ORDER
- BasisType basis(grid_->leafView());
+ BasisType basis(grid_->leafGridView());
hasObstacle_.back().resize(basis.size(), true);
for (int i=0; i<hasObstacle_.size()-1; i++)
@@ -157,7 +157,7 @@ setup(const GridType& grid,
#if defined THIRD_ORDER || defined SECOND_ORDER
if (numLevels>1) {
- P1NodalBasis<typename GridType::LeafGridView,double> p1Basis(grid_->leafView());
+ P1NodalBasis<typename GridType::LeafGridView,double> p1Basis(grid_->leafGridView());
PKtoP1MGTransfer<CorrectionType>* topTransferOp = new PKtoP1MGTransfer<CorrectionType>;
topTransferOp->setup(basis,p1Basis);
diff --git a/harmonicmaps-eoc.cc b/harmonicmaps-eoc.cc
index e010d10e..1974c7e6 100644
--- a/harmonicmaps-eoc.cc
+++ b/harmonicmaps-eoc.cc
@@ -115,7 +115,7 @@ void solve (const shared_ptr<GridType>& grid,
BitSetVector<1> allNodes(grid->size(dim));
allNodes.setAll();
- BoundaryPatch<typename GridType::LeafGridView> dirichletBoundary(grid->leafView(), allNodes);
+ BoundaryPatch<typename GridType::LeafGridView> dirichletBoundary(grid->leafGridView(), allNodes);
#if defined THIRD_ORDER
typedef P3NodalBasis<typename GridType::LeafGridView,double> FEBasis;
@@ -124,7 +124,7 @@ void solve (const shared_ptr<GridType>& grid,
#else
typedef P1NodalBasis<typename GridType::LeafGridView,double> FEBasis;
#endif
- FEBasis feBasis(grid->leafView());
+ FEBasis feBasis(grid->leafGridView());
BitSetVector<blocksize> dirichletNodes;
constructBoundaryDofs(dirichletBoundary,feBasis,dirichletNodes);
@@ -152,7 +152,7 @@ void solve (const shared_ptr<GridType>& grid,
HarmonicEnergyLocalStiffness<typename GridType::LeafGridView,typename FEBasis::LocalFiniteElement, TargetSpace> harmonicEnergyLocalStiffness;
- GeodesicFEAssembler<FEBasis,TargetSpace> assembler(grid->leafView(),
+ GeodesicFEAssembler<FEBasis,TargetSpace> assembler(grid->leafGridView(),
&harmonicEnergyLocalStiffness);
// ///////////////////////////////////////////
@@ -246,10 +246,10 @@ int main (int argc, char *argv[]) try
#else
typedef P1NodalBasis<GridType::LeafGridView,double> FEBasis;
#endif
- FEBasis referenceBasis(referenceGrid->leafView());
+ FEBasis referenceBasis(referenceGrid->leafGridView());
#if !defined THIRD_ORDER && ! defined SECOND_ORDER
- VTKWriter<GridType::LeafGridView> vtkWriter(referenceGrid->leafView());
+ VTKWriter<GridType::LeafGridView> vtkWriter(referenceGrid->leafGridView());
shared_ptr<VTKBasisGridFunction<FEBasis,BlockVector<TargetSpace::CoordinateType> > > vtkVectorField
= Dune::shared_ptr<VTKBasisGridFunction<FEBasis,BlockVector<TargetSpace::CoordinateType> > >
@@ -311,8 +311,8 @@ int main (int argc, char *argv[]) try
for (size_t j=0; j<solution.size(); j++)
xEmbedded[j] = solution[j].globalCoordinates();
- FEBasis feBasis(grid->leafView());
- VTKWriter<GridType::LeafGridView> vtkWriter(grid->leafView());
+ FEBasis feBasis(grid->leafGridView());
+ VTKWriter<GridType::LeafGridView> vtkWriter(grid->leafGridView());
shared_ptr<VTKBasisGridFunction<FEBasis,BlockVector<TargetSpace::CoordinateType> > > vtkVectorField
= Dune::shared_ptr<VTKBasisGridFunction<FEBasis,BlockVector<TargetSpace::CoordinateType> > >
@@ -334,7 +334,7 @@ int main (int argc, char *argv[]) try
// Prolong solution to the very finest grid
for (int j=i; j<numLevels; j++) {
- FEBasis basis(grid->leafView());
+ FEBasis basis(grid->leafGridView());
#if defined THIRD_ORDER || defined SECOND_ORDER
GeodesicFEFunctionAdaptor<FEBasis,TargetSpace>::higherOrderGFEFunctionAdaptor<order>(basis, *grid, solution);
#else
diff --git a/harmonicmaps.cc b/harmonicmaps.cc
index e8b52c22..c29afd7c 100644
--- a/harmonicmaps.cc
+++ b/harmonicmaps.cc
@@ -136,7 +136,7 @@ int main (int argc, char *argv[]) try
BitSetVector<1> allNodes(grid.size(dim));
allNodes.setAll();
- BoundaryPatch<GridType::LeafGridView> dirichletBoundary(grid.leafView(), allNodes);
+ BoundaryPatch<GridType::LeafGridView> dirichletBoundary(grid.leafGridView(), allNodes);
BitSetVector<blocksize> dirichletNodes(grid.size(dim));
for (size_t i=0; i<dirichletNodes.size(); i++)
@@ -226,11 +226,11 @@ int main (int argc, char *argv[]) try
// Create an assembler for the Harmonic Energy Functional
// ////////////////////////////////////////////////////////////
typedef P1NodalBasis<typename GridType::LeafGridView,double> FEBasis;
- FEBasis feBasis(grid.leafView());
+ FEBasis feBasis(grid.leafGridView());
HarmonicEnergyLocalStiffness<GridType::LeafGridView, FEBasis::LocalFiniteElement, TargetSpace> harmonicEnergyLocalStiffness;
- GeodesicFEAssembler<FEBasis,TargetSpace> assembler(grid.leafView(),
+ GeodesicFEAssembler<FEBasis,TargetSpace> assembler(grid.leafGridView(),
&harmonicEnergyLocalStiffness);
// /////////////////////////////////////////////////
@@ -293,8 +293,8 @@ int main (int argc, char *argv[]) try
}
LeafAmiraMeshWriter<GridType> amiramesh;
- amiramesh.addGrid(grid.leafView());
- amiramesh.addVertexData(xEmbedded, grid.leafView());
+ amiramesh.addGrid(grid.leafGridView());
+ amiramesh.addVertexData(xEmbedded, grid.leafGridView());
amiramesh.write("resultGrid", 1);
// //////////////////////////////////////////////////////////
@@ -308,7 +308,7 @@ int main (int argc, char *argv[]) try
// //////////////////////////////////////////////////////////////////////
typedef P1NodalBasis<GridType::LeafGridView,double> FEBasis;
- FEBasis basis(grid.leafView());
+ FEBasis basis(grid.leafGridView());
OperatorAssembler<FEBasis,FEBasis> operatorAssembler(basis, basis);
LaplaceAssembler<GridType, FEBasis::LocalFiniteElement, FEBasis::LocalFiniteElement> laplaceLocalAssembler;
diff --git a/rod-eoc.cc b/rod-eoc.cc
index b8366a03..bdb0fb1e 100644
--- a/rod-eoc.cc
+++ b/rod-eoc.cc
@@ -55,7 +55,7 @@ void solve (const GridType& grid,
const double nu = parameters.get<double>("nu");
// Create a local assembler
- RodLocalStiffness<OneDGrid::LeafGridView,double> localStiffness(grid.leafView(),
+ RodLocalStiffness<OneDGrid::LeafGridView,double> localStiffness(grid.leafGridView(),
A, J1, J2, E, nu);
@@ -87,7 +87,7 @@ void solve (const GridType& grid,
// Create a solver for the rod problem
// ///////////////////////////////////////////
- RodAssembler<GridType::LeafGridView,3> rodAssembler(grid.leafView(), &localStiffness);
+ RodAssembler<GridType::LeafGridView,3> rodAssembler(grid.leafGridView(), &localStiffness);
RiemannianTrustRegionSolver<GridType,RigidBodyMotion<double,3> > rodSolver;
#if 1
@@ -183,7 +183,7 @@ int main (int argc, char *argv[]) try
// //////////////////////////////////////////////////////////////////////
typedef P1NodalBasis<GridType::LeafGridView,double> FEBasis;
- FEBasis basis(referenceGrid.leafView());
+ FEBasis basis(referenceGrid.leafGridView());
OperatorAssembler<FEBasis,FEBasis> operatorAssembler(basis, basis);
LaplaceAssembler<GridType, FEBasis::LocalFiniteElement, FEBasis::LocalFiniteElement> laplaceLocalAssembler;
diff --git a/rod3d.cc b/rod3d.cc
index 2a015cf1..bda26e07 100644
--- a/rod3d.cc
+++ b/rod3d.cc
@@ -119,10 +119,10 @@ int main (int argc, char *argv[]) try
// Create a solver for the rod problem
// ///////////////////////////////////////////
- RodLocalStiffness<GridType::LeafGridView,double> localStiffness(grid.leafView(),
+ RodLocalStiffness<GridType::LeafGridView,double> localStiffness(grid.leafGridView(),
A, J1, J2, E, nu);
- RodAssembler<GridType::LeafGridView,3> rodAssembler(grid.leafView(), &localStiffness);
+ RodAssembler<GridType::LeafGridView,3> rodAssembler(grid.leafGridView(), &localStiffness);
RiemannianTrustRegionSolver<GridType,RigidBodyMotion<double,3> > rodSolver;
#if 1
diff --git a/rodobstacle.cc b/rodobstacle.cc
index 07d8e88d..1cfa9893 100644
--- a/rodobstacle.cc
+++ b/rodobstacle.cc
@@ -182,7 +182,7 @@ int main (int argc, char *argv[]) try
MatrixType hessianMatrix;
- RodAssembler<GridType::LeafGridView,2> rodAssembler(grid.leafView());
+ RodAssembler<GridType::LeafGridView,2> rodAssembler(grid.leafGridView());
rodAssembler.setParameters(1, 350000, 350000);
diff --git a/test/adolctest.cc b/test/adolctest.cc
index 85deaf7c..913439ba 100644
--- a/test/adolctest.cc
+++ b/test/adolctest.cc
@@ -89,7 +89,7 @@ int testHarmonicEnergy() {
GridType grid(l,elements);
typedef Q1NodalBasis<typename GridType::LeafGridView,double> Q1Basis;
- Q1Basis q1Basis(grid.leafView());
+ Q1Basis q1Basis(grid.leafGridView());
typedef Q1LocalFiniteElement<double,double,gridDim> LocalFE;
LocalFE localFiniteElement;
@@ -164,7 +164,7 @@ int testCosseratEnergy() {
GridType grid(l,elements);
typedef Q1NodalBasis<typename GridType::LeafGridView,double> Q1Basis;
- Q1Basis q1Basis(grid.leafView());
+ Q1Basis q1Basis(grid.leafGridView());
typedef Q1LocalFiniteElement<double,double,gridDim> LocalFE;
LocalFE localFiniteElement;
diff --git a/test/frameinvariancetest.cc b/test/frameinvariancetest.cc
index f4a1493a..95180a69 100644
--- a/test/frameinvariancetest.cc
+++ b/test/frameinvariancetest.cc
@@ -88,7 +88,7 @@ int main (int argc, char *argv[]) try
writeRod(x,"rod");
writeRod(rotatedX, "rotated");
- RodLocalStiffness<GridType::LeafGridView,double> assembler(grid.leafView(),
+ RodLocalStiffness<GridType::LeafGridView,double> assembler(grid.leafGridView(),
1,1,1,1e6,0.3);
for (int i=1; i<2; i++) {
diff --git a/test/globalgfetestfunctionbasistest.cc b/test/globalgfetestfunctionbasistest.cc
index 9f24f798..3f671495 100644
--- a/test/globalgfetestfunctionbasistest.cc
+++ b/test/globalgfetestfunctionbasistest.cc
@@ -37,7 +37,7 @@ void test()
// make global basis
typedef P1NodalBasis<typename OneDGrid::LeafGridView> P1Basis;
- P1Basis p1Basis(grid.leafView());
+ P1Basis p1Basis(grid.leafGridView());
typedef GlobalGFETestFunctionBasis<P1Basis,TargetSpace> GlobalBasis;
GlobalBasis basis(p1Basis,testPoints);
diff --git a/test/localgeodesicfestiffnesstest.cc b/test/localgeodesicfestiffnesstest.cc
index 19636229..9f79510e 100644
--- a/test/localgeodesicfestiffnesstest.cc
+++ b/test/localgeodesicfestiffnesstest.cc
@@ -118,7 +118,7 @@ void testHessian()
int nTestPoints = testPoints.size();
typedef P1NodalBasis<GridType::LeafGridView,double> P1Basis;
- P1Basis p1Basis(grid->leafView());
+ P1Basis p1Basis(grid->leafGridView());
TestEnergyLocalStiffness<typename GridType::LeafGridView, P1Basis::LocalFiniteElement, TargetSpace> assembler;
// Set up elements of S^2
diff --git a/test/rodassemblertest.cc b/test/rodassemblertest.cc
index 6330d395..6542a074 100644
--- a/test/rodassemblertest.cc
+++ b/test/rodassemblertest.cc
@@ -539,11 +539,11 @@ int main (int argc, char *argv[]) try
// ///////////////////////////////////////////
// Create a solver for the rod problem
// ///////////////////////////////////////////
- RodLocalStiffness<GridType::LeafGridView,double> localStiffness(grid.leafView(),
+ RodLocalStiffness<GridType::LeafGridView,double> localStiffness(grid.leafGridView(),
0.01, 0.0001, 0.0001, 2.5e5, 0.3);
- RodAssembler<GridType::LeafGridView,3> rodAssembler(grid.leafView(), &localStiffness);
+ RodAssembler<GridType::LeafGridView,3> rodAssembler(grid.leafGridView(), &localStiffness);
std::cout << "Energy: " << rodAssembler.computeEnergy(x) << std::endl;
--
GitLab