Ignore:
Timestamp:
Mar 20, 2014, 10:57:19 AM (10 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r1920:1997 into testing branch

Location:
LMDZ5/branches/testing
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/DefLists/iodef_fields.xml

    r1910 r1999  
    324324        <field id="lcc"    long_name="Cloud liquid fraction at top of cloud"    unit="1" />
    325325        <field id="wvapp"    long_name="-"    unit="-" />
    326         <field id="ozone_daylight"    long_name="Daylight ozone mole fraction"    unit="-" />
    327326        <field id="albe_ter"    long_name="Albedo VIS surf. ter"    unit="-" />
    328327        <field id="albe_lic"    long_name="Albedo VIS surf. lic"    unit="-" />
    … …  
    387386        <field id="rhum"    long_name="Relative humidity"    unit="-" />
    388387        <field id="ozone"    long_name="Ozone mole fraction"    unit="-" />
     388        <field id="ozone_daylight"    long_name="Daylight ozone mole fraction"    unit="-" />
    389389        <field id="upwd"    long_name="saturated updraft"    unit="kg/m2/s" />
    390390        <field id="dtphy"    long_name="Physics dT"    unit="K/s" />

  • LMDZ5/branches/testing/DefLists/iodef_file_histLES.xml

    r1910 r1999  
    331331                <field field_ref="lcc" level="10" />
    332332                <field field_ref="wvapp" level="10" />
    333                 <field field_ref="ozone_daylight" level="10" />
    334333                <field field_ref="albe_ter" level="10" />
    335334                <field field_ref="albe_lic" level="10" />
    … …  
    395394                <field field_ref="rhum" level="10" />
    396395                <field field_ref="ozone" level="10" />
     396                <field field_ref="ozone_daylight" level="10" />
    397397                <field field_ref="upwd" level="10" />
    398398                <field field_ref="dtphy" level="10" />

  • LMDZ5/branches/testing/DefLists/iodef_file_histday.xml

    r1910 r1999  
    331331                <field field_ref="lcc" level="6" />
    332332                <field field_ref="wvapp" level="10" />
    333                 <field field_ref="ozone_daylight" level="10" />
    334333                <field field_ref="albe_ter" level="7" />
    335334                <field field_ref="albe_lic" level="7" />
    … …  
    395394                <field field_ref="rhum" level="5" />
    396395                <field field_ref="ozone" level="10" />
     396                <field field_ref="ozone_daylight" level="10" />
    397397                <field field_ref="upwd" level="10" />
    398398                <field field_ref="dtphy" level="10" />

  • LMDZ5/branches/testing/DefLists/iodef_file_histhf.xml

    r1910 r1999  
    331331                <field field_ref="lcc" level="10" />
    332332                <field field_ref="wvapp" level="10" />
    333                 <field field_ref="ozone_daylight" level="10" />
    334333                <field field_ref="albe_ter" level="7" />
    335334                <field field_ref="albe_lic" level="7" />
    … …  
    395394                <field field_ref="rhum" level="10" />
    396395                <field field_ref="ozone" level="10" />
     396                <field field_ref="ozone_daylight" level="10" />
    397397                <field field_ref="upwd" level="10" />
    398398                <field field_ref="dtphy" level="10" />

  • LMDZ5/branches/testing/DefLists/iodef_file_histins.xml

    r1910 r1999  
    331331                <field field_ref="lcc" level="10" />
    332332                <field field_ref="wvapp" level="10" />
    333                 <field field_ref="ozone_daylight" level="10" />
    334333                <field field_ref="albe_ter" level="10" />
    335334                <field field_ref="albe_lic" level="10" />
    … …  
    395394                <field field_ref="rhum" level="10" />
    396395                <field field_ref="ozone" level="10" />
     396                <field field_ref="ozone_daylight" level="10" />
    397397                <field field_ref="upwd" level="10" />
    398398                <field field_ref="dtphy" level="10" />

  • LMDZ5/branches/testing/DefLists/iodef_file_histmth.xml

    r1910 r1999  
    333333                <field field_ref="lcc" level="2" />
    334334                <field field_ref="wvapp" level="2" />
    335                 <field field_ref="ozone_daylight" level="2" />
    336335                <field field_ref="albe_ter" level="3" />
    337336                <field field_ref="albe_lic" level="3" />
    … …  
    397396                <field field_ref="rhum" level="2" />
    398397                <field field_ref="ozone" level="2" />
     398                <field field_ref="ozone_daylight" level="2" />
    399399                <field field_ref="upwd" level="2" />
    400400                <field field_ref="dtphy" level="2" />

  • LMDZ5/branches/testing/DefLists/iodef_file_histstn.xml

    r1910 r1999  
    331331                <field field_ref="lcc" level="10" />
    332332                <field field_ref="wvapp" level="10" />
    333                 <field field_ref="ozone_daylight" level="10" />
    334333                <field field_ref="albe_ter" level="10" />
    335334                <field field_ref="albe_lic" level="10" />
    … …  
    395394                <field field_ref="rhum" level="10" />
    396395                <field field_ref="ozone" level="10" />
     396                <field field_ref="ozone_daylight" level="10" />
    397397                <field field_ref="upwd" level="10" />
    398398                <field field_ref="dtphy" level="10" />
Note: See TracChangeset for help on using the changeset viewer.