New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 2559 for trunk/NEMOGCM – NEMO

Changeset 2559 for trunk/NEMOGCM


Ignore:
Timestamp:
2011-01-17T11:13:19+01:00 (13 years ago)
Author:
rblod
Message:

Correction in dtadyn when not using key_trabbl

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

    r2528 r2559  
    367367      CALL iom_get( numfl_u, jpdom_data, 'vozocrtx', zu   (:,:,:), jkenr ) 
    368368      CALL iom_get( numfl_v, jpdom_data, 'vomecrty', zv   (:,:,:), jkenr ) 
    369       IF( lk_trabbl .AND. .NOT. lk_c1d .AND. nn_bbl_ldf == 1 ) THEN 
     369#if defined key_trabbl 
     370      IF( .NOT. lk_c1d .AND. nn_bbl_ldf == 1 ) THEN 
    370371         IF( iom_varid( numfl_u, 'sobblcox', ldstop = .FALSE. ) > 0  .AND. & 
    371372         &   iom_varid( numfl_v, 'sobblcoy', ldstop = .FALSE. ) > 0 ) THEN 
     
    375376         ENDIF 
    376377      ENDIF 
     378#endif  
    377379 
    378380      ! file grid-W 
     
    433435      hmlddta(:,:,2)  = zmld(:,:) * tmask(:,:,1) 
    434436 
     437#if defined key_trabbl 
    435438      IF( l_offbbl ) THEN  
    436439         bblxdta(:,:,2) = MAX( 0., zbblx(:,:) ) 
     
    439442         WHERE( bblydta(:,:,2) > 2. ) bblydta(:,:,2) = 0. 
    440443      ENDIF 
     444#endif 
    441445       
    442446      IF( kt == nitend ) THEN 
     
    565569      ENDIF 
    566570      ! 
     571#if defined key_ldfeiv 
    567572      ! Average the diffusive coefficient at u- v- points 
    568573      DO jj = 2, jpjm1 
     
    573578      END DO 
    574579      CALL lbc_lnk( aeiu, 'U', 1. )   ;   CALL lbc_lnk( aeiv, 'V', 1. )    ! lateral boundary condition 
     580#endif 
    575581      ! 
    576582   END SUBROUTINE dta_eiv 
     
    687693      emps(:,:) = emp(:,:)  
    688694      qsr (:,:) = qsrdta (:,:,2)  
     695#if defined key_trabbl 
    689696      IF( l_offbbl ) THEN 
    690697         ahu_bbl(:,:) = bblxdta(:,:,2) 
    691698         ahv_bbl(:,:) = bblydta(:,:,2)  
    692699      ENDIF 
     700#endif 
    693701#if ! defined key_degrad && defined key_traldf_c2d && defined key_traldf_eiv 
    694702      aeiw(:,:) = aeiwdta(:,:,2) 
     
    743751      emps(:,:) = emp(:,:)  
    744752      qsr (:,:) = zweighm1 * qsrdta (:,:,1) + pweigh  * qsrdta (:,:,2)  
     753#if defined key_trabbl 
    745754      IF( l_offbbl ) THEN 
    746755         ahu_bbl(:,:) = zweighm1 * bblxdta(:,:,1) +  pweigh  * bblxdta(:,:,2) 
    747756         ahv_bbl(:,:) = zweighm1 * bblydta(:,:,1) +  pweigh  * bblydta(:,:,2) 
    748757      ENDIF 
     758#endif 
    749759 
    750760#if ! defined key_degrad && defined key_traldf_c2d && defined key_traldf_eiv  
Note: See TracChangeset for help on using the changeset viewer.