Changeset 2695 for LMDZ5/trunk/libf/phylmd/StratAer/ocs_to_so2.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/ocs_to_so2.F90 (modified) (4 diffs)

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

@@ -1 @@
-SUBROUTINE OCS_TO_SO2(pdtphys,tr_seri,t_seri,pplay,paprs,sh,OCS_lifetime,is_strato,ocs_convert_sub)
+SUBROUTINE ocs_to_so2(pdtphys,tr_seri,t_seri,pplay,paprs,sh,is_strato)
 
   USE dimphy, ONLY : klon,klev
@@ -5 +5 @@
   USE infotrac
   USE YOMCST, ONLY : RG
+  USE phys_local_var_mod, ONLY : OCS_lifetime, ocs_convert
 
   IMPLICIT NONE
@@ -16 +17 @@
   REAL,DIMENSION(klon,klev+1),INTENT(IN)        :: paprs   ! pression pour chaque inter-couche (en Pa)
   REAL,DIMENSION(klon,klev),INTENT(IN)          :: sh      ! humidite specifique   
-  REAL,DIMENSION(klon,klev),INTENT(IN)          :: OCS_lifetime
   LOGICAL,DIMENSION(klon,klev),INTENT(IN)       :: is_strato
 
   ! local variables
   INTEGER                                       :: i,j,k,nb,ilon,ilev
-  REAL,DIMENSION(klon,klev)                     :: ocs_convert_sub ! OCS converted to SO2 [kg(S)/m2/layer/s]
 
 !--convert OCS to SO2
+  ocs_convert(:,:)=0.0
   DO ilon=1, klon
   DO ilev=1, klev
@@ -29 +29 @@
   IF (is_strato(ilon,ilev)) THEN
     IF (OCS_lifetime(ilon,ilev).GT.0.0) THEN
-      ocs_convert_sub(ilon,ilev)=tr_seri(ilon,ilev,id_OCS_strat)*(1-exp(-pdtphys/OCS_lifetime(ilon,ilev)))
-    ELSE
-      ocs_convert_sub(ilon,ilev)=0.0
+      ocs_convert(ilon,ilev)=tr_seri(ilon,ilev,id_OCS_strat)*(1.0-exp(-pdtphys/OCS_lifetime(ilon,ilev)))
     ENDIF
-    tr_seri(ilon,ilev,id_OCS_strat)=tr_seri(ilon,ilev,id_OCS_strat) - ocs_convert_sub(ilon,ilev)
-    tr_seri(ilon,ilev,id_SO2_strat)=tr_seri(ilon,ilev,id_SO2_strat) + mSO2mol/mOCSmol*ocs_convert_sub(ilon,ilev)
+    tr_seri(ilon,ilev,id_OCS_strat)=tr_seri(ilon,ilev,id_OCS_strat) - ocs_convert(ilon,ilev)
+    tr_seri(ilon,ilev,id_SO2_strat)=tr_seri(ilon,ilev,id_SO2_strat) + mSO2mol/mOCSmol*ocs_convert(ilon,ilev)
     !convert ocs_convert from kg(OCS)/kgA to kg(S)/m2/layer/s for saving as diagnostic
-    ocs_convert_sub(ilon,ilev)=ocs_convert_sub(ilon,ilev)*mSatom/mOCSmol* &
-                            & (paprs(ilon,ilev)-paprs(ilon,ilev+1))/RG/pdtphys
+    ocs_convert(ilon,ilev)=ocs_convert(ilon,ilev)*mSatom/mOCSmol*(paprs(ilon,ilev)-paprs(ilon,ilev+1))/RG/pdtphys
   ENDIF
   ENDDO
   ENDDO
 
-END SUBROUTINE OCS_TO_SO2
+END SUBROUTINE ocs_to_so2