ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/brains/SimInfo.cpp
(Generate patch)

Comparing branches/development/src/brains/SimInfo.cpp (file contents):
Revision 1528 by gezelter, Fri Dec 17 20:11:05 2010 UTC vs.
Revision 1529 by gezelter, Mon Dec 27 18:35:59 2010 UTC

# Line 684 | Line 684 | namespace OpenMD {
684      Atom* atom;
685      set<AtomType*> atomTypes;
686      
687 <    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {
688 <      
687 >    for(mol = beginMolecule(mi); mol != NULL; mol = nextMolecule(mi)) {      
688        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
689          atomTypes.insert(atom->getAtomType());
690 <      }
691 <      
693 <    }
694 <    
690 >      }      
691 >    }    
692      return atomTypes;        
693    }
694  
# Line 1005 | Line 1002 | namespace OpenMD {
1002          } else {
1003            // throw error        
1004            sprintf( painCave.errMsg,
1005 <                   "SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".", funcType.c_str() );
1005 >                   "SimInfo error: Unknown switchingFunctionType. (Input file specified %s .)\n"
1006 >                   "\tswitchingFunctionType must be one of: \"cubic\" or \"fifth_order_polynomial\".",
1007 >                   funcType.c_str() );
1008            painCave.isFatal = 1;
1009            simError();
1010          }          

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines