Changeset 2081


Ignore:
Timestamp:
2010-09-09T15:58:07+02:00 (11 years ago)
Author:
cbricaud
Message:

correction of bug about the generic name of vertical scales factors

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/DEV_r1784_GLS/NEMO/OPA_SRC/ZDF/zdfgls.F90

    r2048 r2081  
    316316      !  
    317317      ! one level below 
    318       en(:,:,2) = MAX( rn_sbc_tke1 * ustars2(:,:) * ( (zhsro(:,:)+gdepw(:,:,2))/zhsro(:,:) )**rn_a_sf, rn_emin ) 
     318      en(:,:,2) = MAX( rn_sbc_tke1 * ustars2(:,:) * ( (zhsro(:,:)+fsdepw(:,:,2))/zhsro(:,:) )**rn_a_sf, rn_emin ) 
    319319      z_elem_a(:,:,2) = 0. 
    320320      z_elem_c(:,:,2) = 0. 
     
    350350      z_elem_b(:,:,2) = z_elem_b(:,:,2) +  z_elem_a(:,:,2) ! Remove z_elem_a from z_elem_b 
    351351      z_elem_a(:,:,2) = 0.            
    352       zflxs(:,:) = rn_sbc_tke3 * ustars2(:,:)**1.5 * ((zhsro(:,:)+gdept(:,:,1))/zhsro(:,:) )**(1.5*rn_a_sf) 
     352      zflxs(:,:) = rn_sbc_tke3 * ustars2(:,:)**1.5 * ((zhsro(:,:)+fsdept(:,:,1))/zhsro(:,:) )**(1.5*rn_a_sf) 
    353353      en(:,:,2) = en(:,:,2) + zflxs(:,:)/fse3w(:,:,2) 
    354354      ! 
     
    570570      ! 
    571571      ! one level below 
    572       zdep(:,:) = ( (zhsro(:,:) + gdepw(:,:,2))**(zmm*rn_a_sf+znn) )  & 
     572      zdep(:,:) = ( (zhsro(:,:) + fsdepw(:,:,2))**(zmm*rn_a_sf+znn) )  & 
    573573        &                       / zhsro(:,:)**(zmm*rn_a_sf) 
    574574      psi (:,:,2) = rn_sbc_psi1 * ustars2(:,:)**zmm * zdep(:,:) * tmask(:,:,1) 
     
    588588      ! 
    589589      ! one level below 
    590       zdep(:,:) = vkarmn * ( zhsro(:,:) + gdepw(:,:,2) ) 
     590      zdep(:,:) = vkarmn * ( zhsro(:,:) + fsdepw(:,:,2) ) 
    591591      psi (:,:,2) = rn_c0**zpp * en(:,:,1)**zmm * zdep(:,:)**znn * tmask(:,:,1) 
    592592      z_elem_a(:,:,2) = 0. 
     
    611611      ! 
    612612      ! Set psi vertical flux at the surface: 
    613       zdep(:,:) = (zhsro(:,:) + gdept(:,:,1))**(zmm*rn_a_sf+znn-1.) / zhsro(:,:)**(zmm*rn_a_sf) 
     613      zdep(:,:) = (zhsro(:,:) + fsdept(:,:,1))**(zmm*rn_a_sf+znn-1.) / zhsro(:,:)**(zmm*rn_a_sf) 
    614614      zflxs(:,:) = rn_sbc_psi3 * ( zwall_psi(:,:,1)*avm(:,:,1) + zwall_psi(:,:,2)*avm(:,:,2) ) &  
    615615                 & * en(:,:,1)**zmm * zdep          
     
    629629      ! 
    630630      ! Set psi vertical flux at the surface: 
    631       zdep(:,:) = zhsro(:,:) + gdept(:,:,1) 
     631      zdep(:,:) = zhsro(:,:) + fsdept(:,:,1) 
    632632      zflxs(:,:) = rn_sbc_psi2 * ( avm(:,:,1) + avm(:,:,2) ) * en(:,:,1)**zmm * zdep**(znn-1.) 
    633633      psi(:,:,2) = psi(:,:,2) + zflxs(:,:) / fse3w(:,:,2) 
Note: See TracChangeset for help on using the changeset viewer.