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

Comparing trunk/src/applications/staticProps/SCDOrderParameter.hpp (file contents):
Revision 963 by tim, Wed May 17 21:51:42 2006 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_SCDRDERPARAMETER_HPP
42   #define APPLICATIONS_STATICPROPS_SCDRDERPARAMETER_HPP
# Line 44 | Line 44
44   #include "selection/SelectionManager.hpp"
45   #include "applications/staticProps/StaticAnalyser.hpp"
46   #include "utils/Tuple.hpp"
47 < namespace oopse {
48 <    class SCDElem {
49 <        public:
50 <            SCDElem(SimInfo* info, const std::string& sele1, const std::string& sele2, const std::string& sele3);
47 > namespace OpenMD {
48 >  class SCDElem {
49 >  public:
50 >    SCDElem(SimInfo* info, const std::string& sele1, const std::string& sele2, const std::string& sele3);
51      
52 <            std::string getSelection1() const {return sele1_;}
53 <            std::string getSelection2() const {return sele2_;}
54 <            std::string getSelection3() const {return sele3_;}
55 <            RealType calcSCD(Snapshot* snapshot);
52 >    std::string getSelection1() const {return sele1_;}
53 >    std::string getSelection2() const {return sele2_;}
54 >    std::string getSelection3() const {return sele3_;}
55 >    RealType calcSCD(Snapshot* snapshot);
56              
57 <        private:
57 >  private:
58              
59 <            std::string sele1_;                
60 <            std::string sele2_;
61 <            std::string sele3_;
62 <
63 <            typedef tuple3<StuntDouble*, StuntDouble*, StuntDouble*> SDTuple3;
59 >    std::string sele1_;                
60 >    std::string sele2_;
61 >    std::string sele3_;
62 >    bool usePeriodicBoundaryConditions_;
63 >      
64 >    typedef tuple3<StuntDouble*, StuntDouble*, StuntDouble*> SDTuple3;
65          
66 <            std::vector<SDTuple3> tuples_;
67 <    };
66 >    std::vector<SDTuple3> tuples_;
67 >  };
68  
69  
70 <    class SCDOrderParameter : public StaticAnalyser{
71 <        public:
72 <            SCDOrderParameter(SimInfo* info, const std::string& filename,
73 <                const std::string& sele1, const std::string& sele2, const std::string& sele3);
70 >  class SCDOrderParameter : public StaticAnalyser{
71 >  public:
72 >    SCDOrderParameter(SimInfo* info, const std::string& filename,
73 >                      const std::string& sele1, const std::string& sele2, const std::string& sele3);
74  
75 <            SCDOrderParameter(SimInfo* info, const std::string& filename,
76 <                const std::string& molname, int beginIndex, int endIndex);
77 <            virtual void process();
75 >    SCDOrderParameter(SimInfo* info, const std::string& filename,
76 >                      const std::string& molname, int beginIndex, int endIndex);
77 >    virtual void process();
78  
79 <        private:
80 <            void writeSCD();
79 >  private:
80 >    void writeSCD();
81  
82 <            std::vector<SCDElem> scdElems_;
83 <            std::vector<RealType> scdParam_;
82 >    std::vector<SCDElem> scdElems_;
83 >    std::vector<RealType> scdParam_;
84              
85 <            Snapshot* currentSnapshot_;
85 >    Snapshot* currentSnapshot_;
86  
87              
88 <    };
88 >  };
89   }
90  
91   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines