--- trunk/src/applications/staticProps/Hxy.cpp 2006/05/12 21:34:43 955 +++ trunk/src/applications/staticProps/Hxy.cpp 2006/05/17 21:51:42 963 @@ -44,7 +44,7 @@ * * Created by Xiuquan Sun on 05/09/06. * @author Xiuquan Sun - * @version $Id: Hxy.cpp,v 1.1 2006-05-12 21:34:43 xsun Exp $ + * @version $Id: Hxy.cpp,v 1.4 2006-05-17 21:51:42 tim Exp $ * */ @@ -60,8 +60,6 @@ #include #include #include -#include -#include namespace oopse { @@ -76,92 +74,93 @@ namespace oopse { gridsample_.resize(nBinsX_*nBinsY_); gridZ_.resize(nBinsX_*nBinsY_); - sum_bin.resize(nbins); - avg_bin.resize(nbins); - errbin_sum.resize(nbins); - errbin.resize(nbins); - sum_bin_sq.resize(nbins); - avg_bin_sq.resize(nbins); - errbin_sum_sq.resize(nbins); - errbin_sq.resize(nbins); + sum_bin.resize(nbins_); + avg_bin.resize(nbins_); + errbin_sum.resize(nbins_); + errbin.resize(nbins_); + sum_bin_sq.resize(nbins_); + avg_bin_sq.resize(nbins_); + errbin_sum_sq.resize(nbins_); + errbin_sq.resize(nbins_); setOutputName(getPrefix(filename) + ".Hxy"); } void Hxy::process() { +#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H) DumpReader reader(info_, dumpFilename_); int nFrames = reader.getNFrames(); nProcessed_ = nFrames/step_; - - std::vector mag, newmag; - double lenX_, lenY_; - double gridX_, gridY_; - double halfBoxX_, halfBoxY_; + + std::vector mag, newmag; + RealType lenX_, lenY_; + RealType gridX_, gridY_; + RealType halfBoxX_, halfBoxY_; int binNoX, binNoY; - double interpsum, value; + RealType interpsum, value; int ninterp, px, py, newp; int newx, newy, newindex, index; int new_i, new_j, new_index; - double freq_x, freq_y, zero_freq_x, zero_freq_y, freq; - double maxfreqx, maxfreqy, maxfreq, dfreq; + RealType freq_x, freq_y, zero_freq_x, zero_freq_y, freq; + RealType maxfreqx, maxfreqy, maxfreq, dfreq; int whichbin; + int nMolecules; for (int istep = 0; istep < nFrames; istep += step_) { - int nMolecules = reader.getNMolecules(); - - fftw_complex *in, *out; + reader.readFrame(istep); + currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot(); + nMolecules = info_->getNGlobalMolecules(); + + Mat3x3d hmat = currentSnapshot_->getHmat(); + +#ifdef HAVE_FFTW3_H fftw_plan p; +#else + fftwnd_plan p; +#endif + fftw_complex *in, *out; - in = fftw_malloc(sizeof(fftw_complex) * (nBinsX_*nBinsY_)); - out = fftw_malloc(sizeof(fftw_complex) *(nBinsX_*nBinsY_)); - p = fftw_plan_dft_2d(nBinsX_, - nBinsY_, - in, out, - FFTW_FORWARD, - FFTW_ESTIMATE); - int i, j; + in = (fftw_complex*) fftw_malloc(sizeof(fftw_complex) * (nBinsX_*nBinsY_)); + out = (fftw_complex*) fftw_malloc(sizeof(fftw_complex) *(nBinsX_*nBinsY_)); - for(i=0; i < nBinsX_*nBinsY_; i++){ - gridsample_[i].clear(); - gridZ_[i].clear(); - } - - for(i=0; i < nbins; i++){ - sum_bin[i].clear(); - avg_bin[i].clear(); - errbin_sum[i].clear(); - errbin[i].clear(); - sum_bin_sq[i].clear(); - avg_bin_sq[i].clear(); - errbin_sum_sq[i].clear(); - errbin_sq[i].clear(); - } - - mag.resize(nBinsX_*nBinsY_); - newmag.resize(nBinsX_*nBinsY_); - - for(i=0; i < nBinsX_*nBinsY_; i++){ - mag[i].clear(); - newmag[i].clear(); - } +#ifdef HAVE_FFTW3_H + p = fftw_plan_dft_2d(nBinsX_, nBinsY_, in, out, + FFTW_FORWARD, FFTW_ESTIMATE); +#else + p = fftw2d_create_plan(nBinsX_, nBinsY_, FFTW_FORWARD, FFTW_ESTIMATE); +#endif + + int i, j; + + gridsample_.clear(); + gridZ_.clear(); + sum_bin.clear(); + avg_bin.clear(); + errbin_sum.clear(); + errbin.clear(); + sum_bin_sq.clear(); + avg_bin_sq.clear(); + errbin_sum_sq.clear(); + errbin_sq.clear(); + mag.resize(nBinsX_*nBinsY_); + newmag.resize(nBinsX_*nBinsY_); + mag.clear(); + newmag.clear(); + StuntDouble* sd; - reader.readFrame(istep); - currentSnapshot_ = info_->getSnapshotManager()->getCurrentSnapshot(); - - Mat3x3d hmat = currentSnapshot_->getHmat(); - + lenX_ = hmat(0,0); lenY_ = hmat(1,1); - + gridX_ = lenX_ /(nBinsX_); gridY_ = lenY_ /(nBinsY_); - - double halfBoxX_ = lenX_ / 2.0; - double halfBoxY_ = lenY_ / 2.0; - + + RealType halfBoxX_ = lenX_ / 2.0; + RealType halfBoxY_ = lenY_ / 2.0; + if (evaluator_.isDynamic()) { seleMan_.setSelectionSet(evaluator_.evaluate()); } @@ -199,11 +198,11 @@ namespace oopse { for(j = 0; j < nBinsY_; j++){ newindex = i * nBinsY_ + j; if(gridsample_[newindex] > 0){ - gridZ_[newindex] = gridZ_[newindex] / (double)gridsample_[newindex]; + gridZ_[newindex] = gridZ_[newindex] / (RealType)gridsample_[newindex]; } } } - + for (i=0; i< nBinsX_; i++) { for(j=0; j< nBinsY_; j++) { newindex = i*nBinsY_ + j; @@ -248,13 +247,13 @@ namespace oopse { px = i + 1; py = j; newp = px*nBinsY_ + py; - if ((px < nBinsX_) && (gridsample_[newp] > 0)) { - interpsum += gridZ_[newp]; - ninterp++; - } + if ( (px < nBinsX_ ) && ( gridsample_[newp] > 0 )) { + interpsum += gridZ_[newp]; + ninterp++; + } + + value = interpsum / (RealType)ninterp; - value = interpsum / (double)ninterp; - gridZ_[newindex] = value; } } @@ -268,8 +267,11 @@ namespace oopse { c_im(in[newindex]) = 0.0; } } - - fftw_execute(p); +#ifdef HAVE_FFTW3_H + fftw_execute(p); +#else + fftwnd_one(p, in, out); +#endif for (i=0; i< nBinsX_; i++) { for(j=0; j< nBinsY_; j++) { @@ -277,8 +279,11 @@ namespace oopse { mag[newindex] = pow(c_re(out[newindex]),2) + pow(c_im(out[newindex]),2); } } - +#ifdef HAVE_FFTW3_H fftw_destroy_plan(p); +#else + fftwnd_destroy_plan(p); +#endif fftw_free(out); fftw_free(in); @@ -328,7 +333,7 @@ namespace oopse { // printf("%lf\t%lf\t%lf\t%lf\n", dx, dy, maxfreqx, maxfreqy); maxfreq = sqrt(maxfreqx*maxfreqx + maxfreqy*maxfreqy); - dfreq = maxfreq/(double)(nbins-1); + dfreq = maxfreq/(RealType)(nbins_-1); //printf("%lf\n", dfreq); @@ -338,8 +343,8 @@ namespace oopse { for (i=0; i< nBinsX_; i++) { for(j=0; j< nBinsY_; j++) { - freq_x = (double)(i - zero_freq_x)*maxfreqx*2 / nBinsX_; - freq_y = (double)(j - zero_freq_y)*maxfreqy*2 / nBinsY_; + freq_x = (RealType)(i - zero_freq_x)*maxfreqx*2 / nBinsX_; + freq_y = (RealType)(j - zero_freq_y)*maxfreqy*2 / nBinsY_; freq = sqrt(freq_x*freq_x + freq_y*freq_y); @@ -351,37 +356,44 @@ namespace oopse { } } - for ( i = 0; i < nbins; i++) { + for ( i = 0; i < nbins_; i++) { if ( samples[i][istep] > 0) { - bin[i][istep] = 4.0 * sqrt(bin[i][istep] / (double)samples[i][istep]) / (double)nMolecules; + bin[i][istep] = 4.0 * sqrt(bin[i][istep] / (RealType)samples[i][istep]) / (RealType)nMolecules; } } } - for (i = 0; i < nbins; i++) { - for (j = 0; j < nFrames; j++) { + for (int i = 0; i < nbins_; i++) { + for (int j = 0; j < nFrames; j++) { sum_bin[i] += bin[i][j]; sum_bin_sq[i] += bin[i][j] * bin[i][j]; } - avg_bin[i] = sum_bin[i] / (double)nFrames; - avg_bin_sq[i] = sum_bin_sq[i] / (double)nFrames; - for (j = 0; j < nFrames; j++) { + avg_bin[i] = sum_bin[i] / (RealType)nFrames; + avg_bin_sq[i] = sum_bin_sq[i] / (RealType)nFrames; + for (int j = 0; j < nFrames; j++) { errbin_sum[i] += pow((bin[i][j] - avg_bin[i]), 2); errbin_sum_sq[i] += pow((bin[i][j] * bin[i][j] - avg_bin_sq[i]), 2); } - errbin[i] = sqrt( errbin_sum[i] / (double)nFrames ); - errbin_sq[i] = sqrt( errbin_sum_sq[i] / (double)nFrames ); + errbin[i] = sqrt( errbin_sum[i] / (RealType)nFrames ); + errbin_sq[i] = sqrt( errbin_sum_sq[i] / (RealType)nFrames ); } - + printSpectrum(); - } +#else + sprintf(painCave.errMsg, "Hxy: FFTW support was not compiled in!\n"); + painCave.isFatal = 1; + simError(); + +#endif + +} void Hxy::printSpectrum() { std::ofstream rdfStream(outputFilename_.c_str()); if (rdfStream.is_open()) { - for (int i = 0; i < nbins; i++) { + for (int i = 0; i < nbins_; i++) { if ( avg_bin[i] > 0 ){ rdfStream << i*dfreq << "\t" <