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

Comparing trunk/src/applications/staticProps/RhoR.cpp (file contents):
Revision 1306 by chuckv, Thu Oct 16 18:25:36 2008 UTC vs.
Revision 1790 by gezelter, Thu Aug 30 17:18:22 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 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
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 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   /* Calculates Rho(R) for nanoparticle with radius R*/
# Line 47 | Line 48
48   #include "utils/NumericConstant.hpp"
49   #include "io/DumpReader.hpp"
50   #include "primitives/Molecule.hpp"
51 + #include "brains/Thermo.hpp"
52   #include <math.h>
53  
54 < namespace oopse {
54 > namespace OpenMD {
55  
56      
57    RhoR::RhoR(SimInfo* info, const std::string& filename, const std::string& sele, RealType len, int nrbins, RealType particleR)
# Line 72 | Line 74 | namespace oopse {
74    
75  
76    void RhoR::process() {
77 <    
78 <
77 <    
77 >  
78 >    Thermo thermo(info_);
79      DumpReader reader(info_, dumpFilename_);    
80      int nFrames = reader.getNFrames();
81      nProcessed_ = nFrames/step_;
# Line 88 | Line 89 | namespace oopse {
89        StuntDouble* sd;
90        reader.readFrame(istep);
91        currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot();
92 <      Vector3d CenterOfMass = info_->getCom();      
92 >      Vector3d CenterOfMass = thermo.getCom();      
93        
93      
94      
95      
94        if (evaluator_.isDynamic()) {
95          seleMan_.setSelectionSet(evaluator_.evaluate());
96        }
# Line 105 | Line 103 | namespace oopse {
103          RealType distance = r12.length();
104          
105          if (distance < len_) {
106 <          int whichBin = distance / deltaR_;
106 >          int whichBin = int(distance / deltaR_);
107            histogram_[whichBin] += 1;
108          }
109          
# Line 124 | Line 122 | namespace oopse {
122      RealType particleDensity =  3.0 * info_->getNGlobalMolecules() / (4.0 * NumericConstant::PI * pow(particleR_,3));
123      RealType pairConstant = ( 4.0 * NumericConstant::PI * particleDensity ) / 3.0;
124  
125 <    for(int i = 0 ; i < histogram_.size(); ++i){
125 >    for(unsigned int i = 0 ; i < histogram_.size(); ++i){
126  
127        RealType rLower = i * deltaR_;
128        RealType rUpper = rLower + deltaR_;
# Line 143 | Line 141 | namespace oopse {
141      if (rdfStream.is_open()) {
142        rdfStream << "#radial density function rho(r)\n";
143        rdfStream << "#r\tcorrValue\n";
144 <      for (int i = 0; i < avgRhoR_.size(); ++i) {
144 >      for (unsigned int i = 0; i < avgRhoR_.size(); ++i) {
145          RealType r = deltaR_ * (i + 0.5);
146          rdfStream << r << "\t" << avgRhoR_[i]/nProcessed_ << "\n";
147        }

Comparing trunk/src/applications/staticProps/RhoR.cpp (property svn:keywords):
Revision 1306 by chuckv, Thu Oct 16 18:25:36 2008 UTC vs.
Revision 1790 by gezelter, Thu Aug 30 17:18:22 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines