Changeset 10425 for NEMO/trunk/src/OFF


Ignore:
Timestamp:
2018-12-19T22:54:16+01:00 (2 years ago)
Author:
smasson
Message:

trunk: merge back dev_r10164_HPC09_ESIWACE_PREP_MERGE@10424 into the trunk

Location:
NEMO/trunk/src/OFF
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/OFF/dtadyn.F90

    r10222 r10425  
    404404      hrnf_max = MAXVAL( h_rnf(:,:) ) 
    405405      IF( lk_mpp )  THEN 
    406          CALL mpp_max( nkrnf_max )                 ! max over the  global domain 
    407          CALL mpp_max( hrnf_max )                 ! max over the  global domain 
     406         CALL mpp_max( 'dtadyn', nkrnf_max )                 ! max over the  global domain 
     407         CALL mpp_max( 'dtadyn', hrnf_max )                 ! max over the  global domain 
    408408      ENDIF 
    409409      IF(lwp) WRITE(numout,*) ' ' 
  • NEMO/trunk/src/OFF/nemogcm.F90

    r10222 r10425  
    9595      ! check that all process are still there... If some process have an error, 
    9696      ! they will never enter in step and other processes will wait until the end of the cpu time! 
    97       IF( lk_mpp )   CALL mpp_max( nstop ) 
     97      CALL mpp_max( 'nemogcm', nstop ) 
    9898 
    9999      !                            !-----------------------! 
     
    441441      ierr = ierr + trc_oce_alloc()          ! shared TRC / TRA arrays 
    442442      ! 
    443       IF( lk_mpp    )   CALL mpp_sum( ierr ) 
     443      CALL mpp_sum( 'nemogcm', ierr ) 
    444444      IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'nemo_alloc: unable to allocate standard ocean arrays' ) 
    445445      ! 
     
    481481      !!---------------------------------------------------------------------- 
    482482      ! 
    483       IF( kt == nit000 .AND. lwp ) THEN 
     483      IF( kt == nit000 .AND. lwm ) THEN 
    484484         WRITE(numout,*) 
    485485         WRITE(numout,*) 'stp_ctl : time-stepping control' 
     
    489489      ENDIF 
    490490      ! 
    491       IF(lwp) WRITE ( numstp, '(1x, i8)' )   kt      !* save the current time step in numstp 
    492       IF(lwp) REWIND( numstp )                       ! -------------------------- 
     491      IF(lwm) WRITE ( numstp, '(1x, i8)' )   kt      !* save the current time step in numstp 
     492      IF(lwm) REWIND( numstp )                       ! -------------------------- 
    493493      ! 
    494494   END SUBROUTINE stp_ctl 
Note: See TracChangeset for help on using the changeset viewer.