Ignore:
Timestamp:
Nov 28, 2014, 4:36:29 PM (10 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

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

    r2056 r2160  
    1717  <file_definition src="./file_def_histdayNMC_lmdz.xml"/>
    1818  <file_definition src="./file_def_histhfNMC_lmdz.xml"/>
     19  <file_definition src="./file_def_histmthCOSP_lmdz.xml"/>
     20  <file_definition src="./file_def_histdayCOSP_lmdz.xml"/>
     21  <file_definition src="./file_def_histhfCOSP_lmdz.xml"/>
    1922 
    2023  <!-- Define domains and groups of domains -->
     
    3336    </axis>
    3437    <axis id="Ahyb" standard_name="Ahyb comp of Hyb Cord" unit="Pa">
    35     </axis>
     38    </axis> 
    3639    <axis id="Bhyb" standard_name="Bhyb comp of Hyb Cord" unit="">
    3740    </axis>
     
    4043    <axis id="plev" standard_name="model_level_number" unit="Pa">
    4144    </axis>
     45<!--    <axis id="height" standard_name="Cosp levels" unit="m"> -->
     46<!--    </axis> -->
     47<!--    <axis id="height_mlev" standard_name="height_mlev" unit="m"> -->
     48<!--    </axis> -->
     49<!--    <axis id="sza" standard_name="solar_zenith_angle" unit="degrees"> -->
     50<!--    </axis> -->
     51<!--    <axis id="pressure2" standard_name="pressure" unit="mb"> -->
     52<!--    </axis> -->
     53<!--    <axis id="column" standard_name="column" unit="count"> -->
     54<!--    </axis> -->
    4255  </axis_definition>
    4356</context>
Note: See TracChangeset for help on using the changeset viewer.