Changeset 3068 for LMDZ6/trunk/libf/phylmd

Timestamp:

Nov 13, 2017, 11:17:36 AM (7 years ago)

Author:

jyg

Message:

Implementing correct formula in alpale_wk.F90

File:

• LMDZ6/trunk/libf/phylmd/alpale_wk.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/alpale_wk.F90

@@ -67 +67 @@
 !  Compute probability that the grid-cell is intersected by a gust front
 !!  print *,'alpale_wk: wkrad(1), cellrad(1) ', wkrad(1), cellrad(1)
-  proba_gf(:) = exp(-wdens(:)*rpi*max(wkrad(:)-cellrad(:),0.)**2) - &
-                exp(-wdens(:)*rpi*(wkrad(:)+cellrad(:))**2)
+!!  proba_gf(:) = exp(-wdens(:)*rpi*max(wkrad(:)-cellrad(:),0.)**2) - &   ! Formules
+!!                exp(-wdens(:)*rpi*(wkrad(:)+cellrad(:))**2)             ! fausses !
+  proba_gf(:) = 1. - exp(-wdens(:)*rpi*((wkrad(:)+cellrad(:))**2 - &
+                                        max(wkrad(:)-cellrad(:),0.)**2) )
 !
   proba_gf(:) = max(proba_gf(:),1.e-3)
@@ -75 +77 @@
 !!  print *,'alpale_wk: proba_gf(1), fip(1), ', proba_gf(1), fip(1)
   fip_cond(:) = fip(:)/proba_gf(:)
-!!  print *,'alpale_wk: fip_cond(1) ', fip_cond(1)
+!!    print *,'alpale_wk: wkrad(1), cellrad(1), proba_gf(1), fip(1), fip_cond(1) ', &
+!!                        wkrad(1), cellrad(1), proba_gf(1), fip(1), fip_cond(1)
 
    RETURN