Changeset 2594 for LMDZ5/branches/testing/libf/phylmd/clesphys.h

Timestamp:

Jul 18, 2016, 9:41:10 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2545:2589 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/libf/phylmd/clesphys.h

@@ -40 +40 @@
 !IM, MAFo fmagic, pmagic : parametres - additionnel et multiplicatif - 
 !                          pour regler l albedo sur ocean
+       REAL pbl_lmixmin_alpha
        REAL fmagic, pmagic
 ! Hauteur (imposee) du contenu en eau du sol
@@ -77 +78 @@
        REAL ecrit_LES
        REAL freq_ISCCP, ecrit_ISCCP
-       REAL freq_COSP
+       REAL freq_COSP, freq_AIRS
        LOGICAL :: ok_cosp,ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP
+       LOGICAL :: ok_airs
        INTEGER :: ip_ebil_phy, iflag_rrtm, iflag_ice_thermo, NSW, iflag_albedo
        LOGICAL :: ok_chlorophyll
@@ -94 +96 @@
      &     , CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt                     &
      &     , CH4_ppb_per, N2O_ppb_per, CFC11_ppt_per, CFC12_ppt_per     &
-     &     , cdmmax, cdhmax, ksta, ksta_ter, f_ri_cd_min                &
+     &     , cdmmax,cdhmax,ksta,ksta_ter,f_ri_cd_min,pbl_lmixmin_alpha  &
      &     , fmagic, pmagic                                             &
      &     , f_cdrag_ter,f_cdrag_oce,f_rugoro,z0min                     &
@@ -101 +103 @@
      &     , pasphys            , freq_outNMC, freq_calNMC              &
      &     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &
-     &     , freq_ISCCP, ecrit_ISCCP, freq_COSP                         &
+     &     , freq_ISCCP, ecrit_ISCCP, freq_COSP, freq_AIRS              &
      &     , cvl_corr                                                   &
      &     , qsol0,albsno0,evap0                                        &
@@ -120 +122 @@
      &     , lev_histins, lev_histLES, lev_histdayNMC, levout_histNMC   &
      &     , ok_histNMC                                                 &
-     &     , type_run, ok_regdyn, ok_cosp                               &
+     &     , type_run, ok_regdyn, ok_cosp, ok_airs                      &
      &     , ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP                     &
      &     , ip_ebil_phy                                                &