Changeset 2471 for LMDZ5/branches/testing/libf/phylmd/screenc.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/screenc.F90 (modified) (2 diffs)

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

@@ -54 +54 @@
 !-----------------------------------------------------------------------
       include "YOMCST.h"
+      include "flux_arp.h"
 !
 ! Variables locales  
       INTEGER :: i 
-      REAL, dimension(klon) :: cdram, cdrah, cdran, zri1, gref
+      REAL, dimension(klon) :: cdram, cdrah, cdran, zri1, gref,ycdragm
 !
 !------------------------------------------------------------------------- 
@@ -78 +79 @@
                     cdram, cdrah, zri1, pref)
       DO i = 1, knon
+        IF(ok_prescr_ust) THEN
+! La aussi il faut forcer avec ust (FC + MPL 20160210)
+        ycdragm(i) = ust*ust/(1.+speed(i))/speed(i)
+        cdram=ycdragm
+        delu(i) = ust/sqrt(cdram(i))
+        ELSE
         delu(i) = ustar(i)/sqrt(cdram(i))
+        ENDIF
         delte(i)= (testar(i)* sqrt(cdram(i)))/ &
                    cdrah(i)