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 3005 by chuckv, Mon Sep 18 21:31:23 2006 UTC vs.
Revision 3024 by gezelter, Tue Sep 26 14:33:56 2006 UTC

# Line 44 | Line 44
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 BondOrderParameter : public StaticAnalyser{
58 <        public:
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();
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 <            
59 <            void writeOrderParameter();
60 <                    virtual void initalizeHistogram();
61 <                virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
62 <                virtual void processHistogram();
66 >    Snapshot* currentSnapshot_;
67  
68 <            Snapshot* currentSnapshot_;
69 <
70 <            std::string selectionScript1_;
67 <            SelectionManager seleMan1_;    
68 <            SelectionEvaluator evaluator1_;
68 >    std::string selectionScript_;
69 >    SelectionManager seleMan_;    
70 >    SelectionEvaluator evaluator_;          
71              
72 <            std::vector<Vector3d> neighbors_;
73 <            std::vector<std::pair<StuntDouble*, StuntDouble*> > sdPairs_;  /**< each pair is used to define a vector, vector = first - second */
74 <            std::vector<OrderParam> orderParams_;
75 <            
76 <            RealType rCut_;
77 <            int lNumber_;
78 <            int mSize_;
79 <            RealType* Q_l_;
80 <            RealType* W_l_;
81 <            RealType* WHat_l_;
82 <    };
72 >    RealType rCut_;
73 >    static const int lMax_ = 12;
74 >    int frameCounter_;
75 >    int nBins_;
76 >    
77 >    std::map<std::pair<int,int>,int> m2Min;
78 >    std::map<std::pair<int,int>,int> m2Max;
79 >    std::map<std::pair<int,int>,std::vector<RealType> > w3j;
80 >  
81 >    RealType MinQ_;
82 >    RealType MaxQ_;
83 >    RealType deltaQ_;
84 >    std::vector<int> Qcount_;
85 >    std::map<std::pair<int,int>,int> Q_histogram_;
86 >
87 >    RealType MinW_;
88 >    RealType MaxW_;
89 >    RealType deltaW_;
90 >    std::vector<int> Wcount_;
91 >    std::map<std::pair<int,int>,int> W_histogram_;
92 >  };
93   }
94  
95   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines