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

LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/MISR_simulator.F90

@@ -84 +84 @@
        do ilev=1,nlev
           ! Define location of "layer top"
-          if(ilev.eq.1 .or. ilev.eq.nlev) then
+          if(ilev==1 .or. ilev==nlev) then
              ztest=zfull(j,ilev)
           else
@@ -94 +94 @@
           iMISR_ztop=2
           do loop=2,numMISRHgtBins
-             if ( ztest .gt. 1000*misr_histHgt(loop+1) ) then
+             if ( ztest > 1000*misr_histHgt(loop+1) ) then
                 iMISR_ztop=loop+1
              endif
@@ -110 +110 @@
           do ilev=1,nlev
              ! If there a cloud, start the counter and store this height
-             if(thres_crossed_MISR .eq. 0 .and. dtau(j,ibox,ilev) .gt. 0.) then
+             if(thres_crossed_MISR == 0 .and. dtau(j,ibox,ilev) > 0.) then
                 ! First encountered a "cloud"
                 thres_crossed_MISR = 1  
@@ -116 +116 @@
              endif
 
-             if( thres_crossed_MISR .lt. 99 .and. thres_crossed_MISR .gt. 0 ) then
-                if( dtau(j,ibox,ilev) .eq. 0.) then
+             if( thres_crossed_MISR < 99 .and. thres_crossed_MISR > 0 ) then
+                if( dtau(j,ibox,ilev) == 0.) then
                    ! We have come to the end of the current cloud layer without yet 
                    ! selecting a CTH boundary. Restart cloud tau counter 
@@ -129 +129 @@
                 ! current layer cloud top to the current level then MISR will like 
                 ! see a top below the top of the current layer.
-                if( dtau(j,ibox,ilev).gt.0 .and. (cloud_dtau-dtau(j,ibox,ilev)) .lt. 1) then
-                   if(dtau(j,ibox,ilev) .lt. 1 .or. ilev.eq.1 .or. ilev.eq.nlev) then
+                if( dtau(j,ibox,ilev)>0 .and. (cloud_dtau-dtau(j,ibox,ilev)) < 1) then
+                   if(dtau(j,ibox,ilev) < 1 .or. ilev==1 .or. ilev==nlev) then
                       ! MISR will likely penetrate to some point within this layer ... the middle
                       MISR_penetration_height=zfull(j,ilev)
@@ -142 +142 @@
                 
                 ! Check for a distinctive water layer
-                if(dtau(j,ibox,ilev) .gt. 1 .and. at(j,ilev) .gt. 273 ) then
+                if(dtau(j,ibox,ilev) > 1 .and. at(j,ilev) > 273 ) then
                    ! Must be a water cloud, take this as CTH level
                    thres_crossed_MISR=99
@@ -149 +149 @@
                 ! If the total column optical depth is "large" than MISR can't see
                 ! anything else. Set current point as CTH level
-                if(sum(dtau(j,ibox,1:ilev)) .gt. 5) then
+                if(sum(dtau(j,ibox,1:ilev)) > 5) then
                    thres_crossed_MISR=99           
                 endif
@@ -157 +157 @@
           ! Check to see if there was a cloud for which we didn't 
           ! set a MISR cloud top boundary
-          if( thres_crossed_MISR .eq. 1) then
+          if( thres_crossed_MISR == 1) then
              ! If the cloud has a total optical depth of greater
              ! than ~ 0.5 MISR will still likely pick up this cloud
              ! with a height near the true cloud top
              ! otherwise there should be no CTH
-             if(sum(dtau(j,ibox,1:nlev)) .gt. 0.5) then
+             if(sum(dtau(j,ibox,1:nlev)) > 0.5) then
                 ! keep MISR detected CTH
-             elseif(sum(dtau(j,ibox,1:nlev)) .gt. 0.2) then
+             elseif(sum(dtau(j,ibox,1:nlev)) > 0.2) then
                 ! MISR may detect but wont likley have a good height
                 box_MISR_ztop(j,ibox)=-1
@@ -215 +215 @@
     ! Fill dark scenes 
     do j=1,numMISRHgtBins
-       where(sunlit .ne. 1) dist_model_layertops(1:npoints,j) = R_UNDEF
+       where(sunlit /= 1) dist_model_layertops(1:npoints,j) = R_UNDEF
     enddo
 
@@ -257 +257 @@
 
        ! Subcolumns that are cloudy(true) and not(false)
-       box_cloudy(1:ncol) = merge(.true.,.false.,tau(j,1:ncol) .gt. tauchk)
+       box_cloudy(1:ncol) = merge(.true.,.false.,tau(j,1:ncol) > tauchk)
 
        ! Fill optically thin clouds with fill value
        where(.not. box_cloudy(1:ncol)) tauWRK(j,1:ncol)  = -999._wp
-       where(box_MISR_ztopWRK(j,1:ncol) .eq. 0) box_MISR_ztopWRK(j,1:ncol)=-999._wp
+       where(box_MISR_ztopWRK(j,1:ncol) == 0) box_MISR_ztopWRK(j,1:ncol)=-999._wp
 
        ! Compute joint histogram and column quantities for points that are sunlit and cloudy
-       if (sunlit(j) .eq. 1) then 
+       if (sunlit(j) == 1) then
           ! Joint histogram
           call hist2D(tauWRK(j,1:ncol),box_MISR_ztopWRK(j,1:ncol),ncol,misr_histTau,numMISRTauBins,&
@@ -272 +272 @@
 
           ! Column cloud area
-          MISR_cldarea(j)=real(count(box_MISR_ztopWRK(j,1:ncol) .ne. -999.))/ncol
+          MISR_cldarea(j)=real(count(box_MISR_ztopWRK(j,1:ncol) /= -999.))/ncol
 
           ! Column cloud-top height
-          if ( count(box_MISR_ztopWRK(j,1:ncol) .ne. -999.) .ne. 0 ) then
-             MISR_mean_ztop(j) = sum(box_MISR_ztopWRK(j,1:ncol),box_MISR_ztopWRK(j,1:ncol) .ne. -999.)/ &
-                  count(box_MISR_ztopWRK(j,1:ncol) .ne. -999.)
+          if ( count(box_MISR_ztopWRK(j,1:ncol) /= -999.) /= 0 ) then
+             MISR_mean_ztop(j) = sum(box_MISR_ztopWRK(j,1:ncol),box_MISR_ztopWRK(j,1:ncol) /= -999.)/ &
+                  count(box_MISR_ztopWRK(j,1:ncol) /= -999.)
           else
              MISR_mean_ztop(j) = R_UNDEF