Changeset 7709 for branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC

Timestamp:

2017-02-21T16:46:07+01:00 (7 years ago)

Author:

jpalmier

Message:

JPALM -- 21-02-2017 -- merge the branch with Richard optim branch, and add 2 fixes in trcnam_medusa

Location:

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC

Files:

• MEDUSA/trcnam_medusa.F90 (modified) (2 diffs)
• trc.F90 (modified) (1 diff)
• trcini.F90 (modified) (1 diff)
• trcstp.F90 (modified) (2 diffs)

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcnam_medusa.F90

@@ -239 +239 @@
 !!
       jliebig     = 0
+      jq10        = 0.
       xnln        = 0.
       xnld        = 0.
@@ -343 +344 @@
       jdms        = 0
       jdms_input  = 0
-      jdms_input  = 3
+      jdms_model  = 0
             
       !REWIND(numnatm)

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trc.F90

@@ -26 +26 @@
    INTEGER, PUBLIC                                                 ::   numnat_cfg = -1   !: logical unit for the reference passive tracer namelist_top_cfg
    INTEGER, PUBLIC                                                 ::   numont     = -1   !: logical unit for the reference passive tracer namelist output output.namelist.top
-   INTEGER, PUBLIC                                                 ::   numstr        !: logical unit for tracer statistics
+   INTEGER, PUBLIC                                                 ::   numstr     = -1   !: logical unit for tracer statistics
    INTEGER, PUBLIC                                                 ::   numrtr        !: logical unit for trc restart (read )
    INTEGER, PUBLIC                                                 ::   numrtw        !: logical unit for trc restart ( write )

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -123 +123 @@
 # endif
 
-      IF( lwp ) THEN
+      IF( ln_ctl ) THEN
          !
-         CALL ctl_opn( numstr, 'tracer.stat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp , narea )
+         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

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/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
@@ -129 +132 @@
       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 (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( lwp ) WRITE(numstr,9300) kt,  ztrai / areatot
+9300     FORMAT(i10,e18.10)
+      ENDIF
       !
       IF( nn_timing == 1 )   CALL timing_stop('trc_stp')