--- trunk/phylmd/ustarhb.f	2014/09/04 10:40:24	105
+++ trunk/Sources/phylmd/ustarhb.f	2017/11/14 15:43:29	245
@@ -4,52 +4,37 @@
 
 contains
 
-  SUBROUTINE ustarhb(knon, u, v, cd_m, ustar)
+  pure function ustarhb(u, v, cd_m)
 
-    ! From LMDZ4/libf/phylmd/ustarhb.F, version 1.1 2004/06/22 11:45:35
+    ! From LMDZ4/libf/phylmd/ustarhb.F, version 1.1, 2004/06/22 11:45:35
 
     ! Laurent Li (LMD/CNRS), le 30 septembre 1998
     ! Couche limite non-locale. Adaptation du code du CCM3.
-    ! Code non teste, donc a ne pas utiliser.
+    ! Code non test\'e, donc \`a ne pas utiliser.
 
-    ! Nonlocal scheme that determines eddy diffusivities based on a
+    ! Non-local scheme that determines eddy diffusivities based on a
     ! diagnosed boundary layer height and a turbulent velocity scale.
     ! Also countergradient effects for heat and moisture are included.
 
-    ! For more information, see Holtslag, A.A.M., and B.A. Boville, 1993:
+    ! For more information, see Holtslag, A.A.M. and B.A. Boville, 1993:
     ! Local versus nonlocal boundary-layer diffusion in a global climate
     ! model. J. of Climate, vol. 6, 1825-1842.
 
-    USE dimphy, ONLY: klev, klon
-
-    ! Arguments:
-
-    INTEGER knon ! nombre de points a calculer
-    REAL u(klon, klev) ! vitesse U (m/s)
-    REAL v(klon, klev) ! vitesse V (m/s)
-
-    REAL, intent(in):: cd_m(:) 
-    ! (knon) coefficient de friction au sol pour vitesse
-
-    REAL ustar(klon)
+    REAL, intent(in):: u(:), v(:) ! wind in first layer (m/s)
+    REAL, intent(in):: cd_m(:) ! coefficient de friction au sol pour vitesse
+    REAL ustarhb(size(u))
 
+    ! Local:
     INTEGER i
-    REAL zxu, zxv, zxmod, taux, tauy
-    REAL zx_alf1, zx_alf2 ! parametres pour extrapolation
+    REAL wind
 
     !---------------------------------------------------------------
 
-    DO i = 1, knon
-       zx_alf1 = 1.0
-       zx_alf2 = 1.0 - zx_alf1
-       zxu = u(i, 1)*zx_alf1+u(i, 2)*zx_alf2
-       zxv = v(i, 1)*zx_alf1+v(i, 2)*zx_alf2
-       zxmod = 1.0+SQRT(zxu**2+zxv**2)
-       taux = zxu *zxmod*cd_m(i)
-       tauy = zxv *zxmod*cd_m(i)
-       ustar(i) = SQRT(taux**2+tauy**2)
+    DO i = 1, size(u)
+       wind = SQRT(u(i)**2 + v(i)**2)
+       ustarhb(i) = wind * (1 + wind) * cd_m(i)
     ENDDO
 
-  end SUBROUTINE ustarhb
+  end function ustarhb
 
 end module ustarhb_m