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

Comparing trunk/src/integrators/NPTf.hpp (file contents):
Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 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 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   /**
# Line 51 | Line 51
51   #define INTEGRATORS_NPTF_HPP
52  
53   #include "integrators/NPT.hpp"
54 < namespace oopse {
54 > namespace OpenMD {
55  
56 < class NPTf : public NPT{
57 <    public:
56 >  class NPTf : public NPT{
57 >  public:
58  
59 <        NPTf ( SimInfo* info) : NPT(info) {}
59 >    NPTf ( SimInfo* info) : NPT(info) {}
60  
61 <    protected:
61 >  protected:
62  
63 <        Mat3x3d eta;
63 >    Mat3x3d eta;
64  
65 <    private:
65 >  private:
66  
67 <        virtual void evolveEtaA();
68 <        virtual void evolveEtaB();
67 >    virtual void evolveEtaA();
68 >    virtual void evolveEtaB();
69  
70 <        virtual bool etaConverged();
70 >    virtual bool etaConverged();
71  
72 <        virtual void getVelScaleA(Vector3d& sc, const Vector3d& vel);
73 <        virtual void getVelScaleB(Vector3d& sc, int index );
74 <        virtual void getPosScale(const Vector3d& pos, const Vector3d& COM,  int index, Vector3d& sc);
72 >    virtual void getVelScaleA(Vector3d& sc, const Vector3d& vel);
73 >    virtual void getVelScaleB(Vector3d& sc, int index );
74 >    virtual void getPosScale(const Vector3d& pos, const Vector3d& COM,  int index, Vector3d& sc);
75  
76 <        virtual void calcVelScale();
76 >    virtual void calcVelScale();
77          
78 <        virtual void scaleSimBox();
79 <        virtual double calcConservedQuantity();
78 >    virtual void scaleSimBox();
79 >    virtual RealType calcConservedQuantity();
80  
81 <        virtual void loadEta();
82 <        virtual void saveEta();
81 >    virtual void loadEta();
82 >    virtual void saveEta();
83              
84 <        Mat3x3d oldEta;
85 <        Mat3x3d prevEta;
86 <        Mat3x3d vScale;
87 < };
84 >    Mat3x3d oldEta;
85 >    Mat3x3d prevEta;
86 >    Mat3x3d vScale;
87 >  };
88  
89  
90 < }//end namespace oopse
90 > }//end namespace OpenMD
91  
92   #endif //INTEGRATORS_NPTF_HPP

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines