Changeset 2081

Timestamp:

2010-09-09T15:58:07+02:00 (14 years ago)

Author:

cbricaud

Message:

correction of bug about the generic name of vertical scales factors

File:

• branches/DEV_r1784_GLS/NEMO/OPA_SRC/ZDF/zdfgls.F90 (modified) (6 diffs)

branches/DEV_r1784_GLS/NEMO/OPA_SRC/ZDF/zdfgls.F90

@@ -316 +316 @@
       ! 
       ! one level below
-      en(:,:,2) = MAX( rn_sbc_tke1 * ustars2(:,:) * ( (zhsro(:,:)+gdepw(:,:,2))/zhsro(:,:) )**rn_a_sf, rn_emin )
+      en(:,:,2) = MAX( rn_sbc_tke1 * ustars2(:,:) * ( (zhsro(:,:)+fsdepw(:,:,2))/zhsro(:,:) )**rn_a_sf, rn_emin )
       z_elem_a(:,:,2) = 0.
       z_elem_c(:,:,2) = 0.
@@ -350 +350 @@
       z_elem_b(:,:,2) = z_elem_b(:,:,2) +  z_elem_a(:,:,2) ! Remove z_elem_a from z_elem_b
       z_elem_a(:,:,2) = 0.           
-      zflxs(:,:) = rn_sbc_tke3 * ustars2(:,:)**1.5 * ((zhsro(:,:)+gdept(:,:,1))/zhsro(:,:) )**(1.5*rn_a_sf)
+      zflxs(:,:) = rn_sbc_tke3 * ustars2(:,:)**1.5 * ((zhsro(:,:)+fsdept(:,:,1))/zhsro(:,:) )**(1.5*rn_a_sf)
       en(:,:,2) = en(:,:,2) + zflxs(:,:)/fse3w(:,:,2)
       !
@@ -570 +570 @@
       !
       ! one level below
-      zdep(:,:) = ( (zhsro(:,:) + gdepw(:,:,2))**(zmm*rn_a_sf+znn) )  &
+      zdep(:,:) = ( (zhsro(:,:) + fsdepw(:,:,2))**(zmm*rn_a_sf+znn) )  &
         &                       / zhsro(:,:)**(zmm*rn_a_sf)
       psi (:,:,2) = rn_sbc_psi1 * ustars2(:,:)**zmm * zdep(:,:) * tmask(:,:,1)
@@ -588 +588 @@
       !
       ! one level below
-      zdep(:,:) = vkarmn * ( zhsro(:,:) + gdepw(:,:,2) )
+      zdep(:,:) = vkarmn * ( zhsro(:,:) + fsdepw(:,:,2) )
       psi (:,:,2) = rn_c0**zpp * en(:,:,1)**zmm * zdep(:,:)**znn * tmask(:,:,1)
       z_elem_a(:,:,2) = 0.
@@ -611 +611 @@
       !
       ! Set psi vertical flux at the surface:
-      zdep(:,:) = (zhsro(:,:) + gdept(:,:,1))**(zmm*rn_a_sf+znn-1.) / zhsro(:,:)**(zmm*rn_a_sf)
+      zdep(:,:) = (zhsro(:,:) + fsdept(:,:,1))**(zmm*rn_a_sf+znn-1.) / zhsro(:,:)**(zmm*rn_a_sf)
       zflxs(:,:) = rn_sbc_psi3 * ( zwall_psi(:,:,1)*avm(:,:,1) + zwall_psi(:,:,2)*avm(:,:,2) ) & 
                  & * en(:,:,1)**zmm * zdep         
@@ -629 +629 @@
       !
       ! Set psi vertical flux at the surface:
-      zdep(:,:) = zhsro(:,:) + gdept(:,:,1)
+      zdep(:,:) = zhsro(:,:) + fsdept(:,:,1)
       zflxs(:,:) = rn_sbc_psi2 * ( avm(:,:,1) + avm(:,:,2) ) * en(:,:,1)**zmm * zdep**(znn-1.)
       psi(:,:,2) = psi(:,:,2) + zflxs(:,:) / fse3w(:,:,2)