Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/cosp/lidar_simulator.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (7 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

• . (modified) (1 prop)
• libf/phylmd/cosp/lidar_simulator.F90 (modified) (5 diffs)

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/cosp/lidar_simulator.F90

@@ -121 +121 @@
 !---------------------------------------------------------------------------------
 
-      USE MOD_COSP_CONSTANTS, only : ok_debug_cosp
       IMPLICIT NONE
       REAL :: SRsat
@@ -202 +201 @@
       REAL pnorm_perp_liq(npoints,nlev) ! perpendicular lidar backscattered signal power for liq
 
-      REAL :: seuil 
-
 ! Output variable
       REAL pnorm_perp_tot (npoints,nlev) ! perpendicular lidar backscattered signal power
@@ -238 +235 @@
          Gamma = 0.009
 
-  if (ok_debug_cosp) then
-     seuil=1.e-18
-  else
-     seuil=0.0
-  endif 
 !------------------------------------------------------------
 !---- 1. Preliminary definitions and calculations :
@@ -502 +494 @@
 
       DO k= nlev, 1, -1
-         pnorm_perp_ice(:,k) = Alpha * pnorm_ice(:,k) ! Ice particles
-         pnorm_perp_liq(:,k) = 1000*Beta * pnorm_liq(:,k)**2 + Gamma * pnorm_liq(:,k) ! Liquid particles
+              pnorm_perp_ice(:,k) = Alpha * pnorm_ice(:,k) ! Ice particles
+              pnorm_perp_liq(:,k) = 1000*Beta * pnorm_liq(:,k)**2 + Gamma * pnorm_liq(:,k) ! Liquid particles
       ENDDO
 
@@ -531 +523 @@
           tautot_lay_liq(:) = tautot_liq(:,k)-tautot_liq(:,k+1) 
         WHERE (tautot_lay_liq(:).GT.0.)
-         beta_perp_liq(:,k) = pnorm_perp_liq(:,k)/ max(seuil,EXP(-2.0*tautot_liq(:,k+1))) &
-            & * (2.*tautot_lay_liq(:)) / (1.-exp(-2.0*tautot_lay_liq(:)))
+         beta_perp_liq(:,k) = pnorm_perp_liq(:,k)/ EXP(-2.0*tautot_liq(:,k+1)) * (2.*tautot_lay_liq(:)) &
+            & / (1.-exp(-2.0*tautot_lay_liq(:)))
 
         ELSEWHERE