Changeset 886 for CMIP6dreq


Ignore:
Timestamp:
02/12/16 18:14:28 (4 years ago)
Author:
mjuckes
Message:

release cand

Location:
CMIP6dreq/trunk/dreqPy
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • CMIP6dreq/trunk/dreqPy/docs/dreq2Sample.xml

    r880 r886  
    77xmlns="urn:w3id.org:cmip6.dreq.dreq:a"> 
    88<prologue> 
    9 <dc:title>Draft CMIP6 Data Request [01.beta.43]</dc:title> 
     9<dc:title>Draft CMIP6 Data Request [01.beta.44]</dc:title> 
    1010<dc:description>The CMIP6 Data Request will specify the variables requested for the CMIP6 archive, and the detail the experiments and time slices for which they are required.</dc:description> 
    1111<dc:creator>Martin Juckes</dc:creator> 
    12 <dc:date>2016-11-24</dc:date> 
    13 <pav:version>01.beta.43</pav:version> 
     12<dc:date>2016-12-02</dc:date> 
     13<pav:version>01.beta.44</pav:version> 
    1414</prologue> 
    1515<main> 
    1616<requestVarGroup label="requestVarGroup" uid="SECTION:requestVarGroup" useClass="vocab" title="3.1 Request variable group: a collection of request variables" id="rqvg"> 
    1717<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    18 <item id="001.008.001" label="example-01" title="dummy title string" uid="3dfd8d02-b25e-11e6-9598-5404a60d96b5" mip="dummyAt" ref="dummyAt" refNote="dummyAt"/> 
     18<item id="001.008.001" label="example-01" title="dummy title string" uid="9d65f424-b8b6-11e6-be9a-ac72891c3257" mip="dummyAt" ref="dummyAt" refNote="dummyAt"/> 
    1919</requestVarGroup> 
    2020<requestItem label="requestItem" uid="SECTION:requestItem" useClass="vocab" title="3.2 Request Item: specifying the number of years for an experiment" id="rqi"> 
    2121<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    22 <item id="001.010.001" label="example-01" title="dummy title string" uid="3dfde34c-b25e-11e6-9598-5404a60d96b5" mip="dummyAt" tab="dummyAt" expt="dummyAt" rlid="dummyAt" esid="dummyAt" esidComment="dummyAt" preset="25" treset="25" ny="25" nexmax="25" nenmax="25" nymax="5." tslice="dummyAt"/> 
     22<item id="001.010.001" label="example-01" title="dummy title string" uid="9d664be0-b8b6-11e6-be9a-ac72891c3257" mip="dummyAt" tab="dummyAt" expt="dummyAt" rlid="dummyAt" esid="dummyAt" esidComment="dummyAt" preset="25" treset="25" ny="25" nexmax="25" nenmax="25" nymax="5." tslice="dummyAt"/> 
    2323</requestItem> 
    2424<exptgroup label="exptgroup" uid="SECTION:exptgroup" useClass="vocab" title="1.9 Experiment Group" id="exg"> 
    2525<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    26 <item id="001.013.001" label="example-01" title="dummy title string" uid="3dfe314e-b25e-11e6-9598-5404a60d96b5" tierMin="25" ntot="25"/> 
     26<item id="001.013.001" label="example-01" title="dummy title string" uid="9d66ac84-b8b6-11e6-be9a-ac72891c3257" tierMin="25" ntot="25"/> 
    2727</exptgroup> 
    2828<miptable label="miptable" uid="SECTION:miptable" useClass="vocab" title="2.4 MIP tables" id="mtb"> 
    2929<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    30 <item id="001.029.001" label="example-01" title="dummy title string" uid="3dfe7d98-b25e-11e6-9598-5404a60d96b5" description="dummyAt" frequency="dummyAt" prov="dummyAt"/> 
     30<item id="001.029.001" label="example-01" title="dummy title string" uid="9d66fc66-b8b6-11e6-be9a-ac72891c3257" description="dummyAt" frequency="dummyAt" prov="dummyAt"/> 
    3131</miptable> 
    3232<CMORvar label="CMORvar" uid="SECTION:CMORvar" useClass="vocab" title="1.3 CMOR Variable" id="cmv"> 
    3333<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    34 <item id="001.002.001" label="example-01" title="dummy title string" uid="3dfed414-b25e-11e6-9598-5404a60d96b5" stid="dummyAt" vid="dummyAt" valid_min="5." valid_max="5." ok_min_mean_abs="5." ok_max_mean_abs="5." deflate="dummyAt" deflate_level="dummyAt" shuffle="dummyAt" defaultPriority="25" type="dummyAt" modeling_realm="dummyAt" positive="dummyAt" mipTableSection="dummyAt" mtid="dummyAt" mipTable="dummyAt" prov="dummyAt" processing="dummyAt" provNote="dummyAt" frequency="dummyAt" rowIndex="25" description="dummyAt" subGroup="dummyAt"/> 
     34<item id="001.002.001" label="example-01" title="dummy title string" uid="9d674d56-b8b6-11e6-be9a-ac72891c3257" stid="dummyAt" vid="dummyAt" valid_min="5." valid_max="5." ok_min_mean_abs="5." ok_max_mean_abs="5." deflate="dummyAt" deflate_level="dummyAt" shuffle="dummyAt" defaultPriority="25" type="dummyAt" modeling_realm="dummyAt" positive="dummyAt" mipTableSection="dummyAt" mtid="dummyAt" mipTable="dummyAt" prov="dummyAt" processing="dummyAt" provNote="dummyAt" frequency="dummyAt" rowIndex="25" description="dummyAt" subGroup="dummyAt"/> 
    3535</CMORvar> 
    3636<objective label="objective" uid="SECTION:objective" useClass="vocab" title="1.6 Scientific objectives" id="obj"> 
    3737<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    38 <item id="001.014.001" label="example-01" title="dummy title string" uid="3dfee51c-b25e-11e6-9598-5404a60d96b5" description="dummyAt" mip="dummyAt"/> 
     38<item id="001.014.001" label="example-01" title="dummy title string" uid="9d675ec2-b8b6-11e6-be9a-ac72891c3257" description="dummyAt" mip="dummyAt"/> 
    3939</objective> 
    4040<spatialShape label="spatialShape" uid="SECTION:spatialShape" useClass="vocab" title="2.1 Spatial dimensions" id="ss"> 
    4141<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    42 <item id="001.004.001" label="example-01" title="dummy title string" uid="3dfeec42-b25e-11e6-9598-5404a60d96b5" dimensions="dummyAt" dimids="alpha beta" shape="dummyAt" levels="25" levelFlag="false"/> 
     42<item id="001.004.001" label="example-01" title="dummy title string" uid="9d6765a2-b8b6-11e6-be9a-ac72891c3257" dimensions="dummyAt" dimids="alpha beta" shape="dummyAt" levels="25" levelFlag="false"/> 
    4343</spatialShape> 
    4444<requestLink label="requestLink" uid="SECTION:requestLink" useClass="vocab" title="3.3 Request link: linking a set of variables and a set of experiments" id="rql"> 
    4545<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    46 <item id="001.009.001" label="example-01" title="dummy title string" uid="3dfef39a-b25e-11e6-9598-5404a60d96b5" mip="dummyAt" tab="dummyAt" objective="dummyAt" grid="dummyAt" gridreq="dummyAt" comment="dummyAt" ref="dummyAt" refNote="dummyAt" refid="dummyAt" opt="dummyAt" opar="dummyAt"/> 
     46<item id="001.009.001" label="example-01" title="dummy title string" uid="9d676d2c-b8b6-11e6-be9a-ac72891c3257" mip="dummyAt" tab="dummyAt" objective="dummyAt" grid="dummyAt" gridreq="dummyAt" comment="dummyAt" ref="dummyAt" refNote="dummyAt" refid="dummyAt" opt="dummyAt" opar="dummyAt"/> 
    4747</requestLink> 
    4848<tableSection label="tableSection" uid="SECTION:tableSection" useClass="vocab" title="3.4 CMOR Table Sections" id="tbs"> 
    4949<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    50 <item id="001.007.001" label="example-01" title="dummy title string" uid="3dfefb1a-b25e-11e6-9598-5404a60d96b5" gpid="dummyAt" mip="dummyAt" ref="dummyAt" refNote="dummyAt"/> 
     50<item id="001.007.001" label="example-01" title="dummy title string" uid="9d6775a6-b8b6-11e6-be9a-ac72891c3257" gpid="dummyAt" mip="dummyAt" ref="dummyAt" refNote="dummyAt"/> 
    5151</tableSection> 
    5252<modelConfig label="modelConfig" uid="SECTION:modelConfig" useClass="vocab" title="3.5 Model configuration options" id="mcfg"> 
    5353<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    54 <item id="001.020.001" label="example01" title="dummy title string" uid="3dff0092-b25e-11e6-9598-5404a60d96b5" MIPs="dummyAt" usage="dummyAt" type="dummyAt" range="dummyAt"/> 
     54<item id="001.020.001" label="example01" title="dummy title string" uid="9d677bf0-b8b6-11e6-be9a-ac72891c3257" MIPs="dummyAt" usage="dummyAt" type="dummyAt" range="dummyAt"/> 
    5555</modelConfig> 
    5656<varChoiceLinkC label="varChoiceLinkC" uid="SECTION:varChoiceLinkC" useClass="vocab" title="3.6 Links a variable to a choice element" id="vclc"> 
    5757<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    58 <item id="001.017.001" label="example-01" title="dummy title string" uid="3dff05d8-b25e-11e6-9598-5404a60d96b5" vid="dummyAt" cfgid="dummyAt" cfg="false" cid="dummyAt"/> 
     58<item id="001.017.001" label="example-01" title="dummy title string" uid="9d678208-b8b6-11e6-be9a-ac72891c3257" vid="dummyAt" cfgid="dummyAt" cfg="false" cid="dummyAt"/> 
    5959</varChoiceLinkC> 
    6060<objectiveLink label="objectiveLink" uid="SECTION:objectiveLink" useClass="vocab" title="3.7 Link between scientific objectives and requests" id="objl"> 
    6161<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    62 <item id="001.015.001" label="example-01" title="dummy title string" uid="3dff0aec-b25e-11e6-9598-5404a60d96b5" oid="dummyAt" rid="dummyAt"/> 
     62<item id="001.015.001" label="example-01" title="dummy title string" uid="9d6787ee-b8b6-11e6-be9a-ac72891c3257" oid="dummyAt" rid="dummyAt"/> 
    6363</objectiveLink> 
    6464<remarks label="remarks" uid="SECTION:remarks" useClass="vocab" title="3.8 Remarks about other items" id="rmk"> 
    6565<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    66 <item id="001.011.001" label="example-01" title="dummy title string" uid="3dff100a-b25e-11e6-9598-5404a60d96b5" tid="dummyAt" tattr="dummyAt" description="dummyAt" class="dummyAt" qid="dummyAt" techNote="dummyAt" prov="dummyAt"/> 
     66<item id="001.011.001" label="example-01" title="dummy title string" uid="9d678e74-b8b6-11e6-be9a-ac72891c3257" tid="dummyAt" tattr="dummyAt" description="dummyAt" class="dummyAt" qid="dummyAt" techNote="dummyAt" prov="dummyAt"/> 
    6767</remarks> 
    6868<experiment label="experiment" uid="SECTION:experiment" useClass="vocab" title="1.5 Experiments" id="exp"> 
    6969<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    70 <item id="001.012.001" label="example-01" title="dummy title string" uid="3dff173a-b25e-11e6-9598-5404a60d96b5" description="dummyAt" egid="dummyAt" mip="dummyAt" mcfg="dummyAt" tier="25 30" nstart="25" starty="dummyAt" endy="dummyAt" yps="25" ensz="25 30" ntot="25" comment="dummyAt"/> 
     70<item id="001.012.001" label="example-01" title="dummy title string" uid="9d679658-b8b6-11e6-be9a-ac72891c3257" description="dummyAt" egid="dummyAt" mip="dummyAt" mcfg="dummyAt" tier="25 30" nstart="25" starty="dummyAt" endy="dummyAt" yps="25" ensz="25 30" ntot="25" comment="dummyAt"/> 
    7171</experiment> 
    7272<requestVar label="requestVar" uid="SECTION:requestVar" useClass="vocab" title="1.4 Request variable (carrying priority and link to group)" id="rqv"> 
    7373<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    74 <item id="001.006.001" label="example-01" title="dummy title string" uid="3dff1d98-b25e-11e6-9598-5404a60d96b5" priority="25" vid="dummyAt" vgid="dummyAt" mip="dummyAt"/> 
     74<item id="001.006.001" label="example-01" title="dummy title string" uid="9d679f0e-b8b6-11e6-be9a-ac72891c3257" priority="25" vid="dummyAt" vgid="dummyAt" mip="dummyAt"/> 
    7575</requestVar> 
    7676<standardname label="standardname" uid="SECTION:standardname" useClass="vocab" title="1.8 CF Standard Names" id="sn"> 
    7777<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    78 <item id="001.021.001" label="example01" title="dummy title string" uid="3dff2248-b25e-11e6-9598-5404a60d96b5" description="dummyAt" units="dummyAt"/> 
     78<item id="001.021.001" label="example01" title="dummy title string" uid="9d67a4b8-b8b6-11e6-be9a-ac72891c3257" description="dummyAt" units="dummyAt"/> 
    7979</standardname> 
    8080<varChoiceLinkR label="varChoiceLinkR" uid="SECTION:varChoiceLinkR" useClass="vocab" title="3.9 Links a variable to a choice element" id="vclr"> 
    8181<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    82 <item id="001.016.001" label="example-01" title="dummy title string" uid="3dff26ee-b25e-11e6-9598-5404a60d96b5" vid="dummyAt" cid="dummyAt" rank="25"/> 
     82<item id="001.016.001" label="example-01" title="dummy title string" uid="9d67aa3a-b8b6-11e6-be9a-ac72891c3257" vid="dummyAt" cid="dummyAt" rank="25"/> 
    8383</varChoiceLinkR> 
    8484<var label="var" uid="SECTION:var" useClass="vocab" title="1.2 MIP Variable" id="var"> 
    8585<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    86 <item id="001.001.001" label="example-01" title="dummy title string" sn="dummyAt" units="dummyAt" description="dummyAt" procnote="alpha beta" procComment="dummyAt" prov="dummyAt" uid="3dff2d2e-b25e-11e6-9598-5404a60d96b5" provmip="dummyAt" unid="dummyAt"/> 
     86<item id="001.001.001" label="example-01" title="dummy title string" sn="dummyAt" units="dummyAt" description="dummyAt" procnote="alpha beta" procComment="dummyAt" prov="dummyAt" uid="9d67b174-b8b6-11e6-be9a-ac72891c3257" provmip="dummyAt" unid="dummyAt"/> 
    8787</var> 
    8888<mip label="mip" uid="SECTION:mip" useClass="vocab" title="1.1 Model Intercomparison Project" id="mip"> 
    8989<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    90 <item id="001.019.001" label="example-01" title="dummy title string" uid="3dff3242-b25e-11e6-9598-5404a60d96b5" description="dummyAt" url="dummyAt"/> 
     90<item id="001.019.001" label="example-01" title="dummy title string" uid="9d67b78c-b8b6-11e6-be9a-ac72891c3257" description="dummyAt" url="dummyAt"/> 
    9191</mip> 
    9292<varChoice label="varChoice" uid="SECTION:varChoice" useClass="vocab" title="3.10 Indicates variables for which a there is a range of potential CMOR Variables" id="vc"> 
    9393<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    94 <item id="001.018.001" label="example-01" title="dummy title string" uid="3dff3792-b25e-11e6-9598-5404a60d96b5" class="dummyAt" description="dummyAt" varList="dummyAt" optionList="dummyAt"/> 
     94<item id="001.018.001" label="example-01" title="dummy title string" uid="9d67bd36-b8b6-11e6-be9a-ac72891c3257" class="dummyAt" description="dummyAt" varList="dummyAt" optionList="dummyAt"/> 
    9595</varChoice> 
    9696<temporalShape label="temporalShape" uid="SECTION:temporalShape" useClass="vocab" title="2.2 Temporal dimension" id="ts"> 
    9797<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    98 <item id="001.005.001" label="example-01" title="dummy title string" uid="3dff3da0-b25e-11e6-9598-5404a60d96b5" dimid="dummyAt" dimensions="dummyAt" description="dummyAt"/> 
     98<item id="001.005.001" label="example-01" title="dummy title string" uid="9d67c326-b8b6-11e6-be9a-ac72891c3257" dimid="dummyAt" dimensions="dummyAt" description="dummyAt"/> 
    9999</temporalShape> 
    100100<structure label="structure" uid="SECTION:structure" useClass="vocab" title="2.3 Dimensions and related information" id="str"> 
    101101<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    102 <item id="001.003.001" label="example-01" title="dummy title string" uid="3dff43b8-b25e-11e6-9598-5404a60d96b5" spid="dummyAt" tmid="dummyAt" odims="dummyAt" dids="alpha beta" coords="dummyAt" cids="alpha beta" cell_methods="dummyAt" cell_measures="dummyAt" flag_values="dummyAt" flag_meanings="dummyAt" description="dummyAt" procNote="dummyAt" prov="dummyAt" cmid="dummyAt"/> 
     102<item id="001.003.001" label="example-01" title="dummy title string" uid="9d67ca06-b8b6-11e6-be9a-ac72891c3257" spid="dummyAt" tmid="dummyAt" odims="dummyAt" dids="alpha beta" coords="dummyAt" cids="alpha beta" cell_methods="dummyAt" cell_measures="dummyAt" flag_values="dummyAt" flag_meanings="dummyAt" description="dummyAt" procNote="dummyAt" prov="dummyAt" cmid="dummyAt"/> 
    103103</structure> 
    104104<grids label="grids" uid="SECTION:grids" useClass="vocab" title="1.7 Specification of dimensions" id="grd"> 
    105105<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    106 <item id="001.022.001" label="example-01" title="dummy title string" tables="dummyAt" uid="3dff4c0a-b25e-11e6-9598-5404a60d96b5" altLabel="dummyAt" description="dummyAt" standardName="dummyAt" axis="dummyAt" units="dummyAt" isIndex="dummyAt" coords="dummyAt" bounds="dummyAt" direction="dummyAt" valid_min="5." valid_max="5." type="dummyAt" positive="dummyAt" value="dummyAt" boundsValues="dummyAt" requested="dummyAt" boundsRequested="5. 10." tolRequested="dummyAt" isGrid="dummyAt"/> 
     106<item id="001.022.001" label="example-01" title="dummy title string" tables="dummyAt" uid="9d67d398-b8b6-11e6-be9a-ac72891c3257" altLabel="dummyAt" description="dummyAt" standardName="dummyAt" axis="dummyAt" units="dummyAt" isIndex="dummyAt" coords="dummyAt" bounds="dummyAt" direction="dummyAt" valid_min="5." valid_max="5." type="dummyAt" positive="dummyAt" value="dummyAt" boundsValues="dummyAt" requested="dummyAt" boundsRequested="5. 10." tolRequested="dummyAt" isGrid="dummyAt"/> 
    107107</grids> 
    108108<timeSlice label="timeSlice" uid="SECTION:timeSlice" useClass="vocab" title="3.11 Time Slices for Output Requests" id="tsl"> 
    109109<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    110 <item id="001.025.001" label="example-01" title="dummy title string" type="dummyAt" start="25" end="25" step="5." sliceLen="25" nyears="5." uid="3dff5452-b25e-11e6-9598-5404a60d96b5" startList="25 30" sliceLenUnit="dummyAt" description="dummyAt" child="dummyAt"/> 
     110<item id="001.025.001" label="example-01" title="dummy title string" type="dummyAt" start="25" end="25" step="5." sliceLen="25" nyears="5." uid="9d67dd16-b8b6-11e6-be9a-ac72891c3257" startList="25 30" sliceLenUnit="dummyAt" description="dummyAt" child="dummyAt"/> 
    111111</timeSlice> 
    112112<cellMethods label="cellMethods" uid="SECTION:cellMethods" useClass="vocab" title="7.1 Cell Methods" id="cmth"> 
    113113<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    114 <item id="001.029.001" label="example-01" title="dummy title string" uid="3dff5fb0-b25e-11e6-9598-5404a60d96b5" cell_methods="dummyAt"/> 
     114<item id="001.029.001" label="example-01" title="dummy title string" uid="9d67e932-b8b6-11e6-be9a-ac72891c3257" cell_methods="dummyAt"/> 
    115115</cellMethods> 
    116116</main><annex> 
    117117<tags label="tags" uid="SECTION:tags" useClass="vocab" title="6.1 Tags" id="tag"> 
    118118<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    119 <item id="001.026.001" label="example-01" title="dummy title string" description="dummyAt" uid="3dff6488-b25e-11e6-9598-5404a60d96b5"/> 
     119<item id="001.026.001" label="example-01" title="dummy title string" description="dummyAt" uid="9d67ee6e-b8b6-11e6-be9a-ac72891c3257"/> 
    120120</tags> 
    121121<varRelations label="varRelations" uid="SECTION:varRelations" useClass="vocab" title="6.2 Relationships between CMOR variables" id="vrln"> 
    122122<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    123 <item id="001.027.001" label="example_03" title="dummy title string" description="dummyAt" uid="3dff6910-b25e-11e6-9598-5404a60d96b5" relation="dummyAt"/> 
     123<item id="001.027.001" label="example_03" title="dummy title string" description="dummyAt" uid="9d67f3a0-b8b6-11e6-be9a-ac72891c3257" relation="dummyAt"/> 
    124124</varRelations> 
    125125<varRelLnk label="varRelLnk" uid="SECTION:varRelLnk" useClass="vocab" title="6.3 CMOR Variable Relation Links" id="vrln"> 
    126126<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    127 <item id="001.028.001" label="example_03" title="dummy title string" uid="3dff6db6-b25e-11e6-9598-5404a60d96b5" rlid="dummyAt" rid="dummyAt"/> 
     127<item id="001.028.001" label="example_03" title="dummy title string" uid="9d67f8e6-b8b6-11e6-be9a-ac72891c3257" rlid="dummyAt" rid="dummyAt"/> 
    128128</varRelLnk> 
    129129</annex> 

  • CMIP6dreq/trunk/dreqPy/docs/dreq2Schema.xsd

    r863 r886  
    1919       </xs:documentation></xs:annotation> 
    2020<xs:complexType name="ct__requestVarGroup"> 
    21 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__requestVarGroup_vocabItem"/></xs:sequence> 
     21<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__requestVarGroup_vocabItem"/></xs:sequence> 
    2222<xs:attribute name="label" type="xs:string" fixed="requestVarGroup"/> 
    2323<xs:attribute name="title" type="xs:string" fixed="3.1 Request variable group: a collection of request variables"/> 
    … …  
    4747       </xs:documentation></xs:annotation> 
    4848<xs:complexType name="ct__requestItem"> 
    49 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__requestItem_vocabItem"/></xs:sequence> 
     49<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__requestItem_vocabItem"/></xs:sequence> 
    5050<xs:attribute name="label" type="xs:string" fixed="requestItem"/> 
    5151<xs:attribute name="title" type="xs:string" fixed="3.2 Request Item: specifying the number of years for an experiment"/> 
    … …  
    9595       </xs:documentation></xs:annotation> 
    9696<xs:complexType name="ct__exptgroup"> 
    97 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__exptgroup_vocabItem"/></xs:sequence> 
     97<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__exptgroup_vocabItem"/></xs:sequence> 
    9898<xs:attribute name="label" type="xs:string" fixed="exptgroup"/> 
    9999<xs:attribute name="title" type="xs:string" fixed="1.9 Experiment Group"/> 
    … …  
    121121       </xs:documentation></xs:annotation> 
    122122<xs:complexType name="ct__miptable"> 
    123 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__miptable_vocabItem"/></xs:sequence> 
     123<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__miptable_vocabItem"/></xs:sequence> 
    124124<xs:attribute name="label" type="xs:string" fixed="miptable"/> 
    125125<xs:attribute name="title" type="xs:string" fixed="2.4 MIP tables"/> 
    … …  
    149149       </xs:documentation></xs:annotation> 
    150150<xs:complexType name="ct__CMORvar"> 
    151 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__CMORvar_vocabItem"/></xs:sequence> 
     151<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__CMORvar_vocabItem"/></xs:sequence> 
    152152<xs:attribute name="label" type="xs:string" fixed="CMORvar"/> 
    153153<xs:attribute name="title" type="xs:string" fixed="1.3 CMOR Variable"/> 
    … …  
    218218       </xs:documentation></xs:annotation> 
    219219<xs:complexType name="ct__objective"> 
    220 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__objective_vocabItem"/></xs:sequence> 
     220<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__objective_vocabItem"/></xs:sequence> 
    221221<xs:attribute name="label" type="xs:string" fixed="objective"/> 
    222222<xs:attribute name="title" type="xs:string" fixed="1.6 Scientific objectives"/> 
    … …  
    244244       </xs:documentation></xs:annotation> 
    245245<xs:complexType name="ct__spatialShape"> 
    246 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__spatialShape_vocabItem"/></xs:sequence> 
     246<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__spatialShape_vocabItem"/></xs:sequence> 
    247247<xs:attribute name="label" type="xs:string" fixed="spatialShape"/> 
    248248<xs:attribute name="title" type="xs:string" fixed="2.1 Spatial dimensions"/> 
    … …  
    276276       </xs:documentation></xs:annotation> 
    277277<xs:complexType name="ct__requestLink"> 
    278 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__requestLink_vocabItem"/></xs:sequence> 
     278<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__requestLink_vocabItem"/></xs:sequence> 
    279279<xs:attribute name="label" type="xs:string" fixed="requestLink"/> 
    280280<xs:attribute name="title" type="xs:string" fixed="3.3 Request link: linking a set of variables and a set of experiments"/> 
    … …  
    320320       </xs:documentation></xs:annotation> 
    321321<xs:complexType name="ct__tableSection"> 
    322 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__tableSection_vocabItem"/></xs:sequence> 
     322<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__tableSection_vocabItem"/></xs:sequence> 
    323323<xs:attribute name="label" type="xs:string" fixed="tableSection"/> 
    324324<xs:attribute name="title" type="xs:string" fixed="3.4 CMOR Table Sections"/> 
    … …  
    350350       </xs:documentation></xs:annotation> 
    351351<xs:complexType name="ct__modelConfig"> 
    352 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__modelConfig_vocabItem"/></xs:sequence> 
     352<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__modelConfig_vocabItem"/></xs:sequence> 
    353353<xs:attribute name="label" type="xs:string" fixed="modelConfig"/> 
    354354<xs:attribute name="title" type="xs:string" fixed="3.5 Model configuration options"/> 
    … …  
    380380       </xs:documentation></xs:annotation> 
    381381<xs:complexType name="ct__varChoiceLinkC"> 
    382 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__varChoiceLinkC_vocabItem"/></xs:sequence> 
     382<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__varChoiceLinkC_vocabItem"/></xs:sequence> 
    383383<xs:attribute name="label" type="xs:string" fixed="varChoiceLinkC"/> 
    384384<xs:attribute name="title" type="xs:string" fixed="3.6 Links a variable to a choice element"/> 
    … …  
    410410       </xs:documentation></xs:annotation> 
    411411<xs:complexType name="ct__objectiveLink"> 
    412 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__objectiveLink_vocabItem"/></xs:sequence> 
     412<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__objectiveLink_vocabItem"/></xs:sequence> 
    413413<xs:attribute name="label" type="xs:string" fixed="objectiveLink"/> 
    414414<xs:attribute name="title" type="xs:string" fixed="3.7 Link between scientific objectives and requests"/> 
    … …  
    436436       </xs:documentation></xs:annotation> 
    437437<xs:complexType name="ct__remarks"> 
    438 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__remarks_vocabItem"/></xs:sequence> 
     438<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__remarks_vocabItem"/></xs:sequence> 
    439439<xs:attribute name="label" type="xs:string" fixed="remarks"/> 
    440440<xs:attribute name="title" type="xs:string" fixed="3.8 Remarks about other items"/> 
    … …  
    472472       </xs:documentation></xs:annotation> 
    473473<xs:complexType name="ct__experiment"> 
    474 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__experiment_vocabItem"/></xs:sequence> 
     474<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__experiment_vocabItem"/></xs:sequence> 
    475475<xs:attribute name="label" type="xs:string" fixed="experiment"/> 
    476476<xs:attribute name="title" type="xs:string" fixed="1.5 Experiments"/> 
    … …  
    518518       </xs:documentation></xs:annotation> 
    519519<xs:complexType name="ct__requestVar"> 
    520 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__requestVar_vocabItem"/></xs:sequence> 
     520<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__requestVar_vocabItem"/></xs:sequence> 
    521521<xs:attribute name="label" type="xs:string" fixed="requestVar"/> 
    522522<xs:attribute name="title" type="xs:string" fixed="1.4 Request variable (carrying priority and link to group)"/> 
    … …  
    548548       </xs:documentation></xs:annotation> 
    549549<xs:complexType name="ct__standardname"> 
    550 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__standardname_vocabItem"/></xs:sequence> 
     550<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__standardname_vocabItem"/></xs:sequence> 
    551551<xs:attribute name="label" type="xs:string" fixed="standardname"/> 
    552552<xs:attribute name="title" type="xs:string" fixed="1.8 CF Standard Names"/> 
    … …  
    574574       </xs:documentation></xs:annotation> 
    575575<xs:complexType name="ct__varChoiceLinkR"> 
    576 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__varChoiceLinkR_vocabItem"/></xs:sequence> 
     576<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__varChoiceLinkR_vocabItem"/></xs:sequence> 
    577577<xs:attribute name="label" type="xs:string" fixed="varChoiceLinkR"/> 
    578578<xs:attribute name="title" type="xs:string" fixed="3.9 Links a variable to a choice element"/> 
    … …  
    602602       </xs:documentation></xs:annotation> 
    603603<xs:complexType name="ct__var"> 
    604 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__var_vocabItem"/></xs:sequence> 
     604<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__var_vocabItem"/></xs:sequence> 
    605605<xs:attribute name="label" type="xs:string" fixed="var"/> 
    606606<xs:attribute name="title" type="xs:string" fixed="1.2 MIP Variable"/> 
    … …  
    640640       </xs:documentation></xs:annotation> 
    641641<xs:complexType name="ct__mip"> 
    642 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__mip_vocabItem"/></xs:sequence> 
     642<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__mip_vocabItem"/></xs:sequence> 
    643643<xs:attribute name="label" type="xs:string" fixed="mip"/> 
    644644<xs:attribute name="title" type="xs:string" fixed="1.1 Model Intercomparison Project"/> 
    … …  
    666666       </xs:documentation></xs:annotation> 
    667667<xs:complexType name="ct__varChoice"> 
    668 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__varChoice_vocabItem"/></xs:sequence> 
     668<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__varChoice_vocabItem"/></xs:sequence> 
    669669<xs:attribute name="label" type="xs:string" fixed="varChoice"/> 
    670670<xs:attribute name="title" type="xs:string" fixed="3.10 Indicates variables for which a there is a range of potential CMOR Variables"/> 
    … …  
    696696       </xs:documentation></xs:annotation> 
    697697<xs:complexType name="ct__temporalShape"> 
    698 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__temporalShape_vocabItem"/></xs:sequence> 
     698<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__temporalShape_vocabItem"/></xs:sequence> 
    699699<xs:attribute name="label" type="xs:string" fixed="temporalShape"/> 
    700700<xs:attribute name="title" type="xs:string" fixed="2.2 Temporal dimension"/> 
    … …  
    724724       </xs:documentation></xs:annotation> 
    725725<xs:complexType name="ct__structure"> 
    726 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__structure_vocabItem"/></xs:sequence> 
     726<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__structure_vocabItem"/></xs:sequence> 
    727727<xs:attribute name="label" type="xs:string" fixed="structure"/> 
    728728<xs:attribute name="title" type="xs:string" fixed="2.3 Dimensions and related information"/> 
    … …  
    774774       </xs:documentation></xs:annotation> 
    775775<xs:complexType name="ct__grids"> 
    776 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__grids_vocabItem"/></xs:sequence> 
     776<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__grids_vocabItem"/></xs:sequence> 
    777777<xs:attribute name="label" type="xs:string" fixed="grids"/> 
    778778<xs:attribute name="title" type="xs:string" fixed="1.7 Specification of dimensions"/> 
    … …  
    836836       </xs:documentation></xs:annotation> 
    837837<xs:complexType name="ct__timeSlice"> 
    838 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__timeSlice_vocabItem"/></xs:sequence> 
     838<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__timeSlice_vocabItem"/></xs:sequence> 
    839839<xs:attribute name="label" type="xs:string" fixed="timeSlice"/> 
    840840<xs:attribute name="title" type="xs:string" fixed="3.11 Time Slices for Output Requests"/> 
    … …  
    876876       </xs:documentation></xs:annotation> 
    877877<xs:complexType name="ct__cellMethods"> 
    878 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__cellMethods_vocabItem"/></xs:sequence> 
     878<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__cellMethods_vocabItem"/></xs:sequence> 
    879879<xs:attribute name="label" type="xs:string" fixed="cellMethods"/> 
    880880<xs:attribute name="title" type="xs:string" fixed="7.1 Cell Methods"/> 
    … …  
    900900       </xs:documentation></xs:annotation> 
    901901<xs:complexType name="ct__tags"> 
    902 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__tags_vocabItem"/></xs:sequence> 
     902<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__tags_vocabItem"/></xs:sequence> 
    903903<xs:attribute name="label" type="xs:string" fixed="tags"/> 
    904904<xs:attribute name="title" type="xs:string" fixed="6.1 Tags"/> 
    … …  
    924924       </xs:documentation></xs:annotation> 
    925925<xs:complexType name="ct__varRelations"> 
    926 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__varRelations_vocabItem"/></xs:sequence> 
     926<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__varRelations_vocabItem"/></xs:sequence> 
    927927<xs:attribute name="label" type="xs:string" fixed="varRelations"/> 
    928928<xs:attribute name="title" type="xs:string" fixed="6.2 Relationships between CMOR variables"/> 
    … …  
    950950       </xs:documentation></xs:annotation> 
    951951<xs:complexType name="ct__varRelLnk"> 
    952 <xs:sequence><xs:element name="item" maxOccurs="8000" type="aa:ct__varRelLnk_vocabItem"/></xs:sequence> 
     952<xs:sequence><xs:element name="item" maxOccurs="12000" type="aa:ct__varRelLnk_vocabItem"/></xs:sequence> 
    953953<xs:attribute name="label" type="xs:string" fixed="varRelLnk"/> 
    954954<xs:attribute name="title" type="xs:string" fixed="6.3 CMOR Variable Relation Links"/> 

  • CMIP6dreq/trunk/dreqPy/docs/dreqSupp.xml

    r880 r886  
    22<document xmlns="urn:w3id.org:cmip6.dreq.dreq:a" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pav="http://purl.org/pav/2.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="out/dreqSchema.xsd"> 
    33<prologue> 
    4 <dc:title>CMIP6 Data Request Supplement [01.beta.42.01]</dc:title> 
     4<dc:title>CMIP6 Data Request Supplement [01.beta.43]</dc:title> 
    55<dc:description>The CMIP6 Data Request will specify the variables requested for the CMIP6 archive, and the detail the experiments and time slices for which they are required.</dc:description> 
    66<dc:creator>Martin Juckes</dc:creator> 
    7 <dc:date>2016-11-24</dc:date> 
    8 <pav:version>01.beta.42.01</pav:version> 
     7<dc:date>2016-11-29</dc:date> 
     8<pav:version>01.beta.43</pav:version> 
    99</prologue> 
    1010<main> 
    1111<qcranges id="" label="qcranges" title="Quality Control Ranges" uid="SECTION:qcranges" useClass="vocab"> 
    1212<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    13 <item comment="" label="Amon-ci" ok_max_mean_abs_status="suggested" ok_min_mean_abs="0.9" ok_min_mean_abs_status="suggested" prov="CMIP5 data" title="Guide ranges for ci (table Amon)" uid="18223ef4-b22f-11e6-87f9-ac72891c3257" valid_max="1.001" valid_max_status="robust" valid_min="-0.001" valid_min_status="robust" vid="baaa3984-e5dd-11e5-8482-ac72891c3257"/> 
    14 <item comment="" label="Amon-sci" ok_max_mean_abs_status="robust" ok_min_mean_abs="0.9" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for sci (table Amon)" uid="18245d38-b22f-11e6-87f9-ac72891c3257" valid_max="1.001" valid_max_status="robust" valid_min="-0.001" valid_min_status="robust" vid="bab6d180-e5dd-11e5-8482-ac72891c3257"/> 
    15 <item comment="One CMIP5 model is an outlier in mean abs values, being a factor 1000 out: a clear scaling error. Many models exceed the CMIP5 max: relaxed significantly to allow for further increase in modelled convective activity" label="Amon-prc" ok_max_mean_abs_status="robust" ok_min_mean_abs="4e-05" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for prc (table Amon)" uid="1825a508-b22f-11e6-87f9-ac72891c3257" valid_max="0.0015" valid_max_status="robust" valid_min="-1e-06" valid_min_status="robust" vid="bab3f8a2-e5dd-11e5-8482-ac72891c3257"/> 
    16 <item comment="" label="Amon-tas" ok_max_mean_abs_status="robust" ok_min_mean_abs="295.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for tas (table Amon)" uid="18271cb2-b22f-11e6-87f9-ac72891c3257" valid_max="350.0" valid_max_status="robust" valid_min="170.0" valid_min_status="robust" vid="bab9237c-e5dd-11e5-8482-ac72891c3257"/> 
    17 <item comment="CMIP5 values too limited: expanded here." label="Amon-rsuscs" ok_max_mean_abs_status="robust" ok_min_mean_abs="90.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rsuscs (table Amon)" uid="18287c1a-b22f-11e6-87f9-ac72891c3257" valid_max="480.0" valid_max_status="robust" valid_min="-0.1" valid_min_status="robust" vid="bab670b4-e5dd-11e5-8482-ac72891c3257"/> 
    18 <item comment="CMIP5 values too restrictive .. resolution dependent extremes expected .. generous extension of range" label="Amon-uas" ok_max_mean_abs_status="robust" ok_min_mean_abs="10.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for uas (table Amon)" uid="1828cd64-b22f-11e6-87f9-ac72891c3257" valid_max="80.0" valid_max_status="robust" valid_min="-80.0" valid_min_status="robust" vid="babb67c2-e5dd-11e5-8482-ac72891c3257"/> 
    19 <item comment="CMIP5 table max/min values OK apart from one outlier; mean abs values too tight" label="Amon-huss" ok_max_mean_abs_status="robust" ok_min_mean_abs="0.012" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for huss (table Amon)" uid="18296562-b22f-11e6-87f9-ac72891c3257" valid_max="0.03" valid_max_status="robust" valid_min="0.0" valid_min_status="robust" vid="bab01dfe-e5dd-11e5-8482-ac72891c3257"/> 
    20 <item comment="" label="Amon-hfss" ok_max_mean_abs_status="suggested" ok_min_mean_abs="38.0" ok_min_mean_abs_status="suggested" prov="" title="Guide ranges for hfss (table Amon)" uid="18299fbe-b22f-11e6-87f9-ac72891c3257" valid_max="1200.0" valid_max_status="suggested" valid_min="-400.0" valid_min_status="suggested" vid="baaf86a0-e5dd-11e5-8482-ac72891c3257"/> 
    21 <item comment="" label="Amon-rlutcs" ok_max_mean_abs_status="robust" ok_min_mean_abs="270.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rlutcs (table Amon)" uid="1829e76c-b22f-11e6-87f9-ac72891c3257" valid_max="390.0" valid_max_status="robust" valid_min="65.0" valid_min_status="robust" vid="bab5bcdc-e5dd-11e5-8482-ac72891c3257"/> 
    22 <item comment="All models in CMIP5 range, but close to max: relaxed slightly" label="Amon-prw" ok_max_mean_abs_status="robust" ok_min_mean_abs="26.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for prw (table Amon)" uid="182a23f8-b22f-11e6-87f9-ac72891c3257" valid_max="90.0" valid_max_status="robust" valid_min="0.0" valid_min_status="robust" vid="bab45df6-e5dd-11e5-8482-ac72891c3257"/> 
    23 <item comment="CMIP5 models all consistent; several exceed CMOR table max;" label="Amon-prsn" ok_max_mean_abs_status="robust" ok_min_mean_abs="8e-06" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for prsn (table Amon)" uid="182a5350-b22f-11e6-87f9-ac72891c3257" valid_max="0.0008" valid_max_status="robust" valid_min="-1e-06" valid_min_status="robust" vid="bab42b88-e5dd-11e5-8482-ac72891c3257"/> 
    24 <item comment="" label="Amon-rldscs" ok_max_mean_abs_status="robust" ok_min_mean_abs="310.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rldscs (table Amon)" uid="182a892e-b22f-11e6-87f9-ac72891c3257" valid_max="550.0" valid_max_status="robust" valid_min="25.0" valid_min_status="robust" vid="bab5540e-e5dd-11e5-8482-ac72891c3257"/> 
    25 <item comment="Only 3 models .. positive definate in CMIP5, but may turn negative in CMIP6" label="Amon-fco2antt" ok_max_mean_abs_status="tentative" ok_min_mean_abs="1e-09" ok_min_mean_abs_status="tentative" prov="" title="Guide ranges for fco2antt (table Amon)" uid="182ab5b6-b22f-11e6-87f9-ac72891c3257" valid_max="2e-07" valid_max_status="tentative" valid_min="-1e-07" valid_min_status="suggested" vid="baaddada-e5dd-11e5-8482-ac72891c3257"/> 
    26 <item comment="CMIP5 table values OK, but expanded slightly here to allow for greater spatial and scenario variability" label="Amon-pr" ok_max_mean_abs_status="robust" ok_min_mean_abs="4e-05" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for pr (table Amon)" uid="182aee78-b22f-11e6-87f9-ac72891c3257" valid_max="0.0015" valid_max_status="robust" valid_min="-1e-06" valid_min_status="robust" vid="bab3cb52-e5dd-11e5-8482-ac72891c3257"/> 
    27 <item comment="CMIP5 values OK .. abs range tightened slightly" label="Amon-ps" ok_max_mean_abs_status="robust" ok_min_mean_abs="100000.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for ps (table Amon)" uid="182b1d80-b22f-11e6-87f9-ac72891c3257" valid_max="112000.0" valid_max_status="robust" valid_min="47500.0" valid_min_status="robust" vid="bab47b56-e5dd-11e5-8482-ac72891c3257"/> 
    28 <item comment="" label="Amon-rlus" ok_max_mean_abs_status="robust" ok_min_mean_abs="380.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rlus (table Amon)" uid="182b5494-b22f-11e6-87f9-ac72891c3257" valid_max="660.0" valid_max_status="robust" valid_min="43.0" valid_min_status="robust" vid="bab578d0-e5dd-11e5-8482-ac72891c3257"/> 
    29 <item comment="Relaxed mean abs slightly" label="Amon-rlds" ok_max_mean_abs_status="robust" ok_min_mean_abs="330.0" ok_min_mean_abs_status="robust" prov="CMIP5 data" title="Guide ranges for rlds (table Amon)" uid="182b8a68-b22f-11e6-87f9-ac72891c3257" valid_max="520.0" valid_max_status="robust" valid_min="30.0" valid_min_status="robust" vid="bab52da8-e5dd-11e5-8482-ac72891c3257"/> 
    30 <item comment="" label="Amon-fco2nat" ok_max_mean_abs_status="suggested" ok_min_mean_abs="1e-07" ok_min_mean_abs_status="suggested" prov="" title="Guide ranges for fco2nat (table Amon)" uid="182bb696-b22f-11e6-87f9-ac72891c3257" valid_max="2e-06" valid_max_status="suggested" valid_min="-2e-05" valid_min_status="suggested" vid="baaded68-e5dd-11e5-8482-ac72891c3257"/> 
    31 <item comment="" label="Amon-ts" ok_max_mean_abs_status="robust" ok_min_mean_abs="295.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for ts (table Amon)" uid="182bea94-b22f-11e6-87f9-ac72891c3257" valid_max="340.0" valid_max_status="robust" valid_min="170.0" valid_min_status="robust" vid="babaef0e-e5dd-11e5-8482-ac72891c3257"/> 
    32 <item comment="" label="Amon-clt" ok_max_mean_abs_status="robust" ok_min_mean_abs="85.0" ok_min_mean_abs_status="robust" prov="CMIP5 request/data" title="Guide ranges for clt (table Amon)" uid="182c185c-b22f-11e6-87f9-ac72891c3257" valid_max="100.001" valid_max_status="robust" valid_min="-0.001" valid_min_status="robust" vid="baaad7e0-e5dd-11e5-8482-ac72891c3257"/> 
    33 <item comment="CMIP5 values too restrictive .. resolution dependent extremes expected .. generous extension of range" label="Amon-vas" ok_max_mean_abs_status="robust" ok_min_mean_abs="10.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for vas (table Amon)" uid="182c50ba-b22f-11e6-87f9-ac72891c3257" valid_max="80.0" valid_max_status="robust" valid_min="-80.0" valid_min_status="robust" vid="babbcd34-e5dd-11e5-8482-ac72891c3257"/> 
    34 <item comment="CMIP5 values OK: one model has clear outliers not picked up by the limits: could be tightened?" label="Amon-psl" ok_max_mean_abs_status="robust" ok_min_mean_abs="106000.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for psl (table Amon)" uid="182c87ce-b22f-11e6-87f9-ac72891c3257" valid_max="109000.0" valid_max_status="robust" valid_min="91000.0" valid_min_status="robust" vid="bab48ce0-e5dd-11e5-8482-ac72891c3257"/> 
    35 <item comment="" label="Amon-rlut" ok_max_mean_abs_status="robust" ok_min_mean_abs="305.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rlut (table Amon)" uid="182cb5c8-b22f-11e6-87f9-ac72891c3257" valid_max="385.0" valid_max_status="robust" valid_min="65.0" valid_min_status="robust" vid="bab5aad0-e5dd-11e5-8482-ac72891c3257"/> 
    36 <item comment="" label="Amon-hurs" ok_max_mean_abs_status="suggested" ok_min_mean_abs="99.0" ok_min_mean_abs_status="suggested" prov="CMIP5 data" title="Guide ranges for hurs (table Amon)" uid="182cea2a-b22f-11e6-87f9-ac72891c3257" valid_max="100.001" valid_max_status="robust" valid_min="-0.001" valid_min_status="robust" vid="baaff41e-e5dd-11e5-8482-ac72891c3257"/> 
    37 <item comment="CMIP5 values too limited: expanded here." label="Amon-rsds" ok_max_mean_abs_status="robust" ok_min_mean_abs="200.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rsds (table Amon)" uid="182d1658-b22f-11e6-87f9-ac72891c3257" valid_max="550.0" valid_max_status="robust" valid_min="-0.1" valid_min_status="robust" vid="bab5e1b2-e5dd-11e5-8482-ac72891c3257"/> 
    38 <item comment="One model family in CMIP5 (NASA-GISS) has substantially larger values than all others. Broad limits set here to encompass all values." label="Amon-sbl" ok_max_mean_abs_status="robust" ok_min_mean_abs="0.0001" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for sbl (table Amon)" uid="182d4a24-b22f-11e6-87f9-ac72891c3257" valid_max="0.001" valid_max_status="robust" valid_min="-0.0005" valid_min_status="robust" vid="bab6b948-e5dd-11e5-8482-ac72891c3257"/> 
    39 <item comment="CMIP5 values too limited: expanded here." label="Amon-rtmt" ok_max_mean_abs_status="robust" ok_min_mean_abs="150.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rtmt (table Amon)" uid="182d7a30-b22f-11e6-87f9-ac72891c3257" valid_max="250.0" valid_max_status="robust" valid_min="-250.0" valid_min_status="robust" vid="bab6a91c-e5dd-11e5-8482-ac72891c3257"/> 
    40 <item comment="Convection can occur at any level in the atmosphere." label="Amon-cct" ok_max_mean_abs_status="suggested" ok_min_mean_abs="100000.0" ok_min_mean_abs_status="suggested" prov="CMIP6 discussion" title="Guide ranges for cct (table Amon)" uid="182dbb58-b22f-11e6-87f9-ac72891c3257" valid_max="115000.0" valid_max_status="robust" valid_min="0.0" valid_min_status="robust" vid="baa96a0e-e5dd-11e5-8482-ac72891c3257"/> 
    41 <item comment="Two models  (one institution) in CMIP5 were under this valid_min, but acknowledged this as an error." label="Amon-rsutcs" ok_max_mean_abs_status="robust" ok_min_mean_abs="120.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rsutcs (table Amon)" uid="182df320-b22f-11e6-87f9-ac72891c3257" valid_max="480.0" valid_max_status="robust" valid_min="-0.1" valid_min_status="robust" vid="bab69c06-e5dd-11e5-8482-ac72891c3257"/> 
    42 <item comment="Maximum in CMIP5 archive 28 ... but resolution dependent." label="Amon-sfcWind" ok_max_mean_abs_status="robust" ok_min_mean_abs="15.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for sfcWind (table Amon)" uid="182e217e-b22f-11e6-87f9-ac72891c3257" valid_max="80.0" valid_max_status="robust" valid_min="0.0" valid_min_status="robust" vid="bab6f494-e5dd-11e5-8482-ac72891c3257"/> 
    43 <item comment="CMIP5 values exceeded ... appear to have been too restrictive" label="Amon-tauv" ok_max_mean_abs_status="robust" ok_min_mean_abs="0.2" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for tauv (table Amon)" uid="182e55c2-b22f-11e6-87f9-ac72891c3257" valid_max="10.0" valid_max_status="robust" valid_min="-10.0" valid_min_status="robust" vid="bab9888a-e5dd-11e5-8482-ac72891c3257"/> 
    44 <item comment="" label="Amon-tasmin" ok_max_mean_abs_status="robust" ok_min_mean_abs="290.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for tasmin (table Amon)" uid="182e857e-b22f-11e6-87f9-ac72891c3257" valid_max="345.0" valid_max_status="robust" valid_min="165.0" valid_min_status="robust" vid="bab955ea-e5dd-11e5-8482-ac72891c3257"/> 
    45 <item comment="CMIP5 values exceeded ... appear to have been too restrictive" label="Amon-tauu" ok_max_mean_abs_status="robust" ok_min_mean_abs="0.2" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for tauu (table Amon)" uid="182ec520-b22f-11e6-87f9-ac72891c3257" valid_max="10.0" valid_max_status="robust" valid_min="-10.0" valid_min_status="robust" vid="bab96cc4-e5dd-11e5-8482-ac72891c3257"/> 
    46 <item comment="" label="Amon-tasmax" ok_max_mean_abs_status="robust" ok_min_mean_abs="300.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for tasmax (table Amon)" uid="182ef50e-b22f-11e6-87f9-ac72891c3257" valid_max="355.0" valid_max_status="robust" valid_min="175.0" valid_min_status="robust" vid="bab942a8-e5dd-11e5-8482-ac72891c3257"/> 
    47 <item comment="CMIP5 values too limited: expanded here." label="Amon-rsus" ok_max_mean_abs_status="robust" ok_min_mean_abs="90.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rsus (table Amon)" uid="182f2d1c-b22f-11e6-87f9-ac72891c3257" valid_max="480.0" valid_max_status="robust" valid_min="-0.1" valid_min_status="robust" vid="bab6537c-e5dd-11e5-8482-ac72891c3257"/> 
    48 <item comment="" label="Amon-hfls" ok_max_mean_abs_status="robust" ok_min_mean_abs="80.0" ok_min_mean_abs_status="robust" prov="CMIP5 data" title="Guide ranges for hfls (table Amon)" uid="182f648a-b22f-11e6-87f9-ac72891c3257" valid_max="850.0" valid_max_status="robust" valid_min="-90.0" valid_min_status="robust" vid="baaefe2e-e5dd-11e5-8482-ac72891c3257"/> 
    49 <item comment="Two models  (one institution) in CMIP5 were under this valid_min, but acknowledged this as an error." label="Amon-rsut" ok_max_mean_abs_status="robust" ok_min_mean_abs="160.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rsut (table Amon)" uid="182f9284-b22f-11e6-87f9-ac72891c3257" valid_max="480.0" valid_max_status="robust" valid_min="-0.1" valid_min_status="robust" vid="bab68ebe-e5dd-11e5-8482-ac72891c3257"/> 
    50 <item comment="Convection can occur at any level in the atmosphere." label="Amon-ccb" ok_max_mean_abs_status="suggested" ok_min_mean_abs="100000.0" ok_min_mean_abs_status="suggested" prov="CMIP6 discussion" title="Guide ranges for ccb (table Amon)" uid="182fc736-b22f-11e6-87f9-ac72891c3257" valid_max="115000.0" valid_max_status="robust" valid_min="0.0" valid_min_status="robust" vid="baa92652-e5dd-11e5-8482-ac72891c3257"/> 
    51 <item comment="" label="day-clt" ok_max_mean_abs_status="robust" ok_min_mean_abs="90.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for clt (table day)" uid="182ff490-b22f-11e6-87f9-ac72891c3257" url="http://w3id.org/cmip6dr/ranges/day_clt.html" valid_max="100.001" valid_max_status="robust" valid_min="-0.001" valid_min_status="robust" vid="baaace4e-e5dd-11e5-8482-ac72891c3257"/> 
    52 <item comment="" label="day-hfss" ok_max_mean_abs_status="robust" ok_min_mean_abs="60.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for hfss (table day)" uid="18302d3e-b22f-11e6-87f9-ac72891c3257" valid_max="2000.0" valid_max_status="robust" valid_min="-1000.0" valid_min_status="robust" vid="baaf91cc-e5dd-11e5-8482-ac72891c3257"/> 
    53 <item comment="" label="day-hfls" ok_max_mean_abs_status="robust" ok_min_mean_abs="110.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for hfls (table day)" uid="1830643e-b22f-11e6-87f9-ac72891c3257" valid_max="1800.0" valid_max_status="robust" valid_min="-400.0" valid_min_status="robust" vid="baaf0a9a-e5dd-11e5-8482-ac72891c3257"/> 
    54 <item comment="" label="Omon-agessc" ok_max_mean_abs_status="suggested" ok_min_mean_abs="5000.0" ok_min_mean_abs_status="suggested" prov="" title="Guide ranges for agessc (table Omon)" uid="18309120-b22f-11e6-87f9-ac72891c3257" valid_max="20000.0" valid_max_status="suggested" valid_min="-0.001" valid_min_status="robust" vid="baa56de6-e5dd-11e5-8482-ac72891c3257"/> 
     13<item comment="" label="Amon-ci" ok_max_mean_abs_status="suggested" ok_min_mean_abs="0.9" ok_min_mean_abs_status="suggested" prov="CMIP5 data" title="Guide ranges for ci (table Amon)" uid="06c6d9a8-b649-11e6-b1b8-ac72891c3257" valid_max="1.001" valid_max_status="robust" valid_min="-0.001" valid_min_status="robust" vid="baaa3984-e5dd-11e5-8482-ac72891c3257"/> 
     14<item comment="" label="Amon-sci" ok_max_mean_abs_status="robust" ok_min_mean_abs="0.9" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for sci (table Amon)" uid="06c8ed10-b649-11e6-b1b8-ac72891c3257" valid_max="1.001" valid_max_status="robust" valid_min="-0.001" valid_min_status="robust" vid="bab6d180-e5dd-11e5-8482-ac72891c3257"/> 
     15<item comment="One CMIP5 model is an outlier in mean abs values, being a factor 1000 out: a clear scaling error. Many models exceed the CMIP5 max: relaxed significantly to allow for further increase in modelled convective activity" label="Amon-prc" ok_max_mean_abs_status="robust" ok_min_mean_abs="4e-05" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for prc (table Amon)" uid="06ca5a06-b649-11e6-b1b8-ac72891c3257" valid_max="0.0015" valid_max_status="robust" valid_min="-1e-06" valid_min_status="robust" vid="bab3f8a2-e5dd-11e5-8482-ac72891c3257"/> 
     16<item comment="" label="Amon-tas" ok_max_mean_abs_status="robust" ok_min_mean_abs="295.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for tas (table Amon)" uid="06cb8e62-b649-11e6-b1b8-ac72891c3257" valid_max="350.0" valid_max_status="robust" valid_min="170.0" valid_min_status="robust" vid="bab9237c-e5dd-11e5-8482-ac72891c3257"/> 
     17<item comment="CMIP5 values too limited: expanded here." label="Amon-rsuscs" ok_max_mean_abs_status="robust" ok_min_mean_abs="90.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rsuscs (table Amon)" uid="06ccdc0e-b649-11e6-b1b8-ac72891c3257" valid_max="480.0" valid_max_status="robust" valid_min="-0.1" valid_min_status="robust" vid="bab670b4-e5dd-11e5-8482-ac72891c3257"/> 
     18<item comment="CMIP5 values too restrictive .. resolution dependent extremes expected .. generous extension of range" label="Amon-uas" ok_max_mean_abs_status="robust" ok_min_mean_abs="10.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for uas (table Amon)" uid="06cd20b0-b649-11e6-b1b8-ac72891c3257" valid_max="80.0" valid_max_status="robust" valid_min="-80.0" valid_min_status="robust" vid="babb67c2-e5dd-11e5-8482-ac72891c3257"/> 
     19<item comment="CMIP5 table max/min values OK apart from one outlier; mean abs values too tight" label="Amon-huss" ok_max_mean_abs_status="robust" ok_min_mean_abs="0.012" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for huss (table Amon)" uid="06cd6002-b649-11e6-b1b8-ac72891c3257" valid_max="0.03" valid_max_status="robust" valid_min="0.0" valid_min_status="robust" vid="bab01dfe-e5dd-11e5-8482-ac72891c3257"/> 
     20<item comment="" label="Amon-hfss" ok_max_mean_abs_status="suggested" ok_min_mean_abs="38.0" ok_min_mean_abs_status="suggested" prov="" title="Guide ranges for hfss (table Amon)" uid="06cd941e-b649-11e6-b1b8-ac72891c3257" valid_max="1200.0" valid_max_status="suggested" valid_min="-400.0" valid_min_status="suggested" vid="baaf86a0-e5dd-11e5-8482-ac72891c3257"/> 
     21<item comment="" label="Amon-rlutcs" ok_max_mean_abs_status="robust" ok_min_mean_abs="270.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rlutcs (table Amon)" uid="06cdbe44-b649-11e6-b1b8-ac72891c3257" valid_max="390.0" valid_max_status="robust" valid_min="65.0" valid_min_status="robust" vid="bab5bcdc-e5dd-11e5-8482-ac72891c3257"/> 
     22<item comment="All models in CMIP5 range, but close to max: relaxed slightly" label="Amon-prw" ok_max_mean_abs_status="robust" ok_min_mean_abs="26.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for prw (table Amon)" uid="06cde914-b649-11e6-b1b8-ac72891c3257" valid_max="90.0" valid_max_status="robust" valid_min="0.0" valid_min_status="robust" vid="bab45df6-e5dd-11e5-8482-ac72891c3257"/> 
     23<item comment="CMIP5 models all consistent; several exceed CMOR table max;" label="Amon-prsn" ok_max_mean_abs_status="robust" ok_min_mean_abs="8e-06" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for prsn (table Amon)" uid="06ce0ed0-b649-11e6-b1b8-ac72891c3257" valid_max="0.0008" valid_max_status="robust" valid_min="-1e-06" valid_min_status="robust" vid="bab42b88-e5dd-11e5-8482-ac72891c3257"/> 
     24<item comment="" label="Amon-rldscs" ok_max_mean_abs_status="robust" ok_min_mean_abs="310.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rldscs (table Amon)" uid="06ce3edc-b649-11e6-b1b8-ac72891c3257" valid_max="550.0" valid_max_status="robust" valid_min="25.0" valid_min_status="robust" vid="bab5540e-e5dd-11e5-8482-ac72891c3257"/> 
     25<item comment="Only 3 models .. positive definate in CMIP5, but may turn negative in CMIP6" label="Amon-fco2antt" ok_max_mean_abs_status="tentative" ok_min_mean_abs="1e-09" ok_min_mean_abs_status="tentative" prov="" title="Guide ranges for fco2antt (table Amon)" uid="06ce64de-b649-11e6-b1b8-ac72891c3257" valid_max="2e-07" valid_max_status="tentative" valid_min="-1e-07" valid_min_status="suggested" vid="baaddada-e5dd-11e5-8482-ac72891c3257"/> 
     26<item comment="CMIP5 table values OK, but expanded slightly here to allow for greater spatial and scenario variability" label="Amon-pr" ok_max_mean_abs_status="robust" ok_min_mean_abs="4e-05" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for pr (table Amon)" uid="06ce9454-b649-11e6-b1b8-ac72891c3257" valid_max="0.0015" valid_max_status="robust" valid_min="-1e-06" valid_min_status="robust" vid="bab3cb52-e5dd-11e5-8482-ac72891c3257"/> 
     27<item comment="CMIP5 values OK .. abs range tightened slightly" label="Amon-ps" ok_max_mean_abs_status="robust" ok_min_mean_abs="100000.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for ps (table Amon)" uid="06cebaa6-b649-11e6-b1b8-ac72891c3257" valid_max="112000.0" valid_max_status="robust" valid_min="47500.0" valid_min_status="robust" vid="bab47b56-e5dd-11e5-8482-ac72891c3257"/> 
     28<item comment="" label="Amon-rlus" ok_max_mean_abs_status="robust" ok_min_mean_abs="380.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rlus (table Amon)" uid="06cee6ac-b649-11e6-b1b8-ac72891c3257" valid_max="660.0" valid_max_status="robust" valid_min="43.0" valid_min_status="robust" vid="bab578d0-e5dd-11e5-8482-ac72891c3257"/> 
     29<item comment="Relaxed mean abs slightly" label="Amon-rlds" ok_max_mean_abs_status="robust" ok_min_mean_abs="330.0" ok_min_mean_abs_status="robust" prov="CMIP5 data" title="Guide ranges for rlds (table Amon)" uid="06cf0fce-b649-11e6-b1b8-ac72891c3257" valid_max="520.0" valid_max_status="robust" valid_min="30.0" valid_min_status="robust" vid="bab52da8-e5dd-11e5-8482-ac72891c3257"/> 
     30<item comment="" label="Amon-fco2nat" ok_max_mean_abs_status="suggested" ok_min_mean_abs="1e-07" ok_min_mean_abs_status="suggested" prov="" title="Guide ranges for fco2nat (table Amon)" uid="06cf3576-b649-11e6-b1b8-ac72891c3257" valid_max="2e-06" valid_max_status="suggested" valid_min="-2e-05" valid_min_status="suggested" vid="baaded68-e5dd-11e5-8482-ac72891c3257"/> 
     31<item comment="" label="Amon-ts" ok_max_mean_abs_status="robust" ok_min_mean_abs="295.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for ts (table Amon)" uid="06cf6244-b649-11e6-b1b8-ac72891c3257" valid_max="340.0" valid_max_status="robust" valid_min="170.0" valid_min_status="robust" vid="babaef0e-e5dd-11e5-8482-ac72891c3257"/> 
     32<item comment="" label="Amon-clt" ok_max_mean_abs_status="robust" ok_min_mean_abs="85.0" ok_min_mean_abs_status="robust" prov="CMIP5 request/data" title="Guide ranges for clt (table Amon)" uid="06cf86fc-b649-11e6-b1b8-ac72891c3257" valid_max="100.001" valid_max_status="robust" valid_min="-0.001" valid_min_status="robust" vid="baaad7e0-e5dd-11e5-8482-ac72891c3257"/> 
     33<item comment="CMIP5 values too restrictive .. resolution dependent extremes expected .. generous extension of range" label="Amon-vas" ok_max_mean_abs_status="robust" ok_min_mean_abs="10.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for vas (table Amon)" uid="06cfc05e-b649-11e6-b1b8-ac72891c3257" valid_max="80.0" valid_max_status="robust" valid_min="-80.0" valid_min_status="robust" vid="babbcd34-e5dd-11e5-8482-ac72891c3257"/> 
     34<item comment="CMIP5 values OK: one model has clear outliers not picked up by the limits: could be tightened?" label="Amon-psl" ok_max_mean_abs_status="robust" ok_min_mean_abs="106000.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for psl (table Amon)" uid="06cfead4-b649-11e6-b1b8-ac72891c3257" valid_max="109000.0" valid_max_status="robust" valid_min="91000.0" valid_min_status="robust" vid="bab48ce0-e5dd-11e5-8482-ac72891c3257"/> 
     35<item comment="" label="Amon-rlut" ok_max_mean_abs_status="robust" ok_min_mean_abs="305.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rlut (table Amon)" uid="06d00e88-b649-11e6-b1b8-ac72891c3257" valid_max="385.0" valid_max_status="robust" valid_min="65.0" valid_min_status="robust" vid="bab5aad0-e5dd-11e5-8482-ac72891c3257"/> 
     36<item comment="" label="Amon-hurs" ok_max_mean_abs_status="suggested" ok_min_mean_abs="99.0" ok_min_mean_abs_status="suggested" prov="CMIP5 data" title="Guide ranges for hurs (table Amon)" uid="06d03912-b649-11e6-b1b8-ac72891c3257" valid_max="100.001" valid_max_status="robust" valid_min="-0.001" valid_min_status="robust" vid="baaff41e-e5dd-11e5-8482-ac72891c3257"/> 
     37<item comment="CMIP5 values too limited: expanded here." label="Amon-rsds" ok_max_mean_abs_status="robust" ok_min_mean_abs="200.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rsds (table Amon)" uid="06d05fb4-b649-11e6-b1b8-ac72891c3257" valid_max="550.0" valid_max_status="robust" valid_min="-0.1" valid_min_status="robust" vid="bab5e1b2-e5dd-11e5-8482-ac72891c3257"/> 
     38<item comment="One model family in CMIP5 (NASA-GISS) has substantially larger values than all others. Broad limits set here to encompass all values." label="Amon-sbl" ok_max_mean_abs_status="robust" ok_min_mean_abs="0.0001" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for sbl (table Amon)" uid="06d08d5e-b649-11e6-b1b8-ac72891c3257" valid_max="0.001" valid_max_status="robust" valid_min="-0.0005" valid_min_status="robust" vid="bab6b948-e5dd-11e5-8482-ac72891c3257"/> 
     39<item comment="CMIP5 values too limited: expanded here." label="Amon-rtmt" ok_max_mean_abs_status="robust" ok_min_mean_abs="150.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rtmt (table Amon)" uid="06d0b392-b649-11e6-b1b8-ac72891c3257" valid_max="250.0" valid_max_status="robust" valid_min="-250.0" valid_min_status="robust" vid="bab6a91c-e5dd-11e5-8482-ac72891c3257"/> 
     40<item comment="Convection can occur at any level in the atmosphere." label="Amon-cct" ok_max_mean_abs_status="suggested" ok_min_mean_abs="100000.0" ok_min_mean_abs_status="suggested" prov="CMIP6 discussion" title="Guide ranges for cct (table Amon)" uid="06d0dca0-b649-11e6-b1b8-ac72891c3257" valid_max="115000.0" valid_max_status="robust" valid_min="0.0" valid_min_status="robust" vid="baa96a0e-e5dd-11e5-8482-ac72891c3257"/> 
     41<item comment="Two models  (one institution) in CMIP5 were under this valid_min, but acknowledged this as an error." label="Amon-rsutcs" ok_max_mean_abs_status="robust" ok_min_mean_abs="120.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rsutcs (table Amon)" uid="06d10676-b649-11e6-b1b8-ac72891c3257" valid_max="480.0" valid_max_status="robust" valid_min="-0.1" valid_min_status="robust" vid="bab69c06-e5dd-11e5-8482-ac72891c3257"/> 
     42<item comment="Maximum in CMIP5 archive 28 ... but resolution dependent." label="Amon-sfcWind" ok_max_mean_abs_status="robust" ok_min_mean_abs="15.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for sfcWind (table Amon)" uid="06d1293a-b649-11e6-b1b8-ac72891c3257" valid_max="80.0" valid_max_status="robust" valid_min="0.0" valid_min_status="robust" vid="bab6f494-e5dd-11e5-8482-ac72891c3257"/> 
     43<item comment="CMIP5 values exceeded ... appear to have been too restrictive" label="Amon-tauv" ok_max_mean_abs_status="robust" ok_min_mean_abs="0.2" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for tauv (table Amon)" uid="06d15996-b649-11e6-b1b8-ac72891c3257" valid_max="10.0" valid_max_status="robust" valid_min="-10.0" valid_min_status="robust" vid="bab9888a-e5dd-11e5-8482-ac72891c3257"/> 
     44<item comment="" label="Amon-tasmin" ok_max_mean_abs_status="robust" ok_min_mean_abs="290.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for tasmin (table Amon)" uid="06d1872c-b649-11e6-b1b8-ac72891c3257" valid_max="345.0" valid_max_status="robust" valid_min="165.0" valid_min_status="robust" vid="bab955ea-e5dd-11e5-8482-ac72891c3257"/> 
     45<item comment="CMIP5 values exceeded ... appear to have been too restrictive" label="Amon-tauu" ok_max_mean_abs_status="robust" ok_min_mean_abs="0.2" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for tauu (table Amon)" uid="06d1b65c-b649-11e6-b1b8-ac72891c3257" valid_max="10.0" valid_max_status="robust" valid_min="-10.0" valid_min_status="robust" vid="bab96cc4-e5dd-11e5-8482-ac72891c3257"/> 
     46<item comment="" label="Amon-tasmax" ok_max_mean_abs_status="robust" ok_min_mean_abs="300.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for tasmax (table Amon)" uid="06d1e3ac-b649-11e6-b1b8-ac72891c3257" valid_max="355.0" valid_max_status="robust" valid_min="175.0" valid_min_status="robust" vid="bab942a8-e5dd-11e5-8482-ac72891c3257"/> 
     47<item comment="CMIP5 values too limited: expanded here." label="Amon-rsus" ok_max_mean_abs_status="robust" ok_min_mean_abs="90.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rsus (table Amon)" uid="06d20670-b649-11e6-b1b8-ac72891c3257" valid_max="480.0" valid_max_status="robust" valid_min="-0.1" valid_min_status="robust" vid="bab6537c-e5dd-11e5-8482-ac72891c3257"/> 
     48<item comment="" label="Amon-hfls" ok_max_mean_abs_status="robust" ok_min_mean_abs="80.0" ok_min_mean_abs_status="robust" prov="CMIP5 data" title="Guide ranges for hfls (table Amon)" uid="06d22f24-b649-11e6-b1b8-ac72891c3257" valid_max="850.0" valid_max_status="robust" valid_min="-90.0" valid_min_status="robust" vid="baaefe2e-e5dd-11e5-8482-ac72891c3257"/> 
     49<item comment="Two models  (one institution) in CMIP5 were under this valid_min, but acknowledged this as an error." label="Amon-rsut" ok_max_mean_abs_status="robust" ok_min_mean_abs="160.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for rsut (table Amon)" uid="06d2542c-b649-11e6-b1b8-ac72891c3257" valid_max="480.0" valid_max_status="robust" valid_min="-0.1" valid_min_status="robust" vid="bab68ebe-e5dd-11e5-8482-ac72891c3257"/> 
     50<item comment="Convection can occur at any level in the atmosphere." label="Amon-ccb" ok_max_mean_abs_status="suggested" ok_min_mean_abs="100000.0" ok_min_mean_abs_status="suggested" prov="CMIP6 discussion" title="Guide ranges for ccb (table Amon)" uid="06d281cc-b649-11e6-b1b8-ac72891c3257" valid_max="115000.0" valid_max_status="robust" valid_min="0.0" valid_min_status="robust" vid="baa92652-e5dd-11e5-8482-ac72891c3257"/> 
     51<item comment="" label="day-clt" ok_max_mean_abs_status="robust" ok_min_mean_abs="90.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for clt (table day)" uid="06d2a6a2-b649-11e6-b1b8-ac72891c3257" url="http://w3id.org/cmip6dr/ranges/day_clt.html" valid_max="100.001" valid_max_status="robust" valid_min="-0.001" valid_min_status="robust" vid="baaace4e-e5dd-11e5-8482-ac72891c3257"/> 
     52<item comment="" label="day-hfss" ok_max_mean_abs_status="robust" ok_min_mean_abs="60.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for hfss (table day)" uid="06d2d406-b649-11e6-b1b8-ac72891c3257" valid_max="2000.0" valid_max_status="robust" valid_min="-1000.0" valid_min_status="robust" vid="baaf91cc-e5dd-11e5-8482-ac72891c3257"/> 
     53<item comment="" label="day-hfls" ok_max_mean_abs_status="robust" ok_min_mean_abs="110.0" ok_min_mean_abs_status="robust" prov="" title="Guide ranges for hfls (table day)" uid="06d30aac-b649-11e6-b1b8-ac72891c3257" valid_max="1800.0" valid_max_status="robust" valid_min="-400.0" valid_min_status="robust" vid="baaf0a9a-e5dd-11e5-8482-ac72891c3257"/> 
     54<item comment="" label="Omon-agessc" ok_max_mean_abs_status="suggested" ok_min_mean_abs="5000.0" ok_min_mean_abs_status="suggested" prov="" title="Guide ranges for agessc (table Omon)" uid="06d32dd4-b649-11e6-b1b8-ac72891c3257" valid_max="20000.0" valid_max_status="suggested" valid_min="-0.001" valid_min_status="robust" vid="baa56de6-e5dd-11e5-8482-ac72891c3257"/> 
    5555</qcranges> 
    5656<places id="" label="places" title="Places, States or Reservoirs" uid="SECTION:places" useClass="vocab"> 
    … …  
    133133<item label="degckgpm2" text="degC kg m-2" title="Degree Celcius kg per unit area" uid="fd70e27a-3468-11e6-ba71-5404a60d96b5"/> 
    134134<item label="" text="mmol m-2 s-1" title="" uid="fd721cd0-3468-11e6-ba71-5404a60d96b5"/> 
    135 <item label="dobson" text="DU" title="Dobson units" uid="fd703ece-3468-11e6-ba71-5404a60d96b5"/> 
    136135<item group="unitless" label="ppt" text="1e-12" title="Parts Per Trillion" uid="fd7018fe-3468-11e6-ba71-5404a60d96b5"/> 
    137136<item group="unitless" label="percentage" text="%" title="Percentage" uid="fd6ee984-3468-11e6-ba71-5404a60d96b5"/> 

  • CMIP6dreq/trunk/dreqPy/makeTables.py

    r880 r886  
    288288    return cmp(0,1) 
    289289 
    290  
    291290if not oldpython: 
    292291  kAnnex = cmp_to_key( cmpAnnex ) 
     292  kCmpdn = cmp_to_key( cmpdn(['sn','label']).cmp ) 
     293  kCmpdnPrl = cmp_to_key( cmpdn(['prov','rowIndex','label']).cmp ) 
    293294 
    294295import re 
    … …  
    344345      vl =  list( set( [v.vid for v in cmv] )  ) 
    345346      vli = [dq.inx.uid[i] for i in vl] 
    346       thisvli =  sorted( vli, cmp=cmpdn(['sn','label']).cmp ) 
     347      if oldpython: 
     348        thisvli =  sorted( vli, cmp=cmpdn(['sn','label']).cmp ) 
     349      else: 
     350        thisvli = sorted( vli, key=kCmpdn ) 
    347351      wb.var() 
    348352       
    … …  
    361365 
    362366        j = 0 
    363         thiscmv =  sorted( [dq.inx.uid[u] for u in ixt[t]], cmp=cmpdn(['prov','rowIndex','label']).cmp ) 
     367        if oldpython: 
     368          thiscmv =  sorted( [dq.inx.uid[u] for u in ixt[t]], cmp=cmpdn(['prov','rowIndex','label']).cmp ) 
     369        else: 
     370          thiscmv = sorted( [dq.inx.uid[u] for u in ixt[t]], key=kCmpdnPrl ) 
    364371 
    365372        for v in thiscmv: 

  • CMIP6dreq/trunk/dreqPy/misc_utils.py

    r880 r886  
    1010          mlab = m 
    1111      else: 
    12         ll = sorted( list(m) ) 
     12        ll = sorted( [x.lower() for x in list(m)] ) 
    1313        if len(ll) == 1: 
    1414          mlab = list(m)[0] 
    1515        else: 
    16           mlab='.'.join( [ x[:2].lower() for x in m ] ) 
     16          mlab='.'.join( [ x[:2].lower() for x in ll ] ) 
    1717      return mlab 
    1818 

  • CMIP6dreq/trunk/dreqPy/packageConfig.py

    r880 r886  
    1515 
    1616__versionComment__ = "Updates to AerChemMIP experiment names; removed some variable duplication; cleaned uid strings" 
    17 __version__ = "01.beta.43" 
     17__version__ = "01.beta.44" 
    1818__title__ = "dreqPy" 
    1919__description__ = "CMIP6 Data Request Python API" 

  • CMIP6dreq/trunk/dreqPy/scope.py

    r880 r886  
    1212 
    1313if imm == 1: 
    14   from utilities import cmvFilter  
     14  from utilities import cmvFilter, gridOptionSort 
    1515  import makeTables 
    1616  import fgrid 
    … …  
    1919  import dreqPy.volsum as volsum 
    2020  import dreqPy.fgrid as fgrid 
    21   from dreqPy.utilities import cmvFilter  
     21  from dreqPy.utilities import cmvFilter, gridOptionSort  
    2222  import dreqPy.makeTables as makeTables 
    2323 
    2424import collections, string, operator 
    2525import sys, os 
     26 
     27if sys.version_info >= (2,7): 
     28  oldpython = False 
     29else: 
     30  oldpython = True 
     31 
     32gridSorter = gridOptionSort( oldpython ) 
    2633 
    2734def sortTimeSlice( tsl ): 
    … …  
    163170    self.tierMax = tierMax 
    164171    self.gridPolicyDefaultNative = False 
     172    self.gridOceanStructured = True 
     173    self.gridPolicyForce = None 
    165174    self.gridPolicyTopOnly = True 
    166175    self.exptFilter = None 
    … …  
    475484      else: 
    476485 
    477         if rl.grid == '100km': 
     486        if self.gridPolicyForce != None: 
     487          grd = self.gridPolicyForce 
     488        elif rl.grid in ['1deg','2deg','100km']: 
     489          if rl.grid == '100km': 
    478490            grd = '1deg' 
    479         if rl.grid in ['1deg','2deg']: 
     491          else: 
    480492            grd = rl.grid 
    481493        else: 
    482494          ## note that naming of "gridreq" is unfortunate ... "No" means that native grid is required 
    483           if rl.gridreq in ['No', 'no'] or self.gridPolicyDefaultNative: 
     495          if rl.gridreq in ['No', 'no']: 
     496             #or self.gridPolicyDefaultNative: 
    484497            grd = 'native' 
     498          elif rl.gridreq in ['no*1']: 
     499             #or self.gridPolicyDefaultNative: 
     500            grd = 'native:01' 
    485501          else: 
    486502            ## print ( 'INFO.grd.00001: defaulting to grid ..%s, %s, %s' % (rl.label,rl.title, rl.uid) ) 
    … …  
    10231039             g,val = list( l2x[(v,e)].items() )[0] 
    10241040          else: 
    1025             if 'native' in l2x[(v,e)].keys(): 
    1026                g = 'native' 
    1027                val = l2x[(v,e)][g] 
    1028             else: 
    1029                g = sorted( list( l2x[(v,e)].keys() ) )[0] 
    1030                val = l2x[(v,e)][g] 
     1041            kk = gridSorter.sort( l2x[(v,e)].keys() ) 
     1042            gflg = {'si':'','li':''}.get( self.cmvGridId[v], self.cmvGridId[v] ) 
     1043            g = kk[0] 
     1044            ##if g in ['DEF','']: 
     1045              ##if self.gridPolicyDefaultNative:        
     1046                 ##g = 'native' 
     1047            ##elif g == 'native:01': 
     1048              ##if gflg == 'o' and not self.gridOceanStructured: 
     1049                ##g = '1deg' 
     1050              ##else: 
     1051                ##g = 'native' 
     1052            if g not in l2x[(v,e)]: 
     1053              print '%s not found in %s (%s):' % (g,str(l2x[(v,e)].keys()),str(kk)) 
     1054            val = l2x[(v,e)][g] 
     1055                 
     1056            ##if 'native' in l2x[(v,e)].keys(): 
     1057               ##g = 'native' 
     1058               ##val = l2x[(v,e)][g] 
     1059            ##else: 
     1060               ##g = sorted( list( l2x[(v,e)].keys() ) )[0] 
     1061               ##val = l2x[(v,e)][g] 
    10311062          l2[v][(e,g)] = val 
    10321063      else: 
    … …  
    11411172            se[g].add(e) 
    11421173          for g in cc0: 
    1143             g1 = 'native' 
     1174            g1 = g 
    11441175            if self.isLatLon[st.spid] != False: 
    11451176              g1 = g 
    11461177              if g1 == 'DEF' and self.isLatLon[st.spid] == 'o': 
    11471178                  g1 = '1deg' 
     1179              elif g == 'native:01': 
     1180                gflg = {'si':'','li':''}.get( self.cmvGridId[i], self.cmvGridId[i] ) 
     1181                if gflg == 'o' and not self.gridOceanStructured: 
     1182                  g1 = '1deg' 
     1183                else: 
     1184                  g1 = 'native' 
    11481185              else: 
    1149                   g1 = 'native' 
    1150             g1 = g 
     1186                g1 = 'native' 
     1187            elif g == 'native:01': 
     1188                g1 = 'native' 
    11511189 
    11521190            cc[ (st.spid,st.odims,ii.frequency,g1) ].append( (i,cc0[g],cc1[g],se[g]) ) 
    … …  
    12231261            else: 
    12241262              ny = ny/float(nn) 
    1225             assert tt[2] in ['native','1deg','2deg'], 'BAD grid identifier: %s' % str(tt) 
     1263            assert tt[2] in ['native','1deg','2deg','native:01'], 'BAD grid identifier: %s' % str(tt) 
    12261264            c3[tt][f] = (nn,ny,ne, labs,expts) 
    12271265    return (sf,c3) 
    12281266 
    1229   def getStrSz( self, g, stid=None, s=None, o=None, tt=False ): 
     1267  def getStrSz( self, g, stid=None, s=None, o=None, tt=False, cmv=None ): 
    12301268    assert stid == None or (s==None and o==None), 'Specify either stid or s and o' 
    12311269    assert stid != None or (s!=None and o!=None), 'Specify either stid or s and o' 
    … …  
    12491287          else: 
    12501288             g1 = 'native' 
     1289    elif g1 == 'native:01': 
     1290      assert cmv != None, 'Need a valid cmor variable id  .... ' 
     1291      gflg = {'si':'','li':''}.get( self.cmvGridId[cmv], self.cmvGridId[cmv] ) 
     1292      if gflg == 'o' and not self.gridOceanStructured: 
     1293                  g1 = '1deg' 
     1294      else: 
     1295                  g1 = 'native' 
    12511296    if (s,o,g) not in self.strSz: 
    12521297 
    … …  
    12601305        if type( sf ) == type( () ): 
    12611306           sf = sf[0] 
    1262  
    12631307 
    12641308        try: 
    … …  
    13971441      -p <priority>  maximum priority; 
    13981442      --xls : Create Excel file with requested variables; 
    1399       --sf : Print summary of variable count by structure and frequency; 
     1443      --sf : Print summary of variable count by structure and frequency [default]; 
     1444      --legacy : Use legacy approach to volume estimation (depricated); 
    14001445      --xfr : Output variable lists in sheets organised by frequency and realm instead of by MIP table; 
    14011446      --SF : Print summary of variable count by structure and frequency for all MIPs; 
    14021447      --grdpol <native|1deg> :  policy for default grid, if MIPs have not expressed a preference; 
     1448      --grdforce <native|1deg> :  force a specific grid option, independent of individual preferences; 
     1449      --ogrdunstr : provide volume estimates for unstructured ocean grid (interpolation requirements of OMIP data are different in this case); 
    14031450      --allgrd :  When a variable is requested on multiple grids, archive all grids requested (default: only the finest resolution); 
    14041451      --unique :  List only variables which are requested uniquely by this MIP, for at least one experiment; 
    … …  
    14301477                      '--txt':('txt',False), \ 
    14311478                      '--sf':('sf',False), \ 
     1479                      '--legacy':('legacy',False), \ 
    14321480                      '--xfr':('xfr',False), \ 
    14331481                      '--SF':('SF',False), \ 
    14341482                      '--grdpol':('grdpol',True), \ 
     1483                      '--ogrdunstr':('ogrdunstr',False), \ 
     1484                      '--grdforce':('grdforce',True), \ 
     1485                      '--omitCmip':('omitcmip',False), \ 
    14351486                      '--allgrd':('allgrd',False), \ 
    14361487                      '--unique':('unique',False), \ 
    … …  
    14701521      else: 
    14711522        self.adict['m'] = set(self.adict['m'].split(',') ) 
     1523        if 'omitcmip' not in self.adict and 'CMIP' not in self.adict['m']: 
     1524          self.adict['m'].add( 'CMIP' ) 
    14721525 
    14731526    if 'grdpol' in self.adict: 
    14741527      assert self.adict['grdpol'] in ['native','1deg'], 'Grid policy argument --grdpol must be native or 1deg : %s' % self.adict['grdpol'] 
     1528 
     1529    if 'grdforce' in self.adict: 
     1530      assert self.adict['grdforce'] in ['native','1deg'], 'Grid policy argument --grdforce must be native or 1deg : %s' % self.adict['grdforce'] 
    14751531 
    14761532    integerArgs = set( ['p','t','plm'] ) 
    … …  
    15581614    self.sc = dreqQuery( dq=self.dq ) 
    15591615 
     1616    if 'grdforce' in self.adict: 
     1617      self.sc.gridPolicyForce = self.adict['grdforce'] 
    15601618    if 'grdpol' in self.adict: 
    15611619      self.sc.gridPolicyDefaultNative = self.adict['grdpol'] == 'native' 
    … …  
    15661624    if 'unique' in self.adict: 
    15671625      self.sc.uniqueRequest = True 
     1626    self.sc.gridOceanStructured = not self.adict.get( 'ogrdunstr', False ) 
    15681627 
    15691628    if 'mcfg' in self.adict: 
    … …  
    15761635    makeXls = self.adict.get( 'xls', False ) 
    15771636    makeTxt = self.adict.get( 'txt', False ) 
    1578     doSf = 'SF' in self.adict or 'sf' in self.adict 
     1637    ##doSf = 'SF' in self.adict or 'sf' in self.adict 
     1638    doSf = 'legacy' not in self.adict 
     1639    assert not ('legacy' in self.adict and 'sf' in self.adict), "Conflicting command line argument, 'legacy' and 'sf': use only one of these" 
    15791640    if makeXls or makeTxt or doSf: 
    15801641      xlsOdir = self.adict.get( 'xlsdir', 'xls' ) 

  • CMIP6dreq/trunk/dreqPy/utilities.py

    r540 r886  
    11 
     2class gridOptionSort(object): 
     3  def __init__(self,oldpy=True): 
     4    self.od = {'1deg':'1001','2deg':'1002','native':'0102','DEF':'9000','':'9001','native:01':'0101'} 
     5    self.oldpy = oldpy 
     6 
     7  def cmp(self,x,y): 
     8    return cmp( self.od[x], self.od[y] ) 
     9 
     10  def sort(self,ll): 
     11    if self.oldpy: 
     12       return sorted( ll, cmp=self.cmp ) 
     13    else: 
     14       return sorted( ll, key=lambda x: self.od[x] ) 
     15     
    216class cmvFilter(object): 
    317  """Class to filter list of CMOR variables by rank. 

  • CMIP6dreq/trunk/dreqPy/volsum.py

    r880 r886  
    5757    self.odir = odir 
    5858    self.efnsfx = '' 
    59     if sc.gridPolicyDefaultNative: 
     59    if sc.gridPolicyForce == 'native': 
     60      self.efnsfx = '_fn' 
     61    elif sc.gridPolicyForce == '1deg': 
     62      self.efnsfx = '_f1' 
     63    elif sc.gridPolicyDefaultNative: 
    6064      self.efnsfx = '_dn' 
    6165    if not os.path.isdir( odir ): 
    … …  
    138142          if ee.mip not in ['SolarMIP']: 
    139143            lex[e].append( u ) 
    140             t1, tt = self.sc.getStrSz( g, stid=i.stid, tt=True ) 
     144            t1, tt = self.sc.getStrSz( g, stid=i.stid, tt=True, cmv=u ) 
    141145            np = t1[1]*npy 
    142146            if not isClim: 

  • CMIP6dreq/trunk/dreqPy/vrev.py

    r717 r886  
    5151  #for j in dq.inx.iref_by_sect[i].a['requestLink']: 
    5252    #s2.add(j) 
    53     s2 = reduce( operator.or_, [set(dq.inx.iref_by_sect[i].a['requestLink']) for i in s1 if dq.inx.iref_by_sect[i].a.has_key('requestLink')] ) 
     53    s2 = reduce( operator.or_, [set(dq.inx.iref_by_sect[i].a['requestLink']) for i in s1 if 'requestLink' in dq.inx.iref_by_sect[i].a] ) 
    5454 
    5555    mips = set( [dq.inx.uid[i].mip for i in s2 ] ) 
    … …  
    7979    s2 = set() 
    8080    for i in cc1: 
    81       if dq.inx.iref_by_sect[i].a.has_key('requestLink'): 
     81      if 'requestLink' in dq.inx.iref_by_sect[i].a: 
    8282        for l in dq.inx.iref_by_sect[i].a['requestLink']: 
    8383          lr = dq.inx.uid[l] 
    … …  
    8888          else: 
    8989            s2.add( l ) 
    90     ##ll = [set(dq.inx.iref_by_sect[i].a['requestLink']) for i in cc1 if dq.inx.iref_by_sect[i].a.has_key('requestLink')] 
     90    ##ll = [set(dq.inx.iref_by_sect[i].a['requestLink']) for i in cc1 if 'requestLink' in dq.inx.iref_by_sect[i].a] 
    9191    ##if len(ll) == 0: 
    9292      ##return set() 
Note: See TracChangeset for help on using the changeset viewer.