Ignore:
Timestamp:
Jul 18, 2016, 9:41:10 PM (8 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2545:2589 into testing branch

Location:
LMDZ5/branches/testing
Files:
16 edited
2 copied

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

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

    r2542 r2594  
    4444    <axis id="plev" standard_name="model_level_number" unit="Pa">
    4545    </axis>
    46 <!--    <axis id="height" standard_name="Cosp levels" unit="m"> -->
    47 <!--    </axis> -->
    48 <!--    <axis id="height_mlev" standard_name="height_mlev" unit="m"> -->
    49 <!--    </axis> -->
    50 <!--    <axis id="sza" standard_name="solar_zenith_angle" unit="degrees"> -->
    51 <!--    </axis> -->
    52 <!--    <axis id="pressure2" standard_name="pressure" unit="mb"> -->
    53 <!--    </axis> -->
    54 <!--    <axis id="column" standard_name="column" unit="count"> -->
    55 <!--    </axis> -->
     46
     47<!-- Cosp axis definitions-->
     48    <axis id="height" standard_name="Cosp levels" unit="m">
     49    </axis>
     50    <axis id="height_mlev" standard_name="height_mlev" unit="m">
     51    </axis>
     52    <axis id="sza" standard_name="solar_zenith_angle" unit="degrees">
     53    </axis>
     54    <axis id="pressure2" standard_name="pressure" unit="mb">
     55    </axis>
     56    <axis id="column" standard_name="column" unit="count">
     57    </axis>
     58    <axis id="temp" standard_name="temperature" unit="K">
     59    </axis>
     60    <axis id="cth16" name="cth" standard_name="altitude" unit="m">
     61    </axis>
     62
    5663  </axis_definition>
    5764</context>
  • LMDZ5/branches/testing/DefLists/context_lmdz_XIOS1.0.xml

    r2542 r2594  
    4343    <axis id="plev" standard_name="model_level_number" unit="Pa">
    4444    </axis>
     45
     46<!-- Cosp axis definitions-->
    4547<!--    <axis id="height" standard_name="Cosp levels" unit="m"> -->
    4648<!--    </axis> -->
     
    5355<!--    <axis id="column" standard_name="column" unit="count"> -->
    5456<!--    </axis> -->
     57<!--    <axis id="temp" standard_name="temperature" unit="K"> -->
     58<!--    </axis> -->
     59<!--    <axis id="cth16" name="cth" standard_name="altitude" unit="m"> -->
     60<!--    </axis> -->
     61
    5562  </axis_definition>
    5663</context>
  • LMDZ5/branches/testing/DefLists/field_def_lmdz.xml

    r2542 r2594  
    422422    <field_group id="fields_3D" domain_ref="dom_glo" axis_ref="presnivs">
    423423        <field id="tke"    long_name="TKE"    unit="m2/s2" />
    424         <field id="tke_ter"    long_name="Max Turb. Kinetic Energy ter"    unit="-" />
    425         <field id="tke_lic"    long_name="Max Turb. Kinetic Energy lic"    unit="-" />
    426         <field id="tke_oce"    long_name="Max Turb. Kinetic Energy oce"    unit="-" />
    427         <field id="tke_sic"    long_name="Max Turb. Kinetic Energy sic"    unit="-" />
    428         <field id="tke_max_ter"    long_name="Max Turb. Kinetic Energy ter"    unit="-" />
    429         <field id="tke_max_lic"    long_name="Max Turb. Kinetic Energy lic"    unit="-" />
    430         <field id="tke_max_oce"    long_name="Max Turb. Kinetic Energy oce"    unit="-" />
    431         <field id="tke_max_sic"    long_name="Max Turb. Kinetic Energy sic"    unit="-" />
    432         <field id="dltpbltke_ter"    long_name="TKE difference (w - x)"    unit="-" />
    433         <field id="dltpbltke_lic"    long_name="TKE difference (w - x)"    unit="-" />
    434         <field id="dltpbltke_oce"    long_name="TKE difference (w - x)"    unit="-" />
    435         <field id="dltpbltke_sic"    long_name="TKE difference (w - x)"    unit="-" />
     424        <field id="tke_ter"    long_name="Max Turb. Kinetic Energy ter"    unit="m2/s2" />
     425        <field id="tke_lic"    long_name="Max Turb. Kinetic Energy lic"    unit="m2/s2" />
     426        <field id="tke_oce"    long_name="Max Turb. Kinetic Energy oce"    unit="m2/s2" />
     427        <field id="tke_sic"    long_name="Max Turb. Kinetic Energy sic"    unit="m2/s2" />
     428        <field id="tke_max_ter"    long_name="Max Turb. Kinetic Energy ter"    unit="m2/s2" />
     429        <field id="tke_max_lic"    long_name="Max Turb. Kinetic Energy lic"    unit="m2/s2" />
     430        <field id="tke_max_oce"    long_name="Max Turb. Kinetic Energy oce"    unit="m2/s2" />
     431        <field id="tke_max_sic"    long_name="Max Turb. Kinetic Energy sic"    unit="m2/s2" />
     432        <field id="l_mix_ter"    long_name="PBL mixing length ter"    unit="m" />
     433        <field id="l_mix_lic"    long_name="PBL mixing length lic"    unit="m" />
     434        <field id="l_mix_oce"    long_name="PBL mixing length oce"    unit="m" />
     435        <field id="l_mix_sic"    long_name="PBL mixing length sic"    unit="m" />
     436        <field id="l_mixmin_ter"    long_name="min PBL mixing length ter"    unit="m" />
     437        <field id="l_mixmin_lic"    long_name="min PBL mixing length lic"    unit="m" />
     438        <field id="l_mixmin_oce"    long_name="min PBL mixing length oce"    unit="m" />
     439        <field id="l_mixmin_sic"    long_name="min PBL mixing length sic"    unit="m" />
     440        <field id="dltpbltke_ter"    long_name="TKE difference (w - x)"    unit="m2/s2" />
     441        <field id="dltpbltke_lic"    long_name="TKE difference (w - x)"    unit="m2/s2" />
     442        <field id="dltpbltke_oce"    long_name="TKE difference (w - x)"    unit="m2/s2" />
     443        <field id="dltpbltke_sic"    long_name="TKE difference (w - x)"    unit="m2/s2" />
    436444        <field id="cldtau"    long_name="Cloud optical thickness"    unit="1" />
    437445        <field id="cldemi"    long_name="Cloud optical emissivity"    unit="1" />
     
    452460        <field id="ovap"    long_name="Specific humidity"    unit="kg/kg" />
    453461        <field id="ovapinit"    long_name="Specific humidity (begin of timestep)"    unit="kg/kg" />
    454         <field id="oliq"    long_name="Condensed water"    unit="kg/kg" />
     462        <field id="oliq"    long_name="Liquid water"    unit="kg/kg" />
     463        <field id="ocond"    long_name="Condensed water"    unit="kg/kg" />
    455464        <field id="geop"    long_name="Geopotential height"    unit="m2/s2" />
    456465        <field id="vitu"    long_name="Zonal wind"    unit="m/s" />
     
    726735      <field id="cltcalipsoun"    long_name="Lidar Undefined-Phase Total Cloud Fraction"   unit="%" />
    727736      <field id="clcalipsoun"  long_name="Lidar Undefined-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
    728       <field id="clcalipsotmp"  long_name="Lidar Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
    729       <field id="clcalipsotmpliq"  long_name="Lidar Liq-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
    730       <field id="clcalipsotmpice"  long_name="Lidar Ice-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="height" />
    731       <field id="clcalipsotmpun"  long_name="Undefined-Phase Total Cloud Fraction"   unit="%" axis_ref="height" />
     737      <field id="clcalipsotmp"  long_name="Lidar Cloud Fraction (532 nm)" unit="%" axis_ref="temp" />
     738      <field id="clcalipsotmpliq"  long_name="Lidar Liq-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="temp" />
     739      <field id="clcalipsotmpice"  long_name="Lidar Ice-Phase Cloud Fraction (532 nm)" unit="%" axis_ref="temp" />
     740      <field id="clcalipsotmpun"  long_name="Undefined-Phase Total Cloud Fraction"   unit="%" axis_ref="temp" />
    732741    </field_group> 
    733742
     
    801810    </field_group>
    802811
     812    <field_group id="fields_COSP_MODIS" domain_ref="dom_glo" freq_op="3h">
     813      <field id="cllmodis" long_name="MODIS Low-level Cloud Fraction" unit="1" />
     814      <field id="clmmodis" long_name="MODIS Mid-level Cloud Fraction" unit="1" />
     815      <field id="clhmodis" long_name="MODIS Hight-level Cloud Fraction" unit="1" />
     816      <field id="cltmodis" long_name="MODIS Total Cloud Fraction" unit="1" />
     817      <field id="clwmodis" long_name="MODIS Cloud Fraction water mean" unit="1" />
     818      <field id="climodis" long_name="MODIS Cloud Fraction ice mean" unit="1" />
     819      <field id="tautmodis" long_name="MODIS Optical_Thickness_Total_Mean" unit="1" />
     820      <field id="tauwmodis" long_name="MODIS Optical_Thickness_Water_Mean" unit="1" />
     821      <field id="tauimodis" long_name="MODIS Optical_Thickness_Ice_Mean" unit="1" />
     822      <field id="tautlogmodis" long_name="MODIS Optical_Thickness_Total_logMean" unit="1" />
     823      <field id="tauwlogmodis" long_name="MODIS Optical_Thickness_Water_logMean" unit="1" />
     824      <field id="tauilogmodis" long_name="MODIS Optical_Thickness_Ice_logMean" unit="1" />
     825      <field id="reffclwmodis"  long_name="Modis Cloud_Particle_Size_Water_Mean" unit="m" />
     826      <field id="reffclimodis"  long_name="Modis Cloud_Particle_Size_Ice_Mean" unit="m" />
     827      <field id="pctmodis"  long_name="Modis Cloud_Top_Pressure_Total_Mean" unit="Pa" />
     828      <field id="lwpmodis" long_name="Modis Liquid_Water_Path_Mean" unit="kg m-2" />
     829      <field id="iwpmodis" long_name="Modis Ice_Water_Path_Mean" unit="kg m-2" />
     830      <field id="c01_clmodis" long_name="MODIS Cloud Area Fraction" unit="1" axis_ref="pressure2" />
     831      <field id="c02_clmodis" long_name="MODIS Cloud Area Fraction" unit="1" axis_ref="pressure2" />
     832      <field id="c03_clmodis" long_name="MODIS Cloud Area Fraction" unit="1" axis_ref="pressure2" />
     833      <field id="c04_clmodis" long_name="MODIS Cloud Area Fraction" unit="1" axis_ref="pressure2" />
     834      <field id="c05_clmodis" long_name="MODIS Cloud Area Fraction" unit="1" axis_ref="pressure2" />
     835      <field id="c06_clmodis" long_name="MODIS Cloud Area Fraction" unit="1" axis_ref="pressure2" />
     836      <field id="c07_clmodis" long_name="MODIS Cloud Area Fraction" unit="1" axis_ref="pressure2" />
     837    </field_group>
     838
     839    <field_group id="fields_AIRS" domain_ref="dom_glo" operation="instant" freq_op="3h">
     840      <field id="alt_tropo" long_name="Tropopause pressure" unit="hPa" />
     841      <field id="map_prop_hc" long_name="Proportion of high clouds" unit=" "/>
     842      <field id="map_prop_hist" long_name="Proportion of high ice semi-transp clouds" unit=" "/>
     843      <field id="map_emis_hc" long_name="Emissivity of high clouds" unit=" "/>
     844      <field id="map_iwp_hc" long_name="Ice water path of high clouds" unit="g/m2"/>
     845      <field id="map_deltaz_hc" long_name="geom thickness of high clouds" unit="m"/>
     846      <field id="map_pcld_hc" long_name="cloud pressure of high clouds" unit="hPa"/>
     847      <field id="map_tcld_hc" long_name="cloud temperature of high clouds" unit="K"/>
     848      <field id="map_emis_hist" long_name="Emissivity of high ice st clouds" unit=" "/>
     849      <field id="map_iwp_hist" long_name="Ice water path of high ice st clouds" unit="g/m2"/>
     850      <field id="map_deltaz_hist" long_name="geom thickness of high ice st clouds" unit="m"/>
     851      <field id="map_rad_hist" long_name="ice crystals radius in high ice st clouds" unit="m"/>
     852      <field id="map_emis_Cb" long_name="Emissivity of high Cb clouds" unit=" "/>
     853      <field id="map_pcld_Cb" long_name="cloud pressure of high Cb clouds" unit="hPa"/>
     854      <field id="map_tcld_Cb" long_name="cloud temperature of high Cb clouds" unit="K"/>
     855      <field id="map_emis_Anv" long_name="Emissivity of high Anv clouds" unit=" "/>
     856      <field id="map_pcld_Anv" long_name="cloud pressure of high Anv clouds" unit="hPa"/>
     857      <field id="map_tcld_Anv" long_name="cloud temperature of high Anv clouds" unit="K"/>
     858      <field id="map_emis_ThCi" long_name="Emissivity of high ThCi clouds" unit=" "/>
     859      <field id="map_pcld_ThCi" long_name="cloud pressure of high ThCi clouds" unit="hPa"/>
     860      <field id="map_tcld_ThCi" long_name="cloud temperature of high ThCi clouds" unit="K"/>
     861      <field id="map_ntot" long_name="total AIRS cloud fraction" unit=" "/>
     862      <field id="map_hc" long_name="high clouds AIRS cloud fraction" unit=" "/>
     863      <field id="map_hist" long_name="high clouds ice st AIRS cloud fraction" unit=" "/>
     864      <field id="map_Cb" long_name="high clouds Cb AIRS cloud fraction" unit=" "/>
     865      <field id="map_ThCi" long_name="high clouds ThCi AIRS cloud fraction" unit=" "/>
     866      <field id="map_Anv" long_name="high clouds Anv AIRS cloud fraction" unit=" "/>
     867    </field_group>
     868
    803869</field_definition>
    804870
  • LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml

    r2542 r2594  
    282282                <field field_ref="tke_max_oce" level="10" operation="maximum" />
    283283                <field field_ref="tke_max_sic" level="10" operation="maximum" />
     284                <field field_ref="l_mix_ter" level="10" />
     285                <field field_ref="l_mix_lic" level="10" />
     286                <field field_ref="l_mix_oce" level="10" />
     287                <field field_ref="l_mix_sic" level="10" />
     288                <field field_ref="l_mixmin_ter" level="10" />
     289                <field field_ref="l_mixmin_lic" level="10" />
     290                <field field_ref="l_mixmin_oce" level="10" />
     291                <field field_ref="l_mixmin_sic" level="10" />
    284292                <field field_ref="SWnetOR" level="10" />
    285293                <field field_ref="SWdownOR" level="10" />
     
    423431                <field field_ref="ovapinit" level="10" />
    424432                <field field_ref="oliq" level="10" />
     433                <field field_ref="ocond" level="10" />
    425434                <field field_ref="geop" level="10" />
    426435                <field field_ref="vitu" level="10" />
  • LMDZ5/branches/testing/DefLists/file_def_histdayCOSP_lmdz.xml

    r2471 r2594  
    11<file_definition>
    22     <file_group id="defile">
    3         <file id="histdayCOSP" name="histdayCOSP" output_freq="1d" output_level="1"  enabled=".TRUE.">
     3        <file id="histdayCOSP" name="histdayCOSP" output_freq="1d" output_level="1"  enabled="_AUTO_">
    44
    55            <!-- VARS Calipso and PARASOL -->
     
    2525                <field field_ref="clcalipsoliq"  level="1" axis_ref="height" />
    2626                <field field_ref="clcalipsoun"  level="1" axis_ref="height" />
    27                 <field field_ref="clcalipsotmp"  level="1" axis_ref="height" />
    28                 <field field_ref="clcalipsotmpice"  level="1" axis_ref="height" />
    29                 <field field_ref="clcalipsotmpliq"  level="1" axis_ref="height" />
    30                 <field field_ref="clcalipsotmpun"  level="1" axis_ref="height" />
     27                <field field_ref="clcalipsotmp"  level="1" axis_ref="temp" />
     28                <field field_ref="clcalipsotmpice"  level="1" axis_ref="temp" />
     29                <field field_ref="clcalipsotmpliq"  level="1" axis_ref="temp" />
     30                <field field_ref="clcalipsotmpun"  level="1" axis_ref="temp" />
    3131                <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
    3232                <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
     
    139139            </field_group>
    140140
     141            <field_group operation="average" freq_op="3h" detect_missing_value=".true.">
     142                <field field_ref="cllmodis" level="1" />
     143                <field field_ref="clmmodis" level="1" />
     144                <field field_ref="clhmodis" level="1" />
     145                <field field_ref="cltmodis" level="1" />
     146                <field field_ref="clwmodis" level="1" />
     147                <field field_ref="climodis" level="1" />
     148                <field field_ref="tautmodis" level="1" />
     149                <field field_ref="tauwmodis" level="1" />
     150                <field field_ref="tauimodis" level="1" />
     151                <field field_ref="tautlogmodis" level="1" />
     152                <field field_ref="tauilogmodis" level="1" />
     153                <field field_ref="tauwlogmodis" level="1" />
     154                <field field_ref="reffclwmodis" level="1" />
     155                <field field_ref="reffclimodis" level="1" />
     156                <field field_ref="pctmodis"  unit="1" />
     157                <field field_ref="lwpmodis" level="1" />
     158                <field field_ref="iwpmodis" level="1" />
     159                <field field_ref="c01_clmodis" level="1" axis_ref="pressure2" />
     160                <field field_ref="c02_clmodis" level="1" axis_ref="pressure2" />
     161                <field field_ref="c03_clmodis" level="1" axis_ref="pressure2" />
     162                <field field_ref="c04_clmodis" level="1" axis_ref="pressure2" />
     163                <field field_ref="c05_clmodis" level="1" axis_ref="pressure2" />
     164                <field field_ref="c06_clmodis" level="1" axis_ref="pressure2" />
     165                <field field_ref="c07_clmodis" level="1" axis_ref="pressure2" />
     166            </field_group>
     167
    141168        </file>
    142169     </file_group>
  • LMDZ5/branches/testing/DefLists/file_def_histdayNMC_lmdz.xml

    r2435 r2594  
    11<file_definition>
    22    <file_group id="defile">
    3         <file id="histdayNMC" name="histdayNMC" output_freq="1d" output_level="5" enabled=".FALSE.">
     3        <file id="histdayNMC" name="histdayNMC" output_freq="1d" output_level="5" enabled="_AUTO_">
    44
    55            <!-- VARS 3D -->
  • LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml

    r2542 r2594  
    11<file_definition>
    22    <file_group id="defile">
    3         <file id="histday" name="histday" output_freq="1d" output_level="2" enabled=".FALSE.">
     3        <file id="histday" name="histday" output_freq="1d" output_level="2" enabled="_AUTO_">
    44           
    55            <!-- VARS 1D -->
     
    282282                <field field_ref="tke_max_oce" level="4" operation="maximum" />
    283283                <field field_ref="tke_max_sic" level="4" operation="maximum" />
     284                <field field_ref="l_mix_ter" level="10" />
     285                <field field_ref="l_mix_lic" level="10" />
     286                <field field_ref="l_mix_oce" level="10" />
     287                <field field_ref="l_mix_sic" level="10" />
     288                <field field_ref="l_mixmin_ter" level="10" />
     289                <field field_ref="l_mixmin_lic" level="10" />
     290                <field field_ref="l_mixmin_oce" level="10" />
     291                <field field_ref="l_mixmin_sic" level="10" />
    284292                <field field_ref="SWnetOR" level="10" />
    285293                <field field_ref="SWdownOR" level="10" />
     
    423431                <field field_ref="ovapinit" level="10" />
    424432                <field field_ref="oliq" level="3" />
     433                <field field_ref="ocond" level="3" />
    425434                <field field_ref="geop" level="3" />
    426435                <field field_ref="vitu" level="3" />
  • LMDZ5/branches/testing/DefLists/file_def_histhfCOSP_lmdz.xml

    r2471 r2594  
    11<file_definition>
    22     <file_group id="defile">
    3         <file id="histhfCOSP" name="XhisthfCOSP" output_freq="3h" output_level="1"  enabled=".TRUE.">
     3        <file id="histhfCOSP" name="histhfCOSP" output_freq="3h" output_level="1"  enabled="_AUTO_">
    44
    55            <!-- VARS Calipso and PARASOL -->
    6             <field_group operation="average" freq_op="3h" detect_missing_value=".true.">
     6            <field_group operation="instant" freq_op="3h" detect_missing_value=".true.">
    77                <field field_ref="cllcalipso"         level="1" />
    88                <field field_ref="clmcalipso"         level="1" />
     
    2525                <field field_ref="clcalipsoliq"  level="1" axis_ref="height" />
    2626                <field field_ref="clcalipsoun"  level="1" axis_ref="height" />
    27                 <field field_ref="clcalipsotmp"  level="1" axis_ref="height" />
    28                 <field field_ref="clcalipsotmpice"  level="1" axis_ref="height" />
    29                 <field field_ref="clcalipsotmpliq"  level="1" axis_ref="height" />
    30                 <field field_ref="clcalipsotmpun"  level="1" axis_ref="height" />
     27                <field field_ref="clcalipsotmp"  level="1" axis_ref="temp" />
     28                <field field_ref="clcalipsotmpice"  level="1" axis_ref="temp" />
     29                <field field_ref="clcalipsotmpliq"  level="1" axis_ref="temp" />
     30                <field field_ref="clcalipsotmpun"  level="1" axis_ref="temp" />
    3131                <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
    3232                <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
     
    7070              </field_group>
    7171             <!-- VARS CLOUDSAT et/ou Calipso -->
    72             <field_group operation="average" freq_op="3h" detect_missing_value=".true.">
     72            <field_group operation="instant" freq_op="3h" detect_missing_value=".true.">
    7373               <field field_ref="cltlidarradar"  level="1"/>
    7474               <field field_ref="clcalipso2"  level="1" axis_ref="height" />
     
    110110              </field_group>
    111111             <!-- VARS ISCCP -->
    112             <field_group operation="average" freq_op="3h" detect_missing_value=".true.">
     112            <field_group operation="instant" freq_op="3h" detect_missing_value=".true.">
    113113                <field field_ref="sunlit" level="1" />
    114114                <field field_ref="c01_clisccp2" level="1" axis_ref="pressure2" />
     
    129129             </field_group>
    130130             <!-- VARS MISR -->
    131             <field_group operation="average" freq_op="3h" detect_missing_value=".true.">
     131            <field_group operation="instant" freq_op="3h" detect_missing_value=".true.">
    132132                <field field_ref="c01_clMISR" level="1" axis_ref="cth16" />
    133133                <field field_ref="c02_clMISR" level="1" axis_ref="cth16" />
     
    139139            </field_group>
    140140
     141            <field_group operation="instant" freq_op="3h" detect_missing_value=".true.">
     142                <field field_ref="cllmodis" level="1" />
     143                <field field_ref="clmmodis" level="1" />
     144                <field field_ref="clhmodis" level="1" />
     145                <field field_ref="cltmodis" level="1" />
     146                <field field_ref="clwmodis" level="1" />
     147                <field field_ref="climodis" level="1" />
     148                <field field_ref="tautmodis" level="1" />
     149                <field field_ref="tauwmodis" level="1" />
     150                <field field_ref="tauimodis" level="1" />
     151                <field field_ref="tautlogmodis" level="1" />
     152                <field field_ref="tauilogmodis" level="1" />
     153                <field field_ref="tauwlogmodis" level="1" />
     154                <field field_ref="reffclwmodis" level="1" />
     155                <field field_ref="reffclimodis" level="1" />
     156                <field field_ref="pctmodis"  unit="1" />
     157                <field field_ref="lwpmodis" level="1" />
     158                <field field_ref="iwpmodis" level="1" />
     159                <field field_ref="c01_clmodis" level="1" axis_ref="pressure2" />
     160                <field field_ref="c02_clmodis" level="1" axis_ref="pressure2" />
     161                <field field_ref="c03_clmodis" level="1" axis_ref="pressure2" />
     162                <field field_ref="c04_clmodis" level="1" axis_ref="pressure2" />
     163                <field field_ref="c05_clmodis" level="1" axis_ref="pressure2" />
     164                <field field_ref="c06_clmodis" level="1" axis_ref="pressure2" />
     165                <field field_ref="c07_clmodis" level="1" axis_ref="pressure2" />
     166            </field_group>
     167
    141168        </file>
    142169     </file_group>
  • LMDZ5/branches/testing/DefLists/file_def_histhfNMC_lmdz.xml

    r2435 r2594  
    11<file_definition>
    22    <file_group id="defile">
    3         <file id="histhfNMC" name="histhfNMC" output_freq="6h" output_level="5" enabled=".FALSE.">
     3        <file id="histhfNMC" name="histhfNMC" output_freq="6h" output_level="5" enabled="_AUTO_">
    44
    55            <!-- VARS 3D -->
  • LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml

    r2542 r2594  
    11<file_definition>
    22    <file_group id="defile">
    3         <file id="histhf" name="histhf" output_freq="6h" output_level="5" enabled=".FALSE.">
     3        <file id="histhf" name="histhf" output_freq="6h" output_level="5" enabled="_AUTO_">
    44           
    55            <!-- VARS 1D -->
     
    282282                <field field_ref="tke_max_oce" level="10" operation="maximum" />
    283283                <field field_ref="tke_max_sic" level="10" operation="maximum" />
     284                <field field_ref="l_mix_ter" level="10" />
     285                <field field_ref="l_mix_lic" level="10" />
     286                <field field_ref="l_mix_oce" level="10" />
     287                <field field_ref="l_mix_sic" level="10" />
     288                <field field_ref="l_mixmin_ter" level="10" />
     289                <field field_ref="l_mixmin_lic" level="10" />
     290                <field field_ref="l_mixmin_oce" level="10" />
     291                <field field_ref="l_mixmin_sic" level="10" />
    284292                <field field_ref="SWnetOR" level="10" />
    285293                <field field_ref="SWdownOR" level="10" />
     
    403411            </field_group>
    404412
     413            <field_group operation="instant" freq_op="1ts" >
     414                 <field field_ref="alt_tropo" level="10" />
     415                 <field field_ref="map_prop_hc" level="10" />
     416                 <field field_ref="map_prop_hist" level="10" />
     417                 <field field_ref="map_emis_hc" level="10" />
     418                 <field field_ref="map_iwp_hc" level="10" />
     419                 <field field_ref="map_deltaz_hc" level="10" />
     420                 <field field_ref="map_pcld_hc" level="10" />
     421                 <field field_ref="map_tcld_hc" level="10" />
     422                 <field field_ref="map_emis_hist" level="10" />
     423                 <field field_ref="map_iwp_hist" level="10" />
     424                 <field field_ref="map_deltaz_hist" level="10" />
     425                 <field field_ref="map_rad_hist" level="10" />
     426                 <field field_ref="map_emis_Cb" level="10" />
     427                 <field field_ref="map_pcld_Cb" level="10" />
     428                 <field field_ref="map_tcld_Cb" level="10" />
     429                 <field field_ref="map_emis_Anv" level="10" />
     430                 <field field_ref="map_pcld_Anv" level="10" />
     431                 <field field_ref="map_tcld_Anv" level="10" />
     432                 <field field_ref="map_emis_ThCi" level="10" />
     433                 <field field_ref="map_pcld_ThCi" level="10" />
     434                 <field field_ref="map_tcld_ThCi" level="10" />
     435                 <field field_ref="map_ntot" level="10" />
     436                 <field field_ref="map_hc" level="10" />
     437                 <field field_ref="map_hist" level="10" />
     438                 <field field_ref="map_Cb" level="10" />
     439                 <field field_ref="map_ThCi" level="10" />
     440                 <field field_ref="map_Anv" level="10" />
     441            </field_group>
     442
    405443            <!-- VARS 3D -->
    406444            <field_group operation="average" freq_op="1ts" axis_ref="presnivs">
     
    423461                <field field_ref="ovapinit" level="10" />
    424462                <field field_ref="oliq" level="10" />
     463                <field field_ref="ocond" level="10" />
    425464                <field field_ref="geop" level="10" />
    426465                <field field_ref="vitu" level="6" />
  • LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml

    r2542 r2594  
    282282                <field field_ref="tke_max_oce" level="10" operation="maximum" />
    283283                <field field_ref="tke_max_sic" level="10" operation="maximum" />
     284                <field field_ref="l_mix_ter" level="10" />
     285                <field field_ref="l_mix_lic" level="10" />
     286                <field field_ref="l_mix_oce" level="10" />
     287                <field field_ref="l_mix_sic" level="10" />
     288                <field field_ref="l_mixmin_ter" level="10" />
     289                <field field_ref="l_mixmin_lic" level="10" />
     290                <field field_ref="l_mixmin_oce" level="10" />
     291                <field field_ref="l_mixmin_sic" level="10" />
    284292                <field field_ref="SWnetOR" level="2" />
    285293                <field field_ref="SWdownOR" level="2" />
     
    423431                <field field_ref="ovapinit" level="10" />
    424432                <field field_ref="oliq" level="4" />
     433                <field field_ref="ocond" level="4" />
    425434                <field field_ref="geop" level="10" />
    426435                <field field_ref="vitu" level="4" />
  • LMDZ5/branches/testing/DefLists/file_def_histmthCOSP_lmdz.xml

    r2471 r2594  
    11<file_definition>
    22     <file_group id="defile">
    3         <file id="histmthCOSP" name="histmthCOSP" output_freq="30d" output_level="1"  enabled=".TRUE.">
     3        <file id="histmthCOSP" name="histmthCOSP" output_freq="30d" output_level="1"  enabled="_AUTO_">
    44
    55            <!-- VARS Calipso and PARASOL -->
     
    2525                <field field_ref="clcalipsoliq"  level="1" axis_ref="height" />
    2626                <field field_ref="clcalipsoun"  level="1" axis_ref="height" />
    27                 <field field_ref="clcalipsotmp"  level="1" axis_ref="height" />
    28                 <field field_ref="clcalipsotmpice"  level="1" axis_ref="height" />
    29                 <field field_ref="clcalipsotmpliq"  level="1" axis_ref="height" />
    30                 <field field_ref="clcalipsotmpun"  level="1" axis_ref="height" />
     27                <field field_ref="clcalipsotmp"  level="1" axis_ref="temp" />
     28                <field field_ref="clcalipsotmpice"  level="1" axis_ref="temp" />
     29                <field field_ref="clcalipsotmpliq"  level="1" axis_ref="temp" />
     30                <field field_ref="clcalipsotmpun"  level="1" axis_ref="temp" />
    3131                <field field_ref="parasol_refl"  level="1" axis_ref="sza" />
    3232                <field field_ref="parasol_crefl"  level="1" axis_ref="sza" />
     
    138138                <field field_ref="c07_clMISR" level="1" axis_ref="cth16" />
    139139            </field_group>
     140            <field_group operation="average" freq_op="3h" detect_missing_value=".true.">
     141                <field field_ref="cllmodis" level="1" />
     142                <field field_ref="clmmodis" level="1" />
     143                <field field_ref="clhmodis" level="1" />
     144                <field field_ref="cltmodis" level="1" />
     145                <field field_ref="clwmodis" level="1" />
     146                <field field_ref="climodis" level="1" />
     147                <field field_ref="tautmodis" level="1" />
     148                <field field_ref="tauwmodis" level="1" />
     149                <field field_ref="tauimodis" level="1" />
     150                <field field_ref="tautlogmodis" level="1" />
     151                <field field_ref="tauilogmodis" level="1" />
     152                <field field_ref="tauwlogmodis" level="1" />
     153                <field field_ref="reffclwmodis" level="1" />
     154                <field field_ref="reffclimodis" level="1" />
     155                <field field_ref="pctmodis"  unit="1" />
     156                <field field_ref="lwpmodis" level="1" />
     157                <field field_ref="iwpmodis" level="1" />
     158                <field field_ref="c01_clmodis" level="1" axis_ref="pressure2" />
     159                <field field_ref="c02_clmodis" level="1" axis_ref="pressure2" />
     160                <field field_ref="c03_clmodis" level="1" axis_ref="pressure2" />
     161                <field field_ref="c04_clmodis" level="1" axis_ref="pressure2" />
     162                <field field_ref="c05_clmodis" level="1" axis_ref="pressure2" />
     163                <field field_ref="c06_clmodis" level="1" axis_ref="pressure2" />
     164                <field field_ref="c07_clmodis" level="1" axis_ref="pressure2" />
     165            </field_group>
    140166
    141167        </file>
  • LMDZ5/branches/testing/DefLists/file_def_histmthNMC_lmdz.xml

    r2435 r2594  
    11<file_definition>
    22    <file_group id="defile">
    3         <file id="histmthNMC" name="histmthNMC" output_freq="1mo" output_level="5" enabled=".FALSE.">
     3        <file id="histmthNMC" name="histmthNMC" output_freq="1mo" output_level="5" enabled="_AUTO_">
    44
    55            <!-- VARS 3D -->
  • LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml

    r2542 r2594  
    11<file_definition>
    22        <file_group id="defile">
    3         <file id="histmth" name="histmth" output_freq="1mo" output_level="5"  enabled=".FALSE.">
     3        <file id="histmth" name="histmth" output_freq="1mo" output_level="5"  enabled="_AUTO_">
    44
    55            <!-- VARS 1D -->
     
    282282                <field field_ref="tke_max_oce" level="10" operation="maximum" />
    283283                <field field_ref="tke_max_sic" level="10" operation="maximum" />
     284                <field field_ref="l_mix_ter" level="10" />
     285                <field field_ref="l_mix_lic" level="10" />
     286                <field field_ref="l_mix_oce" level="10" />
     287                <field field_ref="l_mix_sic" level="10" />
     288                <field field_ref="l_mixmin_ter" level="10" />
     289                <field field_ref="l_mixmin_lic" level="10" />
     290                <field field_ref="l_mixmin_oce" level="10" />
     291                <field field_ref="l_mixmin_sic" level="10" />
    284292                <field field_ref="SWnetOR" level="10" />
    285293                <field field_ref="SWdownOR" level="10" />
     
    423431                <field field_ref="ovapinit" level="2" />
    424432                <field field_ref="oliq" level="2" />
     433                <field field_ref="ocond" level="2" />
    425434                <field field_ref="geop" level="2" />
    426435                <field field_ref="vitu" level="2" />
  • LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml

    r2542 r2594  
    11<file_definition>
    22    <file_group id="defile">
    3         <file id="histstn" name="histstn" output_freq="1800s" output_level="5" enabled=".FALSE.">
     3        <file id="histstn" name="histstn" output_freq="1800s" output_level="5" enabled="_AUTO_">
    44
    55            <!-- VARS 1D -->
     
    282282                <field field_ref="tke_max_oce" level="10" operation="maximum" />
    283283                <field field_ref="tke_max_sic" level="10" operation="maximum" />
     284                <field field_ref="l_mix_ter" level="10" />
     285                <field field_ref="l_mix_lic" level="10" />
     286                <field field_ref="l_mix_oce" level="10" />
     287                <field field_ref="l_mix_sic" level="10" />
     288                <field field_ref="l_mixmin_ter" level="10" />
     289                <field field_ref="l_mixmin_lic" level="10" />
     290                <field field_ref="l_mixmin_oce" level="10" />
     291                <field field_ref="l_mixmin_sic" level="10" />
    284292                <field field_ref="SWnetOR" level="10" />
    285293                <field field_ref="SWdownOR" level="10" />
     
    423431                <field field_ref="ovapinit" level="10" />
    424432                <field field_ref="oliq" level="10" />
     433                <field field_ref="ocond" level="10" />
    425434                <field field_ref="geop" level="10" />
    426435                <field field_ref="vitu" level="10" />
Note: See TracChangeset for help on using the changeset viewer.