From f70df11b673f2f1b400ccb855f8010389852bda1 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 29 Jan 2022 15:59:14 +0100 Subject: [PATCH] consistent reporting --- python/damask/_grid.py | 4 ++-- src/grid/discretization_grid.f90 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/python/damask/_grid.py b/python/damask/_grid.py index 94f7eefd0..dadfcced5 100644 --- a/python/damask/_grid.py +++ b/python/damask/_grid.py @@ -62,8 +62,8 @@ class Grid: mat_max = np.nanmax(self.material) mat_N = self.N_materials return util.srepr([ - f'cells : {util.srepr(self.cells, " x ")}', - f'size : {util.srepr(self.size, " x ")} / m³', + f'cells: {util.srepr(self.cells, " × ")}', + f'size: {util.srepr(self.size, " × ")} / m³', f'origin: {util.srepr(self.origin," ")} / m', f'# materials: {mat_N}' + ('' if mat_min == 0 and mat_max+1 == mat_N else f' (min: {mat_min}, max: {mat_max})') diff --git a/src/grid/discretization_grid.f90 b/src/grid/discretization_grid.f90 index 67f735a0d..6e8c154ef 100644 --- a/src/grid/discretization_grid.f90 +++ b/src/grid/discretization_grid.f90 @@ -96,9 +96,9 @@ subroutine discretization_grid_init(restart) call MPI_Bcast(origin,3_MPI_INTEGER_KIND,MPI_DOUBLE,0_MPI_INTEGER_KIND,MPI_COMM_WORLD, err_MPI) if (err_MPI /= 0_MPI_INTEGER_KIND) error stop 'MPI error' - print'(/,1x,a,3(i12,1x))', 'cells a b c: ', cells - print '(1x,a,3(es12.5,1x))', 'size x y z: ', geomSize - print '(1x,a,3(es12.5,1x))', 'origin x y z: ', origin + print'(/,1x,a,i0,a,i0,a,i0)', 'cells: ', cells(1), ' × ', cells(2), ' × ', cells(3) + print '(1x,a,es8.2,a,es8.2,a,es8.2,a)', 'size: ', geomSize(1), ' × ', geomSize(2), ' × ', geomSize(3), ' / m³' + print '(1x,a,es8.2,a,es8.2,a,es8.2,a)', 'origin: ', origin(1), ' ', origin(2), ' ', origin(3), ' / m' if (worldsize>cells(3)) call IO_error(894, ext_msg='number of processes exceeds cells(3)')