ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/applications/staticProps/Hxy.hpp
(Generate patch)

Comparing trunk/OOPSE-4/src/applications/staticProps/Hxy.hpp (file contents):
Revision 2752 by gezelter, Tue May 16 02:06:37 2006 UTC vs.
Revision 2763 by xsun, Mon May 22 15:30:42 2006 UTC

# Line 44 | Line 44
44   *
45   *  Created by Xiuquan Sun on 05/09/06.
46   *  @author  Xiuquan Sun
47 < *  @version $Id: Hxy.hpp,v 1.2 2006-05-16 02:06:37 gezelter Exp $
47 > *  @version $Id: Hxy.hpp,v 1.5 2006-05-22 15:30:42 xsun Exp $
48   *
49   */
50   #ifndef APPLICATIONS_STATICPROPS_HXY_HPP
51   #define APPLICATIONS_STATICPROPS_HXY_HPP
52  
53 + #include "config.h"
54 +
55 + #if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
56 +
57 + #ifdef HAVE_FFTW_H
58 + #include <fftw.h>
59 + #endif
60 +
61 + #ifdef HAVE_DFFTW_H
62 + #include <dfftw.h>
63 + #endif
64 +
65 + #ifdef HAVE_FFTW3_H
66 + #include <fftw3.h>
67   #define c_re(c) ((c)[0])
68   #define c_im(c) ((c)[1])
69 + #endif
70 + #endif
71  
72   #include "applications/staticProps/RadialDistrFunc.hpp"
73   namespace oopse {
# Line 60 | Line 76 | namespace oopse {
76      
77    public:
78      Hxy(SimInfo* info, const std::string& filename, const std::string& sele, int nbins_x, int nbins_y, int nrbins);
79 <    
79 >    virtual ~Hxy();
80      int getnbins() {
81        return nbins_;
82      }
# Line 86 | Line 102 | namespace oopse {
102      SelectionEvaluator evaluator_;
103      SelectionManager seleMan_;
104      
105 <    double nBinsX_;
106 <    double nBinsY_;
105 >    int nBinsX_;
106 >    int nBinsY_;
107      int nbins_;
108 <    double dfreq;
108 >    RealType dfreq;
109      
110 <    std::vector<double> gridZ_;
110 >    std::vector<RealType> gridZ_;
111      std::vector<int> gridsample_;
112 <    std::vector< std::vector<double> > bin;
112 >    std::vector< std::vector<RealType> > bin;
113      std::vector< std::vector<int> > samples;
114 <    std::vector<double> sum_bin, sum_bin_sq, avg_bin, avg_bin_sq;
115 <    std::vector<double> errbin_sum, errbin_sum_sq, errbin, errbin_sq;
114 >
115 >    std::vector<RealType> sum_bin, sum_bin_sq, avg_bin, avg_bin_sq;
116 >    std::vector<RealType> errbin_sum, errbin_sum_sq, errbin, errbin_sq;
117 >    std::vector<RealType> mag, newmag;
118 >
119    };
120    
121   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines