diff --git a/src/rodassembler.cc b/src/rodassembler.cc index e769bf699c165b9eba1479fb05d540d79b7d5fa9..5e439209e3d41f85f1b94dc15ac3bed6b375204d 100644 --- a/src/rodassembler.cc +++ b/src/rodassembler.cc @@ -18,7 +18,7 @@ assembleGradient(const std::vector<RigidBodyMotion<3> >& sol, { using namespace Dune; - const typename GridView::Traits::IndexSet& indexSet = gridView_.indexSet(); + const typename GridView::Traits::IndexSet& indexSet = this->gridView_.indexSet(); if (sol.size()!=indexSet.size(gridDim)) DUNE_THROW(Exception, "Solution vector doesn't match the grid!"); @@ -26,8 +26,8 @@ assembleGradient(const std::vector<RigidBodyMotion<3> >& sol, grad.resize(sol.size()); grad = 0; - ElementIterator it = gridView_.template begin<0>(); - ElementIterator endIt = gridView_.template end<0>(); + ElementIterator it = this->gridView_.template begin<0>(); + ElementIterator endIt = this->gridView_.template end<0>(); // Loop over all elements for (; it!=endIt; ++it) { @@ -62,7 +62,7 @@ getStrain(const std::vector<RigidBodyMotion<3> >& sol, { using namespace Dune; - const typename GridView::Traits::IndexSet& indexSet = gridView_.indexSet(); + const typename GridView::Traits::IndexSet& indexSet = this->gridView_.indexSet(); if (sol.size()!=indexSet.size(gridDim)) DUNE_THROW(Exception, "Solution vector doesn't match the grid!"); @@ -71,8 +71,8 @@ getStrain(const std::vector<RigidBodyMotion<3> >& sol, strain.resize(indexSet.size(0)); strain = 0; - ElementIterator it = gridView_.template begin<0>(); - ElementIterator endIt = gridView_.template end<0>(); + ElementIterator it = this->gridView_.template begin<0>(); + ElementIterator endIt = this->gridView_.template end<0>(); // Loop over all elements for (; it!=endIt; ++it) { @@ -151,7 +151,7 @@ getResultantForce(const BoundaryPatchBase<PatchGridView>& boundary, // if (gridView_ != &boundary.gridView()) // DUNE_THROW(Dune::Exception, "The boundary patch has to match the grid view of the assembler!"); - const typename GridView::Traits::IndexSet& indexSet = gridView_.indexSet(); + const typename GridView::Traits::IndexSet& indexSet = this->gridView_.indexSet(); if (sol.size()!=indexSet.size(gridDim)) DUNE_THROW(Exception, "Solution vector doesn't match the grid!"); diff --git a/src/rodassembler.hh b/src/rodassembler.hh index a068536922eee7340c731edb54a6f44016afca32..3f699d79ccb745ca42bd8afce5763ca387ce40c4 100644 --- a/src/rodassembler.hh +++ b/src/rodassembler.hh @@ -33,15 +33,11 @@ class RodAssembler : public GeodesicFEAssembler<GridView, RigidBodyMotion<3> > //! typedef Dune::FieldMatrix<double, blocksize, blocksize> MatrixBlock; - /** \todo public only for debugging! */ - public: - GridView gridView_; - +public: //! ??? RodAssembler(const GridView &gridView, RodLocalStiffness<GridView,double>* localStiffness) - : GeodesicFEAssembler<GridView, RigidBodyMotion<3> >(gridView,localStiffness), - gridView_(gridView) + : GeodesicFEAssembler<GridView, RigidBodyMotion<3> >(gridView,localStiffness) { std::vector<RigidBodyMotion<3> > referenceConfiguration(gridView.size(gridDim));