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

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/sulfate_aer_mod.F90

@@ -93 +93 @@
 !      ***   H2SO4-H2O curved surface - Kelvin effect factor ***
 !            wet radius (m) (RRSI(IK) in [cm])
-             if (f_r_wetB(ilon,ilev,IK) .gt. 1.0) then 
+             if (f_r_wetB(ilon,ilev,IK) > 1.0) then
                radwet = 1.e-2*RRSI(IK)*f_r_wetB(ilon,ilev,IK)
              else 
@@ -197 +197 @@
     H2O(:,:)=sh(:,:)*mAIRmol/mH2Omol
 
-    IF(INSTEP.EQ.0) THEN
+    IF(INSTEP==0) THEN
     
        INSTEP=1
@@ -508 +508 @@
        DO I=1,16
        DO J=1,28
-         IF (F(I,J).LT.9.0)  F(I,J)=30.0
-         IF (F(I,J).GT.99.99) F(I,J)=99.99
+         IF (F(I,J)<9.0)  F(I,J)=30.0
+         IF (F(I,J)>99.99) F(I,J)=99.99
        ENDDO
        ENDDO
@@ -518 +518 @@
     DO J=1,klev
         TP=t_seri(I,J)
-        IF (TP.LT.175.1) TP=175.1
+        IF (TP<175.1) TP=175.1
 !    Partial pressure of H2O (mb)
         PH2O =PMB(I,J)*H2O(I,J)
-        IF (PH2O.LT.XC1) THEN 
+        IF (PH2O<XC1) THEN
           R2SO4(I,J)=99.99
 !          PH2O=XC(1)+1.0E-10
         ELSE 
-          IF (PH2O.GT.XC16) PH2O=XC16 
+          IF (PH2O>XC16) PH2O=XC16
 !         SIMPLE LINEAR INTERPOLATIONS
           CALL FIND(PH2O,TP,XC,YC,F,VAL,N,M)
-          IF (PMB(I,J).GE.10.0.AND.VAL.LT.60.0) VAL=60.0
+          IF (PMB(I,J)>=10.0.AND.VAL<60.0) VAL=60.0
           R2SO4(I,J)=VAL
         ENDIF
@@ -601 +601 @@
         CALL POSACT(XT,XC,NN,JX)
         JX1=JX+1
-        IF(JX.EQ.0) THEN
+        IF(JX==0) THEN
           ACTSO4(I,J)=0.0 
-        ELSE IF(JX.GE.NN) THEN
+        ELSE IF(JX>=NN) THEN
           ACTSO4(I,J)=15811.0 
         ELSE 
@@ -684 +684 @@
     CALL POSITION(YC,Y,M,JY,IERY)
 
-    IF(JX.EQ.0.OR.IERY.EQ.1) THEN
+    IF(JX==0.OR.IERY==1) THEN
        VAL=99.99
        RETURN
     ENDIF
 
-    IF(JY.EQ.0.OR.IERX.EQ.1) THEN
+    IF(JY==0.OR.IERX==1) THEN
        VAL=9.0
        RETURN
@@ -714 +714 @@
     VAL=(1.-T)*(1.-U)*SXY + T*(1.0-U)*SX1Y + T*U*SX1Y1 + (1.0-T)*U*SXY1
 
-    IF(VAL.LT.9.0) VAL=9.0
-    IF(VAL.GT.99.99) VAL=99.99
+    IF(VAL<9.0) VAL=9.0
+    IF(VAL>99.99) VAL=99.99
    
     RETURN
@@ -728 +728 @@
 
        IER=0
-       IF(X.LT.XC(1)) THEN
+       IF(X<XC(1)) THEN
          JX=0
        ELSE
          DO 10 I=1,N
-           IF (X.LT.XC(I)) GO TO 20
+           IF (X<XC(I)) GO TO 20
  10      CONTINUE
          IER=1
@@ -753 +753 @@
        INTEGER JX,I
   
-       IF(XT.GT.X(1)) THEN
+       IF(XT>X(1)) THEN
          JX=0
        ELSE
          DO 10 I=1,N
-           IF (XT.GT.X(I)) GO TO 20
+           IF (XT>X(I)) GO TO 20
  10      CONTINUE
  20      JX=I
@@ -814 +814 @@
       real, intent(in) :: T
 
-      if(T.gt.229.) then
+      if(T>229.) then
 !        Preining et al., 1981 (from Kulmala et al., 1998)
 !        saturation vapor pressure (N/m2 = 1 Pa = 1 kg/(m·s2))
@@ -955 +955 @@
 !       composition
 !       calculation of h2so4 molality
-            if(aw .le. 0.05 .and. aw .gt. 0.) then
+            if(aw <= 0.05 .and. aw > 0.) then
                y1=12.372089320*aw**(-0.16125516114) &
                  &  -30.490657554*aw -2.1133114241
                y2=13.455394705*aw**(-0.19213122550) &
                  &  -34.285174607*aw -1.7620073078
-            else if(aw .le. 0.85 .and. aw .gt. 0.05) then
+            else if(aw <= 0.85 .and. aw > 0.05) then
                y1=11.820654354*aw**(-0.20786404244) &
                  &  -4.8073063730*aw -5.1727540348