first working version

setup.py

@@ -87,7 +87,8 @@
  ('share/graphics/vcs', portrait_files),
  ('share/pcmdi', ('doc/obs_info_dictionary.json',
  'share/pcmdi_metrics_table',
- 'share/disclaimer.txt')),
+ 'share/disclaimer.txt',
+ 'share/default_regions.py')),
  ]
 
 if install_dev:

share/default_regions.py

@@ -0,0 +1,18 @@
+import cdutil
+
+regions_specs = {
+ 'NHEX' : {'domain':cdutil.region.domain(latitude=(30.,90,'ccb'))},
+ 'SHEX' : {'domain':cdutil.region.domain(latitude=(-90.,-30,'ccb'))},
+ 'TROPICS': {'domain':cdutil.region.domain(latitude=(-30.,30,'ccb'))},
+ "global" : {},
+ 'land_NHEX' : {'value':100, 'domain':cdutil.region.domain(latitude=(30.,90,'ccb'))},
+ 'land_SHEX' : {'value':100, 'domain':cdutil.region.domain(latitude=(-90.,-30,'ccb'))},
+ 'land_TROPICS': {'value':100, 'domain':cdutil.region.domain(latitude=(-30.,30,'ccb'))},
+ "land" : {'value':100, },
+ 'ocean_NHEX' : {'value':0, 'domain':cdutil.region.domain(latitude=(30.,90,'ccb'))},
+ 'ocean_SHEX' : {'value':0, 'domain':cdutil.region.domain(latitude=(-90.,-30,'ccb'))},
+ 'ocean_TROPICS': {'value':0, 'domain':cdutil.region.domain(latitude=(30.,30,'ccb'))},
+ "ocean" : {'value':0, },
+ }
+
+default_regions = ['global','NHEX','SHEX','TROPICS']

src/python/io/base.py

@@ -1,6 +1,7 @@
 import json
 import cdms2
 import MV2
+import cdutil
 import genutil
 import os
 import pcmdi_metrics
@@ -13,19 +14,30 @@
 # where value is a integer between 0 and 9 included
 cdms2.setNetcdfDeflateLevelFlag(value)
 
+#cdutil region object need a serializer
+class CDMSDomainsEncoder(json.JSONEncoder):
+ def default(self, o):
+ cmp = o.components()[0].kargs
+ args=",".join(["%s=%s" % (k,v) for k,v in cmp.iteritems()])
+ return {o.id:"cdutil.region.domain(%s)"%args}
 
 class Base(genutil.StringConstructor):
 
- def __init__(self, root, file_template):
+ def __init__(self, root, file_template, file_mask_template=None):
  genutil.StringConstructor.__init__(self, root + "/" + file_template)
  self.targetGrid = None
  self.mask = None
  self.targetMask = None
+ self.file_mask_template = file_mask_template
+ self.root = root
 
  def __call__(self):
  return os.path.abspath(genutil.StringConstructor.__call__(self))
 
- def get(self, var, varInFile=None, *args, **kargs):
+ def get(self, var, varInFile=None, region={}, *args, **kargs):
+ if region is None:
+ region = {}
+
  self.variable = var
  if varInFile is None:
  varInFile = var
@@ -34,12 +46,31 @@ def get(self, var, varInFile=None, *args, **kargs):
  out = f(varInFile, *args, **kargs)
  f.close()
 
- # Now are we looking at a region in particular?
- if self.mask is not None:
+ # Now are we masking anything?
+ value = region.get("value",None)
+ if value is not None: # Indeed we are
+ if self.mask is None:
+ if isinstance(self.file_mask_template, basestring):
+ self.file_mask_template = Base(self.root,self.file_mask_template,{"domain":self.region.get("domain",None)})
+ try:
+ oMask = self.file_mask_template.get("sftlf")
+ # ok that failed falling back on autogenerate
+ except:
+ #dup.tb = args.traceback
+ #dup("Could not find obs mask, generating")
+ #dup.tb = False
+ oMask = cdutil.generateLandSeaMask(
+ out,
+ regridTool=self.regridTool).filled(1.) * 100.
+ oMask = MV2.array(oMask)
+ oMask.setAxis(-1, out.getLongitude())
+ oMask.setAxis(-2, out.getLatitude())
+ self.mask = oMask
  if self.mask.shape != out.shape:
  dum, msk = genutil.grower(out, self.mask)
  else:
  msk = self.mask
+ msk = MV2.not_equal(msk,value)
  out = MV2.masked_where(msk, out)
  if self.targetGrid is not None:
  out = out.regrid(
@@ -55,6 +86,16 @@ def get(self, var, varInFile=None, *args, **kargs):
  else:
  msk = self.targetMask
  out = MV2.masked_where(msk, out)
+ # Now are we looking at a region in particular?
+ domain = region.get("domain",None)
+ if domain is not None: # Ok we are subsetting 
+ if isinstance(domain,dict):
+ out=out(**domain)
+ elif isinstance(domain,(list,tuple)):
+ out=out(*domain)
+ elif isinstance(domain,cdms2.selectors.Selector):
+ domain.id=region.get("id","region")
+ out=out(*[domain])
  return out
 
  def setTargetGrid(self, target, regridTool="esmf", regridMethod="linear"):
@@ -89,7 +130,7 @@ def write(self, data, type="json", mode="w", *args, **kargs):
  f = open(fnm, mode)
  data["metrics_git_sha1"] = pcmdi_metrics.__git_sha1__
  data["uvcdat_version"] = cdat_info.get_version()
- json.dump(data, f, *args, **kargs)
+ json.dump(data, f, cls=CDMSDomainsEncoder, *args, **kargs)
  f.close()
  elif type.lower() in ["asc", "ascii", "txt"]:
  f = open(fnm, mode)

src/python/pcmdi/io.py

@@ -3,11 +3,11 @@
 
 class OBS(pcmdi_metrics.io.base.Base):
 
- def __init__(self, root, var, obs_dic, reference="default"):
+ def __init__(self, root, var, obs_dic, reference="default", file_mask_template=None):
 
  template = "%(realm)/%(frequency)/%(variable)/" +\
  "%(reference)/%(ac)/%(filename)"
- pcmdi_metrics.io.base.Base.__init__(self, root, template)
+ pcmdi_metrics.io.base.Base.__init__(self, root, template,file_mask_template)
  obs_name = obs_dic[var][reference]
  # usually send "default", "alternate", etc
  # but some case (sftlf) we send the actual name