ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/applications/staticProps/BondOrderParameter.hpp
(Generate patch)

Comparing trunk/OOPSE-4/src/applications/staticProps/BondOrderParameter.hpp (file contents):
Revision 2901 by chuckv, Tue Jun 27 16:19:28 2006 UTC vs.
Revision 3007 by gezelter, Tue Sep 19 21:14:11 2006 UTC

# Line 38 | Line 38
38   * University of Notre Dame has been advised of the possibility of
39   * such damages.
40   */
41 < #ifndef APPLICATIONS_STATICPROPS_P2ORDERPARAMETER_HPP
42 < #define APPLICATIONS_STATICPROPS_P2ORDERPARAMETER_HPP
41 > #ifndef APPLICATIONS_STATICPROPS_BONDORDERPARAMETER_HPP
42 > #define APPLICATIONS_STATICPROPS_BONDORDERPARAMETER_HPP
43   #include "selection/SelectionEvaluator.hpp"
44   #include "selection/SelectionManager.hpp"
45   #include "applications/staticProps/StaticAnalyser.hpp"
46 + #include "math/Vector3.hpp"
47  
48   namespace oopse {
49 +  
50 +  class BondOrderParameter : public StaticAnalyser{
51 +  public:
52 +    BondOrderParameter(SimInfo* info, const std::string& filename,
53 +                       const std::string& sele, double rCut, int lNumber, int nbins);
54  
55 <    class P2OrderParameter : public StaticAnalyser{
56 <        public:
51 <            P2OrderParameter(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);
52 <            virtual void process();
55 >    virtual ~BondOrderParameter();
56 >    virtual void process();
57  
58 <        private:
58 >  private:
59 >            
60 >    void writeOrderParameter();
61 >    virtual void initalizeHistogram();
62 >    virtual void collectHistogram(RealType Q_l, RealType W_l_hat);
63 >    virtual void processHistogram();
64  
65 <            struct OrderParam{
57 <                RealType p2;
58 <                Vector3d director;
59 <                RealType angle;
60 <            };            
61 <            void writeP2();
65 >    Snapshot* currentSnapshot_;
66  
67 <            Snapshot* currentSnapshot_;
68 <
69 <            std::string selectionScript1_;
66 <            std::string selectionScript2_;
67 <            SelectionManager seleMan1_;
68 <            SelectionManager seleMan2_;      
69 <            SelectionEvaluator evaluator1_;
70 <            SelectionEvaluator evaluator2_;
71 <            std::vector<std::pair<StuntDouble*, StuntDouble*> > sdPairs_;  /**< each pair is used to define a vector, vector = first - second */
72 <            std::vector<OrderParam> orderParams_;
67 >    std::string selectionScript_;
68 >    SelectionManager seleMan_;    
69 >    SelectionEvaluator evaluator_;          
70              
71 <    };
71 >    RealType rCut_;
72 >    int lNumber_;
73 >    int mSize_;    
74 >
75 >    RealType MaxQ_;
76 >    RealType deltaQ_;
77 >
78 >    RealType MaxW_;
79 >    RealType deltaW_
80 >
81 >    std::vector<int> Q_histogram_;
82 >    std::vector<int> W_histogram_;
83 >
84 >  };
85   }
86  
87   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines