Changeset 2300 for branches

Timestamp:

2010-10-21T10:08:05+02:00 (14 years ago)

Author:

cetlod

Message:

update time stepping formulation of mass of POC in LOBSTER model

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90 (modified) (2 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/TOP_SRC/LOBSTER/trcexp.F90

@@ -56 +56 @@
       !!
       INTEGER  ::   ji, jj, jk, jl, ikbot
-      REAL(wp) ::   zgeolpoc, zfact, zwork, ze3t
+      REAL(wp) ::   zgeolpoc, zfact, zwork, ze3t, zsedpocd
       REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::   ztrbio
       CHARACTER (len=25) :: charout
@@ -122 +122 @@
 #endif
 
-      ! Leap-frog scheme (only in explicit case, otherwise the 
-      ! ----------------  time stepping is already done in trczdf)
-      IF( ln_trczdf_exp .AND. (ln_trcadv_cen2 .OR. ln_trcadv_tvd) ) THEN
-         zfact = 2. * rdttra(jk) * FLOAT( nn_dttrc ) 
-         IF( neuler == 0 .AND. kt == nit000 )   zfact = rdttra(jk) * FLOAT(nn_dttrc) 
-         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 == nit000 ) 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