From 14b8dffcf45da1ebaa80f14ea00d45db21e7e79c Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Wed, 12 Oct 2011 15:00:21 +0000 Subject: [PATCH] remove some out-commented code [[Imported from SVN: r7880]] --- dune/gfe/coupling/rodcontinuumddstep.hh | 104 ------------------------ 1 file changed, 104 deletions(-) diff --git a/dune/gfe/coupling/rodcontinuumddstep.hh b/dune/gfe/coupling/rodcontinuumddstep.hh index a5547073..b6c084ff 100644 --- a/dune/gfe/coupling/rodcontinuumddstep.hh +++ b/dune/gfe/coupling/rodcontinuumddstep.hh @@ -152,110 +152,6 @@ public: }; -#if 0 -template <class RodGridType, class ContinuumGridType> -void RodContinuumFixedPointStep<RodGridType,ContinuumGridType>:: -mergeRodDirichletAndCouplingBoundaries() -{ - //////////////////////////////////////////////////////////////////////////////////// - // For each rod, merge the Dirichlet boundary with all interface boundaries - // - // Currently, we can really only solve rod problems with complete Dirichlet - // boundary. Hence there are more direct ways to construct the - // dirichletAndCouplingNodes field. Yet like to keep the analogy to the continuum - // problem. And maybe one day we have a more flexible rod solver, too. - //////////////////////////////////////////////////////////////////////////////////// - - for (RodIterator rIt = rods_.begin(); rIt != rods_.end(); ++rIt) { - - // name of the current rod - const std::string& name = rIt->first; - - // short-cut to avoid frequent map look-up - Dune::BitSetVector<6>& dirichletAndCouplingNodes = rods_[name].dirichletAndCouplingNodes_; - - dirichletAndCouplingNodes.resize(complex_.rodGrid(name)->size(1)); - - // first copy the true Dirichlet boundary - const BoundaryPatch<typename RodGridType::LeafGridView>& dirichletBoundary = complex_.rods_.find(name)->second.dirichletBoundary_; - - for (int i=0; i<dirichletAndCouplingNodes.size(); i++) - dirichletAndCouplingNodes[i] = dirichletBoundary.containsVertex(i); - - // get the names of all the continua that we couple with - std::set<std::string> continuumNames = continuaPerRod(name); - - for (std::set<std::string>::const_iterator cIt = continuumNames.begin(); - cIt != continuumNames.end(); - ++cIt) { - - const BoundaryPatch<typename RodGridType::LeafGridView>& rodInterfaceBoundary - = complex_.coupling(std::make_pair(name,*cIt)).rodInterfaceBoundary_; - - /** \todo Use the BoundaryPatch iterator here, for increased efficiency */ - for (int i=0; i<dirichletAndCouplingNodes.size(); i++) { - bool v = rodInterfaceBoundary.containsVertex(i); - for (int j=0; j<6; j++) - dirichletAndCouplingNodes[i][j] = dirichletAndCouplingNodes[i][j] or v; - } - - } - - // We can only handle rod problems with a full Dirichlet boundary - assert(dirichletAndCouplingNodes.count()==12); - - } - -} - - -template <class RodGridType, class ContinuumGridType> -void RodContinuumFixedPointStep<RodGridType,ContinuumGridType>:: -mergeContinuumDirichletAndCouplingBoundaries() -{ - //////////////////////////////////////////////////////////////////////////////////// - // For each continuum, merge the Dirichlet boundary with all interface boundaries - //////////////////////////////////////////////////////////////////////////////////// - - for (ContinuumIterator cIt = continua_.begin(); cIt != continua_.end(); ++cIt) { - - // name of the current continuum - const std::string& name = cIt->first; - - // short-cut to avoid frequent map look-up - Dune::BitSetVector<dim>& dirichletAndCouplingNodes = continua_[name].dirichletAndCouplingNodes_; - - dirichletAndCouplingNodes.resize(complex_.continuumGrid(name)->size(dim)); - - // first copy the true Dirichlet boundary - const BoundaryPatch<typename ContinuumGridType::LeafGridView>& dirichletBoundary = complex_.continua_.find(name)->second.dirichletBoundary_; - - for (int i=0; i<dirichletAndCouplingNodes.size(); i++) - dirichletAndCouplingNodes[i] = dirichletBoundary.containsVertex(i); - - // get the names of all the rods that we couple with - std::set<std::string> rodNames = rodsPerContinuum(name); - - for (std::set<std::string>::const_iterator rIt = rodNames.begin(); - rIt != rodNames.end(); - ++rIt) { - - const BoundaryPatch<typename ContinuumGridType::LeafGridView>& continuumInterfaceBoundary - = complex_.coupling(std::make_pair(*rIt,name)).continuumInterfaceBoundary_; - - /** \todo Use the BoundaryPatch iterator here, for increased efficiency */ - for (int i=0; i<dirichletAndCouplingNodes.size(); i++) { - bool v = continuumInterfaceBoundary.containsVertex(i); - for (int j=0; j<dim; j++) - dirichletAndCouplingNodes[i][j] = dirichletAndCouplingNodes[i][j] or v; - } - - } - - } - -} -#endif template <class RodGridType, class ContinuumGridType> std::set<std::string> RodContinuumDDStep<RodGridType,ContinuumGridType>:: -- GitLab