Skip to content
Snippets Groups Projects
Commit 9ee96f99 authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

Philippe 06/11/2018: mode_mppdb: minor changes

parent aeda5159
No related branches found
No related tags found
No related merge requests found
...@@ -200,8 +200,8 @@ CONTAINS ...@@ -200,8 +200,8 @@ CONTAINS
! Wait the sons ! Wait the sons
! !
CALL MPI_BARRIER ( MPPDB_INTRA_COMM , ierr ) CALL MPI_BARRIER ( MPPDB_INTRA_COMM , ierr )
call system(MPPDB_COMMAND)
! WAIT FOR TOTALVIEW IF NEEDED ! WAIT FOR TOTALVIEW IF NEEDED
! call system(MPPDB_COMMAND)
! !
ELSE ! (MPPDB_INTER_COMM <> MPI_COMM_NULL) ELSE ! (MPPDB_INTER_COMM <> MPI_COMM_NULL)
!-------------------------------------------------------------------------! !-------------------------------------------------------------------------!
...@@ -228,8 +228,8 @@ CONTAINS ...@@ -228,8 +228,8 @@ CONTAINS
! !
CALL MPI_BARRIER ( MPPDB_INTRA_COMM , ierr ) CALL MPI_BARRIER ( MPPDB_INTRA_COMM , ierr )
! !
call system(MPPDB_COMMAND)
! WAIT FOR TOTALVIEW IF NEEDED ! WAIT FOR TOTALVIEW IF NEEDED
! call system(MPPDB_COMMAND)
! !
MPPDB_DEBUG = .TRUE. MPPDB_DEBUG = .TRUE.
IF (MPPDB_DEBUG) write(200,*) "MPPDB_INIT :: FIRST SON mppdb_irank_intra=", mppdb_irank_intra & IF (MPPDB_DEBUG) write(200,*) "MPPDB_INIT :: FIRST SON mppdb_irank_intra=", mppdb_irank_intra &
...@@ -434,10 +434,10 @@ CONTAINS ...@@ -434,10 +434,10 @@ CONTAINS
END IF END IF
ELSE ELSE
#ifdef _COLOR_OUTPUT #ifdef _COLOR_OUTPUT
WRITE (*,'( A,I,I,A40 )') achar(27)//'[31mMPPDB_CHECK1D :: KO: array sizes different on 2 sides'//achar(27)//'[0m ',& WRITE (*,'( A,I10,I10,A40 )') achar(27)//'[31mMPPDB_CHECK1D :: KO: array sizes different on 2 sides'//achar(27)//'[0m ',&
SIZE(ITAB),ISIZEOTHER,YMSG SIZE(ITAB),ISIZEOTHER,YMSG
#else #else
WRITE (*,'( A,I,I,A40 )') 'MPPDB_CHECK1D :: KO: array sizes different on 2 sides',SIZE(ITAB),ISIZEOTHER,YMSG WRITE (*,'( A,I10,I10,A40 )') 'MPPDB_CHECK1D :: KO: array sizes different on 2 sides',SIZE(ITAB),ISIZEOTHER,YMSG
#endif #endif
END IF END IF
END IF END IF
...@@ -611,10 +611,10 @@ CONTAINS ...@@ -611,10 +611,10 @@ CONTAINS
END IF END IF
ELSE ELSE
#ifdef _COLOR_OUTPUT #ifdef _COLOR_OUTPUT
WRITE (*,'( A,I,I,A40 )') achar(27)//'[31mMPPDB_CHECK1D :: KO: array sizes different on 2 sides'//achar(27)//'[0m ',& WRITE (*,'( A,I10,I10,A40 )') achar(27)//'[31mMPPDB_CHECK1D :: KO: array sizes different on 2 sides'//achar(27)//'[0m ',&
SIZE(GTAB),ISIZEOTHER,YMSG SIZE(GTAB),ISIZEOTHER,YMSG
#else #else
WRITE (*,'( A,I,I,A40 )') 'MPPDB_CHECK1D :: KO: array sizes different on 2 sides',SIZE(GTAB),ISIZEOTHER,YMSG WRITE (*,'( A,I10,I10,A40 )') 'MPPDB_CHECK1D :: KO: array sizes different on 2 sides',SIZE(GTAB),ISIZEOTHER,YMSG
#endif #endif
END IF END IF
END IF END IF
...@@ -749,9 +749,11 @@ CONTAINS ...@@ -749,9 +749,11 @@ CONTAINS
END IF END IF
#else #else
IF ( OK(1) ) THEN IF ( OK(1) ) THEN
write(*, '(" MPPDB_CHECK1D :: OK MPPDB_CHECK1D =",A40," ERROR=",e15.8," MAXVAL=",e15.8)' ) MESSAGE,MAX_DIFF(1),MAX_VAL(1) write(*, '(" MPPDB_CHECK1D :: OK MPPDB_CHECK1D =",A40," ERROR=",e15.8," MAXVAL=",e15.8)' ) &
MESSAGE,MAX_DIFF(1),MAX_VAL(1)
ELSE ELSE
write(*, '(" MPPDB_CHECK1D :: KO MPPDB_CHECK1D =",A40," ERROR=",e15.8," MAXVAL=",e15.8)' ) MESSAGE,MAX_DIFF(1),MAX_VAL(1) write(*, '(" MPPDB_CHECK1D :: KO MPPDB_CHECK1D =",A40," ERROR=",e15.8," MAXVAL=",e15.8)' ) &
MESSAGE,MAX_DIFF(1),MAX_VAL(1)
END IF END IF
#endif #endif
call flush(OUTPUT_UNIT) call flush(OUTPUT_UNIT)
...@@ -799,10 +801,10 @@ CONTAINS ...@@ -799,10 +801,10 @@ CONTAINS
END IF END IF
ELSE ELSE
#ifdef _COLOR_OUTPUT #ifdef _COLOR_OUTPUT
WRITE (*,'( A,I,I,A40 )') achar(27)//'[31mMPPDB_CHECK1D :: KO: array sizes different on 2 sides'//achar(27)//'[0m ',& WRITE (*,'( A,I10,I10,A40 )') achar(27)//'[31mMPPDB_CHECK1D :: KO: array sizes different on 2 sides'//achar(27)//'[0m ',&
SIZE(ZTAB),ISIZEOTHER,YMSG SIZE(ZTAB),ISIZEOTHER,YMSG
#else #else
WRITE (*,'( A,I,I,A40 )') 'MPPDB_CHECK1D :: KO: array sizes different on 2 sides',SIZE(ZTAB),ISIZEOTHER,YMSG WRITE (*,'( A,I10,I10,A40 )') 'MPPDB_CHECK1D :: KO: array sizes different on 2 sides',SIZE(ZTAB),ISIZEOTHER,YMSG
#endif #endif
END IF END IF
END IF END IF
...@@ -945,7 +947,8 @@ CONTAINS ...@@ -945,7 +947,8 @@ CONTAINS
IIB_SON_ll = 1 + IHEXT_SON_ll ; IJB_SON_ll = 1 + IHEXT_SON_ll IIB_SON_ll = 1 + IHEXT_SON_ll ; IJB_SON_ll = 1 + IHEXT_SON_ll
IIE_SON_ll = IIU_SON_ll-IHEXT_SON_ll ; IJE_SON_ll = IJU_SON_ll-IHEXT_SON_ll IIE_SON_ll = IIU_SON_ll-IHEXT_SON_ll ; IJE_SON_ll = IJU_SON_ll-IHEXT_SON_ll
! !
INUMDIFF(IPAS) = COUNT( TAB_ll(IIB_SON_ll-IDIFF_HEXT:IIE_SON_ll+IDIFF_HEXT,IJB_SON_ll-IDIFF_HEXT:IJE_SON_ll+IDIFF_HEXT,1:IKU_SON_ll)) INUMDIFF(IPAS) = COUNT( TAB_ll(IIB_SON_ll-IDIFF_HEXT:IIE_SON_ll+IDIFF_HEXT, &
IJB_SON_ll-IDIFF_HEXT:IJE_SON_ll+IDIFF_HEXT,1:IKU_SON_ll))
IF ( INUMDIFF(IPAS) > 0 ) THEN IF ( INUMDIFF(IPAS) > 0 ) THEN
OK(IPAS) = .FALSE. OK(IPAS) = .FALSE.
DO JK = 1,SIZE(TAB_ll,3) DO JK = 1,SIZE(TAB_ll,3)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment