Changeset 2819 for branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.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/trcexp.F90 (modified) (5 diffs)

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

@@ -53 +53 @@
       !!              COLUMN BELOW THE SURFACE LAYER.
       !!---------------------------------------------------------------------
+      !!
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
       !!
-      INTEGER  ::   ji, jj, jk, jl, ikt
+      INTEGER  ::   ji, jj, jk, jl, ikt, ierr
       REAL(wp) ::   zgeolpoc, zfact, zwork, ze3t, zsedpocd
-      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::   ztrbio
+      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::  ztrbio
       CHARACTER (len=25) :: charout
       !!---------------------------------------------------------------------
@@ -67 +68 @@
       ENDIF
 
+      IF( l_trdtrc )  THEN
+         ALLOCATE( ztrbio(jpi,jpj,jpk) , STAT = ierr )   ! temporary save of trends
+         IF( ierr > 0 ) THEN
+            CALL ctl_stop( 'trc_exp: unable to allocate ztrbio array' )   ;   RETURN
+         ENDIF
+         ztrbio(:,:,:) = tra(:,:,:,jp_lob_no3)
+      ENDIF
+
       ! VERTICAL DISTRIBUTION OF NEWLY PRODUCED BIOGENIC
       ! POC IN THE WATER COLUMN
@@ -72 +81 @@
       ! LAYERS IS DETERMINED BY DMIN3 DEFINED IN sms_lobster.F90
       ! ----------------------------------------------------------------------
-
-      IF( l_trdtrc )THEN
-         ALLOCATE( ztrbio(jpi,jpj,jpk) )
-         ztrbio(:,:,:) = tra(:,:,:,jp_lob_no3)
-      ENDIF
-
       DO jk = 1, jpkm1
          DO jj = 2, jpjm1
@@ -114 +117 @@
  
       ! Oa & Ek: diagnostics depending on jpdia2d !          left as example
-#if defined key_diatrc
-# if ! defined key_iomput
-      trc2d(:,:,jp_lob0_2d + 18) = sedpocn(:,:)
-# else
-     CALL iom_put( "SEDPOC" , sedpocn )
-# endif
-#endif
+      IF( ln_diatrc ) THEN
+         IF( lk_iomput ) THEN   ;   CALL iom_put( "SEDPOC" , sedpocn )
+         ELSE                   ;   trc2d(:,:,jp_lob0_2d + 18) = sedpocn(:,:)
+         ENDIF
+      ENDIF
 
       
@@ -146 +147 @@
          jl = jp_lob0_trd + 16
          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)