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 3008 by gezelter, Tue Sep 19 21:20:15 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/Wigner3jm_interface.h"
48  
49   namespace oopse {
50 +  
51 +  class BondOrderParameter : public StaticAnalyser{
52 +  public:
53 +    BondOrderParameter(SimInfo* info, const std::string& filename,
54 +                       const std::string& sele, double rCut, int lNumber, int nbins);
55  
56 <    class BondOrderParameter : public StaticAnalyser{
57 <        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();
56 >    virtual ~BondOrderParameter();
57 >    virtual void process();
58  
59 <        private:
57 <
59 >  private:
60              
61 <            void writeOrderParameter();
62 <                    virtual void initalizeHistogram();
63 <                virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
64 <                virtual void processHistogram();
61 >    void writeOrderParameter();
62 >    virtual void initalizeHistogram();
63 >    virtual void collectHistogram(RealType Q_l, RealType W_l_hat);
64 >    virtual void processHistogram();
65  
66 <            Snapshot* currentSnapshot_;
66 >    Snapshot* currentSnapshot_;
67  
68 <            std::string selectionScript1_;
69 <            SelectionManager seleMan1_;    
70 <            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 >    int lNumber_;
74 >    int mSize_;    
75 >
76 >    RealType MaxQ_;
77 >    RealType deltaQ_;
78 >
79 >    RealType MaxW_;
80 >    RealType deltaW_;
81 >
82 >    std::vector<int> Q_histogram_;
83 >    std::vector<int> W_histogram_;
84 >
85 >  };
86   }
87  
88   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines