ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/selection/SelectionEvaluator.hpp
(Generate patch)

Comparing trunk/src/selection/SelectionEvaluator.hpp (file contents):
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
Revision 1364 by cli2, Wed Oct 7 20:49:50 2009 UTC

# Line 68 | Line 68 | namespace oopse {
68  
69      SelectionEvaluator(SimInfo* info);
70  
71
71      bool loadScriptString(const std::string& script);
72      bool loadScriptFile(const std::string& filename);
73          
# Line 132 | Line 131 | namespace oopse {
131      OOPSEBitSet lookupValue(const std::string& variable);
132          
133      void evalError(const std::string& message) {
134 <      std::cerr << "SelectionEvaulator Error: " << message <<  std::endl;
134 >      sprintf( painCave.errMsg,
135 >               "SelectionEvaluator Error: %s\n", message.c_str());
136 >      painCave.severity = OOPSE_ERROR;
137 >      painCave.isFatal = 1;
138 >      simError();
139      }
140  
141      void unrecognizedCommand(const Token& token) {
# Line 162 | Line 165 | namespace oopse {
165          
166      bool containDynamicToken(const std::vector<Token>& tokens);
167  
168 <    double getCharge(Atom* atom);
168 >    RealType getCharge(Atom* atom);
169          
170      SelectionCompiler compiler;
171  
# Line 188 | Line 191 | namespace oopse {
191      NameFinder nameFinder;
192      DistanceFinder distanceFinder;
193      IndexFinder indexFinder;
194 <    int nStuntDouble;   //natoms + nrigidbodies
194 >    int nStuntDouble;   //nGLOBALatoms + nGLOBALrigidbodies
195  
196      typedef std::map<std::string, boost::any > VariablesType;
197      VariablesType variables;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines