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 3022 by gezelter, Tue Sep 26 01:30:32 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 + #include "math/SphericalHarmonic.hpp"
48 + #include "math/Wigner3jm_interface.h"
49  
50   namespace oopse {
51 +  
52 +  class BondOrderParameter : public StaticAnalyser{
53 +  public:
54 +    BondOrderParameter(SimInfo* info, const std::string& filename,
55 +                       const std::string& sele, double rCut, int nbins);
56  
57 <    class P2OrderParameter : public StaticAnalyser{
58 <        public:
51 <            P2OrderParameter(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);
52 <            virtual void process();
57 >    virtual ~BondOrderParameter();
58 >    virtual void process();
59  
60 <        private:
60 >  private:
61 >    
62 >    void writeOrderParameter(std::vector<RealType> Q, std::vector<ComplexType> What);
63 >    virtual void initalizeHistogram();
64 >    virtual void collectHistogram(std::vector<RealType> q, std::vector<ComplexType> what);
65  
66 <            struct OrderParam{
57 <                RealType p2;
58 <                Vector3d director;
59 <                RealType angle;
60 <            };            
61 <            void writeP2();
66 >    Snapshot* currentSnapshot_;
67  
68 <            Snapshot* currentSnapshot_;
69 <
70 <            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_;
68 >    std::string selectionScript_;
69 >    SelectionManager seleMan_;    
70 >    SelectionEvaluator evaluator_;          
71              
72 <    };
72 >    RealType rCut_;
73 >    static const int lMax_ = 12;
74 >    int frameCounter_;
75 >    int nBins_;
76 >
77 >    RealType MinQ_;
78 >    RealType MaxQ_;
79 >    RealType deltaQ_;
80 >    std::vector<int> Qcount_;
81 >    std::map<std::pair<int,int>,int> Q_histogram_;
82 >
83 >    RealType MinW_;
84 >    RealType MaxW_;
85 >    RealType deltaW_;
86 >    std::vector<int> Wcount_;
87 >    std::map<std::pair<int,int>,int> W_histogram_;
88 >  };
89   }
90  
91   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines