Changeset 5117 for LMDZ6/branches/Amaury_dev/libf/phylmd/cv3_routines.F90

Timestamp:

Jul 24, 2024, 4:23:34 PM (4 months ago)

Author:

abarral

Message:

rename modules properly lmdz_*
move some unused files to obsolete/
(lint) uppercase fortran keywords

File:

• LMDZ6/branches/Amaury_dev/libf/phylmd/cv3_routines.F90 (modified) (31 diffs)

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

@@ -8 +8 @@
 
   USE lmdz_ioipsl_getin_p, ONLY: getin_p
-  use lmdz_phys_para
+  USE lmdz_phys_para
   IMPLICIT NONE
 
@@ -554 +554 @@
 !@      do 290 k=minorig,nl
 !@        do 280 i=1,len
-!@          if((k.ge.(nk(i)+1)).and.(p(i,k).lt.plcl(i)))
+!@          if((k.ge.(nk(i)+1)).AND.(p(i,k).lt.plcl(i)))
 !@     &    icb(i)=min(icb(i),k)
 !@ 280    continue
@@ -560 +560 @@
 !@c
 !@      do 300 i=1,len
-!@        if((icb(i).ge.nlm).and.(iflag(i).eq.0))iflag(i)=9
+!@        if((icb(i).ge.nlm).AND.(iflag(i).EQ.0))iflag(i)=9
 !@ 300  continue
 
@@ -582 +582 @@
 
   DO i = 1, len
-!@        if((icb(i).ge.nlm).and.(iflag(i).eq.0))iflag(i)=9
+!@        if((icb(i).ge.nlm).AND.(iflag(i).EQ.0))iflag(i)=9
     IF ((icb(i)==nlm) .AND. (iflag(i)==0)) iflag(i) = 9
   END DO
@@ -942 +942 @@
 ! oct3       ath  = th(i,icb(i)-1) - dttrig
 ! oct3
-! oct3       if (tdif.lt.dtcrit .or. ath.gt.ath1) THEN
+! oct3       if (tdif.lt.dtcrit .OR. ath.gt.ath1) THEN
 ! oct3         do 60 k=1,nl
 ! oct3            sig(i,k) = beta*sig(i,k) - 2.*alpha*tdif*tdif
@@ -1063 +1063 @@
 !AC!       nn=0
 !AC!      do 101 i=1,len
-!AC!      IF(iflag1(i).eq.0)THEN
+!AC!      IF(iflag1(i).EQ.0)THEN
 !AC!       nn=nn+1
 !AC!       tra(nn,k,j)=tra1(i,k,j)
@@ -1874 +1874 @@
 !  ENDDO
 
-  endif
+  ENDIF
 
 ! -- end convect3
@@ -1947 +1947 @@
 ! ori        do 520 i=1,ncum
 ! ori          IF(cape(i).lt.0.0)lcape(i)=.FALSE.
-! ori          if((k.ge.(icb(i)+1)).and.lcape(i))THEN
+! ori          if((k.ge.(icb(i)+1)).AND.lcape(i))THEN
 ! ori            by=(tvp(i,k)-tv(i,k))*dph(i,k)/p(i,k)
 ! ori            byp(i)=(tvp(i,k+1)-tv(i,k+1))*dph(i,k+1)/p(i,k+1)
@@ -2230 +2230 @@
 ! c      do k= 1,nl
 ! c       do i = 1,ncum
-! c        IF (k .ge. icb(i) .and. k .le. inb(i)) THEN
+! c        IF (k .ge. icb(i) .AND. k .le. inb(i)) THEN
 ! c         cbmflast(i) = cbmflast(i)+M(i,k)
 ! c        ENDIF
@@ -2446 +2446 @@
 !AC!        do j=minorig,nl
 !AC!         do il=1,ncum
-!AC!          IF( (i.ge.icb(il)).and.(i.le.inb(il)).and.
-!AC!     :       (j.ge.(icb(il)-1)).and.(j.le.inb(il)))THEN
+!AC!          IF( (i.ge.icb(il)).AND.(i.le.inb(il)).AND.
+!AC!     :       (j.ge.(icb(il)-1)).AND.(j.le.inb(il)))THEN
 !AC!            traent(il,i,j,k)=sij(il,i,j)*tra(il,i,k)
 !AC!     :            +(1.-sij(il,i,j))*tra(il,nk(il),k)
@@ -2464 +2464 @@
     DO il = 1, ncum
       IF ((i>=icb(il)) .AND. (i<=inb(il)) .AND. (nent(il,i)==0)) THEN
-! @      IF(nent(il,i).eq.0)THEN
+! @      IF(nent(il,i).EQ.0)THEN
         ment(il, i, i) = m(il, i)
         qent(il, i, i) = qnk(il) - ep(il, i)*clw(il, i)
@@ -2479 +2479 @@
 !AC!       do i=minorig+1,nl
 !AC!        do il=1,ncum
-!AC!         if (i.ge.icb(il) .and. i.le.inb(il) .and. nent(il,i).eq.0) THEN
+!AC!         if (i.ge.icb(il) .AND. i.le.inb(il) .AND. nent(il,i).EQ.0) THEN
 !AC!          traent(il,i,i,j)=tra(il,nk(il),j)
 !AC!         endif
@@ -2662 +2662 @@
 !AC!      do j=1,ntra
 !AC!       do il=1,ncum
-!AC!        if ( i.ge.icb(il) .and. i.le.inb(il) .and. lwork(il)
-!AC!     :     .and. csum(il,i).lt.m(il,i) ) THEN
+!AC!        if ( i.ge.icb(il) .AND. i.le.inb(il) .AND. lwork(il)
+!AC!     :     .AND. csum(il,i).lt.m(il,i) ) THEN
 !AC!         traent(il,i,i,j)=tra(il,nk(il),j)
 !AC!        endif
@@ -3108 +3108 @@
 !JYG----   Correction : si c6 <= 0, water(il,i)=0.
 ! prec(il,i)=0.
-! endif
+! END IF
 
 !JYG---   Dans tous les cas, evaporation = [tt ce qui entre dans la couche i]
@@ -3181 +3181 @@
 
         END IF
-      END IF !(i.le.inb(il) .and. lwork(il))
+      END IF !(i.le.inb(il) .AND. lwork(il))
     END DO
 ! ----------------------------------------------------------------
@@ -3222 +3222 @@
         END IF
 
-      END IF !(i.le.inb(il) .and. lwork(il) .and. i.ne.1)
+      END IF !(i.le.inb(il) .AND. lwork(il) .AND. i.NE.1)
       IF (prt_level >= 20) THEN
         PRINT *,'cv3_unsat, mp hydrostatic ', i, mp(il,i)
@@ -3343 +3343 @@
 !>jyg
 
-      END IF ! (i.le.inb(il) .and. lwork(il) .and. i.ne.1)
+      END IF ! (i.le.inb(il) .AND. lwork(il) .AND. i.NE.1)
     END DO
 ! ----------------------------------------------------------------
@@ -3357 +3357 @@
       IF (i<inb(il) .AND. lwork(il)) THEN
         mplus(il) = mp(il, i) > mp(il, i+1)
-      END IF ! (i.lt.inb(il) .and. lwork(il))
+      END IF ! (i.lt.inb(il) .AND. lwork(il))
     END DO
 
@@ -3393 +3393 @@
             vp(il, i) = vp(il, i+1)
           END IF ! (mp(il,i+1).gt.1.0e-16)
-        END IF ! (mplus(il)) else if (.not.mplus(il))
+        END IF ! (mplus(il)) ELSE IF (.NOT.mplus(il))
 
         rp(il, i) = amin1(rp(il,i), rs(il,i))
         rp(il, i) = max(rp(il,i), 0.0)
 
-      END IF ! (i.lt.inb(il) .and. lwork(il))
+      END IF ! (i.lt.inb(il) .AND. lwork(il))
     END DO
 ! ----------------------------------------------------------------
@@ -3406 +3406 @@
 !AC!      do j=1,ntra
 !AC!       do il = 1,ncum
-!AC!       if (i.lt.inb(il) .and. lwork(il)) THEN
+!AC!       if (i.lt.inb(il) .AND. lwork(il)) THEN
 !AC!c
 !AC!         IF(mplus(il))THEN
@@ -3416 +3416 @@
 !AC!           trap(il,i,j)=trap(il,i+1,j)
 !AC!          endif
-!AC!         endif ! (mplus(il)) else if (.not.mplus(il))
+!AC!         endif ! (mplus(il)) ELSE IF (.NOT.mplus(il))
 !AC!c
-!AC!        endif ! (i.lt.inb(il) .and. lwork(il))
+!AC!        endif ! (i.lt.inb(il) .AND. lwork(il))
 !AC!       enddo
 !AC!      END DO
@@ -3822 +3822 @@
 !AC!       do j=2,nl
 !AC!        do il=1,ncum
-!AC!         if (j.le.inb(il) .and. iflag(il) .le. 1) THEN
+!AC!         if (j.le.inb(il) .AND. iflag(il) .le. 1) THEN
 !AC!
 !AC!          if (cvflag_grav) THEN
@@ -4170 +4170 @@
 !AC!      do k=1,ntra
 !AC!       do il=1,ncum
-!AC!        if (i.le.inb(il) .and. iflag(il) .le. 1) THEN
+!AC!        if (i.le.inb(il) .AND. iflag(il) .le. 1) THEN
 !AC!         dpinv=1.0/(ph(il,i)-ph(il,i+1))
 !AC!         cpinv=1.0/cpn(il,i)
@@ -4228 +4228 @@
 !AC!       do k=1,i-1
 !AC!        do il=1,ncum
-!AC!         if (i.le.inb(il) .and. iflag(il) .le. 1) THEN
+!AC!         if (i.le.inb(il) .AND. iflag(il) .le. 1) THEN
 !AC!          dpinv=1.0/(ph(il,i)-ph(il,i+1))
 !AC!          cpinv=1.0/cpn(il,i)
@@ -4276 +4276 @@
 !AC!       do k=i,nl+1
 !AC!        do il=1,ncum
-!AC!         if (i.le.inb(il) .and. k.le.inb(il)
-!AC!     $                .and. iflag(il) .le. 1) THEN
+!AC!         if (i.le.inb(il) .AND. k.le.inb(il)
+!AC!     $                .AND. iflag(il) .le. 1) THEN
 !AC!          dpinv=1.0/(ph(il,i)-ph(il,i+1))
 !AC!          cpinv=1.0/cpn(il,i)
@@ -4345 +4345 @@
 !AC!      do j=1,ntra
 !AC!       do il=1,ncum
-!AC!        if (i.le.inb(il) .and. iflag(il) .le. 1) THEN
+!AC!        if (i.le.inb(il) .AND. iflag(il) .le. 1) THEN
 !AC!         dpinv=1.0/(ph(il,i)-ph(il,i+1))
 !AC!         cpinv=1.0/cpn(il,i)
@@ -4726 +4726 @@
     DO k = i, nl
       DO il = 1, ncum
-! test         if (i.ge.icb(il).and.i.le.inb(il).and.k.le.inb(il)) THEN
+! test         if (i.ge.icb(il).AND.i.le.inb(il).AND.k.le.inb(il)) THEN
         IF (i<=inb(il) .AND. k<=inb(il)) THEN
           upwd(il, i) = upwd(il, i) + up1(il, k, i)
@@ -4989 +4989 @@
       DO i = 1, ncum
         IF (k>=icb(i) .AND. k<=inb(i) .AND. & 
-!!jyg              j.ge.k.and.j.le.inb(i)) THEN
+!!jyg              j.ge.k.AND.j.le.inb(i)) THEN
 !!jyg             epm(i,j,k)=1.-(1.-ep(i,j))*clw(i,j)/elij(i,k,j)
             j>k .AND. j<=inb(i)) THEN
@@ -5159 +5159 @@
 
 ! local
-      integer i,k    
+      INTEGER i,k
 !      real hp_bak(nloc,nd)
 !      real ep_bak(nloc,nd)
-      real m_loc(nloc,nd)
-      real sig_loc(nloc,nd)
-      real w0_loc(nloc,nd)
-      integer iflag_loc(nloc)
-      real cape(nloc)
+      REAL m_loc(nloc,nd)
+      REAL sig_loc(nloc,nd)
+      REAL w0_loc(nloc,nd)
+      INTEGER iflag_loc(nloc)
+      REAL cape(nloc)
         
-        if (coef_epmax_cape>1e-12) THEN
+        IF (coef_epmax_cape>1e-12) THEN
         ! il faut calculer la cape: on fait un calcule simple car tant qu'on ne
         ! connait pas ep, on ne connait pas les mélanges, ddfts etc... qui sont
@@ -5221 +5221 @@
       do k=minorig+1,nl
        do i=1,ncum
-        if((k>=icb(i)).and.(k<=inb(i)))THEN
+        IF((k>=icb(i)).AND.(k<=inb(i)))THEN
           hp(i, k) = hnk(i) + (lv(i,k)+(cpd-cpv)*t(i,k)+frac(i,k)*lf(i,k))* &
                               ep(i, k)*clw(i, k)
@@ -5241 +5241 @@
 !      do i=1,ncum  
 !       do k=1,nl
-!        if ((abs(hp_bak(i,k)-hp(i,k))/hp_bak(i,k).gt.1e-1).or. &
-!            ((abs(hp_bak(i,k)-hp(i,k))/hp_bak(i,k).gt.1e-4).and. &
+!        if ((abs(hp_bak(i,k)-hp(i,k))/hp_bak(i,k).gt.1e-1).OR. &
+!            ((abs(hp_bak(i,k)-hp(i,k))/hp_bak(i,k).gt.1e-4).AND. &
 !            (ep(i,k)-ep_bak(i,k).lt.1e-4))) THEN
 !           WRITE(*,*) 'i,k=',i,k