From e1a730e96b8ec6655b01af31e373ac221a3517fd Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 17 Nov 2018 09:58:54 +0100 Subject: [PATCH] python3 compatible integer division and argument sequence in agreement with documentation --- processing/post/addCurl.py | 2 +- processing/post/addDivergence.py | 2 +- processing/post/addGradient.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/processing/post/addCurl.py b/processing/post/addCurl.py index cae1ef8b0..2716849b4 100755 --- a/processing/post/addCurl.py +++ b/processing/post/addCurl.py @@ -49,7 +49,7 @@ def curlFFT(geomdim,field): curl_fourier = np.einsum(einsums[n],e,k_s,field_fourier)*TWOPIIMG - return np.fft.irfftn(curl_fourier,axes=(0,1,2),s=shapeFFT).reshape([N,n]) + return np.fft.irfftn(curl_fourier,s=shapeFFT,axes=(0,1,2)).reshape([N,n]) # -------------------------------------------------------------------- diff --git a/processing/post/addDivergence.py b/processing/post/addDivergence.py index 73eb4ed9e..0aa4b05ae 100755 --- a/processing/post/addDivergence.py +++ b/processing/post/addDivergence.py @@ -45,7 +45,7 @@ def divFFT(geomdim,field): div_fourier = np.einsum(einsums[n],k_s,field_fourier)*TWOPIIMG - return np.fft.irfftn(div_fourier,axes=(0,1,2),s=shapeFFT).reshape([N,n/3]) + return np.fft.irfftn(div_fourier,s=shapeFFT,axes=(0,1,2)).reshape([N,n//3]) # -------------------------------------------------------------------- diff --git a/processing/post/addGradient.py b/processing/post/addGradient.py index 676efb27e..83cb54064 100755 --- a/processing/post/addGradient.py +++ b/processing/post/addGradient.py @@ -45,7 +45,7 @@ def gradFFT(geomdim,field): k_s = np.concatenate((ki[:,:,:,None],kj[:,:,:,None],kk[:,:,:,None]),axis = 3).astype('c16') grad_fourier = np.einsum(einsums[n],field_fourier,k_s)*TWOPIIMG - return np.fft.irfftn(grad_fourier,axes=(0,1,2),s=shapeFFT).reshape([N,3*n]) + return np.fft.irfftn(grad_fourier,s=shapeFFT,axes=(0,1,2)).reshape([N,3*n]) # --------------------------------------------------------------------