Changeset 5095 for LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/cosp_optics.F90

Timestamp:

Jul 22, 2024, 9:46:57 AM (4 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/cospv2/cosp_optics.F90 (modified) (7 diffs)

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

@@ -72 +72 @@
     varOUT(1:dim1,1:dim2,1:dim3) = 0._wp
     do j=1,dim2
-       where(flag(:,j,:) == 1)
+       where(flag(:,j,:) .eq. 1)
           varOUT(:,j,:) = varIN2
        endwhere
-       where(flag(:,j,:) == 2)
+       where(flag(:,j,:) .eq. 2)
           varOUT(:,j,:) = varIN1
        endwhere
@@ -96 +96 @@
     
     varOUT(1:dim1,1:dim2,1:dim3) = 0._wp
-   where(flag(:,:,:) == 1)
+   where(flag(:,:,:) .eq. 1)
        varOUT(:,:,:) = varIN2
     endwhere
-    where(flag(:,:,:) == 2)
+    where(flag(:,:,:) .eq. 2)
        varOUT(:,:,:) = varIN1
     endwhere
@@ -295 +295 @@
 
     ! Which LIDAR frequency are we using?
-    if (lidar_freq == 355) then
+    if (lidar_freq .eq. 355) then
        Cmol   = Cmol_355nm
        rdiffm = rdiffm_355nm
     endif
-    if (lidar_freq == 532) then
+    if (lidar_freq .eq. 532) then
        Cmol   = Cmol_532nm
        rdiffm = rdiffm_532nm
@@ -336 +336 @@
     
     ! LS and CONV Ice water coefficients
-    if (ice_type == 0) then
+    if (ice_type .eq. 0) then
        polpart(INDX_LSICE,1:5) = polpartLSICE0
        polpart(INDX_CVICE,1:5) = polpartCVICE0
     endif
-    if (ice_type == 1) then
+    if (ice_type .eq. 1) then
        polpart(INDX_LSICE,1:5) = polpartLSICE1
        polpart(INDX_CVICE,1:5) = polpartCVICE1
@@ -393 +393 @@
     ! Polynomials kp_lidar derived from Mie theory
     do i = 1, npart
-       where (rad_part(1:npoints,1:nlev,i) > 0.0)
+       where (rad_part(1:npoints,1:nlev,i) .gt. 0.0)
           kp_part(1:npoints,1:nlev,i) = &
                polpart(i,1)*(rad_part(1:npoints,1:nlev,i)*1e6)**4 &
@@ -426 +426 @@
        ! Alpha of particles in each subcolumn:
        do i = 1, npart
-          where (rad_part(1:npoints,1:nlev,i) > 0.0)
+          where (rad_part(1:npoints,1:nlev,i) .gt. 0.0)
              alpha_part(1:npoints,1:nlev,i) = 3._wp/4._wp * Qscat &
                   * rhoair(1:npoints,1:nlev) * qpart(1:npoints,1:nlev,i) &
@@ -440 +440 @@
           ! Optical thickness of each layer (particles)
           tau_part(1:npoints,1:nlev,i) = tau_part(1:npoints,1:nlev,i) &
-   * (zheight(1:npoints,1:nlev)-zheight(1:npoints,2:nlev+1) )
+               & * (zheight(1:npoints,1:nlev)-zheight(1:npoints,2:nlev+1) )
           ! Optical thickness from TOA to layer k (particles)
           do k=zi,zf,zinc