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

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

@@ -89 +89 @@
     IF (first) THEN
       CALL getin_p('multiply_proba_notrig',multiply_proba_notrig)
-      IF (iflag_clos_bl .LT. 3) THEN
+      IF (iflag_clos_bl < 3) THEN
          random_notrig_max=1.
          CALL getin_p('random_notrig_max',random_notrig_max)
-      ELSEIF (iflag_clos_bl .EQ. 3) THEN  ! (iflag_clos_bl .LT. 3)
+      ELSEIF (iflag_clos_bl == 3) THEN  ! (iflag_clos_bl .LT. 3)
          cv_feed_area = 1.e10   ! m2
          CALL getin_p('cv_feed_area', cv_feed_area)
@@ -120 +120 @@
 !!
 !---------------------------------------
-  IF (iflag_clos_bl .LT. 3) THEN
+  IF (iflag_clos_bl < 3) THEN
 !---------------------------------------
 !
@@ -127 +127 @@
           !cc nrlmd le 10/04/2012
           !-----------Stochastic triggering-----------
-          if (iflag_trig_bl.ge.1) then
+          if (iflag_trig_bl>=1) then
              !
-             IF (prt_level .GE. 10) THEN
+             IF (prt_level >= 10) THEN
                 WRITE(lunout,*)'cin, ale_bl_stat, alp_bl, alp_bl_stat ', &
                      cin, ale_bl_stat, alp_bl, alp_bl_stat
@@ -140 +140 @@
                 random_notrig(i)=1e6*ale_bl_stat(i)-int(1e6*ale_bl_stat(i))
                 if ( random_notrig(i) > random_notrig_max ) random_notrig(i)=0.
-                if ( ale_bl_trig(i) .lt. abs(cin(i))+1.e-10 ) then 
+                if ( ale_bl_trig(i) < abs(cin(i))+1.e-10 ) then
                    tau_trig(i)=tau_trig_shallow
                 else
@@ -147 +147 @@
              enddo
              !
-             IF (prt_level .GE. 10) THEN
+             IF (prt_level >= 10) THEN
                 WRITE(lunout,*)'random_notrig, tau_trig ', &
                      random_notrig, tau_trig
@@ -155 +155 @@
 
              !Option pour re-activer l'ancien calcul de Ale_bl (iflag_trig_bl=2)
-             IF (iflag_trig_bl.eq.1) then
+             IF (iflag_trig_bl==1) then
 
                 !----Tirage al\'eatoire et calcul de ale_bl_trig
                 do i=1,klon
-                   if ( (ale_bl_stat(i) .gt. abs(cin(i))+1.e-10) )  then
+                   if ( (ale_bl_stat(i) > abs(cin(i))+1.e-10) )  then
                       proba_notrig(i)=proba_notrig(i)* &
                          (1.-exp(-strig(i)/s2(i)))**(n2(i)*dtime/tau_trig(i))
                       !        print *, 'proba_notrig(i) ',proba_notrig(i)
-                      if (random_notrig(i) .ge. proba_notrig(i)) then 
+                      if (random_notrig(i) >= proba_notrig(i)) then
                          ale_bl_trig(i)=ale_bl_stat(i)
                       else
@@ -178 +178 @@
                 enddo
 
-             ELSE IF (iflag_trig_bl.ge.2) then
+             ELSE IF (iflag_trig_bl>=2) then
 
                 do i=1,klon
-                   if ( (Ale_bl(i) .gt. abs(cin(i))+1.e-10) )  then
+                   if ( (Ale_bl(i) > abs(cin(i))+1.e-10) )  then
                       proba_notrig(i)=proba_notrig(i)* &
                          (1.-exp(-strig(i)/s2(i)))**(n2(i)*dtime/tau_trig(i))
                       !        print *, 'proba_notrig(i) ',proba_notrig(i)
-                      if (random_notrig(i) .ge. proba_notrig(i)) then 
+                      if (random_notrig(i) >= proba_notrig(i)) then
                          ale_bl_trig(i)=Ale_bl(i)
                       else
@@ -203 +203 @@
 
              !
-             IF (prt_level .GE. 10) THEN
+             IF (prt_level >= 10) THEN
                 WRITE(lunout,*)'proba_notrig, ale_bl_trig ', &
                      proba_notrig, ale_bl_trig
@@ -211 +211 @@
 
           !-----------Statistical closure-----------
-          if (iflag_clos_bl.eq.1) then 
+          if (iflag_clos_bl==1) then
 
              do i=1,klon
                 !CR: alp probabiliste
-                if (ale_bl_trig(i).gt.0.) then
+                if (ale_bl_trig(i)>0.) then
                    alp_bl(i)=alp_bl(i)/(1.-min(proba_notrig(i),0.999))
                 endif
              enddo
 
-          else if (iflag_clos_bl.eq.2) then
+          else if (iflag_clos_bl==2) then
 
              !CR: alp calculee dans thermcell_main
@@ -235 +235 @@
 !
 !---------------------------------------
-  ELSEIF (iflag_clos_bl .EQ. 3) THEN  ! (iflag_clos_bl .LT. 3)
+  ELSEIF (iflag_clos_bl == 3) THEN  ! (iflag_clos_bl .LT. 3)
 !---------------------------------------
 !
@@ -242 +242 @@
 
           !-----------Stochastic triggering-----------
-     if (iflag_trig_bl.ge.1) then
+     if (iflag_trig_bl>=1) then
         !
-        IF (prt_level .GE. 10) THEN
+        IF (prt_level >= 10) THEN
            WRITE(lunout,*)'cin, ale_bl_stat, alp_bl_stat ', &
                 cin, ale_bl_stat, alp_bl_stat
@@ -251 +251 @@
         ! Use ale_bl_stat (Rochetin's code) or ale_bl (old code) according to 
         ! iflag_trig_bl value.
-        IF (iflag_trig_bl.eq.1) then         ! use ale_bl_stat (Rochetin computation)
+        IF (iflag_trig_bl==1) then         ! use ale_bl_stat (Rochetin computation)
          do i=1,klon
               ale_bl_ref(i)=ale_bl_stat(i)
          enddo
-        ELSE IF (iflag_trig_bl.ge.2) then    ! use ale_bl (old computation)
+        ELSE IF (iflag_trig_bl>=2) then    ! use ale_bl (old computation)
          do i=1,klon
               ale_bl_ref(i)=Ale_bl(i)
@@ -266 +266 @@
 !!jyg           proba_notrig(i)=1.
            random_notrig(i)=1e6*ale_bl_stat(i)-int(1e6*ale_bl_stat(i))
-           if ( ale_bl_trig(i) .lt. abs(cin(i))+1.e-10 ) then 
+           if ( ale_bl_trig(i) < abs(cin(i))+1.e-10 ) then
               tau_trig(i)=tau_trig_shallow
            else
@@ -273 +273 @@
         enddo
         !
-        IF (prt_level .GE. 10) THEN
+        IF (prt_level >= 10) THEN
            WRITE(lunout,*)'random_notrig, tau_trig ', &
                 random_notrig, tau_trig
@@ -282 +282 @@
         !----alp_bl computation
         do i=1,klon
-           if ( (ale_bl_ref(i) .gt. abs(cin(i))+1.e-10) )  then
+           if ( (ale_bl_ref(i) > abs(cin(i))+1.e-10) )  then
               birth_number = n2(i)*exp(-strig(i)/s2(i))
               birth_rate(i) = birth_number/(tau_trig(i)*cell_area(i))
@@ -301 +301 @@
         !----ale_bl_trig computation
          do i=1,klon
-           if (random_notrig(i) .ge. proba_notrig(i)) then 
+           if (random_notrig(i) >= proba_notrig(i)) then
               ale_bl_trig(i)=ale_bl_ref(i)
            else
@@ -309 +309 @@
 
         !
-        IF (prt_level .GE. 10) THEN
+        IF (prt_level >= 10) THEN
            WRITE(lunout,*)'proba_notrig, ale_bl_trig ', &
                 proba_notrig, ale_bl_trig
@@ -320 +320 @@
 !---------------------------------------
 
-          IF (prt_level .GE. 10) THEN
+          IF (prt_level >= 10) THEN
              WRITE(lunout,*)'alpale_th: ale_bl_trig, alp_bl_stat, birth_rate ', &
                       ale_bl_trig(1), alp_bl_stat(1), birth_rate(1)
@@ -330 +330 @@
           ! Couplage Thermiques/Emanuel seulement si T<0
           if (iflag_coupl==2) then
-             IF (prt_level .GE. 10) THEN
+             IF (prt_level >= 10) THEN
                 WRITE(lunout,*)'Couplage Thermiques/Emanuel seulement si T<0'
              ENDIF