Changeset 2764

Timestamp:

2011-05-09T13:20:38+02:00 (13 years ago)

Author:

cetlod

Message:

update the dtadyn.F90 routine, see ticket #823

File:

• trunk/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

@@ -75 +75 @@
    REAL(wp), ALLOCATABLE, SAVE,   DIMENSION(:,:,:) :: empdta     ! E-P at two consecutive times
    REAL(wp), ALLOCATABLE, SAVE,   DIMENSION(:,:,:) :: qsrdta     ! short wave heat flux at two consecutive times
-   REAL(wp), ALLOCATABLE, SAVE,   DIMENSION(:,:,:) :: bblxdta    ! frequency of bbl in the x direction at 2 consecutive times 
-   REAL(wp), ALLOCATABLE, SAVE,   DIMENSION(:,:,:) :: bblydta    ! frequency of bbl in the y direction at 2 consecutive times 
+   REAL(wp), ALLOCATABLE, SAVE,   DIMENSION(:,:,:) :: bblxdta    ! bbl diffusive coef. in the x direction at 2 consecutive times 
+   REAL(wp), ALLOCATABLE, SAVE,   DIMENSION(:,:,:) :: bblydta    ! bbl diffusive coef. in the y direction at 2 consecutive times 
    LOGICAL :: l_offbbl
 #if defined key_ldfslp && ! defined key_c1d
@@ -360 +360 @@
 #if defined key_trabbl
       IF( .NOT. lk_c1d .AND. nn_bbl_ldf == 1 ) THEN
-         IF( iom_varid( numfl_u, 'sobblcox', ldstop = .FALSE. ) > 0  .AND. &
-         &   iom_varid( numfl_v, 'sobblcoy', ldstop = .FALSE. ) > 0 ) THEN
-             CALL iom_get( numfl_u, jpdom_data, 'sobblcox', zbblx(:,:), jkenr )
-             CALL iom_get( numfl_v, jpdom_data, 'sobblcoy', zbbly(:,:), jkenr )
+         IF( iom_varid( numfl_u, 'ahu_bbl', ldstop = .FALSE. ) > 0  .AND. &
+         &   iom_varid( numfl_v, 'ahv_bbl', ldstop = .FALSE. ) > 0 ) THEN
+             CALL iom_get( numfl_u, jpdom_data, 'ahu_bbl', zbblx(:,:), jkenr )
+             CALL iom_get( numfl_v, jpdom_data, 'ahv_bbl', zbbly(:,:), jkenr )
              l_offbbl = .TRUE.
          ENDIF
@@ -440 +440 @@
       !
       wspddta(:,:,2)  = zwspd(:,:) * tmask(:,:,1)
-      frlddta(:,:,2)  = MIN( 1., zice(:,:) ) * tmask(:,:,1)
-      empdta (:,:,2)  = zemp(:,:) * tmask(:,:,1)
-      qsrdta (:,:,2)  = zqsr(:,:) * tmask(:,:,1)
-      hmlddta(:,:,2)  = zmld(:,:) * tmask(:,:,1)
+      frlddta(:,:,2)  = zice (:,:) * tmask(:,:,1)
+      empdta (:,:,2)  = zemp (:,:) * tmask(:,:,1)
+      qsrdta (:,:,2)  = zqsr (:,:) * tmask(:,:,1)
+      hmlddta(:,:,2)  = zmld (:,:) * tmask(:,:,1)
 
 #if defined key_trabbl
       IF( l_offbbl ) THEN 
-         bblxdta(:,:,2) = MAX( 0., zbblx(:,:) )
-         bblydta(:,:,2) = MAX( 0., zbbly(:,:) )
-         WHERE( bblxdta(:,:,2) > 2. ) bblxdta(:,:,2) = 0.
-         WHERE( bblydta(:,:,2) > 2. ) bblydta(:,:,2) = 0.
+         bblxdta(:,:,2) = zbblx(:,:)  * umask(:,:,1)
+         bblydta(:,:,2) = zbbly(:,:)  * vmask(:,:,1)
       ENDIF
 #endif