Changeset 2471 for LMDZ5/branches/testing/libf/phylmd/cdrag.F90

Timestamp:

Mar 18, 2016, 12:09:23 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2434:2457 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cdrag.F90 (modified) (2 diffs)

LMDZ5/branches/testing/libf/phylmd/cdrag.F90

@@ -114 +114 @@
   LOGICAL, PARAMETER    :: zxli=.FALSE. ! calcul des cdrags selon Laurent Li
   REAL, DIMENSION(klon) :: zcdn_m, zcdn_h         ! Drag coefficient in neutral conditions
+  REAL zzzcd
 !
 ! Fonctions thermodynamiques et fonctions d'instabilite
@@ -176 +177 @@
 
 
-! Coefficients CD neutres pour m et h
-     zcdn_m(i) = (CKAP/LOG(1.+zgeop1(i)/(RG*z0m(i))))**2
-     zcdn_h(i) = (CKAP/LOG(1.+zgeop1(i)/(RG*z0h(i))))**2
+! Coefficients CD neutres pour m et h : k^2/ln(z/z0) et k^2/(ln(z/z0)*ln(z/z0h))
+     zzzcd=CKAP/LOG(1.+zgeop1(i)/(RG*z0m(i)))
+     zcdn_m(i) = zzzcd*zzzcd
+     zcdn_h(i) = zzzcd*(CKAP/LOG(1.+zgeop1(i)/(RG*z0m(i))))
 
      IF (zri(i) .GT. 0.) THEN      ! situation stable