Changeset 4413

Timestamp:

Feb 1, 2023, 5:47:09 PM (16 months ago)

Author:

evignon

Message:

pour les mini-projets: controle des coefficients pour le detrainement
et l'entrainement des downdrafts dans les .def

Location:

LMDZ6/trunk/libf/phylmd

Files:

• thermcell_ini_mod.F90 (modified) (3 diffs)
• thermcell_main.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/thermcell_ini_mod.F90

@@ -8 +8 @@
    integer        :: iflag_thermals_ed,iflag_thermals_optflux,iflag_thermals_closure
    integer        :: iflag_thermals_down
+   real           :: entrdn_coef, detrdn_coef
 
 !$OMP THREADPRIVATE(dvdq,dqimpl,prt_level,lunout)
@@ -14 +15 @@
 !$OMP THREADPRIVATE(iflag_thermals_ed,iflag_thermals_optflux,iflag_thermals_closure)
 !$OMP THREADPRIVATE(iflag_thermals_down)
+!$OMP THREADPRIVATE(entrdn_coef, detrdn_coef)
 
 
@@ -91 +93 @@
 
 
+   entrdn_coef = 0.5
+   CALL getin_p('entrdn_coef',entrdn_coef)
+
+   detrdn_coef = 0.5
+   CALL getin_p('detrdn_coef',detrdn_coef)
+
+
      CALL getin_p('thermals_fact_epsilon',fact_epsilon)
      CALL getin_p('thermals_betalpha',betalpha)

LMDZ6/trunk/libf/phylmd/thermcell_main.F90

@@ -19 +19 @@
       USE thermcell_ini_mod, ONLY: iflag_thermals_closure,iflag_thermals_ed,tau_thermals,r_aspect_thermals
       USE thermcell_ini_mod, ONLY: iflag_thermals_down
+      USE thermcell_ini_mod, ONLY: entrdn_coef, detrdn_coef
       USE thermcell_ini_mod, ONLY: RD,RG
 
@@ -134 +135 @@
       real, dimension(ngrid,nlay) :: zqsat,csc
       real, dimension(ngrid) :: zcon,zcon2,alim_star_tot,f
+      real, dimension(ngrid,nlay) :: entrdn,detrdn
 
       character (len=20) :: modname='thermcell_main'
@@ -502 +504 @@
         print*,'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
         print*,'WARNING !!! routine thermcell_down en cours de developpement'
-        ! on veut transporter la temperature potentielle, l'eau totale, qté de mouvement
-        CALL thermcell_updown_dq(ngrid,nlay,ptimestep,lmax,entr0,detr0,0.5*detr0,0.5*entr0,masse,zthl,zdthladj)
-        CALL thermcell_updown_dq(ngrid,nlay,ptimestep,lmax,entr0,detr0,0.5*detr0,0.5*entr0,masse,po,pdoadj)
-        CALL thermcell_updown_dq(ngrid,nlay,ptimestep,lmax,entr0,detr0,0.5*detr0,0.5*entr0,masse,zu,pduadj)
-        CALL thermcell_updown_dq(ngrid,nlay,ptimestep,lmax,entr0,detr0,0.5*detr0,0.5*entr0,masse,zv,pdvadj)
+        entrdn=entrdn_coef*detr0
+        detrdn=detrdn_coef*entr0 
+        ! we want to transport potential temperature, total water and momentum
+        CALL thermcell_updown_dq(ngrid,nlay,ptimestep,lmax,entr0,detr0,entrdn,detrdn,masse,zthl,zdthladj)
+        CALL thermcell_updown_dq(ngrid,nlay,ptimestep,lmax,entr0,detr0,entrdn,detrdn,masse,po,pdoadj)
+        CALL thermcell_updown_dq(ngrid,nlay,ptimestep,lmax,entr0,detr0,entrdn,detrdn,masse,zu,pduadj)
+        CALL thermcell_updown_dq(ngrid,nlay,ptimestep,lmax,entr0,detr0,entrdn,detrdn,masse,zv,pdvadj)
       ELSE
       !--------------------------------------------------------------