Changeset 2382 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

Timestamp:

2010-11-13T14:08:12+01:00 (13 years ago)

Author:

gm

Message:

v3.3beta: C1D - bug correction to compile with key_c1d

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90 (modified) (7 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -37 +37 @@
    !!   tke_rst      : read/write tke restart in ocean restart file
    !!----------------------------------------------------------------------
-   USE oce            ! ocean dynamics and active tracers 
-   USE dom_oce        ! ocean space and time domain
-   USE domvvl         ! ocean space and time domain : variable volume layer
-   USE zdf_oce        ! ocean vertical physics
+   USE oce            ! ocean: dynamics and active tracers variables
+   USE phycst         ! physical constants
+   USE dom_oce        ! domain: ocean
+   USE domvvl         ! domain: variable volume layer
    USE sbc_oce        ! surface boundary condition: ocean
-   USE phycst         ! physical constants
-   USE zdfmxl         ! mixed layer
-   USE restart        ! only for lrst_oce
+   USE zdf_oce        ! vertical physics: ocean variables
+   USE zdfmxl         ! vertical physics: mixed layer
+   USE zdfbfr         ! vertical mixing: bottom friction
+   USE restart        ! ocean restart
    USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
    USE prtctl         ! Print control
    USE in_out_manager ! I/O manager
    USE iom            ! I/O manager library
-   USE zdfbfr          ! bottom friction
 
    IMPLICIT NONE
@@ -180 +180 @@
       !!
       INTEGER  ::   ji, jj, jk                      ! dummy loop arguments
-!!$      INTEGER  ::   ikbu, ikbv, ikbum1, ikbvm1      ! temporary scalar
-!!$      INTEGER  ::   ikbt, ikbumm1, ikbvmm1          ! temporary scalar
+!!bfr      INTEGER  ::   ikbu, ikbv, ikbum1, ikbvm1      ! temporary scalar
+!!bfr      INTEGER  ::   ikbt, ikbumm1, ikbvmm1          ! temporary scalar
       REAL(wp) ::   zrhoa  = 1.22                   ! Air density kg/m3
       REAL(wp) ::   zcdrag = 1.5e-3                 ! drag coefficient
@@ -190 +190 @@
       REAL(wp) ::   zus   , zwlc  , zind            !    -         -
       REAL(wp) ::   zzd_up, zzd_lw                  !    -         -
-!!$      REAL(wp) ::   zebot                           !    -         -
+!!bfr      REAL(wp) ::   zebot                           !    -         -
       INTEGER , DIMENSION(jpi,jpj)     ::   imlc    ! 2D workspace
       REAL(wp), DIMENSION(jpi,jpj)     ::   zhlc    !  -      -
@@ -209 +209 @@
          END DO
       END DO
-      !
+      
+!!bfr   - start commented area
       !                     !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       !                     !  Bottom boundary condition on tke
@@ -219 +220 @@
       ! computational cost is justified
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-      !
       !                     en(bot)   = (rn_ebb0/rau0)*0.5*sqrt(u_botfr^2+v_botfr^2) (min value rn_emin)
 !CDIR NOVERRCHK
@@ -242 +242 @@
 !!       END DO
 !!    END DO
-      !
+!!bfr   - end commented area
       !
       !                     !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
@@ -275 +275 @@
             END DO
          END DO
-# if defined key_c1d
-         hlc(:,:) = zhlc(:,:) * tmask(:,:,1)      ! c1d configuration: save finite Langmuir Circulation depth
-# endif
          zcof = 0.016 / SQRT( zrhoa * zcdrag )
 !CDIR NOVERRCHK