Changeset 4822

Timestamp:

Feb 15, 2024, 7:35:57 PM (11 months ago)

Author:

fhourdin

Message:

Transport de la TKE par les thermiques

Location:

LMDZ6/trunk/libf/phylmd

Files:

• physiq_mod.F90 (modified) (3 diffs)
• yamada4.F90 (modified) (2 diffs)
• yamada_ini_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -759 +759 @@
     real therm_tke_max0(klon)   ! TKE dans les thermiques au LCL 
     real env_tke_max0(klon)     ! TKE dans l'environnement au LCL 
+    INTEGER, SAVE :: iflag_thermcell_tke ! transtport TKE by thermals
+    !$OMP THREADPRIVATE(iflag_thermcell_tke)
 
 !JLD    !---D\'eclenchement stochastique
@@ -1484 +1486 @@
        tau_gl=86400.*tau_gl
        WRITE(lunout,*) 'debut physiq_mod tau_gl=',tau_gl
+       iflag_thermcell_tke=0
+       call getin_p('iflag_thermcell_tke', iflag_thermcell_tke)                          !
 
        CALL getin_p('iflag_alp_wk_cond', iflag_alp_wk_cond) 
@@ -3774 +3778 @@
           ! Transport de la TKE par les panaches thermiques.
           ! FH : 2010/02/01
-          !     if (iflag_pbl.eq.10) then
-          !     call thermcell_dtke(klon,klev,nbsrf,pdtphys,fm_therm,entr_therm,
-          !    s           rg,paprs,pbl_tke)
-          !     endif
+               if (iflag_thermcell_tke==1) then
+               call thermcell_dtke(klon,klev,nbsrf,pdtphys,fm_therm,entr_therm,rg,paprs,pbl_tke)
+               endif
           ! -------------------------------------------------------------------
 

LMDZ6/trunk/libf/phylmd/yamada4.F90

@@ -8 +8 @@
   USE yamada_ini_mod, only : new_yamada4,yamada4_num,hboville
   USE yamada_ini_mod, only : prt_level, lunout,pbl_lmixmin_alpha,b1,kap,viscom,viscoh
-  USE yamada_ini_mod, only : ric, yun,ydeux,lmixmin
+  USE yamada_ini_mod, only : ric, yun,ydeux,lmixmin,iflag_vdif_q2
   
   IMPLICIT NONE
@@ -532 +532 @@
     !.......................................
 
-  IF (iflag_pbl>=12) THEN
+print*,'iflag_vdif_q2 =',iflag_vdif_q2
+  IF (iflag_vdif_q2==1) THEN
     q2(1:ngrid, 1) = q2(1:ngrid, 2)
     CALL vdif_q2(dt, g, rconst, ngrid, plev, temp, kq, q2)

LMDZ6/trunk/libf/phylmd/yamada_ini_mod.F90

@@ -16 +16 @@
   real :: ric, yun,ydeux,lmixmin,b1,kap,kapb
   !$OMP THREADPRIVATE(ric, yun,ydeux,lmixmin,b1,kap,kapb)
+  integer :: iflag_vdif_q2
+  !$OMP THREADPRIVATE(iflag_vdif_q2)
 
   real, dimension(:), allocatable, save :: l0
@@ -45 +47 @@
    new_yamada4=.false.
    CALL getin_p('new_yamada4',new_yamada4)
+
+   iflag_vdif_q2=1
+   CALL getin_p('iflag_vdif_q2',iflag_vdif_q2)