Changeset 4727 for LMDZ6/branches/LMDZ_ECRad/libf/phylmd/clesphys.h

Timestamp:

Oct 19, 2023, 4:02:57 PM (8 months ago)

Author:

idelkadi

Message:

Merged trunk changes -r4488:4726 LMDZ_ECRad branch

Location:

LMDZ6/branches/LMDZ_ECRad

Files:

• . (modified) (1 prop)
• libf/phylmd/clesphys.h (modified) (6 diffs)

LMDZ6/branches/LMDZ_ECRad/libf/phylmd/clesphys.h

@@ -18 +18 @@
        REAL co2_ppm, co2_ppm0, solaire
        INTEGER iflag_thermals,nsplit_thermals
+       INTEGER iflag_physiq
        REAL tau_thermals
 
@@ -42 +43 @@
 !IM seuils cdrm, cdrh
        REAL cdmmax, cdhmax
+!IM pour les params différentes Olivier Torres
+       INTEGER choix_bulk, nit_bulk, kz0
 !IM param. stabilite s/ terres et en dehors
        REAL ksta, ksta_ter, f_ri_cd_min
@@ -100 +103 @@
        LOGICAL :: ok_daily_climoz
        LOGICAL :: ok_new_lscp
+       LOGICAL :: ok_bs, ok_rad_bs
 ! flag to bypass or not the phytrac module
        INTEGER :: iflag_phytrac
 
-!AI flags pour ECRAD
+!AI flags pour ECRAD       
        LOGICAL :: ok_3Deffect
        CHARACTER(len=512) :: namelist_ecrad_file
@@ -109 +113 @@
        COMMON/clesphys/                                                 &
 ! REAL FIRST
+! rajout choix_bulk et nit_bulk kz0 par Olivier Torres
      &       co2_ppm, solaire                                           &
      &     , RCO2, RCH4, RN2O, RCFC11, RCFC12                           &
@@ -136 +141 @@
      &     , ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad                &
      &     , iflag_con, nbapp_cv, nbapp_wk                              &
+     &     , choix_bulk, nit_bulk, kz0                                  &
      &     , iflag_ener_conserv                                         &
      &     , ok_suntime_rrtm                                            & 
@@ -154 +160 @@
      &     , ok_chlorophyll,ok_conserv_q, adjust_tropopause             &
      &     , ok_daily_climoz, ok_all_xml, ok_lwoff                      &
-     &     , iflag_phytrac, ok_new_lscp                                 &
-     &     , iflag_thermals,nsplit_thermals, tau_thermals               &
-     &     , ok_3Deffect, namelist_ecrad_file    
+     &     , iflag_phytrac, ok_new_lscp, ok_bs, ok_rad_bs               &
+     &     ,  iflag_thermals,nsplit_thermals, tau_thermals              &
+     &     , iflag_physiq, ok_3Deffect, namelist_ecrad_file
        save /clesphys/
 !$OMP THREADPRIVATE(/clesphys/)