Changeset 5082 for LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_cloudth.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/lmdz_cloudth.F90 (modified) (33 diffs)

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

@@ -79 +79 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-      IF (iflag_cloudth_vert.GE.1) THEN
+      IF (iflag_cloudth_vert>=1) THEN
       CALL cloudth_vert(ngrid,klev,ind2,  &
      &           ztv,po,zqta,fraca, & 
@@ -117 +117 @@
       do ind1=1,ngrid
 
-      if ((ztv(ind1,1).gt.ztv(ind1,2)).and.(fraca(ind1,ind2).gt.1.e-10)) then 
+      if ((ztv(ind1,1)>ztv(ind1,2)).and.(fraca(ind1,ind2)>1.e-10)) then
 
       zqenv(ind1)=(po(ind1)-fraca(ind1,ind2)*zqta(ind1,ind2))/(1.-fraca(ind1,ind2))
@@ -186 +186 @@
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-      if (ctot(ind1,ind2).lt.1.e-10) then
+      if (ctot(ind1,ind2)<1.e-10) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2) 
@@ -227 +227 @@
       qltot(ind1,ind2)=sigma1s*((exp(-1.*xenv**2)/sqrt2pi)+xenv*sqrt(2.)*cenv(ind1,ind2))
       
-      if (ctot(ind1,ind2).lt.1.e-3) then
+      if (ctot(ind1,ind2)<1.e-3) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2) 
@@ -347 +347 @@
       do ind1=1,ngrid
 
-      if ((ztv(ind1,1).gt.ztv(ind1,2)).and.(fraca(ind1,ind2).gt.1.e-10)) then 
+      if ((ztv(ind1,1)>ztv(ind1,2)).and.(fraca(ind1,ind2)>1.e-10)) then
 
       zqenv(ind1)=(po(ind1)-fraca(ind1,ind2)*zqta(ind1,ind2))/(1.-fraca(ind1,ind2))
@@ -510 +510 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-      if (cenv(ind1,ind2).lt.1.e-10.or.cth(ind1,ind2).lt.1.e-10) then
+      if (cenv(ind1,ind2)<1.e-10.or.cth(ind1,ind2)<1.e-10) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2) 
@@ -554 +554 @@
       qltot(ind1,ind2)=sigma1s*((exp(-1.*xenv**2)/sqrt2pi)+xenv*sqrt(2.)*cenv(ind1,ind2))
       
-      if (ctot(ind1,ind2).lt.1.e-3) then
+      if (ctot(ind1,ind2)<1.e-3) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2) 
@@ -651 +651 @@
       INTEGER :: ind1,l, ig
 
-      IF (iflag_cloudth_vert.GE.1) THEN
+      IF (iflag_cloudth_vert>=1) THEN
       CALL cloudth_vert_v3(ngrid,klev,ind2,  &
      &           ztv,po,zqta,fraca, & 
@@ -694 +694 @@
       do ind1=1,ngrid
 
-      if ((ztv(ind1,1).gt.ztv(ind1,2)).and.(fraca(ind1,ind2).gt.1.e-10)) then 
+      if ((ztv(ind1,1)>ztv(ind1,2)).and.(fraca(ind1,ind2)>1.e-10)) then
 
       zqenv(ind1)=(po(ind1)-fraca(ind1,ind2)*zqta(ind1,ind2))/(1.-fraca(ind1,ind2))
@@ -759 +759 @@
       qltot(ind1,ind2)=fraca(ind1,ind2)*qlth(ind1,ind2)+(1.-1.*fraca(ind1,ind2))*qlenv(ind1,ind2)
 
-      if (ctot(ind1,ind2).lt.1.e-10) then
+      if (ctot(ind1,ind2)<1.e-10) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2) 
@@ -790 +790 @@
       qltot(ind1,ind2)=sigma1s*((exp(-1.*xenv**2)/sqrt2pi)+xenv*sqrt2*cenv(ind1,ind2))
 
-      if (ctot(ind1,ind2).lt.1.e-3) then
+      if (ctot(ind1,ind2)<1.e-3) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2)
@@ -926 +926 @@
       do ind1=1,ngrid
 
-      if ((ztv(ind1,1).gt.ztv(ind1,2)).and.(fraca(ind1,ind2).gt.1.e-10)) then !Thermal and environnement
+      if ((ztv(ind1,1)>ztv(ind1,2)).and.(fraca(ind1,ind2)>1.e-10)) then !Thermal and environnement
 
       zqenv(ind1)=(po(ind1)-fraca(ind1,ind2)*zqta(ind1,ind2))/(1.-fraca(ind1,ind2)) !qt = a*qtth + (1-a)*qtenv
@@ -978 +978 @@
       ENDIF
       sigma1s = sigma1s_fraca + sigma1s_ratqs
-      IF (iflag_ratqs.eq.11) then
+      IF (iflag_ratqs==11) then
          sigma1s = ratqs(ind1,ind2)*po(ind1)*aenv
       ENDIF
@@ -1073 +1073 @@
       IntJ=0.5*senv*(1-erf(xenv2))+(sigma1s/sqrt2pi)*exp_xenv2
       IntJ_CF=0.5*(1.-1.*erf(xenv2))
-      if (deltasenv .lt. 1.e-10) then 
+      if (deltasenv < 1.e-10) then
       qlenv(ind1,ind2)=IntJ
       cenv_vol(ind1,ind2)=IntJ_CF
@@ -1089 +1089 @@
       IntJ=0.5*sth*(1-erf(xth2))+(sigma2s/sqrt2pi)*exp_xth2
       IntJ_CF=0.5*(1.-1.*erf(xth2))
-      if (deltasth .lt. 1.e-10) then
+      if (deltasth < 1.e-10) then
       qlth(ind1,ind2)=IntJ
       cth_vol(ind1,ind2)=IntJ_CF
@@ -1158 +1158 @@
 
 !      if (ctot(ind1,ind2).lt.1.e-10) then
-      if (cenv(ind1,ind2).lt.1.e-10.or.cth(ind1,ind2).lt.1.e-10) then
+      if (cenv(ind1,ind2)<1.e-10.or.cth(ind1,ind2)<1.e-10) then
       ctot(ind1,ind2)=0.
       ctot_vol(ind1,ind2)=0.
@@ -1201 +1201 @@
       qltot(ind1,ind2)=sigma1s*((exp(-1.*xenv**2)/sqrt2pi)+xenv*sqrt(2.)*cenv(ind1,ind2))
       
-      if (ctot(ind1,ind2).lt.1.e-3) then
+      if (ctot(ind1,ind2)<1.e-3) then
       ctot(ind1,ind2)=0.
       qcloud(ind1)=zqsatenv(ind1,ind2)
@@ -1338 +1338 @@
 !Both thermal and environment in the gridbox
 !-------------------------------------------------------------------------------
-      IF ((ztv(ind1,1).gt.ztv(ind1,2)).and.(fraca(ind1,ind2).gt.1.e-10)) THEN
+      IF ((ztv(ind1,1)>ztv(ind1,2)).and.(fraca(ind1,ind2)>1.e-10)) THEN
         !--------------------------------------------
         !calcul de qsat_env
@@ -1409 +1409 @@
         !Incloud Condensed water qcloud
         !--------------------------------------------
-      if (ctot_surf(ind1,ind2) .lt. 1.e-10) then
+      if (ctot_surf(ind1,ind2) < 1.e-10) then
       ctot_vol(ind1,ind2)=0.
       ctot_surf(ind1,ind2)=0.
@@ -1470 +1470 @@
         !Incloud Condensed water qcloud
         !--------------------------------------------
-      if (ctot_surf(ind1,ind2) .lt. 1.e-8) then
+      if (ctot_surf(ind1,ind2) < 1.e-8) then
       ctot_vol(ind1,ind2)=0.
       ctot_surf(ind1,ind2)=0.
@@ -1623 +1623 @@
 
       DO ind1=1,klon
-            IF ((temp(ind1) .LT. RTT) .AND. (temp(ind1) .GT. temp_nowater) &
+            IF ((temp(ind1) < RTT) .AND. (temp(ind1) > temp_nowater) &
             .AND. (ind2<=klev-2)  &
-            .AND. (frac_th(ind1).GT.min_frac_th_cld)) THEN
+            .AND. (frac_th(ind1)>min_frac_th_cld)) THEN
                 mpc_bl_points(ind1,ind2)=1
             ELSE
@@ -1661 +1661 @@
 
 
-    IF (frac_th(ind1).GT.min_frac_th_cld) THEN !Thermal and environnement
+    IF (frac_th(ind1)>min_frac_th_cld) THEN !Thermal and environnement
 
 ! unlike in the other cloudth routine, 
@@ -1700 +1700 @@
  
            sigma1s = sigma1s_fraca + sigma1s_ratqs
-           IF (iflag_ratqs.eq.11) then
+           IF (iflag_ratqs==11) then
               sigma1s = ratqs(ind1)*qt(ind1)*aenv
            ENDIF
@@ -1732 +1732 @@
             IntJ_CF=0.5*(1.-1.*erf(xenv2))
 
-            IF (deltasenv .LT. 1.e-10) THEN 
+            IF (deltasenv < 1.e-10) THEN
               qcenv(ind1)=IntJ
               cenv_vol(ind1)=IntJ_CF
@@ -1743 +1743 @@
               qcenv(ind1)=IntJ+IntI1+IntI2+IntI3
               cenv_vol(ind1)=IntJ_CF+IntI1_CF+IntI3_CF
-              IF (Tbefenv(ind1) .LT. temp_nowater) THEN
+              IF (Tbefenv(ind1) < temp_nowater) THEN
                   ! freeze all droplets in cirrus temperature regime
                   icefracenv(ind1)=1. 
@@ -1756 +1756 @@
             IntJ_CF=0.5*(1.-1.*erf(xth2))
      
-            IF (deltasth .LT. 1.e-10) THEN
+            IF (deltasth < 1.e-10) THEN
               qcth(ind1)=IntJ
               cth_vol(ind1)=IntJ_CF
@@ -1767 +1767 @@
               qcth(ind1)=IntJ+IntI1+IntI2+IntI3
               cth_vol(ind1)=IntJ_CF+IntI1_CF+IntI3_CF
-              IF (Tbefth(ind1) .LT. temp_nowater) THEN
+              IF (Tbefth(ind1) < temp_nowater) THEN
                   ! freeze all droplets in cirrus temperature regime
                   icefracth(ind1)=1.
@@ -1777 +1777 @@
             ctot_vol(ind1)=frac_th(ind1)*cth_vol(ind1)+(1.-1.*frac_th(ind1))*cenv_vol(ind1)
 
-            IF (cenv(ind1).LT.min_neb_th.and.cth(ind1).LT.min_neb_th) THEN
+            IF (cenv(ind1)<min_neb_th.and.cth(ind1)<min_neb_th) THEN
                 ctot(ind1)=0.
                 ctot_vol(ind1)=0.
@@ -1786 +1786 @@
                 qcloud(ind1)=qctot(ind1)/ctot(ind1)+qslenv(ind1)
                 qincloud(ind1)=qctot(ind1)/ctot(ind1)
-                IF (qctot(ind1) .GT. 0) THEN
+                IF (qctot(ind1) > 0) THEN
                   icefrac(ind1)=(frac_th(ind1)*qcth(ind1)*icefracth(ind1)+(1.-1.*frac_th(ind1))*qcenv(ind1)*icefracenv(ind1))/qctot(ind1)
                   icefrac(ind1)=max(min(1.,icefrac(ind1)), 0.)
@@ -1812 +1812 @@
 
 
-        IF (ctot(ind1).LT.min_neb_th) THEN
+        IF (ctot(ind1)<min_neb_th) THEN
           ctot(ind1)=0.
           qcloud(ind1)=qslenv(ind1)
@@ -2178 +2178 @@
 
 
-    IF (iflag_topthermals .GT. 0) THEN ! uppermost thermals levels
+    IF (iflag_topthermals > 0) THEN ! uppermost thermals levels
 
     Dv=0.0001*0.211*(p0/pres(ind2))*((temp(ind2)/T0)**1.94) ! water vapor diffusivity in air, SI
@@ -2231 +2231 @@
     fp2=0.
     fp1=0.
-    IF (fraca(ind2p1) .GT. 0.) THEN
+    IF (fraca(ind2p1) > 0.) THEN
     fp2=-qith(ind2p2)*rho(ind2p2)*vith(ind2p2)*fraca(ind2p2)! flux defined positive upward
     fp1=-qith(ind2p1)*rho(ind2p1)*vith(ind2p1)*fraca(ind2p1)
@@ -2240 +2240 @@
     ! Calculation in a top-to-bottom loop
 
-    IF (fm_therm(ind1,ind2p1) .GT. 0.) THEN
+    IF (fm_therm(ind1,ind2p1) > 0.) THEN
           qi= 1./fm_therm(ind1,ind2p1)* &
               (deltazlev(ind2p1)*(-rim_term-dep_term-det_term-precip_term) + &