Ignore:
Timestamp:
2020-06-26T10:26:32+02:00 (3 months ago)
Author:
gsamson
Message:

merge trunk@r13136 into ASINTER-06 branch; pass all SETTE tests; results identical to trunk@r13136; ticket #2419

Location:
NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement

    • Property svn:externals
      •  

        old new  
        88 
        99# SETTE 
        10 ^/utils/CI/sette@HEAD         sette 
         10^/utils/CI/sette@12931        sette 
  • NEMO/branches/2020/dev_r12563_ASINTER-06_ABL_improvement/src/SAO/nemogcm.F90

    r12377 r13159  
    2929   USE sao_intp 
    3030   ! 
     31   USE in_out_manager ! I/O manager 
    3132   USE lib_mpp        ! distributed memory computing 
    3233   USE mppini         ! shared/distributed memory setting (mpp_init routine) 
     
    139140      IF( lwm )   CALL ctl_opn(     numond, 'output.namelist.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. ) 
    140141      ! open /dev/null file to be able to supress output write easily 
     142      IF( Agrif_Root() ) THEN 
    141143                  CALL ctl_opn(     numnul,           '/dev/null', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. ) 
     144#ifdef key_agrif 
     145      ELSE 
     146                  numnul = Agrif_Parent(numnul)    
     147#endif 
     148      ENDIF 
    142149      ! 
    143150      !                             !--------------------! 
     
    151158      ! 
    152159      ! finalize the definition of namctl variables 
    153       IF( sn_cfctl%l_allon ) THEN 
    154          ! Turn on all options. 
    155          CALL nemo_set_cfctl( sn_cfctl, .TRUE., .TRUE. ) 
    156          ! Ensure all processors are active 
    157          sn_cfctl%procmin = 0 ; sn_cfctl%procmax = 1000000 ; sn_cfctl%procincr = 1 
    158       ELSEIF( sn_cfctl%l_config ) THEN 
    159          ! Activate finer control of report outputs 
    160          ! optionally switch off output from selected areas (note this only 
    161          ! applies to output which does not involve global communications) 
    162          IF( ( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax  ) .OR. & 
    163            & ( MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 ) )    & 
    164            &   CALL nemo_set_cfctl( sn_cfctl, .FALSE., .FALSE. ) 
    165       ELSE 
    166          ! turn off all options. 
    167          CALL nemo_set_cfctl( sn_cfctl, .FALSE., .TRUE. ) 
    168       ENDIF 
     160      IF( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax .OR. MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 )   & 
     161         &   CALL nemo_set_cfctl( sn_cfctl, .FALSE. ) 
    169162      ! 
    170163      lwp = (narea == 1) .OR. sn_cfctl%l_oceout    ! control of all listing output print 
     
    263256         WRITE(numout,*) '~~~~~~~~' 
    264257         WRITE(numout,*) '   Namelist namctl' 
    265          WRITE(numout,*) '                              sn_cfctl%l_glochk  = ', sn_cfctl%l_glochk 
    266          WRITE(numout,*) '                              sn_cfctl%l_allon   = ', sn_cfctl%l_allon 
    267          WRITE(numout,*) '       finer control over o/p sn_cfctl%l_config  = ', sn_cfctl%l_config 
    268258         WRITE(numout,*) '                              sn_cfctl%l_runstat = ', sn_cfctl%l_runstat 
    269259         WRITE(numout,*) '                              sn_cfctl%l_trcstat = ', sn_cfctl%l_trcstat 
     
    403393   END SUBROUTINE nemo_alloc 
    404394 
    405    SUBROUTINE nemo_set_cfctl(sn_cfctl, setto, for_all ) 
     395   SUBROUTINE nemo_set_cfctl(sn_cfctl, setto ) 
    406396      !!---------------------------------------------------------------------- 
    407397      !!                     ***  ROUTINE nemo_set_cfctl  *** 
    408398      !! 
    409399      !! ** Purpose :   Set elements of the output control structure to setto. 
    410       !!                for_all should be .false. unless all areas are to be 
    411       !!                treated identically. 
    412400      !! 
    413401      !! ** Method  :   Note this routine can be used to switch on/off some 
    414       !!                types of output for selected areas but any output types 
    415       !!                that involve global communications (e.g. mpp_max, glob_sum) 
    416       !!                should be protected from selective switching by the 
    417       !!                for_all argument 
    418       !!---------------------------------------------------------------------- 
    419       LOGICAL :: setto, for_all 
    420       TYPE(sn_ctl) :: sn_cfctl 
    421       !!---------------------------------------------------------------------- 
    422       IF( for_all ) THEN 
    423          sn_cfctl%l_runstat = setto 
    424          sn_cfctl%l_trcstat = setto 
    425       ENDIF 
     402      !!                types of output for selected areas. 
     403      !!---------------------------------------------------------------------- 
     404      TYPE(sn_ctl), INTENT(inout) :: sn_cfctl 
     405      LOGICAL     , INTENT(in   ) :: setto 
     406      !!---------------------------------------------------------------------- 
     407      sn_cfctl%l_runstat = setto 
     408      sn_cfctl%l_trcstat = setto 
    426409      sn_cfctl%l_oceout  = setto 
    427410      sn_cfctl%l_layout  = setto 
Note: See TracChangeset for help on using the changeset viewer.