Changeset 4040 for LMDZ6/trunk/libf


Ignore:
Timestamp:
Dec 1, 2021, 10:28:05 AM (3 years ago)
Author:
crisi
Message:

mettre à jour avec le cv_gen

Location:
LMDZ6/trunk/libf/phylmdiso
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/trunk/libf/phylmdiso/phyetat0.F90

    r4036 r4040  
    2121       solsw, solswfdiff, t_ancien, u_ancien, v_ancien, w01, wake_cstar, wake_deltaq, &
    2222       wake_deltat, wake_delta_pbl_TKE, delta_tsurf, beta_aridity, wake_fip, wake_pe, &
    23        wake_s, wake_dens, zgam, zmax0, zmea, zpic, zsig, &
     23       wake_s, wake_dens, awake_dens, cv_gen, zgam, zmax0, zmea, zpic, zsig, &
    2424#ifdef ISO
    2525       fxtevap, xtsol, xt_ancien, xtl_ancien, xts_ancien, wake_deltaxt, &
     
    442442!!  found=phyetat0_get(1,wake_dens,"WAKE_DENS","Wake num. /unit area",0.)
    443443  found=phyetat0_get(1,wake_dens,"WAKE_DENS","Wake num. /unit area",-1000.)
     444  found=phyetat0_get(1,awake_dens,"AWAKE_DENS","Active Wake num. /unit area",0.)
     445  found=phyetat0_get(1,cv_gen,"CV_GEN","CB birth rate",0.)
    444446!>jyg
    445447  found=phyetat0_get(1,wake_cstar,"WAKE_CSTAR","WAKE_CSTAR",0.)
     
    463465! fisrtilp/Clouds 0.002 could be ratqsbas. But can stay like this as well
    464466  found=phyetat0_get(klev,ratqs_inter,"RATQS_INTER","Relative width of the lsc sugrid scale water",0.002)
    465 
    466467
    467468!===========================================
     
    596597     end where
    597598  end if
    598  
    599599
    600600  ! on ferme le fichier
  • LMDZ6/trunk/libf/phylmdiso/phys_local_var_mod.F90

    r4009 r4040  
    1616      REAL, SAVE, ALLOCATABLE :: u_seri(:,:), v_seri(:,:)
    1717      !$OMP THREADPRIVATE(u_seri, v_seri)
    18       REAL, SAVE, ALLOCATABLE :: l_mixmin(:,:,:), l_mix(:,:,:), tke_dissip(:,:,:), wprime(:,:,:)
    19       !$OMP THREADPRIVATE(l_mixmin, l_mix, tke_dissip, wprime)
     18      REAL, SAVE, ALLOCATABLE :: l_mixmin(:,:,:),l_mix(:,:,:),tke_dissip(:,:,:), wprime(:,:,:)
     19      !$OMP THREADPRIVATE(l_mixmin, l_mix, tke_dissip,wprime)
    2020      REAL, SAVE, ALLOCATABLE :: tr_seri(:,:,:)
    2121      !$OMP THREADPRIVATE(tr_seri)
     
    465465      REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: proba_notrig, random_notrig
    466466!$OMP THREADPRIVATE(proba_notrig, random_notrig)
    467       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: cv_gen
    468 !$OMP THREADPRIVATE(cv_gen)
    469467      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: fsolsw, wfbils, wfbilo
    470468!$OMP THREADPRIVATE(fsolsw, wfbils, wfbilo)
     
    693691      ALLOCATE(t_seri(klon,klev),q_seri(klon,klev),ql_seri(klon,klev),qs_seri(klon,klev))
    694692      ALLOCATE(u_seri(klon,klev),v_seri(klon,klev))
    695       ALLOCATE(l_mixmin(klon,klev+1,nbsrf), l_mix(klon,klev+1,nbsrf), tke_dissip(klon,klev+1,nbsrf), wprime(klon,klev+1,nbsrf))
    696       l_mix(:,:,:)=0. ; l_mixmin(:,:,:)=0. ; tke_dissip(:,:,:)=0. ; wprime(:,:,:)=0. ! doit etre initialse car pas toujours remplis
     693      ALLOCATE(l_mixmin(klon,klev+1,nbsrf),l_mix(klon,klev+1,nbsrf),tke_dissip(klon,klev+1,nbsrf),wprime(klon,klev+1,nbsrf))
     694      l_mix(:,:,:)=0.;l_mixmin(:,:,:)=0.;tke_dissip(:,:,:)=0.;wprime(:,:,:)=0. ! doit etre initialse car pas toujours remplis
    697695
    698696      ALLOCATE(tr_seri(klon,klev,nbtr))
     
    949947      alp_bl_stat(:)=0
    950948      ALLOCATE(proba_notrig(klon), random_notrig(klon))
    951       ALLOCATE(cv_gen(klon))
    952949
    953950      ALLOCATE(dnwd0(klon, klev))
     
    10901087      DEALLOCATE(t_seri,q_seri,ql_seri,qs_seri)
    10911088      DEALLOCATE(u_seri,v_seri)
    1092       DEALLOCATE(l_mixmin,l_mix, tke_dissip, wprime)
     1089      DEALLOCATE(l_mixmin,l_mix, tke_dissip,wprime)
    10931090
    10941091      DEALLOCATE(tr_seri)
     
    13111308      DEALLOCATE(alp_bl_stat, n2, s2)
    13121309      DEALLOCATE(proba_notrig, random_notrig)
    1313       DEALLOCATE(cv_gen)
    13141310
    13151311      DEALLOCATE(dnwd0)
  • LMDZ6/trunk/libf/phylmdiso/phys_output_write_mod.F90

    r4036 r4040  
    246246         wstar, cape, ema_pcb, ema_pct, &
    247247         ema_cbmf, Mipsh, Ma, fm_therm, ale_bl, alp_bl, ale, &
    248          alp, cin, wake_pe, wake_dens, wake_s, wake_deltat, &
     248         alp, cin, wake_pe, wake_dens, cv_gen, wake_s, wake_deltat, &
    249249         wake_deltaq, ftd, fqd, ale_bl_trig, albsol1, &
    250250         ale_wake, ale_bl_stat, &
     
    288288         cdragh_x   ,cdragh_w   ,cdragm_x   ,cdragm_w   , &
    289289         kh         ,kh_x       ,kh_w       , &
    290          cv_gen, wake_h, &
     290         wake_h, &
    291291         wake_omg, d_t_wake, d_q_wake, Vprecip, qtaa, Clw, &
    292292         wdtrainA, wdtrainS, wdtrainM, n2, s2, proba_notrig, &
     
    857857       CALL histwrite_phy(o_u10m, zu10m)
    858858       CALL histwrite_phy(o_v10m, zv10m)
    859 
    860859
    861860       IF (vars_defined) THEN
     
    14581457          CALL histwrite_phy(o_slab_bils, slab_wfbils)
    14591458          IF (nslay.EQ.1) THEN
    1460               zx_tmp_fi2d(:)=tslab(:,1)
     1459              IF (vars_defined) zx_tmp_fi2d(:)=tslab(:,1)
    14611460              CALL histwrite_phy(o_tslab, zx_tmp_fi2d)
    1462               zx_tmp_fi2d(:)=dt_qflux(:,1)
     1461              IF (vars_defined) zx_tmp_fi2d(:)=dt_qflux(:,1)
    14631462              CALL histwrite_phy(o_slab_qflux, zx_tmp_fi2d)
    14641463          ELSE
     
    14761475          IF (slab_hdiff) THEN
    14771476            IF (nslay.EQ.1) THEN
    1478                 zx_tmp_fi2d(:)=dt_hdiff(:,1)
     1477                IF (vars_defined) zx_tmp_fi2d(:)=dt_hdiff(:,1)
    14791478                CALL histwrite_phy(o_slab_hdiff, zx_tmp_fi2d)
    14801479            ELSE
     
    14841483          IF (slab_ekman.GT.0) THEN
    14851484            IF (nslay.EQ.1) THEN
    1486                 zx_tmp_fi2d(:)=dt_ekman(:,1)
     1485                IF (vars_defined) zx_tmp_fi2d(:)=dt_ekman(:,1)
    14871486                CALL histwrite_phy(o_slab_ekman, zx_tmp_fi2d)
    14881487            ELSE
  • LMDZ6/trunk/libf/phylmdiso/phys_state_var_mod.F90

    r3940 r4040  
    263263! awake_dens  : number of active wakes per unit area
    264264! wake_dens   : number of wakes per unit area
     265! cv_gen      : birth rate of cumulonimbus per unit area.
    265266! wake_occ    : occurence of wakes (= 1 if wakes occur, =0 otherwise)
    266267! wake_Cstar  : vitesse d'etalement de la poche
     
    279280      REAL,ALLOCATABLE,SAVE :: awake_dens(:), wake_dens(:)
    280281!$OMP THREADPRIVATE(awake_dens, wake_dens)
     282      REAL,ALLOCATABLE,SAVE :: cv_gen(:)
     283!$OMP THREADPRIVATE(cv_gen)
    281284      REAL,ALLOCATABLE,SAVE :: wake_Cstar(:)
    282285!$OMP THREADPRIVATE(wake_Cstar)
     
    525528      print*, 'allocate falb'
    526529      ALLOCATE(falb_dir(klon,nsw,nbsrf),falb_dif(klon,nsw,nbsrf))
    527       print*, 'allocate falb good', falb_dir(1,1,1)
     530!!      print*, 'allocate falb good', falb_dir(1,1,1)
    528531      ALLOCATE(chl_con(klon))
    529532!albedo SB <<<
     
    623626      ALLOCATE(wake_deltat(klon,klev), wake_deltaq(klon,klev))
    624627      ALLOCATE(wake_s(klon), awake_dens(klon), wake_dens(klon))
    625       awake_dens = 0.
     628!!      awake_dens = 0.  ! initialized in phyetat0
     629      ALLOCATE(cv_gen(klon))
    626630      ALLOCATE(wake_Cstar(klon))
    627631      ALLOCATE(wake_pe(klon), wake_fip(klon))
     
    795799      DEALLOCATE(wake_deltat, wake_deltaq)
    796800      DEALLOCATE(wake_s, awake_dens, wake_dens)
     801      DEALLOCATE(cv_gen)
    797802      DEALLOCATE(wake_Cstar, wake_pe, wake_fip)
    798803!jyg<
  • LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

    r4036 r4040  
    264264       d_t_vdf_x, d_t_vdf_w, &
    265265       d_q_vdf_x, d_q_vdf_w, &
    266        pbl_tke_input, tke_dissip, l_mix, wprime, &
     266       pbl_tke_input, tke_dissip, l_mix, wprime,&
    267267       t_therm, q_therm, u_therm, v_therm, &
    268268       cdragh_x, cdragh_w, &
     
    291291       alp_bl_stat, n2, s2,  &
    292292       proba_notrig, random_notrig,  &
    293        cv_gen,  &
     293!!       cv_gen,  &  !moved to phys_state_var_mod
    294294       !
    295295       dnwd0,  &
Note: See TracChangeset for help on using the changeset viewer.