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

Comparing trunk/src/selection/SelectionEvaluator.cpp (file contents):
Revision 1364 by cli2, Wed Oct 7 20:49:50 2009 UTC vs.
Revision 1513 by gezelter, Tue Oct 19 18:40:54 2010 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   #include <stack>
# Line 47 | Line 47
47   #include "primitives/Molecule.hpp"
48   #include "io/basic_ifstrstream.hpp"
49  
50 < namespace oopse {
50 > namespace OpenMD {
51  
52  
53    SelectionEvaluator::SelectionEvaluator(SimInfo* si)
54 <    : info(si), nameFinder(info), distanceFinder(info), indexFinder(info),
54 >    : info(si), nameFinder(info), distanceFinder(info), hullFinder(info),
55 >      indexFinder(info),
56        isLoaded_(false){    
57        nStuntDouble = info->getNGlobalAtoms() + info->getNGlobalRigidBodies();
58      }            
# Line 67 | Line 68 | namespace oopse {
68  
69        sprintf( painCave.errMsg,
70                 "SelectionCompiler Error: %s\n", errorMessage.c_str());
71 <      painCave.severity = OOPSE_ERROR;
71 >      painCave.severity = OPENMD_ERROR;
72        painCave.isFatal = 1;
73        simError();
74        return false;
# Line 122 | Line 123 | namespace oopse {
123      return loadScript(filename, script);
124    }
125    
126 <  void SelectionEvaluator::instructionDispatchLoop(OOPSEBitSet& bs){
126 >  void SelectionEvaluator::instructionDispatchLoop(OpenMDBitSet& bs){
127      
128      while ( pc < aatoken.size()) {
129        statement = aatoken[pc++];
# Line 143 | Line 144 | namespace oopse {
144  
145    }
146  
147 <  OOPSEBitSet SelectionEvaluator::expression(const std::vector<Token>& code,
147 >  OpenMDBitSet SelectionEvaluator::expression(const std::vector<Token>& code,
148                                               int pcStart) {
149 <    OOPSEBitSet bs;
150 <    std::stack<OOPSEBitSet> stack;
149 >    OpenMDBitSet bs;
150 >    std::stack<OpenMDBitSet> stack;
151    
152      for (int pc = pcStart; pc < code.size(); ++pc) {
153        Token instruction = code[pc];
# Line 157 | Line 158 | namespace oopse {
158        case Token::expressionEnd:
159          break;
160        case Token::all:
161 <        bs = OOPSEBitSet(nStuntDouble);
161 >        bs = OpenMDBitSet(nStuntDouble);
162          bs.setAll();
163          stack.push(bs);            
164          break;
165        case Token::none:
166 <        bs = OOPSEBitSet(nStuntDouble);
166 >        bs = OpenMDBitSet(nStuntDouble);
167          stack.push(bs);            
168          break;
169        case Token::opOr:
# Line 181 | Line 182 | namespace oopse {
182        case Token::within:
183          withinInstruction(instruction, stack.top());
184          break;
185 +      case Token::hull:
186 +        stack.push(hull());
187 +        break;
188          //case Token::selected:
189          //  stack.push(getSelectionSet());
190          //  break;
# Line 213 | Line 217 | namespace oopse {
217  
218  
219  
220 <  OOPSEBitSet SelectionEvaluator::comparatorInstruction(const Token& instruction) {
220 >  OpenMDBitSet SelectionEvaluator::comparatorInstruction(const Token& instruction) {
221      int comparator = instruction.tok;
222      int property = instruction.intValue;
223      float comparisonValue = boost::any_cast<float>(instruction.value);
224      float propertyValue;
225 <    OOPSEBitSet bs(nStuntDouble);
225 >    OpenMDBitSet bs(nStuntDouble);
226      bs.clearAll();
227      
228      SimInfo::MoleculeIterator mi;
# Line 244 | Line 248 | namespace oopse {
248      return bs;
249    }
250  
251 <  void SelectionEvaluator::compareProperty(StuntDouble* sd, OOPSEBitSet& bs,
251 >  void SelectionEvaluator::compareProperty(StuntDouble* sd, OpenMDBitSet& bs,
252                                             int property, int comparator,
253                                             float comparisonValue) {
254      RealType propertyValue = 0.0;
# Line 274 | Line 278 | namespace oopse {
278      case Token::z:
279        propertyValue = sd->getPos().z();
280        break;
281 +    case Token::r:
282 +      propertyValue = sd->getPos().length();
283 +      break;
284      default:
285        unrecognizedAtomProperty(property);
286      }
# Line 305 | Line 312 | namespace oopse {
312    }
313  
314    void SelectionEvaluator::withinInstruction(const Token& instruction,
315 <                                             OOPSEBitSet& bs){
315 >                                             OpenMDBitSet& bs){
316      
317      boost::any withinSpec = instruction.value;
318      float distance;
# Line 362 | Line 369 | namespace oopse {
369      }
370    }
371  
372 <  void SelectionEvaluator::select(OOPSEBitSet& bs){
372 >  void SelectionEvaluator::select(OpenMDBitSet& bs){
373      bs = expression(statement, 1);
374    }
375    
376 <  OOPSEBitSet SelectionEvaluator::lookupValue(const std::string& variable){
376 >  OpenMDBitSet SelectionEvaluator::lookupValue(const std::string& variable){
377      
378 <    OOPSEBitSet bs(nStuntDouble);
378 >    OpenMDBitSet bs(nStuntDouble);
379      std::map<std::string, boost::any>::iterator i = variables.find(variable);
380      
381      if (i != variables.end()) {
382 <      if (i->second.type() == typeid(OOPSEBitSet)) {
383 <        return boost::any_cast<OOPSEBitSet>(i->second);
382 >      if (i->second.type() == typeid(OpenMDBitSet)) {
383 >        return boost::any_cast<OpenMDBitSet>(i->second);
384        } else if (i->second.type() ==  typeid(std::vector<Token>)){
385          bs = expression(boost::any_cast<std::vector<Token> >(i->second), 2);
386          i->second =  bs; /**@todo fixme */
# Line 386 | Line 393 | namespace oopse {
393      return bs;
394    }
395    
396 <  OOPSEBitSet SelectionEvaluator::nameInstruction(const std::string& name){    
396 >  OpenMDBitSet SelectionEvaluator::nameInstruction(const std::string& name){    
397      return nameFinder.match(name);    
398    }    
399  
# Line 407 | Line 414 | namespace oopse {
414      //predefine();
415    }
416  
417 <  OOPSEBitSet SelectionEvaluator::evaluate() {
418 <    OOPSEBitSet bs(nStuntDouble);
417 >  OpenMDBitSet SelectionEvaluator::evaluate() {
418 >    OpenMDBitSet bs(nStuntDouble);
419      if (isLoaded_) {
420        pc = 0;
421        instructionDispatchLoop(bs);
# Line 417 | Line 424 | namespace oopse {
424      return bs;
425    }
426  
427 <  OOPSEBitSet SelectionEvaluator::indexInstruction(const boost::any& value) {
428 <    OOPSEBitSet bs(nStuntDouble);
427 >  OpenMDBitSet SelectionEvaluator::indexInstruction(const boost::any& value) {
428 >    OpenMDBitSet bs(nStuntDouble);
429  
430      if (value.type() == typeid(int)) {
431        int index = boost::any_cast<int>(value);
# Line 441 | Line 448 | namespace oopse {
448    }
449  
450  
451 +  OpenMDBitSet SelectionEvaluator::hull() {
452 +    OpenMDBitSet bs(nStuntDouble);
453 +    
454 +    bs = hullFinder.findHull();
455 +    
456 +    return bs;
457 +  }
458 +
459 +
460 +
461    RealType SelectionEvaluator::getCharge(Atom* atom) {
462      RealType charge =0.0;
463      AtomType* atomType = atom->getAtomType();
# Line 455 | Line 472 | namespace oopse {
472          } else {
473            sprintf( painCave.errMsg,
474                     "Can not cast GenericData to DoubleGenericData\n");
475 <          painCave.severity = OOPSE_ERROR;
475 >          painCave.severity = OPENMD_ERROR;
476            painCave.isFatal = 1;
477            simError();          
478          }

Comparing trunk/src/selection/SelectionEvaluator.cpp (property svn:keywords):
Revision 1364 by cli2, Wed Oct 7 20:49:50 2009 UTC vs.
Revision 1513 by gezelter, Tue Oct 19 18:40:54 2010 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines