ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/integrators/LDForceManager.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/integrators/LDForceManager.cpp (file contents):
Revision 2766 by gezelter, Wed May 24 15:24:52 2006 UTC vs.
Revision 2767 by tim, Wed May 24 16:18:00 2006 UTC

# Line 123 | Line 123 | namespace oopse {
123          painCave.isFatal = 1;
124          simError();  
125        }      
126 <      std::map<std::string, HydroProp>::iterator iter = hydroPropMap.find(integrableObject->getType());
127 <      if (iter != hydroPropMap.end()) {
128 <        hydroProps_.push_back(iter->second);
129 <      } else {
130 <        sprintf( painCave.errMsg,
131 <                 "Can not find resistance tensor for atom [%s]\n", integrableObject->getType().c_str());
132 <        painCave.severity = OOPSE_ERROR;
133 <        painCave.isFatal = 1;
134 <        simError();  
126 >
127 >      for (mol = info->beginMolecule(i); mol != NULL;
128 >           mol = info->nextMolecule(i)) {
129 >        for (integrableObject = mol->beginIntegrableObject(j);
130 >             integrableObject != NULL;
131 >             integrableObject = mol->nextIntegrableObject(j)) {
132 >
133 >          std::map<std::string, HydroProp>::iterator iter = hydroPropMap.find(integrableObject->getType());
134 >          if (iter != hydroPropMap.end()) {
135 >            hydroProps_.push_back(iter->second);
136 >          } else {
137 >            sprintf( painCave.errMsg,
138 >                     "Can not find resistance tensor for atom [%s]\n", integrableObject->getType().c_str());
139 >            painCave.severity = OOPSE_ERROR;
140 >            painCave.isFatal = 1;
141 >            simError();  
142 >          }        
143 >        }
144        }
145      } else {
146  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines