From 551b4369a196632aaa83c307cd1a62ec368de58d Mon Sep 17 00:00:00 2001 From: Chuanlai Liu Date: Mon, 7 Nov 2016 09:06:35 +0100 Subject: [PATCH] improved readability --- processing/post/addCurl.py | 4 ++-- processing/post/addDivergence.py | 7 +++++-- processing/post/addGradient.py | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/processing/post/addCurl.py b/processing/post/addCurl.py index ba310750b..bec3e3a81 100755 --- a/processing/post/addCurl.py +++ b/processing/post/addCurl.py @@ -38,9 +38,9 @@ def curlFFT(geomdim,field): e[0, 1, 2] = e[1, 2, 0] = e[2, 0, 1] = 1.0 # Levi-Civita symbols e[0, 2, 1] = e[2, 1, 0] = e[1, 0, 2] = -1.0 - if dataType == 'tensor': + if dataType == 'tensor': # tensor, 3x3 -> 3x3 curl_fourier = np.einsum('slm,ijkl,ijknm->ijksn',e,k_s,field_fourier)*TWOPIIMG - elif dataType == 'vector': + elif dataType == 'vector': # vector, 3 -> 3 curl_fourier = np.einsum('slm,ijkl,ijkm->ijks',e,k_s,field_fourier)*TWOPIIMG return np.fft.irfftn(curl_fourier,axes=(0,1,2),s=shapeFFT).reshape([N,n]) diff --git a/processing/post/addDivergence.py b/processing/post/addDivergence.py index 3ce35d275..84cdf4593 100755 --- a/processing/post/addDivergence.py +++ b/processing/post/addDivergence.py @@ -15,6 +15,9 @@ def divFFT(geomdim,field): N = grid.prod() # field size n = np.array(np.shape(field)[3:]).prod() # data size + if n == 3: dataType = 'vector' + elif n == 9: dataType = 'tensor' + field_fourier = np.fft.rfftn(field,axes=(0,1,2),s=shapeFFT) div_fourier = np.empty(field_fourier.shape[0:len(np.shape(field))-1],'c16') # size depents on whether tensor or vector @@ -30,9 +33,9 @@ def divFFT(geomdim,field): kk, kj, ki = np.meshgrid(k_sk,k_sj,k_si,indexing = 'ij') k_s = np.concatenate((ki[:,:,:,None],kj[:,:,:,None],kk[:,:,:,None]),axis = 3).astype('c16') - if n == 9: # tensor, 3x3 -> 3 + if dataType == 'tensor': # tensor, 3x3 -> 3 div_fourier = np.einsum('ijklm,ijkm->ijkl',field_fourier,k_s)*TWOPIIMG - elif n == 3: # vector, 3 -> 1 + elif dataType == 'vector': # vector, 3 -> 1 div_fourier = np.einsum('ijkl,ijkl->ijk',field_fourier,k_s)*TWOPIIMG return np.fft.irfftn(div_fourier,axes=(0,1,2),s=shapeFFT).reshape([N,n/3]) diff --git a/processing/post/addGradient.py b/processing/post/addGradient.py index d28a6f813..5ac784c01 100755 --- a/processing/post/addGradient.py +++ b/processing/post/addGradient.py @@ -33,9 +33,9 @@ def gradFFT(geomdim,field): kk, kj, ki = np.meshgrid(k_sk,k_sj,k_si,indexing = 'ij') k_s = np.concatenate((ki[:,:,:,None],kj[:,:,:,None],kk[:,:,:,None]),axis = 3).astype('c16') - if n == 3: # vector, 3 -> 3x3 + if dataType == 'vector': # vector, 3 -> 3x3 grad_fourier = np.einsum('ijkl,ijkm->ijklm',field_fourier,k_s)*TWOPIIMG - elif n == 1: # scalar, 1 -> 3 + elif dataType == 'scalar': # scalar, 1 -> 3 grad_fourier = np.einsum('ijkl,ijkl->ijkl',field_fourier,k_s)*TWOPIIMG return np.fft.irfftn(grad_fourier,axes=(0,1,2),s=shapeFFT).reshape([N,3*n])