mirror of
https://github.com/cosmo-sims/MUSIC.git
synced 2024-09-19 17:03:46 +02:00
Re-enabled the possibility to apply a deconvolution filter when using CIC interpolation to particles positions
(e.g. for a glass) by setting [output]/glass_cicdeconvolve=yes/no, default is off
This commit is contained in:
parent
06d1f88aa2
commit
db54d01b2a
1 changed files with 5 additions and 5 deletions
10
poisson.cc
10
poisson.cc
|
@ -718,7 +718,7 @@ double fft_poisson_plugin::gradient( int dir, grid_hierarchy& u, grid_hierarchy&
|
||||||
|
|
||||||
|
|
||||||
bool do_glass = cf_.getValueSafe<bool>("output","glass",false);
|
bool do_glass = cf_.getValueSafe<bool>("output","glass",false);
|
||||||
bool deconvolve_cic = do_glass;
|
bool deconvolve_cic = do_glass & cf_.getValueSafe<bool>("output","glass_cicdeconvolve",false);
|
||||||
|
|
||||||
#pragma omp parallel for
|
#pragma omp parallel for
|
||||||
for( int i=0; i<nx; ++i )
|
for( int i=0; i<nx; ++i )
|
||||||
|
@ -743,7 +743,7 @@ double fft_poisson_plugin::gradient( int dir, grid_hierarchy& u, grid_hierarchy&
|
||||||
|
|
||||||
|
|
||||||
#ifdef FFTW3
|
#ifdef FFTW3
|
||||||
/*if( deconvolve_cic )
|
if( deconvolve_cic )
|
||||||
{
|
{
|
||||||
double dfx, dfy, dfz;
|
double dfx, dfy, dfz;
|
||||||
dfx = M_PI*ki/(double)nx; dfx = (i!=0)? sin(dfx)/dfx : 1.0;
|
dfx = M_PI*ki/(double)nx; dfx = (i!=0)? sin(dfx)/dfx : 1.0;
|
||||||
|
@ -754,9 +754,9 @@ double fft_poisson_plugin::gradient( int dir, grid_hierarchy& u, grid_hierarchy&
|
||||||
cdata[idx][0] *= dfx;
|
cdata[idx][0] *= dfx;
|
||||||
cdata[idx][1] *= dfx;
|
cdata[idx][1] *= dfx;
|
||||||
|
|
||||||
}*/
|
}
|
||||||
#else
|
#else
|
||||||
/*if( deconvolve_cic )
|
if( deconvolve_cic )
|
||||||
{
|
{
|
||||||
double dfx, dfy, dfz;
|
double dfx, dfy, dfz;
|
||||||
dfx = M_PI*ki/(double)nx; dfx = (i!=0)? sin(dfx)/dfx : 1.0;
|
dfx = M_PI*ki/(double)nx; dfx = (i!=0)? sin(dfx)/dfx : 1.0;
|
||||||
|
@ -767,7 +767,7 @@ double fft_poisson_plugin::gradient( int dir, grid_hierarchy& u, grid_hierarchy&
|
||||||
|
|
||||||
cdata[idx].re *= dfx;
|
cdata[idx].re *= dfx;
|
||||||
cdata[idx].im *= dfx;
|
cdata[idx].im *= dfx;
|
||||||
}*/
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*double ktot = sqrt(ii*ii+jj*jj+k*k);
|
/*double ktot = sqrt(ii*ii+jj*jj+k*k);
|
||||||
|
|
Loading…
Reference in a new issue