Changeset 5099 for LMDZ6/branches/Amaury_dev/libf/phylmd/cvltr_scav.F90

Timestamp:

Jul 22, 2024, 9:29:09 PM (4 months ago)

Author:

abarral

Message:

Replace most uses of CPP_DUST by the corresponding logical defined in lmdz_cppkeys_wrapper.F90
Convert several files from .F to .f90 to allow Dust to compile w/o rrtm/ecrad
Create lmdz_yoerad.f90
(lint) Remove "!" on otherwise empty line

File:

• LMDZ6/branches/Amaury_dev/libf/phylmd/cvltr_scav.F90 (modified) (19 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmd/cvltr_scav.F90

@@ -1 @@
-!
+
 ! $Id $
-!
+
 SUBROUTINE cvltr_scav(pdtime, da, phi,phi2,d1a,dam, mpIN,epIN, &
      sigd,sij,wght_cvfd,clw,elij,epmlmMm,eplaMm,    &
@@ -10 +10 @@
      qPa,qMel,qTrdi,dtrcvMA,Mint,                   &
      zmfd1a,zmfphi2,zmfdam)
-  !
+
   USE IOIPSL 
   USE dimphy
@@ -33 +33 @@
   REAL,DIMENSION(klon,klev),INTENT(IN)      :: d1a,dam ! matrices pour simplifier
   REAL,DIMENSION(klon,klev,klev),INTENT(IN) :: phi2    ! l'ecriture des tendances
-  !
+
   REAL,DIMENSION(klon,klev),INTENT(IN)      :: mpIN
   REAL,DIMENSION(klon,klev+1),INTENT(IN)    :: paprs  ! pression aux 1/2 couches (bas en haut)
@@ -40 +40 @@
   REAL,DIMENSION(klon,klev),INTENT(IN)      :: upd   ! saturated updraft mass flux
   REAL,DIMENSION(klon,klev),INTENT(IN)      :: dnd   ! saturated downdraft mass flux
-  !
+
   REAL,DIMENSION(klon,klev),INTENT(IN)      :: wdtrainA   ! masses precipitantes de l'asc adiab
   REAL,DIMENSION(klon,klev),INTENT(IN)      :: wdtrainM   ! masses precipitantes des melanges
@@ -59 +59 @@
   REAL,DIMENSION(klon),INTENT(IN)           :: sigd
   INTEGER,DIMENSION(klon),INTENT(IN)        :: icb,inb
-  !
+
   REAL,DIMENSION(klon,klev),INTENT(IN) :: ccntrAA_3d
   REAL,DIMENSION(klon,klev),INTENT(IN) :: ccntrENV_3d
   REAL,DIMENSION(klon,klev),INTENT(IN) :: coefcoli_3d
-  !
+
   ! Sortie
   REAL,DIMENSION(klon,klev,nbtr),INTENT(OUT)     :: dtrcv     ! tendance totale (bas en haut)
@@ -71 +71 @@
   REAL,DIMENSION(klon,klev,nbtr),INTENT(OUT)     :: dtrsat    ! tendance trsp+sat scav
   REAL,DIMENSION(klon,klev,nbtr),INTENT(OUT)     :: dtrUscav  ! tendance du lessivage courant unsat
-  !
+
   ! Variables locales
   INTEGER                           :: i,j,k
@@ -116 +116 @@
 !!!
   REAL,DIMENSION(klon,klev)         :: imp              ! coefficient d'impaction
-  !
+
   LOGICAL,DIMENSION(klon,klev) :: NO_precip
   ! var tmp tests
@@ -142 +142 @@
 !!  ENDDO
 !>jyg
-  !
+
   ! initialisation pour flux de traceurs, td et autre
-  !
+
   trsptrac = 0.
   scavtrac = 0.
@@ -308 +308 @@
   ENDDO
 !!!!!
-  !
+
   ! rajout du terme lie a l ascendance induite
-  !
+
   DO j=2,klev
      DO i=1,klon
@@ -316 +316 @@
      END DO
   END DO
-  !
+
   ! tendance courants insatures  ! sans lessivage ancien schema
-  !
+
   DO k=1,klev
      DO j=1,klev
@@ -326 +326 @@
      END DO
   END DO
-  !
+
   ! =========================================
   ! calcul des tendances liees aux courants satures   j <-> z ; k <-> z'
@@ -338 +338 @@
   END DO
   !RL
-  !
+
   DO j=1,klev
      DO i=1,klon
@@ -347 +347 @@
      END DO
   END DO
-  !
+
   DO k=1,klev
      DO j=1,klev
@@ -540 +540 @@
                          (pmflxr(i,j+1)+pmflxs(i,j+1)+Pa(i,j)+Pm(i,j))*&
                          (-mp(i,j+1)*qDi(i,j+1,it)))
-                    !
+
                     qPr(i,j,it)=kappa(i,j)*(&
                          (-mp(i,j+1)-imp(i,j)/RG*dxpres(i,j))*&
@@ -558 +558 @@
                          (pmflxr(i,j+1)+pmflxs(i,j+1)+Pa(i,j)+Pm(i,j))*&
                          (-mp(i,j+1)*(qDi(i,j+1,it)-tr(i,j,it))-mp(i,j)*tr(i,j,it)))
-                    !
+
                     qPr(i,j,it)=kappa(i,j)*(&
                          (-mp(i,j)-imp(i,j)/RG*dxpres(i,j))*&
@@ -622 +622 @@
               uscavtrac= (-mp(i,k)+mp(i,k+1))*(qDi(i,k,it)-tr(i,k,it))&
                    + mp(i,k)*(tr(i,k-1,it)-tr(i,k,it))
-              !
+
               !        if(it.eq.3) write(*,'(I2,1X,a,5X,e20.12,82X,a,e20.12)')k,' det incloud',&
               !                    (-mp(i,k)+mp(i,k+1))*(qDi(i,k,it)-tr(i,k,it))*pdtimeRG/dxpres(i,k)+&
@@ -630 +630 @@
            ELSEIF(mp(i,k)>mp(i,k+1).AND.mp(i,k)>1.e-10) THEN
               uscavtrac= mp(i,k)*(tr(i,k-1,it)-tr(i,k,it))
-              !
+
               !         if(it.eq.3) write(*,'(I2,1X,a,5X,e20.12,82X,a,e20.12)')k,' ent incloud',uscavtrac*pdtimeRG/dxpres(i,k), 'mp',mp(i,k)
               !=!------------------------------------------------------------- end ent/det 
@@ -656 +656 @@
               uscavtrac= (-0.+mp(i,2))*(qDi(i,k,it)-tr(i,k,it)) !&
               !                   + mp(i,2)*(0.-tr(i,k,it))
-              !
+
               !       if(it.eq.3) write(*,'(I2,1X,a,e20.12,84X,a,e20.12)')k,' 1 det',&
               !                  (-0.+mp(i,2))*(qDi(i,k,it)-tr(i,k,it))*pdtimeRG/dxpres(i,k)+&
@@ -696 +696 @@
   !         conservMA=conservMA+dtrcvMA(i,k,it)*   &
   !        (paprs(i,k)-paprs(i,k+1))/RG
-  !
+
   !      if(it.eq.3)  write(*,'(I2,2X,a,e20.12,2X,a,e20.12,2X,a,e20.12,2X,a,e20.12)') k,&
   !         'MA td ',dtrcvMA(i,k,it)*dxpres(i,k)/RG,&