Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/alpale_th.F90
- Timestamp:
- Nov 5, 2018, 3:24:59 PM (6 years ago)
- Location:
- LMDZ6/branches/DYNAMICO-conv
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/branches/DYNAMICO-conv
- Property svn:mergeinfo changed
/LMDZ6/trunk removed
- Property svn:mergeinfo changed
-
LMDZ6/branches/DYNAMICO-conv/libf/phylmd/alpale_th.F90
r3356 r3411 3 3 ale_bl_trig, ale_bl_stat, ale_bl, & 4 4 alp_bl, alp_bl_stat, & 5 proba_notrig, random_notrig , birth_rate)5 proba_notrig, random_notrig) 6 6 7 7 ! ************************************************************** … … 42 42 REAL, DIMENSION(klon), INTENT(OUT) :: random_notrig 43 43 44 REAL, DIMENSION(klon), INTENT(OUT) :: birth_rate45 46 44 include "thermcell.h" 47 45 … … 55 53 REAL, DIMENSION(klon) :: ale_bl_ref 56 54 REAL, DIMENSION(klon) :: tau_trig 55 REAL, DIMENSION(klon) :: birth_rate 57 56 ! 58 57 !$OMP THREADPRIVATE(random_notrig_max) … … 63 62 REAL x 64 63 umexp(x) = max(sign(1.,x-1.e-3),0.)*(1.-exp(-x))/max(x,1.e-3) + & 65 (1.-max(sign(1.,x-1.e-3),0.))*(1.-0.5*x*(1.-x/3.*(1.-0.25*x))) !!! correct formula (jyg) 66 !!! (1.-max(sign(1.,x-1.e-3),0.))*(-0.5*x*(1.-x/3.*(1.-0.25*x))) !!! bug introduced by mistake (jyg) 67 !!! (1.-max(sign(1.,x-1.e-3),0.))*(1.-0.5*x*(1.-x/3.*(1.-0.25*x))) !!! initial correct formula (jyg) 64 (1.-max(sign(1.,x-1.e-3),0.))*(1.-0.5*x*(1.-x/3.*(1.-0.25*x))) 68 65 ! 69 66 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ … … 104 101 ! 105 102 IF (prt_level .GE. 10) THEN 106 print *,'cin, ale_bl_stat, alp_bl , alp_bl_stat ', &107 cin, ale_bl_stat, alp_bl , alp_bl_stat103 print *,'cin, ale_bl_stat, alp_bl_stat ', & 104 cin, ale_bl_stat, alp_bl_stat 108 105 ENDIF 109 106 … … 142 139 ale_bl_trig(i)=0. 143 140 endif 144 birth_rate(i) = n2(i)*exp(-s_trig/s2(i))/(tau_trig(i)*cell_area(i))145 !!! birth_rate(i) = max(birth_rate(i),1.e-18)146 141 else 147 142 !!jyg proba_notrig(i)=1. 148 birth_rate(i) = 0.149 143 random_notrig(i)=0. 150 144 ale_bl_trig(i)=0. … … 164 158 ale_bl_trig(i)=0. 165 159 endif 166 birth_rate(i) = n2(i)*exp(-s_trig/s2(i))/(tau_trig(i)*cell_area(i))167 !!! birth_rate(i) = max(birth_rate(i),1.e-18)168 160 else 169 161 !!jyg proba_notrig(i)=1. 170 birth_rate(i) = 0.171 162 random_notrig(i)=0. 172 163 ale_bl_trig(i)=0. … … 264 255 birth_number = n2(i)*exp(-s_trig/s2(i)) 265 256 birth_rate(i) = birth_number/(tau_trig(i)*cell_area(i)) 266 !!! birth_rate(i) = max(birth_rate(i),1.e-18)267 257 proba_notrig(i)=proba_notrig(i)*exp(-birth_number*dtime/tau_trig(i)) 268 258 Alp_bl(i) = Alp_bl(i)* & … … 272 262 else 273 263 !!jyg proba_notrig(i)=1. 274 birth_rate(i)=0.275 264 random_notrig(i)=0. 276 265 alp_bl(i)=0. … … 300 289 301 290 IF (prt_level .GE. 10) THEN 302 print *,'alpale_th: ale_bl_trig, alp_bl_stat, birth_rate ', & 303 ale_bl_trig(1), alp_bl_stat(1), birth_rate(1) 291 print *,'ale_bl_trig, alp_bl_stat ',ale_bl_trig, alp_bl_stat 304 292 ENDIF 305 293
Note: See TracChangeset
for help on using the changeset viewer.