Changeset 2176

Timestamp:

2010-10-07T09:39:02+02:00 (14 years ago)

Author:

sga

Message:

NEMO branch DEV_r1924_visbeck.

Add code to be cut from branch DEV_r1924_nocs_latphys at revision 2163

Location:

branches/DEV_r1924_visbeck/NEMO/OPA_SRC

Files:

• LDF/ldfeiv_vis.F90 (added)
• LDF/ldftra.F90 (modified) (2 diffs)
• LDF/ldftra_oce.F90 (modified) (2 diffs)
• TRA/traldf.F90 (modified) (1 diff)
• step.F90 (modified) (2 diffs)

branches/DEV_r1924_visbeck/NEMO/OPA_SRC/LDF/ldftra.F90

@@ -67 +67 @@
       NAMELIST/namtra_ldf/ ln_traldf_lap  , ln_traldf_bilap,                  &
          &                 ln_traldf_level, ln_traldf_hor  , ln_traldf_iso,   &
+         &                 ln_traldf_vis,                                     &
          &                 rn_aht_0       , rn_ahtb_0      , rn_aeiv_0
       !!----------------------------------------------------------------------
@@ -83 +84 @@
          WRITE(numout,*) '      laplacian operator            ln_traldf_lap   = ', ln_traldf_lap
          WRITE(numout,*) '      bilaplacian operator          ln_traldf_bilap = ', ln_traldf_bilap
+         WRITE(numout,*) '      visbeck     operator          ln_traldf_vis   = ', ln_traldf_vis   
          WRITE(numout,*) '      lateral eddy diffusivity      rn_aht_0        = ', rn_aht_0
          WRITE(numout,*) '      background hor. diffusivity   rn_ahtb_0       = ', rn_ahtb_0

branches/DEV_r1924_visbeck/NEMO/OPA_SRC/LDF/ldftra_oce.F90

@@ -20 +20 @@
    LOGICAL , PUBLIC ::   ln_traldf_hor   = .FALSE.   !: horizontal (geopotential) direction
    LOGICAL , PUBLIC ::   ln_traldf_iso   = .TRUE.    !: iso-neutral direction
+   LOGICAL , PUBLIC ::   ln_traldf_vis   = .FALSE.   !: visbeck eddy velocity coefficients
    REAL(wp), PUBLIC ::   rn_aht_0        = 2000._wp  !: lateral eddy diffusivity (m2/s)
    REAL(wp), PUBLIC ::   rn_ahtb_0       =    0._wp  !: lateral background eddy diffusivity (m2/s)
@@ -41 +42 @@
    !!   'key_traldf_eiv'                              eddy induced velocity
    !!----------------------------------------------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_traldf_eiv   = .TRUE.   !: eddy induced velocity flag
+   LOGICAL, PUBLIC, PARAMETER               ::   lk_traldf_eiv   = .TRUE.   !: eddy induced velocity flag
       
 # if defined key_traldf_c3d

branches/DEV_r1924_visbeck/NEMO/OPA_SRC/TRA/traldf.F90

@@ -143 +143 @@
          WRITE(numout,*) '      horizontal (geopotential)   ln_traldf_hor   = ', ln_traldf_hor
          WRITE(numout,*) '      iso-neutral                 ln_traldf_iso   = ', ln_traldf_iso
+         WRITE(numout,*) '      Visbeck scheme for aeiv     ln_traldf_vis   = ', ln_traldf_vis
       ENDIF
 

branches/DEV_r1924_visbeck/NEMO/OPA_SRC/step.F90

@@ -85 +85 @@
    USE ldfslp          ! iso-neutral slopes               (ldf_slp routine)
    USE ldfeiv          ! eddy induced velocity coef.      (ldf_eiv routine)
+   USE ldfeiv_vis      ! eddy induced velocity coef.  (ldf_eiv_vis routine)
 
    USE zdftmx          ! tide-induced vertical mixing     (zdf_tmx routine)
@@ -237 +238 @@
       ENDIF
 #if defined key_traldf_c2d
-      IF( lk_traldf_eiv )   CALL ldf_eiv( kstp )      ! eddy induced velocity coefficient
+      IF( lk_traldf_eiv )  THEN                                  ! eddy induced velocity coefficient
+         IF ( ln_traldf_vis )   THEN
+            CALL ldf_eiv_vis( kstp )
+         ELSE
+            CALL ldf_eiv( kstp )
+         ENDIF
+      ENDIF
 #  endif