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 353 by tim, Wed Feb 16 19:36:30 2005 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 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   #ifndef APPLICATIONS_STATICPROPS_GOFR_HPP
42   #define APPLICATIONS_STATICPROPS_GOFR_HPP
43  
44   #include "applications/staticProps/RadialDistrFunc.hpp"
45 < namespace oopse {
45 > namespace OpenMD {
46  
47 < class GofR : public RadialDistrFunc {
47 >  class GofR : public RadialDistrFunc {
48      
49 <    public:
50 <        GofR(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);
49 >  public:
50 >    GofR(SimInfo* info, const std::string& filename, const std::string& sele1,
51 >         const std::string& sele2, RealType len, int nrbins);
52  
53 +    int getNRBins() {
54 +      return nRBins_;
55 +    }
56  
57 <        void setNRBins(int nbins) {
58 <            assert(nbins > 0);
59 <            nRBins_ = nbins;
56 <            deltaR_ = len_ / nRBins_;
57 <            histogram_.resize(nRBins_);
58 <            avgGofr_.resize(nRBins_);
59 <        }
60 <
61 <        int getNRBins() {
62 <            return nRBins_;
63 <        }
64 <
65 <        void setLength(double len) {
66 <            len_ = len;
67 <            deltaR_ = len_ /nRBins_;                
68 <        }
69 <
70 <        double getLength() {
71 <            return len_;
72 <        }
57 >    RealType getLength() {
58 >      return len_;
59 >    }
60          
61 <    private:
61 >  private:
62  
63 <        virtual void preProcess();
64 <        virtual void initalizeHistogram();
65 <        virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
66 <        virtual void processHistogram();
63 >    virtual void preProcess();
64 >    virtual void initalizeHistogram();
65 >    virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
66 >    virtual void processHistogram();
67  
68 <        virtual void writeRdf();
68 >    virtual void writeRdf();
69  
70 <        double len_;
71 <        int nRBins_;
72 <        double deltaR_;
70 >    RealType len_;
71 >    int nRBins_;
72 >    RealType deltaR_;
73          
74 <        std::vector<int> histogram_;
75 <        std::vector<double> avgGofr_;
76 < };
74 >    std::vector<int> histogram_;
75 >    std::vector<RealType> avgGofr_;
76 >  };
77  
78   }
79   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines