Skip to content
Snippets Groups Projects
Commit 006ef150 authored by Oliver Sander's avatar Oliver Sander Committed by sander@PCPOOL.MI.FU-BERLIN.DE
Browse files

don't keep a grid view -- there is already one in the base class

[[Imported from SVN: r5691]]
parent 8436c76c
No related branches found
No related tags found
No related merge requests found
...@@ -18,7 +18,7 @@ assembleGradient(const std::vector<RigidBodyMotion<3> >& sol, ...@@ -18,7 +18,7 @@ assembleGradient(const std::vector<RigidBodyMotion<3> >& sol,
{ {
using namespace Dune; 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)) if (sol.size()!=indexSet.size(gridDim))
DUNE_THROW(Exception, "Solution vector doesn't match the grid!"); DUNE_THROW(Exception, "Solution vector doesn't match the grid!");
...@@ -26,8 +26,8 @@ assembleGradient(const std::vector<RigidBodyMotion<3> >& sol, ...@@ -26,8 +26,8 @@ assembleGradient(const std::vector<RigidBodyMotion<3> >& sol,
grad.resize(sol.size()); grad.resize(sol.size());
grad = 0; grad = 0;
ElementIterator it = gridView_.template begin<0>(); ElementIterator it = this->gridView_.template begin<0>();
ElementIterator endIt = gridView_.template end<0>(); ElementIterator endIt = this->gridView_.template end<0>();
// Loop over all elements // Loop over all elements
for (; it!=endIt; ++it) { for (; it!=endIt; ++it) {
...@@ -62,7 +62,7 @@ getStrain(const std::vector<RigidBodyMotion<3> >& sol, ...@@ -62,7 +62,7 @@ getStrain(const std::vector<RigidBodyMotion<3> >& sol,
{ {
using namespace Dune; 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)) if (sol.size()!=indexSet.size(gridDim))
DUNE_THROW(Exception, "Solution vector doesn't match the grid!"); DUNE_THROW(Exception, "Solution vector doesn't match the grid!");
...@@ -71,8 +71,8 @@ getStrain(const std::vector<RigidBodyMotion<3> >& sol, ...@@ -71,8 +71,8 @@ getStrain(const std::vector<RigidBodyMotion<3> >& sol,
strain.resize(indexSet.size(0)); strain.resize(indexSet.size(0));
strain = 0; strain = 0;
ElementIterator it = gridView_.template begin<0>(); ElementIterator it = this->gridView_.template begin<0>();
ElementIterator endIt = gridView_.template end<0>(); ElementIterator endIt = this->gridView_.template end<0>();
// Loop over all elements // Loop over all elements
for (; it!=endIt; ++it) { for (; it!=endIt; ++it) {
...@@ -151,7 +151,7 @@ getResultantForce(const BoundaryPatchBase<PatchGridView>& boundary, ...@@ -151,7 +151,7 @@ getResultantForce(const BoundaryPatchBase<PatchGridView>& boundary,
// if (gridView_ != &boundary.gridView()) // if (gridView_ != &boundary.gridView())
// DUNE_THROW(Dune::Exception, "The boundary patch has to match the grid view of the assembler!"); // 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)) if (sol.size()!=indexSet.size(gridDim))
DUNE_THROW(Exception, "Solution vector doesn't match the grid!"); DUNE_THROW(Exception, "Solution vector doesn't match the grid!");
......
...@@ -33,15 +33,11 @@ class RodAssembler : public GeodesicFEAssembler<GridView, RigidBodyMotion<3> > ...@@ -33,15 +33,11 @@ class RodAssembler : public GeodesicFEAssembler<GridView, RigidBodyMotion<3> >
//! //!
typedef Dune::FieldMatrix<double, blocksize, blocksize> MatrixBlock; typedef Dune::FieldMatrix<double, blocksize, blocksize> MatrixBlock;
/** \todo public only for debugging! */ public:
public:
GridView gridView_;
//! ??? //! ???
RodAssembler(const GridView &gridView, RodAssembler(const GridView &gridView,
RodLocalStiffness<GridView,double>* localStiffness) RodLocalStiffness<GridView,double>* localStiffness)
: GeodesicFEAssembler<GridView, RigidBodyMotion<3> >(gridView,localStiffness), : GeodesicFEAssembler<GridView, RigidBodyMotion<3> >(gridView,localStiffness)
gridView_(gridView)
{ {
std::vector<RigidBodyMotion<3> > referenceConfiguration(gridView.size(gridDim)); std::vector<RigidBodyMotion<3> > referenceConfiguration(gridView.size(gridDim));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment