From 4d82fc595d9ff9ab42e50fe8e98ca212d89d3ecf Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Sat, 2 Apr 2011 16:13:40 +0000
Subject: [PATCH] constructor for more than a single rod/continuum
[[Imported from SVN: r7057]]
---
.../coupling/rodcontinuumfixedpointstep.hh | 37 +++----------------
1 file changed, 6 insertions(+), 31 deletions(-)
diff --git a/dune/gfe/coupling/rodcontinuumfixedpointstep.hh b/dune/gfe/coupling/rodcontinuumfixedpointstep.hh
index 60b55fb4..59f14375 100644
--- a/dune/gfe/coupling/rodcontinuumfixedpointstep.hh
+++ b/dune/gfe/coupling/rodcontinuumfixedpointstep.hh
@@ -57,26 +57,15 @@ public:
mergeContinuumDirichletAndCouplingBoundaries();
}
-#if 0
/** \brief Constructor for a general complex */
RodContinuumFixedPointStep(const RodContinuumComplex<RodGridType,ContinuumGridType>& complex,
- const std::string& preconditioner,
- const Dune::array<double,2>& alpha,
- double richardsonDamping,
- const std::map<std::string,RodAssembler<typename RodGridType::LeafGridView,3>*>& rodAssembler,
- const std::map<std::string,RodLocalStiffness<typename RodGridType::LeafGridView,double>*>& rodLocalStiffness,
- const std::map<std::string,RiemannianTrustRegionSolver<RodGridType,RigidBodyMotion<3> >*>& rodSolver,
- const std::map<std::string,const MatrixType*>& stiffnessMatrix3d,
- const std::map<std::string, const Dune::shared_ptr< ::LoopSolver<VectorType> > >& solver,
- const std::map<std::string,LinearLocalAssembler<ContinuumGridType,
- ContinuumLocalFiniteElement,
- ContinuumLocalFiniteElement,
- Dune::FieldMatrix<double,dim,dim> >*>& localAssembler)
+ double damping,
+ const std::map<std::string,RodAssembler<typename RodGridType::LeafGridView,3>*>& rodAssembler,
+ const std::map<std::string,RiemannianTrustRegionSolver<RodGridType,RigidBodyMotion<3> >*>& rodSolver,
+ const std::map<std::string,const MatrixType*>& stiffnessMatrix3d,
+ const std::map<std::string, const Dune::shared_ptr< ::LoopSolver<VectorType> > >& solver)
: complex_(complex),
- preconditioner_(preconditioner),
- alpha_(alpha),
- richardsonDamping_(richardsonDamping),
- neumannRegularization_(0)
+ damping_(damping)
{
///////////////////////////////////////////////////////////////////////////////////
// Rod-related data
@@ -86,11 +75,6 @@ public:
++it)
rods_[it->first].assembler_ = it->second;
- for (typename std::map<std::string,RodLocalStiffness<typename RodGridType::LeafGridView,double>*>::const_iterator it = rodLocalStiffness.begin();
- it != rodLocalStiffness.end();
- ++it)
- rods_[it->first].localStiffness_ = it->second;
-
for (typename std::map<std::string,RiemannianTrustRegionSolver<RodGridType,RigidBodyMotion<3> >*>::const_iterator it = rodSolver.begin();
it != rodSolver.end();
++it)
@@ -109,18 +93,9 @@ public:
++it)
continua_[it->first].solver_ = it->second;
- for (typename std::map<std::string,LinearLocalAssembler<ContinuumGridType,
- ContinuumLocalFiniteElement,
- ContinuumLocalFiniteElement,
- Dune::FieldMatrix<double,dim,dim> >*>::const_iterator it = localAssembler.begin();
- it != localAssembler.end();
- ++it)
- continua_[it->first].localAssembler_ = it->second;
-
mergeRodDirichletAndCouplingBoundaries();
mergeContinuumDirichletAndCouplingBoundaries();
}
-#endif
void mergeRodDirichletAndCouplingBoundaries();
--
GitLab