Changeset 12933 for NEMO/trunk/src/OFF


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/OFF/nemogcm.F90

    r12843 r12933  
    9292      !!              Madec, 2008, internal report, IPSL. 
    9393      !!---------------------------------------------------------------------- 
    94       INTEGER :: istp, indic       ! time step index 
     94      INTEGER :: istp       ! time step index 
    9595      !!---------------------------------------------------------------------- 
    9696 
     
    132132         IF( .NOT.ln_linssh )   CALL dta_dyn_sf_interp( istp, Nnn )  ! calculate now grid parameters 
    133133#endif 
    134                                 CALL stp_ctl    ( istp, indic )  ! Time loop: control and print 
     134                                CALL stp_ctl    ( istp )             ! Time loop: control and print 
    135135         istp = istp + 1 
    136136      END DO 
     
    229229      ! 
    230230      ! finalize the definition of namctl variables 
    231       IF( sn_cfctl%l_allon ) THEN 
    232          ! Turn on all options. 
    233          CALL nemo_set_cfctl( sn_cfctl, .TRUE., .TRUE. ) 
    234          ! Ensure all processors are active 
    235          sn_cfctl%procmin = 0 ; sn_cfctl%procmax = 1000000 ; sn_cfctl%procincr = 1 
    236       ELSEIF( sn_cfctl%l_config ) THEN 
    237          ! Activate finer control of report outputs 
    238          ! optionally switch off output from selected areas (note this only 
    239          ! applies to output which does not involve global communications) 
    240          IF( ( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax  ) .OR. & 
    241            & ( MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 ) )    & 
    242            &   CALL nemo_set_cfctl( sn_cfctl, .FALSE., .FALSE. ) 
    243       ELSE 
    244          ! turn off all options. 
    245          CALL nemo_set_cfctl( sn_cfctl, .FALSE., .TRUE. ) 
    246       ENDIF 
     231      IF( narea < sn_cfctl%procmin .OR. narea > sn_cfctl%procmax .OR. MOD( narea - sn_cfctl%procmin, sn_cfctl%procincr ) /= 0 )   & 
     232         &   CALL nemo_set_cfctl( sn_cfctl, .FALSE. ) 
    247233      ! 
    248234      lwp = (narea == 1) .OR. sn_cfctl%l_oceout    ! control of all listing output print 
     
    373359         WRITE(numout,*) '~~~~~~~~' 
    374360         WRITE(numout,*) '   Namelist namctl' 
    375          WRITE(numout,*) '                              sn_cfctl%l_glochk  = ', sn_cfctl%l_glochk 
    376          WRITE(numout,*) '                              sn_cfctl%l_allon   = ', sn_cfctl%l_allon 
    377          WRITE(numout,*) '       finer control over o/p sn_cfctl%l_config  = ', sn_cfctl%l_config 
    378361         WRITE(numout,*) '                              sn_cfctl%l_runstat = ', sn_cfctl%l_runstat 
    379362         WRITE(numout,*) '                              sn_cfctl%l_trcstat = ', sn_cfctl%l_trcstat 
     
    511494   END SUBROUTINE nemo_alloc 
    512495 
    513    SUBROUTINE nemo_set_cfctl(sn_cfctl, setto, for_all ) 
     496   SUBROUTINE nemo_set_cfctl(sn_cfctl, setto ) 
    514497      !!---------------------------------------------------------------------- 
    515498      !!                     ***  ROUTINE nemo_set_cfctl  *** 
    516499      !! 
    517500      !! ** Purpose :   Set elements of the output control structure to setto. 
    518       !!                for_all should be .false. unless all areas are to be 
    519       !!                treated identically. 
    520       !! 
     501     !! 
    521502      !! ** Method  :   Note this routine can be used to switch on/off some 
    522       !!                types of output for selected areas but any output types 
    523       !!                that involve global communications (e.g. mpp_max, glob_sum) 
    524       !!                should be protected from selective switching by the 
    525       !!                for_all argument 
    526       !!---------------------------------------------------------------------- 
    527       LOGICAL :: setto, for_all 
    528       TYPE(sn_ctl) :: sn_cfctl 
    529       !!---------------------------------------------------------------------- 
    530       IF( for_all ) THEN 
    531          sn_cfctl%l_runstat = setto 
    532          sn_cfctl%l_trcstat = setto 
    533       ENDIF 
     503      !!                types of output for selected areas. 
     504      !!---------------------------------------------------------------------- 
     505      TYPE(sn_ctl), INTENT(inout) :: sn_cfctl 
     506      LOGICAL     , INTENT(in   ) :: setto 
     507      !!---------------------------------------------------------------------- 
     508      sn_cfctl%l_runstat = setto 
     509      sn_cfctl%l_trcstat = setto 
    534510      sn_cfctl%l_oceout  = setto 
    535511      sn_cfctl%l_layout  = setto 
     
    561537 
    562538 
    563    SUBROUTINE stp_ctl( kt, kindic ) 
     539   SUBROUTINE stp_ctl( kt ) 
    564540      !!---------------------------------------------------------------------- 
    565541      !!                    ***  ROUTINE stp_ctl  *** 
     
    572548      !!---------------------------------------------------------------------- 
    573549      INTEGER, INTENT(in   ) ::   kt      ! ocean time-step index 
    574       INTEGER, INTENT(inout) ::   kindic  ! indicator of solver convergence 
    575550      !!---------------------------------------------------------------------- 
    576551      ! 
Note: See TracChangeset for help on using the changeset viewer.