ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/applications/staticProps/BondOrderParameter.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/applications/staticProps/BondOrderParameter.cpp (file contents):
Revision 2901 by chuckv, Tue Jun 27 16:19:28 2006 UTC vs.
Revision 3079 by gezelter, Tue Nov 21 20:44:54 2006 UTC

# Line 1 | Line 1
1 < /*
2 < * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 < *
4 < * The University of Notre Dame grants you ("Licensee") a
5 < * non-exclusive, royalty free, license to use, modify and
6 < * redistribute this software in source and binary code form, provided
7 < * that the following conditions are met:
8 < *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
19 < *    notice, this list of conditions and the following disclaimer.
20 < *
21 < * 3. Redistributions in binary form must reproduce the above copyright
22 < *    notice, this list of conditions and the following disclaimer in the
23 < *    documentation and/or other materials provided with the
24 < *    distribution.
25 < *
26 < * This software is provided "AS IS," without a warranty of any
27 < * kind. All express or implied conditions, representations and
28 < * warranties, including any implied warranty of merchantability,
29 < * fitness for a particular purpose or non-infringement, are hereby
30 < * excluded.  The University of Notre Dame and its licensors shall not
31 < * be liable for any damages suffered by licensee as a result of
32 < * using, modifying or distributing the software or its
33 < * derivatives. In no event will the University of Notre Dame or its
34 < * licensors be liable for any lost revenue, profit or data, or for
35 < * direct, indirect, special, consequential, incidental or punitive
36 < * damages, however caused and regardless of the theory of liability,
37 < * arising out of the use of or inability to use software, even if the
38 < * University of Notre Dame has been advised of the possibility of
39 < * such damages.
40 < */
41 <
42 < #include "applications/staticProps/P2OrderParameter.hpp"
43 < #include "utils/simError.h"
44 < #include "io/DumpReader.hpp"
45 < #include "primitives/Molecule.hpp"
46 < #include "utils/NumericConstant.hpp"
47 < namespace oopse {
48 <
49 <
50 < P2OrderParameter::P2OrderParameter(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2)
51 <  : StaticAnalyser(info, filename),
52 <    selectionScript1_(sele1), selectionScript2_(sele2), evaluator1_(info), evaluator2_(info),
53 <    seleMan1_(info), seleMan2_(info){
54 <
55 <    setOutputName(getPrefix(filename) + ".p2");
56 <        
57 <    evaluator1_.loadScriptString(sele1);
58 <    evaluator2_.loadScriptString(sele2);
59 <
60 <    if (!evaluator1_.isDynamic()) {
61 <      seleMan1_.setSelectionSet(evaluator1_.evaluate());
62 <    }else {
63 <        sprintf( painCave.errMsg,
64 <                 "--sele1 must be static selection\n");
65 <        painCave.severity = OOPSE_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 = OOPSE_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 = OOPSE_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 <
100 <    
101 <  }
102 <
103 < void P2OrderParameter::process() {
104 <  Molecule* mol;
105 <  RigidBody* rb;
106 <  SimInfo::MoleculeIterator mi;
107 <  Molecule::RigidBodyIterator rbIter;
108 <  
109 <  DumpReader reader(info_, dumpFilename_);    
110 <  int nFrames = reader.getNFrames();
111 <
112 <  for (int i = 0; i < nFrames; i += step_) {
113 <    reader.readFrame(i);
114 <    currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
115 <
116 <    
117 <    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
118 <        //change the positions of atoms which belong to the rigidbodies
119 <        for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
120 <            rb->updateAtoms();
121 <        }
122 <        
123 <    }      
124 <
125 <      Mat3x3d orderTensor(0.0);
126 <      for (std::vector<std::pair<StuntDouble*, StuntDouble*> >::iterator j = sdPairs_.begin(); j != sdPairs_.end(); ++j) {
127 <          Vector3d vec = j->first->getPos() - j->second->getPos();
128 <          currentSnapshot_->wrapVector(vec);
129 <          vec.normalize();
130 <          orderTensor +=outProduct(vec, vec);
131 <      }
132 <      
133 <      orderTensor /= sdPairs_.size();
134 <      orderTensor -= (RealType)(1.0/3.0) * Mat3x3d::identity();  
135 <      
136 <      Vector3d eigenvalues;
137 <      Mat3x3d eigenvectors;    
138 <      Mat3x3d::diagonalize(orderTensor, eigenvalues, eigenvectors);
139 <      
140 <      int which;
141 <      RealType maxEval = 0.0;
142 <      for(int k = 0; k< 3; k++){
143 <        if(fabs(eigenvalues[k]) > maxEval){
144 <          which = k;
145 <          maxEval = fabs(eigenvalues[k]);
146 <        }
147 <      }
148 <      RealType p2 = 1.5 * maxEval;
149 <      
150 <      //the eigen vector is already normalized in SquareMatrix3::diagonalize
151 <      Vector3d director = eigenvectors.getColumn(which);
152 <      if (director[0] < 0) {
153 <          director.negate();
154 <      }  
155 <
156 <      RealType angle = 0.0;
157 <      for (std::vector<std::pair<StuntDouble*, StuntDouble*> >::iterator j = sdPairs_.begin(); j != sdPairs_.end(); ++j) {
158 <          Vector3d vec = j->first->getPos() - j->second->getPos();
159 <          currentSnapshot_->wrapVector(vec);
160 <          vec.normalize();
161 <
162 <          angle += acos(dot(vec, director)) ;
163 <      }
164 <      angle = angle / (sdPairs_.size() * NumericConstant::PI) * 180.0;
165 <
166 <       OrderParam param;
167 <       param.p2 = p2;
168 <       param.director = director;
169 <       param.angle = angle;
170 <
171 <        orderParams_.push_back(param);      
172 <    
173 <  }
174 <
175 <  writeP2();
176 <  
177 < }
178 <
179 < void P2OrderParameter::writeP2() {
180 <
181 <    std::ofstream os(getOutputFileName().c_str());
182 <    os << "#radial distribution function\n";
183 <    os<< "#selection1: (" << selectionScript1_ << ")\t";
184 <    os << "selection2: (" << selectionScript2_ << ")\n";
185 <    os << "#p2\tdirector_x\tdirector_y\tdiretor_z\tangle(degree)\n";    
186 <
187 <    for (std::size_t i = 0; i < orderParams_.size(); ++i) {
188 <        os <<  orderParams_[i].p2 << "\t"
189 <            <<  orderParams_[i].director[0] << "\t"
190 <            <<  orderParams_[i].director[1] << "\t"
191 <            <<  orderParams_[i].director[2] << "\t"
192 <            <<  orderParams_[i].angle << "\n";
193 <
194 <    }
195 <
196 < }
197 <
198 < }
199 <
1 > /*
2 > * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3 > *
4 > * The University of Notre Dame grants you ("Licensee") a
5 > * non-exclusive, royalty free, license to use, modify and
6 > * redistribute this software in source and binary code form, provided
7 > * that the following conditions are met:
8 > *
9 > * 1. Acknowledgement of the program authors must be made in any
10 > *    publication of scientific results based in part on use of the
11 > *    program.  An acceptable form of acknowledgement is citation of
12 > *    the article in which the program was described (Matthew
13 > *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 > *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 > *    Parallel Simulation Engine for Molecular Dynamics,"
16 > *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 > *
18 > * 2. Redistributions of source code must retain the above copyright
19 > *    notice, this list of conditions and the following disclaimer.
20 > *
21 > * 3. Redistributions in binary form must reproduce the above copyright
22 > *    notice, this list of conditions and the following disclaimer in the
23 > *    documentation and/or other materials provided with the
24 > *    distribution.
25 > *
26 > * This software is provided "AS IS," without a warranty of any
27 > * kind. All express or implied conditions, representations and
28 > * warranties, including any implied warranty of merchantability,
29 > * fitness for a particular purpose or non-infringement, are hereby
30 > * excluded.  The University of Notre Dame and its licensors shall not
31 > * be liable for any damages suffered by licensee as a result of
32 > * using, modifying or distributing the software or its
33 > * derivatives. In no event will the University of Notre Dame or its
34 > * licensors be liable for any lost revenue, profit or data, or for
35 > * direct, indirect, special, consequential, incidental or punitive
36 > * damages, however caused and regardless of the theory of liability,
37 > * arising out of the use of or inability to use software, even if the
38 > * University of Notre Dame has been advised of the possibility of
39 > * such damages.
40 > *
41 > *  BondOrderParameter.cpp
42 > *  OOPSE-4
43 > *
44 > *  Created by J. Daniel Gezelter on 09/26/06.
45 > *  @author  J. Daniel Gezelter
46 > *  @version $Id: BondOrderParameter.cpp,v 1.21 2006-11-21 20:44:54 gezelter Exp $
47 > *
48 > */
49 >
50 > #include "applications/staticProps/BondOrderParameter.hpp"
51 > #include "utils/simError.h"
52 > #include "io/DumpReader.hpp"
53 > #include "primitives/Molecule.hpp"
54 > #include "utils/NumericConstant.hpp"
55 >
56 > namespace oopse {
57 >
58 >  BondOrderParameter::BondOrderParameter(SimInfo* info,
59 >                                         const std::string& filename,
60 >                                         const std::string& sele,
61 >                                         double rCut, int nbins) : StaticAnalyser(info, filename), selectionScript_(sele), evaluator_(info), seleMan_(info){
62 >    
63 >    setOutputName(getPrefix(filename) + ".bo");
64 >
65 >    evaluator_.loadScriptString(sele);
66 >    if (!evaluator_.isDynamic()) {
67 >      seleMan_.setSelectionSet(evaluator_.evaluate());
68 >    }
69 >
70 >    // Set up cutoff radius and order of the Legendre Polynomial:
71 >
72 >    rCut_ = rCut;
73 >    nBins_ = nbins;
74 >    Qcount_.resize(lMax_+1);
75 >    Wcount_.resize(lMax_+1);
76 >
77 >    // Q can take values from 0 to 1
78 >
79 >    MinQ_ = 0.0;
80 >    MaxQ_ = 1.1;
81 >    deltaQ_ = (MaxQ_ - MinQ_) / nbins;
82 >
83 >    // W_6 for icosahedral clusters is 11 / sqrt(4199) = 0.169754, so we'll
84 >    // use values for MinW_ and MaxW_ that are slightly larger than this:
85 >
86 >    MinW_ = -0.25;
87 >    MaxW_ = 0.25;
88 >    deltaW_ = (MaxW_ - MinW_) / nbins;
89 >
90 >    // Make arrays for Wigner3jm
91 >    double* THRCOF = new double[2*lMax_+1];
92 >    // Variables for Wigner routine
93 >    double lPass, m1Pass, m2m, m2M;
94 >    int error, mSize;
95 >    mSize = 2*lMax_+1;
96 >
97 >    for (int l = 0; l <= lMax_; l++) {
98 >      lPass = (double)l;
99 >      for (int m1 = -l; m1 <= l; m1++) {
100 >        m1Pass = (double)m1;
101 >
102 >        std::pair<int,int> lm = std::make_pair(l, m1);
103 >        
104 >        // Zero work array
105 >        for (int ii = 0; ii < 2*l + 1; ii++){
106 >          THRCOF[ii] = 0.0;
107 >        }
108 >            
109 >        // Get Wigner coefficients
110 >        Wigner3jm(&lPass, &lPass, &lPass,
111 >                  &m1Pass, &m2m, &m2M,
112 >                  THRCOF, &mSize, &error);
113 >        
114 >        m2Min[lm] = (int)floor(m2m);
115 >        m2Max[lm] = (int)floor(m2M);
116 >        
117 >        for (int mmm = 0; mmm < (int)(m2M - m2m); mmm++) {
118 >          w3j[lm].push_back(THRCOF[mmm]);
119 >        }
120 >      }
121 >    }
122 >    delete [] THRCOF;
123 >    THRCOF = NULL;
124 >  }
125 >  
126 >  BondOrderParameter::~BondOrderParameter() {
127 >    Q_histogram_.clear();
128 >    W_histogram_.clear();
129 >    for (int l = 0; l <= lMax_; l++) {
130 >      for (int m = -l; m <= l; m++) {
131 >        w3j[std::make_pair(l,m)].clear();
132 >      }
133 >    }
134 >    w3j.clear();
135 >    m2Min.clear();
136 >    m2Max.clear();
137 >  }
138 >  
139 >  void BondOrderParameter::initalizeHistogram() {
140 >    for (int bin = 0; bin < nBins_; bin++) {
141 >      for (int l = 0; l <= lMax_; l++) {
142 >        Q_histogram_[std::make_pair(bin,l)] = 0;
143 >        W_histogram_[std::make_pair(bin,l)] = 0;
144 >      }
145 >    }
146 >  }
147 >
148 >  void BondOrderParameter::process() {
149 >    Molecule* mol;
150 >    Atom* atom;
151 >    RigidBody* rb;
152 >    int myIndex;
153 >    SimInfo::MoleculeIterator mi;
154 >    Molecule::RigidBodyIterator rbIter;
155 >    Molecule::AtomIterator ai;
156 >    StuntDouble* sd;
157 >    Vector3d vec;
158 >    RealType costheta;
159 >    RealType phi;
160 >    RealType r;
161 >    RealType dist;
162 >    std::map<std::pair<int,int>,ComplexType> q;
163 >    std::vector<RealType> q_l;
164 >    std::vector<RealType> q2;
165 >    std::vector<ComplexType> w;
166 >    std::vector<ComplexType> w_hat;
167 >    std::map<std::pair<int,int>,ComplexType> QBar;
168 >    std::vector<RealType> Q2;
169 >    std::vector<RealType> Q;
170 >    std::vector<ComplexType> W;
171 >    std::vector<ComplexType> W_hat;
172 >    int nBonds, Nbonds;
173 >    SphericalHarmonic sphericalHarmonic;
174 >    int i, j;
175 >
176 >    DumpReader reader(info_, dumpFilename_);    
177 >    int nFrames = reader.getNFrames();
178 >    frameCounter_ = 0;
179 >
180 >    q_l.resize(lMax_+1);
181 >    q2.resize(lMax_+1);
182 >    w.resize(lMax_+1);
183 >    w_hat.resize(lMax_+1);
184 >
185 >    Q2.resize(lMax_+1);
186 >    Q.resize(lMax_+1);
187 >    W.resize(lMax_+1);
188 >    W_hat.resize(lMax_+1);
189 >    Nbonds = 0;
190 >
191 >    for (int istep = 0; istep < nFrames; istep += step_) {
192 >      reader.readFrame(istep);
193 >      frameCounter_++;
194 >      currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
195 >      
196 >      if (evaluator_.isDynamic()) {
197 >        seleMan_.setSelectionSet(evaluator_.evaluate());
198 >      }
199 >
200 >      // update the positions of atoms which belong to the rigidbodies
201 >
202 >      for (mol = info_->beginMolecule(mi); mol != NULL;
203 >           mol = info_->nextMolecule(mi)) {
204 >        for (rb = mol->beginRigidBody(rbIter); rb != NULL;
205 >             rb = mol->nextRigidBody(rbIter)) {
206 >          rb->updateAtoms();
207 >        }        
208 >      }          
209 >            
210 >      // outer loop is over the selected StuntDoubles:
211 >
212 >      for (sd = seleMan_.beginSelected(i); sd != NULL;
213 >           sd = seleMan_.nextSelected(i)) {
214 >
215 >        myIndex = sd->getGlobalIndex();
216 >        nBonds = 0;
217 >        
218 >        for (int l = 0; l <= lMax_; l++) {
219 >          for (int m = -l; m <= l; m++) {
220 >            q[std::make_pair(l,m)] = 0.0;
221 >          }
222 >        }
223 >        
224 >        // inner loop is over all other atoms in the system:
225 >        
226 >        for (mol = info_->beginMolecule(mi); mol != NULL;
227 >             mol = info_->nextMolecule(mi)) {
228 >          for (atom = mol->beginAtom(ai); atom != NULL;
229 >               atom = mol->nextAtom(ai)) {
230 >
231 >            if (atom->getGlobalIndex() != myIndex) {
232 >
233 >              vec = sd->getPos() - atom->getPos();      
234 >
235 >              if (usePeriodicBoundaryConditions_)
236 >                currentSnapshot_->wrapVector(vec);
237 >              
238 >              // Calculate "bonds" and build Q_lm(r) where
239 >              //      Q_lm = Y_lm(theta(r),phi(r))                
240 >              // The spherical harmonics are wrt any arbitrary coordinate
241 >              // system, we choose standard spherical coordinates
242 >              
243 >              r = vec.length();
244 >              
245 >              // Check to see if neighbor is in bond cutoff
246 >              
247 >              if (r < rCut_) {
248 >                costheta = vec.z() / r;
249 >                phi = atan2(vec.y(), vec.x());
250 >
251 >                for (int l = 0; l <= lMax_; l++) {
252 >                  sphericalHarmonic.setL(l);
253 >                  for(int m = -l; m <= l; m++){
254 >                    sphericalHarmonic.setM(m);
255 >                    q[std::make_pair(l,m)] += sphericalHarmonic.getValueAt(costheta, phi);
256 >                  }
257 >                }
258 >                nBonds++;
259 >              }  
260 >            }
261 >          }
262 >        }
263 >        
264 >        
265 >        for (int l = 0; l <= lMax_; l++) {
266 >          q2[l] = 0.0;
267 >          for (int m = -l; m <= l; m++){
268 >            q[std::make_pair(l,m)] /= (RealType)nBonds;            
269 >            q2[l] += norm(q[std::make_pair(l,m)]);
270 >          }
271 >          q_l[l] = sqrt(q2[l] * 4.0 * NumericConstant::PI / (RealType)(2*l + 1));
272 >        }
273 >        
274 >        // Find Third Order Invariant W_l
275 >    
276 >        for (int l = 0; l <= lMax_; l++) {
277 >          w[l] = 0.0;
278 >          for (int m1 = -l; m1 <= l; m1++) {
279 >            std::pair<int,int> lm = std::make_pair(l, m1);
280 >            for (int mmm = 0; mmm < (m2Max[lm] - m2Min[lm]); mmm++) {
281 >              int m2 = m2Min[lm] + mmm;
282 >              int m3 = -m1-m2;
283 >              w[l] += w3j[lm][mmm] * q[lm] *
284 >                q[std::make_pair(l,m2)] *  q[std::make_pair(l,m3)];
285 >            }
286 >          }
287 >          
288 >          w_hat[l] = w[l] / pow(q2[l], 1.5);
289 >        }
290 >
291 >        collectHistogram(q_l, w_hat);
292 >        
293 >        Nbonds += nBonds;
294 >        for (int l = 0; l <= lMax_;  l++) {
295 >          for (int m = -l; m <= l; m++) {
296 >            QBar[std::make_pair(l,m)] += (RealType)nBonds*q[std::make_pair(l,m)];
297 >          }
298 >        }
299 >      }
300 >    }
301 >      
302 >    // Normalize Qbar2
303 >    for (int l = 0; l <= lMax_; l++) {
304 >      for (int m = -l; m <= l; m++){
305 >        QBar[std::make_pair(l,m)] /= Nbonds;
306 >      }
307 >    }
308 >    
309 >    // Find second order invariant Q_l
310 >    
311 >    for (int l = 0; l <= lMax_; l++) {
312 >      Q2[l] = 0.0;
313 >      for (int m = -l; m <= l; m++){
314 >        Q2[l] += norm(QBar[std::make_pair(l,m)]);
315 >      }
316 >      Q[l] = sqrt(Q2[l] * 4.0 * NumericConstant::PI / (RealType)(2*l + 1));
317 >    }
318 >    
319 >    // Find Third Order Invariant W_l
320 >    
321 >    for (int l = 0; l <= lMax_; l++) {
322 >      W[l] = 0.0;
323 >      for (int m1 = -l; m1 <= l; m1++) {
324 >        std::pair<int,int> lm = std::make_pair(l, m1);
325 >        for (int mmm = 0; mmm < (m2Max[lm] - m2Min[lm]); mmm++) {
326 >          int m2 = m2Min[lm] + mmm;
327 >          int m3 = -m1-m2;
328 >          W[l] += w3j[lm][mmm] * QBar[lm] *
329 >            QBar[std::make_pair(l,m2)] * QBar[std::make_pair(l,m3)];
330 >        }
331 >      }
332 >      
333 >      W_hat[l] = W[l] / pow(Q2[l], 1.5);
334 >    }
335 >    
336 >    writeOrderParameter(Q, W_hat);    
337 >  }
338 >
339 >  void BondOrderParameter::collectHistogram(std::vector<RealType> q,
340 >                                            std::vector<ComplexType> what) {
341 >
342 >    for (int l = 0; l <= lMax_; l++) {
343 >      if (q[l] >= MinQ_ && q[l] < MaxQ_) {
344 >        int qbin = (q[l] - MinQ_) / deltaQ_;
345 >        Q_histogram_[std::make_pair(qbin,l)] += 1;
346 >        Qcount_[l]++;      
347 >      } else {
348 >        sprintf( painCave.errMsg,
349 >                 "q_l value outside reasonable range\n");
350 >        painCave.severity = OOPSE_ERROR;
351 >        painCave.isFatal = 1;
352 >        simError();  
353 >      }
354 >    }
355 >
356 >    for (int l = 0; l <= lMax_; l++) {
357 >      if (real(what[l]) >= MinW_ && real(what[l]) < MaxW_) {
358 >        int wbin = (real(what[l]) - MinW_) / deltaW_;
359 >        W_histogram_[std::make_pair(wbin,l)] += 1;
360 >        Wcount_[l]++;      
361 >      } else {
362 >        sprintf( painCave.errMsg,
363 >                 "Re[w_hat] value (%lf) outside reasonable range\n", real(what[l]));
364 >        painCave.severity = OOPSE_ERROR;
365 >        painCave.isFatal = 1;
366 >        simError();  
367 >      }
368 >    }
369 >
370 >  }  
371 >
372 >
373 >  void BondOrderParameter::writeOrderParameter(std::vector<RealType> Q,
374 >                                               std::vector<ComplexType> What) {
375 >    
376 >    std::ofstream osq((getOutputFileName() + "q").c_str());
377 >
378 >    if (osq.is_open()) {
379 >      
380 >      osq << "# Bond Order Parameters\n";
381 >      osq << "# selection: (" << selectionScript_ << ")\n";
382 >      osq << "# \n";
383 >      for (int l = 0; l <= lMax_; l++) {
384 >        osq << "# <Q_" << l << ">: " << Q[l] << "\n";
385 >      }
386 >      // Normalize by number of frames and write it out:
387 >      for (int i = 0; i < nBins_; ++i) {
388 >        RealType Qval = MinQ_ + (i + 0.5) * deltaQ_;              
389 >        osq << Qval;
390 >        for (int l = 0; l <= lMax_; l++) {
391 >
392 >          osq << "\t" << (RealType)Q_histogram_[std::make_pair(i,l)]/(RealType)Qcount_[l]/deltaQ_;
393 >        }
394 >        osq << "\n";
395 >      }
396 >
397 >      osq.close();
398 >
399 >    } else {
400 >      sprintf(painCave.errMsg, "BondOrderParameter: unable to open %s\n",
401 >              (getOutputFileName() + "q").c_str());
402 >      painCave.isFatal = 1;
403 >      simError();  
404 >    }
405 >
406 >    std::ofstream osw((getOutputFileName() + "w").c_str());
407 >
408 >    if (osw.is_open()) {
409 >      osw << "# Bond Order Parameters\n";
410 >      osw << "# selection: (" << selectionScript_ << ")\n";
411 >      osw << "# \n";
412 >      for (int l = 0; l <= lMax_; l++) {
413 >        osw << "# <W_" << l << ">: " << real(What[l]) << "\t" << imag(What[l]) << "\n";
414 >      }
415 >      // Normalize by number of frames and write it out:
416 >      for (int i = 0; i < nBins_; ++i) {
417 >        RealType Wval = MinW_ + (i + 0.5) * deltaW_;              
418 >        osw << Wval;
419 >        for (int l = 0; l <= lMax_; l++) {
420 >
421 >          osw << "\t" << (RealType)W_histogram_[std::make_pair(i,l)]/(RealType)Wcount_[l]/deltaW_;
422 >        }
423 >        osw << "\n";
424 >      }
425 >
426 >      osw.close();
427 >    } else {
428 >      sprintf(painCave.errMsg, "BondOrderParameter: unable to open %s\n",
429 >              (getOutputFileName() + "w").c_str());
430 >      painCave.isFatal = 1;
431 >      simError();  
432 >    }
433 >      
434 >  }
435 > }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines