Ignore:
Timestamp:
Nov 5, 2018, 3:24:59 PM (6 years ago)
Author:
Laurent Fairhead
Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

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

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/DYNAMICO-conv

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

    r3356 r3411  
    1818                <field field_ref="flat" level="1" />
    1919                <field field_ref="slp" level="1" />
    20                 <field field_ref="sza" level="1" />
    2120                <field field_ref="ptstar" level="1" />
    2221                <field field_ref="pt0" level="1" />
    … …  
    6362                <field field_ref="ndayrain" level="10" operation="instant" />
    6463                <field field_ref="precip" level="1" />
    65                 <field field_ref="rain_fall" level="1" />
    66                 <field field_ref="rain_con" level="1" />
    6764                <field field_ref="plul" level="1" />
    6865                <field field_ref="plun" level="1" />
    … …  
    130127                <field field_ref="fqcalving" level="10" />
    131128                <field field_ref="fqfonte" level="10" />
    132                 <field field_ref="mrroli" level="10" />
    133129                <field field_ref="runofflic" level="10" />
    134130                <field field_ref="taux" level="10" />
    … …  
    235231                <field field_ref="proba_notrig" level="1" />
    236232                <field field_ref="random_notrig" level="1" />
    237                 <field field_ref="cv_gen" level="1" />
    238233                <field field_ref="ale_bl_stat" level="1" />
    239234                <field field_ref="ale_bl_trig" level="1" />
    … …  
    326321                <field field_ref="l_mixmin_sic" level="10" />
    327322                <field field_ref="SWnetOR" level="10" />
     323                <field field_ref="SWdownOR" level="10" />
    328324                <field field_ref="LWdownOR" level="10" />
    329325                <field field_ref="snowl" level="1" />
    … …  
    428424                <field field_ref="ftime_con" level="10" operation="instant" />
    429425                <field field_ref="wake_h" level="5" />
    430                 <field field_ref="wake_dens" level="5" />
    431426                <field field_ref="wake_s" level="5" />
    432427                <field field_ref="epmax" level="10" />
    … …  
    435430                <field field_ref="lmaxth" level="10" />
    436431                <field field_ref="ftime_th" level="10" />
    437                 <field field_ref="ftime_deepcv" level="10" />
    438432                <field field_ref="f0_th" level="10" />
    439433                <field field_ref="zmax_th" level="4" />
    … …  
    482476                <field field_ref="ocond" level="3" />
    483477                <field field_ref="geop" level="3" />
    484                 <field field_ref="geoph" level="3" />
    485478                <field field_ref="vitu" level="3" />
    486479                <field field_ref="vitv" level="3" />
    … …  
    516509                <field field_ref="lcc3dcon" level="6" />
    517510                <field field_ref="lcc3dstra" level="6" />
    518                 <field field_ref="cldwatmxrat" level="6" />
    519                 <field field_ref="icc3dcon" level="6" />
    520                 <field field_ref="icc3dstra" level="6" />
    521                 <field field_ref="cldicemxrat" level="6" />
    522511                <field field_ref="clwcon" level="10" />
    523512                <field field_ref="Ma" level="10" />
Note: See TracChangeset for help on using the changeset viewer.