Changeset 8201 for branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/TOP_SRC/trcstp.F90

Timestamp:

2017-06-21T16:27:21+02:00 (7 years ago)

Author:

frrh

Message:

Merge MEDUSA branch using command:

svn merge -r 5711:8182 \u200b\u200bsvn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/NERC/dev_r5518_NOC_MEDUSA_Stable

and run "fcm conflicts" to resolve conflicts - mainly tree conflicts in AGRIF files.

File:

• branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/TOP_SRC/trcstp.F90 (modified) (4 diffs)

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

@@ -55 +55 @@
       !!              Update the passive tracers
       !!-------------------------------------------------------------------
+
+      USE dom_oce, ONLY: narea
+
       INTEGER, INTENT( in ) ::  kt      ! ocean time-step index
       INTEGER               ::  jk, jn  ! dummy loop indices
@@ -87 +90 @@
          tra(:,:,:,:) = 0.e0
          !
+# if defined key_debug_medusa
+         IF(lwp) WRITE(numout,*) ' MEDUSA trc_stp begins at kt =', kt
+         CALL flush(numout)
+# endif
                                    CALL trc_rst_opn  ( kt )       ! Open tracer restart file 
+# if defined key_debug_medusa
+                                   CALL trc_rst_stat 
+                                   CALL trc_rst_tra_stat
+# endif
          IF( lrst_trc )            CALL trc_rst_cal  ( kt, 'WRITE' )   ! calendar
          IF( lk_iomput ) THEN  ;   CALL trc_wri      ( kt )       ! output of passive tracers with iom I/O manager
@@ -93 +104 @@
          ENDIF
                                    CALL trc_sms      ( kt )       ! tracers: sinks and sources
+# if defined key_debug_medusa
+         IF(lwp) WRITE(numout,*) ' MEDUSA trc_stp SMS complete at kt =', kt
+         CALL trc_rst_stat
+         CALL trc_rst_tra_stat
+         CALL flush(numout)
+# endif
                                    CALL trc_trp      ( kt )       ! transport of passive tracers
+# if defined key_debug_medusa
+         IF(lwp) WRITE(numout,*) ' MEDUSA trc_stp transport complete at kt =', kt
+         CALL trc_rst_stat
+         CALL trc_rst_tra_stat
+         CALL flush(numout)
+# endif
          IF( kt == nittrc000 ) THEN
             CALL iom_close( numrtr )       ! close input tracer restart file
@@ -102 +125 @@
          !
          IF( nn_dttrc /= 1   )     CALL trc_sub_reset( kt )       ! resetting physical variables when sub-stepping
-         !
-      ENDIF
-      !
-      ztrai = 0._wp                                                   !  content of all tracers
-      DO jn = 1, jptra
-         ztrai = ztrai + glob_sum( trn(:,:,:,jn) * cvol(:,:,:)   )
-      END DO
-      IF( lwp ) WRITE(numstr,9300) kt,  ztrai / areatot
-9300  FORMAT(i10,e18.10)
+# if defined key_debug_medusa
+         IF(lwp) WRITE(numout,*) ' MEDUSA trc_stp ends at kt =', kt
+         CALL flush(numout)
+# endif
+         !
+      ENDIF
+      !
+      IF (ln_ctl) THEN 
+         ! The following code is very expensive since it involves multiple 
+         ! reproducible global sums over all tracer fields and is potentially  
+         ! called on every timestep. The results it produces are purely for 
+         ! informational purposes and do not affect model evolution. 
+         ! Hence we restrict its use by protecting it with the ln_ctl RTL 
+         ! which should normally only be used under debugging conditions 
+         ! and not in operational runs. We also need to restrict output  
+         ! to the master PE since there's no point duplicating the same results 
+         ! on all processors.    
+         ztrai = 0._wp                                                   !  content of all tracers
+         DO jn = 1, jptra
+            ztrai = ztrai + glob_sum( trn(:,:,:,jn) * cvol(:,:,:)   )
+         END DO
+         IF( numstr /= -1 ) WRITE(numstr,9300) kt,  ztrai / areatot
+9300     FORMAT(i10,e18.10)
+      ENDIF
       !
       IF( nn_timing == 1 )   CALL timing_stop('trc_stp')