Ignore:
Timestamp:
Jan 30, 2017, 5:54:45 PM (8 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2727:2785 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

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

    r2720 r2787  
    1313       LOGICAL ok_limitvrai
    1414       LOGICAL ok_all_xml
    15        INTEGER nbapp_rad, iflag_con, nbapp_cv, iflag_ener_conserv
     15       INTEGER nbapp_rad, iflag_con, nbapp_cv, nbapp_wk, iflag_ener_conserv
    1616       REAL co2_ppm, co2_ppm0, solaire
    1717       LOGICAL ok_suntime_rrtm
     
    114114     &     , cycle_diurne, soil_model, new_oliq                         &
    115115     &     , ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad                &
    116      &     , iflag_con, nbapp_cv                                        &
     116     &     , iflag_con, nbapp_cv, nbapp_wk                              &
    117117     &     , iflag_ener_conserv                                         &
    118118     &     , ok_4xCO2atm                                                &
Note: See TracChangeset for help on using the changeset viewer.