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

Timestamp:

Sep 11, 2013, 11:45:01 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

---

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -61 +61 @@
        REAL pasphys
        LOGICAL ok_histNMC(3)
+       INTEGER levout_histNMC(3)
        REAL freq_outNMC(3) , freq_calNMC(3)
        CHARACTER(len=4) type_run
@@ -73 +74 @@
        REAL freq_COSP
        LOGICAL :: ok_cosp,ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP
-       INTEGER :: ip_ebil_phy, iflag_rrtm
+       INTEGER :: ip_ebil_phy, iflag_rrtm, iflag_ice_thermo
        LOGICAL :: ok_strato
        LOGICAL :: ok_hines
@@ -91 +92 @@
      &     , f_cdrag_ter,f_cdrag_oce,f_rugoro                           &
      &     , lev_histhf, lev_histday, lev_histmth                       &
-     &     , lev_histins, lev_histLES, lev_histdayNMC                   &
+     &     , lev_histins, lev_histLES, lev_histdayNMC, levout_histNMC   &
      &     , pasphys, ok_histNMC, freq_outNMC, freq_calNMC              &
      &     , type_run, ok_isccp, ok_regdyn, ok_cosp                     &
@@ -101 +102 @@
      &     , ok_lic_melt, cvl_corr, aer_type                            &
      &     , qsol0, iflag_rrtm, ok_strato,ok_hines,ecrit_LES            &
-     &     , co2_ppm0
+     &     , co2_ppm0, iflag_ice_thermo
      
        save /clesphys/