ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/staticProps/BondOrderParameter.hpp
(Generate patch)

Comparing trunk/src/applications/staticProps/BondOrderParameter.hpp (file contents):
Revision 994 by chuckv, Tue Jun 27 16:19:28 2006 UTC vs.
Revision 1047 by gezelter, Thu Sep 21 21:47:17 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/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 P2OrderParameter : public StaticAnalyser{
57 <        public:
51 <            P2OrderParameter(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);
52 <            virtual void process();
56 >    virtual ~BondOrderParameter();
57 >    virtual void process();
58  
59 <        private:
59 >  private:
60 >            
61 >    void writeOrderParameter(RealType ql, RealType wlhat);
62  
63 <            struct OrderParam{
57 <                RealType p2;
58 <                Vector3d director;
59 <                RealType angle;
60 <            };            
61 <            void writeP2();
63 >    Snapshot* currentSnapshot_;
64  
65 <            Snapshot* currentSnapshot_;
66 <
67 <            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_;
65 >    std::string selectionScript_;
66 >    SelectionManager seleMan_;    
67 >    SelectionEvaluator evaluator_;          
68              
69 <    };
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