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

Comparing:
trunk/src/applications/staticProps/BondOrderParameter.cpp (file contents), Revision 1094 by gezelter, Tue Nov 21 20:44:54 2006 UTC vs.
branches/development/src/applications/staticProps/BondOrderParameter.cpp (file contents), Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 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, 24107 (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.21 2006-11-21 20:44:54 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 {
54 > using namespace MATPACK;
55 > namespace OpenMD {
56  
57    BondOrderParameter::BondOrderParameter(SimInfo* info,
58                                           const std::string& filename,
# Line 83 | Line 82 | namespace oopse {
82      // W_6 for icosahedral clusters is 11 / sqrt(4199) = 0.169754, so we'll
83      // use values for MinW_ and MaxW_ that are slightly larger than this:
84  
85 <    MinW_ = -0.25;
86 <    MaxW_ = 0.25;
85 >    MinW_ = -1.1;
86 >    MaxW_ = 1.1;
87      deltaW_ = (MaxW_ - MinW_) / nbins;
88  
89      // Make arrays for Wigner3jm
90 <    double* THRCOF = new double[2*lMax_+1];
90 >    RealType* THRCOF = new RealType[2*lMax_+1];
91      // Variables for Wigner routine
92 <    double lPass, m1Pass, m2m, m2M;
92 >    RealType lPass, m1Pass, m2m, m2M;
93      int error, mSize;
94      mSize = 2*lMax_+1;
95  
96      for (int l = 0; l <= lMax_; l++) {
97 <      lPass = (double)l;
97 >      lPass = (RealType)l;
98        for (int m1 = -l; m1 <= l; m1++) {
99 <        m1Pass = (double)m1;
99 >        m1Pass = (RealType)m1;
100  
101          std::pair<int,int> lm = std::make_pair(l, m1);
102          
# Line 105 | Line 104 | namespace oopse {
104          for (int ii = 0; ii < 2*l + 1; ii++){
105            THRCOF[ii] = 0.0;
106          }
107 <            
107 >
108          // Get Wigner coefficients
109 <        Wigner3jm(&lPass, &lPass, &lPass,
110 <                  &m1Pass, &m2m, &m2M,
111 <                  THRCOF, &mSize, &error);
109 >        Wigner3jm(lPass, lPass, lPass,
110 >                  m1Pass, m2m, m2M,
111 >                  THRCOF, mSize, error);
112          
113          m2Min[lm] = (int)floor(m2m);
114          m2Max[lm] = (int)floor(m2M);
115          
116 <        for (int mmm = 0; mmm < (int)(m2M - m2m); mmm++) {
116 >        for (int mmm = 0; mmm <= (int)(m2M - m2m); mmm++) {
117            w3j[lm].push_back(THRCOF[mmm]);
118          }
119        }
# Line 158 | Line 157 | namespace oopse {
157      RealType costheta;
158      RealType phi;
159      RealType r;
161    RealType dist;
160      std::map<std::pair<int,int>,ComplexType> q;
161      std::vector<RealType> q_l;
162      std::vector<RealType> q2;
# Line 171 | Line 169 | namespace oopse {
169      std::vector<ComplexType> W_hat;
170      int nBonds, Nbonds;
171      SphericalHarmonic sphericalHarmonic;
172 <    int i, j;
172 >    int i;
173  
174      DumpReader reader(info_, dumpFilename_);    
175      int nFrames = reader.getNFrames();
# Line 265 | Line 263 | namespace oopse {
263          for (int l = 0; l <= lMax_; l++) {
264            q2[l] = 0.0;
265            for (int m = -l; m <= l; m++){
266 <            q[std::make_pair(l,m)] /= (RealType)nBonds;            
266 >            q[std::make_pair(l,m)] /= (RealType)nBonds;
267              q2[l] += norm(q[std::make_pair(l,m)]);
268            }
269            q_l[l] = sqrt(q2[l] * 4.0 * NumericConstant::PI / (RealType)(2*l + 1));
# Line 277 | Line 275 | namespace oopse {
275            w[l] = 0.0;
276            for (int m1 = -l; m1 <= l; m1++) {
277              std::pair<int,int> lm = std::make_pair(l, m1);
278 <            for (int mmm = 0; mmm < (m2Max[lm] - m2Min[lm]); mmm++) {
278 >            for (int mmm = 0; mmm <= (m2Max[lm] - m2Min[lm]); mmm++) {
279                int m2 = m2Min[lm] + mmm;
280                int m3 = -m1-m2;
281                w[l] += w3j[lm][mmm] * q[lm] *
# Line 285 | Line 283 | namespace oopse {
283              }
284            }
285            
286 <          w_hat[l] = w[l] / pow(q2[l], 1.5);
286 >          w_hat[l] = w[l] / pow(q2[l], RealType(1.5));
287          }
288  
289          collectHistogram(q_l, w_hat);
# Line 322 | Line 320 | namespace oopse {
320        W[l] = 0.0;
321        for (int m1 = -l; m1 <= l; m1++) {
322          std::pair<int,int> lm = std::make_pair(l, m1);
323 <        for (int mmm = 0; mmm < (m2Max[lm] - m2Min[lm]); mmm++) {
323 >        for (int mmm = 0; mmm <= (m2Max[lm] - m2Min[lm]); mmm++) {
324            int m2 = m2Min[lm] + mmm;
325            int m3 = -m1-m2;
326            W[l] += w3j[lm][mmm] * QBar[lm] *
# Line 330 | Line 328 | namespace oopse {
328          }
329        }
330        
331 <      W_hat[l] = W[l] / pow(Q2[l], 1.5);
331 >      W_hat[l] = W[l] / pow(Q2[l], RealType(1.5));
332      }
333      
334      writeOrderParameter(Q, W_hat);    
# Line 347 | Line 345 | namespace oopse {
345        } else {
346          sprintf( painCave.errMsg,
347                   "q_l value outside reasonable range\n");
348 <        painCave.severity = OOPSE_ERROR;
348 >        painCave.severity = OPENMD_ERROR;
349          painCave.isFatal = 1;
350          simError();  
351        }
# Line 361 | Line 359 | namespace oopse {
359        } else {
360          sprintf( painCave.errMsg,
361                   "Re[w_hat] value (%lf) outside reasonable range\n", real(what[l]));
362 <        painCave.severity = OOPSE_ERROR;
362 >        painCave.severity = OPENMD_ERROR;
363          painCave.isFatal = 1;
364          simError();  
365        }

Comparing:
trunk/src/applications/staticProps/BondOrderParameter.cpp (property svn:keywords), Revision 1094 by gezelter, Tue Nov 21 20:44:54 2006 UTC vs.
branches/development/src/applications/staticProps/BondOrderParameter.cpp (property svn:keywords), Revision 1767 by gezelter, Fri Jul 6 22:01:58 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines