New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 13014 – NEMO

Changeset 13014


Ignore:
Timestamp:
2020-06-03T10:44:33+02:00 (4 years ago)
Author:
smasson
Message:

Clem's branch: merge with r4.0-HEAD@13013

Location:
NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/OCE/LBC/lib_mpp.F90

    r12955 r13014  
    10901090      nstop = nstop + 1 
    10911091      ! 
    1092       IF( numout == 6 ) THEN                          ! force to open ocean.output file if not already opened 
    1093          CALL ctl_opn( numout, 'ocean.output', 'APPEND', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. ) 
    1094       ELSE 
    1095          IF( narea > 1 .AND. cd1 == 'STOP' ) THEN     ! add an error message in ocean.output 
    1096             CALL ctl_opn( inum,'ocean.output', 'APPEND', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. ) 
    1097             WRITE(inum,*) 
    1098             WRITE(inum,'(a,i4.4)') ' ===>>> : see E R R O R in ocean.output_', narea - 1 
    1099          ENDIF 
     1092      IF( cd1 == 'STOP' .AND. narea /= 1 ) THEN    ! Immediate stop: add an arror message in 'ocean.output' file 
     1093         CALL ctl_opn( inum, 'ocean.output', 'APPEND', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. ) 
     1094         WRITE(inum,*) 
     1095         WRITE(inum,*) ' ==>>>   Look for "E R R O R" messages in all existing *ocean.output* files' 
     1096         CLOSE(inum) 
     1097      ENDIF 
     1098      IF( numout == 6 ) THEN                       ! force to open ocean.output file if not already opened 
     1099         CALL ctl_opn( numout, 'ocean.output', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE., narea ) 
    11001100      ENDIF 
    11011101      ! 
  • NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/OCE/nemogcm.F90

    r12955 r13014  
    225225         IF( ngrdstop > 0 ) THEN 
    226226            WRITE(ctmp9,'(i2)') ngrdstop 
    227             WRITE(ctmp2,*) '      ==>>>   Error detected in Agrif grid '//TRIM(ctmp9) 
    228             WRITE(ctmp3,*) '      ==>>>   look for error messages in '//TRIM(ctmp9)//'_ocean_output* files' 
    229             CALL ctl_stop( ctmp1, ctmp2, ctmp3 ) 
     227            WRITE(ctmp2,*) '           E R R O R detected in Agrif grid '//TRIM(ctmp9) 
     228            WRITE(ctmp3,*) '           Look for "E R R O R" messages in all existing '//TRIM(ctmp9)//'_ocean_output* files' 
     229            CALL ctl_stop( ' ', ctmp1, ' ', ctmp2, ' ', ctmp3 ) 
    230230         ELSE 
    231             CALL ctl_stop( ctmp1 ) 
     231            WRITE(ctmp2,*) '           Look for "E R R O R" messages in all existing ocean_output* files' 
     232            CALL ctl_stop( ' ', ctmp1, ' ', ctmp2 ) 
    232233         ENDIF 
    233234      ENDIF 
  • NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/OCE/stpctl.F90

    r12955 r13014  
    240240      !!! WRITE(clsum, '(i'//clfmt//')') ksum                   ! this is creating a compilation error with AGRIF 
    241241      cl4 = '(i'//clfmt//')'   ;   WRITE(clsum, cl4) ksum 
    242       WRITE(clfmt, '(i1)') INT(LOG10(REAL(jpnij-1,wp))) + 1     ! how many digits to we need to write ? (we decide max = 9) 
     242      WRITE(clfmt, '(i1)') INT(LOG10(REAL(MAX(1,jpnij-1),wp))) + 1    ! how many digits to we need to write ? (we decide max = 9) 
    243243      cl4 = '(i'//clfmt//')'   ;   WRITE(clmin, cl4) kmin-1 
    244244                                   WRITE(clmax, cl4) kmax-1 
  • NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/OFF/nemogcm.F90

    r12842 r13014  
    136136      IF( nstop /= 0 .AND. lwp ) THEN                 ! error print 
    137137         WRITE(ctmp1,*) '   ==>>>   nemo_gcm: a total of ', nstop, ' errors have been found' 
    138          CALL ctl_stop( ctmp1 ) 
     138         WRITE(ctmp2,*) '           Look for "E R R O R" messages in all existing ocean_output* files' 
     139         CALL ctl_stop( ' ', ctmp1, ' ', ctmp2 ) 
    139140      ENDIF 
    140141      ! 
  • NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/SAS/nemogcm.F90

    r12640 r13014  
    153153      IF( nstop /= 0 .AND. lwp ) THEN        ! error print 
    154154         WRITE(ctmp1,*) '   ==>>>   nemo_gcm: a total of ', nstop, ' errors have been found' 
    155          CALL ctl_stop( ctmp1 ) 
     155         WRITE(ctmp2,*) '           Look for "E R R O R" messages in all existing ocean_output* files' 
     156         CALL ctl_stop( ' ', ctmp1, ' ', ctmp2 ) 
    156157      ENDIF 
    157158      ! 
  • NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/tests/CANAL/MY_SRC/stpctl.F90

    r12955 r13014  
    240240      !!! WRITE(clsum, '(i'//clfmt//')') ksum                   ! this is creating a compilation error with AGRIF 
    241241      cl4 = '(i'//clfmt//')'   ;   WRITE(clsum, cl4) ksum 
    242       WRITE(clfmt, '(i1)') INT(LOG10(REAL(jpnij-1,wp))) + 1     ! how many digits to we need to write ? (we decide max = 9) 
     242      WRITE(clfmt, '(i1)') INT(LOG10(REAL(MAX(1,jpnij-1),wp))) + 1    ! how many digits to we need to write ? (we decide max = 9) 
    243243      cl4 = '(i'//clfmt//')'   ;   WRITE(clmin, cl4) kmin-1 
    244244                                   WRITE(clmax, cl4) kmax-1 
Note: See TracChangeset for help on using the changeset viewer.