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_histins_lmdz.xml

    r3356 r3411  
    1818                <field field_ref="flat" level="10" />
    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" />
    … …  
    5958                <field field_ref="ndayrain" level="10" operation="instant"  />
    6059                <field field_ref="precip" level="1" />
    61                 <field field_ref="rain_fall" level="1" />
    62                 <field field_ref="rain_con" level="1" />
    6360                <field field_ref="plul" level="1" />
    6461                <field field_ref="plun" level="1" />
    … …  
    9693                <field field_ref="SWupSFC" level="10" />
    9794                <field field_ref="SWupSFCclr" level="10" />
    98                 <field field_ref="SWdnSFC" level="2" />
     95                <field field_ref="SWdnSFC" level="10" />
    9996                <field field_ref="SWdnSFCclr" level="10" />
    10097                <field field_ref="LWupSFC" level="10" />
    … …  
    126123                <field field_ref="fqcalving" level="10" />
    127124                <field field_ref="fqfonte" level="10" />
    128                 <field field_ref="mrroli" level="10" />
    129125                <field field_ref="runofflic" level="10" />
    130126                <field field_ref="taux" level="10" />
    … …  
    231227                <field field_ref="proba_notrig" level="1" />
    232228                <field field_ref="random_notrig" level="1" />
    233                 <field field_ref="cv_gen" level="1" />
    234229                <field field_ref="ale_bl_stat" level="1" />
    235230                <field field_ref="ale_bl_trig" level="1" />
    … …  
    320315                <field field_ref="l_mixmin_sic" level="10" />
    321316                <field field_ref="SWnetOR" level="2" />
     317                <field field_ref="SWdownOR" level="2" />
    322318                <field field_ref="LWdownOR" level="2" />
    323319                <field field_ref="snowl" level="10" />
    … …  
    415411                <field field_ref="ftime_con" level="10" operation="instant" />
    416412                <field field_ref="wake_h" level="10" />
    417                 <field field_ref="wake_dens" level="10" />
    418413                <field field_ref="wake_s" level="10" />
    419414                <field field_ref="epmax" level="10" />
    … …  
    422417                <field field_ref="lmaxth" level="10" />
    423418                <field field_ref="ftime_th" level="10" />
    424                 <field field_ref="ftime_deepcv" level="10" />
    425419                <field field_ref="f0_th" level="10" />
    426420                <field field_ref="zmax_th" level="4" />
    … …  
    469463                <field field_ref="ocond" level="4" />
    470464                <field field_ref="geop" level="10" />
    471                 <field field_ref="geoph" level="10" />
    472465                <field field_ref="vitu" level="4" />
    473466                <field field_ref="vitv" level="4" />
    … …  
    503496                <field field_ref="lcc3dcon" level="10" />
    504497                <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" />
    509498                <field field_ref="clwcon" level="10" />
    510499                <field field_ref="Ma" level="10" />
Note: See TracChangeset for help on using the changeset viewer.