Changeset 1026

Timestamp:

05/06/17 19:58:23 (3 years ago)

Author:

mjuckes

Message:

cand

Location:

CMIP6dreqbuild/trunk/src/framework/dreqPy

Files:

• makeTables.py (modified) (1 diff)
• packageConfig.py (modified) (1 diff)
• scope.py (modified) (1 diff)

CMIP6dreqbuild/trunk/src/framework/dreqPy/makeTables.py

@@ -195 +195 @@
         return '<li>%s [%s]: %s</li>' % ( cmv.label, targ.__href__(odir='../u/',label=targ.priority) , 'Variable not defined or not found'  )
       else:
-        return '<li>%s [%s]: %s</li>' % ( cmv.label, targ.__href__(odir='../u/',label=targ.priority) , cmv.__href__(odir='../u/',label=cmv.title)  )
+        ng = len( targ._inx.iref_by_sect[cmv.uid].a['requestVar'] )
+        nv = len( targ._inx.iref_by_sect[cmv.vid].a['CMORvar'] )
+        return '<li>%s.%s [%s]: %s {groups: %s, vars: %s}</li>' % ( cmv.label,cmv.mipTable, targ.__href__(odir='../u/',label=targ.priority) , cmv.__href__(odir='../u/',label=cmv.title), ng, nv  )
     else:
       rg = targ._inx.uid[ targ.vgid ]

CMIP6dreqbuild/trunk/src/framework/dreqPy/packageConfig.py

@@ -14 +14 @@
 DOC_DIR = os.environ.get('DRQ_CONFIG_DIR', DOC_DEFAULT_DIR)
 
-__versionComment__ = "Version 01.00.10"
-__version__ = "01.00.10"
+__versionComment__ = "Version 01.00.11"
+__version__ = "01.00.11"
 __title__ = "dreqPy"
 __description__ = "CMIP6 Data Request Python API"

CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py

@@ -1523 +1523 @@
       --grdforce <native|1deg> :  force a specific grid option, independent of individual preferences;
       --ogrdunstr : provide volume estimates for unstructured ocean grid (interpolation requirements of OMIP data are different in this case);
+      --omitCmip : omit the CMIP core data request (included by default);
       --allgrd :  When a variable is requested on multiple grids, archive all grids requested (default: only the finest resolution);
       --unique :  List only variables which are requested uniquely by this MIP, for at least one experiment;