Changeset 12835


Ignore:
Timestamp:
2020-04-30T08:55:37+02:00 (7 months ago)
Author:
smasson
Message:

r12581_ticket2418: suppress l_allon and l_config namelist parameters, see #2418

Location:
NEMO/branches/2020/r12581_ticket2418
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/r12581_ticket2418/cfgs/SHARED/namelist_ref

    r12593 r12835  
    13941394&namctl        !   Control prints                                       (default: OFF) 
    13951395!----------------------------------------------------------------------- 
    1396    sn_cfctl%l_allon  = .FALSE.    ! IF T activate all options. If F deactivate all unless l_config is T 
    1397      sn_cfctl%l_config = .TRUE.     ! IF .true. then control which reports are written with the following 
    1398        sn_cfctl%l_runstat = .TRUE.  ! switches and which areas produce reports with the proc integer settings. 
    1399        sn_cfctl%l_trcstat = .FALSE. ! The default settings for the proc integers should ensure 
    1400        sn_cfctl%l_oceout  = .FALSE. ! that  all areas report. 
    1401        sn_cfctl%l_layout  = .FALSE. ! 
    1402        sn_cfctl%l_prtctl  = .FALSE. ! 
    1403        sn_cfctl%l_prttrc  = .FALSE. ! 
    1404        sn_cfctl%l_oasout  = .FALSE. ! 
    1405        sn_cfctl%procmin   = 0       ! Minimum area number for reporting [default:0] 
    1406        sn_cfctl%procmax   = 1000000 ! Maximum area number for reporting [default:1000000] 
    1407        sn_cfctl%procincr  = 1       ! Increment for optional subsetting of areas [default:1] 
    1408        sn_cfctl%ptimincr  = 1       ! Timestep increment for writing time step progress info 
    1409    nn_print    =    0      !  level of print (0 no extra print) 
    1410    nn_ictls    =    0      !  start i indice of control sum (use to compare mono versus 
    1411    nn_ictle    =    0      !  end   i indice of control sum        multi processor runs 
    1412    nn_jctls    =    0      !  start j indice of control               over a subdomain) 
    1413    nn_jctle    =    0      !  end   j indice of control 
    1414    nn_isplt    =    1      !  number of processors in i-direction 
    1415    nn_jsplt    =    1      !  number of processors in j-direction 
    1416    ln_timing   = .false.   !  timing by routine write out in timing.output file 
    1417    ln_diacfl   = .false.   !  CFL diagnostics write out in cfl_diagnostics.ascii 
     1396   sn_cfctl%l_runstat = .TRUE.    ! switches and which areas produce reports with the proc integer settings. 
     1397   sn_cfctl%l_trcstat = .FALSE.   ! The default settings for the proc integers should ensure 
     1398   sn_cfctl%l_oceout  = .FALSE.   ! that  all areas report. 
     1399   sn_cfctl%l_layout  = .FALSE.   ! 
     1400   sn_cfctl%l_prtctl  = .FALSE.   ! 
     1401   sn_cfctl%l_prttrc  = .FALSE.   ! 
     1402   sn_cfctl%l_oasout  = .FALSE.   ! 
     1403   sn_cfctl%procmin   = 0         ! Minimum area number for reporting [default:0] 
     1404   sn_cfctl%procmax   = 1000000   ! Maximum area number for reporting [default:1000000] 
     1405   sn_cfctl%procincr  = 1         ! Increment for optional subsetting of areas [default:1] 
     1406   sn_cfctl%ptimincr  = 1         ! Timestep increment for writing time step progress info 
     1407   nn_print    =    0             !  level of print (0 no extra print) 
     1408   nn_ictls    =    0             !  start i indice of control sum (use to compare mono versus 
     1409   nn_ictle    =    0             !  end   i indice of control sum        multi processor runs 
     1410   nn_jctls    =    0             !  start j indice of control               over a subdomain) 
     1411   nn_jctle    =    0             !  end   j indice of control 
     1412   nn_isplt    =    1             !  number of processors in i-direction 
     1413   nn_jsplt    =    1             !  number of processors in j-direction 
     1414   ln_timing   = .false.          !  timing by routine write out in timing.output file 
     1415   ln_diacfl   = .false.          !  CFL diagnostics write out in cfl_diagnostics.ascii 
    14181416/ 
    14191417!----------------------------------------------------------------------- 
  • NEMO/branches/2020/r12581_ticket2418/cfgs/WED025/EXPREF/namelist_cfg

    r12489 r12835  
    658658&namctl        !   Control prints                                       (default: OFF) 
    659659!----------------------------------------------------------------------- 
    660    ln_ctl = .FALSE.                 ! Toggle all report printing on/off (T/F); Ignored if sn_cfctl%l_config is T 
    661      sn_cfctl%l_config = .TRUE.     ! IF .true. then control which reports are written with the following 
    662        sn_cfctl%l_runstat = .FALSE. ! switches and which areas produce reports with the proc integer settings. 
    663        sn_cfctl%l_trcstat = .FALSE. ! The default settings for the proc integers should ensure 
    664        sn_cfctl%l_oceout  = .FALSE. ! that  all areas report. 
    665        sn_cfctl%l_layout  = .FALSE. ! 
    666        sn_cfctl%l_mppout  = .FALSE. ! 
    667        sn_cfctl%l_mpptop  = .FALSE. ! 
    668        sn_cfctl%procmin   = 0       ! Minimum area number for reporting [default:0] 
    669        sn_cfctl%procmax   = 1000000 ! Maximum area number for reporting [default:1000000] 
    670        sn_cfctl%procincr  = 1       ! Increment for optional subsetting of areas [default:1] 
    671        sn_cfctl%ptimincr  = 1       ! Timestep increment for writing time step progress info 
    672    nn_print    =    0      !  level of print (0 no extra print) 
    673    nn_ictls    =    0      !  start i indice of control sum (use to compare mono versus 
    674    nn_ictle    =    0      !  end   i indice of control sum        multi processor runs 
    675    nn_jctls    =    0      !  start j indice of control               over a subdomain) 
    676    nn_jctle    =    0      !  end   j indice of control 
    677    nn_isplt    =    1      !  number of processors in i-direction 
    678    nn_jsplt    =    1      !  number of processors in j-direction 
    679    ln_timing   = .true.    !  timing by routine write out in timing.output file 
    680    ln_diacfl   = .false.   !  CFL diagnostics write out in cfl_diagnostics.ascii 
     660   sn_cfctl%l_runstat = .FALSE.   ! switches and which areas produce reports with the proc integer settings. 
     661   ln_timing   = .true.           !  timing by routine write out in timing.output file 
    681662/ 
    682663!----------------------------------------------------------------------- 
  • NEMO/branches/2020/r12581_ticket2418/src/OCE/C1D/step_c1d.F90

    r12718 r12835  
    2727   PRIVATE 
    2828 
    29    PUBLIC stp_c1d      ! called by opa.F90 
     29   PUBLIC stp_c1d      ! called by nemogcm.F90 
    3030 
    3131   !!---------------------------------------------------------------------- 
  • NEMO/branches/2020/r12581_ticket2418/src/OCE/IOM/in_out_manager.F90

    r12684 r12835  
    100100   !!---------------------------------------------------------------------- 
    101101   TYPE :: sn_ctl                !: structure for control over output selection 
    102       LOGICAL :: l_allon   = .FALSE.  !: overall control; activate all following output options 
    103       LOGICAL :: l_config  = .FALSE.  !: activate/deactivate finer control 
    104                                       !  Note if l_config is True then sn_cfctl%l_allon is ignored. 
    105                                       !  Otherwise setting sn_cfctl%l_allon T/F is equivalent to  
    106                                       !  setting all the following logicals in this structure T/F 
    107                                       !  and disabling subsetting of processors 
    108102      LOGICAL :: l_runstat = .FALSE.  !: Produce/do not produce run.stat file (T/F) 
    109103      LOGICAL :: l_trcstat = .FALSE.  !: Produce/do not produce tracer.stat file (T/F) 
  • NEMO/branches/2020/r12581_ticket2418/src/OCE/nemogcm.F90

    r12684 r12835  
    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_allon   = ', sn_cfctl%l_allon 
    537          WRITE(numout,*) '       finer control over o/p sn_cfctl%l_config  = ', sn_cfctl%l_config 
    538522         WRITE(numout,*) '                              sn_cfctl%l_runstat = ', sn_cfctl%l_runstat 
    539523         WRITE(numout,*) '                              sn_cfctl%l_trcstat = ', sn_cfctl%l_trcstat 
     
    683667 
    684668    
    685    SUBROUTINE nemo_set_cfctl(sn_cfctl, setto, for_all ) 
     669   SUBROUTINE nemo_set_cfctl(sn_cfctl, setto ) 
    686670      !!---------------------------------------------------------------------- 
    687671      !!                     ***  ROUTINE nemo_set_cfctl  *** 
    688672      !! 
    689673      !! ** Purpose :   Set elements of the output control structure to setto. 
    690       !!                for_all should be .false. unless all areas are to be 
    691       !!                treated identically. 
    692674      !! 
    693675      !! ** Method  :   Note this routine can be used to switch on/off some 
    694       !!                types of output for selected areas but any output types 
    695       !!                that involve global communications (e.g. mpp_max, glob_sum) 
    696       !!                should be protected from selective switching by the 
    697       !!                for_all argument 
    698       !!---------------------------------------------------------------------- 
    699       LOGICAL :: setto, for_all 
    700       TYPE(sn_ctl) :: sn_cfctl 
    701       !!---------------------------------------------------------------------- 
    702       IF( for_all ) THEN 
    703          sn_cfctl%l_runstat = setto 
    704          sn_cfctl%l_trcstat = setto 
    705       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 
    706683      sn_cfctl%l_oceout  = setto 
    707684      sn_cfctl%l_layout  = setto 
  • NEMO/branches/2020/r12581_ticket2418/src/OFF/nemogcm.F90

    r12655 r12835  
    227227      ! 
    228228      ! finalize the definition of namctl variables 
    229       IF( sn_cfctl%l_allon ) THEN 
    230          ! Turn on all options. 
    231          CALL nemo_set_cfctl( sn_cfctl, .TRUE., .TRUE. ) 
    232          ! Ensure all processors are active 
    233          sn_cfctl%procmin = 0 ; sn_cfctl%procmax = 1000000 ; sn_cfctl%procincr = 1 
    234       ELSEIF( sn_cfctl%l_config ) THEN 
    235          ! Activate finer control of report outputs 
    236          ! optionally switch off output from selected areas (note this only 
    237          ! applies to output which does not involve global communications) 
    238          IF( ( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax  ) .OR. & 
    239            & ( MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 ) )    & 
    240            &   CALL nemo_set_cfctl( sn_cfctl, .FALSE., .FALSE. ) 
    241       ELSE 
    242          ! turn off all options. 
    243          CALL nemo_set_cfctl( sn_cfctl, .FALSE., .TRUE. ) 
    244       ENDIF 
     229      IF( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax .OR. MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 )   & 
     230         &   CALL nemo_set_cfctl( sn_cfctl, .FALSE. ) 
    245231      ! 
    246232      lwp = (narea == 1) .OR. sn_cfctl%l_oceout    ! control of all listing output print 
     
    371357         WRITE(numout,*) '~~~~~~~~' 
    372358         WRITE(numout,*) '   Namelist namctl' 
    373          WRITE(numout,*) '                              sn_cfctl%l_allon   = ', sn_cfctl%l_allon 
    374          WRITE(numout,*) '       finer control over o/p sn_cfctl%l_config  = ', sn_cfctl%l_config 
    375359         WRITE(numout,*) '                              sn_cfctl%l_runstat = ', sn_cfctl%l_runstat 
    376360         WRITE(numout,*) '                              sn_cfctl%l_trcstat = ', sn_cfctl%l_trcstat 
     
    506490   END SUBROUTINE nemo_alloc 
    507491 
    508    SUBROUTINE nemo_set_cfctl(sn_cfctl, setto, for_all ) 
     492   SUBROUTINE nemo_set_cfctl(sn_cfctl, setto ) 
    509493      !!---------------------------------------------------------------------- 
    510494      !!                     ***  ROUTINE nemo_set_cfctl  *** 
    511495      !! 
    512496      !! ** Purpose :   Set elements of the output control structure to setto. 
    513       !!                for_all should be .false. unless all areas are to be 
    514       !!                treated identically. 
    515       !! 
     497     !! 
    516498      !! ** Method  :   Note this routine can be used to switch on/off some 
    517       !!                types of output for selected areas but any output types 
    518       !!                that involve global communications (e.g. mpp_max, glob_sum) 
    519       !!                should be protected from selective switching by the 
    520       !!                for_all argument 
    521       !!---------------------------------------------------------------------- 
    522       LOGICAL :: setto, for_all 
    523       TYPE(sn_ctl) :: sn_cfctl 
    524       !!---------------------------------------------------------------------- 
    525       IF( for_all ) THEN 
    526          sn_cfctl%l_runstat = setto 
    527          sn_cfctl%l_trcstat = setto 
    528       ENDIF 
     499      !!                types of output for selected areas. 
     500      !!---------------------------------------------------------------------- 
     501      TYPE(sn_ctl), INTENT(inout) :: sn_cfctl 
     502      LOGICAL     , INTENT(in   ) :: setto 
     503      !!---------------------------------------------------------------------- 
     504      sn_cfctl%l_runstat = setto 
     505      sn_cfctl%l_trcstat = setto 
    529506      sn_cfctl%l_oceout  = setto 
    530507      sn_cfctl%l_layout  = setto 
  • NEMO/branches/2020/r12581_ticket2418/src/SAO/nemogcm.F90

    r12655 r12835  
    158158      ! 
    159159      ! finalize the definition of namctl variables 
    160       IF( sn_cfctl%l_allon ) THEN 
    161          ! Turn on all options. 
    162          CALL nemo_set_cfctl( sn_cfctl, .TRUE., .TRUE. ) 
    163          ! Ensure all processors are active 
    164          sn_cfctl%procmin = 0 ; sn_cfctl%procmax = 1000000 ; sn_cfctl%procincr = 1 
    165       ELSEIF( sn_cfctl%l_config ) THEN 
    166          ! Activate finer control of report outputs 
    167          ! optionally switch off output from selected areas (note this only 
    168          ! applies to output which does not involve global communications) 
    169          IF( ( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax  ) .OR. & 
    170            & ( MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 ) )    & 
    171            &   CALL nemo_set_cfctl( sn_cfctl, .FALSE., .FALSE. ) 
    172       ELSE 
    173          ! turn off all options. 
    174          CALL nemo_set_cfctl( sn_cfctl, .FALSE., .TRUE. ) 
    175       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. ) 
    176162      ! 
    177163      lwp = (narea == 1) .OR. sn_cfctl%l_oceout    ! control of all listing output print 
     
    270256         WRITE(numout,*) '~~~~~~~~' 
    271257         WRITE(numout,*) '   Namelist namctl' 
    272          WRITE(numout,*) '                              sn_cfctl%l_allon   = ', sn_cfctl%l_allon 
    273          WRITE(numout,*) '       finer control over o/p sn_cfctl%l_config  = ', sn_cfctl%l_config 
    274258         WRITE(numout,*) '                              sn_cfctl%l_runstat = ', sn_cfctl%l_runstat 
    275259         WRITE(numout,*) '                              sn_cfctl%l_trcstat = ', sn_cfctl%l_trcstat 
     
    409393   END SUBROUTINE nemo_alloc 
    410394 
    411    SUBROUTINE nemo_set_cfctl(sn_cfctl, setto, for_all ) 
     395   SUBROUTINE nemo_set_cfctl(sn_cfctl, setto ) 
    412396      !!---------------------------------------------------------------------- 
    413397      !!                     ***  ROUTINE nemo_set_cfctl  *** 
    414398      !! 
    415399      !! ** Purpose :   Set elements of the output control structure to setto. 
    416       !!                for_all should be .false. unless all areas are to be 
    417       !!                treated identically. 
    418400      !! 
    419401      !! ** Method  :   Note this routine can be used to switch on/off some 
    420       !!                types of output for selected areas but any output types 
    421       !!                that involve global communications (e.g. mpp_max, glob_sum) 
    422       !!                should be protected from selective switching by the 
    423       !!                for_all argument 
    424       !!---------------------------------------------------------------------- 
    425       LOGICAL :: setto, for_all 
    426       TYPE(sn_ctl) :: sn_cfctl 
    427       !!---------------------------------------------------------------------- 
    428       IF( for_all ) THEN 
    429          sn_cfctl%l_runstat = setto 
    430          sn_cfctl%l_trcstat = setto 
    431       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 
    432409      sn_cfctl%l_oceout  = setto 
    433410      sn_cfctl%l_layout  = setto 
  • NEMO/branches/2020/r12581_ticket2418/src/SAS/nemogcm.F90

    r12684 r12835  
    276276      ! 
    277277      ! finalize the definition of namctl variables 
    278       IF( sn_cfctl%l_allon ) THEN 
    279          ! Turn on all options. 
    280          CALL nemo_set_cfctl( sn_cfctl, .TRUE., .TRUE. ) 
    281          ! Ensure all processors are active 
    282          sn_cfctl%procmin = 0 ; sn_cfctl%procmax = 1000000 ; sn_cfctl%procincr = 1 
    283       ELSEIF( sn_cfctl%l_config ) THEN 
    284          ! Activate finer control of report outputs 
    285          ! optionally switch off output from selected areas (note this only 
    286          ! applies to output which does not involve global communications) 
    287          IF( ( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax  ) .OR. & 
    288            & ( MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 ) )    & 
    289            &   CALL nemo_set_cfctl( sn_cfctl, .FALSE., .FALSE. ) 
    290       ELSE 
    291          ! turn off all options. 
    292          CALL nemo_set_cfctl( sn_cfctl, .FALSE., .TRUE. ) 
    293       ENDIF 
     278      IF( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax .OR. MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 )   & 
     279         &   CALL nemo_set_cfctl( sn_cfctl, .FALSE. ) 
    294280      ! 
    295281      lwp = (narea == 1) .OR. sn_cfctl%l_oceout    ! control of all listing output print 
     
    409395         WRITE(numout,*) '~~~~~~~~' 
    410396         WRITE(numout,*) '   Namelist namctl' 
    411          WRITE(numout,*) '                              sn_cfctl%l_allon   = ', sn_cfctl%l_allon 
    412          WRITE(numout,*) '       finer control over o/p sn_cfctl%l_config  = ', sn_cfctl%l_config 
    413397         WRITE(numout,*) '                              sn_cfctl%l_runstat = ', sn_cfctl%l_runstat 
    414398         WRITE(numout,*) '                              sn_cfctl%l_trcstat = ', sn_cfctl%l_trcstat 
     
    552536   END SUBROUTINE nemo_alloc 
    553537 
    554    SUBROUTINE nemo_set_cfctl(sn_cfctl, setto, for_all ) 
     538   SUBROUTINE nemo_set_cfctl(sn_cfctl, setto ) 
    555539      !!---------------------------------------------------------------------- 
    556540      !!                     ***  ROUTINE nemo_set_cfctl  *** 
    557541      !! 
    558542      !! ** Purpose :   Set elements of the output control structure to setto. 
    559       !!                for_all should be .false. unless all areas are to be 
    560       !!                treated identically. 
    561543      !! 
    562544      !! ** Method  :   Note this routine can be used to switch on/off some 
    563       !!                types of output for selected areas but any output types 
    564       !!                that involve global communications (e.g. mpp_max, glob_sum) 
    565       !!                should be protected from selective switching by the 
    566       !!                for_all argument 
    567       !!---------------------------------------------------------------------- 
    568       LOGICAL :: setto, for_all 
    569       TYPE(sn_ctl) :: sn_cfctl 
    570       !!---------------------------------------------------------------------- 
    571       IF( for_all ) THEN 
    572          sn_cfctl%l_runstat = setto 
    573          sn_cfctl%l_trcstat = setto 
    574       ENDIF 
     545      !!                types of output for selected areas. 
     546      !!---------------------------------------------------------------------- 
     547      TYPE(sn_ctl), INTENT(inout) :: sn_cfctl 
     548      LOGICAL     , INTENT(in   ) :: setto 
     549      !!---------------------------------------------------------------------- 
     550      sn_cfctl%l_runstat = setto 
     551      sn_cfctl%l_trcstat = setto 
    575552      sn_cfctl%l_oceout  = setto 
    576553      sn_cfctl%l_layout  = setto 
  • NEMO/branches/2020/r12581_ticket2418/tests/STATION_ASF/MY_SRC/nemogcm.F90

    r12655 r12835  
    184184      ! 
    185185      ! finalize the definition of namctl variables 
    186       IF( sn_cfctl%l_allon ) THEN 
    187          ! Turn on all options. 
    188          CALL nemo_set_cfctl( sn_cfctl, .TRUE., .TRUE. ) 
    189          ! Ensure all processors are active 
    190          sn_cfctl%procmin = 0 ; sn_cfctl%procmax = 1000000 ; sn_cfctl%procincr = 1 
    191       ELSEIF( sn_cfctl%l_config ) THEN 
    192          ! Activate finer control of report outputs 
    193          ! optionally switch off output from selected areas (note this only 
    194          ! applies to output which does not involve global communications) 
    195          IF( ( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax  ) .OR. & 
    196            & ( MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 ) )    & 
    197            &   CALL nemo_set_cfctl( sn_cfctl, .FALSE., .FALSE. ) 
    198       ELSE 
    199          ! turn off all options. 
    200          CALL nemo_set_cfctl( sn_cfctl, .FALSE., .TRUE. ) 
    201       ENDIF 
     186      IF( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax .OR. MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 )   & 
     187         &   CALL nemo_set_cfctl( sn_cfctl, .FALSE. ) 
    202188      ! 
    203189      lwp = (narea == 1) .OR. sn_cfctl%l_oceout    ! control of all listing output print 
     
    308294         WRITE(numout,*) '~~~~~~~~' 
    309295         WRITE(numout,*) '   Namelist namctl' 
    310          WRITE(numout,*) '                              sn_cfctl%l_allon   = ', sn_cfctl%l_allon 
    311          WRITE(numout,*) '       finer control over o/p sn_cfctl%l_config  = ', sn_cfctl%l_config 
    312296         WRITE(numout,*) '                              sn_cfctl%l_runstat = ', sn_cfctl%l_runstat 
    313297         WRITE(numout,*) '                              sn_cfctl%l_trcstat = ', sn_cfctl%l_trcstat 
     
    445429 
    446430    
    447    SUBROUTINE nemo_set_cfctl(sn_cfctl, setto, for_all ) 
     431   SUBROUTINE nemo_set_cfctl(sn_cfctl, setto ) 
    448432      !!---------------------------------------------------------------------- 
    449433      !!                     ***  ROUTINE nemo_set_cfctl  *** 
    450434      !! 
    451435      !! ** Purpose :   Set elements of the output control structure to setto. 
    452       !!                for_all should be .false. unless all areas are to be 
    453       !!                treated identically. 
    454436      !! 
    455437      !! ** Method  :   Note this routine can be used to switch on/off some 
    456       !!                types of output for selected areas but any output types 
    457       !!                that involve global communications (e.g. mpp_max, glob_sum) 
    458       !!                should be protected from selective switching by the 
    459       !!                for_all argument 
    460       !!---------------------------------------------------------------------- 
    461       LOGICAL :: setto, for_all 
    462       TYPE(sn_ctl) :: sn_cfctl 
    463       !!---------------------------------------------------------------------- 
    464       IF( for_all ) THEN 
    465          sn_cfctl%l_runstat = setto 
    466          sn_cfctl%l_trcstat = setto 
    467       ENDIF 
     438      !!                types of output for selected areas. 
     439      !!---------------------------------------------------------------------- 
     440      TYPE(sn_ctl), INTENT(inout) :: sn_cfctl 
     441      LOGICAL     , INTENT(in   ) :: setto 
     442      !!---------------------------------------------------------------------- 
     443      sn_cfctl%l_runstat = setto 
     444      sn_cfctl%l_trcstat = setto 
    468445      sn_cfctl%l_oceout  = setto 
    469446      sn_cfctl%l_layout  = setto 
Note: See TracChangeset for help on using the changeset viewer.