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

Comparing trunk/src/applications/staticProps/RhoZ.cpp (file contents):
Revision 1267 by gpuliti, Mon Jun 30 17:53:42 2008 UTC vs.
Revision 1782 by gezelter, Wed Aug 22 02:28:28 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 < *
33 < *  RhoZ.cpp
34 < *  OOPSE-2.0
35 < *
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 Charles F. Vardeman II on 11/26/05.
42   *  @author  Charles F. Vardeman II
43 < *  @version $Id: RhoZ.cpp,v 1.7 2008-06-30 17:53:42 gpuliti Exp $
43 > *  @version $Id$
44   *
45   */
46  
# Line 56 | Line 52
52   #include "utils/simError.h"
53   #include "io/DumpReader.hpp"
54   #include "primitives/Molecule.hpp"
55 < namespace oopse {
55 > namespace OpenMD {
56    
57    RhoZ::RhoZ(SimInfo* info, const std::string& filename, const std::string& sele, int nzbins)
58      : StaticAnalyser(info, filename), selectionScript_(sele),  evaluator_(info), seleMan_(info), nZBins_(nzbins){
# Line 130 | Line 126 | namespace oopse {
126        //loop over the slices to calculate the densities
127        for (i = 0; i < nZBins_; i++) {
128          RealType totalMass = 0;
129 <        for (int k = 0; k < sliceSDLists_[i].size(); ++k) {
129 >        for (unsigned int k = 0; k < sliceSDLists_[i].size(); ++k) {
130            totalMass += sliceSDLists_[i][k]->getMass();
131          }
132          density_[i] += totalMass/sliceVolume;
# Line 159 | Line 155 | namespace oopse {
155        rdfStream << "#nFrames:\t" << nProcessed_ << "\n";
156        rdfStream << "#selection: (" << selectionScript_ << ")\n";
157        rdfStream << "#z\tdensity\n";
158 <      for (int i = 0; i < density_.size(); ++i) {
158 >      for (unsigned int i = 0; i < density_.size(); ++i) {
159          RealType z = zAve * (i+0.5)/density_.size();
160          rdfStream << z << "\t" << 1.660535*density_[i]/nProcessed_ << "\n";
161        }

Comparing trunk/src/applications/staticProps/RhoZ.cpp (property svn:keywords):
Revision 1267 by gpuliti, Mon Jun 30 17:53:42 2008 UTC vs.
Revision 1782 by gezelter, Wed Aug 22 02:28:28 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines