Changeset 2704 for LMDZ5/trunk/libf/phylmd/StratAer/interp_sulf_input.F90

Timestamp:

Nov 20, 2016, 2:15:32 PM (8 years ago)

Author:

oboucher

Message:

This revision concerns the StratAer? module and should not impact the rest of LMDz
Bug correction in interp_sulf_input.F90
Update of miecalc_aer.F90 and traccoag_mod.F90
Phytrac tracers are now dealt with in XIOS through the Fortran interface with minimal input in the xml
Making tracer groups in DefLists? for StratAer?

File:

• LMDZ5/trunk/libf/phylmd/StratAer/interp_sulf_input.F90 (modified) (5 diffs)

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

@@ -71 +71 @@
 !$OMP THREADPRIVATE(OCS_clim,SO2_clim)
 !
-  INTEGER i, k, kk, ilon, ilev, j
+  INTEGER i, k, kk, j
   REAL p_bound
 
@@ -89 +89 @@
   5.53084382e+01,   3.35462635e+01,   0.0           /)
 !
-  REAL, PARAMETER :: epsilon_OCS=1.0e-20     ! minimum OCS concentration [kg/kgA] for weighting of lifetime
-  REAL, PARAMETER :: epsilon_SO2=1.0e-20     ! minimum SO2 concentration [kg/kgA] for weighting of lifetime
-  REAL, PARAMETER :: min_OCS_lifetime= 3600. !minimum OCS lifetime [sec]
-  REAL, PARAMETER :: min_SO2_lifetime=86400. !minimum SO2 lifetime [sec]
-
  IF (.NOT.ALLOCATED(OCS_clim)) ALLOCATE(OCS_clim(klon,klev))
  IF (.NOT.ALLOCATED(SO2_clim)) ALLOCATE(SO2_clim(klon,klev))
@@ -183 +178 @@
 
   !---regrid weighted lifetime and climatologies
-  DO i=1, klon
+  DO i=1, klon_glo
     DO k=1, klev
      OCS_lifetime_glo(i,k)=0.0
@@ -206 +201 @@
   ENDDO
 
-  ENDIF ! is_mpi_root
+  ENDIF !--is_mpi_root and is_omp_root
 
 !--keep memory of previous month
@@ -255 +250 @@
 
   !convert SO2_backgr_tend from kg(SO2)/kgA to kg(S)/m2/layer/s for saving as diagnostic
-  DO ilon=1, klon
-    DO ilev=1, klev
-      SO2_backgr_tend(ilon,ilev)=SO2_backgr_tend(ilon,ilev)*mSatom/mSO2mol*(paprs(ilon,ilev)-paprs(ilon,ilev+1))/RG/pdtphys
-      OCS_backgr_tend(ilon,ilev)=OCS_backgr_tend(ilon,ilev)*mSatom/mOCSmol*(paprs(ilon,ilev)-paprs(ilon,ilev+1))/RG/pdtphys
+  DO i=1, klon
+    DO k=1, klev
+      SO2_backgr_tend(i,k)=SO2_backgr_tend(i,k)*mSatom/mSO2mol*(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
+      OCS_backgr_tend(i,k)=OCS_backgr_tend(i,k)*mSatom/mOCSmol*(paprs(i,k)-paprs(i,k+1))/RG/pdtphys
     ENDDO
   ENDDO