From 2f81bc250753ae01ed04477aef8b21afee0c7501 Mon Sep 17 00:00:00 2001 From: Michael Krayer Date: Thu, 9 Apr 2020 15:23:31 +0200 Subject: [PATCH] bugfix: global field size; added nxproc etc to files --- python/ibmppp/ibmppp.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/python/ibmppp/ibmppp.py b/python/ibmppp/ibmppp.py index 52ca611..daa185c 100644 --- a/python/ibmppp/ibmppp.py +++ b/python/ibmppp/ibmppp.py @@ -376,9 +376,9 @@ class ibmppp: nghy = 1 nghz = 1 # Compute global nx,ny,nz - nxg = self.__procGrid[key][1][-1]-self.__procGrid[key][0][0] - nyg = self.__procGrid[key][3][-1]-self.__procGrid[key][2][0] - nzg = self.__procGrid[key][5][-1]-self.__procGrid[key][4][0] + nxg = self.__procGrid[key][1][-1]-self.__procGrid[key][0][0]+1 + nyg = self.__procGrid[key][3][-1]-self.__procGrid[key][2][0]+1 + nzg = self.__procGrid[key][5][-1]-self.__procGrid[key][4][0]+1 # If append flag is set, we add a dataset to the existing file if append: ioflag = 'a' @@ -388,9 +388,12 @@ class ibmppp: fid = h5py.File(file_chunk,ioflag) if not append: fid.create_dataset('rank',data=self.__rank) - fid.create_dataset('icol',data=self.__icol) - fid.create_dataset('jrow',data=self.__jrow) - fid.create_dataset('kpln',data=self.__kpln) + fid.create_dataset('iproc',data=self.__icol) + fid.create_dataset('jproc',data=self.__jrow) + fid.create_dataset('kproc',data=self.__kpln) + fid.create_dataset('nxproc',data=self.__nxp) + fid.create_dataset('nyproc',data=self.__nyp) + fid.create_dataset('nzproc',data=self.__nzp) gid = fid.create_group('/'+key) gid.create_dataset('ib',data=self.__localChunkBounds[key][0]) gid.create_dataset('ie',data=self.__localChunkBounds[key][1]) @@ -477,9 +480,9 @@ class ibmppp: jpe1 = jpb1+self.__nyppp-1 kpe1 = kpb1+self.__nzppp-1 # Compute global nx,ny,nz - nxg = self.__procGrid1[key][1][-1]-self.__procGrid1[key][0][0] - nyg = self.__procGrid1[key][3][-1]-self.__procGrid1[key][2][0] - nzg = self.__procGrid1[key][5][-1]-self.__procGrid1[key][4][0] + nxg = self.__procGrid1[key][1][-1]-self.__procGrid1[key][0][0]+1 + nyg = self.__procGrid1[key][3][-1]-self.__procGrid1[key][2][0]+1 + nzg = self.__procGrid1[key][5][-1]-self.__procGrid1[key][4][0]+1 # If append flag is set, we add a dataset to the existing file if append: ioflag = 'a' @@ -511,9 +514,12 @@ class ibmppp: fid = h5py.File(file_chunk,ioflag) if not append: fid.create_dataset('rank',data=iprank) - fid.create_dataset('icol',data=ip1) - fid.create_dataset('jrow',data=jp1) - fid.create_dataset('kpln',data=kp1) + fid.create_dataset('iproc',data=ip1) + fid.create_dataset('jproc',data=jp1) + fid.create_dataset('kproc',data=kp1) + fid.create_dataset('nxproc',data=self.__nxp1) + fid.create_dataset('nyproc',data=self.__nyp1) + fid.create_dataset('nzproc',data=self.__nzp1) gid = fid.create_group('/'+key) gid.create_dataset('ib',data=ib1) gid.create_dataset('ie',data=ie1)