Index: LMDZ6/trunk/libf/phylmd/macv2sp.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/macv2sp.f90	(revision 6128)
+++ LMDZ6/trunk/libf/phylmd/macv2sp.f90	(revision 6143)
@@ -13,4 +13,6 @@
   !--dNovrN   = enhancement factor for CDNC
   !
+  !ASima : *_allaer arguments and non-SP "aer" diagnostics arrive from rrtm/aeropt_5wv_rrtm.F90 with values for inca1850 aerosols
+
   USE mo_simple_plumes, ONLY: sp_aod550_profile, sp_aop_profile, sp_setup 	! subroutines
   USE mo_simple_plumes, ONLY: nplumes, sp_initialized, aerosols_SP_forcing_year ! variables
@@ -18,5 +20,7 @@
   USE dimphy
   USE aero_mod
-  USE phys_local_var_mod, ONLY: t_seri, od443aer, od550aer, od865aer, ec550aer, dryod550aer, od550lt1aer, od550SPaer
+  USE phys_local_var_mod, ONLY: t_seri, od443aer, od550aer, od865aer, ec550aer, dryod550aer, od550lt1aer
+  ! SP-specific diagnostics ; an alternative to od550SPaer_prof would be ec550SPaer = od550SPaer_prof/dz
+  USE phys_local_var_mod, ONLY: od550SPaer, od550SPaer_prof 
   !
   USE yomcst_mod_h
@@ -66,5 +70,8 @@
   !
   oro(:)  = pphis(:)/RG                             ! surface height in m
-  !
+  ! ASima : the following calculations of z and dz are also done in phys_output_write_mod.F90
+  !      for wind100m, under "IF (vars_defined)" ; "z" therein does not include "oro" 
+  !    Layers' top and middle altitudes zhalf et zfull are also calculated for diagnostics
+  !      in phys_output_write_mod.F90, under "IF (vars_defined)", using the geopotential "phi" ...   
   DO k = 1, klev
     zrho(:) = pplay(:,k)/t_seri(:,k)/RD                         ! air density in kg/m3
@@ -107,8 +114,8 @@
   !
   ! aod550 profile = sum over the 'nplumes' dimension
-  aod_prof(:,:)=SUM(aod550(:,:,:),dim=3)
+  od550SPaer_prof(:,:)=SUM(aod550(:,:,:),dim=3)
   !
   !--a/ AOD of SP anthropic aerosols = vertical sum of SP aod profile
-  od550SPaer(:)=SUM(aod_prof(:,:),dim=2)
+  od550SPaer(:)=SUM(od550SPaer_prof(:,:),dim=2)
   !
   !--b/ total AOD = Inca1850 + SP
@@ -122,5 +129,5 @@
   !
   !--extinction coefficient for diagnostic
-  ec550aer(:,:)=ec550aer(:,:)+aod_prof(:,:)/dz(:,:)
+  ec550aer(:,:)=ec550aer(:,:)+od550SPaer_prof(:,:)/dz(:,:)
   !