Changeset 902 for trunk/NEMO

Timestamp:

2008-04-22T21:41:39+02:00 (16 years ago)

Author:

rblod

Message:

Correct a bug with key_ldf_slp and ln_traldf_iso = .FALSE., see ticket #118

Location:

trunk/NEMO/OPA_SRC/TRA

Files:

• traldf.F90 (modified) (2 diffs)
• trazdf_imp.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/TRA/traldf.F90

@@ -33 +33 @@
    PUBLIC   tra_ldf    ! called by step.F90 
 
-   INTEGER ::   nldf = 0   ! type of lateral diffusion used defined from ln_traldf_... namlist logicals)
+   INTEGER, PUBLIC ::   nldf = 0   ! type of lateral diffusion used defined from ln_traldf_... namlist logicals)
+                                   ! (need to be public to be used in vertical diffusion routine)
 #if defined key_traldf_ano
    REAL, DIMENSION(jpi,jpj,jpk) ::   t0_ldf, s0_ldf   ! lateral diffusion trends of T & S
@@ -159 +160 @@
 
       ! defined the type of lateral diffusion from ln_traldf_... logicals
+      ! CAUTION : nldf = 1 is used in trazdf_imp, change it carefully
       ierr = 0
       IF( ln_traldf_lap ) THEN       ! laplacian operator

trunk/NEMO/OPA_SRC/TRA/trazdf_imp.F90

@@ -31 +31 @@
    USE prtctl          ! Print control
    USE domvvl          ! variable volume
+   USE traldf          ! lateral mixing type
 
    IMPLICIT NONE
@@ -138 +139 @@
 #if defined key_ldfslp
       ! update and save of avt (and avs if double diffusive mixing)
-      DO jk = 2, jpkm1
-         DO jj = 2, jpjm1
-            DO ji = fs_2, fs_jpim1   ! vector opt.
-               zavi = fsahtw(ji,jj,jk)                       &   ! vertical mixing coef. due to lateral mixing
-                  & * (  wslpi(ji,jj,jk) * wslpi(ji,jj,jk)   &
-                  &    + wslpj(ji,jj,jk) * wslpj(ji,jj,jk)  )
-               zwt(ji,jj,jk) = avt(ji,jj,jk) + zavi              ! zwt=avt+zavi (total vertical mixing coef. on temperature)
+      IF( nldf == 1) THEN
+         DO jk = 2, jpkm1
+            DO jj = 2, jpjm1
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                  zavi = fsahtw(ji,jj,jk)                       &   ! vertical mixing coef. due to lateral mixing
+                     & * (  wslpi(ji,jj,jk) * wslpi(ji,jj,jk)   &
+                     &    + wslpj(ji,jj,jk) * wslpj(ji,jj,jk)  )
+                  zwt(ji,jj,jk) = avt(ji,jj,jk) + zavi              ! zwt=avt+zavi (total vertical mixing coef. on temperature)
 # if defined key_zdfddm
-               zavsi(ji,jj,jk) = fsavs(ji,jj,jk) + zavi          ! dd mixing: zavsi = total vertical mixing coef. on salinity
+                  zavsi(ji,jj,jk) = fsavs(ji,jj,jk) + zavi          ! dd mixing: zavsi = total vertical mixing coef. on salinity
 # endif
-            END DO
-         END DO
-      END DO
+               END DO
+            END DO
+         END DO
+      ENDIF   
 
 #else