From 3ebba9b3c0e55f9bfddb355b357de1e11f91dec7 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 13 Sep 2020 21:21:55 +0200 Subject: [PATCH] more sensible locations for reporting --- src/DAMASK_interface.f90 | 1 - src/grid/discretization_grid.f90 | 4 ++++ src/grid/spectral_utilities.f90 | 3 --- src/parallelization.f90 | 7 ++++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/DAMASK_interface.f90 b/src/DAMASK_interface.f90 index fbd6f02ce..46ecd4da0 100644 --- a/src/DAMASK_interface.f90 +++ b/src/DAMASK_interface.f90 @@ -191,7 +191,6 @@ subroutine DAMASK_interface_init call get_command(commandLine) call get_environment_variable('USER',userName) ! ToDo: https://stackoverflow.com/questions/8953424/how-to-get-the-username-in-c-c-in-linux - print'(/,a,i4.1)', ' MPI processes: ',worldsize print'(a)', ' Host name: '//trim(getHostName()) print'(a)', ' User name: '//trim(userName) diff --git a/src/grid/discretization_grid.f90 b/src/grid/discretization_grid.f90 index fa732863a..2b6199a33 100644 --- a/src/grid/discretization_grid.f90 +++ b/src/grid/discretization_grid.f90 @@ -73,6 +73,10 @@ subroutine discretization_grid_init(restart) call readGeom(grid,geomSize,origin,microstructureAt) endif + print'(/,a,3(i12 ))', ' grid a b c: ', grid + print'(a,3(es12.5))', ' size x y z: ', geomSize + print'(a,3(es12.5))', ' origin x y z: ', origin + !-------------------------------------------------------------------------------------------------- ! grid solver specific quantities if(worldsize>grid(3)) call IO_error(894, ext_msg='number of processes exceeds grid(3)') diff --git a/src/grid/spectral_utilities.f90 b/src/grid/spectral_utilities.f90 index 9a81a441b..1dc66a23f 100644 --- a/src/grid/spectral_utilities.f90 +++ b/src/grid/spectral_utilities.f90 @@ -226,9 +226,6 @@ subroutine spectral_utilities_init grid1Red = grid(1)/2 + 1 wgt = 1.0/real(product(grid),pReal) - print'(/,a,3(i12 ))', ' grid a b c: ', grid - print'(a,3(es12.5))', ' size x y z: ', geomSize - num%memory_efficient = num_grid%get_asInt('memory_efficient', defaultVal=1) > 0 ! ToDo: should be logical in YAML file num%divergence_correction = num_grid%get_asInt('divergence_correction', defaultVal=2) diff --git a/src/parallelization.f90 b/src/parallelization.f90 index fc1effd54..341b620c9 100644 --- a/src/parallelization.f90 +++ b/src/parallelization.f90 @@ -36,7 +36,7 @@ subroutine parallelization_init PetscErrorCode :: petsc_err #else - write(6,'(/,a)') ' <<<+- parallelization init -+>>>'; flush(6) + print'(/,a)', ' <<<+- parallelization init -+>>>'; flush(6) #endif #ifdef PETSc @@ -54,7 +54,8 @@ subroutine parallelization_init call MPI_Comm_rank(PETSC_COMM_WORLD,worldrank,err) if (err /= 0) error stop 'Could not determine worldrank' - if (worldrank == 0) write(6,'(/,a)') ' <<<+- parallelization init -+>>>'; flush(6) + if (worldrank == 0) print'(/,a)', ' <<<+- parallelization init -+>>>' + if (worldrank == 0) print'(a,i3)', ' MPI processes: ',worldsize call MPI_Comm_size(PETSC_COMM_WORLD,worldsize,err) if (err /= 0) error stop 'Could not determine worldsize' @@ -88,7 +89,7 @@ subroutine parallelization_init !$ DAMASK_NUM_THREADS = 1_pI32 !$ endif !$ endif -!$ write(6,'(a,i8)') ' DAMASK_NUM_THREADS: ',DAMASK_NUM_THREADS +!$ print'(a,i2)', ' DAMASK_NUM_THREADS: ',DAMASK_NUM_THREADS !$ call omp_set_num_threads(DAMASK_NUM_THREADS) end subroutine parallelization_init