Ignore:
Timestamp:
Jun 14, 2015, 9:13:32 PM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes -r2237:2291 into testing branch

Location:
LMDZ5/branches/testing
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

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

    r2258 r2298  
    1 <field_definition level="1" prec="4" operation="average" freq_op="1ts" enabled=".true.">
     1<field_definition level="1" prec="4" operation="average" freq_op="1ts" enabled=".true." default_value="9.96921e+36">
    22   
    33<!--    <field_group id="fields_1D" grid_ref="vertical">  -->
     
    212212        <field id="alp_bl_conv"    long_name="ALP_BL_CONV"    unit="W/m2" />
    213213        <field id="alp_bl_stat"    long_name="ALP_BL_STAT"    unit="W/m2" />
    214         <field id="u850"    long_name="Zonal wind 1hPa"    unit="m/s" />
    215         <field id="u700"    long_name="Zonal wind 2hPa"    unit="m/s" />
    216         <field id="u500"    long_name="Zonal wind 3hPa"    unit="m/s" />
    217         <field id="u200"    long_name="Zonal wind 4hPa"    unit="m/s" />
    218         <field id="u100"    long_name="Zonal wind 5hPa"    unit="m/s" />
    219         <field id="u50"     long_name="Zonal wind 6hPa"    unit="m/s" />
    220         <field id="u10"     long_name="Zonal wind 7hPa"    unit="m/s" />
    221         <field id="v850"    long_name="Meridional wind 1hPa"    unit="m/s" />
    222         <field id="v700"    long_name="Meridional wind 2hPa"    unit="m/s" />
    223         <field id="v500"    long_name="Meridional wind 3hPa"    unit="m/s" />
    224         <field id="v200"    long_name="Meridional wind 4hPa"    unit="m/s" />
    225         <field id="v100"    long_name="Meridional wind 5hPa"    unit="m/s" />
    226         <field id="v50"     long_name="Meridional wind 6hPa"    unit="m/s" />
    227         <field id="v10"    long_name="Meridional wind 7hPa"    unit="m/s" />
    228         <field id="w850"    long_name="Vertical wind 1hPa"    unit="Pa/s" />
    229         <field id="w700"    long_name="Vertical wind 2hPa"    unit="Pa/s" />
    230         <field id="w500"    long_name="Vertical wind 3hPa"    unit="Pa/s" />
    231         <field id="w200"    long_name="Vertical wind 4hPa"    unit="Pa/s" />
    232         <field id="w100"    long_name="Vertical wind 5hPa"    unit="Pa/s" />
    233         <field id="w50"    long_name="Vertical wind 6hPa"    unit="Pa/s" />
    234         <field id="w10"    long_name="Vertical wind 7hPa"    unit="Pa/s" />
    235         <field id="t850"    long_name="Temperature 1hPa"    unit="K" />
    236         <field id="t700"    long_name="Temperature 2hPa"    unit="K" />
    237         <field id="t500"    long_name="Temperature 3hPa"    unit="K" />
    238         <field id="t200"    long_name="Temperature 4hPa"    unit="K" />
    239         <field id="t100"    long_name="Temperature 5hPa"    unit="K" />
    240         <field id="t50"    long_name="Temperature 6hPa"    unit="K" />
    241         <field id="t10"    long_name="Temperature 7hPa"    unit="K" />
    242         <field id="q850"    long_name="Specific humidity 1hPa"    unit="kg/kg" />
    243         <field id="q700"    long_name="Specific humidity 2hPa"    unit="kg/kg" />
    244         <field id="q500"    long_name="Specific humidity 3hPa"    unit="kg/kg" />
    245         <field id="q200"    long_name="Specific humidity 4hPa"    unit="kg/kg" />
    246         <field id="q100"    long_name="Specific humidity 5hPa"    unit="kg/kg" />
    247         <field id="q50"    long_name="Specific humidity 6hPa"    unit="kg/kg" />
    248         <field id="q10"    long_name="Specific humidity 7hPa"    unit="kg/kg" />
    249         <field id="z850"    long_name="Geopotential height 1hPa"    unit="m" />
    250         <field id="z700"    long_name="Geopotential height 2hPa"    unit="m" />
    251         <field id="z500"    long_name="Geopotential height 3hPa"    unit="m" />
    252         <field id="z200"    long_name="Geopotential height 4hPa"    unit="m" />
    253         <field id="z100"    long_name="Geopotential height 5hPa"    unit="m" />
    254         <field id="z50"    long_name="Geopotential height 6hPa"    unit="m" />
    255         <field id="z10"    long_name="Geopotential height 7hPa"    unit="m" />
     214        <field id="u850"    long_name="Zonal wind 850hPa"    unit="m/s" />
     215        <field id="u700"    long_name="Zonal wind 700hPa"    unit="m/s" />
     216        <field id="u500"    long_name="Zonal wind 500hPa"    unit="m/s" />
     217        <field id="u200"    long_name="Zonal wind 200hPa"    unit="m/s" />
     218        <field id="u100"    long_name="Zonal wind 100hPa"    unit="m/s" />
     219        <field id="u50"     long_name="Zonal wind 50hPa"    unit="m/s" />
     220        <field id="u10"     long_name="Zonal wind 10hPa"    unit="m/s" />
     221        <field id="v850"    long_name="Meridional wind 850hPa"    unit="m/s" />
     222        <field id="v700"    long_name="Meridional wind 700hPa"    unit="m/s" />
     223        <field id="v500"    long_name="Meridional wind 500hPa"    unit="m/s" />
     224        <field id="v200"    long_name="Meridional wind 200hPa"    unit="m/s" />
     225        <field id="v100"    long_name="Meridional wind 100hPa"    unit="m/s" />
     226        <field id="v50"     long_name="Meridional wind 50hPa"    unit="m/s" />
     227        <field id="v10"    long_name="Meridional wind 10hPa"    unit="m/s" />
     228        <field id="w850"    long_name="Vertical wind 850hPa"    unit="Pa/s" />
     229        <field id="w700"    long_name="Vertical wind 700hPa"    unit="Pa/s" />
     230        <field id="w500"    long_name="Vertical wind 500hPa"    unit="Pa/s" />
     231        <field id="w200"    long_name="Vertical wind 200hPa"    unit="Pa/s" />
     232        <field id="w100"    long_name="Vertical wind 100hPa"    unit="Pa/s" />
     233        <field id="w50"    long_name="Vertical wind 50hPa"    unit="Pa/s" />
     234        <field id="w10"    long_name="Vertical wind 10hPa"    unit="Pa/s" />
     235        <field id="t850"    long_name="Temperature 850hPa"    unit="K" />
     236        <field id="t700"    long_name="Temperature 700hPa"    unit="K" />
     237        <field id="t500"    long_name="Temperature 500hPa"    unit="K" />
     238        <field id="t200"    long_name="Temperature 200hPa"    unit="K" />
     239        <field id="t100"    long_name="Temperature 100hPa"    unit="K" />
     240        <field id="t50"    long_name="Temperature 50hPa"    unit="K" />
     241        <field id="t10"    long_name="Temperature 10hPa"    unit="K" />
     242        <field id="q850"    long_name="Specific humidity 850hPa"    unit="kg/kg" />
     243        <field id="q700"    long_name="Specific humidity 700hPa"    unit="kg/kg" />
     244        <field id="q500"    long_name="Specific humidity 500hPa"    unit="kg/kg" />
     245        <field id="q200"    long_name="Specific humidity 200hPa"    unit="kg/kg" />
     246        <field id="q100"    long_name="Specific humidity 100hPa"    unit="kg/kg" />
     247        <field id="q50"    long_name="Specific humidity 50hPa"    unit="kg/kg" />
     248        <field id="q10"    long_name="Specific humidity 10hPa"    unit="kg/kg" />
     249        <field id="z850"    long_name="Geopotential height 850hPa"    unit="m" />
     250        <field id="z700"    long_name="Geopotential height 700hPa"    unit="m" />
     251        <field id="z500"    long_name="Geopotential height 500hPa"    unit="m" />
     252        <field id="z200"    long_name="Geopotential height 200hPa"    unit="m" />
     253        <field id="z100"    long_name="Geopotential height 100hPa"    unit="m" />
     254        <field id="z50"    long_name="Geopotential height 50hPa"    unit="m" />
     255        <field id="z10"    long_name="Geopotential height 10hPa"    unit="m" />
    256256        <field id="t_oce_sic"    long_name="Temp mixte oce-sic"    unit="K" />
    257257        <field id="weakinv"    long_name="Weak inversion"    unit="-" />
     
    547547   
    548548    <field_group  id="fields_NMC" domain_ref="dom_glo" axis_ref="plev">
    549       <field id="tnondef" long_name="Undefined value of T" unit="K" />
     549<!--  <field id="tnondef" long_name="Undefined value of T" unit="K" /> -->
    550550      <field id="ta" long_name="Air temperature" unit="K" />
    551551      <field id="zg" long_name="Geopotential height" unit="m" />
     
    555555      <field id="va" long_name="Northward wind" unit="m s-1" />
    556556      <field id="wap" long_name="Lagrangian tendency of air pressure" unit="Pa s-1" />
    557       <field id="psbg" long_name="Pressure sfce below ground" unit="%" />
     557<!--  <field id="psbg" long_name="Pressure sfce below ground" unit="%" /> -->
    558558      <field id="tro3" long_name="Ozone mole fraction" unit="1e-9" />
    559559      <field id="tro3_daylight" long_name="Daylight ozone mole fraction" unit="1e-9" />
     
    621621    </field_group>
    622622
    623     <field_group id="fields_COSP_CALIPSO" domain_ref="dom_glo">
     623    <field_group id="fields_COSP_CALIPSO" domain_ref="dom_glo" freq_op="3h">
    624624      <field id="cllcalipso"    long_name="Lidar Low-level Cloud Fraction"   unit="1" />
    625625      <field id="clhcalipso"    long_name="Lidar Hight-level Cloud Fraction"   unit="1" />
     
    629629      <field id="parasol_refl"  long_name="PARASOL-like mono-directional reflectance" unit="1" axis_ref="sza" />
    630630      <field id="parasol_crefl"  long_name="PARASOL-like mono-directional reflectance (integral)" unit="1" axis_ref="sza" />
     631      <field id="Ncrefl"  long_name="Nb for PARASOL-like mono-directional reflectance" unit="1" axis_ref="sza" />
    631632      <field id="c01_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
    632633      <field id="c02_cfad_lidarsr532" long_name="Lidar Scattering Ratio CFAD (532 nm)" unit="1" axis_ref="presnivs" />
     
    672673    </field_group> 
    673674
    674     <field_group id="fields_COSP_ISCCP" domain_ref="dom_glo">
     675    <field_group id="fields_COSP_ISCCP" domain_ref="dom_glo" freq_op="3h">
    675676      <field id="sunlit" long_name="1 for day points, 0 for nightime" unit="1" />
    676677      <field id="c01_clisccp2" long_name="Cloud Fraction as Calculated by the ISCCP Simulator" unit="1" axis_ref="pressure2" />
  • LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml

    r2258 r2298  
    205205                <field field_ref="alp_bl_stat" level="10" />
    206206
    207                 <field_group operation="instant">
     207                <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
    208208                    <field field_ref="u850" level="10" />
    209209                    <field field_ref="u700" level="10" />
  • LMDZ5/branches/testing/DefLists/file_def_histdayCOSP_lmdz.xml

    r2160 r2298  
    44
    55            <!-- VARS 2D -->
    6             <field_group operation="instant" freq_op="1ts">
     6            <field_group operation="average" freq_op="3h">
    77                <field field_ref="cllcalipso"         level="1" />
    88                <field field_ref="clmcalipso"         level="1" />
     
    1212                <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
    1313                <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
     14                <field field_ref="Ncrefl"  level="1" axis_ref="sza" />
    1415                <field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
    1516                <field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
  • LMDZ5/branches/testing/DefLists/file_def_histdayNMC_lmdz.xml

    r2160 r2298  
    44
    55            <!-- VARS 3D -->
    6             <field_group operation="instant" freq_op="1ts" >
    7                 <field field_ref="tnondef" level="5" />
     6            <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
     7<!--            <field field_ref="tnondef" level="5" /> -->
    88                <field field_ref="ta" level="1" />
    99                <field field_ref="zg" level="5" />
     
    1313                <field field_ref="va" level="5" />
    1414                <field field_ref="wap" level="5" />
    15                 <field field_ref="psbg" level="5" />
     15<!--            <field field_ref="psbg" level="5" /> -->
    1616                <field field_ref="tro3" level="5" />
    1717                <field field_ref="tro3_daylight" level="5" />
  • LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml

    r2258 r2298  
    205205                <field field_ref="alp_bl_stat" level="1" />
    206206
    207                 <field_group operation="instant">
     207                <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
    208208                    <field field_ref="u850" level="7" />
    209209                    <field field_ref="u700" level="7" />
  • LMDZ5/branches/testing/DefLists/file_def_histhfCOSP_lmdz.xml

    r2160 r2298  
    11<file_definition>
    22     <file_group id="defile">
    3         <file id="histhfCOSP" name="XhisthfCOSP" output_freq="6h" output_level="10"  enabled=".FALSE.">
     3        <file id="histhfCOSP" name="XhisthfCOSP" output_freq="3h" output_level="10"  enabled=".FALSE.">
    44
    55            <!-- VARS 2D -->
    6             <field_group operation="instant" freq_op="1ts">
     6            <field_group operation="instant" freq_op="3h">
    77                <field field_ref="cllcalipso"         level="1" />
    88                <field field_ref="clmcalipso"         level="1" />
     
    1212                <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
    1313                <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
     14                <field field_ref="Ncrefl"  level="1" axis_ref="sza" />
    1415                <field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
    1516                <field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
  • LMDZ5/branches/testing/DefLists/file_def_histhfNMC_lmdz.xml

    r2160 r2298  
    44
    55            <!-- VARS 3D -->
    6             <field_group operation="instant" freq_op="1ts" >
    7                 <field field_ref="tnondef" level="5" />
     6            <field_group operation="instant" freq_op="1ts" detect_missing_value=".true." >
     7<!--            <field field_ref="tnondef" level="5" />  -->
    88                <field field_ref="ta" level="1" />
    99                <field field_ref="zg" level="5" />
     
    1313                <field field_ref="va" level="5" />
    1414                <field field_ref="wap" level="5" />
    15                 <field field_ref="psbg" level="5" />
     15<!--            <field field_ref="psbg" level="5" /> -->
    1616                <field field_ref="tro3" level="5" />
    1717                <field field_ref="tro3_daylight" level="5" />
  • LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml

    r2258 r2298  
    205205                <field field_ref="alp_bl_stat" level="10" />
    206206
    207                 <field_group operation="instant">
     207                <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
    208208                    <field field_ref="u850" level="10" />
    209209                    <field field_ref="u700" level="10" />
  • LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml

    r2258 r2298  
    11<file_definition>
    22    <file_group id="defile">
    3         <file id="histins" name="Xhistins" output_freq="6h" output_level="4" enabled=".FALSE.">
     3        <file id="histins" name="Xhistins" output_freq="1ts" output_level="4" enabled=".FALSE.">
    44           
    55            <!-- VARS 1D -->
     
    205205                <field field_ref="alp_bl_stat" level="1" />
    206206
    207                 <field_group operation="instant">
     207                <field_group operation="instant" freq_op="1ts" detect_missing_value=".true.">
    208208                    <field field_ref="u850" level="7" />
    209209                    <field field_ref="u700" level="7" />
  • LMDZ5/branches/testing/DefLists/file_def_histmthCOSP_lmdz.xml

    r2160 r2298  
    11<file_definition>
    22     <file_group id="defile">
    3         <file id="histmthCOSP" name="XhistmthCOSP" output_freq="5d" output_level="10"  enabled=".FALSE.">
     3        <file id="histmthCOSP" name="XhistmthCOSP" output_freq="1mo" output_level="10"  enabled=".FALSE.">
    44
    55            <!-- VARS 2D -->
    6             <field_group operation="instant" freq_op="1ts">
     6            <field_group operation="average" freq_op="3h">
    77                <field field_ref="cllcalipso"         level="1" />
    88                <field field_ref="clmcalipso"         level="1" />
     
    1212                <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
    1313                <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
     14                <field field_ref="Ncrefl"  level="1" axis_ref="sza" />
    1415                <field field_ref="c01_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
    1516                <field field_ref="c02_cfad_lidarsr532"  level="10" axis_ref="presnivs" />
  • LMDZ5/branches/testing/DefLists/file_def_histmthNMC_lmdz.xml

    r2160 r2298  
    44
    55            <!-- VARS 3D -->
    6             <field_group operation="instant" freq_op="1ts" >
    7                 <field field_ref="tnondef" level="5" />
     6            <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
     7<!--            <field field_ref="tnondef" level="5" />  -->
    88                <field field_ref="ta" level="1" />
    99                <field field_ref="zg" level="5" />
     
    1313                <field field_ref="va" level="5" />
    1414                <field field_ref="wap" level="5" />
    15                 <field field_ref="psbg" level="5" />
     15<!--            <field field_ref="psbg" level="5" />  -->
    1616                <field field_ref="tro3" level="5" />
    1717                <field field_ref="tro3_daylight" level="5" />
  • LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml

    r2258 r2298  
    205205                <field field_ref="alp_bl_stat" level="1" />
    206206
    207                 <field_group operation="instant">
     207                <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
    208208                    <field field_ref="u850" level="1" />
    209209                    <field field_ref="u700" level="1" />
  • LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml

    r2258 r2298  
    205205                <field field_ref="alp_bl_stat" level="10" />
    206206
    207                 <field_group operation="instant">
     207                <field_group operation="average" freq_op="1ts" detect_missing_value=".true.">
    208208                    <field field_ref="u850" level="10" />
    209209                    <field field_ref="u700" level="10" />
Note: See TracChangeset for help on using the changeset viewer.