Changeset 915 for trunk/NEMO/OPA_SRC

Timestamp:

2008-05-07T11:42:47+02:00 (16 years ago)

Author:

rblod

Message:

Correct the ldf_slp/trazdf_imp bug in a proper way, see ticket #118

Location:

trunk/NEMO/OPA_SRC

Files:

• TRA/traldf.F90 (modified) (1 diff)
• TRA/trazdf_imp.F90 (modified) (3 diffs)
• oce.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/TRA/traldf.F90

@@ -205 +205 @@
       IF( nldf == 1 .OR. nldf == 3 ) THEN      ! rotation
          IF( .NOT.lk_ldfslp )   CALL ctl_stop( '          the rotation of the diffusive tensor require key_ldfslp' )
+         l_traldf_rot = .TRUE.                 ! needed for trazdf_imp
       ENDIF
 

trunk/NEMO/OPA_SRC/TRA/trazdf_imp.F90

@@ -31 +31 @@
    USE prtctl          ! Print control
    USE domvvl          ! variable volume
-   USE traldf          ! lateral mixing type
+   USE ldftra          ! lateral mixing type
 
    IMPLICIT NONE
@@ -139 +139 @@
 #if defined key_ldfslp
       ! update and save of avt (and avs if double diffusive mixing)
-      IF( nldf == 1) THEN
+      IF( l_traldf_rot ) THEN
          DO jk = 2, jpkm1
             DO jj = 2, jpjm1
@@ -154 +154 @@
          END DO
       ENDIF   
-
 #else
       ! No isopycnal diffusion

trunk/NEMO/OPA_SRC/oce.F90

@@ -20 +20 @@
    !! Physics and algorithm flags
    !! ---------------------------
+   LOGICAL, PUBLIC ::   l_traldf_rot    = .FALSE.  !: rotated laplacian operator for lateral diffusion 
    LOGICAL, PUBLIC ::   ln_dynhpg_imp   = .FALSE.  !: semi-implicite hpg flag
    INTEGER, PUBLIC ::   nn_dynhpg_rst   = 0        !: add dynhpg implicit variables in restart ot not