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

Comparing trunk/src/applications/staticProps/BOPofR.hpp (file contents):
Revision 1128 by chuckv, Wed Apr 11 23:27:20 2007 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 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 38 | Line 29
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31   *
32 < *  BondOrderParameter.hpp
33 < *  OOPSE-4
34 < *
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 > * [4] , Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). *
41   *  Created by J. Daniel Gezelter on 09/26/06
42   *  @author  J. Daniel Gezelter
43 < *  @version $Id: BOPofR.hpp,v 1.1 2007-04-11 23:27:20 chuckv Exp $
43 > *  @version $Id$
44   *
45   */
46  
# Line 54 | Line 51
51   #include "applications/staticProps/StaticAnalyser.hpp"
52   #include "math/Vector3.hpp"
53   #include "math/SphericalHarmonic.hpp"
57 #include "math/Wigner3jm_interface.h"
54  
55 < namespace oopse {
55 > namespace OpenMD {
56  
57    /**
58     * @class BondOrderParameter
# Line 68 | Line 64 | namespace oopse {
64     *    P. J. Steinhart, D. R. Nelson, and M. Ronchetti,
65     *    Phys. Rev. B, 28, 784 (1983).
66     *
67 <   * A somewhat more useful reference which has formulae for these order
68 <   * parameters for individual atoms is:
67 >   * A somewhat more useful reference which has formulae for these
68 >   * order parameters for individual atoms is:
69     *
70     *   "Numerical calculation of the rate of crystal nucleation in a
71 <   *    Lennard-Jones system at moderate undercooling," by
72 <   *    Pieter Rein ten Wolde, Maria J. Ruiz-Montero, and Daan Frenkel,
71 >   *    Lennard-Jones system at moderate undercooling," by Pieter Rein
72 >   *    ten Wolde, Maria J. Ruiz-Montero, and Daan Frenkel,
73     *    J. Chem. Phys. 104, pp. 9932-9947 (1996).
74     *
75 <   * Note that this version uses a single cutoff radius to decide
75 >   * Note that this version uses a single cutoff radius to decide
76     * membership in the list of neighbors, and does not have use a
77 <   * distance-dependent weighting as used in the second reference above.
77 >   * distance-dependent weighting as used in the second reference
78 >   * above.
79     *
80     * The selection script can be utilized to look at specific types of
81 <   * central atoms.  A dynamic selector can also be utilized.  By default,
82 <   * this class computes the Q_{l} and \hat{W}_{l} parameters up to l = 12.
83 <   * The completed configurational averages of these values as
84 <   * well as the distributions of atomic q_{l} and \hat{w}_{l} values
85 <   * are then placed in .boq and .bow files.
81 >   * central atoms.  A dynamic selector can also be utilized.  By
82 >   * default, this class computes the \f[ Q_{l} \f] and
83 >   * \f[ \hat{W}_{l} \f] parameters up to \f[ l = 12 \f].  The
84 >   * completed configurational averages of these values as well as the
85 >   * distributions of atomic \f[ q_{l} \f] and \f[ \hat{w}_{l} \f]
86 >   * values are then placed in .boq and .bow files.
87     */
88    class BOPofR : public StaticAnalyser{
89    public:
# Line 96 | Line 94 | namespace oopse {
94      virtual void process();
95      
96    private:
97 <    virtual void initalizeHistogram();
97 >    virtual void initializeHistogram();
98      virtual void collectHistogram(std::vector<RealType> q,
99                                    std::vector<ComplexType> what, RealType distCOM);    
100      void writeOrderParameter();
# Line 107 | Line 105 | namespace oopse {
105      SelectionEvaluator evaluator_;          
106              
107      RealType rCut_;
108 <    static const int lMax_ = 12;
108 >    static const int lMax_ = 6;
109      int frameCounter_;
110      int nBins_;
111 <        RealType len_;
112 <        RealType deltaR_;
111 >    RealType len_;
112 >    RealType deltaR_;
113      
114      std::map<std::pair<int,int>,int> m2Min;
115      std::map<std::pair<int,int>,int> m2Max;
116      std::map<std::pair<int,int>,std::vector<RealType> > w3j;
117    
118 <    std::vector<std::vector<int> > RCount_;
119 <    std::vector<std::vector<RealType> > WofR_;
120 <    std::vector<std::vector<RealType> > QofR_;
118 >    std::vector<int> RCount_;
119 >    std::vector<int>  WofR_;
120 >    std::vector<int> QofR_;
121    };
122   }
123  

Comparing trunk/src/applications/staticProps/BOPofR.hpp (property svn:keywords):
Revision 1128 by chuckv, Wed Apr 11 23:27:20 2007 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines