Changeset 2295

Timestamp:

Jun 12, 2015, 6:44:36 AM (9 years ago)

Author:

fhourdin

Message:

Correction du seuil sur la probabilite de non declenchement.
Changement de priorite de sortie sur deux variables.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• phys_output_ctrlout_mod.F90 (modified) (1 diff)
• physiq.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/phys_output_ctrlout_mod.F90

@@ -1085 +1085 @@
   TYPE(ctrl_out), SAVE :: o_wake_omg = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), &
     'wake_omg', 'wake_omg', ' ', (/ ('', i=1, 9) /))
-  TYPE(ctrl_out), SAVE :: o_wdtrainA = ctrl_out((/ 4, 1, 10,  4,  1, 10, 11, 11, 110 /), &
+  TYPE(ctrl_out), SAVE :: o_wdtrainA = ctrl_out((/ 4, 5, 10,  4,  1, 10, 11, 11, 110 /), &
     'wdtrainA', 'precipitation from AA', '-', (/ ('', i=1, 9) /))
-  TYPE(ctrl_out), SAVE :: o_wdtrainM = ctrl_out((/ 4, 1, 10,  4,  1, 10, 11, 11, 110 /), &
+  TYPE(ctrl_out), SAVE :: o_wdtrainM = ctrl_out((/ 4, 5, 10,  4,  1, 10, 11, 11, 110 /), &
     'wdtrainM', 'precipitation from mixture', '-', (/ ('', i=1, 9) /))
   TYPE(ctrl_out), SAVE :: o_Vprecip = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &

LMDZ5/trunk/libf/phylmd/physiq.F90

@@ -442 +442 @@
   integer :: tau_trig(klon)
 
-  REAL,SAVE :: random_notrig_max=1.01
+  REAL,SAVE :: random_notrig_max=1.
   !$OMP THREADPRIVATE(random_notrig_max) 
 
@@ -2740 +2740 @@
               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)=1.1
+              if ( random_notrig(i) > random_notrig_max ) random_notrig(i)=0.
               if ( ale_bl_trig(i) .lt. abs(cin(i))+1.e-10 ) then 
                  tau_trig(i)=tau_trig_shallow