Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/alpale_wk.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

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

LMDZ6/branches/DYNAMICO-conv/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) - &   ! Formules
-!!                exp(-wdens(:)*rpi*(wkrad(:)+cellrad(:))**2)             ! fausses !
-  proba_gf(:) = 1. - exp(-wdens(:)*rpi*((wkrad(:)+cellrad(:))**2 - &
-                                        max(wkrad(:)-cellrad(:),0.)**2) )
+  proba_gf(:) = exp(-wdens(:)*rpi*max(wkrad(:)-cellrad(:),0.)**2) - &
+                exp(-wdens(:)*rpi*(wkrad(:)+cellrad(:))**2)
 !
   proba_gf(:) = max(proba_gf(:),1.e-3)
@@ -77 +75 @@
 !!  print *,'alpale_wk: proba_gf(1), fip(1), ', proba_gf(1), fip(1)
   fip_cond(:) = fip(:)/proba_gf(:)
-!!    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)
+!!  print *,'alpale_wk: fip_cond(1) ', fip_cond(1)
 
    RETURN