Changeset 2528 for trunk/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90 (modified) (9 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90

@@ -19 +19 @@
    USE lbclnk
    USE trc
-   USE trctrp_lec
+   USE trcnam_trp
    USE prtctl_trc      ! Print control for debbuging
-   USE trdmld_trc
-   USE trdmld_trc_oce
+   USE trdmod_oce
+   USE trdmod_trc
    USE iom
 
@@ -33 +33 @@
 #  include "top_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/TOP 2.0 , LOCEAN-IPSL (2007) 
+   !! NEMO/TOP 3.3 , NEMO Consortium (2010)
    !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -55 +55 @@
       INTEGER, INTENT( in ) ::   kt      ! ocean time-step index      
       !!
-      INTEGER  ::   ji, jj, jk, jl, ikbot
-      REAL(wp) ::   zgeolpoc, zfact, zwork, ze3t
+      INTEGER  ::   ji, jj, jk, jl, ikt
+      REAL(wp) ::   zgeolpoc, zfact, zwork, ze3t, zsedpocd
       REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::   ztrbio
       CHARACTER (len=25) :: charout
@@ -75 +75 @@
       IF( l_trdtrc )THEN
          ALLOCATE( ztrbio(jpi,jpj,jpk) )
-         ztrbio(:,:,:) = tra(:,:,:,jpno3)
+         ztrbio(:,:,:) = tra(:,:,:,jp_lob_no3)
       ENDIF
 
@@ -82 +82 @@
             DO ji = fs_2, fs_jpim1
                ze3t = 1. / fse3t(ji,jj,jk)
-               tra(ji,jj,jk,jpno3) = tra(ji,jj,jk,jpno3) + ze3t * dmin3(ji,jj,jk) * fbod(ji,jj)
+               tra(ji,jj,jk,jp_lob_no3) = tra(ji,jj,jk,jp_lob_no3) + ze3t * dmin3(ji,jj,jk) * fbod(ji,jj)
             END DO
          END DO
@@ -95 +95 @@
       DO jj = 2, jpjm1
          DO ji = fs_2, fs_jpim1
-            ikbot = mbathy(ji,jj) - 1
-            tra(ji,jj,ikbot,jpno3) = tra(ji,jj,ikbot,jpno3) + sedlam * sedpocn(ji,jj) / fse3t(ji,jj,ikbot) 
+            ikt = mbkt(ji,jj) 
+            tra(ji,jj,ikt,jp_lob_no3) = tra(ji,jj,ikt,jp_lob_no3) + sedlam * sedpocn(ji,jj) / fse3t(ji,jj,ikt) 
             ! Deposition of organic matter in the sediment
-            zwork = vsed * trn(ji,jj,ikbot,jpdet)
+            zwork = vsed * trn(ji,jj,ikt,jp_lob_det)
             sedpoca(ji,jj) = ( zwork + dminl(ji,jj) * fbod(ji,jj)   &
                &           - sedlam * sedpocn(ji,jj) - sedlostpoc * sedpocn(ji,jj) ) * rdt
@@ -107 +107 @@
       DO jj = 2, jpjm1
          DO ji = fs_2, fs_jpim1
-            tra(ji,jj,1,jpno3) = tra(ji,jj,1,jpno3) + zgeolpoc * cmask(ji,jj) / areacot / fse3t(ji,jj,1)
+            tra(ji,jj,1,jp_lob_no3) = tra(ji,jj,1,jp_lob_no3) + zgeolpoc * cmask(ji,jj) / areacot / fse3t(ji,jj,1)
          END DO
       END DO
@@ -114 +114 @@
  
       ! Oa & Ek: diagnostics depending on jpdia2d !          left as example
-#if defined key_trc_diaadd
+#if defined key_diatrc
 # if ! defined key_iomput
       trc2d(:,:,jp_lob0_2d + 18) = sedpocn(:,:)
@@ -122 +122 @@
 #endif
 
-      ! Leap-frog scheme (only in explicit case, otherwise the 
-      ! ----------------  time stepping is already done in trczdf)
-      IF( l_trczdf_exp .AND. (ln_trcadv_cen2 .OR. ln_trcadv_tvd) ) THEN
-         zfact = 2. * rdttra(jk) * FLOAT( ndttrc ) 
-         IF( neuler == 0 .AND. kt == nittrc000 )   zfact = rdttra(jk) * FLOAT(ndttrc) 
-         sedpoca(:,:) =  sedpocb(:,:) + zfact * sedpoca(:,:) 
-      ENDIF
-
       
       ! Time filter and swap of arrays
       ! ------------------------------
-      IF( ln_trcadv_cen2 .OR. ln_trcadv_tvd  ) THEN         ! centred or tvd scheme
-         IF( neuler == 0 .AND. kt == nittrc000 ) THEN
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  sedpocb(ji,jj) = sedpocn(ji,jj)
-                  sedpocn(ji,jj) = sedpoca(ji,jj)
-                  sedpoca(ji,jj) = 0.e0
-               END DO
-            END DO
-         ELSE
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  sedpocb(ji,jj) = atfp  * ( sedpocb(ji,jj) + sedpoca(ji,jj) )    &
-                     &           + atfp1 *   sedpocn(ji,jj)
-                  sedpocn(ji,jj) = sedpoca(ji,jj)
-                  sedpoca(ji,jj) = 0.e0
-               END DO
-            END DO
-         ENDIF
-      ELSE                                                   !  case of smolar scheme or muscl
-         sedpocb(:,:) = sedpoca(:,:)
-         sedpocn(:,:) = sedpoca(:,:)
-         sedpoca(:,:) = 0.e0
+      IF( neuler == 0 .AND. kt == nit000 ) THEN        ! Euler time-stepping at first time-step
+        !                                             ! (only swap)
+        sedpocn(:,:) = sedpoca(:,:)
+        !                                              
+      ELSE
+        !
+        DO jj = 1, jpj
+           DO ji = 1, jpi
+              zsedpocd = sedpoca(ji,jj) - 2. * sedpocn(ji,jj) + sedpocb(ji,jj)      ! time laplacian on tracers
+              sedpocb(ji,jj) = sedpocn(ji,jj) + atfp * zsedpocd                     ! sedpocb <-- filtered sedpocn
+              sedpocn(ji,jj) = sedpoca(ji,jj)                                       ! sedpocn <-- sedpoca
+           END DO
+        END DO
+        ! 
       ENDIF
+      sedpoca(:,:) = 0.e0
       !
       IF( l_trdtrc ) THEN
-         ztrbio(:,:,:) = tra(:,:,:,jpno3) - ztrbio(:,:,:)
+         ztrbio(:,:,:) = tra(:,:,:,jp_lob_no3) - ztrbio(:,:,:)
          jl = jp_lob0_trd + 16
          CALL trd_mod_trc( ztrbio, jl, kt )   ! handle the trend