Skip to content

Commit

Permalink
version 01.00.22
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Juckes committed Apr 6, 2022
1 parent 693da1f commit f84a946
Show file tree
Hide file tree
Showing 14 changed files with 1,117 additions and 1,126 deletions.
6 changes: 0 additions & 6 deletions Release/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,3 @@ The dreqPy package includes an XML document specifying the CMIP6 data request an
The XML document is described in dreqML.pdf in the docs directory.

The python API is described in dreqPy.pdf, also in the docs directory.


Version 01.00.21.post1
----------------------
Fixes an error in the CMORvar modeling_realm attribute, replacing "ocnBgChem" with "ocnBgchem".
No other changes (apart from version, document date, and comment line in packageConfig.py).
Binary file modified Release/dreqPy/docs/CMIP6_MIP_tables.xlsx
Binary file not shown.
1,815 changes: 895 additions & 920 deletions Release/dreqPy/docs/dreq.xml

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Release/dreqPy/docs/dreq2Defn.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ xsi:schemaLocation="http://w3id.org/cmip6dr/ns vocabFrameworkSchema_v01beta.xsd"
<rowAttribute label="deflate_level" type="xs:string" title="Deflate Level: NetCDF compression parameter" useClass="" techNote="" description="" uid="ATTRIBUTE::CMORvar.deflate_level" superclass="" required="true"/>
<rowAttribute label="shuffle" type="xs:string" title="Shuffle: NetCDF compression parameter" useClass="" techNote="" description="" uid="ATTRIBUTE::CMORvar.shuffle" superclass="" required="true"/>
<rowAttribute label="defaultPriority" type="xs:integer" title="Indicative priority for this parameter, which is over-ruled by the requestVar priority setting, but provides a reference for organisation of the CMORvariables" useClass="" techNote="" description="For the priority of requested data, the priority attribute of the requestVar section should be used." uid="ATTRIBUTE::CMORvar.defaultPriority" superclass="" required="true"/>
<rowAttribute label="type" type="xs:string" title="Data value type, e.g. float or double" useClass="" techNote="" description="" uid="ATTRIBUTE::CMORvar.type" superclass="" required="true"/>
<rowAttribute label="type" type="aa:st__fortranType" title="Data value type, e.g. float or double" useClass="" techNote="" description="Data type is specified using Fortran code words: character, double, integer, real " uid="ATTRIBUTE::CMORvar.type" superclass="" required="true"/>
<rowAttribute label="modeling_realm" type="xs:string" title="Modeling Realm" useClass="drsVocab" techNote="" description="" uid="ATTRIBUTE::CMORvar.modeling_realm" superclass="" required="true"/>
<rowAttribute label="positive" type="xs:string" title="CMOR Directive Positive" useClass="CMORdirective" techNote="" description="For any variable where the DREQ has specified a value for 'positive', CMOR requires users to say whether the data they're giving CMOR assumes 'positive is up' or 'positive is down'. If the user's direction is opposite what is requested by DREQ, CMOR multiplies the data by -1 before storing it, so that it will conform with the specifications." uid="ATTRIBUTE::CMORvar.positive" superclass="" required="true"/>
<rowAttribute label="mipTableSection" type="xs:string" title="Section of a table" useClass="subsubsection" techNote="" description="" uid="ATTRIBUTE::CMORvar.mipTableSection" superclass="" required="false"/>
Expand Down Expand Up @@ -137,7 +137,7 @@ xsi:schemaLocation="http://w3id.org/cmip6dr/ns vocabFrameworkSchema_v01beta.xsd"
<rowAttribute label="uid" type="aa:st__uid" title="Record identifier" useClass="recordId" techNote="" description="" uid="ATTRIBUTE::modelConfig.uid" superclass="" required="true"/>
<rowAttribute label="MIPs" type="xs:string" title="MIPs which make use of this feature" useClass="" techNote="" description="" uid="ATTRIBUTE::modelConfig.MIPs" superclass="" required="true"/>
<rowAttribute label="usage" type="xs:string" title="How the feature is relevant to the data request" useClass="" techNote="" description="" uid="ATTRIBUTE::modelConfig.usage" superclass="" required="true"/>
<rowAttribute label="type" type="xs:string" title="Type of model" useClass="" techNote="" description="" uid="ATTRIBUTE::modelConfig.type" superclass="" required="true"/>
<rowAttribute label="type" type="aa:st__configurationType" title="Type of model" useClass="" techNote="" description="" uid="ATTRIBUTE::modelConfig.type" superclass="" required="true"/>
<rowAttribute label="range" type="xs:string" title="Range of valid values, e.g. xs:boolean" useClass="" techNote="" description="" uid="ATTRIBUTE::modelConfig.range" superclass="" required="true"/>
</table>
<table label="varChoiceLinkC" uid="SECTION:varChoiceLinkC" title="3.6 Links a variable to a choice element" id="vclc" itemLabelMode="def" level="0" maxOccurs="1" labUnique="Yes" description="Link between a variable choice element and variables">
Expand Down Expand Up @@ -304,12 +304,12 @@ xsi:schemaLocation="http://w3id.org/cmip6dr/ns vocabFrameworkSchema_v01beta.xsd"
<rowAttribute label="isIndex" type="xs:string" title="index axis?" useClass="" techNote="" description="" uid="ATTRIBUTE::grids.isIndex" superclass="" required="true"/>
<rowAttribute label="coords" type="xs:string" title="coords_attrib" useClass="" techNote="" description="" uid="ATTRIBUTE::grids.coords" superclass="" required="true"/>
<rowAttribute label="bounds" type="xs:string" title="bounds?" useClass="" techNote="" description="" uid="ATTRIBUTE::grids.bounds" superclass="" required="true"/>
<rowAttribute label="direction" type="xs:string" title="stored direction" useClass="" techNote="" description="" uid="ATTRIBUTE::grids.direction" superclass="" required="true"/>
<rowAttribute label="direction" type="xs:string" title="stored direction" useClass="" techNote="" description="decreasing, increasing or empty" uid="ATTRIBUTE::grids.direction" superclass="" required="true"/>
<rowAttribute label="valid_min" type="xs:float" title="valid_min" useClass="" techNote="" description="" uid="ATTRIBUTE::grids.valid_min" superclass="" required="false"/>
<rowAttribute label="valid_max" type="xs:float" title="valid_max" useClass="" techNote="" description="" uid="ATTRIBUTE::grids.valid_max" superclass="" required="false"/>
<rowAttribute label="type" type="xs:string" title="type" useClass="" techNote="" description="" uid="ATTRIBUTE::grids.type" superclass="" required="true"/>
<rowAttribute label="type" type="aa:st__fortranType" title="type" useClass="" techNote="" description="Data type is specified using Fortran code words: character, double, integer, real " uid="ATTRIBUTE::grids.type" superclass="" required="true"/>
<rowAttribute label="positive" type="xs:string" title="positive" useClass="" techNote="" description="" uid="ATTRIBUTE::grids.positive" superclass="" required="true"/>
<rowAttribute label="value" type="xs:string" title="value" useClass="" techNote="" description="" uid="ATTRIBUTE::grids.value" superclass="" required="true"/>
<rowAttribute label="value" type="xs:string" title="value of a scalar coordinate" useClass="" techNote="" description="This attribute is only for scalar coordinates. Otherwise use *requested*" uid="ATTRIBUTE::grids.value" superclass="" required="true"/>
<rowAttribute label="boundsValues" type="xs:string" title="bounds _values" useClass="" techNote="" description="" uid="ATTRIBUTE::grids.boundsValues" superclass="" required="true"/>
<rowAttribute label="requested" type="xs:string" title="requested" useClass="" techNote="" description="" uid="ATTRIBUTE::grids.requested" superclass="" required="true"/>
<rowAttribute label="boundsRequested" type="aa:st__floatList" title="bounds_ requested" useClass="" techNote="" description="" uid="ATTRIBUTE::grids.boundsRequested" superclass="" required="false"/>
Expand Down
Loading

0 comments on commit f84a946

Please sign in to comment.