Changeset 5082 for LMDZ6/branches/Amaury_dev/libf/phylmd/calltherm.F90

Timestamp:

Jul 19, 2024, 5:41:58 PM (4 months ago)

Author:

abarral

Message:

(lint) Fix obsolete boolean operators

File:

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

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

@@ -198 +198 @@
          ale_bl(:)=0.
          alp_bl(:)=0.
-         if (prt_level.ge.10) then
+         if (prt_level>=10) then
           print*,'thermV4 nsplit: ',nsplit_thermals,' weak_inversion'
          endif
 
 !   tests sur les valeurs negatives de l'eau
-         logexpr0=prt_level.ge.10
+         logexpr0=prt_level>=10
          nbptspb=0
          do k=1,klev
@@ -209 +209 @@
 ! Attention teste abderr 19-03-09
 !               logexpr2(i,k)=.not.q_seri(i,k).ge.0.
-                logexpr2(i,k)=.not.q_seri(i,k).ge.1.e-15
+                logexpr2(i,k)=.not.q_seri(i,k)>=1.e-15
                if (logexpr2(i,k)) then
 #ifdef ISO
@@ -228 +228 @@
             enddo
          enddo
-         if(nbptspb.GT.0) print*,'Number of points with q_seri(i,k)<=0 ',nbptspb   
+         if(nbptspb>0) print*,'Number of points with q_seri(i,k)<=0 ',nbptspb
 
 
@@ -257 +257 @@
      &      ,r_aspect_thermals,30.,w2di_thermals  &
      &      ,tau_thermals)
-          else if (iflag_thermals.eq.2) then
+          else if (iflag_thermals==2) then
             CALL thermcell_sec(klon,klev,zdt  &
      &      ,pplay,paprs,pphi,zlev  &
@@ -265 +265 @@
      &      ,r_aspect_thermals,30.,w2di_thermals  &
      &      ,tau_thermals)
-          else if (iflag_thermals.eq.3) then
+          else if (iflag_thermals==3) then
             CALL thermcell(klon,klev,zdt  &
      &      ,pplay,paprs,pphi  &
@@ -273 +273 @@
      &      ,r_aspect_thermals,l_mix_thermals,w2di_thermals  &
      &      ,tau_thermals)
-          else if (iflag_thermals.eq.10) then
+          else if (iflag_thermals==10) then
             CALL thermcell_eau(klon,klev,zdt  &
      &      ,pplay,paprs,pphi  &
@@ -281 +281 @@
      &      ,r_aspect_thermals,l_mix_thermals,w2di_thermals  &
      &      ,tau_thermals)
-          else if (iflag_thermals.eq.11) then
+          else if (iflag_thermals==11) then
               abort_message = 'cas non prevu dans calltherm'
               CALL abort_physic (modname,abort_message,1)
-          else if (iflag_thermals.eq.12) then
+          else if (iflag_thermals==12) then
             CALL calcul_sec(klon,klev,zdt  &
      &      ,pplay,paprs,pphi,zlev  &
@@ -323 +323 @@
      &        )
 
-           if (prt_level.gt.10) write(lunout,*)'Apres thermcell_main OK'
+           if (prt_level>10) write(lunout,*)'Apres thermcell_main OK'
          else
            abort_message = 'Cas des thermiques non prevu'
@@ -355 +355 @@
       fact(:)=0.
       DO i=1,klon
-       logexpr1(i)=flag_bidouille_stratocu.or.weak_inversion(i).gt.0.5
+       logexpr1(i)=flag_bidouille_stratocu.or.weak_inversion(i)>0.5
        IF(logexpr1(i)) fact(i)=1./REAL(nsplit_thermals)
       ENDDO
@@ -414 +414 @@
 #endif
 #endif 
-           if (prt_level.gt.10) write(lunout,*)'Apres apres thermcell_main OK'
+           if (prt_level>10) write(lunout,*)'Apres apres thermcell_main OK'
 
        DO i=1,klon
@@ -422 +422 @@
             alp_bl(i)=alp_bl(i)+alp(i)/REAL(nsplit_thermals)
 !            write(23,*)'ALP CALLTHERM',alp_bl(i),alp(i)
-        if(prt_level.GE.10) print*,'calltherm i alp_bl alp ale_bl ale',i,alp_bl(i),alp(i),ale_bl(i),ale(i)
+        if(prt_level>=10) print*,'calltherm i alp_bl alp ale_bl ale',i,alp_bl(i),alp(i),ale_bl(i),ale(i)
        ENDDO
 
@@ -431 +431 @@
             DO k = 1, klev
             DO i = 1, klon
-               logexpr2(i,k)=.not.q_seri(i,k).ge.0.
+               logexpr2(i,k)=.not.q_seri(i,k)>=0.
                if (logexpr2(i,k)) then
                 q_seri(i,k)=1.e-15
@@ -457 +457 @@
 #endif
 
-        IF(nbptspb.GT.0) print*,'Number of points with q_seri(i,k)<=0 ',nbptspb   
+        IF(nbptspb>0) print*,'Number of points with q_seri(i,k)<=0 ',nbptspb
 ! tests sur les valeurs de la temperature
         nbptspb=0
             DO k = 1, klev
             DO i = 1, klon
-               logexpr2(i,k)=t_seri(i,k).lt.50..or.t_seri(i,k).gt.370.
+               logexpr2(i,k)=t_seri(i,k)<50..or.t_seri(i,k)>370.
                if (logexpr2(i,k)) nbptspb=nbptspb+1
 !              if ((t_seri(i,k).lt.50.) .or.  &
@@ -472 +472 @@
             ENDDO
             ENDDO
-        IF(nbptspb.GT.0) print*,'Number of points with q_seri(i,k)<=0 ',nbptspb
+        IF(nbptspb>0) print*,'Number of points with q_seri(i,k)<=0 ',nbptspb
          enddo ! isplit
 
@@ -483 +483 @@
                do k=1,klev
             do i=1,klon
-                  if (entr_therm(i,k).gt.0.) then
+                  if (entr_therm(i,k)>0.) then
                      fmc_therm(i,k+1)=fmc_therm(i,k)+entr_therm(i,k)
                   else
@@ -498 +498 @@
 !      print*,'<<<<calcul de lhumidite dans thermique'
 !CR:on ne le calcule que pour le cas sec
-      if (iflag_thermals.le.11) then      
+      if (iflag_thermals<=11) then
       do i=1,klon
          zqasc(i,1)=q_seri(i,1)
          do k=2,klev
-            if (fmc_therm(i,k+1).gt.1.e-6) then
+            if (fmc_therm(i,k+1)>1.e-6) then
                zqasc(i,k)=(fmc_therm(i,k)*zqasc(i,k-1)  &
      &              +entr_therm(i,k)*q_seri(i,k))/fmc_therm(i,k+1)
@@ -519 +519 @@
                 do k=1,klev
                    clwcon0(i,k)=zqasc(i,k)-zqsat(i,k)
-                   if (clwcon0(i,k).lt.0. .or.   &
-     &             (fm_therm(i,k+1)+detrc_therm(i,k)).lt.1.e-6) then
+                   if (clwcon0(i,k)<0. .or.   &
+     &             (fm_therm(i,k+1)+detrc_therm(i,k))<1.e-6) then
                       clwcon0(i,k)=0.
                    endif
@@ -529 +529 @@
                 do k=1,klev
                    clwcon0(i,k)=zqla(i,k)  
-                   if (clwcon0(i,k).lt.0. .or.   &
-     &             (fm_therm(i,k+1)+detrc_therm(i,k)).lt.1.e-6) then
+                   if (clwcon0(i,k)<0. .or.   &
+     &             (fm_therm(i,k+1)+detrc_therm(i,k))<1.e-6) then
                    clwcon0(i,k)=0. 
                    endif
@@ -542 +542 @@
           do i=1,klon
              do k=1,klev
-                if (ztla(i,k) .lt. 1.e-10) fraca(i,k) =0.
+                if (ztla(i,k) < 1.e-10) fraca(i,k) =0.
              enddo
           enddo