Changeset 949

Timestamp:

04/04/12 15:01:12 (14 months ago)

Author:

jjr8

Message:

Working on GHRSSTLevel4.

Location:

MGET/Branches/Jason/PythonPackage/src/GeoEco

Files:

• DataProducts/NASA/PODAAC.py (modified) (7 diffs)
• Datasets/Collections.py (modified) (3 diffs)
• Datasets/OPeNDAP.py (modified) (3 diffs)
• Datasets/Virtual.py (modified) (4 diffs)

MGET/Branches/Jason/PythonPackage/src/GeoEco/DataProducts/NASA/PODAAC.py

@@ -24 +24 @@
 from GeoEco.Datasets.Collections import DirectoryTree
 from GeoEco.Datasets.GDAL import GDALDataset
-from GeoEco.Datasets.OPeNDAP import THREDDSCatalog
-from GeoEco.Datasets.Virtual import TimeSeriesGridStack, GridSliceCollection, MaskedGrid, ClippedGrid, RotatedGlobalGrid, ClimatologicalGridCollection
+from GeoEco.Datasets.OPeNDAP import THREDDSCatalog, OPeNDAPURL, OPeNDAPGrid
+from GeoEco.Datasets.Virtual import TimeSeriesGridStack, GridSliceCollection, MaskedGrid, ClippedGrid, RotatedGlobalGrid, ClimatologicalGridCollection, DerivedGrid
 from GeoEco.DynamicDocString import DynamicDocString
 from GeoEco.Internationalization import _
@@ -104 +104 @@
 
     def __getattribute__(self, name):
-        if name.startswith('__') or name in ['_WrappedGrid', '_GetTimeCoordsFromQueryableAttributeValues', '_GetQueryableAttributesForTimeSlices', '_GetLazyPropertyValuesForTimeSlices', 'CreateArcGISRasters', 'InterpolateAtArcGISPoints', 'CreateCayulaCornillonFrontsAsArcGISRasters']:
+        if name.startswith('__') or name in ['_WrappedGrid', '_GetTimeCoordsFromQueryableAttributeValues', '_GetQueryableAttributesForTimeSlices', '_GetLazyPropertyValuesForTimeSlices', 'CreateArcGISRasters', 'CreateClimatologicalArcGISRasters', 'InterpolateAtArcGISPoints', 'CreateCayulaCornillonFrontsAsArcGISRasters']:
             return object.__getattribute__(self, name)
         return object.__getattribute__(object.__getattribute__(self, '_WrappedGrid'), name)
 
     def __setattr__(self, name, value):
-        if name.startswith('__') or name in ['_WrappedGrid', '_GetTimeCoordsFromQueryableAttributeValues', '_GetQueryableAttributesForTimeSlices', '_GetLazyPropertyValuesForTimeSlices', 'CreateArcGISRasters', 'InterpolateAtArcGISPoints', 'CreateCayulaCornillonFrontsAsArcGISRasters']:
+        if name.startswith('__') or name in ['_WrappedGrid', '_GetTimeCoordsFromQueryableAttributeValues', '_GetQueryableAttributesForTimeSlices', '_GetLazyPropertyValuesForTimeSlices', 'CreateArcGISRasters', 'CreateClimatologicalArcGISRasters', 'InterpolateAtArcGISPoints', 'CreateCayulaCornillonFrontsAsArcGISRasters']:
             object.__setattr__(self, name, value)
         else:
@@ -457 +457 @@
         # Return successfully.
 
+        return outputWorkspace
+
+
+class _GHRSSTLevel4THREDDSCatalog(THREDDSCatalog):
+    __doc__ = DynamicDocString()
+
+    def __init__(self, displayName=None, timeout=60, maxRetryTime=120, cacheDirectory=None):
+        super(_GHRSSTLevel4THREDDSCatalog, self).__init__('http://podaac-opendap.jpl.nasa.gov/opendap/allData/ghrsst/data/L4/catalog.xml',
+                                                          [r'(?P<AreaCode>[^\-]+)',
+                                                           r'(?P<RDACCode>[^\-]+)',
+                                                           r'(?P<ProductCode2>[^\-]+)',
+                                                           r'(?P<Year>\d\d\d\d)',
+                                                           r'(?P<DayOfYear>\d\d\d)',
+                                                           r'(?P<Year>\d\d\d\d)(?P<Month>\d\d)(?P<Day>\d\d)-(?P<RDACCode>[^\-]+)-L4(?P<ProductType>[^\-]+)-(?P<AreaCode>[^\-]+)-v(?P<GDSVersion>\d\d)-fv(?P<FileVersion>[^\-]+)-(?P<ProductCode>[^\-]+)(?:\.nc|\.nc\.bz2|\.nc\.gz)'],
+                                                          displayName=displayName,
+                                                          timeout=timeout,
+                                                          maxRetryTime=maxRetryTime,
+                                                          queryableAttributes=(QueryableAttribute(u'RDACCode', _(u'RDAC code'), UnicodeStringTypeMetadata()),
+                                                                               QueryableAttribute(u'ProductType', _(u'Product type'), UnicodeStringTypeMetadata()),
+                                                                               QueryableAttribute(u'AreaCode', _(u'Area code'), UnicodeStringTypeMetadata()),
+                                                                               QueryableAttribute(u'GDSVersion', _(u'GDS version'), IntegerTypeMetadata()),
+                                                                               QueryableAttribute(u'FileVersion', _(u'File version'), UnicodeStringTypeMetadata()),
+                                                                               QueryableAttribute(u'ProductCode', _(u'Product code'), UnicodeStringTypeMetadata()),
+                                                                               QueryableAttribute(u'ProductCode2', _(u'Product code 2'), UnicodeStringTypeMetadata()),
+                                                                               QueryableAttribute(u'DateTime', _(u'Start date'), DateTimeTypeMetadata())),
+                                                          cacheDirectory=cacheDirectory)
+
+    def _ConstructOPeNDAPURL(self, url, timeout, maxRetryTime, queryableAttributeValues, cacheDirectory):
+        return _GHRSSTLevel4OPeNDAPURL(url,
+                                       timeout=timeout,
+                                       maxRetryTime=maxRetryTime,
+                                       parentCollection=self,
+                                       queryableAttributeValues=queryableAttributeValues,
+                                       lazyPropertyValues={'VariableTypes': ['Grid', 'Grid'],
+                                                           'VariableNames': ['analysed_sst', 'analysis_error']},
+                                       cacheDirectory=cacheDirectory)
+
+
+class _GHRSSTLevel4OPeNDAPURL(OPeNDAPURL):
+    __doc__ = DynamicDocString()
+
+    def _ConstructOPeNDAPGrid(self, variableName, variableType):
+        return _GHRSSTLevel4OPeNDAPGrid(self, variableName, variableType)
+
+
+class _GHRSSTLevel4OPeNDAPGrid(OPeNDAPGrid):
+    __doc__ = DynamicDocString()
+
+    def __init__(self, opendapURLObj, variableName, variableType):
+        self.__doc__.Obj.ValidateMethodInvocation()
+
+        # Perform additional validation.
+        
+        if variableName not in ['analysed_sst', 'analysis_error']:
+            raise ValueError(_(u'This tool does not support the "%(variableName)s" variable. The supported variables are "analysed_sst" and "analysis_error".') % {u'variableName': variableName})
+
+        # Initialize the base class.
+        
+        super(_GHRSSTLevel4OPeNDAPGrid, self).__init__(opendapURLObj,
+                                                       variableName,
+                                                       variableType,
+                                                       lazyPropertyValues={'SpatialReference': Dataset.ConvertSpatialReference('proj4', '+proj=latlong +ellps=WGS84 +datum=WGS84 +no_defs', 'obj'),
+                                                                           'Dimensions': u'tyx',
+                                                                           'TIncrement': 1,
+                                                                           'TIncrementUnit': 'day',
+                                                                           'TSemiRegularity': None,
+                                                                           'TCountPerSemiRegularPeriod': None,
+                                                                           'TCornerCoordType': 'min',
+                                                                           'CoordDependencies': (None, None, None),
+                                                                           'PhysicalDimensions': u'tyx',
+                                                                           'PhysicalDimensionsFlipped': (False, False, False)})
+
+    def _GetLazyPropertyPhysicalValue(self, name):
+
+        # If the caller is asking for the CoordIncrements or
+        # CornerCoords, calculate them from the lon and lat OPeNDAP
+        # variables, which give the center coordinates of the cells.
+
+        self.ParentCollection._Open()
+
+        if name in ['CoordIncrements', 'CornerCoords']:
+            lon = self.ParentCollection._PydapDataset['lon']
+            lat = self.ParentCollection._PydapDataset['lat']
+
+            if lon[0] > lon[-1]:
+                self.SetLazyPropertyValue('CoordIncrements', (1., (lat[-1] - lat[0]) / (lat.shape[0] - 1), (lon[-1] + 360. - lon[0]) / (lon.shape[0] - 1)))     # For datasets such as ABOM-L4HRfnd-AUS-RAMSSA_09km that cross the 180th meridian, use a 0-to-360 coordinate system
+            else:
+                self.SetLazyPropertyValue('CoordIncrements', (1., (lat[-1] - lat[0]) / (lat.shape[0] - 1), (lon[-1] - lon[0]) / (lon.shape[0] - 1)))
+
+            self.SetLazyPropertyValue('CornerCoords', (datetime.datetime(1980, 1, 1), lat[0], lon[0]))      # Use fake time coordinate; the true time coordinates are parsed from the file name. 
+
+            return self.GetLazyPropertyValue(name)
+
+        # If the caller is asking for the scaled data type, scaling
+        # function, or unscaling function, determine these from the
+        # data type and add_offset and scale_factor attributes of this
+        # OPeNDAP variable.
+
+        if name in ['ScaledDataType', 'ScalingFunction', 'UnscalingFunction']:
+            v = self._GetOPeNDAPVariable()
+            if self.GetLazyPropertyValue('UnscaledDataType').startswith('float') or not hasattr(v, 'scale_factor') or not hasattr(v, 'add_offset'):
+                return None
+
+            import numpy
+
+            self.SetLazyPropertyValue('ScaledDataType', u'float32')
+            self.SetLazyPropertyValue('ScalingFunction', lambda data: numpy.cast['float32'](v.scale_factor*data + v.add_offset))
+            self.SetLazyPropertyValue('UnscalingFunction', lambda data: numpy.cast[str(self.GetLazyPropertyValue('UnscaledDataType'))](numpy.round((data - v.add_offset)/v.scale_factor)))
+
+            return self.GetLazyPropertyValue(name)
+
+        # If the caller is asking for the UnscaledNoDataValue, get it
+        # from the _FillValue attribute of this OPeNDAP variable.
+
+        if name == 'UnscaledNoDataValue':
+            v = self._GetOPeNDAPVariable()
+            if not hasattr(v, '_FillValue'):
+                return None
+            if not self.GetLazyPropertyValue('UnscaledDataType').startswith('float'):
+                return int(v._FillValue)
+            return v._FillValue
+
+        # If the caller is asking for the ScaledNoDataValue, calculate
+        # it.
+        
+        if name == 'ScaledNoDataValue':
+            scalingFunction = self.GetLazyPropertyValue('ScalingFunction')
+            unscaledNoDataValue = self.GetLazyPropertyValue('UnscaledNoDataValue')
+            if scalingFunction is None or unscaledNoDataValue is None:
+                return None
+            return scalingFunction(unscaledNoDataValue)
+
+        # Otherwise let the base class get this property.
+        
+        return super(_GHRSSTLevel4OPeNDAPGrid, self)._GetLazyPropertyPhysicalValue(name)
+
+
+class GHRSSTLevel4(Grid):
+    __doc__ = DynamicDocString()
+
+    def __init__(self, variableName, rdacCode, productType, areaCode, gdsVersion, fileVersion, productCode, productCode2=None, convertToCelsius=True, timeout=60, maxRetryTime=300, cacheDirectory=None):
+        self.__doc__.Obj.ValidateMethodInvocation()
+
+        # Construct a _GHRSSTLevel4THREDDSCatalog and wrap it in a
+        # TimeSeriesGridStack to create a 3D grid with dimensions tyx.
+
+        if productCode2 is None:
+            productCode2 = productCode
+
+        if rdacCode == 'REMSS' and areaCode == 'GLOB' and productCode == 'mw_ir_rt_OI':
+            datasetSpecificExpression = 'AND (Year > 2008 OR Year = 2008 AND DayOfYear >= 199)'     # Hack to speed up querying for mw_ir_rt_OI, which is stored in same directory as mw_ir_OI but starts at a much later date.
+        else:
+            datasetSpecificExpression = ''
+
+        grid = TimeSeriesGridStack(_GHRSSTLevel4THREDDSCatalog(_('GHRSST L4 product %s-L4%s-%s-%s hosted by NASA PO.DAAC') % (rdacCode, productType, areaCode, productCode), timeout, maxRetryTime, cacheDirectory),
+                                   expression = "VariableName = '%s' AND RDACCode = '%s' AND ProductType = '%s' AND AreaCode = '%s' AND GDSVersion = %i AND FileVersion = '%s' AND ProductCode = '%s' AND ProductCode2 = '%s' %s" % (variableName, rdacCode, productType, areaCode, gdsVersion, fileVersion, productCode, productCode2, datasetSpecificExpression),
+                                   reportProgress=False)
+
+        # If the caller requested that we convert Kelvin temperatures
+        # to Celsius, wrap the grid.
+
+        if convertToCelsius:
+            qav = {}
+            for qa in grid.GetAllQueryableAttributes():
+                qav[qa.Name] = grid.GetQueryableAttributeValue(qa.Name)
+            
+            grid = DerivedGrid([grid],
+                               'self._Grids[0].Data.__getitem__(tuple(sliceList)) - 273.15',
+                               grid.DisplayName,
+                               grid.DataType,
+                               grid.NoDataValue - 273.15,
+                               queryableAttributes=tuple(grid.GetAllQueryableAttributes()),
+                               queryableAttributeValues=qav)
+
+        # Assign our _WrappedGrid instance variable.
+
+        self._WrappedGrid = grid
+
+    def __getattribute__(self, name):
+        if name.startswith('__') or name in ['_WrappedGrid', '_PODAAC_Products', '_RotateAndClip', 'CreateArcGISRasters', 'CreateClimatologicalArcGISRasters', 'InterpolateAtArcGISPoints', 'CreateCayulaCornillonFrontsAsArcGISRasters']:
+            return object.__getattribute__(self, name)
+        return object.__getattribute__(object.__getattribute__(self, '_WrappedGrid'), name)
+
+    def __setattr__(self, name, value):
+        if name.startswith('__') or name in ['_WrappedGrid', '_PODAAC_Products', '_RotateAndClip', 'CreateArcGISRasters', 'CreateClimatologicalArcGISRasters', 'InterpolateAtArcGISPoints', 'CreateCayulaCornillonFrontsAsArcGISRasters']:
+            object.__setattr__(self, name, value)
+        else:
+            setattr(object.__getattribute__(self, '_WrappedGrid'), name, value)
+
+    # In the lists below the items are [rdacCode, productType, areaCode, gdsVersion, fileVersion, productCode, productCode2]
+
+    _PODAAC_Products = {u'ABOM-L4HRfnd-AUS-RAMSSA_09km': ['ABOM', 'HRfnd', 'AUS', 1, '01_0', 'RAMSSA_09km', 'RAMSSA_09km'],
+                        u'ABOM-L4LRfnd-GLOB-GAMSSA_28km': ['ABOM', 'LRfnd', 'GLOB', 1, '01_0', 'GAMSSA_28km', 'GAMSSA_28km'],
+                        u'DMI-L4UHfnd-NSEABALTIC-DMI_OI': ['DMI', 'UHfnd', 'NSEABALTIC', 1, '01', 'DMI_OI', 'DMI_OI'],
+                        u'EUR-L4UHRfnd-MED-ODYSSEA': ['EUR', 'UHRfnd', 'MED', 1, '01', 'ODYSSEA', 'ODYSSEA'],
+                        u'EUR-L4UHRfnd-NWE-ODYSSEA': ['EUR', 'UHRfnd', 'NWE', 1, '01', 'ODYSSEA', 'ODYSSEA'],
+                        u'JPL-L4UHfnd-GLOB-MUR': ['JPL', 'UHfnd', 'GLOB', 1, '03', 'MUR', 'MUR'],
+                        u'JPL_OUROCEAN-L4UHfnd-GLOB-G1SST': ['JPL_OUROCEAN', 'UHfnd', 'GLOB', 1, '01_0', 'G1SST', 'G1SST'],
+                        u'NAVO-L4HR1m-GLOB-K10_SST': ['NAVO', 'HR1m', 'GLOB', 1, '01_0', 'K10_SST', 'K10_SST'],
+                        u'NCDC-L4LRblend-GLOB-AVHRR_AMSR_OI': ['NCDC', 'LRblend', 'GLOB', 1, '02_0', 'AVHRR_AMSR_OI', 'AVHRR_AMSR_OI'],
+                        u'NCDC-L4LRblend-GLOB-AVHRR_OI': ['NCDC', 'LRblend', 'GLOB', 1, '02_0', 'AVHRR_OI', 'AVHRR_OI'],
+                        #u'REMSS-L4HRfnd-GLOB-mw_ir_OI': ['REMSS', 'HRfnd', 'GLOB', 1, '01', 'mw_ir_OI', 'mw_ir_OI'],               # PO.DAAC's copy of this dataset is not up to date. I emailed them and they are working on it.
+                        #u'REMSS-L4HRfnd-GLOB-mw_ir_rt_OI': ['REMSS', 'HRfnd', 'GLOB', 1, '01', 'mw_ir_rt_OI', 'mw_ir_OI'],         # PO.DAAC's copy of this dataset is not up to date. I emailed them and they are working on it.
+                        u'UKMO-L4HRfnd-GLOB-OSTIA': ['UKMO', 'HRfnd', 'GLOB', 1, '02', 'OSTIA', 'OSTIA']}
+
+    @classmethod
+    def _RotateAndClip(cls, grid, rotationOffset, spatialExtent, startDate, endDate):
+        if rotationOffset is not None:
+            grid = RotatedGlobalGrid(grid, rotationOffset, u'Map units')
+
+        xMin, yMin, xMax, yMax = None, None, None, None
+        if spatialExtent is not None:
+            from GeoEco.Types import EnvelopeTypeMetadata
+            xMin, yMin, xMax, yMax = EnvelopeTypeMetadata.ParseFromArcGISString(spatialExtent)
+
+        if spatialExtent is not None or startDate is not None or endDate is not None:
+            if startDate is not None:
+                startDate = datetime.datetime(startDate.year, startDate.month, startDate.day, 0, 0, 0)
+            if endDate is not None:
+                endDate = datetime.datetime(endDate.year, endDate.month, endDate.day, 23, 59, 59)
+                
+            grid = ClippedGrid(grid, u'Map coordinates', xMin=xMin, xMax=xMax, yMin=yMin, yMax=yMax, tMin=startDate, tMax=endDate)
+            
+        return grid
+
+    @classmethod
+    def CreateArcGISRasters(cls, product, variableName,
+                            outputWorkspace, mode=u'add', rasterNameExpressions=[u'%(AreaCode)s', u'%(RDACCode)s', u'%(ProductCode)s', u'%(VariableName)s', u'%%Y', u'%%Y%%m%%d-%(RDACCode)s-L4%(ProductType)s-%(AreaCode)s-v%(GDSVersion)02i-fv%(FileVersion)s-%(ProductCode)s-%(VariableName)s.img'], rasterCatalog=None,
+                            rotationOffset=None, spatialExtent=None, startDate=None, endDate=None, 
+                            timeout=60, maxRetryTime=300, cacheDirectory=None,
+                            convertToCelsius=True, useUnscaledData=False, calculateStatistics=True, buildRAT=False, buildPyramids=False):
+        cls.__doc__.Obj.ValidateMethodInvocation()
+        [rdacCode, productType, areaCode, gdsVersion, fileVersion, productCode, productCode2] = cls._PODAAC_Products[product]
+        grid = cls(variableName, rdacCode, productType, areaCode, gdsVersion, fileVersion, productCode, productCode2, convertToCelsius and variableName == u'analysed_sst' and not useUnscaledData, timeout, maxRetryTime, cacheDirectory)
+        try:
+            from GeoEco.Datasets.ArcGIS import ArcGISWorkspace, ArcGISRaster
+            grid = cls._RotateAndClip(grid, rotationOffset, spatialExtent, startDate, endDate)
+            workspace = ArcGISWorkspace(outputWorkspace, ArcGISRaster, pathCreationExpressions=rasterNameExpressions, cacheTree=True, queryableAttributes=tuple(grid.GetAllQueryableAttributes() + [QueryableAttribute(u'DateTime', _(u'Date'), DateTimeTypeMetadata())]))
+            workspace.ImportDatasets(GridSliceCollection(grid, tQACoordType=u'min').QueryDatasets(), mode, useUnscaledData=useUnscaledData, calculateStatistics=calculateStatistics, buildRAT=buildRAT, buildPyramids=buildPyramids)
+            if rasterCatalog is not None:
+                workspace.ToRasterCatalog(rasterCatalog, grid.GetSpatialReference(u'ArcGIS'), tQACoordType=u'min', tCoordFunction=lambda qav: [qav[u'DateTime'], qav[u'DateTime'] + datetime.timedelta(0.5), qav[u'DateTime'] + datetime.timedelta(1) - datetime.timedelta(seconds=1)], overwriteExisting=True)
+        finally:
+            grid.Close()
         return outputWorkspace
 
@@ -856 +1099 @@
 
 'Add' should be appropriate for nearly all situations. One situation
-in which 'Replace' is appropriate is when NASA reprocesses the entire
-dataset with improved algorithms and releases updated images. In that
-case, you may wish to recreate all of your rasters using the updated
-data.
+in which 'Replace' is appropriate is when the data publisher
+reprocesses the entire dataset with improved algorithms and releases
+updated images. In that case, you may wish to recreate all of your
+rasters using the updated data.
 
 The ArcGIS Overwrite Outputs geoprocessing setting has no effect on
@@ -989 +1232 @@
     description=_(
 u"""Spatial extent of the output rasters, in degrees. If not provided,
-the spatial extent will be the entire planet.
+the spatial extent will not be clipped.
 
 This parameter is applied after the rotation parameter and uses
@@ -1881 +2124 @@
 
 ###############################################################################
+# Metadata: _GHRSSTLevel4THREDDSCatalog class
+###############################################################################
+
+AddClassMetadata(_GHRSSTLevel4THREDDSCatalog,
+    shortDescription=_(u'THREDDSCatalog for the NASA JPL PO.DAAC GHRSST L4 datasets.'),
+    longDescription=_(
+u"""This class is not intended to be used directly by external
+callers. Use GHRSSTLevel4 instead."""))
+
+###############################################################################
+# Metadata: _GHRSSTLevel4OPeNDAPURL class
+###############################################################################
+
+AddClassMetadata(_GHRSSTLevel4OPeNDAPURL,
+    shortDescription=_(u'OPeNDAPURL for a NASA JPL PO.DAAC GHRSST L4 file.'),
+    longDescription=_(
+u"""This class is not intended to be used directly by external
+callers. Use GHRSSTLevel4 instead."""))
+
+###############################################################################
+# Metadata: _GHRSSTLevel4OPeNDAPGrid class
+###############################################################################
+
+AddClassMetadata(_GHRSSTLevel4OPeNDAPGrid,
+    shortDescription=_(u'OPeNDAPGrid for a variable of a NASA JPL PO.DAAC GHRSST L4 file.'),
+    longDescription=_(
+u"""This class is not intended to be used directly by external
+callers. Use GHRSSTLevel4 instead."""))
+
+# Constructor
+
+AddMethodMetadata(_GHRSSTLevel4OPeNDAPGrid.__init__,
+    shortDescription=_(u'Constructs a new _GHRSSTLevel4OPeNDAPGrid instance.'))
+
+AddArgumentMetadata(_GHRSSTLevel4OPeNDAPGrid.__init__, u'self',
+    typeMetadata=ClassInstanceTypeMetadata(cls=_GHRSSTLevel4OPeNDAPGrid),
+    description=_(u'_GHRSSTLevel4OPeNDAPGrid instance.'))
+
+AddArgumentMetadata(_GHRSSTLevel4OPeNDAPGrid.__init__, u'opendapURLObj',
+    typeMetadata=ClassInstanceTypeMetadata(cls=_GHRSSTLevel4OPeNDAPURL),
+    description=_(u'_GHRSSTLevel4OPeNDAPURL instance that contains us.'))
+
+AddArgumentMetadata(_GHRSSTLevel4OPeNDAPGrid.__init__, u'variableName',
+    typeMetadata=UnicodeStringTypeMetadata(allowedValues=[u'analysed_sst', u'analysis_error']),
+    description=_(u'OPeNDAP variable name.'))
+
+AddArgumentMetadata(_GHRSSTLevel4OPeNDAPGrid.__init__, u'variableType',
+    typeMetadata=UnicodeStringTypeMetadata(allowedValues=[u'Grid']),
+    description=_(u'OPeNDAP variable type.'))
+
+AddResultMetadata(_GHRSSTLevel4OPeNDAPGrid.__init__, u'grid',
+    typeMetadata=ClassInstanceTypeMetadata(cls=_GHRSSTLevel4OPeNDAPGrid),
+    description=_(u'_GHRSSTLevel4OPeNDAPGrid instance.'))
+
+###############################################################################
+# Metadata: GHRSSTLevel4 class
+###############################################################################
+
+_GHRSSTLevel4_LongDescription = _(
+u"""The `Group for High-Resolution Sea Surface Temperature (GHRSST) <http://www.ghrsst.org/>`_
+provides a new generation of global high-resolution (<10km) SST
+products to the operational oceanographic, meteorological, climate and
+general scientific community. The overall aim of the GHRSST is to
+provide the best quality sea surface temperature data for applications
+in short, medium and decadal/climate time scales in the most cost
+effective and efficient manner through international collaboration and
+scientific innovation.
+
+This %(name)s accesses L4 gap-free gridded SST products published in
+near real time by the GHRSST GDAC Global Data Assembly Center (GDAC)
+at the `NASA JPL Physical Oceanography Distributed Active Archive Center (PO.DAAC) <http://podaac.jpl.nasa.gov/SeaSurfaceTemperature/GHRSST>`_.
+These products provide regional and global daily cloud-free estimates
+of SST at spatial resolutions ranging from 0.25 degrees to down 1 km.
+To fill in cloudy areas, data from multiple satellite and in-situ
+sensors are combined and regions without any data are filled in
+various interpolation and modeling techniques.
+
+All products accessed by this %(name)s are published at a daily
+timestep. Some products are updated on a continual basis and available
+in near real time; others are updated infrequently and are intended
+mainly for historical analysis. The temporal extent, spatial
+resolution and extent, and sensors and interpolation technique used
+vary by product. All products use the WGS 1984 geographic coordinate
+system. GHRSST temperatures are published in kelvin. By default, this
+%(name)s converts them to degrees Celsius but provides an option to
+obtain the original kelvin values.
+
+All products are obtained from PO.DAAC using the OPeNDAP protocol.
+This %(name)s supports most but not all of the GHRSST L4 products
+hosted by PO.DAAC. If you see a product on PO.DAAC that is not
+available with this tool, please contact the MGET development team for
+assistance.""")
+
+AddClassMetadata(GHRSSTLevel4,
+    shortDescription=_(u'A Grid representing a GHRSST L4 product hosted by NASA JPL PO.DAAC.'),
+    longDescription=_GHRSSTLevel4_LongDescription % {u'name': 'class'})
+
+# Constructor
+
+AddMethodMetadata(GHRSSTLevel4.__init__,
+    shortDescription=_(u'Constructs a new GHRSSTLevel4 instance.'))
+
+AddArgumentMetadata(GHRSSTLevel4.__init__, u'self',
+    typeMetadata=ClassInstanceTypeMetadata(cls=GHRSSTLevel4),
+    description=_(u'GHRSSTLevel4 instance.'))
+
+AddArgumentMetadata(GHRSSTLevel4.__init__, u'variableName',
+    typeMetadata=UnicodeStringTypeMetadata(allowedValues=[u'analysed_sst', u'analysis_error']),
+    description=_(
+u"""GHRSST variable to access, one of:
+
+* analysed_sst - GHRSST product-specific estimate of SST.
+
+* analysis_error - GHRSST product-specific estimate of of the error in
+  the SST estimate.
+
+Please see the product documentation for details about what these
+variables mean and how they were calculated. These variable names are
+case-sensitive."""),
+    arcGISDisplayName=_(u'GHRSST variable'))
+
+AddArgumentMetadata(GHRSSTLevel4.__init__, u'rdacCode',
+    typeMetadata=UnicodeStringTypeMetadata(),
+    description=_(
+u"""The code of the GHRSST Regional Data Access Center (RDAC) that
+produced the product. These codes are case-sensitive, typically upper
+case, and assigned by GHRSST."""))
+
+AddArgumentMetadata(GHRSSTLevel4.__init__, u'productType',
+    typeMetadata=UnicodeStringTypeMetadata(),
+    description=_(
+u"""GHRSST product type code. These codes are case-sensitive, assigned
+by GHRSST, and indicate the overall resolution and type of SST
+estimated by the product. Typical codes include "LRfnd", "HRfnd",
+"UHfnd", "HR1m", and "LRblend"."""))
+
+AddArgumentMetadata(GHRSSTLevel4.__init__, u'areaCode',
+    typeMetadata=UnicodeStringTypeMetadata(),
+    description=_(
+u"""The region code of the the product. These codes are
+case-sensitive, typically upper case, and assigned by GHRSST. A list
+of codes may be seen on the PO.DAAC OPeNDAP server at
+http://podaac-opendap.jpl.nasa.gov/opendap/hyrax/allData/ghrsst/data/L4/"""))
+
+AddArgumentMetadata(GHRSSTLevel4.__init__, u'gdsVersion',
+    typeMetadata=IntegerTypeMetadata(minValue=1),
+    description=_(
+u"""Version of the GHRSST Data Specification (GDS) used by the
+product. At the time of this writing, all products accessed by this
+function were at GDS version 1."""))
+
+AddArgumentMetadata(GHRSSTLevel4.__init__, u'fileVersion',
+    typeMetadata=UnicodeStringTypeMetadata(),
+    description=_(
+u"""Version of the file. This is a case-sensitive string that is
+product specific and assigned by the RDAC that produced the
+product."""))
+
+AddArgumentMetadata(GHRSSTLevel4.__init__, u'productCode',
+    typeMetadata=UnicodeStringTypeMetadata(),
+    description=_(
+u"""The RDAC-assigned product code that appears at the end of the
+GHRSST file name."""))
+
+AddArgumentMetadata(GHRSSTLevel4.__init__, u'productCode2',
+    typeMetadata=UnicodeStringTypeMetadata(canBeNone=True),
+    description=_(
+u"""The RDAC-assigned product code that appears in the PO.DAAC OPeNDAP
+catalog structure below the RDAC level. For example, in the URL
+http://podaac-opendap.jpl.nasa.gov/opendap/hyrax/allData/ghrsst/data/L4/GLOB/REMSS/mw_ir_OI/2012/001/20120103-REMSS-L4HRfnd-GLOB-v01-fv03-mw_ir_rt_OI.nc.gz,
+the productCode is "mw_ir_rt_OI" while the productCode2 is "mw_ir_OI".
+
+Typically the productCode2 is the same as the same as the productCode,
+in which case you should omit the productCode2 (leave it None). Only a
+few products have a different productCode2."""))
+
+AddArgumentMetadata(GHRSSTLevel4.__init__, u'convertToCelsius',
+    typeMetadata=BooleanTypeMetadata(),
+    description=_(
+u"""If True (the default), temperature values will be converted from
+kelvin to degrees Celsius. If False, temperature values will be in the
+original kelvin values."""),
+    arcGISDisplayName=_(u'Use unscaled data'),
+    arcGISCategory=_(u'Additional raster processing options'))
+
+CopyArgumentMetadata(THREDDSCatalog.__init__, u'timeout', GHRSSTLevel4.__init__, u'timeout')
+CopyArgumentMetadata(THREDDSCatalog.__init__, u'maxRetryTime', GHRSSTLevel4.__init__, u'maxRetryTime')
+CopyArgumentMetadata(THREDDSCatalog.__init__, u'cacheDirectory', GHRSSTLevel4.__init__, u'cacheDirectory')
+
+AddResultMetadata(GHRSSTLevel4.__init__, u'grid',
+    typeMetadata=ClassInstanceTypeMetadata(cls=GHRSSTLevel4),
+    description=_(u'GHRSSTLevel4 instance.'))
+
+# Public method: GHRSSTLevel4.CreateArcGISRasters
+
+AddMethodMetadata(GHRSSTLevel4.CreateArcGISRasters,
+    shortDescription=_(u'Creates rasters for a GHRSST L4 product hosted by NASA JPL PO.DAAC.'),
+    longDescription=_GHRSSTLevel4_LongDescription % {u'name': 'tool'},
+    isExposedToPythonCallers=True,
+    isExposedByCOM=True,
+    isExposedAsArcGISTool=True,
+    arcGISDisplayName=_(u'Create Rasters for GHRSST L4 SST'),
+    arcGISToolCategory=_(u'Data Products\\NASA JPL PO.DAAC\\GHRSST L4 SST'),
+    dependencies=[ArcGISDependency(9, 1), PythonAggregatedModuleDependency('numpy')])
+
+AddArgumentMetadata(GHRSSTLevel4.CreateArcGISRasters, u'cls',
+    typeMetadata=ClassOrClassInstanceTypeMetadata(cls=GHRSSTLevel4),
+    description=_(u'GHRSSTLevel4 class or instance.'))
+
+AddArgumentMetadata(GHRSSTLevel4.CreateArcGISRasters, u'product',
+    typeMetadata=UnicodeStringTypeMetadata(allowedValues=sorted(GHRSSTLevel4._PODAAC_Products.keys())),
+    description=_(
+u"""GHRSST L4 product to access. Currently, the following products are
+supported:
+
+* `ABOM-L4HRfnd-AUS-RAMSSA_09km <http://podaac.jpl.nasa.gov/dataset/UKMO-L4HRfnd-GLOB-OSTIA>`_.
+* `ABOM-L4LRfnd-GLOB-GAMSSA_28km <http://podaac.jpl.nasa.gov/dataset/ABOM-L4LRfnd-GLOB-GAMSSA_28km>`_.
+* `DMI-L4UHfnd-NSEABALTIC-DMI_OI <http://podaac.jpl.nasa.gov/dataset/DMI-L4UHfnd-NSEABALTIC-DMI_OI>`_.
+* `EUR-L4UHRfnd-MED-ODYSSEA <http://podaac.jpl.nasa.gov/dataset/EUR-L4UHRfnd-MED-ODYSSEA>`_.
+* `EUR-L4UHRfnd-NWE-ODYSSEA <http://podaac.jpl.nasa.gov/dataset/EUR-L4UHRfnd-NWE-ODYSSEA>`_.
+* `JPL-L4UHfnd-GLOB-MUR <http://podaac.jpl.nasa.gov/dataset/JPL-L4UHfnd-GLOB-MUR>`_.
+* `JPL_OUROCEAN-L4UHfnd-GLOB-G1SST <http://podaac.jpl.nasa.gov/dataset/JPL_OUROCEAN-L4UHfnd-GLOB-G1SST>`_.
+* `NAVO-L4HR1m-GLOB-K10_SST <http://podaac.jpl.nasa.gov/dataset/NAVO-L4HR1m-GLOB-K10_SST>`_.
+* `NCDC-L4LRblend-GLOB-AVHRR_AMSR_OI <http://podaac.jpl.nasa.gov/dataset/NCDC-L4LRblend-GLOB-AVHRR_AMSR_OI>`_.
+* `NCDC-L4LRblend-GLOB-AVHRR_OI <http://podaac.jpl.nasa.gov/dataset/NCDC-L4LRblend-GLOB-AVHRR_OI>`_.
+* `UKMO-L4HRfnd-GLOB-OSTIA <http://podaac.jpl.nasa.gov/dataset/UKMO-L4HRfnd-GLOB-OSTIA>`_.
+
+All products use the WGS 1984 geographic coordinate system and are
+published at a daily timestep. Some products are updated on a
+continual basis and available in near real time; others are updated
+infrequently and are intended mainly for historical analysis. The
+temporal extent, spatial resolution and extent, and sensors and
+interpolation technique used vary by product. Please see the products'
+documentation for details.
+
+This tool supports most but not all of the GHRSST L4 products hosted
+by PO.DAAC. If you see a product on PO.DAAC that is not available with
+this tool, please contact the MGET development team for
+assistance."""),
+    arcGISDisplayName=_(u'GHRSST L4 product'))
+
+CopyArgumentMetadata(GHRSSTLevel4.__init__, u'variableName', GHRSSTLevel4.CreateArcGISRasters, u'variableName')
+
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'outputWorkspace', GHRSSTLevel4.CreateArcGISRasters, u'outputWorkspace')
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'mode', GHRSSTLevel4.CreateArcGISRasters, u'mode')
+
+AddArgumentMetadata(GHRSSTLevel4.CreateArcGISRasters, u'rasterNameExpressions',
+    typeMetadata=ListTypeMetadata(elementType=UnicodeStringTypeMetadata(), minLength=1),
+    description=_(
+u"""List of expressions specifying how the output rasters should be
+named.
+
+The default expression assumes you are storing rasters in a file
+system directory and creates them in a tree structure with names that
+imitate those used by NASA. When storing rasters in a directory, the
+final expression specifies the file name of the raster and any
+preceding expressions specify subdirectories. The extension of the
+final expression determines the output raster format: .asc for ArcInfo
+ASCII Grid, .bmp for BMP, .gif for GIF, .img for an ERDAS IMAGINE
+file, .jpg for JPEG, .jp2 for JPEG 2000, .png for PNG, .tif for
+GeoTIFF, or no extension for ArcInfo Binary Grid. The default
+expression uses .img.
+
+When storing rasters in a geodatabase, you should provide only one
+expression. That expression specifies the raster's name.
+
+Each expression may contain any sequence of characters permitted by
+the output workspace. Each expression may optionally contain one or
+more of the following case-sensitive codes. The tool replaces the
+codes with appropriate values when creating each raster:
+
+* %(AreaCode)s - GHRSST abbreviation indicating the spatial extent of
+  the product, such as "GLOB" for global extent or "AUS" for
+  Australia.
+
+* %(RDACCode)s - GHRSST abbreviation for the Regonal Data Assembly
+  Center (RDAC) that produced the product.
+
+* %(ProductCode)s - name of the product, assigned by the RDAC.
+
+* %(VariableName)s - GHRSST variable represented in the output raster,
+  either "analysed_sst" or "analysis_error".
+
+* %(ProductType)s - GHRSST product type code that indicates the
+  overall resolution and type of SST estimated by the product. For
+  example, "UHfnd" indicates ultra-high resolution (< 5 km spatial
+  resolution) foundational SST. Please see the GHRSST documentation
+  for the formal meanings of these codes.
+
+* %(GDSVersion)02i - version of the GHRSST Data Specification (GDS)
+  used by the product. At the time of this writing, all products
+  accessed by this function were at GDS version 1, which will be
+  rendered as 01 by the expression %(GDSVersion)02i.
+
+* %(FileVersion)s - version of the data file itself. This is
+  product-specific and assigned by the RDAC that produced the product.
+
+* %%Y - four-digit year of the raster.
+
+* %%m - two-digit month of the first day of the raster.
+
+* %%d - two-digit day of the month of the first day of the raster.
+
+* %%j - three-digit day of the year of the first day of the raster.
+"""),
+    arcGISDisplayName=_(u'Raster name expressions'))
+
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'rasterCatalog', GHRSSTLevel4.CreateArcGISRasters, u'rasterCatalog')
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'rotationOffset', GHRSSTLevel4.CreateArcGISRasters, u'rotationOffset')
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'spatialExtent', GHRSSTLevel4.CreateArcGISRasters, u'spatialExtent')
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'startDate', GHRSSTLevel4.CreateArcGISRasters, u'startDate')
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'endDate', GHRSSTLevel4.CreateArcGISRasters, u'endDate')
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'timeout', GHRSSTLevel4.CreateArcGISRasters, u'timeout')
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'maxRetryTime', GHRSSTLevel4.CreateArcGISRasters, u'maxRetryTime')
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'cacheDirectory', GHRSSTLevel4.CreateArcGISRasters, u'cacheDirectory')
+
+CopyArgumentMetadata(GHRSSTLevel4.__init__, u'convertToCelsius', GHRSSTLevel4.CreateArcGISRasters, u'convertToCelsius')
+
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'useUnscaledData', GHRSSTLevel4.CreateArcGISRasters, u'useUnscaledData')
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'calculateStatistics', GHRSSTLevel4.CreateArcGISRasters, u'calculateStatistics')
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'buildRAT', GHRSSTLevel4.CreateArcGISRasters, u'buildRAT')
+CopyArgumentMetadata(MODISL3SSTTimeSeries.CreateArcGISRasters, u'buildPyramids', GHRSSTLevel4.CreateArcGISRasters, u'buildPyramids')
+
+AddResultMetadata(GHRSSTLevel4.CreateArcGISRasters, u'updatedOutputWorkspace',
+    typeMetadata=ArcGISWorkspaceTypeMetadata(),
+    description=_(u'Updated output workspace.'),
+    arcGISDisplayName=_(u'Updated output workspace'),
+    arcGISParameterDependencies=[u'outputWorkspace'])
+
+###############################################################################
 # Metadata: QuikSCATL3TimeSeries class
 ###############################################################################
@@ -1903 +2476 @@
 
 __all__ = ['MODISL3SSTTimeSeries',
-##           'MODISL3SSTTimeSlicesInDirectory',
+           'GHRSSTLevel4'
            'QuikSCATL3TimeSeries',
            'QuikSCATL3TimeSlicesInDirectory']

MGET/Branches/Jason/PythonPackage/src/GeoEco/Datasets/Collections.py

@@ -176 +176 @@
             if 'Year' not in dateTimeComponents:
                 raise TypeError(_(u'This dataset collection includes a queryable attribute with the data type DateTimeTypeMetadata but %(param)s does not include a path component for the year.') % {u'param': param})
-                
-            # Validate that Month and DayOfYear are not both
-            # specified, and that Day and DayOfYear are not both
-            # specified.
-
-            if 'Month' in dateTimeComponents and 'DayOfYear' in dateTimeComponents:
-                raise TypeError(_(u'%(param)s includes path components for both the month and the day of the year. This is not allowed. Please choose one or the other.') % {u'param': param})
-
-            if 'Day' in dateTimeComponents and 'DayOfYear' in dateTimeComponents:
-                raise TypeError(_(u'%(param)s includes path components for both the day of the month and the day of the year. This is not allowed. Please choose one or the other.') % {u'param': param})
 
             # Validate that if Day is specified, Month is also
@@ -309 +299 @@
                 foundAll = True
                 for dtComp in self._DateTimeComponents:
-                    if dtComp not in componentAttrValues:
+                    if dtComp not in componentAttrValues and not (dtComp in ['Month', 'Day'] and 'DayOfYear' in componentAttrValues or dtComp == 'DayOfYear' and 'Month' in componentAttrValues and 'Day' in componentAttrValues):
                         foundAll = False
                         break
@@ -342 +332 @@
                         continue
                         
-                    if 'DayOfYear' in componentAttrValues:
+                    if 'DayOfYear' in componentAttrValues and not ('Month' in componentAttrValues and 'Day' in componentAttrValues):
                         try:
                             dt += datetime.timedelta(days=componentAttrValues['DayOfYear'] - 1)

MGET/Branches/Jason/PythonPackage/src/GeoEco/Datasets/OPeNDAP.py

@@ -321 +321 @@
 
     def _ConstructFoundObject(self, pathComponents, attrValues, options):
-        lazyPropertyValues = {}
-        if self.GetLazyPropertyValue('VariableNames') is not None:
-            lazyPropertyValues['VariableNames'] = self.GetLazyPropertyValue('VariableNames')
-        if self.GetLazyPropertyValue('VariableTypes') is not None:
-            lazyPropertyValues['VariableTypes'] = self.GetLazyPropertyValue('VariableTypes')
-
-        return OPeNDAPURL(self._OPeNDAPURLForPath['/'.join(pathComponents)], timeout=self._Timeout, maxRetryTime=self._MaxRetryTime, parentCollection=self, queryableAttributeValues=attrValues, lazyPropertyValues=lazyPropertyValues, cacheDirectory=self.CacheDirectory)
+        return self._ConstructOPeNDAPURL(self._OPeNDAPURLForPath['/'.join(pathComponents)], self._Timeout, self._MaxRetryTime, attrValues, self.CacheDirectory)
+
+    def _ConstructOPeNDAPURL(self, url, timeout, maxRetryTime, queryableAttributeValues, cacheDirectory):
+        return OPeNDAPURL(url, timeout=timeout, maxRetryTime=maxRetryTime, parentCollection=self, queryableAttributeValues=queryableAttributeValues, cacheDirectory=cacheDirectory)
 
 
@@ -469 +466 @@
             if result:
                 if variableTypes[i] == 'Grid':
-                    datasetsFound.append(OPeNDAPGrid(self, variableNames[i], variableTypes[i]))
+                    datasetsFound.append(self._ConstructOPeNDAPGrid(variableNames[i], variableTypes[i]))
                 else:
                     raise NotImplementedError(_(u'Only OPeNDAP Grid variables are supported at this time.'))
@@ -477 +474 @@
 
         return datasetsFound
+
+    def _ConstructOPeNDAPGrid(self, variableName, variableType):
+        return OPeNDAPGrid(self, variableName, variableType)
 
     def _Open(self):

MGET/Branches/Jason/PythonPackage/src/GeoEco/Datasets/Virtual.py

@@ -124 +124 @@
         # are stacking a collection of 2D (yx) or 3D (zyx) grids into
         # a 3D (tyx) or 4D (tzyx) stack.
-
-        if 't' not in self._CachedOldestGrid.Dimensions:
+        #
+        # As a special case, we treat a 3D (txy) or 4D (tzxy) grid
+        # with one time slice as a 2D (xy) or 3D (zxy) grid.
+
+        if 't' not in self._CachedOldestGrid.Dimensions or self._CachedOldestGrid.Shape[0] == 1:
 
             # Handle properties that are not identical to but are
@@ -131 +134 @@
 
             if name == 'Dimensions':
-                return 't' + self._CachedOldestGrid.Dimensions
+                if self._CachedOldestGrid.Dimensions[0] != 't':
+                    return 't' + self._CachedOldestGrid.Dimensions
+                return self._CachedOldestGrid.Dimensions
 
             if name == 'PhysicalDimensions':
-                return 't' + self._CachedOldestGrid.Dimensions      # Transposing of the underlying time slices is done when we fetch each slice, thus they are all properly ordered by the time we receive them.
+                if self._CachedOldestGrid.Dimensions[0] != 't':
+                    return 't' + self._CachedOldestGrid.Dimensions      # Transposing of the underlying time slices is done when we fetch each slice, thus they are all properly ordered by the time we receive them.
+                return self._CachedOldestGrid.Dimensions
 
             if name == 'PhysicalDimensionsFlipped':
-                return tuple([False] * (len(self._CachedOldestGrid.Dimensions) + 1))      # Flipping of the underlying time slices is done when we fetch each slice, thus they are all properly oriented by the time we receive them.
+                if self._CachedOldestGrid.Dimensions[0] != 't':
+                    return tuple([False] * (len(self._CachedOldestGrid.Dimensions) + 1))      # Flipping of the underlying time slices is done when we fetch each slice, thus they are all properly oriented by the time we receive them.
+                return tuple([False] * len(self._CachedOldestGrid.Dimensions))
 
             if name == 'CoordDependencies':
-                return tuple([None] + list(self._CachedOldestGrid.CoordDependencies))
+                if self._CachedOldestGrid.Dimensions[0] != 't':
+                    return tuple([None] + list(self._CachedOldestGrid.CoordDependencies))
+                return tuple([None] + list(self._CachedOldestGrid.CoordDependencies[1:]))
 
             if name == 'CoordIncrements':
-                return tuple([self._CachedOldestGrid.GetLazyPropertyValue('TIncrement')] + list(self._CachedOldestGrid.CoordIncrements))
+                if self._CachedOldestGrid.Dimensions[0] != 't':
+                    return tuple([self._CachedOldestGrid.GetLazyPropertyValue('TIncrement')] + list(self._CachedOldestGrid.CoordIncrements))
+                return tuple([self._CachedOldestGrid.GetLazyPropertyValue('TIncrement')] + list(self._CachedOldestGrid.CoordIncrements[1:]))
 
             if name == 'CornerCoords':
-                return tuple([self._CachedOldestGrid.GetQueryableAttributeValue(self._DateTimeAttrName)] + list(self._CachedOldestGrid.GetLazyPropertyValue('CornerCoords')))
+                if self._CachedOldestGrid.Dimensions[0] != 't':
+                    return tuple([self._CachedOldestGrid.GetQueryableAttributeValue(self._DateTimeAttrName)] + list(self._CachedOldestGrid.GetLazyPropertyValue('CornerCoords')))
+                return tuple([self._CachedOldestGrid.GetQueryableAttributeValue(self._DateTimeAttrName)] + list(self._CachedOldestGrid.GetLazyPropertyValue('CornerCoords')[1:]))
 
             # Handle the shape. This is more complicated because we
@@ -229 +244 @@
                     # Set and return the shape.
 
-                    shape = tuple([i+1] + list(self._CachedOldestGrid.Shape))
+                    if self._CachedOldestGrid.Dimensions[0] != 't':
+                        shape = tuple([i+1] + list(self._CachedOldestGrid.Shape))
+                    else:
+                        shape = tuple([i+1] + list(self._CachedOldestGrid.Shape[1:]))
+
                     self.SetLazyPropertyValue('Shape', shape)
+
                     return shape
 
@@ -317 +337 @@
                 
             if i < len(self._CachedDatasets) and self._CachedDatasets[i].GetQueryableAttributeValue(self._DateTimeAttrName) == tCoords[t]:
-                data[t] = self._CachedDatasets[i].UnscaledData.__getitem__(tuple(sliceList[1:]))
+                if self._CachedDatasets[i].Dimensions[0] != 't':
+                    data[t] = self._CachedDatasets[i].UnscaledData.__getitem__(tuple(sliceList[1:]))
+                else:
+                    data[t] = self._CachedDatasets[i].UnscaledData.__getitem__(tuple([0] + sliceList[1:]))
             elif self._CachedOldestGrid.UnscaledNoDataValue is not None:
                 if tCornerCoordType == 'min':