Changeset 3356 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/alpale_th.F90

Timestamp:

Jun 29, 2018, 12:31:11 PM (7 years ago)

Author:

Laurent Fairhead

Message:

First attempt at merging with trunk

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

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

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/alpale_th.F90

@@ -3 +3 @@
                        ale_bl_trig, ale_bl_stat, ale_bl,  &
                        alp_bl, alp_bl_stat, &
-                       proba_notrig, random_notrig)
+                       proba_notrig, random_notrig, birth_rate)
 
 ! **************************************************************
@@ -42 +42 @@
   REAL, DIMENSION(klon), INTENT(OUT)                         :: random_notrig
 
+  REAL, DIMENSION(klon), INTENT(OUT)                         :: birth_rate
+
   include "thermcell.h"
 
@@ -53 +55 @@
   REAL, DIMENSION(klon)                                      :: ale_bl_ref
   REAL, DIMENSION(klon)                                      :: tau_trig
-  REAL, DIMENSION(klon)                                      :: birth_rate
 !
     !$OMP THREADPRIVATE(random_notrig_max) 
@@ -62 +63 @@
  REAL x
  umexp(x) = max(sign(1.,x-1.e-3),0.)*(1.-exp(-x))/max(x,1.e-3) + &
-            (1.-max(sign(1.,x-1.e-3),0.))*(1.-0.5*x*(1.-x/3.*(1.-0.25*x)))
+            (1.-max(sign(1.,x-1.e-3),0.))*(1.-0.5*x*(1.-x/3.*(1.-0.25*x)))  !!! correct formula            (jyg)
+!!!            (1.-max(sign(1.,x-1.e-3),0.))*(-0.5*x*(1.-x/3.*(1.-0.25*x))) !!! bug introduced by mistake  (jyg)
+!!!            (1.-max(sign(1.,x-1.e-3),0.))*(1.-0.5*x*(1.-x/3.*(1.-0.25*x)))  !!! initial correct formula (jyg)
 !
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -101 +104 @@
              !
              IF (prt_level .GE. 10) THEN
-                print *,'cin, ale_bl_stat, alp_bl_stat ', &
-                     cin, ale_bl_stat, alp_bl_stat
+                print *,'cin, ale_bl_stat, alp_bl, alp_bl_stat ', &
+                     cin, ale_bl_stat, alp_bl, alp_bl_stat
              ENDIF
 
@@ -139 +142 @@
                          ale_bl_trig(i)=0.
                       endif
+                      birth_rate(i) = n2(i)*exp(-s_trig/s2(i))/(tau_trig(i)*cell_area(i))
+!!!                      birth_rate(i) = max(birth_rate(i),1.e-18)
                    else
 !!jyg                      proba_notrig(i)=1.
+                      birth_rate(i) = 0.
                       random_notrig(i)=0.
                       ale_bl_trig(i)=0.
@@ -158 +164 @@
                          ale_bl_trig(i)=0.
                       endif
+                      birth_rate(i) = n2(i)*exp(-s_trig/s2(i))/(tau_trig(i)*cell_area(i))
+!!!                      birth_rate(i) = max(birth_rate(i),1.e-18)
                    else
 !!jyg                      proba_notrig(i)=1.
+                      birth_rate(i) = 0.
                       random_notrig(i)=0.
                       ale_bl_trig(i)=0.
@@ -255 +264 @@
               birth_number = n2(i)*exp(-s_trig/s2(i))
               birth_rate(i) = birth_number/(tau_trig(i)*cell_area(i))
+!!!              birth_rate(i) = max(birth_rate(i),1.e-18)
               proba_notrig(i)=proba_notrig(i)*exp(-birth_number*dtime/tau_trig(i))
               Alp_bl(i) = Alp_bl(i)* &
@@ -262 +272 @@
           else 
 !!jyg              proba_notrig(i)=1.
+              birth_rate(i)=0.
               random_notrig(i)=0.
               alp_bl(i)=0.
@@ -289 +300 @@
 
           IF (prt_level .GE. 10) THEN
-             print *,'ale_bl_trig, alp_bl_stat ',ale_bl_trig, alp_bl_stat
+             print *,'alpale_th: ale_bl_trig, alp_bl_stat, birth_rate ', &
+                      ale_bl_trig(1), alp_bl_stat(1), birth_rate(1)
           ENDIF