Changeset 10570 for NEMO/trunk/src/TOP

Timestamp:

2019-01-24T16:14:49+01:00 (5 years ago)

Author:

acc

Message:

Trunk update to implement finer control over the choice of text report files generated. See ticket: #2167

Location:

NEMO/trunk/src/TOP

Files:

• prtctl_trc.F90 (modified) (2 diffs)
• trcini.F90 (modified) (1 diff)
• trcstp.F90 (modified) (3 diffs)

NEMO/trunk/src/TOP/prtctl_trc.F90

@@ -210 +210 @@
          sind = narea
          eind = narea
-         clb_name = "('mpp.top.output_',I3.3)"
+         clb_name = "('mpp.top.output_',I4.4)"
          cl_run = 'MULTI processor run'
          ! use indices for each area computed by mpp_init subroutine
@@ -229 +229 @@
          sind = 1
          eind = ijsplt
-         clb_name = "('mono.top.output_',I3.3)"
+         clb_name = "('mono.top.output_',I4.4)"
          cl_run   = 'MONO processor run '
          ! compute indices for each area as done in mpp_init subroutine

NEMO/trunk/src/TOP/trcini.F90

@@ -72 +72 @@
       CALL trc_ice_ini   ! Tracers in sea ice
       !
-      IF(lwm) CALL ctl_opn( numstr, 'tracer.stat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp , narea )
+      IF( lwm .AND. sn_cfctl%l_trcstat ) THEN
+         CALL ctl_opn( numstr, 'tracer.stat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp , narea )
+      ENDIF
       !
       CALL trc_ini_state  !  passive tracers initialisation : from a restart or from clim

NEMO/trunk/src/TOP/trcstp.F90

@@ -57 +57 @@
       INTEGER ::   jk, jn   ! dummy loop indices
       REAL(wp)::   ztrai    ! local scalar
+      LOGICAL ::   ll_trcstat ! local logical
       CHARACTER (len=25) ::   charout   !
       !!-------------------------------------------------------------------
@@ -68 +69 @@
       ENDIF
       !
+      ll_trcstat  = ( ln_ctl .OR. sn_cfctl%l_trcstat ) .AND. &
+     &              ( ( MOD( kt, sn_cfctl%ptimincr ) == 0 ) .OR. ( kt == nitend ) )
       IF( kt == nittrc000 .AND. lk_trdmxl_trc )  CALL trd_mxl_trc_init    ! trends: Mixed-layer
       !
@@ -109 +112 @@
       ENDIF
       !
-      IF (ln_ctl ) THEN
+      IF (ll_trcstat) THEN
          ztrai = 0._wp                                                   !  content of all tracers
          DO jn = 1, jptra