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 1818 by gezelter, Wed Dec 12 20:37:29 2012 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include "applications/staticProps/P2OrderParameter.hpp"
# Line 44 | Line 45
45   #include "io/DumpReader.hpp"
46   #include "primitives/Molecule.hpp"
47   #include "utils/NumericConstant.hpp"
48 +
49 + using namespace std;
50   namespace OpenMD {
51  
52 <
53 <  P2OrderParameter::P2OrderParameter(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2)
54 <    : StaticAnalyser(info, filename),
55 <      selectionScript1_(sele1), selectionScript2_(sele2), evaluator1_(info), evaluator2_(info),
56 <      seleMan1_(info), seleMan2_(info){
57 <
52 >  P2OrderParameter::P2OrderParameter(SimInfo* info, const string& filename,
53 >                                     const string& sele1)
54 >    : StaticAnalyser(info, filename), doVect_(true),
55 >      selectionScript1_(sele1), evaluator1_(info),
56 >      evaluator2_(info), seleMan1_(info), seleMan2_(info) {
57 >    
58      setOutputName(getPrefix(filename) + ".p2");
59 <        
59 >    
60      evaluator1_.loadScriptString(sele1);
61 <    evaluator2_.loadScriptString(sele2);
61 >  }
62  
63 <    if (!evaluator1_.isDynamic()) {
64 <      seleMan1_.setSelectionSet(evaluator1_.evaluate());
65 <    }else {
66 <      sprintf( painCave.errMsg,
67 <               "--sele1 must be static selection\n");
65 <      painCave.severity = OPENMD_ERROR;
66 <      painCave.isFatal = 1;
67 <      simError();  
68 <    }
69 <
70 <    if (!evaluator2_.isDynamic()) {
71 <      seleMan2_.setSelectionSet(evaluator2_.evaluate());
72 <    }else {
73 <      sprintf( painCave.errMsg,
74 <               "--sele2 must be static selection\n");
75 <      painCave.severity = OPENMD_ERROR;
76 <      painCave.isFatal = 1;
77 <      simError();  
78 <    }
79 <
80 <    if (seleMan1_.getSelectionCount() != seleMan2_.getSelectionCount() ) {
81 <      sprintf( painCave.errMsg,
82 <               "The number of selected Stuntdoubles are not the same in --sele1 and sele2\n");
83 <      painCave.severity = OPENMD_ERROR;
84 <      painCave.isFatal = 1;
85 <      simError();  
86 <
87 <    }
88 <
89 <    int i;
90 <    int j;
91 <    StuntDouble* sd1;
92 <    StuntDouble* sd2;
93 <    for (sd1 = seleMan1_.beginSelected(i), sd2 = seleMan2_.beginSelected(j);
94 <         sd1 != NULL && sd2 != NULL;
95 <         sd1 = seleMan1_.nextSelected(i), sd2 = seleMan2_.nextSelected(j)) {
96 <
97 <      sdPairs_.push_back(std::make_pair(sd1, sd2));
98 <    }
99 <
63 >  P2OrderParameter::P2OrderParameter(SimInfo* info, const string& filename,
64 >                                     const string& sele1, const string& sele2)
65 >    : StaticAnalyser(info, filename), doVect_(false),
66 >      selectionScript1_(sele1), selectionScript2_(sele2), evaluator1_(info),
67 >      evaluator2_(info), seleMan1_(info), seleMan2_(info) {
68      
69 +    setOutputName(getPrefix(filename) + ".p2");
70 +    
71 +    evaluator1_.loadScriptString(sele1);
72 +    evaluator2_.loadScriptString(sele2);    
73    }
74  
75    void P2OrderParameter::process() {
# Line 105 | Line 77 | namespace OpenMD {
77      RigidBody* rb;
78      SimInfo::MoleculeIterator mi;
79      Molecule::RigidBodyIterator rbIter;
80 <  
80 >    StuntDouble* sd1;
81 >    StuntDouble* sd2;
82 >    int ii;
83 >    int jj;
84 >    int vecCount;
85 >
86      DumpReader reader(info_, dumpFilename_);    
87      int nFrames = reader.getNFrames();
88  
89      for (int i = 0; i < nFrames; i += step_) {
90        reader.readFrame(i);
91        currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
92 <
93 <    
94 <      for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
92 >      
93 >      for (mol = info_->beginMolecule(mi); mol != NULL;
94 >           mol = info_->nextMolecule(mi)) {
95          //change the positions of atoms which belong to the rigidbodies
96 <        for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
96 >        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
97 >             rb = mol->nextRigidBody(rbIter)) {
98            rb->updateAtoms();
99 <        }
122 <        
99 >        }        
100        }      
101  
102        Mat3x3d orderTensor(0.0);
103 <      for (std::vector<std::pair<StuntDouble*, StuntDouble*> >::iterator j = sdPairs_.begin(); j != sdPairs_.end(); ++j) {
104 <        Vector3d vec = j->first->getPos() - j->second->getPos();
105 <        if (usePeriodicBoundaryConditions_)
106 <          currentSnapshot_->wrapVector(vec);
107 <        vec.normalize();
108 <        orderTensor +=outProduct(vec, vec);
103 >      vecCount = 0;
104 >
105 >      seleMan1_.setSelectionSet(evaluator1_.evaluate());
106 >      
107 >      if (doVect_) {
108 >        
109 >        for (sd1 = seleMan1_.beginSelected(ii); sd1 != NULL;
110 >             sd1 = seleMan1_.nextSelected(ii)) {
111 >          if (sd1->isDirectional()) {
112 >            Vector3d vec = sd1->getA().getColumn(2);
113 >            vec.normalize();
114 >            orderTensor += outProduct(vec, vec);
115 >            vecCount++;
116 >          }
117 >        }
118 >  
119 >        orderTensor /= vecCount;
120 >
121 >      } else {
122 >
123 >        seleMan2_.setSelectionSet(evaluator2_.evaluate());
124 >            
125 >        if (seleMan1_.getSelectionCount() != seleMan2_.getSelectionCount() ) {
126 >          sprintf( painCave.errMsg,
127 >                   "In frame %d, the number of selected StuntDoubles are not\n"
128 >                   "\tthe same in --sele1 and sele2\n", i);
129 >          painCave.severity = OPENMD_INFO;
130 >          painCave.isFatal = 0;
131 >          simError();            
132 >        }
133 >        
134 >        for (sd1 = seleMan1_.beginSelected(ii),
135 >               sd2 = seleMan2_.beginSelected(jj);
136 >             sd1 != NULL && sd2 != NULL;
137 >             sd1 = seleMan1_.nextSelected(ii),
138 >               sd2 = seleMan2_.nextSelected(jj)) {
139 >
140 >          Vector3d vec = sd1->getPos() - sd2->getPos();
141 >
142 >          if (usePeriodicBoundaryConditions_)
143 >            currentSnapshot_->wrapVector(vec);
144 >
145 >          vec.normalize();
146 >
147 >          orderTensor +=outProduct(vec, vec);
148 >          vecCount++;
149 >        }
150 >      
151 >        orderTensor /= vecCount;
152        }
153        
154 <      orderTensor /= sdPairs_.size();
154 >      if (vecCount == 0) {
155 >          sprintf( painCave.errMsg,
156 >                   "In frame %d, the number of selected vectors was zero.\n"
157 >                   "\tThis will not give a meaningful order parameter.", i);
158 >          painCave.severity = OPENMD_ERROR;
159 >          painCave.isFatal = 1;
160 >          simError();        
161 >      }
162 >
163        orderTensor -= (RealType)(1.0/3.0) * Mat3x3d::identity();  
164        
165        Vector3d eigenvalues;
166        Mat3x3d eigenvectors;    
167 +
168        Mat3x3d::diagonalize(orderTensor, eigenvalues, eigenvectors);
169        
170        int which;
# Line 155 | Line 184 | namespace OpenMD {
184        }  
185  
186        RealType angle = 0.0;
187 <      for (std::vector<std::pair<StuntDouble*, StuntDouble*> >::iterator j = sdPairs_.begin(); j != sdPairs_.end(); ++j) {
188 <        Vector3d vec = j->first->getPos() - j->second->getPos();
189 <        if (usePeriodicBoundaryConditions_)
190 <          currentSnapshot_->wrapVector(vec);
191 <        vec.normalize();
192 <
193 <        angle += acos(dot(vec, director)) ;
187 >      vecCount = 0;
188 >      
189 >      if (doVect_) {
190 >        for (sd1 = seleMan1_.beginSelected(ii); sd1 != NULL;
191 >             sd1 = seleMan1_.nextSelected(ii)) {
192 >          if (sd1->isDirectional()) {
193 >            Vector3d vec = sd1->getA().getColumn(2);
194 >            vec.normalize();
195 >            angle += acos(dot(vec, director));
196 >            vecCount++;
197 >          }
198 >        }
199 >        angle = angle/(vecCount*NumericConstant::PI)*180.0;
200 >        
201 >      } else {
202 >        for (sd1 = seleMan1_.beginSelected(ii),
203 >               sd2 = seleMan2_.beginSelected(jj);
204 >             sd1 != NULL && sd2 != NULL;
205 >             sd1 = seleMan1_.nextSelected(ii),
206 >               sd2 = seleMan2_.nextSelected(jj)) {
207 >          
208 >          Vector3d vec = sd1->getPos() - sd2->getPos();
209 >          if (usePeriodicBoundaryConditions_)
210 >            currentSnapshot_->wrapVector(vec);
211 >          vec.normalize();          
212 >          angle += acos(dot(vec, director)) ;
213 >          vecCount++;
214 >        }
215 >        angle = angle / (vecCount * NumericConstant::PI) * 180.0;
216        }
166      angle = angle / (sdPairs_.size() * NumericConstant::PI) * 180.0;
217  
218        OrderParam param;
219        param.p2 = p2;
# Line 173 | Line 223 | namespace OpenMD {
223        orderParams_.push_back(param);      
224      
225      }
226 <
226 >    
227      writeP2();
228 <  
228 >    
229    }
230  
231    void P2OrderParameter::writeP2() {
232  
233 <    std::ofstream os(getOutputFileName().c_str());
233 >    ofstream os(getOutputFileName().c_str());
234      os << "#radial distribution function\n";
235      os<< "#selection1: (" << selectionScript1_ << ")\t";
236 <    os << "selection2: (" << selectionScript2_ << ")\n";
236 >    if (!doVect_) {
237 >      os << "selection2: (" << selectionScript2_ << ")\n";
238 >    }
239      os << "#p2\tdirector_x\tdirector_y\tdiretor_z\tangle(degree)\n";    
240  
241 <    for (std::size_t i = 0; i < orderParams_.size(); ++i) {
241 >    for (size_t i = 0; i < orderParams_.size(); ++i) {
242        os <<  orderParams_[i].p2 << "\t"
243           <<  orderParams_[i].director[0] << "\t"
244           <<  orderParams_[i].director[1] << "\t"

Comparing trunk/src/applications/staticProps/P2OrderParameter.cpp (property svn:keywords):
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 UTC vs.
Revision 1818 by gezelter, Wed Dec 12 20:37:29 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines