Changeset 2559

Timestamp:

2011-01-17T11:13:19+01:00 (14 years ago)

Author:

rblod

Message:

Correction in dtadyn when not using key_trabbl

File:

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

trunk/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

@@ -367 +367 @@
       CALL iom_get( numfl_u, jpdom_data, 'vozocrtx', zu   (:,:,:), jkenr )
       CALL iom_get( numfl_v, jpdom_data, 'vomecrty', zv   (:,:,:), jkenr )
-      IF( lk_trabbl .AND. .NOT. lk_c1d .AND. nn_bbl_ldf == 1 ) THEN
+#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
@@ -375 +376 @@
          ENDIF
       ENDIF
+#endif 
 
       ! file grid-W
@@ -433 +435 @@
       hmlddta(:,:,2)  = zmld(:,:) * tmask(:,:,1)
 
+#if defined key_trabbl
       IF( l_offbbl ) THEN 
          bblxdta(:,:,2) = MAX( 0., zbblx(:,:) )
@@ -439 +442 @@
          WHERE( bblydta(:,:,2) > 2. ) bblydta(:,:,2) = 0.
       ENDIF
+#endif
       
       IF( kt == nitend ) THEN
@@ -565 +569 @@
       ENDIF
       !
+#if defined key_ldfeiv
       ! Average the diffusive coefficient at u- v- points
       DO jj = 2, jpjm1
@@ -573 +578 @@
       END DO
       CALL lbc_lnk( aeiu, 'U', 1. )   ;   CALL lbc_lnk( aeiv, 'V', 1. )    ! lateral boundary condition
+#endif
       !
    END SUBROUTINE dta_eiv
@@ -687 +693 @@
       emps(:,:) = emp(:,:) 
       qsr (:,:) = qsrdta (:,:,2) 
+#if defined key_trabbl
       IF( l_offbbl ) THEN
          ahu_bbl(:,:) = bblxdta(:,:,2)
          ahv_bbl(:,:) = bblydta(:,:,2) 
       ENDIF
+#endif
 #if ! defined key_degrad && defined key_traldf_c2d && defined key_traldf_eiv
       aeiw(:,:) = aeiwdta(:,:,2)
@@ -743 +751 @@
       emps(:,:) = emp(:,:) 
       qsr (:,:) = zweighm1 * qsrdta (:,:,1) + pweigh  * qsrdta (:,:,2) 
+#if defined key_trabbl
       IF( l_offbbl ) THEN
          ahu_bbl(:,:) = zweighm1 * bblxdta(:,:,1) +  pweigh  * bblxdta(:,:,2)
          ahv_bbl(:,:) = zweighm1 * bblydta(:,:,1) +  pweigh  * bblydta(:,:,2)
       ENDIF
+#endif
 
 #if ! defined key_degrad && defined key_traldf_c2d && defined key_traldf_eiv