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

Comparing trunk/src/applications/staticProps/GofXyz.hpp (file contents):
Revision 369 by tim, Fri Feb 18 23:07:32 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_GOFXYZ_HPP
42   #define APPLICATIONS_STATICPROPS_GOFXYZ_HPP
43  
44   #include "applications/staticProps/RadialDistrFunc.hpp"
45 < namespace oopse {
45 > namespace OpenMD {
46  
47 < class GofXyz : public RadialDistrFunc {
47 >  class GofXyz : public RadialDistrFunc {
48      
49 <    public:
50 <        GofXyz(SimInfo* info, const std::string& filename, const std::string& sele1,
51 <            const std::string& sele2, const std::string& sele3,double len, int nrbins);
49 >  public:
50 >    GofXyz(SimInfo* info, const std::string& filename, const std::string& sele1,
51 >           const std::string& sele2, const std::string& sele3,RealType len, int nrbins);
52  
53 <        int getNRBins() {
54 <            return nRBins_;
55 <        }
53 >    int getNRBins() {
54 >      return nRBins_;
55 >    }
56          
57 <        double getLength() {
58 <            return len_;
59 <        }
57 >    RealType getLength() {
58 >      return len_;
59 >    }
60          
61 <    private:
61 >  private:
62  
63 <        virtual void preProcess();
64 <        void initalizeHistogram();
65 <        virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
66 <        virtual void writeRdf();
63 >    virtual void preProcess();
64 >    void initalizeHistogram();
65 >    virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
66 >    virtual void writeRdf();
67          
68 <        //virtual void validateSelection1(SelectionManager& sman);
68 >    //virtual void validateSelection1(SelectionManager& sman);
69          
70 <        double len_;
71 <        double halfLen_;
72 <        int nRBins_;
73 <        double deltaR_;
70 >    RealType len_;
71 >    RealType halfLen_;
72 >    int nRBins_;
73 >    RealType deltaR_;
74  
75 <        SelectionEvaluator evaluator3_;
76 <        SelectionManager seleMan3_;
75 >    SelectionEvaluator evaluator3_;
76 >    SelectionManager seleMan3_;
77          
78 <        std::vector<std::vector<std::vector<int> > > histogram_;
78 >    std::vector<std::vector<std::vector<int> > > histogram_;
79  
80 <        std::map<int, RotMat3x3d> rotMats_;
80 >    std::map<int, RotMat3x3d> rotMats_;
81  
82 < };
82 >  };
83  
84  
85   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines