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

Comparing trunk/src/applications/dump2Xyz/Dump2XYZ.cpp (file contents):
Revision 413 by tim, Wed Mar 9 17:30:29 2005 UTC vs.
Revision 543 by tim, Thu May 26 22:45:00 2005 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 57 | Line 57
57   #include "selection/SelectionEvaluator.hpp"
58   #include "selection/SelectionManager.hpp"
59   #include "visitors/LipidTransVisitor.hpp"
60 + #include "visitors/AtomNameVisitor.hpp"
61  
62   using namespace oopse;
63  
# Line 99 | Line 100 | int main(int argc, char* argv[]){
100    
101    
102    
103 <  //creat visitor list
103 >  //create visitor list
104    CompositeVisitor* compositeVisitor = new CompositeVisitor();
105      
106 <  //creat RigidBody Visitor
106 >  //create RigidBody Visitor
107    if(args_info.rigidbody_flag){
108      RBCOMVisitor* rbCOMVisitor = new RBCOMVisitor(info);
109      compositeVisitor->addVisitor(rbCOMVisitor, 900);
110    }
111    
112 <  //creat SSD atom visitor
112 >  //create SSD atom visitor
113    SSDAtomVisitor* ssdVisitor = new SSDAtomVisitor(info);
114    compositeVisitor->addVisitor(ssdVisitor, 800);
115    
116    LinearAtomVisitor* linearVisitor = new LinearAtomVisitor(info);
117    compositeVisitor->addVisitor(linearVisitor, 750);
118    
119 <  //creat default atom visitor
119 >  //create default atom visitor
120    DefaultAtomVisitor* defaultAtomVisitor = new DefaultAtomVisitor(info);
121    compositeVisitor->addVisitor(defaultAtomVisitor, 700);
122    
123 <  //creat waterType visitor
123 >  //create waterType visitor
124    if(args_info.watertype_flag){
125      WaterTypeVisitor* waterTypeVisitor = new WaterTypeVisitor;
126      compositeVisitor->addVisitor(waterTypeVisitor, 600);
127    }
128 +
129 +  if (args_info.basetype_flag) {
130 +      AtomNameVisitor* atomNameVisitor = new AtomNameVisitor(info);
131 +      compositeVisitor->addVisitor(atomNameVisitor, 550);
132 +
133 +  }
134    
135    //create ZconsVisitor
136    if(args_info.zconstraint_flag){
# Line 137 | Line 144 | int main(int argc, char* argv[]){
144      }
145    }
146    
147 <  //creat wrapping visitor
147 >  //create wrapping visitor
148    
149    if(args_info.periodicBox_flag){
150      WrappingVisitor* wrappingVisitor = new WrappingVisitor(info);
151      compositeVisitor->addVisitor(wrappingVisitor, 400);
152    }
153  
154 <  //creat replicate visitor
154 >  //create replicate visitor
155    if(args_info.repeatX_given > 0 || args_info.repeatY_given > 0 ||args_info.repeatY_given > 0){
156      Vector3i replicateOpt(args_info.repeatX_arg, args_info.repeatY_arg, args_info.repeatZ_arg);
157      ReplicateVisitor* replicateVisitor = new ReplicateVisitor(info, replicateOpt);
# Line 160 | Line 167 | int main(int argc, char* argv[]){
167      exit(1);
168    }
169      
170 <  //creat xyzVisitor
170 >  //create xyzVisitor
171    XYZVisitor* xyzVisitor;
172    if (args_info.selection_given) {
173      xyzVisitor = new XYZVisitor(info, args_info.selection_arg);
# Line 171 | Line 178 | int main(int argc, char* argv[]){
178    
179    std::cout << compositeVisitor->toString();
180    
181 <  //creat prepareVisitor
181 >  //create prepareVisitor
182    PrepareVisitor* prepareVisitor = new PrepareVisitor();
183    
184    //open dump file
# Line 229 | Line 236 | int main(int argc, char* argv[]){
236    
237    xyzStream.close();
238    
239 <  
239 >  delete prepareVisitor;
240    delete compositeVisitor;
241    delete info;
242    

Diff Legend

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