version 01.00.29

Release/dreqPy/docs/dreq2Defn.xml

@@ -109,8 +109,8 @@ xsi:schemaLocation="http://w3id.org/cmip6dr/ns vocabFrameworkSchema_v01beta.xsd"
   <rowAttribute label="mip" type="xs:string" title="Endorsed MIP requesting the data" useClass="internalLink" techNote="" description="" uid="ATTRIBUTE::requestLink.mip" superclass="" required="true"/>
   <rowAttribute label="tab" type="xs:string" title="Redundant" useClass="" techNote="" description="" uid="ATTRIBUTE::requestLink.tab" superclass="" required="false"/>
   <rowAttribute label="objective" type="xs:string" title="Science objectives associated with this request" useClass="" techNote="" description="Every request for model ouput is linked to one or more objectives. The XML link is made via objectiveLink records, each of which associates one requestLink with one objective record." uid="ATTRIBUTE::requestLink.objective" superclass="" required="true"/>
-  <rowAttribute label="grid" type="xs:string" title="Grid options" useClass="" techNote="" description="" uid="ATTRIBUTE::requestLink.grid" superclass="" required="true"/>
-  <rowAttribute label="gridreq" type="xs:string" title="Grid option constraints" useClass="" techNote="" description="" uid="ATTRIBUTE::requestLink.gridreq" superclass="" required="true"/>
+  <rowAttribute label="grid" type="xs:string" title="Grid options" useClass="" techNote="" description="Specified required or preferred (depending on the value of gridreq) horizontal grid. Options: native (for model grid), 1deg, 2deg, 8 to 25km (8km preferred, less than 25km required), 5 to 25km (5km preferred, less than 25km required), blank (no prerefence).  " uid="ATTRIBUTE::requestLink.grid" superclass="" required="true"/>
+  <rowAttribute label="gridreq" type="xs:string" title="Grid option constraints" useClass="" techNote="" description="Is the grid specified by the grid attribute optional (yes) or (no), conditionally (no*1 -- used for ocean data, when native is required only from models using a regular grid)" uid="ATTRIBUTE::requestLink.gridreq" superclass="" required="true"/>
   <rowAttribute label="comment" type="xs:string" title="Comment" useClass="" techNote="" description="" uid="ATTRIBUTE::requestLink.comment" superclass="" required="true"/>
   <rowAttribute label="ref" type="xs:string" title="Reference" useClass="" techNote="" description="" uid="ATTRIBUTE::requestLink.ref" superclass="" required="false"/>
   <rowAttribute label="refNote" type="xs:string" title="Note on reference" useClass="" techNote="" description="" uid="ATTRIBUTE::requestLink.refNote" superclass="" required="false"/>
@@ -183,7 +183,7 @@ xsi:schemaLocation="http://w3id.org/cmip6dr/ns vocabFrameworkSchema_v01beta.xsd"
   <rowAttribute label="description" type="xs:string" title="Description" useClass="freeText" techNote="" description="" uid="ATTRIBUTE::experiment.description" superclass="" required="true"/>
   <rowAttribute label="egid" type="xs:string" title="Identifier for experiment group" useClass="internalLink" techNote="" description="" uid="ATTRIBUTE::experiment.egid" superclass="" required="true"/>
   <rowAttribute label="mip" type="xs:string" title="MIP defining experiment" useClass="internalLink" techNote="" description="" uid="ATTRIBUTE::experiment.mip" superclass="" required="true"/>
-  <rowAttribute label="mcfg" type="xs:string" title="Model category" useClass="" techNote="" description="" uid="ATTRIBUTE::experiment.mcfg" superclass="" required="true"/>
+  <rowAttribute label="mcfg" type="xs:string" title="Model Source Types" useClass="" techNote="" description="Specifies the model source types which are required/allowed for this experiment (see https://github.com/WCRP-CMIP/CMIP6_Cvs/blob/master/CMIP6_source_type.json). Syntax is a space separated list of required source types, follwed by a | and a space separated list of additional allowed source types." uid="ATTRIBUTE::experiment.mcfg" superclass="" required="true"/>
   <rowAttribute label="tier" type="aa:st__integerListMonInc" title="Tier of experiment" useClass="" techNote="" description="Experiments are assigned a tier by the MIP specifying the tier, tier 1 experiments being the most important." uid="ATTRIBUTE::experiment.tier" superclass="" usage="Must be a list of the same length as ensz." required="true"/>
   <rowAttribute label="nstart" type="xs:integer" title="Number of start dates" useClass="" techNote="" description="" uid="ATTRIBUTE::experiment.nstart" superclass="" required="true"/>
   <rowAttribute label="starty" type="xs:string" title="Start year" useClass="" techNote="" description="" uid="ATTRIBUTE::experiment.starty" superclass="" required="true"/>

Release/dreqPy/docs/dreq2Schema.xsd

@@ -488,7 +488,7 @@
    xs:stringDescriptionegid;
    xs:stringIdentifier for experiment groupmip;
    xs:stringMIP defining experimentmcfg;
-   xs:stringModel categorytier;
+   xs:stringModel Source Typestier;
    aa:st__integerListMonIncTier of experimentnstart;
    xs:integerNumber of start datesstarty;
    xs:stringStart yearendy;