Changeset 4133 for LMDZ6/trunk/libf/phylmd/thermcell_flux2.F90

Timestamp:

Apr 20, 2022, 11:44:24 PM (2 years ago)

Author:

fhourdin

Message:

Corrections thermiques pour replay

File:

• LMDZ6/trunk/libf/phylmd/thermcell_flux2.F90 (modified) (18 diffs)

LMDZ6/trunk/libf/phylmd/thermcell_flux2.F90

@@ -2 +2 @@
 ! $Id$
 !
-      SUBROUTINE thermcell_flux2(ngrid,klev,ptimestep,masse, &
+      SUBROUTINE thermcell_flux2(ngrid,nlay,ptimestep,masse, &
      &       lalim,lmax,alim_star,  &
      &       entr_star,detr_star,f,rhobarz,zlev,zw2,fm,entr,  &
@@ -16 +16 @@
       IMPLICIT NONE
       
+! arguments
+      INTEGER, intent(in) :: ngrid,nlay
+      REAL, intent(in) :: ptimestep
+      REAL, intent(in), dimension(ngrid,nlay) :: masse
+      INTEGER, intent(in), dimension(ngrid) :: lalim,lmax
+      REAL, intent(in), dimension(ngrid,nlay) :: alim_star,entr_star,detr_star
+      REAL, intent(in), dimension(ngrid) :: f
+      REAL, intent(in), dimension(ngrid,nlay) :: rhobarz
+      REAL, intent(in), dimension(ngrid,nlay+1) :: zw2,zlev
+! FH : laisser ca le temps de verifier qu'on a bien fait de commenter les
+!      lignes faisant apparaitre zqla, zmax ...
+!     REAL, intent(in), dimension(ngrid) :: zmax(ngrid)
+!     enlever aussi zqla
+      REAL, intent(in), dimension(ngrid,nlay) :: zqla  ! not used
+      integer, intent(in) :: lev_out, lunout1
+
+      REAL,intent(out), dimension(ngrid,nlay) :: entr,detr
+      REAL,intent(out), dimension(ngrid,nlay+1) :: fm
+
+! local
       INTEGER ig,l
-      INTEGER ngrid,klev
-      
-      REAL alim_star(ngrid,klev),entr_star(ngrid,klev)
-      REAL detr_star(ngrid,klev)
-      REAL zw2(ngrid,klev+1)
-      REAL zlev(ngrid,klev+1)
-      REAL masse(ngrid,klev)
-      REAL ptimestep
-      REAL rhobarz(ngrid,klev)
-      REAL f(ngrid)
-      INTEGER lmax(ngrid)
-      INTEGER lalim(ngrid)
-      REAL zqla(ngrid,klev)
-      REAL zmax(ngrid)
-
+      integer igout,lout
+      REAL zfm
       integer ncorecfm1,ncorecfm2,ncorecfm3,ncorecalpha
       integer ncorecfm4,ncorecfm5,ncorecfm6,ncorecfm7,ncorecfm8
       
-
-      REAL entr(ngrid,klev),detr(ngrid,klev)
-      REAL fm(ngrid,klev+1)
-      REAL zfm
-
-      integer igout,lout
-      integer lev_out
-      integer lunout1
 
       REAL f_old,ddd0,eee0,ddd,eee,zzz
@@ -90 +89 @@
 
       if (check_debug) then
-      do l=1,klev
+      do l=1,nlay
          do ig=1,ngrid
             if (l.le.lmax(ig)) then
@@ -118 +117 @@
 !-------------------------------------------------------------------------
 
-      do l=1,klev
+      do l=1,nlay
          entr(:,l)=f(:)*(entr_star(:,l)+alim_star(:,l))
          detr(:,l)=f(:)*detr_star(:,l)
@@ -135 +134 @@
 
       fm(:,1)=0.
-      do l=1,klev
+      do l=1,nlay
          do ig=1,ngrid
             if (l.lt.lmax(ig)) then
@@ -154 +153 @@
 ! autres corrections.
 
-      do l=1,klev
+      do l=1,nlay
          do ig=1,ngrid
             if (detr(ig,l).gt.fm(ig,l)) then
@@ -164 +163 @@
 
 !      if (prt_level.ge.10) &
-!    &    call printflux(ngrid,klev,lunout1,igout,f,lmax,lalim, &
+!    &    call printflux(ngrid,nlay,lunout1,igout,f,lmax,lalim, &
 !    &    ptimestep,masse,entr,detr,fm,'2  ')
 
@@ -178 +177 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-      do l=1,klev
+      do l=1,nlay
 
          do ig=1,ngrid
@@ -196 +195 @@
 !-------------------------------------------------------------------------
 
-!     do l=1,klev
+!     do l=1,nlay
          do ig=1,ngrid
             if (fm(ig,l+1).lt.0.) then
@@ -215 +214 @@
 !-------------------------------------------------------------------------
       if (iflag_thermals_optflux==0) then 
-!     do l=1,klev
+!     do l=1,nlay
          do ig=1,ngrid
           if (l.ge.lalim(ig).and.l.le.lmax(ig) &
@@ -241 +240 @@
 !-------------------------------------------------------------------------
       if (iflag_thermals_optflux==0) then
-!     do l=1,klev
+!     do l=1,nlay
          do ig=1,ngrid
             if ((fm(ig,l+1).gt.fm(ig,l)).and.(l.gt.lalim(ig))) then
@@ -264 +263 @@
       if(1.eq.1) then
 
-!     do l=1,klev
+!     do l=1,nlay
 
 
@@ -337 +336 @@
 !-------------------------------------------------------------------------
 
-!     do l=1,klev
+!     do l=1,nlay
          do ig=1,ngrid
             if (fm(ig,l+1).lt.0.) then
@@ -386 +385 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-!    do l=1,klev
+!    do l=1,nlay
         do ig=1,ngrid
            if (zw2(ig,l+1).gt.1.e-10) then
@@ -393 +392 @@
               f_old=fm(ig,l+1)
               fm(ig,l+1)=zfm
-!             zw2(ig,l+1)=0.
-!             zqla(ig,l+1)=0.
               detr(ig,l)=detr(ig,l)+f_old-fm(ig,l+1)
 !             lmax(ig)=l+1
@@ -415 +412 @@
 
 !      if (prt_level.ge.10) &
-!    &    call printflux(ngrid,klev,lunout1,igout,f,lmax,lalim, &
+!    &    call printflux(ngrid,nlay,lunout1,igout,f,lmax,lalim, &
 !    &    ptimestep,masse,entr,detr,fm,'8  ')
 
@@ -426 +423 @@
       if (1.eq.1) then
       labort_physic=.false.
-      do l=1,klev-1
+      do l=1,nlay-1
          do ig=1,ngrid
             eee0=entr(ig,l)
@@ -507 +504 @@
 
 !      if (prt_level.ge.10) &
-!    &    call printflux(ngrid,klev,lunout1,igout,f,lmax,lalim, &
+!    &    call printflux(ngrid,nlay,lunout1,igout,f,lmax,lalim, &
 !    &    ptimestep,masse,entr,detr,fm,'fin')
 
 
-      return
+ RETURN
       end