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

Comparing trunk/src/applications/staticProps/BondOrderParameter.cpp (file contents):
Revision 1100 by gezelter, Wed Dec 20 21:03:11 2006 UTC vs.
Revision 2071 by gezelter, Sat Mar 7 21:41:51 2015 UTC

# Line 6 | Line 6
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
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 38 | Line 29
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31   *
32 < *  BondOrderParameter.cpp
33 < *  OOPSE-4
34 < *
32 > * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 > * research, please cite the appropriate papers when you publish your
34 > * work.  Good starting points are:
35 > *                                                                      
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, 234107 (2008).          
39 > * [4] Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [4] , Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). *
41   *  Created by J. Daniel Gezelter on 09/26/06.
42   *  @author  J. Daniel Gezelter
43 < *  @version $Id: BondOrderParameter.cpp,v 1.22 2006-12-20 21:03:11 gezelter Exp $
43 > *  @version $Id$
44   *
45   */
46  
# Line 52 | Line 49
49   #include "io/DumpReader.hpp"
50   #include "primitives/Molecule.hpp"
51   #include "utils/NumericConstant.hpp"
52 + #include "math/Wigner3jm.hpp"
53  
54 < namespace oopse {
55 <
54 > using namespace MATPACK;
55 > namespace OpenMD {
56 >  
57    BondOrderParameter::BondOrderParameter(SimInfo* info,
58                                           const std::string& filename,
59                                           const std::string& sele,
60 <                                         double rCut, int nbins) : StaticAnalyser(info, filename), selectionScript_(sele), evaluator_(info), seleMan_(info){
60 >                                         double rCut, int nbins)
61 >    : StaticAnalyser(info, filename), selectionScript_(sele), seleMan_(info),
62 >      evaluator_(info) {
63      
64      setOutputName(getPrefix(filename) + ".bo");
65  
# Line 88 | Line 89 | namespace oopse {
89      deltaW_ = (MaxW_ - MinW_) / nbins;
90  
91      // Make arrays for Wigner3jm
92 <    double* THRCOF = new double[2*lMax_+1];
92 >    RealType* THRCOF = new RealType[2*lMax_+1];
93      // Variables for Wigner routine
94 <    double lPass, m1Pass, m2m, m2M;
94 >    RealType lPass, m1Pass, m2m, m2M;
95      int error, mSize;
96      mSize = 2*lMax_+1;
97  
98      for (int l = 0; l <= lMax_; l++) {
99 <      lPass = (double)l;
99 >      lPass = (RealType)l;
100        for (int m1 = -l; m1 <= l; m1++) {
101 <        m1Pass = (double)m1;
101 >        m1Pass = (RealType)m1;
102  
103          std::pair<int,int> lm = std::make_pair(l, m1);
104          
# Line 107 | Line 108 | namespace oopse {
108          }
109  
110          // Get Wigner coefficients
111 <        Wigner3jm(&lPass, &lPass, &lPass,
112 <                  &m1Pass, &m2m, &m2M,
113 <                  THRCOF, &mSize, &error);
114 <        
111 >        Wigner3jm(lPass, lPass, lPass,
112 >                  m1Pass, m2m, m2M,
113 >                  THRCOF, mSize, error);
114 >      
115          m2Min[lm] = (int)floor(m2m);
116          m2Max[lm] = (int)floor(m2M);
117          
# Line 136 | Line 137 | namespace oopse {
137      m2Max.clear();
138    }
139    
140 <  void BondOrderParameter::initalizeHistogram() {
140 >  void BondOrderParameter::initializeHistogram() {
141      for (int bin = 0; bin < nBins_; bin++) {
142        for (int l = 0; l <= lMax_; l++) {
143          Q_histogram_[std::make_pair(bin,l)] = 0;
# Line 158 | Line 159 | namespace oopse {
159      RealType costheta;
160      RealType phi;
161      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;
# Line 171 | Line 171 | namespace oopse {
171      std::vector<ComplexType> W_hat;
172      int nBonds, Nbonds;
173      SphericalHarmonic sphericalHarmonic;
174 <    int i, j;
174 >    int i;
175  
176      DumpReader reader(info_, dumpFilename_);    
177      int nFrames = reader.getNFrames();
# Line 253 | Line 253 | namespace oopse {
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                  }
259                  nBonds++;
# Line 265 | Line 266 | namespace oopse {
266          for (int l = 0; l <= lMax_; l++) {
267            q2[l] = 0.0;
268            for (int m = -l; m <= l; m++){
269 <            q[std::make_pair(l,m)] /= (RealType)nBonds;            
269 >            q[std::make_pair(l,m)] /= (RealType)nBonds;
270 >
271              q2[l] += norm(q[std::make_pair(l,m)]);
272            }
273            q_l[l] = sqrt(q2[l] * 4.0 * NumericConstant::PI / (RealType)(2*l + 1));
# Line 285 | Line 287 | namespace oopse {
287              }
288            }
289            
290 <          w_hat[l] = w[l] / pow(q2[l], 1.5);
290 >          w_hat[l] = w[l] / pow(q2[l], RealType(1.5));
291          }
292  
293          collectHistogram(q_l, w_hat);
# Line 330 | Line 332 | namespace oopse {
332          }
333        }
334        
335 <      W_hat[l] = W[l] / pow(Q2[l], 1.5);
335 >      W_hat[l] = W[l] / pow(Q2[l], RealType(1.5));
336      }
337      
338      writeOrderParameter(Q, W_hat);    
# Line 341 | Line 343 | namespace oopse {
343  
344      for (int l = 0; l <= lMax_; l++) {
345        if (q[l] >= MinQ_ && q[l] < MaxQ_) {
346 <        int qbin = (q[l] - MinQ_) / deltaQ_;
346 >        int qbin = int((q[l] - MinQ_) / deltaQ_);
347          Q_histogram_[std::make_pair(qbin,l)] += 1;
348          Qcount_[l]++;      
349        } else {
350          sprintf( painCave.errMsg,
351                   "q_l value outside reasonable range\n");
352 <        painCave.severity = OOPSE_ERROR;
352 >        painCave.severity = OPENMD_ERROR;
353          painCave.isFatal = 1;
354          simError();  
355        }
# Line 355 | Line 357 | namespace oopse {
357  
358      for (int l = 0; l <= lMax_; l++) {
359        if (real(what[l]) >= MinW_ && real(what[l]) < MaxW_) {
360 <        int wbin = (real(what[l]) - MinW_) / deltaW_;
360 >        int wbin = int((real(what[l]) - MinW_) / deltaW_);
361          W_histogram_[std::make_pair(wbin,l)] += 1;
362          Wcount_[l]++;      
363        } else {
364          sprintf( painCave.errMsg,
365                   "Re[w_hat] value (%lf) outside reasonable range\n", real(what[l]));
366 <        painCave.severity = OOPSE_ERROR;
366 >        painCave.severity = OPENMD_ERROR;
367          painCave.isFatal = 1;
368          simError();  
369        }

Comparing trunk/src/applications/staticProps/BondOrderParameter.cpp (property svn:keywords):
Revision 1100 by gezelter, Wed Dec 20 21:03:11 2006 UTC vs.
Revision 2071 by gezelter, Sat Mar 7 21:41:51 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines