Changeset 2038 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcsed.F90

Timestamp:

2010-08-02T12:57:40+02:00 (14 years ago)

Author:

cetlod

Message:

Apply the merge to passive tracers, see ticket:693

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcsed.F90 (modified) (8 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/LOBSTER/trcsed.F90

@@ -18 +18 @@
    USE sms_lobster
    USE lbclnk
-   USE trdmld_trc
-   USE trdmld_trc_oce
+   USE trdmod_trc
    USE iom
    USE prtctl_trc      ! Print control for debbuging
@@ -53 +52 @@
       !!                             tra = tra + dz(trn wn)
       !!        
-      !!              IF 'key_trc_diabio' is defined, the now vertical advection
+      !!              IF 'key_diabio' is defined, the now vertical advection
       !!              trend of passive tracers is saved for futher diagnostics.
       !!---------------------------------------------------------------------
@@ -61 +60 @@
       REAL(wp) ::   ztra
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zwork
-#if defined key_trc_diaadd && defined key_iomput
+#if defined key_diatrc && defined key_iomput
       REAL(wp), DIMENSION(jpi,jpj) ::  zw2d
 #endif
@@ -77 +76 @@
       ! --------------------------------------------
 
-      ! for detritus sedimentation only - jpdet
+      ! for detritus sedimentation only - jp_lob_det
       zwork(:,:,1  ) = 0.e0      ! surface value set to zero
       zwork(:,:,jpk) = 0.e0      ! bottom value  set to zero
 
-#if defined key_trc_diaadd && defined key_iomput
+#if defined key_diatrc && defined key_iomput
       zw2d(:,:) = 0.
 # endif
@@ -87 +86 @@
       IF( l_trdtrc )THEN
          ALLOCATE( ztrbio(jpi,jpj,jpk) )
-         ztrbio(:,:,:) = tra(:,:,:,jpdet)
+         ztrbio(:,:,:) = tra(:,:,:,jp_lob_det)
       ENDIF
 
       ! tracer flux at w-point: we use -vsed (downward flux)  with simplification : no e1*e2
       DO jk = 2, jpkm1
-         zwork(:,:,jk) = -vsed * trn(:,:,jk-1,jpdet)
+         zwork(:,:,jk) = -vsed * trn(:,:,jk-1,jp_lob_det)
       END DO
 
@@ -100 +99 @@
             DO ji = 1,jpi
                ztra  = - ( zwork(ji,jj,jk) - zwork(ji,jj,jk+1) ) / fse3t(ji,jj,jk)
-               tra(ji,jj,jk,jpdet) = tra(ji,jj,jk,jpdet) + ztra
-#if defined key_trc_diabio
+               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_trc_diaadd
+#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.
@@ -115 +114 @@
       END DO
 
-#if defined key_trc_diabio
+#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_trc_diaadd
+#if defined key_diatrc
 # if ! defined key_iomput
       jl = jp_lob0_2d + 7
@@ -131 +130 @@
 
       IF( l_trdtrc ) THEN
-         ztrbio(:,:,:) = tra(:,:,:,jpdet) - ztrbio(:,:,:)
+         ztrbio(:,:,:) = tra(:,:,:,jp_lob_det) - ztrbio(:,:,:)
          jl = jp_lob0_trd + 7
          CALL trd_mod_trc( ztrbio, jl, kt )   ! handle the trend