ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/visitors/CompositeVisitor.cpp
(Generate patch)

Comparing:
trunk/src/visitors/CompositeVisitor.cpp (file contents), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/visitors/CompositeVisitor.cpp (file contents), Revision 1874 by gezelter, Wed May 15 15:09:35 2013 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, 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   #include <cstring>
# Line 44 | Line 45
45   #include "primitives/RigidBody.hpp"
46   #include "primitives/DirectionalAtom.hpp"
47  
48 < namespace oopse {
48 > namespace OpenMD {
49  
50    CompositeVisitor::~CompositeVisitor(){
51      VisitorIterator i;
# Line 60 | Line 61 | namespace oopse {
61      VisitorIterator i;
62      int curPriority;
63    
64 <    for(i = visitorList.begin(); i != visitorList.end(); i++){
64 >    for(i = visitorList.begin(); i != visitorList.end(); ++i){
65        curPriority = (*i).second;
66        //if new visitor has higher priority, just insert it before current visitor
67        if(priority > curPriority){      
# Line 134 | Line 135 | namespace oopse {
135      sprintf(buffer , "visitors in current priority list:\n");
136      result += buffer;
137    
138 <    for(i = visitorList.begin(); i != visitorList.end(); i++){
138 >    for(i = visitorList.begin(); i != visitorList.end(); ++i){
139        sprintf(buffer, "Priority = %d\tvisitor = %s\n",  (*i).second, ((*i).first->getVisitorName()).c_str());
140        result += buffer;
141      }
# Line 142 | Line 143 | namespace oopse {
143      sprintf(buffer, "Detail information about every visitor:\n");
144  
145  
146 <    for(i = visitorList.begin(); i != visitorList.end(); i++)
146 >    for(i = visitorList.begin(); i != visitorList.end(); ++i)
147        result += ((*i).first)->toString();
148  
149      sprintf(buffer ,"******************************************************************\n");
# Line 159 | Line 160 | namespace oopse {
160        curVisitor->update();
161    }
162  
163 < }//namespace oopse
163 > }//namespace OpenMD

Comparing:
trunk/src/visitors/CompositeVisitor.cpp (property svn:keywords), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/visitors/CompositeVisitor.cpp (property svn:keywords), Revision 1874 by gezelter, Wed May 15 15:09:35 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines