Commit 36e81ad9 authored by Pierre Augier's avatar Pierre Augier
Browse files

Version 0.2.1

parent c350fea390c8
......@@ -24,6 +24,7 @@ src_cy/fft*_pxd.pxd
*egg-info*
dist*
*.egg/*
*OAR.*
......
0.2.1
-----
- install with pip (+ configure install setup with ``~/.fluidfft-site.cfg``)
0.2.0
-----
......
......@@ -21,7 +21,7 @@ mpl.use('Agg')
import matplotlib.pyplot as plt
plt.ioff()
from fluidrtd.ipynb_maker import ipynb_to_rst
from fluiddoc.ipynb_maker import ipynb_to_rst
import fluidfft
import fluidfft.bench_analysis
from fluidfft.bench_analysis import plot_scaling
......
......@@ -88,6 +88,12 @@ or::
pip install fluidfft --user
You can also configure the installation of fluidfft by creating the file
``~/.fluidfft-site.cfg`` and modify it to fit your requirements before the
installation with pip::
wget https://bitbucket.org/fluiddyn/fluidfft/raw/default/site.cfg.default -O ~/.fluidfft-site.cfg
Install from the repository (recommended)
-----------------------------------------
......
Please read the file fluiddyn/doc/ipynb/README_for_ipynb_writers.rst
(http://fluiddyn.readthedocs.io/en/latest/ipynb/README_for_ipynb_writers.html)
......@@ -11,4 +11,4 @@ http://legacy.python.org/dev/peps/pep-0386/
'a' or 'alpha' means alpha version (internal testing),
'b' or 'beta' means beta version (external testing).
"""
__version__ = '0.2.0.post10'
__version__ = '0.2.1'
......@@ -50,8 +50,9 @@ def make_testop_functions(name, cls):
op = OperatorsPseudoSpectral3D(n0, n1, n2,
3*pi, 1*pi, 2*pi, fft=cls)
a = np.random.random(op._op_fft.get_local_size_X()).reshape(
op._op_fft.get_shapeX_loc())
a = np.random.random(
op._op_fft.get_local_size_X()).reshape(
op._op_fft.get_shapeX_loc())
afft = op.fft3d(a)
a = op.ifft3d(afft)
afft = op.fft3d(a)
......@@ -62,8 +63,7 @@ def make_testop_functions(name, cls):
energy_fft = 0.5 * abs(afft)**2
nrj = op.sum_wavenumbers(energy_fft)
# error so we skip but this should work...
# self.assertAlmostEqual(nrjafft, nrj)
self.assertAlmostEqual(nrjafft, nrj)
# not implemented...
# E_kx, E_ky, E_kz = op.compute_1dspectra(energy_fft)
......
......@@ -204,7 +204,7 @@ myreal FFT3DWithCUFFT::sum_wavenumbers_double(myreal* fieldK)
sum += sum0/2.;
return (myreal) sum;
return (myreal) 2.*sum;
}
......@@ -238,7 +238,7 @@ void FFT3DWithCUFFT::sum_wavenumbers_complex(mycomplex* fieldK, mycomplex* resul
sum += sum0/2.;
*result = sum;
*result = 2.*sum;
}
......
......@@ -211,7 +211,7 @@ myreal FFT3DWithFFTW3D::sum_wavenumbers_double(myreal* fieldK)
for (i2=1; i2<nK2-1; i2++)
sum += fieldK[i2 + (i1 + i0 * nK1) * nK2];
return sum;
return sum*2.;
}
......@@ -246,7 +246,7 @@ void FFT3DWithFFTW3D::sum_wavenumbers_complex(mycomplex* fieldK, mycomplex* resu
for (i2=1; i2<nK2-1; i2++)
sum += fieldK[i2 + (i1 + i0 * nK1) * nK2];
*result = sum;
*result = sum*2.;
}
......
......@@ -236,7 +236,7 @@ myreal FFT3DMPIWithFFTW1D::sum_wavenumbers_double(myreal* fieldK)
MPI_Allreduce(&sum_loc, &sum_tot, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
// cout << "mean= " << sum_tot << endl;
return sum_tot;
return sum_tot*2.;
}
......@@ -268,7 +268,7 @@ void FFT3DMPIWithFFTW1D::sum_wavenumbers_complex(
MPI_Allreduce(&sum_loc, &sum_tot, 1, MPI_COMPLEX, MPI_SUM, MPI_COMM_WORLD);
// cout << "mean= " << sum_tot << endl;
*result = sum_tot;
*result = sum_tot*2.;
}
......
......@@ -228,7 +228,7 @@ myreal FFT3DMPIWithFFTWMPI3D::sum_wavenumbers_double(myreal* fieldK)
MPI_Allreduce(&energy_loc, &energy, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
return (myreal) energy;
return (myreal) energy*2.;
}
void FFT3DMPIWithFFTWMPI3D::sum_wavenumbers_complex(
......@@ -265,7 +265,7 @@ void FFT3DMPIWithFFTWMPI3D::sum_wavenumbers_complex(
MPI_Allreduce(&energy_loc, &energy, 1, MPI_COMPLEX, MPI_SUM, MPI_COMM_WORLD);
//ERREUR PTET LA... COMPLEX OU DOUBLE COMPLEX???
*result = energy;
*result = energy*2.;
}
......
......@@ -213,7 +213,7 @@ myreal FFT3DMPIWithP3DFFT::sum_wavenumbers_double(myreal* fieldK)
MPI_Allreduce(&sum_loc, &sum, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
return (myreal) sum;
return (myreal) sum*2.;
}
......@@ -257,7 +257,7 @@ void FFT3DMPIWithP3DFFT::sum_wavenumbers_complex(
MPI_Allreduce(&sum_loc, &sum, 1, MPI_COMPLEX, MPI_SUM, MPI_COMM_WORLD);
*result = sum;
*result = sum*2.;
}
......
......@@ -292,7 +292,7 @@ myreal FFT3DMPIWithPFFT::sum_wavenumbers_double(myreal* fieldK)
MPI_Allreduce(&sum_loc, &sum, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
return (myreal) sum;
return (myreal) sum*2.;
}
......@@ -338,7 +338,7 @@ void FFT3DMPIWithPFFT::sum_wavenumbers_complex(
MPI_Allreduce(&sum_loc, &sum, 1, MPI_COMPLEX, MPI_SUM, MPI_COMM_WORLD);
*result = sum;
*result = sum*2.;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment