Changeset 2819 for branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90

Timestamp:

2011-08-09T10:29:53+02:00 (13 years ago)

Author:

cetlod

Message:

Improvment of branch dev_r2787_LOCEAN3_TRA_TRP

File:

• branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcsed.F90 (modified) (6 diffs)

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

@@ -57 +57 @@
       !!---------------------------------------------------------------------
       USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released
-      USE wrk_nemo, ONLY: zwork => wrk_3d_2
-      USE wrk_nemo, ONLY: zw2d  => wrk_2d_1 ! only used (if defined 
-                                            ! key_diatrc && defined key_iomput)
+      USE wrk_nemo, ONLY: zw2d  => wrk_2d_1, zwork => wrk_3d_2
       !!
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
       !!
-      INTEGER  ::   ji, jj, jk, jl
-      REAL(wp) ::   ztra
-      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::   ztrbio
+      INTEGER  ::   ji, jj, jk, jl, ierr
+      REAL(wp) ::   ztra, ze3t
+      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::  ztrbio
       CHARACTER (len=25) :: charout
       !!---------------------------------------------------------------------
-
-      IF( ( wrk_in_use(3,2)) .OR. ( wrk_in_use(2,1)) ) THEN
-         CALL ctl_stop('trc_sed : requested workspace arrays unavailable.')
-         RETURN
-      END IF
 
       IF( kt == nit000 ) THEN
@@ -80 +73 @@
       ENDIF
 
+      IF( wrk_in_use(2, 1) .OR. wrk_in_use(3, 2) ) THEN
+         CALL ctl_stop('trc_sed : requested workspace arrays unavailable.')  ;  RETURN
+      END IF
+
+      IF( l_trdtrc )  THEN
+         ALLOCATE( ztrbio(jpi,jpj,jpk) , STAT = ierr )   ! temporary save of trends
+         IF( ierr > 0 ) THEN
+            CALL ctl_stop( 'trc_sed: unable to allocate ztrbio array' )   ;   RETURN
+         ENDIF
+         ztrbio(:,:,:) = tra(:,:,:,jp_lob_det)
+      ENDIF
+
+      IF( ln_diatrc .AND. lk_iomput )  zw2d(:,:) = 0.
+
       ! sedimentation of detritus  : upstream scheme
       ! --------------------------------------------
@@ -86 +93 @@
       zwork(:,:,1  ) = 0.e0      ! surface value set to zero
       zwork(:,:,jpk) = 0.e0      ! bottom value  set to zero
-
-#if defined key_diatrc && defined key_iomput
-      zw2d(:,:) = 0.
-# endif
-
-      IF( l_trdtrc )THEN
-         ALLOCATE( ztrbio(jpi,jpj,jpk) )
-         ztrbio(:,:,:) = tra(:,:,:,jp_lob_det)
-      ENDIF
 
       ! tracer flux at w-point: we use -vsed (downward flux)  with simplification : no e1*e2
@@ -104 +102 @@
       DO jk = 1, jpkm1
          DO jj = 1, jpj
-            DO ji = 1,jpi
+            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 defined key_diabio
-               trbio(ji,jj,jk,jp_lob0_trd + 7) = ztra
-#endif
-#if defined key_diatrc
-# if ! defined key_iomput
-               trc2d(ji,jj,jp_lob0_2d + 7) = trc2d(ji,jj,jp_lob0_2d + 7) + ztra * fse3t(ji,jj,jk) * 86400.
-# else
-               zw2d(ji,jj) = zw2d(ji,jj) + ztra * fse3t(ji,jj,jk) * 86400.
-# endif
-#endif
+               !
+               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
+               !
             END DO
          END DO
       END DO
 
-#if defined key_diabio
-      jl = jp_lob0_trd + 7
-      CALL lbc_lnk (trbio(:,:,1,jl), 'T', 1. )    ! Lateral boundary conditions on trcbio
-#endif
-#if defined key_diatrc
-# if ! defined key_iomput
-      jl = jp_lob0_2d + 7
-      CALL lbc_lnk( trc2d(:,:,jl), 'T', 1. )      ! Lateral boundary conditions on trc2d
-# else
-      CALL lbc_lnk( zw2d(:,:), 'T', 1. )      ! Lateral boundary conditions on zw2d
-      CALL iom_put( "TDETSED", zw2d )
-# endif
-#endif
-      !
+      IF( ln_diatrc .AND. lk_iomput )  CALL iom_put( "TDETSED", zw2d )
 
       IF( l_trdtrc ) THEN
@@ -140 +124 @@
          jl = jp_lob0_trd + 7
          CALL trd_mod_trc( ztrbio, jl, kt )   ! handle the trend
+         DEALLOCATE( ztrbio ) 
       ENDIF
-
-      IF( l_trdtrc ) DEALLOCATE( ztrbio )
 
       IF(ln_ctl)   THEN  ! print mean trends (used for debugging)
@@ -150 +133 @@
       ENDIF
 
-      IF( ( wrk_not_released(3, 2) ) .OR. ( wrk_not_released(2, 1) ) )  &
+      IF( ( wrk_not_released(2, 1) ) .OR. ( wrk_not_released(3, 2) ) )  &
        &         CALL ctl_stop('trc_sed : failed to release workspace arrays.')