Changeset 2530 for LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

Timestamp:

May 31, 2016, 1:34:05 PM (8 years ago)

Author:

oboucher

Message:

Changing flag_aerosol_strat from logical (y/n) to
an integer (0/1/2) for CMIP6 needs

File:

• LMDZ5/trunk/libf/phylmd/conf_phys_m.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

@@ -76 +76 @@
     LOGICAL              :: ok_ade, ok_aie, ok_cdnc, aerosol_couple
     INTEGER              :: flag_aerosol
-    LOGICAL              :: flag_aerosol_strat
+    INTEGER              :: flag_aerosol_strat
     LOGICAL              :: new_aod
     REAL                 :: bl95_b0, bl95_b1
@@ -94 +94 @@
     LOGICAL,SAVE        :: ok_ade_omp, ok_aie_omp, ok_cdnc_omp, aerosol_couple_omp
     INTEGER, SAVE       :: flag_aerosol_omp
-    LOGICAL, SAVE       :: flag_aerosol_strat_omp
+    INTEGER, SAVE       :: flag_aerosol_strat_omp
     LOGICAL, SAVE       :: new_aod_omp
     REAL,SAVE           :: bl95_b0_omp, bl95_b1_omp
@@ -386 +386 @@
     !
     !Config Key  = flag_aerosol_strat
-    !Config Desc = use stratospheric aerosols T/F
-    !Config Def  = false
+    !Config Desc = use stratospheric aerosols 0, 1, 2
+    ! - 0 = no stratospheric aerosols 
+    ! - 1 = stratospheric aerosols scaled from 550 nm AOD 
+    ! - 2 = stratospheric aerosol properties from CMIP6
+    !Config Def  = 0
     !Config Help = Used in physiq.F
     !
     !
-    flag_aerosol_strat_omp = .false.
+    flag_aerosol_strat_omp = 0
     CALL getin('flag_aerosol_strat',flag_aerosol_strat_omp)