Changeset 2695 for LMDZ5/trunk/libf/phylmd/StratAer/cond_evap_tstep_mod.F90

Timestamp:

Nov 1, 2016, 11:19:45 AM (8 years ago)

Author:

oboucher

Message:

Removing useless global variables
Interpolation only done once a month
Changing test orders in implicit coagulation routine as some compilers didn't like it

File:

• LMDZ5/trunk/libf/phylmd/StratAer/cond_evap_tstep_mod.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phylmd/StratAer/cond_evap_tstep_mod.F90

@@ -18 +18 @@
       USE aerophys
       USE infotrac
-      USE YOMCST
+      USE YOMCST, ONLY : RPI
 
       IMPLICIT NONE
@@ -139 +139 @@
       USE aerophys
       USE infotrac
+      USE YOMCST, ONLY : RPI
 
       IMPLICIT NONE
-
-      include "YOMCST.h"
 
       ! input variables
@@ -175 +174 @@
         ff(IK,:)=0.0 
         DO k=1, nbtr_bin 
-          IF (k.LE.(nbtr_bin-1).AND.Vbin_wet(k).LE.Vnew.AND.Vnew.LT.Vbin_wet(k+1)) THEN
-            ff(IK,k)= Vbin_wet(k)/Vnew*(Vbin_wet(k+1)-Vnew)/(Vbin_wet(k+1)-Vbin_wet(k))
+          IF (k.LE.(nbtr_bin-1)) THEN 
+            IF (Vbin_wet(k).LE.Vnew.AND.Vnew.LT.Vbin_wet(k+1)) THEN
+              ff(IK,k)= Vbin_wet(k)/Vnew*(Vbin_wet(k+1)-Vnew)/(Vbin_wet(k+1)-Vbin_wet(k))
+            ENDIF
           ENDIF
           IF (k.EQ.1.AND.Vnew.LE.Vbin_wet(k)) THEN
             ff(IK,k)= 1.
           ENDIF
-          IF (k.GT.1.AND.Vbin_wet(k-1).LT.Vnew.AND.Vnew.LT.Vbin_wet(k)) THEN
-            ff(IK,k)= 1.-ff(IK,k-1)
+          IF (k.GT.1) THEN 
+            IF (Vbin_wet(k-1).LT.Vnew.AND.Vnew.LT.Vbin_wet(k)) THEN
+              ff(IK,k)= 1.-ff(IK,k-1)
+            ENDIF
           ENDIF
           IF (k.EQ.nbtr_bin.AND.Vnew.GE.Vbin_wet(k)) THEN