Ignore:
Timestamp:
Jun 29, 2018, 12:31:11 PM (6 years ago)
Author:
Laurent Fairhead
Message:

First attempt at merging with trunk

Location:
LMDZ6/branches/DYNAMICO-conv
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/DYNAMICO-conv

  • LMDZ6/branches/DYNAMICO-conv/DefLists/file_def_histins_lmdz.xml

    r2995 r3356  
    1818                <field field_ref="flat" level="10" />
    1919                <field field_ref="slp" level="1" />
     20                <field field_ref="sza" level="1" />
    2021                <field field_ref="ptstar" level="1" />
    2122                <field field_ref="pt0" level="1" />
     
    5859                <field field_ref="ndayrain" level="10" operation="instant"  />
    5960                <field field_ref="precip" level="1" />
     61                <field field_ref="rain_fall" level="1" />
     62                <field field_ref="rain_con" level="1" />
    6063                <field field_ref="plul" level="1" />
    6164                <field field_ref="plun" level="1" />
     
    9396                <field field_ref="SWupSFC" level="10" />
    9497                <field field_ref="SWupSFCclr" level="10" />
    95                 <field field_ref="SWdnSFC" level="10" />
     98                <field field_ref="SWdnSFC" level="2" />
    9699                <field field_ref="SWdnSFCclr" level="10" />
    97100                <field field_ref="LWupSFC" level="10" />
     
    123126                <field field_ref="fqcalving" level="10" />
    124127                <field field_ref="fqfonte" level="10" />
     128                <field field_ref="mrroli" level="10" />
    125129                <field field_ref="runofflic" level="10" />
    126130                <field field_ref="taux" level="10" />
     
    227231                <field field_ref="proba_notrig" level="1" />
    228232                <field field_ref="random_notrig" level="1" />
     233                <field field_ref="cv_gen" level="1" />
    229234                <field field_ref="ale_bl_stat" level="1" />
    230235                <field field_ref="ale_bl_trig" level="1" />
     
    315320                <field field_ref="l_mixmin_sic" level="10" />
    316321                <field field_ref="SWnetOR" level="2" />
    317                 <field field_ref="SWdownOR" level="2" />
    318322                <field field_ref="LWdownOR" level="2" />
    319323                <field field_ref="snowl" level="10" />
     
    411415                <field field_ref="ftime_con" level="10" operation="instant" />
    412416                <field field_ref="wake_h" level="10" />
     417                <field field_ref="wake_dens" level="10" />
    413418                <field field_ref="wake_s" level="10" />
    414419                <field field_ref="epmax" level="10" />
     
    417422                <field field_ref="lmaxth" level="10" />
    418423                <field field_ref="ftime_th" level="10" />
     424                <field field_ref="ftime_deepcv" level="10" />
    419425                <field field_ref="f0_th" level="10" />
    420426                <field field_ref="zmax_th" level="4" />
     
    463469                <field field_ref="ocond" level="4" />
    464470                <field field_ref="geop" level="10" />
     471                <field field_ref="geoph" level="10" />
    465472                <field field_ref="vitu" level="4" />
    466473                <field field_ref="vitv" level="4" />
     
    496503                <field field_ref="lcc3dcon" level="10" />
    497504                <field field_ref="lcc3dstra" level="10" />
     505                <field field_ref="cldwatmxrat" level="10" />
     506                <field field_ref="icc3dcon" level="10" />
     507                <field field_ref="icc3dstra" level="10" />
     508                <field field_ref="cldicemxrat" level="10" />
    498509                <field field_ref="clwcon" level="10" />
    499510                <field field_ref="Ma" level="10" />
Note: See TracChangeset for help on using the changeset viewer.