Changeset 3028 for branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90

Timestamp:

2011-10-31T09:42:39+01:00 (12 years ago)

Author:

cetlod

Message:

branch dev_LOCEAN_2011 : minor changes in TOP component relative to the management of additional diagnostics

File:

• branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90 (modified) (5 diffs)

branches/2011/dev_LOCEAN_2011/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90

@@ -57 +57 @@
       !!---------------------------------------------------------------------
       USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: zw2d  => wrk_2d_1, zwork => wrk_3d_2
+      USE wrk_nemo, ONLY: zwork => wrk_3d_2, ztra => wrk_3d_3
+      USE wrk_nemo, ONLY: zw2d  => wrk_2d_1
       !!
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
       !!
       INTEGER  ::   ji, jj, jk, jl, ierr
-      REAL(wp) ::   ztra, ze3t
       REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::  ztrbio
       CHARACTER (len=25) :: charout
@@ -73 +73 @@
       ENDIF
 
-      IF( wrk_in_use(2, 1) .OR. wrk_in_use(3, 2) ) THEN
+      IF( wrk_in_use(2, 1) .OR. wrk_in_use(3, 2,3) ) THEN
          CALL ctl_stop('trc_sed : requested workspace arrays unavailable.')  ;  RETURN
       END IF
@@ -85 +85 @@
       ENDIF
 
-      IF( ln_diatrc .AND. lk_iomput )  zw2d(:,:) = 0.
+      IF( ln_diatrc )  zw2d(:,:) = 0.
 
       ! sedimentation of detritus  : upstream scheme
@@ -103 +103 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               ztra  = - ( zwork(ji,jj,jk) - zwork(ji,jj,jk+1) ) / fse3t(ji,jj,jk)
-               tra(ji,jj,jk,jp_lob_det) = tra(ji,jj,jk,jp_lob_det) + ztra
-               !
-               IF( ln_diabio )  trbio(ji,jj,jk,jp_lob0_trd + 7) = ztra
-               IF( ln_diatrc ) THEN
-                  ze3t = ztra * fse3t(ji,jj,jk) * 86400.
-                  IF( lk_iomput ) THEN   ;  zw2d(ji,jj) = zw2d(ji,jj) + ze3t 
-                  ELSE                   ;  trc2d(ji,jj,jp_lob0_2d + 7) = trc2d(ji,jj,jp_lob0_2d + 7) + ze3t
-                  ENDIF
-               ENDIF
-               !
+               ztra(ji,jj,jk)  = - ( zwork(ji,jj,jk) - zwork(ji,jj,jk+1) ) / fse3t(ji,jj,jk)
+               tra(ji,jj,jk,jp_lob_det) = tra(ji,jj,jk,jp_lob_det) + ztra(ji,jj,jk) 
             END DO
          END DO
       END DO
 
-      IF( ln_diatrc .AND. lk_iomput )  CALL iom_put( "TDETSED", zw2d )
-
+      IF( ln_diatrc ) THEN 
+         zw2d(:,:) = 0.
+         DO jk = 1, jpkm1
+            DO jj = 1, jpj
+               DO ji = 1, jpi
+                  zw2d(ji,jj) = zw2d(ji,jj) + ztra(ji,jj,jk) * fse3t(ji,jj,jk) * 86400.
+               END DO
+            END DO
+         END DO
+         IF( lk_iomput )  THEN
+           CALL iom_put( "TDETSED", zw2d )
+         ELSE
+           trc2d(:,:,jp_lob0_2d + 7) = zw2d(:,:)
+         ENDIF
+      ENDIF
+      !
+      IF( ln_diabio )  trbio(:,:,:,jp_lob0_trd + 7) = ztra(:,:,:)
+      !
       IF( l_trdtrc ) THEN
          ztrbio(:,:,:) = tra(:,:,:,jp_lob_det) - ztrbio(:,:,:)
@@ -133 +140 @@
       ENDIF
 
-      IF( ( wrk_not_released(2, 1) ) .OR. ( wrk_not_released(3, 2) ) )  &
+      IF( ( wrk_not_released(2, 1) ) .OR. ( wrk_not_released(3, 2,3) ) )  &
        &         CALL ctl_stop('trc_sed : failed to release workspace arrays.')