Index: LMDZ6/trunk/libf/phylmdiso/phyetat0.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/phyetat0.F90 (revision 4039) +++ LMDZ6/trunk/libf/phylmdiso/phyetat0.F90 (revision 4040) @@ -21,5 +21,5 @@ solsw, solswfdiff, t_ancien, u_ancien, v_ancien, w01, wake_cstar, wake_deltaq, & wake_deltat, wake_delta_pbl_TKE, delta_tsurf, beta_aridity, wake_fip, wake_pe, & - wake_s, wake_dens, zgam, zmax0, zmea, zpic, zsig, & + wake_s, wake_dens, awake_dens, cv_gen, zgam, zmax0, zmea, zpic, zsig, & #ifdef ISO fxtevap, xtsol, xt_ancien, xtl_ancien, xts_ancien, wake_deltaxt, & @@ -442,4 +442,6 @@ !! found=phyetat0_get(1,wake_dens,"WAKE_DENS","Wake num. /unit area",0.) found=phyetat0_get(1,wake_dens,"WAKE_DENS","Wake num. /unit area",-1000.) + found=phyetat0_get(1,awake_dens,"AWAKE_DENS","Active Wake num. /unit area",0.) + found=phyetat0_get(1,cv_gen,"CV_GEN","CB birth rate",0.) !>jyg found=phyetat0_get(1,wake_cstar,"WAKE_CSTAR","WAKE_CSTAR",0.) @@ -463,5 +465,4 @@ ! fisrtilp/Clouds 0.002 could be ratqsbas. But can stay like this as well found=phyetat0_get(klev,ratqs_inter,"RATQS_INTER","Relative width of the lsc sugrid scale water",0.002) - !=========================================== @@ -596,5 +597,4 @@ end where end if - ! on ferme le fichier Index: LMDZ6/trunk/libf/phylmdiso/phys_local_var_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/phys_local_var_mod.F90 (revision 4039) +++ LMDZ6/trunk/libf/phylmdiso/phys_local_var_mod.F90 (revision 4040) @@ -16,6 +16,6 @@ REAL, SAVE, ALLOCATABLE :: u_seri(:,:), v_seri(:,:) !$OMP THREADPRIVATE(u_seri, v_seri) - REAL, SAVE, ALLOCATABLE :: l_mixmin(:,:,:), l_mix(:,:,:), tke_dissip(:,:,:), wprime(:,:,:) - !$OMP THREADPRIVATE(l_mixmin, l_mix, tke_dissip, wprime) + REAL, SAVE, ALLOCATABLE :: l_mixmin(:,:,:),l_mix(:,:,:),tke_dissip(:,:,:), wprime(:,:,:) + !$OMP THREADPRIVATE(l_mixmin, l_mix, tke_dissip,wprime) REAL, SAVE, ALLOCATABLE :: tr_seri(:,:,:) !$OMP THREADPRIVATE(tr_seri) @@ -465,6 +465,4 @@ REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: proba_notrig, random_notrig !$OMP THREADPRIVATE(proba_notrig, random_notrig) - REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: cv_gen -!$OMP THREADPRIVATE(cv_gen) REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: fsolsw, wfbils, wfbilo !$OMP THREADPRIVATE(fsolsw, wfbils, wfbilo) @@ -693,6 +691,6 @@ ALLOCATE(t_seri(klon,klev),q_seri(klon,klev),ql_seri(klon,klev),qs_seri(klon,klev)) ALLOCATE(u_seri(klon,klev),v_seri(klon,klev)) - ALLOCATE(l_mixmin(klon,klev+1,nbsrf), l_mix(klon,klev+1,nbsrf), tke_dissip(klon,klev+1,nbsrf), wprime(klon,klev+1,nbsrf)) - l_mix(:,:,:)=0. ; l_mixmin(:,:,:)=0. ; tke_dissip(:,:,:)=0. ; wprime(:,:,:)=0. ! doit etre initialse car pas toujours remplis + ALLOCATE(l_mixmin(klon,klev+1,nbsrf),l_mix(klon,klev+1,nbsrf),tke_dissip(klon,klev+1,nbsrf),wprime(klon,klev+1,nbsrf)) + l_mix(:,:,:)=0.;l_mixmin(:,:,:)=0.;tke_dissip(:,:,:)=0.;wprime(:,:,:)=0. ! doit etre initialse car pas toujours remplis ALLOCATE(tr_seri(klon,klev,nbtr)) @@ -949,5 +947,4 @@ alp_bl_stat(:)=0 ALLOCATE(proba_notrig(klon), random_notrig(klon)) - ALLOCATE(cv_gen(klon)) ALLOCATE(dnwd0(klon, klev)) @@ -1090,5 +1087,5 @@ DEALLOCATE(t_seri,q_seri,ql_seri,qs_seri) DEALLOCATE(u_seri,v_seri) - DEALLOCATE(l_mixmin,l_mix, tke_dissip, wprime) + DEALLOCATE(l_mixmin,l_mix, tke_dissip,wprime) DEALLOCATE(tr_seri) @@ -1311,5 +1308,4 @@ DEALLOCATE(alp_bl_stat, n2, s2) DEALLOCATE(proba_notrig, random_notrig) - DEALLOCATE(cv_gen) DEALLOCATE(dnwd0) Index: LMDZ6/trunk/libf/phylmdiso/phys_output_write_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/phys_output_write_mod.F90 (revision 4039) +++ LMDZ6/trunk/libf/phylmdiso/phys_output_write_mod.F90 (revision 4040) @@ -246,5 +246,5 @@ wstar, cape, ema_pcb, ema_pct, & ema_cbmf, Mipsh, Ma, fm_therm, ale_bl, alp_bl, ale, & - alp, cin, wake_pe, wake_dens, wake_s, wake_deltat, & + alp, cin, wake_pe, wake_dens, cv_gen, wake_s, wake_deltat, & wake_deltaq, ftd, fqd, ale_bl_trig, albsol1, & ale_wake, ale_bl_stat, & @@ -288,5 +288,5 @@ cdragh_x ,cdragh_w ,cdragm_x ,cdragm_w , & kh ,kh_x ,kh_w , & - cv_gen, wake_h, & + wake_h, & wake_omg, d_t_wake, d_q_wake, Vprecip, qtaa, Clw, & wdtrainA, wdtrainS, wdtrainM, n2, s2, proba_notrig, & @@ -857,5 +857,4 @@ CALL histwrite_phy(o_u10m, zu10m) CALL histwrite_phy(o_v10m, zv10m) - IF (vars_defined) THEN @@ -1458,7 +1457,7 @@ CALL histwrite_phy(o_slab_bils, slab_wfbils) IF (nslay.EQ.1) THEN - zx_tmp_fi2d(:)=tslab(:,1) + IF (vars_defined) zx_tmp_fi2d(:)=tslab(:,1) CALL histwrite_phy(o_tslab, zx_tmp_fi2d) - zx_tmp_fi2d(:)=dt_qflux(:,1) + IF (vars_defined) zx_tmp_fi2d(:)=dt_qflux(:,1) CALL histwrite_phy(o_slab_qflux, zx_tmp_fi2d) ELSE @@ -1476,5 +1475,5 @@ IF (slab_hdiff) THEN IF (nslay.EQ.1) THEN - zx_tmp_fi2d(:)=dt_hdiff(:,1) + IF (vars_defined) zx_tmp_fi2d(:)=dt_hdiff(:,1) CALL histwrite_phy(o_slab_hdiff, zx_tmp_fi2d) ELSE @@ -1484,5 +1483,5 @@ IF (slab_ekman.GT.0) THEN IF (nslay.EQ.1) THEN - zx_tmp_fi2d(:)=dt_ekman(:,1) + IF (vars_defined) zx_tmp_fi2d(:)=dt_ekman(:,1) CALL histwrite_phy(o_slab_ekman, zx_tmp_fi2d) ELSE Index: LMDZ6/trunk/libf/phylmdiso/phys_state_var_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/phys_state_var_mod.F90 (revision 4039) +++ LMDZ6/trunk/libf/phylmdiso/phys_state_var_mod.F90 (revision 4040) @@ -263,4 +263,5 @@ ! awake_dens : number of active wakes per unit area ! wake_dens : number of wakes per unit area +! cv_gen : birth rate of cumulonimbus per unit area. ! wake_occ : occurence of wakes (= 1 if wakes occur, =0 otherwise) ! wake_Cstar : vitesse d'etalement de la poche @@ -279,4 +280,6 @@ REAL,ALLOCATABLE,SAVE :: awake_dens(:), wake_dens(:) !$OMP THREADPRIVATE(awake_dens, wake_dens) + REAL,ALLOCATABLE,SAVE :: cv_gen(:) +!$OMP THREADPRIVATE(cv_gen) REAL,ALLOCATABLE,SAVE :: wake_Cstar(:) !$OMP THREADPRIVATE(wake_Cstar) @@ -525,5 +528,5 @@ print*, 'allocate falb' ALLOCATE(falb_dir(klon,nsw,nbsrf),falb_dif(klon,nsw,nbsrf)) - print*, 'allocate falb good', falb_dir(1,1,1) +!! print*, 'allocate falb good', falb_dir(1,1,1) ALLOCATE(chl_con(klon)) !albedo SB <<< @@ -623,5 +626,6 @@ ALLOCATE(wake_deltat(klon,klev), wake_deltaq(klon,klev)) ALLOCATE(wake_s(klon), awake_dens(klon), wake_dens(klon)) - awake_dens = 0. +!! awake_dens = 0. ! initialized in phyetat0 + ALLOCATE(cv_gen(klon)) ALLOCATE(wake_Cstar(klon)) ALLOCATE(wake_pe(klon), wake_fip(klon)) @@ -795,4 +799,5 @@ DEALLOCATE(wake_deltat, wake_deltaq) DEALLOCATE(wake_s, awake_dens, wake_dens) + DEALLOCATE(cv_gen) DEALLOCATE(wake_Cstar, wake_pe, wake_fip) !jyg< Index: LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (revision 4039) +++ LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (revision 4040) @@ -264,5 +264,5 @@ d_t_vdf_x, d_t_vdf_w, & d_q_vdf_x, d_q_vdf_w, & - pbl_tke_input, tke_dissip, l_mix, wprime, & + pbl_tke_input, tke_dissip, l_mix, wprime,& t_therm, q_therm, u_therm, v_therm, & cdragh_x, cdragh_w, & @@ -291,5 +291,5 @@ alp_bl_stat, n2, s2, & proba_notrig, random_notrig, & - cv_gen, & +!! cv_gen, & !moved to phys_state_var_mod ! dnwd0, &