Changeset 2528 for trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90

Timestamp:

2010-12-27T18:33:53+01:00 (13 years ago)

Author:

rblod

Message:

Update NEMOGCM from branch nemo_v3_3_beta

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) (7 diffs, 1 prop)

trunk/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90

@@ -6 +6 @@
    !! History :  1.0  !  2004-04  (L. Bessieres, G. Madec)  Original code
    !!             -   !  2006-08  (A. Koch-Larrouy) Indonesian strait
+   !!            3.3  !  2010-10  (C. Ethe, G. Madec) reorganisation of initialisation phase
    !!----------------------------------------------------------------------
 #if defined key_zdftmx
@@ -27 +28 @@
    PRIVATE
 
-   PUBLIC   zdf_tmx    ! called in step module 
+   PUBLIC   zdf_tmx         ! called in step module 
+   PUBLIC   zdf_tmx_init    ! called in opa module 
 
    LOGICAL, PUBLIC, PARAMETER ::   lk_zdftmx = .TRUE.    !: tidal mixing flag
@@ -47 +49 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009) 
-   !! $Id$ 
-   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
+   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
+   !! $Id$
+   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
 
@@ -96 +98 @@
       REAL(wp), DIMENSION(jpi,jpj) ::   zkz   ! temporary 2D workspace
       !!----------------------------------------------------------------------
-
-      !                        
-      IF( kt == nit000  )   CALL zdf_tmx_init      ! Initialization (first time-step only)
 
       !                          ! ----------------------- !
@@ -372 +371 @@
       DO jj = 1, jpj                ! part independent of the level
          DO ji = 1, jpi
-            zhdep(ji,jj) = fsdepw(ji,jj,mbathy(ji,jj))       ! depth of the ocean
+            zhdep(ji,jj) = fsdepw(ji,jj,mbkt(ji,jj)+1)       ! depth of the ocean
             zfact(ji,jj) = rau0 * rn_htmx * ( 1. - EXP( -zhdep(ji,jj) / rn_htmx ) )
             IF( zfact(ji,jj) /= 0 )   zfact(ji,jj) = en_tmx(ji,jj) / zfact(ji,jj)
@@ -488 +487 @@
          !
       ENDIF
-
+      !
    END SUBROUTINE zdf_tmx_init
 
@@ -497 +496 @@
    LOGICAL, PUBLIC, PARAMETER ::   lk_zdftmx = .FALSE.   !: tidal mixing flag
 CONTAINS
-   SUBROUTINE zdf_tmx( kt )          ! Empty routine
+   SUBROUTINE zdf_tmx_init           ! Dummy routine
+      WRITE(*,*) 'zdf_tmx: You should not have seen this print! error?'
+   END SUBROUTINE zdf_tmx_init
+   SUBROUTINE zdf_tmx( kt )          ! Dummy routine
       WRITE(*,*) 'zdf_tmx: You should not have seen this print! error?', kt
    END SUBROUTINE zdf_tmx