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

Comparing trunk/src/applications/staticProps/GofR.hpp (file contents):
Revision 306 by tim, Wed Feb 9 17:08:22 2005 UTC vs.
Revision 1785 by jmichalk, Wed Aug 22 18:43:27 2012 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]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42   #ifndef APPLICATIONS_STATICPROPS_GOFR_HPP
43   #define APPLICATIONS_STATICPROPS_GOFR_HPP
44  
45 < #include "application/staticProps/RadialDistrFunc.hpp"
46 < namespace oopse {
45 > #include "applications/staticProps/RadialDistrFunc.hpp"
46 > namespace OpenMD {
47  
48 < class GofR : public RadialDistrFunc {
48 >  class GofR : public RadialDistrFunc {
49      
50 <    public:
51 <        GofR(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2. double len);
50 >  public:
51 >    GofR(SimInfo* info, const std::string& filename, const std::string& sele1,
52 >         const std::string& sele2, RealType len, int nrbins);
53  
54 <    private:
54 >    int getNRBins() {
55 >      return nRBins_;
56 >    }
57  
58 <        virtual void preProcess();
59 <        virtual void initalizeHistogram();
60 <        virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
61 <        virtual void processHistogram();
58 >    RealType getLength() {
59 >      return len_;
60 >    }
61 >        
62 >  private:
63  
64 <        virtual void writeRdf();
64 >    virtual void preProcess();
65 >    virtual void initializeHistogram();
66 >    virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
67 >    virtual void processHistogram();
68 >
69 >    virtual void writeRdf();
70 >
71 >    RealType len_;
72 >    int nRBins_;
73 >    RealType deltaR_;
74          
75 <        std::vector<int> histogram_;
76 <        std::vector<double> avgGofr_;
77 <        int npairs_;
64 < };
75 >    std::vector<int> histogram_;
76 >    std::vector<RealType> avgGofr_;
77 >  };
78  
79   }
80   #endif

Comparing trunk/src/applications/staticProps/GofR.hpp (property svn:keywords):
Revision 306 by tim, Wed Feb 9 17:08:22 2005 UTC vs.
Revision 1785 by jmichalk, Wed Aug 22 18:43:27 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines