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

Comparing trunk/src/applications/staticProps/RhoZ.hpp (file contents):
Revision 769 by chuckv, Wed Nov 30 21:00:39 2005 UTC vs.
Revision 1390 by gezelter, Wed Nov 25 20:02:06 2009 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 + * 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   *
42 *  RhoZ.hpp
43 *  OOPSE-2.0
44 *
41   *  Created by Charles F. Vardeman II on 11/26/05.
42   *  @author  Charles F. Vardeman II
43 < *  @version $Id: RhoZ.hpp,v 1.1 2005-11-30 21:00:39 chuckv Exp $
43 > *  @version $Id: RhoZ.hpp,v 1.6 2009-11-25 20:01:59 gezelter Exp $
44   *
45   */
46   #ifndef APPLICATIONS_STATICPROPS_RHOZ_HPP
47   #define APPLICATIONS_STATICPROPS_RHOZ_HPP
48  
49 < #include "applications/staticProps/RadialDistrFunc.hpp"
50 < namespace oopse {
49 > #include <string>
50 > #include <vector>
51 > #include "selection/SelectionEvaluator.hpp"
52 > #include "selection/SelectionManager.hpp"
53 > #include "utils/NumericConstant.hpp"
54 > #include "applications/staticProps/StaticAnalyser.hpp"
55 >
56 > namespace OpenMD {
57    
58 <  class RhoZ : public RadialDistrFunc {
58 >  class RhoZ : public StaticAnalyser {
59      
60 < public:
61 <    RhoZ(SimInfo* info, const std::string& filename, const std::string& sele1,
60 <         const std::string& sele2, double len, int nrbins);
60 >  public:
61 >    RhoZ(SimInfo* info, const std::string& filename, const std::string& sele, int nzbins);
62      
63 <    int getNRBins() {
64 <      return nRBins_;
63 >    int getNZBins() {
64 >      return nZBins_;
65      }
66      
67 <    double getLength() {
67 <      return len_;
68 <    }
67 >    virtual void process();
68      
69 < private:
71 <      
72 <      virtual void preProcess();
73 <    virtual void initalizeHistogram();
74 <    virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
75 <    virtual void processHistogram();
69 >  private:
70      
71 <    virtual void writeRdf();
71 >    virtual void writeDensity();
72      
79    double len_;
80    int nRBins_;
81    double deltaR_;
73      
74 <    std::vector<int> histogram_;
75 <    std::vector<double> avgGofr_;
74 >    Snapshot* currentSnapshot_;
75 >    
76 >    int nProcessed_;
77 >    std::string selectionScript_;
78 >    SelectionEvaluator evaluator_;
79 >    SelectionManager seleMan_;
80 >    
81 >    int nZBins_;
82 >    
83 >    std::vector<std::vector<StuntDouble*> > sliceSDLists_;
84 >    std::vector<RealType> zBox_;
85 >    std::vector<RealType> density_;
86    };
87    
88   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines