Skip to content
Snippets Groups Projects
Commit fc018785 authored by Antoine Cyril David Hoffmann's avatar Antoine Cyril David Hoffmann 🌱
Browse files

Merge branch 'master' of gitlab.epfl.ch:ahoffman/gyacomo

parents 0591d3c6 14df2578
No related branches found
No related tags found
No related merge requests found
......@@ -58,25 +58,25 @@ subroutine auxval
DO i_ = 0,num_procs-1
CALL mpi_barrier(MPI_COMM_WORLD, ierr)
IF (my_id .EQ. i_) THEN
IF (my_id .EQ. 0) WRITE(*,*) '------------ Parallel environment ------------'
IF (my_id .EQ. 0) WRITE(*,'(A,I4)') ' Total number of processes: ', num_procs
IF (my_id .EQ. 0) WRITE(*,'(A,I4,A,I4,A,I4,A)') ' Process distribution:'
IF (my_id .EQ. 0) WRITE(*,'(A,I4,A,I4,A,I4,A)') ' (', num_procs_p, ',', num_procs_ky, ',', num_procs_z,')'
IF (my_id .EQ. 0) WRITE(*,*) ''
IF (my_id .EQ. 0) WRITE(*,*) '--------- Parallel environment ----------'
IF (my_id .EQ. 0) WRITE(*,'(A12,I3)') 'n_procs ', num_procs
IF (my_id .EQ. 0) WRITE(*,'(A12,I3,A14,I3,A14,I3)') 'num_procs_p = ', num_procs_p, ', num_procs_ky = ', num_procs_ky, ', num_procs_z = ', num_procs_z
IF (my_id .EQ. 0) WRITE(*,*) ''
WRITE(*,'(A9,I3,A10,I3,A10,I3,A9,I3)')&
'my_id = ', my_id, ', rank_p = ', rank_p, ', rank_ky = ', rank_ky,', rank_z = ', rank_z
WRITE(*,'(A22,I3,A11,I3)')&
' local_np = ', local_np , ', offset = ', local_np_offset
WRITE(*,'(A22,I3,A11,I3)')&
' local_nj = ', local_nj , ', offset = ', local_nj_offset
WRITE(*,'(A22,I3,A11,I3)')&
' local_nkx = ', local_nkx , ', offset = ', local_nkx_offset
WRITE(*,'(A22,I3,A11,I3)')&
' local_nky = ', local_nky , ', offset = ', local_nky_offset
WRITE(*,'(A22,I3,A11,I3)')&
' local_nz = ', local_nz , ', offset = ', local_nz_offset
WRITE(*,'(A10,I4,A3,I4,A1,I4,A1,I4,A1)')&
' Process #', my_id, ' (', rank_p, ',', rank_ky,',', rank_z,')'
WRITE(*,'(A18,I4,A11,I4)')&
' local_np = ', local_np , ', offset = ', local_np_offset
WRITE(*,'(A18,I4,A11,I4)')&
' local_nj = ', local_nj , ', offset = ', local_nj_offset
WRITE(*,'(A18,I4,A11,I4)')&
' local_nkx = ', local_nkx , ', offset = ', local_nkx_offset
WRITE(*,'(A18,I4,A11,I4)')&
' local_nky = ', local_nky , ', offset = ', local_nky_offset
WRITE(*,'(A18,I4,A11,I4)')&
' local_nz = ', local_nz , ', offset = ', local_nz_offset
IF (my_id .NE. num_procs-1) WRITE (*,*) ''
IF (my_id .EQ. num_procs-1) WRITE(*,*) '------------------------------------------'
IF (my_id .EQ. num_procs-1) WRITE(*,*) '----------------------------------------------'
IF (my_id .EQ. num_procs-1) CALL FLUSH(OUTPUT_UNIT)
ENDIF
ENDDO
......
......@@ -257,7 +257,7 @@ CONTAINS
!
END SUBROUTINE daytim
!================================================================================
CHARACTER(64) FUNCTION day_and_time_str
CHARACTER(64) FUNCTION day_and_time_str()
! Print date and time
USE parallel, ONLY: my_id
use prec_const
......
......@@ -18,17 +18,16 @@ SUBROUTINE control
CALL start_chrono(chrono_runt)
!________________________________________________________________________________
! ] 1. Prologue
! Print out title
CALL show_title
! Write the current time
CALL speak('Start time: '//day_and_time_str(),0)
! 1.1 Initialize the parallel environment
! 1.0 Initialize the parallel environment
CALL speak('Init MPI [',2)
CALL ppinit
CALL speak('] MPI initialized',2)
CALL mpi_barrier(MPI_COMM_WORLD, ierr)
! 1.1 Title and start time
CALL show_title
CALL speak('Start time: '//day_and_time_str(),0)
! 1.2 Define data specific to run
CALL speak('Load basic data [',2)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment