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 3005 by chuckv, Mon Sep 18 21:31:23 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 P2OrderParameter : public StaticAnalyser{
50 >    class BondOrderParameter : public StaticAnalyser{
51          public:
52 <            P2OrderParameter(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);
52 >            BondOrderParameter(SimInfo* info, const std::string& filename, const std::string& sele1,
53 >                 const std::string& sele2, double rCut, int lNumber );
54              virtual void process();
55  
56          private:
57  
58 <            struct OrderParam{
59 <                RealType p2;
60 <                Vector3d director;
61 <                RealType angle;
62 <            };            
61 <            void writeP2();
58 >            
59 >            void writeOrderParameter();
60 >                    virtual void initalizeHistogram();
61 >                virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
62 >                virtual void processHistogram();
63  
64              Snapshot* currentSnapshot_;
65  
66              std::string selectionScript1_;
67 <            std::string selectionScript2_;
67 <            SelectionManager seleMan1_;
68 <            SelectionManager seleMan2_;      
67 >            SelectionManager seleMan1_;    
68              SelectionEvaluator evaluator1_;
69 <            SelectionEvaluator evaluator2_;
69 >            
70 >            std::vector<Vector3d> neighbors_;
71              std::vector<std::pair<StuntDouble*, StuntDouble*> > sdPairs_;  /**< each pair is used to define a vector, vector = first - second */
72              std::vector<OrderParam> orderParams_;
73              
74 +            RealType rCut_;
75 +            int lNumber_;
76 +            int mSize_;
77 +            RealType* Q_l_;
78 +            RealType* W_l_;
79 +            RealType* WHat_l_;
80      };
81   }
82  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines