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

Comparing trunk/src/applications/staticProps/GofAngle2.hpp (file contents):
Revision 311 by tim, Thu Feb 10 22:37:21 2005 UTC vs.
Revision 2023 by gezelter, Thu Oct 2 14:35:14 2014 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, 234107 (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_GOFANGLE2_HPP
43   #define APPLICATIONS_STATICPROPS_GOFANGLE2_HPP
44  
45   #include "applications/staticProps/RadialDistrFunc.hpp"
46 < namespace oopse {
46 > namespace OpenMD {
47  
48 < class GofAngle2 : public RadialDistrFunc {
48 >  class GofAngle2 : public RadialDistrFunc {
49      
50 <    public:
51 <        GofAngle2(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);
50 >  public:
51 >    GofAngle2(SimInfo* info, const std::string& filename,
52 >              const std::string& sele1, const std::string& sele2,
53 >              int nangleBins);
54 >    GofAngle2(SimInfo* info, const std::string& filename,
55 >              const std::string& sele1, const std::string& sele2,
56 >              const std::string& sele3, int nangleBins);
57    
58 <        void setNAngleBins(int nbins) {
53 <            assert(nbins >0);
54 <            nAngleBins_ = nbins;
55 <            deltaCosAngle_ = 2.0 / nAngleBins_;
56 <            for (int i = 0 ; i < nAngleBins_; ++i) {
57 <                histogram_[i].resize(nAngleBins_);
58 <                avgGofr_[i].resize(nAngleBins_);
59 <            }
60 <        }
58 >    int getNAngleBins() {return nAngleBins_;}
59          
60 <        int getNAngleBins() {return nAngleBins_;}
63 <        
64 <    private:
60 >  private:
61  
62 <        virtual void preProcess();
63 <        virtual void initalizeHistogram();
64 <        virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
65 <        virtual void processHistogram();
62 >    virtual void preProcess();
63 >    virtual void processNonOverlapping( SelectionManager& sman1,
64 >                                        SelectionManager& sman2);
65 >    virtual void processOverlapping( SelectionManager& sman );
66 >    virtual void initializeHistogram();
67 >    virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
68 >    virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2,
69 >                                  StuntDouble* sd3);
70 >    virtual void processHistogram();
71  
72 <        virtual void writeRdf();
72 >    virtual void writeRdf();
73  
74 <        double deltaCosAngle_;
75 <        int nAngleBins_;
74 >
75 >    RealType deltaCosAngle_;
76 >    int nAngleBins_;
77 >    bool doSele3_;
78 >
79 >    SelectionManager seleMan3_;
80 >    SelectionEvaluator evaluator3_;
81 >    std::string selectionScript3_;
82          
83 <        std::vector<std::vector<int> > histogram_;
84 <        std::vector<std::vector<int> > avgGofr_;
85 <        int npairs_;
86 < };
83 >    std::vector<std::vector<int> > histogram_;
84 >    std::vector<std::vector<int> > avgGofr_;
85 >    int npairs_;
86 >  };
87  
88   }
89   #endif

Comparing trunk/src/applications/staticProps/GofAngle2.hpp (property svn:keywords):
Revision 311 by tim, Thu Feb 10 22:37:21 2005 UTC vs.
Revision 2023 by gezelter, Thu Oct 2 14:35:14 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines