Changeset 4381

Timestamp:

Jan 13, 2023, 11:39:28 AM (16 months ago)

Author:

evignon

Message:

pour les downdrafts, suppression de la cle de compilation pour protection sous flag
iflag_thermals_down
+ stop si le flux compensatoire est vers le haut

Location:

LMDZ6/trunk/libf/phylmd

Files:

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

LMDZ6/trunk/libf/phylmd/thermcell_down.F90

@@ -4 +4 @@
 ! thermcell_updown_dq: calcul du transport d'un traceur en pr??sence 
 ! d'up/down drafts
+!
 !--------------------------------------------------------------
 
@@ -83 +84 @@
        fthd(ig,ilay)=-fdn(ig,ilay)*thetad(ig,ilay)
        !!!!ATTENTION HYPOTHESE de FLUX COMPENSATOIRE DESCENDANT ET DONC comme schema amont on va chercher theta au dessus!!!!!
+       !!!! si ce n'est pas le cas on stoppe le code !!!!
+       if (fup(ig,ilay)-fdn(ig,ilay) .lt. 0.) then
+          write(*,*) 'flux compensatoire montant, cas non traite par thermcell_updown_dq'
+          stop          
+       endif
        fthe(ig,ilay)=-(fup(ig,ilay)-fdn(ig,ilay))*theta(ig,ilay)
        fthtot(ig,ilay)=fthu(ig,ilay)+fthd(ig,ilay)+fthe(ig,ilay)

LMDZ6/trunk/libf/phylmd/thermcell_ini_mod.F90

@@ -7 +7 @@
    real           :: r_aspect_thermals,tau_thermals,fact_thermals_ed_dz
    integer        :: iflag_thermals_ed,iflag_thermals_optflux,iflag_thermals_closure
-
+   integer        :: iflag_thermals_down
 
 !$OMP THREADPRIVATE(dvdq,dqimpl,prt_level,lunout)
@@ -13 +13 @@
 !$OMP THREADPRIVATE(r_aspect_thermals,tau_thermals,fact_thermals_ed_dz)
 !$OMP THREADPRIVATE(iflag_thermals_ed,iflag_thermals_optflux,iflag_thermals_closure)
+!$OMP THREADPRIVATE(iflag_thermals_down)
+
 
    REAL, SAVE :: fact_epsilon=0.002
@@ -85 +87 @@
    CALL getin_p('iflag_thermals_closure',iflag_thermals_closure)
 
+   iflag_thermals_down = 0
+   CALL getin_p('iflag_thermals_down',iflag_thermals_down)
+
+
      CALL getin_p('thermals_fact_epsilon',fact_epsilon)
      CALL getin_p('thermals_betalpha',betalpha)

LMDZ6/trunk/libf/phylmd/thermcell_main.F90

@@ -18 +18 @@
       USE thermcell_ini_mod, ONLY: thermcell_ini,dqimpl,dvdq,prt_level,lunout,prt_level
       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: RD,RG
 
@@ -481 +482 @@
 !   calcul du transport vertical
 !------------------------------------------------------------------
-
-#undef DevThermcellDown
-#ifdef DevThermcellDown
-      print*,'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
-      print*,'WARNING !!! routine thermcell_down en cours de developpement'
-      CALL thermcell_updown_dq(ngrid,nlay,ptimestep,lmax,entr0,detr0,0.5*detr0,0.5*entr0,masse,zthl)
-!--------------------------------------------------------------
-#endif
+      IF (iflag_thermals_down .GT. 0) THEN
+        print*,'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+        print*,'WARNING !!! routine thermcell_down en cours de developpement'
+        CALL thermcell_updown_dq(ngrid,nlay,ptimestep,lmax,entr0,detr0,0.5*detr0,0.5*entr0,masse,zthl)
+      ENDIF
+      !--------------------------------------------------------------
 
       call thermcell_dq(ngrid,nlay,dqimpl,ptimestep,fm0,entr0,masse,  &