From 69ae002e56b927fb35a29654919078fc9f646aae Mon Sep 17 00:00:00 2001 From: Michael Stumpf Date: Fri, 3 Apr 2020 13:52:05 +0200 Subject: [PATCH] update from fh2 --- python/ibmppp/ibmppp.py | 4 +--- python/ucf/ucf.py | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/python/ibmppp/ibmppp.py b/python/ibmppp/ibmppp.py index 901bab5..de0d2cb 100644 --- a/python/ibmppp/ibmppp.py +++ b/python/ibmppp/ibmppp.py @@ -647,8 +647,6 @@ class ibmppp: fid.write(' \n') # Write data for key in self.col: - if key in ('x','y','z'): - continue fid.write(' \n'.format(key)) fid.write(' \n'.format(self.__npartg)) fid.write(' {}:/{}\n'.format(os.path.basename(file_h5),key)) @@ -973,7 +971,7 @@ class ibmppp: sli_y = slice(idx_y[0],idx_y[-1]+1) sli_z = slice(idx_z[0],idx_z[-1]+1) # Construct a grid of the subarray - xg,yg,zg = np.meshgrid(self.localGrid[key][0][sli_x],self.localGrid[key][1][sli_y],self.localGrid[key][2][sli_z],indexing='ij') + xg,yg,zg = np.meshgrid(self.localGrid[key][0][sli_x],self.localGrid[key][1][sli_y],self.localGrid[key][2][sli_z],indexing='ij',copy=True) # Iterate through subarray and mask field it = np.nditer((self.field[key][sli_x,sli_y,sli_z],xg,yg,zg), op_flags=[['writeonly'],['readonly'],['readonly'],['readonly']] diff --git a/python/ucf/ucf.py b/python/ucf/ucf.py index e433173..790a945 100644 --- a/python/ucf/ucf.py +++ b/python/ucf/ucf.py @@ -613,9 +613,8 @@ def colmap_from_flags(irank,ihybrid,idem,iscal): col['txc'] = ioffset; ioffset+=1 col['tyc'] = ioffset; ioffset+=1 col['tzc'] = ioffset; ioffset+=1 - ioffset = ioffset+6; if iscal>0: for ii in range(0,iscal): - col['s'+ii] = ioffset; ioffset+=1 - col['q'+ii] = ioffset; ioffset+=1 - return col \ No newline at end of file + col['s'+str(ii)] = ioffset; ioffset+=1 + col['q'+str(ii)] = ioffset; ioffset+=1 + return col