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

Comparing trunk/src/applications/staticProps/P2OrderParameter.cpp (file contents):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1657 by gezelter, Tue Oct 18 13:44:44 2011 UTC

# Line 44 | Line 44
44   #include "io/DumpReader.hpp"
45   #include "primitives/Molecule.hpp"
46   #include "utils/NumericConstant.hpp"
47 +
48 + using namespace std;
49   namespace OpenMD {
50  
51 +  P2OrderParameter::P2OrderParameter(SimInfo* info, const string& filename,
52 +                                     const string& sele1)
53 +    : StaticAnalyser(info, filename), doVect_(true),
54 +      selectionScript1_(sele1), evaluator1_(info),
55 +      evaluator2_(info), seleMan1_(info), seleMan2_(info) {
56 +    
57 +    setOutputName(getPrefix(filename) + ".p2");
58 +    
59 +    evaluator1_.loadScriptString(sele1);
60 +    
61 +    if (!evaluator1_.isDynamic()) {
62 +      seleMan1_.setSelectionSet(evaluator1_.evaluate());
63 +    }
64 +  }
65  
66 <  P2OrderParameter::P2OrderParameter(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2)
67 <    : StaticAnalyser(info, filename),
68 <      selectionScript1_(sele1), selectionScript2_(sele2), evaluator1_(info), evaluator2_(info),
69 <      seleMan1_(info), seleMan2_(info){
70 <
66 >  P2OrderParameter::P2OrderParameter(SimInfo* info, const string& filename,
67 >                                     const string& sele1, const string& sele2)
68 >    : StaticAnalyser(info, filename), doVect_(false),
69 >      selectionScript1_(sele1), selectionScript2_(sele2), evaluator1_(info),
70 >      evaluator2_(info), seleMan1_(info), seleMan2_(info) {
71 >    
72      setOutputName(getPrefix(filename) + ".p2");
73 <        
73 >    
74      evaluator1_.loadScriptString(sele1);
75      evaluator2_.loadScriptString(sele2);
76 <
76 >    
77      if (!evaluator1_.isDynamic()) {
78        seleMan1_.setSelectionSet(evaluator1_.evaluate());
79      }else {
# Line 66 | Line 83 | namespace OpenMD {
83        painCave.isFatal = 1;
84        simError();  
85      }
86 <
86 >    
87      if (!evaluator2_.isDynamic()) {
88        seleMan2_.setSelectionSet(evaluator2_.evaluate());
89      }else {
# Line 76 | Line 93 | namespace OpenMD {
93        painCave.isFatal = 1;
94        simError();  
95      }
96 <
96 >    
97      if (seleMan1_.getSelectionCount() != seleMan2_.getSelectionCount() ) {
98        sprintf( painCave.errMsg,
99                 "The number of selected Stuntdoubles are not the same in --sele1 and sele2\n");
100        painCave.severity = OPENMD_ERROR;
101        painCave.isFatal = 1;
102        simError();  
103 <
103 >      
104      }
105 <
105 >    
106      int i;
107      int j;
108      StuntDouble* sd1;
# Line 94 | Line 111 | namespace OpenMD {
111           sd1 != NULL && sd2 != NULL;
112           sd1 = seleMan1_.nextSelected(i), sd2 = seleMan2_.nextSelected(j)) {
113  
114 <      sdPairs_.push_back(std::make_pair(sd1, sd2));
115 <    }
99 <
100 <    
114 >      sdPairs_.push_back(make_pair(sd1, sd2));
115 >    }
116    }
117  
118    void P2OrderParameter::process() {
# Line 105 | Line 120 | namespace OpenMD {
120      RigidBody* rb;
121      SimInfo::MoleculeIterator mi;
122      Molecule::RigidBodyIterator rbIter;
123 +    StuntDouble* sd;
124 +    int i, ii;
125    
126      DumpReader reader(info_, dumpFilename_);    
127      int nFrames = reader.getNFrames();
# Line 112 | Line 129 | namespace OpenMD {
129      for (int i = 0; i < nFrames; i += step_) {
130        reader.readFrame(i);
131        currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
132 <
133 <    
134 <      for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
132 >      
133 >      for (mol = info_->beginMolecule(mi); mol != NULL;
134 >           mol = info_->nextMolecule(mi)) {
135          //change the positions of atoms which belong to the rigidbodies
136 <        for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
136 >        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
137 >             rb = mol->nextRigidBody(rbIter)) {
138            rb->updateAtoms();
139 <        }
122 <        
139 >        }        
140        }      
141  
142        Mat3x3d orderTensor(0.0);
143 <      for (std::vector<std::pair<StuntDouble*, StuntDouble*> >::iterator j = sdPairs_.begin(); j != sdPairs_.end(); ++j) {
144 <        Vector3d vec = j->first->getPos() - j->second->getPos();
145 <        if (usePeriodicBoundaryConditions_)
146 <          currentSnapshot_->wrapVector(vec);
147 <        vec.normalize();
148 <        orderTensor +=outProduct(vec, vec);
143 >
144 >      if (doVect_) {
145 >        
146 >        if  (evaluator1_.isDynamic())
147 >          seleMan1_.setSelectionSet(evaluator1_.evaluate());
148 >        
149 >        for (sd = seleMan1_.beginSelected(ii); sd != NULL;
150 >             sd = seleMan1_.nextSelected(ii)) {
151 >          if (sd->isDirectional()) {
152 >            Vector3d vec = sd->getA().getColumn(2);
153 >            vec.normalize();
154 >            orderTensor += outProduct(vec, vec);
155 >          }
156 >        }
157 >  
158 >        orderTensor /= seleMan1_.getSelectionCount();
159 >
160 >      } else {
161 >            
162 >        for (vector<pair<StuntDouble*, StuntDouble*> >::iterator j = sdPairs_.begin();
163 >             j != sdPairs_.end(); ++j) {
164 >          Vector3d vec = j->first->getPos() - j->second->getPos();
165 >          if (usePeriodicBoundaryConditions_)
166 >            currentSnapshot_->wrapVector(vec);
167 >          vec.normalize();
168 >          orderTensor +=outProduct(vec, vec);
169 >        }
170 >      
171 >        orderTensor /= sdPairs_.size();
172        }
173        
174 <      orderTensor /= sdPairs_.size();
174 >
175        orderTensor -= (RealType)(1.0/3.0) * Mat3x3d::identity();  
176        
177        Vector3d eigenvalues;
178        Mat3x3d eigenvectors;    
179 +
180        Mat3x3d::diagonalize(orderTensor, eigenvalues, eigenvectors);
181        
182        int which;
# Line 155 | Line 196 | namespace OpenMD {
196        }  
197  
198        RealType angle = 0.0;
199 <      for (std::vector<std::pair<StuntDouble*, StuntDouble*> >::iterator j = sdPairs_.begin(); j != sdPairs_.end(); ++j) {
200 <        Vector3d vec = j->first->getPos() - j->second->getPos();
201 <        if (usePeriodicBoundaryConditions_)
202 <          currentSnapshot_->wrapVector(vec);
203 <        vec.normalize();
204 <
205 <        angle += acos(dot(vec, director)) ;
199 >      RealType p4 = 0.0;
200 >      
201 >      if (doVect_) {
202 >        for (sd = seleMan1_.beginSelected(ii); sd != NULL;
203 >             sd = seleMan1_.nextSelected(ii)) {
204 >          if (sd->isDirectional()) {
205 >            Vector3d vec = sd->getA().getColumn(2);
206 >            vec.normalize();
207 >            RealType myDot = dot(vec, director);
208 >            angle += acos(myDot);
209 >            p4 += (35.0 * pow(myDot, 4) - 30.0 * pow(myDot, 2) + 3.0) / 8.0;
210 >          }
211 >        }
212 >        angle = angle/(seleMan1_.getSelectionCount()*NumericConstant::PI)*180.0;
213 >        p4 /= (seleMan1_.getSelectionCount());
214 >      } else {
215 >        for (vector<pair<StuntDouble*, StuntDouble*> >::iterator j = sdPairs_.begin(); j != sdPairs_.end(); ++j) {
216 >          Vector3d vec = j->first->getPos() - j->second->getPos();
217 >          if (usePeriodicBoundaryConditions_)
218 >            currentSnapshot_->wrapVector(vec);
219 >          vec.normalize();          
220 >          RealType myDot = dot(vec, director);
221 >          angle += acos(myDot);
222 >          p4 += (35.0 * pow(myDot, 4) - 30.0 * pow(myDot, 2) + 3.0) / 8.0;
223 >        }
224 >        angle = angle / (sdPairs_.size() * NumericConstant::PI) * 180.0;
225 >        p4 /= (seleMan1_.getSelectionCount());
226        }
166      angle = angle / (sdPairs_.size() * NumericConstant::PI) * 180.0;
227  
228        OrderParam param;
229        param.p2 = p2;
230        param.director = director;
231        param.angle = angle;
232 +      param.p4 = p4;
233  
234        orderParams_.push_back(param);      
235      
236      }
237 <
237 >    
238      writeP2();
239 <  
239 >    
240    }
241  
242    void P2OrderParameter::writeP2() {
243  
244 <    std::ofstream os(getOutputFileName().c_str());
244 >    ofstream os(getOutputFileName().c_str());
245      os << "#radial distribution function\n";
246      os<< "#selection1: (" << selectionScript1_ << ")\t";
247 <    os << "selection2: (" << selectionScript2_ << ")\n";
248 <    os << "#p2\tdirector_x\tdirector_y\tdiretor_z\tangle(degree)\n";    
247 >    if (!doVect_) {
248 >      os << "selection2: (" << selectionScript2_ << ")\n";
249 >    }
250 >    os << "#p2\tdirector_x\tdirector_y\tdiretor_z\tangle(degree)\t<p4>\n";    
251  
252 <    for (std::size_t i = 0; i < orderParams_.size(); ++i) {
252 >    for (size_t i = 0; i < orderParams_.size(); ++i) {
253        os <<  orderParams_[i].p2 << "\t"
254           <<  orderParams_[i].director[0] << "\t"
255           <<  orderParams_[i].director[1] << "\t"
256           <<  orderParams_[i].director[2] << "\t"
257 <         <<  orderParams_[i].angle << "\n";
257 >         <<  orderParams_[i].angle << "\t"
258 >         <<  orderParams_[i].p4 << "\n";
259  
260      }
261  

Comparing trunk/src/applications/staticProps/P2OrderParameter.cpp (property svn:keywords):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1657 by gezelter, Tue Oct 18 13:44:44 2011 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines