Ignore:
Timestamp:
2020-05-15T10:06:25+02:00 (10 months ago)
Author:
smasson
Message:

trunk: merge back r12581_ticket2418 branch into the trunk, see #2418

Location:
NEMO/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk

    • Property svn:externals
      •  

        old new  
        88 
        99# SETTE 
        10 ^/utils/CI/sette@12798        sette 
         10^/utils/CI/sette@12931        sette 
  • NEMO/trunk/src/OCE/nemogcm.F90

    r12641 r12933  
    186186      END DO 
    187187      ! 
    188       IF( .NOT. Agrif_Root() ) THEN 
    189          CALL Agrif_ParentGrid_To_ChildGrid() 
    190          IF( ln_diaobs )   CALL dia_obs_wri 
    191          IF( ln_timing )   CALL timing_finalize 
    192          CALL Agrif_ChildGrid_To_ParentGrid() 
    193       ENDIF 
    194       ! 
    195188# else 
    196189      ! 
     
    237230      IF( nstop /= 0 .AND. lwp ) THEN        ! error print 
    238231         WRITE(ctmp1,*) '   ==>>>   nemo_gcm: a total of ', nstop, ' errors have been found' 
    239          CALL ctl_stop( ctmp1 ) 
     232         IF( ngrdstop > 0 ) THEN 
     233            WRITE(ctmp9,'(i2)') ngrdstop 
     234            WRITE(ctmp2,*) '      ==>>>   Error detected in Agrif grid '//TRIM(ctmp9) 
     235            WRITE(ctmp3,*) '      ==>>>   look for error messages in '//TRIM(ctmp9)//'_ocean_output* files' 
     236            CALL ctl_stop( ctmp1, ctmp2, ctmp3 ) 
     237         ELSE 
     238            CALL ctl_stop( ctmp1 ) 
     239         ENDIF 
    240240      ENDIF 
    241241      ! 
     
    335335      ! 
    336336      ! finalize the definition of namctl variables 
    337       IF( sn_cfctl%l_allon ) THEN 
    338          ! Turn on all options. 
    339          CALL nemo_set_cfctl( sn_cfctl, .TRUE., .TRUE. ) 
    340          ! Ensure all processors are active 
    341          sn_cfctl%procmin = 0 ; sn_cfctl%procmax = 1000000 ; sn_cfctl%procincr = 1 
    342       ELSEIF( sn_cfctl%l_config ) THEN 
    343          ! Activate finer control of report outputs 
    344          ! optionally switch off output from selected areas (note this only 
    345          ! applies to output which does not involve global communications) 
    346          IF( ( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax  ) .OR. & 
    347            & ( MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 ) )    & 
    348            &   CALL nemo_set_cfctl( sn_cfctl, .FALSE., .FALSE. ) 
    349       ELSE 
    350          ! turn off all options. 
    351          CALL nemo_set_cfctl( sn_cfctl, .FALSE., .TRUE. ) 
    352       ENDIF 
     337      IF( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax .OR. MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 )   & 
     338         &   CALL nemo_set_cfctl( sn_cfctl, .FALSE. ) 
    353339      ! 
    354340      lwp = (narea == 1) .OR. sn_cfctl%l_oceout    ! control of all listing output print 
     
    534520         WRITE(numout,*) '~~~~~~~~' 
    535521         WRITE(numout,*) '   Namelist namctl' 
    536          WRITE(numout,*) '                              sn_cfctl%l_glochk  = ', sn_cfctl%l_glochk 
    537          WRITE(numout,*) '                              sn_cfctl%l_allon   = ', sn_cfctl%l_allon 
    538          WRITE(numout,*) '       finer control over o/p sn_cfctl%l_config  = ', sn_cfctl%l_config 
    539522         WRITE(numout,*) '                              sn_cfctl%l_runstat = ', sn_cfctl%l_runstat 
    540523         WRITE(numout,*) '                              sn_cfctl%l_trcstat = ', sn_cfctl%l_trcstat 
     
    684667 
    685668    
    686    SUBROUTINE nemo_set_cfctl(sn_cfctl, setto, for_all ) 
     669   SUBROUTINE nemo_set_cfctl(sn_cfctl, setto ) 
    687670      !!---------------------------------------------------------------------- 
    688671      !!                     ***  ROUTINE nemo_set_cfctl  *** 
    689672      !! 
    690673      !! ** Purpose :   Set elements of the output control structure to setto. 
    691       !!                for_all should be .false. unless all areas are to be 
    692       !!                treated identically. 
    693674      !! 
    694675      !! ** Method  :   Note this routine can be used to switch on/off some 
    695       !!                types of output for selected areas but any output types 
    696       !!                that involve global communications (e.g. mpp_max, glob_sum) 
    697       !!                should be protected from selective switching by the 
    698       !!                for_all argument 
    699       !!---------------------------------------------------------------------- 
    700       LOGICAL :: setto, for_all 
    701       TYPE(sn_ctl) :: sn_cfctl 
    702       !!---------------------------------------------------------------------- 
    703       IF( for_all ) THEN 
    704          sn_cfctl%l_runstat = setto 
    705          sn_cfctl%l_trcstat = setto 
    706       ENDIF 
     676      !!                types of output for selected areas. 
     677      !!---------------------------------------------------------------------- 
     678      TYPE(sn_ctl), INTENT(inout) :: sn_cfctl 
     679      LOGICAL     , INTENT(in   ) :: setto 
     680      !!---------------------------------------------------------------------- 
     681      sn_cfctl%l_runstat = setto 
     682      sn_cfctl%l_trcstat = setto 
    707683      sn_cfctl%l_oceout  = setto 
    708684      sn_cfctl%l_layout  = setto 
Note: See TracChangeset for help on using the changeset viewer.