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

Comparing:
trunk/src/visitors/ZconsVisitor.cpp (file contents), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/visitors/ZconsVisitor.cpp (file contents), Revision 1465 by chuckv, Fri Jul 9 23:08:25 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 <cmath>
43   #include "visitors/ZconsVisitor.hpp"
44   #include "primitives/Molecule.hpp"
45   #include "utils/StringUtils.hpp"
46 < namespace oopse {
46 > #include "types/ZconsStamp.hpp"
47 > namespace OpenMD {
48  
49    ZConsVisitor::ZConsVisitor(SimInfo* info) : BaseVisitor(), info_(info), zconsReader_(NULL){
50  
# Line 51 | Line 52 | namespace oopse {
52      currSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
53      Globals* simParam = info_->getSimParams();
54  
55 <    if (simParam->haveZconstraintTime()){
55 >    if (simParam->haveZconsTime()){
56        zconsTime_ = simParam->getZconsTime();
57      }
58      else{
# Line 69 | Line 70 | namespace oopse {
70        zconsTol_ = 0.01;
71        sprintf(painCave.errMsg,
72                "ZConstraint Warning: Tolerance for z-constraint method is not specified.\n"
73 <              "\tOOPSE will use a default value of %f.\n"
73 >              "\tOpenMD will use a default value of %f.\n"
74                "\tTo set the tolerance, use the zconsTol variable.\n",
75                zconsTol_);
76        painCave.isFatal = 0;
77        simError();      
78      }    
79          
80 <    int nZconstraints = simParam->getNzConstraints();
81 <    ZconStamp** stamp = simParam->getZconStamp();
80 >    int nZconstraints = simParam->getNZconsStamps();
81 >    std::vector<ZConsStamp*> stamp = simParam->getZconsStamps();
82      for (int i = 0; i < nZconstraints; i++){
83        int zmolIndex = stamp[i]->getMolIndex();
84        zmolStates_.insert(std::make_pair(zmolIndex, zsMoving));
# Line 156 | Line 157 | namespace oopse {
157      
158    }
159  
160 <  void ZConsVisitor::readZconsFile(double time) {
161 <    double tempTime;
160 >  void ZConsVisitor::readZconsFile(RealType time) {
161 >    RealType tempTime;
162      while(zconsReader_->hasNextFrame()){
163        tempTime = zconsReader_->getCurTime();
164        if(tempTime >= time) {
# Line 214 | Line 215 | namespace oopse {
215      sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
216      result += buffer;
217  
218 <    sprintf(buffer , "number of zconstraint molecule: %d\n", zmolStates_.size());
218 >    sprintf(buffer , "number of zconstraint molecule: %d\n", (int) zmolStates_.size());
219      result += buffer;
220  
221      sprintf(buffer , "zconstraint tolerance = %lf\n", zconsTol_);
# Line 240 | Line 241 | namespace oopse {
241    }
242  
243  
244 < }//namespace oopse
244 > }//namespace OpenMD

Comparing:
trunk/src/visitors/ZconsVisitor.cpp (property svn:keywords), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/visitors/ZconsVisitor.cpp (property svn:keywords), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines