Changeset 5082 for LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/inlandsis.F

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/inlandsis/inlandsis.F (modified) (12 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmd/inlandsis/inlandsis.F

@@ -409 +409 @@
         IF (BloMod) THEN
  
-        if (klonv.eq.1) then
-          if(isnoSV(1).ge.2                   .and.
+        if (klonv==1) then
+          if(isnoSV(1)>=2                   .and.
      .         TsisSV(1,max(1,isnoSV(1)))<273.  .and.
      .         ro__SV(1,max(1,isnoSV(1)))<500.  .and.
@@ -518 +518 @@
 C +     Gallee et al., 2001    eq 5, p5
  
-          if (usth_param .eq. "gal") then
+          if (usth_param == "gal") then
             Salt_us   =   (log(2.868) - log(1 + SaltMo)) * rCd10n/0.085
             Salt_us   = Salt_us * Fac_Mo
@@ -525 +525 @@
           endif
  
-          if (usth_param .eq. "lis") then !Liston et al. 2007
+          if (usth_param == "lis") then !Liston et al. 2007
             if(ro__SV(ikl,isn)>300.) then
               Salt_us   = 0.005*exp(0.013*ro__SV(ikl,isn))
@@ -607 +607 @@
         hSalSV(ikl) = 8.436e-2  * us__SV(ikl)**SblPom
  
-        if (qsalt_param .eq. "pom") then
+        if (qsalt_param == "pom") then
           qSalSV(ikl) = (us__SV(ikl)**2 - usthSV(ikl)**2) *signus
      .               / (hSalSV(ikl) * gravit * us__SV(ikl) * 3.25)
         endif
  
-        if (qsalt_param .eq. "bin") then
+        if (qsalt_param == "bin") then
           qSalSV(ikl) = (us__SV(ikl) * us__SV(ikl)
      .                -usthSV(ikl) * usthSV(ikl))*signus
@@ -668 +668 @@
 C + ...         [ A compromise between
 C + ...           Kotlyakov (1961) and Lenaerts (2012, JGR, Part1) ]
-                if (tt_tmp.ge.-10) then
+                if (tt_tmp>=-10) then
                   BufPro   =  max( rosMin,
      .            104. *sqrt( max( vv_tmp-6.0,0.0))) ! Kotlyakov (1961)
@@ -894 +894 @@
 
           
-      if (discret_xf.AND.klonv.eq.1) then
-
-       if(isnoSV(1).ge.1.or.NLaysv(1).ge.1) then
+      if (discret_xf.AND.klonv==1) then
+
+       if(isnoSV(1)>=1.or.NLaysv(1)>=1) then
 C +          **********
          call SISVAT_zSn
@@ -1081 +1081 @@
 
 
-      if (iflag_temp_inlandsis .eq. 0) then
+      if (iflag_temp_inlandsis == 0) then
 
        call SISVAT_TSo
@@ -1198 +1198 @@
 ! ^^^^^^^^^^^^^^^^^^^^
 
-          IF (iflag_tsurf_inlandsis .EQ. 0) THEN   
+          IF (iflag_tsurf_inlandsis == 0) THEN
 
             Tsrfsv(ikl) =TsisSV(ikl,isnoSV(ikl))
 
-          ELSE IF (iflag_tsurf_inlandsis .GT. 0) THEN
+          ELSE IF (iflag_tsurf_inlandsis > 0) THEN
 ! Etienne: extrapolation from the two uppermost levels:
 
@@ -1208 +1208 @@
            zm1=-dzsnSV(ikl,isnoSV(ikl))/2.
            zm2=-(dzsnSV(ikl,isnoSV(ikl)) + dzsnSV(ikl,isnoSV(ikl)-1)/2.)
-         else if (isnoSV(ikl) .EQ. 1) then
+         else if (isnoSV(ikl) == 1) then
            zm1=-dzsnSV(ikl,isnoSV(ikl))/2.
            zm2=-(dzsnSV(ikl,isnoSV(ikl))+dz_dSV(0)/2.)
@@ -1236 +1236 @@
       IF (SnoMod)                                                 THEN
 
-      if (discret_xf .AND. klonv.eq.1) then
-      if(isnoSV(1).ge.1) then
+      if (discret_xf .AND. klonv==1) then
+      if(isnoSV(1)>=1) then
 C +          **********
       call SISVAT_GSn
@@ -1305 +1305 @@
 ! Calculation of snow roughness length
 !=====================================
-          IF (iflag_z0m_snow .EQ. 0) THEN
+          IF (iflag_z0m_snow == 0) THEN
 
           Z0m_Sn=prescribed_z0m_snow
 
-          ELSE IF (iflag_z0m_snow .EQ. 1) THEN
+          ELSE IF (iflag_z0m_snow == 1) THEN
 
           Z0m_Sn=Z0enSV(ikl) 
 
-          ELSE IF (iflag_z0m_snow .EQ. 2) THEN                             
+          ELSE IF (iflag_z0m_snow == 2) THEN
 
 C +--Rough   Snow Surface Roughness Length (Variable Sastrugi Height)
@@ -1336 +1336 @@
           coefd = log(z03)-coefc*ta3
 
-          if (TaT_SV(ikl) .lt. ta1) then
+          if (TaT_SV(ikl) < ta1) then
             Z0_obs = z01
-          else if (TaT_SV(ikl).ge.ta1 .and. TaT_SV(ikl).lt.ta2) then
+          else if (TaT_SV(ikl)>=ta1 .and. TaT_SV(ikl)<ta2) then
             Z0_obs = exp(coefa*TaT_SV(ikl) + coefb)
-          else if (TaT_SV(ikl).ge.ta2 .and. TaT_SV(ikl).lt.ta3) then
+          else if (TaT_SV(ikl)>=ta2 .and. TaT_SV(ikl)<ta3) then
             ! if st > 0, melting induce smooth surface
             Z0_obs = exp(coefc*TaT_SV(ikl) + coefd)