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

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -6 +6 @@
 ! 1/ Total number of aerosols for which an aerosol optical depth is provided
 !--strat aerosols are only prescribed naero_tot = 10 ==> 11 
+!--adding nitrate naero_tot = 14 OB
 
-  INTEGER, PARAMETER :: naero_tot = 11
+  INTEGER, PARAMETER :: naero_tot = 14
 
 ! Identification number used in aeropt_2bands and aeropt_5wv
 ! corresponding to naero_tot
-  INTEGER, PARAMETER :: id_ASBCM    = 1
-  INTEGER, PARAMETER :: id_ASPOMM   = 2
-  INTEGER, PARAMETER :: id_ASSO4M   = 3
-  INTEGER, PARAMETER :: id_CSSO4M   = 4
-  INTEGER, PARAMETER :: id_SSSSM    = 5
-  INTEGER, PARAMETER :: id_CSSSM    = 6
-  INTEGER, PARAMETER :: id_ASSSM    = 7
-  INTEGER, PARAMETER :: id_CIDUSTM  = 8
-  INTEGER, PARAMETER :: id_AIBCM    = 9
-  INTEGER, PARAMETER :: id_AIPOMM   = 10
-  INTEGER, PARAMETER :: id_STRAT   = 11
+  INTEGER, PARAMETER :: id_ASBCM_phy    = 1
+  INTEGER, PARAMETER :: id_ASPOMM_phy   = 2
+  INTEGER, PARAMETER :: id_ASSO4M_phy   = 3
+  INTEGER, PARAMETER :: id_CSSO4M_phy   = 4
+  INTEGER, PARAMETER :: id_SSSSM_phy    = 5
+  INTEGER, PARAMETER :: id_CSSSM_phy    = 6
+  INTEGER, PARAMETER :: id_ASSSM_phy    = 7
+  INTEGER, PARAMETER :: id_CIDUSTM_phy  = 8
+  INTEGER, PARAMETER :: id_AIBCM_phy    = 9
+  INTEGER, PARAMETER :: id_AIPOMM_phy   = 10
+  INTEGER, PARAMETER :: id_ASNO3M_phy   = 11
+  INTEGER, PARAMETER :: id_CSNO3M_phy   = 12
+  INTEGER, PARAMETER :: id_CINO3M_phy   = 13
+  INTEGER, PARAMETER :: id_STRAT_phy    = 14
 
 ! Corresponding names for the aerosols
@@ -35 +39 @@
        "AIBCM  ", &
        "AIPOMM ", &
+       "ASNO3M ", & 
+       "CSNO3M ", &
+       "CINO3M ", &
        "STRAT  " /)
 
@@ -66 +73 @@
   ! 9 = NO3    
 
-! Number of  wavelengths
+! Number of diagnostics wavelengths (5 SW + 1 LW @ 10 um)
   INTEGER, PARAMETER :: nwave = 5
+  INTEGER, PARAMETER :: nwave_lw = 1
 
 ! Number of modes spectral bands
   INTEGER, parameter :: nbands = 2
-  INTEGER, parameter :: nbands_rrtm = 6
+  INTEGER, parameter :: nbands_sw_rrtm = 6
+  INTEGER, parameter :: nbands_lw_rrtm = 16
 
 END MODULE aero_mod