Changeset 4617 for branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90

Timestamp:

2014-04-06T17:47:31+02:00 (10 years ago)

Author:

gm

Message:

#1260 : TOP fixes, see the associated wiki page for explanation

File:

• branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90 (modified) (8 diffs)

branches/2014/dev_CNRS0_NOC1_LDF/NEMOGCM/NEMO/TOP_SRC/PISCES/P2Z/p2zsed.F90

@@ -41 +41 @@
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
-
 CONTAINS
 
@@ -62 +61 @@
       !!              trend of passive tracers is saved for futher diagnostics.
       !!---------------------------------------------------------------------
-      !!
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
       !!
@@ -78 +76 @@
          IF(lwp) WRITE(numout,*) ' ~~~~~~~'
       ENDIF
-
-      ! Allocate temporary workspace
-                       CALL wrk_alloc( jpi, jpj, jpk, zwork, ztra )
-      IF( ln_diatrc )  CALL wrk_alloc( jpi, jpj, zw2d )
+      !
+      CALL wrk_alloc( jpi, jpj, jpk, zwork, ztra )
+      !
       IF( l_trdtrc ) THEN
          CALL wrk_alloc( jpi, jpj, jpk, ztrbio )
@@ -110 +107 @@
 
       IF( ln_diatrc ) THEN 
-         DO jk = 1, jpkm1
+         CALL wrk_alloc( jpi, jpj, zw2d )
+         zw2d(:,:) = ztra(:,:,1) * fse3t(:,:,1) * 86400.
+         DO jk = 2, jpkm1
             zw2d(:,:) = zw2d(:,:) + ztra(:,:,jk) * fse3t(:,:,jk) * 86400.
          END DO
@@ -121 +120 @@
       ENDIF
       !
-      IF( ln_diabio )  trbio(:,:,:,jp_pcs0_trd + 7) = ztra(:,:,:)
+      IF( ln_diabio .AND. .NOT.lk_iomput )  trbio(:,:,:,jp_pcs0_trd + 7) = ztra(:,:,:)
       CALL wrk_dealloc( jpi, jpj, jpk, zwork, ztra )
       !
@@ -130 +129 @@
          CALL wrk_dealloc( jpi, jpj, jpk, ztrbio )
       ENDIF
-
+      !
       IF(ln_ctl)   THEN  ! print mean trends (used for debugging)
          WRITE(charout, FMT="('sed')")
@@ -141 +140 @@
    END SUBROUTINE p2z_sed
 
+
    SUBROUTINE p2z_sed_init
       !!----------------------------------------------------------------------
@@ -150 +150 @@
       !!
       !!----------------------------------------------------------------------
+      INTEGER ::   ios   ! Local integer
+      !
       NAMELIST/namlobsed/ sedlam, sedlostpoc, vsed, xhr
-      INTEGER :: ios                 ! Local integer output status for namelist read
-
+      !!----------------------------------------------------------------------
+      !
       REWIND( numnatp_ref )              ! Namelist namlobsed in reference namelist : Lobster sediments
       READ  ( numnatp_ref, namlobsed, IOSTAT = ios, ERR = 901)
 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namlosed in reference namelist', lwp )
-
+      !
       REWIND( numnatp_cfg )              ! Namelist namlobsed in configuration namelist : Lobster sediments
       READ  ( numnatp_cfg, namlobsed, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namlobsed in configuration namelist', lwp )
       WRITE ( numonp, namlobsed )
-
+      !
       IF(lwp) THEN
           WRITE(numout,*) ' Namelist namlobsed'