diff --git a/src/rodassembler.cc b/src/rodassembler.cc index 5976108bf37a1d83d473e3db0757ef2a59fa9b3b..1df607afca466e926a1135bfb9c2111bf4487948 100644 --- a/src/rodassembler.cc +++ b/src/rodassembler.cc @@ -45,54 +45,6 @@ getNeighborsPerVertex(Dune::MatrixIndexSet& nb) const } - -template <class GridType> -void RodAssembler<GridType>:: -assembleMatrix(const std::vector<RigidBodyMotion<3> >& sol, - Dune::BCRSMatrix<MatrixBlock>& matrix) const -{ - const typename GridType::Traits::LevelIndexSet& indexSet = grid_->levelIndexSet(grid_->maxLevel()); - - Dune::MatrixIndexSet neighborsPerVertex; - getNeighborsPerVertex(neighborsPerVertex); - - matrix = 0; - - ElementIterator it = grid_->template lbegin<0>( grid_->maxLevel() ); - ElementIterator endit = grid_->template lend<0> ( grid_->maxLevel() ); - - for( ; it != endit; ++it ) { - - const Dune::LagrangeShapeFunctionSet<double, double, gridDim> & baseSet - = Dune::LagrangeShapeFunctions<double, double, gridDim>::general(it->type(), elementOrder); - const int numOfBaseFct = baseSet.size(); - - // Extract local solution - std::vector<RigidBodyMotion<3> > localSolution(numOfBaseFct); - - for (int i=0; i<numOfBaseFct; i++) - localSolution[i] = sol[indexSet.subIndex(*it,i,gridDim)]; - - // setup matrix - this->localStiffness_->assemble(*it, localSolution); - - // Add element matrix to global stiffness matrix - for(int i=0; i<numOfBaseFct; i++) { - - int row = indexSet.subIndex(*it,i,gridDim); - - for (int j=0; j<numOfBaseFct; j++ ) { - - int col = indexSet.subIndex(*it,j,gridDim); - matrix[row][col] += this->localStiffness_->mat(i,j); - - } - } - - } - -} - template <class GridType> void RodAssembler<GridType>:: assembleGradient(const std::vector<RigidBodyMotion<3> >& sol, diff --git a/src/rodassembler.hh b/src/rodassembler.hh index f20fa53412a29e74e2d64fdf2f82917c805a7010..34a8a6ab1f6791fabdcdf89c58838142c969ebea 100644 --- a/src/rodassembler.hh +++ b/src/rodassembler.hh @@ -65,11 +65,6 @@ class RodAssembler : public GeodesicFEAssembler<typename GridType::LeafGridView, dynamic_cast<RodLocalStiffness<typename GridType::LeafGridView, double>* >(this->localStiffness_)->setReferenceConfiguration(referenceConfiguration); } - /** \brief Assemble the tangent stiffness matrix - */ - void assembleMatrix(const std::vector<RigidBodyMotion<3> >& sol, - Dune::BCRSMatrix<MatrixBlock>& matrix) const; - void assembleGradient(const std::vector<RigidBodyMotion<3> >& sol, Dune::BlockVector<Dune::FieldVector<double, blocksize> >& grad) const;