Changeset 2056 for LMDZ5/branches/testing/libf/phylmd/aero_mod.F90

Timestamp:

Jun 11, 2014, 3:46:46 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1997:2055 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/aero_mod.F90 (modified) (4 diffs)

LMDZ5/branches/testing/libf/phylmd/aero_mod.F90

@@ -2 +2 @@
 !
 MODULE aero_mod
-  ! Declaration des indices pour les aerosols 
+! Declaration des indices pour les aerosols 
 
-  ! Total number of aerosols
-!  INTEGER, PARAMETER :: naero_tot = 10 
-!--STRAT AER
+! 1/ Total number of aerosols for which an aerosol optical depth is provided
+!--strat aerosols are only prescribed naero_tot = 10 ==> 11 
+
   INTEGER, PARAMETER :: naero_tot = 11
 
-  ! Identification number used in aeropt_2bands and aeropt_5wv
-  ! corresponding to naero_tot
+! Identification number used in aeropt_2bands and aeropt_5wv
+! corresponding to naero_tot
   INTEGER, PARAMETER :: id_ASBCM    = 1
   INTEGER, PARAMETER :: id_ASPOMM   = 2
@@ -21 +21 @@
   INTEGER, PARAMETER :: id_AIBCM    = 9
   INTEGER, PARAMETER :: id_AIPOMM   = 10
-!--STRAT AER
-  INTEGER, PARAMETER :: id_strat   = 11
+  INTEGER, PARAMETER :: id_STRAT   = 11
 
+! Corresponding names for the aerosols
+  CHARACTER(len=7),DIMENSION(naero_tot), PARAMETER :: name_aero_tau=(/&
+       "ASBCM  ", &
+       "ASPOMM ", &
+       "SO4    ", &
+       "CSSO4M ", &
+       "SSSSM  ", &
+       "CSSSM  ", &
+       "ASSSM  ", &
+       "CIDUSTM", &
+       "AIBCM  ", &
+       "AIPOMM ", &
+       "STRAT  " /)
 
-  ! Total number of aerosols actually used in LMDZ 
-  ! 1 =  ASBCM
-  ! 2 =  ASPOMM
-  ! 3 =  ASSO4M ( = SO4) 
-  ! 4 =  CSSO4M 
-  ! 5 =  SSSSM 
-  ! 6 =  CSSSM
-  ! 7 =  ASSSM
-  ! 8 =  CIDUSTM
-  ! 9 =  AIBCM
-  !10 =  AIPOMM
-!--STRAT AER
-  !11 = aerosols stratos
-!  INTEGER, PARAMETER :: naero_spc = 10
-  INTEGER, PARAMETER :: naero_spc = 11
+! 2/ Total number of aerosols for which an aerosol mass is provided
 
-  ! Corresponding names for the aerosols
+  INTEGER, PARAMETER :: naero_spc = 10
+
+! Corresponding names for the aerosols
   CHARACTER(len=7),DIMENSION(naero_spc), PARAMETER :: name_aero=(/&
        "ASBCM  ", &
@@ -52 +52 @@
        "CIDUSTM", &
        "AIBCM  ", &
-!       "AIPOMM " /)
-       "AIPOMM ", &
-       "STRAT  " /)
+       "AIPOMM " /)
 
-
-  ! Number of aerosol groups
+! 3/ Number of aerosol groups
+  INTEGER, PARAMETER :: naero_grp = 9 
   ! 1 = ZERO    
   ! 2 = AER total    
@@ -67 +65 @@
   ! 8 = SS    
   ! 9 = NO3    
-  INTEGER, PARAMETER :: naero_grp = 9 
 
-  ! Number of  wavelengths
+! Number of  wavelengths
   INTEGER, PARAMETER :: nwave = 5
 
-  ! Number of modes spectral bands
+! Number of modes spectral bands
   INTEGER, parameter :: nbands = 2
+  INTEGER, parameter :: nbands_rrtm = 6
 
 END MODULE aero_mod