Commit bd5b94b8 authored by Pierre Augier's avatar Pierre Augier
Browse files

Use fluiddyn 0.1.6 for documentation

parent da1bf67d987b
......@@ -42,7 +42,9 @@ tmp = os.path.join(os.path.dirname(__file__), 'tmp')
if not os.path.exists(tmp):
os.mkdir(tmp)
ipynb_to_rst()
ipynb_to_rst(executed=[
'tuto_fft2d_mpi.ipynb', 'tuto_fft2d_seq.ipynb',
'tuto_fft3d_mpi.ipynb', 'tuto_fft3d_seq.ipynb'])
save_fig_scaling('legi_cluster7_2d', 1024, 1024, '2d')
save_fig_scaling('legi_cluster8_2d', 960, 960, '2d')
......
channels:
- conda-forge
dependencies:
- python=3.4
- python=3.6
- numpy
- cython
- mpi4py
......@@ -10,3 +13,4 @@ dependencies:
- jupyter
- matplotlib
- pandas
- fftw
......@@ -266,7 +266,7 @@ setup(
'Programming Language :: C'],
packages=find_packages(exclude=[
'doc', 'include', 'scripts', 'src_cpp', 'src_cy']),
install_requires=['fluiddyn'],
install_requires=['fluiddyn >= 0.1.6'],
# cmdclass={'build_ext': build_ext},
ext_modules=ext_modules,
entry_points={
......
......@@ -82,21 +82,32 @@ cdef class ${class_name}:
return fieldX
def get_shapeX_loc(self):
"""Get the local shape of the array in the "real space"."""
cdef int output_nX0loc, output_nX1
self.thisptr.get_local_shape_X(&output_nX0loc, &output_nX1)
return output_nX0loc, output_nX1
def get_shapeK_loc(self):
"""Get the local shape of the array in the Fourier space"""
cdef int output_nK0loc, output_nK1
self.thisptr.get_local_shape_K(&output_nK0loc, &output_nK1)
return output_nK0loc, output_nK1
def get_shapeX_seq(self):
"""Get the shape of the real array as it would be with nb_proc = 1"""
cdef int output_nX0, output_nX1
self.thisptr.get_shapeX_seq(&output_nX0, &output_nX1)
return output_nX0, output_nX1
def get_shapeK_seq(self):
"""Get the shape of the complex array as it would be with nb_proc = 1
Warning: if get_is_transposed(), the complex array would also be
transposed, so in this case, one should write::
nKy = self.get_shapeK_seq[1]
"""
cdef int output_nK0, output_nK1
self.thisptr.get_shapeK_seq(&output_nK0, &output_nK1)
return output_nK0, output_nK1
......
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