From fb5ac1cfea28735f2aca33c0f14ef2e050ee8ede Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Sun, 23 Jan 2011 11:14:15 +0000
Subject: [PATCH] use a map to store the continuum forces
[[Imported from SVN: r6832]]
---
dune/gfe/coupling/rodcontinuumsteklovpoincarestep.hh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dune/gfe/coupling/rodcontinuumsteklovpoincarestep.hh b/dune/gfe/coupling/rodcontinuumsteklovpoincarestep.hh
index 7c5cfb73..8c958b87 100644
--- a/dune/gfe/coupling/rodcontinuumsteklovpoincarestep.hh
+++ b/dune/gfe/coupling/rodcontinuumsteklovpoincarestep.hh
@@ -617,10 +617,10 @@ iterate(std::map<std::pair<std::string,std::string>, RigidBodyMotion<3> >& lambd
// Evaluate the Dirichlet-to-Neumann map for the continuum
///////////////////////////////////////////////////////////////////
- std::map<std::pair<std::string,std::string>, RigidBodyMotion<3>::TangentVector > tmpContinuumForceTorque = continuumDirichletToNeumannMap("continuum", lambda);
+ std::map<std::pair<std::string,std::string>, RigidBodyMotion<3>::TangentVector > continuumForceTorque
+ = continuumDirichletToNeumannMap("continuum", lambda);
- RigidBodyMotion<3>::TangentVector continuumForceTorque = tmpContinuumForceTorque[std::make_pair("rod","continuum")];
- std::cout << "resultant continuum force and torque: " << continuumForceTorque << std::endl;
+ std::cout << "resultant continuum force and torque: " << continuumForceTorque[interfaceName] << std::endl;
///////////////////////////////////////////////////////////////
// Compute the overall Steklov-Poincare residual
@@ -629,7 +629,7 @@ iterate(std::map<std::pair<std::string,std::string>, RigidBodyMotion<3> >& lambd
// Flip orientation to account for opposing normals
rodForceTorque *= -1;
- RigidBodyMotion<3>::TangentVector residualForceTorque = rodForceTorque + continuumForceTorque;
+ RigidBodyMotion<3>::TangentVector residualForceTorque = rodForceTorque + continuumForceTorque[interfaceName];
///////////////////////////////////////////////////////////////
--
GitLab