Changeset 1617

Timestamp:

2009-08-12T16:59:14+02:00 (15 years ago)

Author:

ctlod

Message:

remove the TKE profile of penetration case (2) for the parameter nn_htau, see ticket: #521

Location:

trunk/NEMO/OPA_SRC/ZDF

Files:

• zdftke.F90 (modified) (3 diffs)
• zdftke_old.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -76 +76 @@
    REAL(wp) ::   rn_bshear= 1.e-20          ! background shear (>0)
    INTEGER  ::   nn_etau  = 0               ! type of depth penetration of surface tke (=0/1/2)
-   INTEGER  ::   nn_htau  = 0               ! type of tke profile of penetration (=0/1/2)
+   INTEGER  ::   nn_htau  = 0               ! type of tke profile of penetration (=0/1)
    REAL(wp) ::   rn_efr   = 1.0_wp          ! fraction of TKE surface value which penetrates in the ocean
    LOGICAL  ::   ln_lc    = .FALSE.         ! Langmuir cells (LC) as a source term of TKE or not
@@ -664 +664 @@
       IF( nn_mxl  < 0    .OR. nn_mxl  > 3   )   CALL ctl_stop( 'bad flag: nn_mxl is  0, 1 or 2 ' )
       IF( nn_pdl  < 0    .OR. nn_pdl  > 1   )   CALL ctl_stop( 'bad flag: nn_pdl is  0 or 1    ' )
-      IF( nn_htau < 0    .OR. nn_htau > 2   )   CALL ctl_stop( 'bad flag: nn_htau is 0, 1 or 2 ' )
+      IF( nn_htau < 0    .OR. nn_htau > 1   )   CALL ctl_stop( 'bad flag: nn_htau is 0 or 1    ' )
       IF( rn_lc   < 0.15 .OR. rn_lc   > 0.2 )   CALL ctl_stop( 'bad value: rn_lc must be between 0.15 and 0.2 ' )
 
@@ -674 +674 @@
          CASE( 0 )                                    ! constant depth penetration (here 10 meters)
             htau(:,:) = 10.e0
-         CASE( 1 )                                    ! F(latitude) : 5m to 40m at high lat.
+         CASE( 1 )                                    ! F(latitude) : 0.5m to 30m at high lat.
             DO jj = 1, jpj
                DO ji = 1, jpi  
-                  htau(ji,jj) = MAX( 5., MIN( 40., 60.*ABS( SIN( rpi/180. * gphit(ji,jj) ) ) )   )
-               END DO
-            END DO
-         CASE( 2 )                                    ! F(latitude) : 5m to 60m at high lat.
-            DO jj = 1, jpj
-               DO ji = 1, jpi
-                  htau(ji,jj) =  MAX( 5.,6./4.* MIN( 40., 60.*ABS( SIN( rpi/180. * gphit(ji,jj) ) ) )   )
+                  htau(ji,jj) = MAX( 0.5, 3./4. * MIN( 40., 60.*ABS( SIN( rpi/180. * gphit(ji,jj) ) ) )   )
                END DO
             END DO

trunk/NEMO/OPA_SRC/ZDF/zdftke_old.F90

@@ -81 +81 @@
    REAL(wp) ::   rn_cri   = 2._wp / 9._wp   ! critic Richardson number
    INTEGER  ::   nn_etau  = 0               ! type of depth penetration of surface tke (=0/1/2)
-   INTEGER  ::   nn_htau  = 0               ! type of tke profile of penetration (=0/1/2)
+   INTEGER  ::   nn_htau  = 0               ! type of tke profile of penetration (=0/1)
    REAL(wp) ::   rn_lmin0 = 0.4_wp          ! surface  min value of mixing length
    REAL(wp) ::   rn_lmin  = 0.1_wp          ! interior min value of mixing length
@@ -555 +555 @@
             END DO
          CASE( 1 )                                    ! meridional profile  1
-            DO jj = 2, jpjm1                          ! ( 5m in the tropics to a maximum of 40 m at high lat.)
-               DO ji = fs_2, fs_jpim1   ! vector opt.
-                  zhtau(ji,jj) = MAX( 5., MIN( 40., 60.*ABS( SIN( rpi/180. * gphit(ji,jj) ) ) )   )
-               END DO
-            END DO
-         CASE( 2 )                                    ! meridional profile 2
-            DO jj = 2, jpjm1                          ! ( 5m in the tropics to a maximum of 60 m at high lat.)
-               DO ji = fs_2, fs_jpim1   ! vector opt.
-                  zhtau(ji,jj) =  MAX( 5.,6./4.* MIN( 40., 60.*ABS( SIN( rpi/180. * gphit(ji,jj) ) ) )   )
+            DO jj = 2, jpjm1                          ! ( 0.5m in the tropics to a maximum of 30 m at high lat.)
+               DO ji = fs_2, fs_jpim1   ! vector opt.
+                  zhtau(ji,jj) = MAX( 0.5, 3./4. * MIN( 40., 60.*ABS( SIN( rpi/180. * gphit(ji,jj) ) ) )   )
                END DO
             END DO
@@ -781 +775 @@
       IF( nn_pdl  < 0    .OR. nn_pdl  > 1   )   CALL ctl_stop( 'bad flag: nn_pdl is  0 or 1    ' )
       IF( nn_ave  < 0    .OR. nn_ave  > 1   )   CALL ctl_stop( 'bad flag: nn_ave is  0 or 1    ' )
-      IF( nn_htau < 0    .OR. nn_htau > 2   )   CALL ctl_stop( 'bad flag: nn_htau is 0, 1 or 2 ' )
+      IF( nn_htau < 0    .OR. nn_htau > 1   )   CALL ctl_stop( 'bad flag: nn_htau is 0 or 1    ' )
       IF( rn_lc   < 0.15 .OR. rn_lc   > 0.2 )   CALL ctl_stop( 'bad value: rn_lc must be between 0.15 and 0.2 ' )