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

Comparing trunk/src/selection/SelectionToken.hpp (file contents):
Revision 1515 by gezelter, Tue Oct 19 20:17:37 2010 UTC vs.
Revision 1931 by gezelter, Mon Aug 19 19:20:32 2013 UTC

# Line 35 | Line 35
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).                        
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (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_TOKEN_HPP
# Line 121 | Line 122 | namespace OpenMD {
122      const  static int embeddedExpression= (1 << 19); // embedded expression
123      const static int index = (1 << 20) | expression;
124      // rasmol commands
125 <    const static int define       = command | expressionCommand |1;
126 <    const static int select       = command |expressionCommand |2 ;
125 >    const static int define       = command | expressionCommand | 1;
126 >    const static int select       = command | expressionCommand | 2 ;
127  
128      //predefine
129      //const static int selected    = predefinedset |0;
# Line 141 | Line 142 | namespace OpenMD {
142      const static int none         = expression | 10;
143      const static int name         = expression | 11;
144      const static int hull         = expression | dynamic | 12;
145 +
146      // miguel 2005 01 01
147      // these are used to demark the beginning and end of expressions
148      // they do not exist in the source code, but are emitted by the
# Line 149 | Line 151 | namespace OpenMD {
151      const static int expressionEnd   = expression | 101;
152  
153      const static int mass         = atomproperty | 0;
154 <    const static int charge       = atomproperty | 1;
154 >    const static int charge       = atomproperty | dynamic | 1;
155      const static int x            = atomproperty | dynamic | 2;
156      const static int y            = atomproperty | dynamic | 3;
157      const static int z            = atomproperty | dynamic | 4;
158      const static int r            = atomproperty | dynamic | 5;
159 +    const static int wrappedX     = atomproperty | dynamic | 6;
160 +    const static int wrappedY     = atomproperty | dynamic | 7;
161 +    const static int wrappedZ     = atomproperty | dynamic | 8;
162          
163      const static int opGT         = comparator |  dynamic | 0;
164      const static int opGE         = comparator |  dynamic | 1;

Diff Legend

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