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 3015 by gezelter, Thu Sep 21 21:47:17 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();
60 <                    virtual void initalizeHistogram();
61 <                virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
62 <                virtual void processHistogram();
61 >    void writeOrderParameter(RealType ql, RealType wlhat);
62  
63 <            Snapshot* currentSnapshot_;
63 >    Snapshot* currentSnapshot_;
64  
65 <            std::string selectionScript1_;
66 <            SelectionManager seleMan1_;    
67 <            SelectionEvaluator evaluator1_;
65 >    std::string selectionScript_;
66 >    SelectionManager seleMan_;    
67 >    SelectionEvaluator evaluator_;          
68              
69 <            std::vector<Vector3d> neighbors_;
70 <            std::vector<std::pair<StuntDouble*, StuntDouble*> > sdPairs_;  /**< each pair is used to define a vector, vector = first - second */
71 <            std::vector<OrderParam> orderParams_;
72 <            
73 <            RealType rCut_;
75 <            int lNumber_;
76 <            int mSize_;
77 <            RealType* Q_l_;
78 <            RealType* W_l_;
79 <            RealType* WHat_l_;
80 <    };
69 >    RealType rCut_;
70 >    int lNumber_;
71 >    int mSize_;    
72 >    int frameCounter_;
73 >  };
74   }
75  
76   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines