Changeset 5095 for LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_stats.F90

Timestamp:

Jul 22, 2024, 9:46:57 AM (2 months ago)

Author:

abarral

Message:

Revert cosp*/ from the trunk, as it's external code
Add missing bits from FCM2 source

File:

• LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_stats.F90 (modified) (4 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_stats.F90

@@ -203 +203 @@
           do j=1,Nlevels
              sc_ratio = beta_tot(pr,i,j)/beta_mol(pr,j)
-             if ((sc_ratio <= s_att) .and. (flag_sat == 0)) flag_sat = j
-             if (Ze_tot(pr,i,j) < -30.) then  !radar can't detect cloud
-                if ( (sc_ratio > s_cld) .or. (flag_sat == j) ) then  !lidar sense cloud
+             if ((sc_ratio .le. s_att) .and. (flag_sat .eq. 0)) flag_sat = j
+             if (Ze_tot(pr,i,j) .lt. -30.) then  !radar can't detect cloud
+                if ( (sc_ratio .gt. s_cld) .or. (flag_sat .eq. j) ) then  !lidar sense cloud
                    lidar_only_freq_cloud(pr,j)=lidar_only_freq_cloud(pr,j)+1. !top->surf
                    flag_cld=1
@@ -213 +213 @@
              endif
           enddo !levels
-          if (flag_cld == 1) tcc(pr)=tcc(pr)+1._wp
+          if (flag_cld .eq. 1) tcc(pr)=tcc(pr)+1._wp
        enddo !columns
     enddo !points
@@ -245 +245 @@
     
     do ij=2,Nbins+1  
-       hist1D(ij-1) = count(var >= bins(ij-1) .and. var < bins(ij))
-       if (count(var == R_GROUND) >= 1) hist1D(ij-1)=R_UNDEF
+       hist1D(ij-1) = count(var .ge. bins(ij-1) .and. var .lt. bins(ij))
+       if (count(var .eq. R_GROUND) .ge. 1) hist1D(ij-1)=R_UNDEF
     enddo
     
@@ -278 +278 @@
     do ij=2,nbin1+1
        do ik=2,nbin2+1
-          jointHist(ij-1,ik-1)=count(var1 >= bin1(ij-1) .and. var1 < bin1(ij) .and. &
-               var2 >= bin2(ik-1) .and. var2 < bin2(ik))
+          jointHist(ij-1,ik-1)=count(var1 .ge. bin1(ij-1) .and. var1 .lt. bin1(ij) .and. &
+               var2 .ge. bin2(ik-1) .and. var2 .lt. bin2(ik))        
        enddo
     enddo