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

Timestamp:

Jun 14, 2015, 9:13:32 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2237:2291 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -44 +44 @@
 ! Frottement au sol (Cdrag)
        Real f_cdrag_ter,f_cdrag_oce
+       REAL min_wind_speed,f_gust_wk,f_gust_bl,f_qsat_oce,f_z0qh_oce
+       REAL z0m_seaice,z0h_seaice
+       INTEGER iflag_gusts,iflag_z0_oce
+
 ! Rugoro
-       Real f_rugoro
+       Real f_rugoro,z0min
 
 !IM lev_histhf  : niveau sorties 6h
@@ -91 +95 @@
      &     , cdmmax, cdhmax, ksta, ksta_ter, f_ri_cd_min                &
      &     , fmagic, pmagic                                             &
-     &     , f_cdrag_ter,f_cdrag_oce,f_rugoro                           &
+     &     , f_cdrag_ter,f_cdrag_oce,f_rugoro,z0min                     &
+     &     , min_wind_speed,f_gust_wk,f_gust_bl,f_qsat_oce,f_z0qh_oce   &
+     &     , z0m_seaice,z0h_seaice                                      &
      &     , pasphys            , freq_outNMC, freq_calNMC              &
      &     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &
@@ -115 +121 @@
      &     , ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP                     &
      &     , ip_ebil_phy                                                &
+     &     , iflag_gusts ,iflag_z0_oce                                  &
      &     , ok_lic_melt,           aer_type                            &
      &     , iflag_rrtm, ok_strato,ok_hines, ok_qch4                    &