Merge branch 'master' into reconnection
This commit is contained in:
commit
b573ac4934
@ -37,7 +37,7 @@ program amun
|
||||
use mpitools , only : initialize_mpitools, finalize_mpitools
|
||||
use mpitools , only : verbose => master, nproc, check_status
|
||||
#ifdef MPI
|
||||
use mpitools , only : reduce_sum, nprocs
|
||||
use mpitools , only : reduce_sum, nodes, nprocs
|
||||
#endif /* MPI */
|
||||
use parameters, only : read_parameters, finalize_parameters
|
||||
use random , only : initialize_random, finalize_random
|
||||
@ -136,14 +136,19 @@ program amun
|
||||
call print_welcome(verbose)
|
||||
#ifdef MPI
|
||||
call print_section(verbose, "Parallelization")
|
||||
call print_parameter(verbose, "MPI processes" , nprocs)
|
||||
call print_parameter(verbose, "MPI nodes" , nodes)
|
||||
call print_parameter(verbose, "MPI processes per node" , nprocs / nodes)
|
||||
#else /* MPI */
|
||||
!$ call print_section(verbose, "Parallelization")
|
||||
#endif /* MPI */
|
||||
!$omp parallel
|
||||
!$omp master
|
||||
!$ nthreads = omp_get_num_threads()
|
||||
#ifdef MPI
|
||||
!$ call print_parameter(verbose, "OpenMP threads per process", nthreads)
|
||||
#else /* MPI */
|
||||
!$ call print_parameter(verbose, "OpenMP threads", nthreads)
|
||||
#endif /* MPI */
|
||||
!$omp end master
|
||||
!$omp end parallel
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user