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

Timestamp:

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

Author:

abarral

Message:

(lint) Fix obsolete boolean operators

File:

• LMDZ6/branches/Amaury_dev/libf/phylmd/lmdz_ratqs_main.F90 (modified) (12 diffs)

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

@@ -71 +71 @@
 !   ----------------
 !   on ecrase le tableau ratqsc calcule par clouds_gno
-      if (iflag_cld_th.eq.1) then
+      if (iflag_cld_th==1) then
          do k=1,klev
          do i=1,klon
@@ -86 +86 @@
 !  par nversion de la fonction log normale
 !-----------------------------------------------------------------------
-      else if (iflag_cld_th.eq.4) then
+      else if (iflag_cld_th==4) then
          ptconvth(:,:)=.false.
          ratqsc(:,:)=0.
-         if(prt_level.ge.9) print*,'avant clouds_gno thermique'
+         if(prt_level>=9) print*,'avant clouds_gno thermique'
          call clouds_gno &
          (klon,klev,q_seri,zqsat,clwcon0th,ptconvth,ratqsc,rnebcon0th)
-         if(prt_level.ge.9) print*,' CLOUDS_GNO OK'
+         if(prt_level>=9) print*,' CLOUDS_GNO OK'
        
        endif
@@ -99 +99 @@
 !   -------------
 
-      if (iflag_ratqs.eq.0) then
+      if (iflag_ratqs==0) then
 
 ! Le cas iflag_ratqs=0 correspond a la version IPCC 2005 du modele.
@@ -116 +116 @@
 ! avec thermiques.
 
-      else if (iflag_ratqs.eq.1) then
+      else if (iflag_ratqs==1) then
 
          do k=1,klev
             do i=1, klon
-               if (pplay(i,k).ge.60000.) then
+               if (pplay(i,k)>=60000.) then
                   ratqss(i,k)=ratqsbas
-               else if ((pplay(i,k).ge.30000.).and.(pplay(i,k).lt.60000.)) then
+               else if ((pplay(i,k)>=30000.).and.(pplay(i,k)<60000.)) then
                   ratqss(i,k)=ratqsbas+(ratqshaut-ratqsbas)*(60000.-pplay(i,k))/(60000.-30000.)
                else
@@ -130 +130 @@
          enddo
 
-      else if (iflag_ratqs.eq.2) then
+      else if (iflag_ratqs==2) then
 
          do k=1,klev
             do i=1, klon
-               if (pplay(i,k).ge.60000.) then
+               if (pplay(i,k)>=60000.) then
                   ratqss(i,k)=ratqsbas*(paprs(i,1)-pplay(i,k))/(paprs(i,1)-60000.)
-               else if ((pplay(i,k).ge.30000.).and.(pplay(i,k).lt.60000.)) then
+               else if ((pplay(i,k)>=30000.).and.(pplay(i,k)<60000.)) then
                     ratqss(i,k)=ratqsbas+(ratqshaut-ratqsbas)*(60000.-pplay(i,k))/(60000.-30000.)
                else
@@ -173 +173 @@
 
 
-       else if (iflag_ratqs .GT. 9) then
+       else if (iflag_ratqs > 9) then
  
        ! interactive ratqs calculations that depend on cold pools, orography, surface heterogeneity and small-scale turbulence
@@ -193 +193 @@
           enddo
       
-          if (iflag_ratqs .EQ. 10) then 
+          if (iflag_ratqs == 10) then
              ! interactive ratqs in presence of cold pools     
              call ratqs_inter(klon,klev,iflag_ratqs,pdtphys,paprs, &
@@ -205 +205 @@
              enddo
              ratqss=ratqss+ratqs_inter_
-          else if (iflag_ratqs .EQ. 11) then
+          else if (iflag_ratqs == 11) then
             print*,'avant ratqs_inter'
             ! interactive ratqs with several sources
@@ -213 +213 @@
                        ratqs_inter_)
              ratqss=ratqss+ratqs_inter_
-          else if (iflag_ratqs .EQ. 12) then
+          else if (iflag_ratqs == 12) then
              ! contribution of surface heterogeneities to ratqs
              call ratqs_hetero(klon,klev,pctsrf,s_pblh,t2m,q2m,t_seri,q_seri,pplay,paprs,ratqs_hetero_)
              ratqss=ratqss+ratqs_hetero_
-          else if (iflag_ratqs .EQ. 13) then
+          else if (iflag_ratqs == 13) then
              ! contribution of ubgrid orography to ratqs
              call ratqs_oro(klon,klev,pctsrf,zstd,zqsat,t_seri,pplay,paprs,ratqs_oro_)
              ratqss=ratqss+ratqs_oro_
-          else if (iflag_ratqs .EQ. 14) then
+          else if (iflag_ratqs == 14) then
              ! effect of subgrid-scale TKE on ratqs (in development)
              call ratqs_tke(klon,klev,pdtphys,t_seri,q_seri,zqsat,pplay,paprs,omega,tke,tke_dissip,lmix,wprime,ratqs_tke_)     
@@ -234 +234 @@
 !  -----------
 
-      if (iflag_cld_th.eq.1 .or.iflag_cld_th.eq.2.or.iflag_cld_th.eq.4) then
+      if (iflag_cld_th==1 .or.iflag_cld_th==2.or.iflag_cld_th==4) then
 
 ! On ajoute une constante au ratqsc*2 pour tenir compte de 
@@ -248 +248 @@
 
 !   les ratqs sont une combinaison de ratqss et ratqsc
-       if(prt_level.ge.9) write(lunout,*)'PHYLMD NOUVEAU TAU_RATQS ',tau_ratqs
+       if(prt_level>=9) write(lunout,*)'PHYLMD NOUVEAU TAU_RATQS ',tau_ratqs
 
          if (tau_ratqs>1.e-10) then
@@ -271 +271 @@
           do k=1,klev
              do i=1,klon
-                if (ratqsc(i,k).gt.1.e-10) then
+                if (ratqsc(i,k)>1.e-10) then
                    ratqs(i,k)=ratqs(i,k)*zfratqs2+(iflag_cld_th/100.)*ratqsc(i,k)*(1.-zfratqs2)
                 endif