mwtkrayer
/
ucftools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated output

This commit is contained in:
Michael Krayer 2021-05-12 13:07:14 +02:00
parent 2e2f987f7f
commit f707360f17
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
python/ibmppp/ibmppp.py
View File

@ -678,6 +678,14 @@ class ibmppp:
gid.create_dataset('nx',data=nxg) gid.create_dataset('nx',data=nxg)
gid.create_dataset('ny',data=nyg) gid.create_dataset('ny',data=nyg)
gid.create_dataset('nz',data=nzg) gid.create_dataset('nz',data=nzg)
x0 = self.grid[key][0][0]
y0 = self.grid[key][1][0]
z0 = self.grid[key][2][0]
dx = self.__dx[key]*step
gid.create_dataset('x0',data=x0)
gid.create_dataset('y0',data=y0)
gid.create_dataset('z0',data=z0)
gid.create_dataset('dx',data=dx)
did = gid.create_dataset('data',(nzg,nyg,nxg),dtype=self.__precision) did = gid.create_dataset('data',(nzg,nyg,nxg),dtype=self.__precision)
did[ksl_h5,jsl_h5,isl_h5] = np.transpose(self.field[key][isl_ch,jsl_ch,ksl_ch]) did[ksl_h5,jsl_h5,isl_h5] = np.transpose(self.field[key][isl_ch,jsl_ch,ksl_ch])
fid.close() fid.close()
@ -691,10 +699,12 @@ class ibmppp:
fid.close() fid.close()
if self.__rank!=self.__nproc-1: if self.__rank!=self.__nproc-1:
self.__comm.send(True, dest=self.__rank+1, tag=1) self.__comm.send(True, dest=self.__rank+1, tag=1)
# Ensure that no processor is still working on the file
self.__comm.Barrier()
# Create an XDMF file for the field # Create an XDMF file for the field
if xdmf and self.__rank==0: if xdmf and self.__rank==0:
if verbose: if verbose:
print('[saveFieldSingleFile] generating XDMF',end='\r') print('[saveFieldSingleFile] generating XDMF'+4*'\t',end='\r')
# Construct XDMF filename # Construct XDMF filename
file_xdmf = filename+'_'+key+'.xdmf' file_xdmf = filename+'_'+key+'.xdmf'
filename_h5 = os.path.basename(file_out) filename_h5 = os.path.basename(file_out)
@ -705,10 +715,6 @@ class ibmppp:
fid.write(' <Domain>\n') fid.write(' <Domain>\n')
fid.write(' <Grid Name="{}">\n'.format(key)) fid.write(' <Grid Name="{}">\n'.format(key))
#fid.write(' <Time Value="%.2f" />\n',params.general.simtime) #fid.write(' <Time Value="%.2f" />\n',params.general.simtime)
dx = self.__dx[key]*step
x0 = self.grid[key][0][0]
y0 = self.grid[key][1][0]
z0 = self.grid[key][2][0]
fid.write(' <Topology TopologyType="3DCORECTMesh" NumberOfElements="{:d} {:d} {:d}"/>\n'.format(nzg,nyg,nxg)) fid.write(' <Topology TopologyType="3DCORECTMesh" NumberOfElements="{:d} {:d} {:d}"/>\n'.format(nzg,nyg,nxg))
fid.write(' <Geometry Origin="" Type="ORIGIN_DXDYDZ">\n') fid.write(' <Geometry Origin="" Type="ORIGIN_DXDYDZ">\n')
fid.write(' <DataItem DataType="Float" Dimensions="3" Format="XML" Precision="8"> {:12f} {:12f} {:12f}</DataItem>\n'.format(z0,y0,x0)) fid.write(' <DataItem DataType="Float" Dimensions="3" Format="XML" Precision="8"> {:12f} {:12f} {:12f}</DataItem>\n'.format(z0,y0,x0))
@ -722,6 +728,10 @@ class ibmppp:
fid.write(' </Domain>\n') fid.write(' </Domain>\n')
fid.write('</Xdmf> \n') fid.write('</Xdmf> \n')
fid.close() fid.close()
# Clear carriage return output if verbose
if self.__rank==0 and verbose:
print(10*'\t',end='\r')
return None
def saveStatistics(self,filename): def saveStatistics(self,filename):
'''Writes all gathered statistics to a h5 file.''' '''Writes all gathered statistics to a h5 file.'''