Changeset 1537 for trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90

Timestamp:

2009-07-24T16:22:23+02:00 (15 years ago)

Author:

ctlod

Message:

ensure the restartability of the 2nd order advection scheme,see ticket: 489

File:

• trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdfevd.F90

@@ -69 +69 @@
       avmu_evd (:,:,:) = avmu(:,:,:) 
 
-      SELECT CASE ( n_evdm )
+      SELECT CASE ( nn_evdm )
  
       CASE ( 1 )           ! enhance vertical eddy viscosity and diffusivity (if rn2<-1.e-12)
@@ -88 +88 @@
                   IF(   MIN( rn2(ji,jj,jk),  rn2b(ji,jj,jk) ) <= -1.e-12 ) THEN
 #endif
-                     avt (ji  ,jj  ,jk) = avevd * tmask(ji  ,jj  ,jk)
-                     avm (ji  ,jj  ,jk) = avevd * tmask(ji  ,jj  ,jk)
-                     avmu(ji  ,jj  ,jk) = avevd * umask(ji  ,jj  ,jk)
-                     avmu(ji-1,jj  ,jk) = avevd * umask(ji-1,jj  ,jk)
-                     avmv(ji  ,jj  ,jk) = avevd * vmask(ji  ,jj  ,jk)
-                     avmv(ji  ,jj-1,jk) = avevd * vmask(ji  ,jj-1,jk)
+                     avt (ji  ,jj  ,jk) = rn_avevd * tmask(ji  ,jj  ,jk)
+                     avm (ji  ,jj  ,jk) = rn_avevd * tmask(ji  ,jj  ,jk)
+                     avmu(ji  ,jj  ,jk) = rn_avevd * umask(ji  ,jj  ,jk)
+                     avmu(ji-1,jj  ,jk) = rn_avevd * umask(ji-1,jj  ,jk)
+                     avmv(ji  ,jj  ,jk) = rn_avevd * vmask(ji  ,jj  ,jk)
+                     avmv(ji  ,jj-1,jk) = rn_avevd * vmask(ji  ,jj-1,jk)
                   ENDIF
                END DO
@@ -112 +112 @@
          DO jk = 1, jpkm1                                 ! Horizontal slab
             !                                             ! ===============
-!!!         WHERE( rn2(:,:,jk) <= -1.e-12 ) avt(:,:,jk) = tmask(:,:,jk) * avevd   ! agissant sur T SEUL! 
+!!!         WHERE( rn2(:,:,jk) <= -1.e-12 ) avt(:,:,jk) = tmask(:,:,jk) * rn_avevd   ! agissant sur T SEUL! 
 #if defined key_vectopt_loop
             DO jj = 1, 1                     ! big loop forced
@@ -126 +126 @@
                   IF(   MIN( rn2(ji,jj,jk), rn2b(ji,jj,jk) ) <= -1.e-12 ) &
 #endif
-                     avt(ji,jj,jk) = avevd * tmask(ji,jj,jk)
+                     avt(ji,jj,jk) = rn_avevd * tmask(ji,jj,jk)
                END DO
             END DO