Changeset 2785 for LMDZ5/trunk

Timestamp:

Jan 30, 2017, 10:58:17 AM (8 years ago)

Author:

Laurent Fairhead

Message:

Modifications to ensure that config.def file remains compatible with old physics in modispl configurations
LF

File:

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

LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

@@ -398 +398 @@
     flag_aerosol_omp = 0
     CALL getin('flag_aerosol',flag_aerosol_omp)
-    !
-    !Config Key  = flag_aerosol_strat
-    !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 = 0
-    CALL getin('flag_aerosol_strat',flag_aerosol_strat_omp)
 
     !
@@ -556 +544 @@
     solaire_omp = 1365.
     CALL getin('solaire', solaire_omp)
-    !
-    !Config Key  = ok_sun_time
-    !Config Desc = oui ou non variabilite solaire
-    !Config Def  = .FALSE.
-    !Config Help =
-    !
-    !
-    !valeur AMIP II
-    ok_suntime_rrtm_omp = .FALSE.
-    CALL getin('ok_suntime_rrtm',ok_suntime_rrtm_omp)
     !
     !Config Key  = co2_ppm
@@ -1006 +984 @@
     CALL getin('ok_chlorophyll',ok_chlorophyll_omp)
     !albedo SB <<<
+    !
+    !Config Key  = ok_sun_time
+    !Config Desc = oui ou non variabilite solaire
+    !Config Def  = .FALSE.
+    !Config Help =
+    !
+    !
+    !valeur AMIP II
+    ok_suntime_rrtm_omp = .FALSE.
+    IF (iflag_rrtm_omp==1) THEN
+      CALL getin('ok_suntime_rrtm',ok_suntime_rrtm_omp)
+    ENDIF
+    !
+    !Config Key  = flag_aerosol_strat
+    !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 = 0
+    IF (iflag_rrtm_omp==1) THEN
+      CALL getin('flag_aerosol_strat',flag_aerosol_strat_omp)
+    ENDIF
 
     !