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

Comparing trunk/src/applications/staticProps/BOPofR.cpp (file contents):
Revision 1194 by chuckv, Thu Dec 6 19:52:11 2007 UTC vs.
Revision 1785 by jmichalk, Wed Aug 22 18:43:27 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: BOPofR.cpp,v 1.3 2007-12-06 19:52:11 chuckv 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 + #include "brains/Thermo.hpp"
54  
55 <
56 < namespace oopse {
55 > using namespace MATPACK;
56 > namespace OpenMD {
57  
58    BOPofR::BOPofR(SimInfo* info, const std::string& filename, const std::string& sele, double rCut,
59                   int nbins, RealType len) : StaticAnalyser(info, filename), selectionScript_(sele), evaluator_(info), seleMan_(info){
# Line 84 | Line 83 | namespace oopse {
83          }
84          
85      // Make arrays for Wigner3jm
86 <    double* THRCOF = new double[2*lMax_+1];
86 >    RealType* THRCOF = new RealType[2*lMax_+1];
87      // Variables for Wigner routine
88 <    double lPass, m1Pass, m2m, m2M;
88 >    RealType lPass, m1Pass, m2m, m2M;
89      int error, mSize;
90      mSize = 2*lMax_+1;
91  
92      for (int l = 0; l <= lMax_; l++) {
93 <      lPass = (double)l;
93 >      lPass = (RealType)l;
94        for (int m1 = -l; m1 <= l; m1++) {
95 <        m1Pass = (double)m1;
95 >        m1Pass = (RealType)m1;
96  
97          std::pair<int,int> lm = std::make_pair(l, m1);
98          
# Line 103 | Line 102 | namespace oopse {
102          }
103  
104          // Get Wigner coefficients
105 <        Wigner3jm(&lPass, &lPass, &lPass,
106 <                  &m1Pass, &m2m, &m2M,
107 <                  THRCOF, &mSize, &error);
105 >        Wigner3jm(lPass, lPass, lPass,
106 >                  m1Pass, m2m, m2M,
107 >                  THRCOF, mSize, error);
108          
109          m2Min[lm] = (int)floor(m2m);
110          m2Max[lm] = (int)floor(m2M);
# Line 146 | Line 145 | namespace oopse {
145    }
146  
147    
148 <  void BOPofR::initalizeHistogram() {
148 >  void BOPofR::initializeHistogram() {
149          for (int i = 0; i < nBins_; i++){
150                  RCount_[i] = 0;
151                  WofR_[i] = 0;
# Line 168 | Line 167 | namespace oopse {
167      RealType costheta;
168      RealType phi;
169      RealType r;
171    RealType dist;
170      Vector3d rCOM;
171      RealType distCOM;
172      Vector3d pos;
# Line 185 | Line 183 | namespace oopse {
183      std::vector<ComplexType> W_hat;
184      int nBonds, Nbonds;
185      SphericalHarmonic sphericalHarmonic;
186 <    int i, j;
187 <
186 >    int i;
187 >    
188      DumpReader reader(info_, dumpFilename_);    
189      int nFrames = reader.getNFrames();
190      frameCounter_ = 0;
191  
192 +    Thermo thermo(info_);
193 +
194      q_l.resize(lMax_+1);
195      q2.resize(lMax_+1);
196      w.resize(lMax_+1);
# Line 206 | Line 206 | namespace oopse {
206        reader.readFrame(istep);
207        frameCounter_++;
208        currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
209 <      CenterOfMass = info_->getCom();
209 >      CenterOfMass = thermo.getCom();
210        if (evaluator_.isDynamic()) {
211          seleMan_.setSelectionSet(evaluator_.evaluate());
212        }
# Line 304 | Line 304 | namespace oopse {
304              }
305            }
306            
307 <          w_hat[l] = w[l] / pow(q2[l], 1.5);
307 >          w_hat[l] = w[l] / pow(q2[l], RealType(1.5));
308          }
309  
310          collectHistogram(q_l, w_hat, distCOM);

Comparing trunk/src/applications/staticProps/BOPofR.cpp (property svn:keywords):
Revision 1194 by chuckv, Thu Dec 6 19:52:11 2007 UTC vs.
Revision 1785 by jmichalk, Wed Aug 22 18:43:27 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines