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 1801 by gezelter, Mon Oct 1 18:21:15 2012 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]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #ifndef SELECTION_SELECTIONEVALUATOR_HPP
# Line 52 | Line 53
53   #include "selection/SelectionCompiler.hpp"
54   #include "selection/NameFinder.hpp"
55   #include "selection/DistanceFinder.hpp"
56 + #include "selection/HullFinder.hpp"
57   #include "selection/IndexFinder.hpp"
58 < #include "utils/OOPSEBitSet.hpp"
58 > #include "utils/OpenMDBitSet.hpp"
59   #include "primitives/StuntDouble.hpp"
60   #include "utils/StringUtils.hpp"
61 < namespace oopse {
61 > namespace OpenMD {
62  
63  
64    /**
65     * @class SelectionEvaluator SelectionEvaluator.hpp "selection/SelectionEvaluator"
66 <   * @brief Evalute the tokens compiled by SelectionCompiler and return a OOPSEBitSet
66 >   * @brief Evalute the tokens compiled by SelectionCompiler and return a OpenMDBitSet
67     */
68    class SelectionEvaluator{
69    public:
70  
71      SelectionEvaluator(SimInfo* info);
72  
71
73      bool loadScriptString(const std::string& script);
74      bool loadScriptFile(const std::string& filename);
75          
76 <    OOPSEBitSet evaluate();
76 >    OpenMDBitSet evaluate();
77          
78      /**
79       * Tests if the result from evaluation of script is dynamic.
# Line 116 | Line 117 | namespace oopse {
117      void clearDefinitionsAndLoadPredefined();
118          
119      void define();
120 <    void select(OOPSEBitSet& bs);
120 >    void select(OpenMDBitSet& bs);
121      void predefine(const std::string& script);
122  
123 <    void instructionDispatchLoop(OOPSEBitSet& bs);
123 >    void instructionDispatchLoop(OpenMDBitSet& bs);
124  
125 <    void withinInstruction(const Token& instruction, OOPSEBitSet& bs);
125 >    void withinInstruction(const Token& instruction, OpenMDBitSet& bs);
126 >    OpenMDBitSet allInstruction();
127          
128 <    OOPSEBitSet comparatorInstruction(const Token& instruction);
129 <    void compareProperty(StuntDouble* sd, OOPSEBitSet& bs, int property, int comparator, float comparisonValue);
130 <    OOPSEBitSet nameInstruction(const std::string& name);
131 <    OOPSEBitSet indexInstruction(const boost::any& value);
132 <    OOPSEBitSet expression(const std::vector<Token>& tokens, int pc);
128 >    OpenMDBitSet comparatorInstruction(const Token& instruction);
129 >    void compareProperty(StuntDouble* sd, OpenMDBitSet& bs, int property, int comparator, float comparisonValue);
130 >    OpenMDBitSet nameInstruction(const std::string& name);
131 >    OpenMDBitSet indexInstruction(const boost::any& value);
132 >    OpenMDBitSet expression(const std::vector<Token>& tokens, int pc);
133  
134 <    OOPSEBitSet lookupValue(const std::string& variable);
134 >    OpenMDBitSet lookupValue(const std::string& variable);
135 >
136 >    OpenMDBitSet hull();
137          
138      void evalError(const std::string& message) {
139 <      std::cerr << "SelectionEvaulator Error: " << message <<  std::endl;
139 >      sprintf( painCave.errMsg,
140 >               "SelectionEvaluator Error: %s\n", message.c_str());
141 >      painCave.severity = OPENMD_ERROR;
142 >      painCave.isFatal = 1;
143 >      simError();
144      }
145  
146      void unrecognizedCommand(const Token& token) {
# Line 162 | Line 170 | namespace oopse {
170          
171      bool containDynamicToken(const std::vector<Token>& tokens);
172  
173 <    double getCharge(Atom* atom);
173 >    RealType getCharge(Atom* atom);
174          
175      SelectionCompiler compiler;
176  
# Line 176 | Line 184 | namespace oopse {
184      std::vector<int> linenumbers;
185      std::vector<int> lineIndices;
186      std::vector<std::vector<Token> > aatoken;
187 <    int pc; // program counter
187 >    unsigned int pc; // program counter
188  
189      bool error;
190      std::string errorMessage;
# Line 187 | Line 195 | namespace oopse {
195      SimInfo* info;
196      NameFinder nameFinder;
197      DistanceFinder distanceFinder;
198 +    HullFinder hullFinder;
199      IndexFinder indexFinder;
200 <    int nStuntDouble;   //natoms + nrigidbodies
200 >    int nStuntDouble;   //nGLOBALatoms + nGLOBALrigidbodies
201  
202      typedef std::map<std::string, boost::any > VariablesType;
203      VariablesType variables;

Comparing trunk/src/selection/SelectionEvaluator.hpp (property svn:keywords):
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
Revision 1801 by gezelter, Mon Oct 1 18:21:15 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines