Changeset 1795 for LMDZ5/branches/testing/libf/phylmd/conf_phys_m.F90

Timestamp:

Jul 18, 2013, 10:20:28 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Version testing basee sur la r1794

---

Testing release based on r1794

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/conf_phys_m.F90 (modified) (11 diffs)

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

@@ -18 +18 @@
                        iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
                        ok_ade, ok_aie, ok_cdnc, aerosol_couple, &
-                       flag_aerosol, new_aod, &
+                       flag_aerosol, flag_aerosol_strat, new_aod, &
                        bl95_b0, bl95_b1,&
                        read_climoz, &
@@ -60 +60 @@
 ! ok_ade, ok_aie: apply or not aerosol direct and indirect effects
 ! ok_cdnc, ok cloud droplet number concentration
+! flag_aerosol_strat : flag pour les aerosols stratos
 ! bl95_b*: parameters in the formula to link CDNC to aerosol mass conc 
 !
@@ -72 +73 @@
   LOGICAL              :: ok_ade, ok_aie, ok_cdnc, aerosol_couple
   INTEGER              :: flag_aerosol
+  LOGICAL              :: flag_aerosol_strat
   LOGICAL              :: new_aod
   REAL                 :: bl95_b0, bl95_b1
@@ -87 +89 @@
   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
   LOGICAL, SAVE       :: new_aod_omp
   REAL,SAVE           :: bl95_b0_omp, bl95_b1_omp
@@ -169 +172 @@
   LOGICAL,SAVE :: ok_orodr_omp, ok_orolf_omp, ok_limitvrai_omp
   INTEGER, SAVE :: nbapp_rad_omp, iflag_con_omp
+  INTEGER, SAVE :: iflag_ener_conserv_omp
   LOGICAL,SAVE :: ok_strato_omp
   LOGICAL,SAVE :: ok_hines_omp
@@ -306 +310 @@
   flag_aerosol_omp = 0
   CALL getin('flag_aerosol',flag_aerosol_omp)
+!
+!Config Key  = flag_aerosol_strat
+!Config Desc = use stratospheric aerosols T/F
+!Config Def  = false
+!Config Help = Used in physiq.F
+!
+!
+  flag_aerosol_strat_omp = .false.
+  CALL getin('flag_aerosol_strat',flag_aerosol_strat_omp)
 
 ! Temporary variable for testing purpose!!
@@ -653 +666 @@
        CALL getin('iflag_con',iflag_con_omp)
 
+!Config  Key  = iflag_ener_conserv
+!Config  Desc = Flag de convection
+!Config  Def  = 1
+!Config  Help = Flag  pour la convection les options suivantes existent :
+!Config         -1 pour Kinetic energy correction
+!Config         1  conservation kinetic and enthalpy
+       iflag_ener_conserv_omp = -1
+       CALL getin('iflag_ener_conserv',iflag_ener_conserv_omp)
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!
@@ -1637 +1660 @@
     nbapp_rad = nbapp_rad_omp
     iflag_con = iflag_con_omp
+    iflag_ener_conserv = iflag_ener_conserv_omp
 
     epmax = epmax_omp
@@ -1705 +1729 @@
     aerosol_couple = aerosol_couple_omp
     flag_aerosol=flag_aerosol_omp
+    flag_aerosol_strat=flag_aerosol_strat_omp
     new_aod=new_aod_omp
     aer_type = aer_type_omp
@@ -1845 +1870 @@
   write(lunout,*)'nbapp_rad=',nbapp_rad
   write(lunout,*)'iflag_con=',iflag_con
+  write(lunout,*)'iflag_ener_conserv=',iflag_ener_conserv
   write(lunout,*)' epmax = ', epmax
   write(lunout,*)' ok_adj_ema = ', ok_adj_ema
@@ -1888 +1914 @@
   write(lunout,*)' aerosol_couple = ', aerosol_couple
   write(lunout,*)' flag_aerosol = ', flag_aerosol
+  write(lunout,*)' flag_aerosol_strat = ', flag_aerosol_strat
   write(lunout,*)' new_aod = ', new_aod
   write(lunout,*)' aer_type = ',aer_type