Changeset 4843 for LMDZ6/trunk/libf/phylmd/lmdz_thermcell_main.F90

Timestamp:

Mar 4, 2024, 6:58:03 PM (3 months ago)

Author:

crio

Message:

Nouvelle formulation du strig et correction thermiques montent trop haut

File:

• LMDZ6/trunk/libf/phylmd/lmdz_thermcell_main.F90 (modified) (6 diffs)

LMDZ6/trunk/libf/phylmd/lmdz_thermcell_main.F90

@@ -15 +15 @@
      &                  ,zmax0, f0,zw2,fraca,ztv &
      &                  ,zpspsk,ztla,zthl,ztva &
-     &                  ,pcon,rhobarz,wth3,wmax_sec,lalim,fm,alim_star,zmax &
+     &                  ,pcon,rhobarz,wth3,wmax_sec,lalim,fm,alim_star,zmax,zcong &
 #ifdef ISO         
      &      ,xtpo,xtpdoadj &
@@ -134 +134 @@
       real, intent(out), dimension(ngrid,nlay+1) :: fm
       real, intent(out), dimension(ngrid,nlay) :: alim_star
-      real, intent(out), dimension(ngrid) :: zmax
+      real, intent(out), dimension(ngrid) :: zmax,zcong
 
 !   local:
@@ -150 +150 @@
       integer ig,k,l,ierr,ll
       logical sorties
-      real, dimension(ngrid) :: linter,zmix, zmax_sec
-      integer,dimension(ngrid) :: lmin,lmix,lmix_bis,nivcon
+      real, dimension(ngrid) :: linter,zmix, zmax_sec,lintercong
+      integer,dimension(ngrid) :: lmin,lmix,lmix_bis,nivcon, lcong
       real, dimension(ngrid,nlay) :: ztva_est
       real, dimension(ngrid,nlay) :: deltaz,zlay,zdthladj,zu,zv,z_o,zl,zva,zua,z_oa
@@ -227 +227 @@
 
           CALL thermcell_env(ngrid,nlay,p_o,ptemp_env,puwind,pvwind,pplay,  &
-         &           pplev,z_o,ztemp_env,zl,ztv,zthl,zu,zv,zpspsk,zqsat,lev_out)
+         &           pplev,z_o,ztemp_env,zl,ztv,zthl,zu,zv,zpspsk,zqsat,lcong,lintercong,lev_out)
 
       else
@@ -456 +456 @@
 !-------------------------------------------------------------------------------
 !
-      CALL thermcell_height(ngrid,nlay,lalim,lmin,linter,lmix,zw2,  &
-     &           zlev,lmax,zmax,zmax0,zmix,wmax)
+      CALL thermcell_height(ngrid,nlay,lalim,lmin,linter,lcong,lintercong,lmix,zw2,  &
+     &           zlev,lmax,zmax,zmax0,zmix,wmax,zcong)
 ! Attention, w2 est transforme en sa racine carree dans cette routine
 ! Le probleme vient du fait que linter et lmix sont souvent egaux a 1.
@@ -729 +729 @@
         endif
       enddo
-      if (ierr==1) then
-           abort_message = 'thermcellV0_main: les thermiques vont trop haut '
-           CALL abort_physic (modname,abort_message,1)
-      endif
+!      if (ierr==1) then
+!           abort_message = 'thermcellV0_main: les thermiques vont trop haut '
+!           CALL abort_physic (modname,abort_message,1)
+!      endif
 
       if (prt_level.ge.1) print*,'14b OK convect8'