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

Timestamp:

Apr 13, 2015, 10:21:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes 2216:2237 into testing branch

Location:

LMDZ5/branches/testing

Files:

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

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

@@ -74 +74 @@
        REAL freq_COSP
        LOGICAL :: ok_cosp,ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP
-       INTEGER :: ip_ebil_phy, iflag_rrtm, iflag_ice_thermo,NSW
+       INTEGER :: ip_ebil_phy, iflag_rrtm, iflag_ice_thermo, NSW, iflag_albedo
+       LOGICAL :: ok_chlorophyll
        LOGICAL :: ok_strato
        LOGICAL :: ok_hines, ok_gwd_rando
@@ -116 +117 @@
      &     , ok_lic_melt,           aer_type                            &
      &     , iflag_rrtm, ok_strato,ok_hines, ok_qch4                    &
-     &     , iflag_ice_thermo, ok_gwd_rando, NSW                        &
-     &     , ok_conserv_q, ok_all_xml
+     &     , iflag_ice_thermo, ok_gwd_rando, NSW, iflag_albedo          &
+     &     , ok_chlorophyll,ok_conserv_q, ok_all_xml
      
        save /clesphys/