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/context_lmdz.xml

    r3356 r3411  
    6161    <axis id="bnds" standard_name="bounds" unit="1" >
    6262    </axis>
    63     <axis id="spectband" standard_name="Sensor Band Central Radiation Wavenumber" unit="m-1">
    64     </axis>
    65     <axis id="axis_lat" standard_name="Latitude axis">
    66            <reduce_domain operation="average" direction="iDir" />
    67     </axis>
    6863
    6964<!-- Cosp axis definitions-->
     
    8075    <axis id="temp" standard_name="temperature" unit="K">
    8176    </axis>
    82     <axis id="cth" standard_name="altitude" unit="m">
     77    <axis id="cth16" name="cth" standard_name="altitude" unit="m">
    8378    </axis>
    8479    <axis id="ReffIce" standard_name="ReffIce" unit="microne" >
     
    9590
    9691  <grid_definition>
     92<!-- Define Scalar grid for GHG, orbital parameters and solar constants -->
     93    <grid id="grid_scalar">
     94    </grid>
    9795
    9896    <grid id="klev_bnds"> <axis axis_ref="klev" /> <axis axis_ref="bnds" /> </grid>
     
    111109        <domain id="dom_glo" />
    112110        <axis id="plev" />
    113      </grid>
    114 
    115      <grid id="grid_glo_spectband">
    116         <domain id="dom_glo" />
    117         <axis id="spectband" />
    118111     </grid>
    119112
     
    147140     <grid id="grid4Dcol">
    148141        <domain id="dom_glo" />
     142        <axis id="height_mlev" />
    149143        <axis id="column" />
    150         <axis id="height_mlev" />
    151144     </grid>
    152145
     
    171164     <grid id="grid4Dmisr">
    172165        <domain id="dom_glo" />
    173         <axis id="cth" />
    174166        <axis id="tau" />
     167        <axis id="cth16" />
    175168     </grid>
    176169
     
    192185     </grid>
    193186
    194  <!-- Grid definitions to allow summing of a 3D varaible -->   
    195       <grid id="grid_3D" >
    196          <domain id="dom_glo" />
    197          <axis id="lev" />
    198        </grid>
    199 
    200187  </grid_definition>
    201188
Note: See TracChangeset for help on using the changeset viewer.