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 1078 by gezelter, Wed Oct 18 21:58:48 2006 UTC vs.
branches/development/src/applications/staticProps/BondOrderParameter.cpp (file contents), Revision 1601 by gezelter, Thu Aug 4 20:04:35 2011 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
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]  Vardeman & Gezelter, in progress (2009).                        
40   *
41   *  Created by J. Daniel Gezelter on 09/26/06.
42   *  @author  J. Daniel Gezelter
43 < *  @version $Id: BondOrderParameter.cpp,v 1.19 2006-10-18 21:58:47 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 186 | Line 185 | namespace oopse {
185      Q.resize(lMax_+1);
186      W.resize(lMax_+1);
187      W_hat.resize(lMax_+1);
188 +    Nbonds = 0;
189  
190      for (int istep = 0; istep < nFrames; istep += step_) {
191        reader.readFrame(istep);
# Line 261 | Line 261 | namespace oopse {
261          }
262          
263          
264        for (int l = 0; l <= lMax_; l++) {        
265          q_l[l] = 0.0;
266          for(int m = -l; m <= l; m++) {
267            q_l[l] += norm(q[std::make_pair(l,m)]);
268          }    
269          q_l[l] *= 4.0*NumericConstant::PI/(RealType)(2*l + 1);
270          q_l[l] = sqrt(q_l[l])/(RealType)nBonds;
271        }
272
273        // Find second order invariant Q_l
274        
264          for (int l = 0; l <= lMax_; l++) {
265            q2[l] = 0.0;
266            for (int m = -l; m <= l; m++){
267 +            q[std::make_pair(l,m)] /= (RealType)nBonds;
268              q2[l] += norm(q[std::make_pair(l,m)]);
269            }
270 <          q_l[l] = sqrt(q2[l] * 4.0 * NumericConstant::PI /
281 <                        (RealType)(2*l + 1))/(RealType)nBonds;
270 >          q_l[l] = sqrt(q2[l] * 4.0 * NumericConstant::PI / (RealType)(2*l + 1));
271          }
272 <
272 >        
273          // Find Third Order Invariant W_l
274      
275          for (int l = 0; l <= lMax_; l++) {
276            w[l] = 0.0;
277            for (int m1 = -l; m1 <= l; m1++) {
278              std::pair<int,int> lm = std::make_pair(l, m1);
279 <            for (int mmm = 0; mmm < (m2Max[lm] - m2Min[lm]); mmm++) {
279 >            for (int mmm = 0; mmm <= (m2Max[lm] - m2Min[lm]); mmm++) {
280                int m2 = m2Min[lm] + mmm;
281                int m3 = -m1-m2;
282                w[l] += w3j[lm][mmm] * q[lm] *
# Line 303 | Line 292 | namespace oopse {
292          Nbonds += nBonds;
293          for (int l = 0; l <= lMax_;  l++) {
294            for (int m = -l; m <= l; m++) {
295 <            QBar[std::make_pair(l,m)] += q[std::make_pair(l,m)];
295 >            QBar[std::make_pair(l,m)] += (RealType)nBonds*q[std::make_pair(l,m)];
296            }
297          }
298        }
# Line 332 | Line 321 | namespace oopse {
321        W[l] = 0.0;
322        for (int m1 = -l; m1 <= l; m1++) {
323          std::pair<int,int> lm = std::make_pair(l, m1);
324 <        for (int mmm = 0; mmm < (m2Max[lm] - m2Min[lm]); mmm++) {
324 >        for (int mmm = 0; mmm <= (m2Max[lm] - m2Min[lm]); mmm++) {
325            int m2 = m2Min[lm] + mmm;
326            int m3 = -m1-m2;
327            W[l] += w3j[lm][mmm] * QBar[lm] *
# Line 357 | Line 346 | namespace oopse {
346        } else {
347          sprintf( painCave.errMsg,
348                   "q_l value outside reasonable range\n");
349 <        painCave.severity = OOPSE_ERROR;
349 >        painCave.severity = OPENMD_ERROR;
350          painCave.isFatal = 1;
351          simError();  
352        }
# Line 370 | Line 359 | namespace oopse {
359          Wcount_[l]++;      
360        } else {
361          sprintf( painCave.errMsg,
362 <                 "Re[w_hat] value outside reasonable range\n");
363 <        painCave.severity = OOPSE_ERROR;
362 >                 "Re[w_hat] value (%lf) outside reasonable range\n", real(what[l]));
363 >        painCave.severity = OPENMD_ERROR;
364          painCave.isFatal = 1;
365          simError();  
366        }
# Line 398 | Line 387 | namespace oopse {
387          RealType Qval = MinQ_ + (i + 0.5) * deltaQ_;              
388          osq << Qval;
389          for (int l = 0; l <= lMax_; l++) {
390 <          osq << "\t" << (RealType)Q_histogram_[std::make_pair(i,l)] /
391 <            (RealType)Qcount_[l];
390 >
391 >          osq << "\t" << (RealType)Q_histogram_[std::make_pair(i,l)]/(RealType)Qcount_[l]/deltaQ_;
392          }
393          osq << "\n";
394        }
# Line 420 | Line 409 | namespace oopse {
409        osw << "# selection: (" << selectionScript_ << ")\n";
410        osw << "# \n";
411        for (int l = 0; l <= lMax_; l++) {
412 <        osw << "# <W_" << l << ">: " << real(What[l]) << "\n";
412 >        osw << "# <W_" << l << ">: " << real(What[l]) << "\t" << imag(What[l]) << "\n";
413        }
414        // Normalize by number of frames and write it out:
415        for (int i = 0; i < nBins_; ++i) {
416          RealType Wval = MinW_ + (i + 0.5) * deltaW_;              
417          osw << Wval;
418          for (int l = 0; l <= lMax_; l++) {
419 <          osw << "\t" << (RealType)W_histogram_[std::make_pair(i,l)] /
420 <            (RealType)Wcount_[l];
419 >
420 >          osw << "\t" << (RealType)W_histogram_[std::make_pair(i,l)]/(RealType)Wcount_[l]/deltaW_;
421          }
422          osw << "\n";
423        }

Comparing:
trunk/src/applications/staticProps/BondOrderParameter.cpp (property svn:keywords), Revision 1078 by gezelter, Wed Oct 18 21:58:48 2006 UTC vs.
branches/development/src/applications/staticProps/BondOrderParameter.cpp (property svn:keywords), Revision 1601 by gezelter, Thu Aug 4 20:04:35 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines