Changeset 12555 for branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/TOP_SRC

Timestamp:

2020-03-13T17:33:02+01:00 (4 years ago)

Author:

charris

Message:

Changes from GO6 package branch (GMED ticket 450):

svn merge -r 11035:11101 ​svn+ssh://charris@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/dev_r5518_GO6_package

Location:

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/TOP_SRC

Files:

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

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -119 +119 @@
       CALL trc_ice_ini                                 ! Tracers in sea ice
 
-      IF( ln_ctl ) THEN
-         !
-         IF (narea == 1) THEN  
-            ! The tracer.stat file only contains global tracer sum values, if 
-            ! it contains anything at all. Hence it only needs to be opened 
-            ! and written to on the master PE, not on all PEs.  
-            CALL ctl_opn( numstr, 'tracer.stat', 'REPLACE','FORMATTED',  & 
-                          'SEQUENTIAL', -1, numout, lwp , narea ) 
-         ENDIF  
-         !
-      ENDIF
+      !
+      IF (lwm .AND. sn_cfctl%l_trcstat) THEN  
+         ! The tracer.stat file only contains global tracer sum values, if 
+         ! it contains anything at all. Hence it only needs to be opened 
+         ! and written to on the master PE, not on all PEs.  
+         CALL ctl_opn( numstr, 'tracer.stat', 'REPLACE','FORMATTED',  & 
+                       'SEQUENTIAL', -1, numout, lwp , narea ) 
+      ENDIF  
+      !
 
       IF( ln_trcdta ) THEN

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/TOP_SRC/trcstp.F90

@@ -62 +62 @@
       INTEGER               ::  jk, jn  ! dummy loop indices
       REAL(wp)              ::  ztrai
+      LOGICAL ::   ll_trcstat ! local logical
       CHARACTER (len=25)    ::  charout 
       !!-------------------------------------------------------------------
@@ -67 +68 @@
       IF( nn_timing == 1 )   CALL timing_start('trc_stp')
       !
+      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
       !
@@ -120 +123 @@
       ENDIF
       !
-      IF (ln_ctl) THEN 
+      IF (ll_trcstat) THEN 
          ! The following code is very expensive since it involves multiple 
          ! reproducible global sums over all tracer fields and is potentially