Changeset 2787 for LMDZ5/branches/testing/libf/phylmd/alpale_th.F90

Timestamp:

Jan 30, 2017, 5:54:45 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2727:2785 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/alpale_th.F90 (modified) (10 diffs)

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

@@ -38 +38 @@
   REAL, DIMENSION(klon), INTENT(INOUT)                       :: alp_bl
   REAL, DIMENSION(klon), INTENT(INOUT)                       :: alp_bl_stat
-
-  REAL, DIMENSION(klon), INTENT(OUT)                         :: proba_notrig, random_notrig
+  REAL, DIMENSION(klon), INTENT(INOUT)                       :: proba_notrig
+
+  REAL, DIMENSION(klon), INTENT(OUT)                         :: random_notrig
 
   include "thermcell.h"
@@ -73 +74 @@
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 !
+!!
+!!  The following 3 lines should be commented if one wants to activate the 
+!! multiplication of no-trigger probabilities between calls to the convection 
+!! scheme.
+!!
+             do i=1,klon
+                proba_notrig(i)=1.
+             enddo
+!!
+!!
 !---------------------------------------
   IF (iflag_clos_bl .LT. 3) THEN
@@ -97 +108 @@
              !----Initialisations
              do i=1,klon
-                proba_notrig(i)=1.
+!!jyg                proba_notrig(i)=1.
                 random_notrig(i)=1e6*ale_bl_stat(i)-int(1e6*ale_bl_stat(i))
                 if ( random_notrig(i) > random_notrig_max ) random_notrig(i)=0.
@@ -120 +131 @@
                 do i=1,klon
                    if ( (ale_bl_stat(i) .gt. abs(cin(i))+1.e-10) )  then
-                      proba_notrig(i)=(1.-exp(-s_trig/s2(i)))** &
-                           (n2(i)*dtime/tau_trig(i))
+                      proba_notrig(i)=proba_notrig(i)* &
+                         (1.-exp(-s_trig/s2(i)))**(n2(i)*dtime/tau_trig(i))
                       !        print *, 'proba_notrig(i) ',proba_notrig(i)
                       if (random_notrig(i) .ge. proba_notrig(i)) then 
@@ -129 +140 @@
                       endif
                    else
-                      proba_notrig(i)=1.
+!!jyg                      proba_notrig(i)=1.
                       random_notrig(i)=0.
                       ale_bl_trig(i)=0.
@@ -139 +150 @@
                 do i=1,klon
                    if ( (Ale_bl(i) .gt. abs(cin(i))+1.e-10) )  then
-                      proba_notrig(i)=(1.-exp(-s_trig/s2(i)))** &
-                           (n2(i)*dtime/tau_trig(i))
+                      proba_notrig(i)=proba_notrig(i)* &
+                         (1.-exp(-s_trig/s2(i)))**(n2(i)*dtime/tau_trig(i))
                       !        print *, 'proba_notrig(i) ',proba_notrig(i)
                       if (random_notrig(i) .ge. proba_notrig(i)) then 
@@ -148 +159 @@
                       endif
                    else
-                      proba_notrig(i)=1.
+!!jyg                      proba_notrig(i)=1.
                       random_notrig(i)=0.
                       ale_bl_trig(i)=0.
@@ -223 +234 @@
         !----Initializations and random number generation
         do i=1,klon
-           proba_notrig(i)=1.
+!!jyg           proba_notrig(i)=1.
            random_notrig(i)=1e6*ale_bl_stat(i)-int(1e6*ale_bl_stat(i))
            if ( ale_bl_trig(i) .lt. abs(cin(i))+1.e-10 ) then 
@@ -244 +255 @@
               birth_number = n2(i)*exp(-s_trig/s2(i))
               birth_rate(i) = birth_number/(tau_trig(i)*cell_area(i))
-              proba_notrig(i)=exp(-birth_number*dtime/tau_trig(i))
+              proba_notrig(i)=proba_notrig(i)*exp(-birth_number*dtime/tau_trig(i))
               Alp_bl(i) = Alp_bl(i)* &
                           umexp(-birth_number*cv_feed_area/cell_area(i))/ &
@@ -250 +261 @@
                           tau_trig(i)*cv_feed_area/(dtime*cell_area(i))
           else 
-              proba_notrig(i)=1.
+!!jyg              proba_notrig(i)=1.
               random_notrig(i)=0.
               alp_bl(i)=0.