Changeset 862

Timestamp:

12/12/11 17:20:25 (17 months ago)

Author:

jjr8

Message:

Continuing work on NOAA OSCAR. Also added HYCOM GLBa0.08 to connectivity tool.

Location:

MGET/Branches/Jason/PythonPackage/src/GeoEco

Files:

• Connectivity/CoralReefConnectivity.py (modified) (8 diffs)
• DataProducts/NOAA/OSCAR.py (modified) (4 diffs)
• Datasets/Virtual.py (modified) (1 diff)
• Datasets/__init__.py (modified) (1 diff)

MGET/Branches/Jason/PythonPackage/src/GeoEco/Connectivity/CoralReefConnectivity.py

@@ -22 +22 @@
 
 from GeoEco.DataProducts.Aviso import AvisoGriddedGeostrophicCurrents, _AvisoGriddedProduct_LongDescription
-from GeoEco.DataProducts.HYCOM import HYCOMGOMl0044D, _HYCOMGOMl004_LongDescription
+from GeoEco.DataProducts.HYCOM import HYCOMGOMl0044D, _HYCOMGOMl004_LongDescription, HYCOMGLBa008Equatorial4D, _HYCOMGLBa008Equatorial_LongDescription
+from GeoEco.DataProducts.NOAA.OSCAR import OSCAR5DayThirdDegreeCurrents, _OSCAR_LongDescription
 from GeoEco.DynamicDocString import DynamicDocString
 from GeoEco.Internationalization import _
@@ -184 +185 @@
 
         avisoCurrentsDirectory = os.path.join(simulationDirectory, 'OriginalAvisoCurrents')
+        AvisoGriddedGeostrophicCurrents.CreateArcGISRasters(username, password, product, u'u', avisoCurrentsDirectory, rasterNameExpressions=['u', '%%Y', 'u%%Y%%j0000.img'], startDate=startDate, endDate=endDate, timeout=timeout, maxRetryTime=maxRetryTime, cacheDirectory=cacheDirectory)
+        AvisoGriddedGeostrophicCurrents.CreateArcGISRasters(username, password, product, u'v', avisoCurrentsDirectory, rasterNameExpressions=['v', '%%Y', 'v%%Y%%j0000.img'], startDate=startDate, endDate=endDate, timeout=timeout, maxRetryTime=maxRetryTime, cacheDirectory=cacheDirectory)
+
+        # Record in the Simulation.ini file that we downloaded some
+        # currents and then project, snap, and clip them to the
+        # projection, extent, and cell size of the reef IDs raster.
+
+        cls._FinishLoadingCurrents(simulationDirectory, u'Aviso ' + product, u'Center', 86400, avisoCurrentsDirectory, u'setnull( inputRaster > 1000000 || inputRaster < -1000000, inputRaster / 100)')     # Use Map Algebra to Convert from cm/s to to m/s and mask bogus values introduced by ArcGIS
+
+        # Return successfully.
+
+        return simulationDirectory
+
+    @classmethod
+    def LoadOSCARCurrentsIntoSimulation(cls, simulationDirectory, startDate, endDate, timeout=60, maxRetryTime=120, cacheDirectory=None):
+        cls.__doc__.Obj.ValidateMethodInvocation()
+
+        # Parse and validate the Simulation.ini file.
+
+        scp, crosses180, currentsLoaded, currentsProduct = cls._ReadCurrentsInfoFromSimulationINI(simulationDirectory)
+
+        # If the simulation already has currents loaded in it from a
+        # different product, report an error.
+
+        if currentsLoaded and currentsProduct != u'OSCAR':
+            Logger.RaiseException(ValueError(_(u'Cannot load OSCAR currents data into the simulation in directory %(dir)s because that simulation already has %(prod2)s currents data loaded into it. You can load additional %(prod2)s data, if you like, but to use OSCAR data, you must create a new simulation.') % {u'dir': simulationDirectory, u'prod2': currentsProduct}))
+
+        # First, download and create OSCAR current rasters in an
+        # OSCAR-specific directory. These will have the OSCAR
+        # projection, extent, and cell size. We still need to project
+        # them to the simulation's projection, extent, and cell size.
+        #
+        # TODO: Need to handle rotation?
+
+        oscarCurrentsDirectory = os.path.join(simulationDirectory, 'OriginalOSCARCurrents')
+        OSCAR5DayThirdDegreeCurrents.CreateArcGISRasters(u'u', oscarCurrentsDirectory, rasterNameExpressions=['u', '%%Y', 'u%%Y%%j0000.img'], startDate=startDate, endDate=endDate, timeout=timeout, maxRetryTime=maxRetryTime, cacheDirectory=cacheDirectory)
+        OSCAR5DayThirdDegreeCurrents.CreateArcGISRasters(u'v', oscarCurrentsDirectory, rasterNameExpressions=['v', '%%Y', 'v%%Y%%j0000.img'], startDate=startDate, endDate=endDate, timeout=timeout, maxRetryTime=maxRetryTime, cacheDirectory=cacheDirectory)
+
+        # Record in the Simulation.ini file that we downloaded some
+        # currents and then project, snap, and clip them to the
+        # projection, extent, and cell size of the reef IDs raster.
+
+        cls._FinishLoadingCurrents(simulationDirectory, u'OSCAR', u'Center', 6*86400, oscarCurrentsDirectory)
+
+        # Return successfully.
+
+        return simulationDirectory
+
+    @classmethod
+    def LoadHYCOMGOMl0044DCurrentsIntoSimulation(cls, simulationDirectory, startDate, endDate, depth=0., timeout=600, maxRetryTime=None, cacheDirectory=None):
+        cls.__doc__.Obj.ValidateMethodInvocation()
+
+        # Parse and validate the Simulation.ini file.
+
+        scp, crosses180, currentsLoaded, currentsProduct = cls._ReadCurrentsInfoFromSimulationINI(simulationDirectory)
+
+        # If the simulation already has currents loaded in it from a
+        # different product or depth, report an error.
+
+        if currentsLoaded and currentsProduct != u'HYCOM GOMl0.04 ' + unicode(int(depth)) + u' m':
+            Logger.RaiseException(ValueError(_(u'Cannot load %(prod1)s currents data into the simulation in directory %(dir)s because that simulation already has %(prod2)s currents data loaded into it. You can load additional %(prod2)s data, if you like, but to use %(prod1)s data, you must create a new simulation.') % {u'dir': simulationDirectory, u'prod1': u'HYCOM GOMl0.04 ' + unicode(int(depth)) + u' m', u'prod2': currentsProduct}))
+
+        # First, download and create HYCOM current rasters in a
+        # HYCOM-specific directory. These will have the HYCOM
+        # projection, extent, and cell size. We still need to project
+        # them to the simulation's projection, extent, and cell size.
+
+        hycomCurrentsDirectory = os.path.join(simulationDirectory, 'OriginalHYCOMCurrents')
+        HYCOMGOMl0044D.CreateArcGISRasters(u'u', hycomCurrentsDirectory, rasterNameExpressions=['%(VariableName)s', '%%Y', '%(VariableName)s%%Y%%j0000.img'], minDepth=depth, maxDepth=depth, startDate=startDate, endDate=endDate, timeout=timeout, maxRetryTime=maxRetryTime, cacheDirectory=cacheDirectory)
+        HYCOMGOMl0044D.CreateArcGISRasters(u'v', hycomCurrentsDirectory, rasterNameExpressions=['%(VariableName)s', '%%Y', '%(VariableName)s%%Y%%j0000.img'], minDepth=depth, maxDepth=depth, startDate=startDate, endDate=endDate, timeout=timeout, maxRetryTime=maxRetryTime, cacheDirectory=cacheDirectory)
+
+        # Record in the Simulation.ini file that we downloaded some
+        # currents and then project, snap, and clip them to the
+        # projection, extent, and cell size of the reef IDs raster.
+
+        cls._FinishLoadingCurrents(simulationDirectory, u'HYCOM GOMl0.04  ' + unicode(int(depth)) + u' m', u'Center', 86400, hycomCurrentsDirectory)
+
+        # Return successfully.
+
+        return simulationDirectory
+
+    @classmethod
+    def LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation(cls, simulationDirectory, startDate, endDate, depth=0., extendYExtent=False, timeout=60, maxRetryTime=120, cacheDirectory=None):
+        cls.__doc__.Obj.ValidateMethodInvocation()
+
+        # Parse and validate the Simulation.ini file.
+
+        scp, crosses180, currentsLoaded, currentsProduct = cls._ReadCurrentsInfoFromSimulationINI(simulationDirectory)
+
+        # If the simulation already has currents loaded in it from a
+        # different product or depth, report an error.
+
+        if currentsLoaded and currentsProduct != u'HYCOM GLBa0.08 Equatorial ' + unicode(int(depth)) + u' m':
+            Logger.RaiseException(ValueError(_(u'Cannot load %(prod1)s currents data into the simulation in directory %(dir)s because that simulation already has %(prod2)s currents data loaded into it. You can load additional %(prod2)s data, if you like, but to use %(prod1)s data, you must create a new simulation.') % {u'dir': simulationDirectory, u'prod1': u'HYCOM GLBa0.08 Equatorial ' + unicode(int(depth)) + u' m', u'prod2': currentsProduct}))
+
+        # First, download and create HYCOM current rasters in a
+        # HYCOM-specific directory. These will have the HYCOM
+        # projection, extent, and cell size. We still need to project
+        # them to the simulation's projection, extent, and cell size.
+
+        hycomCurrentsDirectory = os.path.join(simulationDirectory, 'OriginalHYCOMCurrents')
+        HYCOMGLBa008Equatorial4D.CreateArcGISRasters(u'u', hycomCurrentsDirectory, rasterNameExpressions=['%(VariableName)s', '%%Y', '%(VariableName)s%%Y%%j0000.img'], extendYExtent=extendYExtent, minDepth=depth, maxDepth=depth, startDate=startDate, endDate=endDate, timeout=timeout, maxRetryTime=maxRetryTime, cacheDirectory=cacheDirectory)
+        HYCOMGLBa008Equatorial4D.CreateArcGISRasters(u'v', hycomCurrentsDirectory, rasterNameExpressions=['%(VariableName)s', '%%Y', '%(VariableName)s%%Y%%j0000.img'], extendYExtent=extendYExtent, minDepth=depth, maxDepth=depth, startDate=startDate, endDate=endDate, timeout=timeout, maxRetryTime=maxRetryTime, cacheDirectory=cacheDirectory)
+
+        # Record in the Simulation.ini file that we downloaded some
+        # currents and then project, snap, and clip them to the
+        # projection, extent, and cell size of the reef IDs raster.
+
+        cls._FinishLoadingCurrents(simulationDirectory, u'HYCOM GLBa0.08 Equatorial ' + unicode(int(depth)) + u' m', u'Center', 86400, hycomCurrentsDirectory)
+
+        # Return successfully.
+
+        return simulationDirectory
+
+    @classmethod
+    def _FinishLoadingCurrents(cls, simulationDirectory, currentsProduct, currentsDateType, maxSecondsBetweenCurrentsImages, originalCurrentsDirectory, mapAlgebraExpression=None):
+
+        # Write the Simulation.ini file, so that any new rasters
+        # loaded into the simulation must be from the same product and
+        # depth.
+            
+        scp.set(u'Simulation', u'CurrentsLoaded', unicode(True))
+        scp.set(u'Simulation', u'CurrentsProduct', currentsProduct)
+        scp.set(u'Simulation', u'CurrentsDateType', currentsDateType)
+        scp.set(u'Simulation', u'MaxSecondsBetweenCurrentsImages', unicode(maxSecondsBetweenCurrentsImages))
+        f = file(os.path.join(simulationDirectory, u'Simulation.ini'), 'w')
         try:
-            AvisoGriddedGeostrophicCurrents.CreateArcGISRasters(username, password, product, u'u', avisoCurrentsDirectory, rasterNameExpressions=['u', '%%Y', 'u%%Y%%j0000.img'], startDate=startDate, endDate=endDate, timeout=timeout, maxRetryTime=maxRetryTime, cacheDirectory=cacheDirectory)
-            AvisoGriddedGeostrophicCurrents.CreateArcGISRasters(username, password, product, u'v', avisoCurrentsDirectory, rasterNameExpressions=['v', '%%Y', 'v%%Y%%j0000.img'], startDate=startDate, endDate=endDate, timeout=timeout, maxRetryTime=maxRetryTime, cacheDirectory=cacheDirectory)
-
-        # If we created any rasters, record in the Simulation.ini file
-        # that we got some, so that any new rasters loaded into the
-        # simulation must be from the same product and depth.
-            
+            scp.write(f)
         finally:
-            import glob
-            if len(glob.glob(os.path.join(os.path.join(avisoCurrentsDirectory, u'u', u'*', u'u[0-9][0-9][0-9][0-9][0-9][0-9][0-9]0000.img')))) > 0:
-                scp.set(u'Simulation', u'CurrentsLoaded', unicode(True))
-                scp.set(u'Simulation', u'CurrentsProduct', u'Aviso ' + product)
-                scp.set(u'Simulation', u'CurrentsDateType', u'Center')
-                if u'DT-Ref' in product or u'DT-Upd' in product:
-                    scp.set(u'Simulation', u'MaxSecondsBetweenCurrentsImages', unicode(7*86400))
-                else:
-                    scp.set(u'Simulation', u'MaxSecondsBetweenCurrentsImages', unicode(86400))
-                f = file(os.path.join(simulationDirectory, u'Simulation.ini'), 'w')
-                try:
-                    scp.write(f)
-                finally:
-                    try:
-                        f.close()
-                    except:
-                        pass
+            try:
+                f.close()
+            except:
+                pass
 
         # Obtain the projection, extent, and cell size of the reef IDs
@@ -231 +339 @@
         gp.Extent = describeReefIDsRaster.Extent
         try:
-            ArcGISRaster.FindAndProjectClipAndOrExecuteMapAlgebra(avisoCurrentsDirectory,
+            ArcGISRaster.FindAndProjectClipAndOrExecuteMapAlgebra(originalCurrentsDirectory,
                                                                   os.path.join(simulationDirectory, u'Currents'),
                                                                   projectedCoordinateSystem=reefIDsRasterCS,
@@ -237 +345 @@
                                                                   projectedCellSize=reefIDsCellSize,
                                                                   registrationPoint=u'%g %g' % (reefIDsRasterLeft, reefIDsRasterBottom),
-                                                                  mapAlgebraExpression=u'setnull( inputRaster > 1000000 || inputRaster < -1000000, inputRaster / 100)',       # Convert from cm/s to to m/s and mask bogus values introduced by ArcGIS
+                                                                  mapAlgebraExpression=mapAlgebraExpression,
                                                                   wildcard=u'*.img',
                                                                   searchTree=True,
@@ -250 +358 @@
             if oldGPExtent is not None:
                 gp.Extent = oldGPExtent
-
-        # Return successfully.
-
-        return simulationDirectory
-
-    @classmethod
-    def LoadHYCOMGOMl0044DCurrentsIntoSimulation(cls, simulationDirectory, startDate, endDate, depth=0., timeout=600, maxRetryTime=None, cacheDirectory=None):
-        cls.__doc__.Obj.ValidateMethodInvocation()
-
-        # Parse and validate the Simulation.ini file.
-
-        scp, crosses180, currentsLoaded, currentsProduct = cls._ReadCurrentsInfoFromSimulationINI(simulationDirectory)
-
-        # If the simulation already has currents loaded in it from a
-        # different product or depth, report an error.
-
-        if currentsLoaded and currentsProduct != u'HYCOM GOMl0.04 ' + unicode(int(depth)) + u' m':
-            Logger.RaiseException(ValueError(_(u'Cannot load %(prod1)s currents data into the simulation in directory %(dir)s because that simulation already has %(prod2)s currents data loaded into it. You can load additional %(prod2)s data, if you like, but to use %(prod1)s data, you must create a new simulation.') % {u'dir': simulationDirectory, u'prod1': u'HYCOM GOMl0.04 ' + unicode(int(depth)) + u' m', u'prod2': currentsProduct}))
-
-        # First, download and create HYCOM current rasters in a
-        # HYCOM-specific directory. These will have the HYCOM
-        # projection, extent, and cell size. We still need to project
-        # them to the simulation's projection, extent, and cell size.
-
-        hycomCurrentsDirectory = os.path.join(simulationDirectory, 'OriginalHYCOMCurrents')
-        try:
-            HYCOMGOMl0044D.CreateArcGISRasters(u'u', hycomCurrentsDirectory, rasterNameExpressions=['%(VariableName)s', '%%Y', '%(VariableName)s%%Y%%j0000.img'], minDepth=depth, maxDepth=depth, startDate=startDate, endDate=endDate, timeout=timeout, maxRetryTime=maxRetryTime, cacheDirectory=cacheDirectory)
-            HYCOMGOMl0044D.CreateArcGISRasters(u'v', hycomCurrentsDirectory, rasterNameExpressions=['%(VariableName)s', '%%Y', '%(VariableName)s%%Y%%j0000.img'], minDepth=depth, maxDepth=depth, startDate=startDate, endDate=endDate, timeout=timeout, maxRetryTime=maxRetryTime, cacheDirectory=cacheDirectory)
-
-        # If we created any rasters, record in the Simulation.ini file
-        # that we got some, so that any new rasters loaded into the
-        # simulation must be from the same product and depth.
-            
-        finally:
-            import glob
-            if len(glob.glob(os.path.join(os.path.join(hycomCurrentsDirectory, u'u', u'*', u'u[0-9][0-9][0-9][0-9][0-9][0-9][0-9]0000.img')))) > 0:
-                scp.set(u'Simulation', u'CurrentsLoaded', unicode(True))
-                scp.set(u'Simulation', u'CurrentsProduct', u'HYCOM GOMl0.04 ' + unicode(int(depth)) + u' m')
-                scp.set(u'Simulation', u'CurrentsDateType', u'Center')
-                scp.set(u'Simulation', u'MaxSecondsBetweenCurrentsImages', unicode(86400))
-                f = file(os.path.join(simulationDirectory, u'Simulation.ini'), 'w')
-                try:
-                    scp.write(f)
-                finally:
-                    try:
-                        f.close()
-                    except:
-                        pass
-
-        # Obtain the projection, extent, and cell size of the reef IDs
-        # raster, so we can project, snap, and clip the currents
-        # rasters to match it.
-
-        from GeoEco.ArcGIS import GeoprocessorManager
-        gp = GeoprocessorManager.GetWrappedGeoprocessor()
-
-        describeReefIDsRaster = gp.Describe(os.path.join(simulationDirectory, u'ReefData', u'reef_ids'))
-        reefIDsRasterCS = gp.CreateSpatialReference(describeReefIDsRaster.SpatialReference).split(';')[0]
-        reefIDsRasterLeft, reefIDsRasterBottom, reefIDsRasterRight, reefIDsRasterTop = EnvelopeTypeMetadata.ParseFromArcGISString(describeReefIDsRaster.Extent)
-        reefIDsCellSize = describeReefIDsRaster.MeanCellWidth
-
-        # Use a GeoEco function that calls Project_management to
-        # project, snap, and clip the rasters all in one step.
-
-        from GeoEco.DataManagement.ArcGISRasters import ArcGISRaster
-
-        oldGPExtent = gp.Extent
-        gp.Extent = describeReefIDsRaster.Extent
-        try:
-            ArcGISRaster.FindAndProjectClipAndOrExecuteMapAlgebra(hycomCurrentsDirectory,
-                                                                  os.path.join(simulationDirectory, u'Currents'),
-                                                                  projectedCoordinateSystem=reefIDsRasterCS,
-                                                                  resamplingTechnique=u'BILINEAR',
-                                                                  projectedCellSize=reefIDsCellSize,
-                                                                  registrationPoint=u'%g %g' % (reefIDsRasterLeft, reefIDsRasterBottom),
-                                                                  wildcard=u'*.img',
-                                                                  searchTree=True,
-                                                                  outputRasterPythonExpression=u'os.path.join(outputWorkspace, os.path.splitext(inputRaster[len(workspaceToSearch)+1:])[0])',
-                                                                  modulesToImport=[u'os'],
-                                                                  skipExisting=True)
-
-        # Reset the geoprocessing extent environment setting to
-        # whatever the caller had before.
-
-        finally:
-            if oldGPExtent is not None:
-                gp.Extent = oldGPExtent
-
-        # Return successfully.
-
-        return simulationDirectory
 
     @classmethod
@@ -1076 +1093 @@
     arcGISDisplayName=_(u'Updated simulation directory'))
 
+# Public method: CoralReefConnectivity.LoadOSCARCurrentsIntoSimulation
+
+AddMethodMetadata(CoralReefConnectivity.LoadOSCARCurrentsIntoSimulation,
+    shortDescription=_(u'Downloads NOAA OSCAR 5-day unfiltered 1/3 degree ocean surface currents into a coral reef connectivity simulation.'),
+    longDescription=_OSCAR_LongDescription % {u'name': 'tool'},
+    isExposedToPythonCallers=True,
+    isExposedByCOM=True,
+    isExposedAsArcGISTool=True,
+    arcGISDisplayName=_(u'Load OSCAR Currents Into Coral Reef Connectivity Simulation'),
+    arcGISToolCategory=_(u'Connectivity Analysis\\Coral Reef Larval Connectivity'),
+    dependencies=[ArcGISDependency(9, 2), ArcGISExtensionDependency(u'spatial'), PythonAggregatedModuleDependency('numpy')])
+
+CopyArgumentMetadata(CoralReefConnectivity.CreateSimulationFromArcGISRasters, u'cls', CoralReefConnectivity.LoadOSCARCurrentsIntoSimulation, u'cls')
+
+AddArgumentMetadata(CoralReefConnectivity.LoadOSCARCurrentsIntoSimulation, u'simulationDirectory',
+    typeMetadata=DirectoryTypeMetadata(mustExist=True),
+    description=_(
+u"""Existing coral reef connectivity simulation directory that should
+recieve the OSCAR currents data.
+
+The directory must have been created using the Create Coral Reef
+Connectivity Simulation tool.
+
+If you have already loaded OSCAR currents data into the simulation,
+you can use this tool to add data for an additional range of dates. If
+you try to load data for a range of dates that have been already
+loaded into the simulation, the downloads for those dates will be
+skipped."""),
+    arcGISDisplayName=_(u'Simulation directory to recieve OSCAR currents data'))
+
+CopyArgumentMetadata(CoralReefConnectivity.LoadAvisoGeostrophicCurrentsIntoSimulation, u'startDate', CoralReefConnectivity.LoadOSCARCurrentsIntoSimulation, u'startDate')
+CopyArgumentMetadata(CoralReefConnectivity.LoadAvisoGeostrophicCurrentsIntoSimulation, u'endDate', CoralReefConnectivity.LoadOSCARCurrentsIntoSimulation, u'endDate')
+CopyArgumentMetadata(OSCAR5DayThirdDegreeCurrents.CreateArcGISRasters, u'timeout', CoralReefConnectivity.LoadOSCARCurrentsIntoSimulation, u'timeout')
+CopyArgumentMetadata(OSCAR5DayThirdDegreeCurrents.CreateArcGISRasters, u'maxRetryTime', CoralReefConnectivity.LoadOSCARCurrentsIntoSimulation, u'maxRetryTime')
+CopyArgumentMetadata(OSCAR5DayThirdDegreeCurrents.CreateArcGISRasters, u'cacheDirectory', CoralReefConnectivity.LoadOSCARCurrentsIntoSimulation, u'cacheDirectory')
+
+CopyResultMetadata(CoralReefConnectivity.LoadAvisoGeostrophicCurrentsIntoSimulation, u'updatedSimulationDirectory', CoralReefConnectivity.LoadOSCARCurrentsIntoSimulation, u'updatedSimulationDirectory')
+
 # Public method: CoralReefConnectivity.LoadHYCOMGOMl0044DCurrentsIntoSimulation
 
@@ -1130 +1185 @@
   simulation. It does not implement vertical migration or other
   behaviors that might be appropriate for your species. A newer
-  version of this tool, to be released in 2011, will support vertical
+  version of this tool, to be released in 2012, will support vertical
   migration.
 
@@ -1147 +1202 @@
 
 CopyResultMetadata(CoralReefConnectivity.LoadAvisoGeostrophicCurrentsIntoSimulation, u'updatedSimulationDirectory', CoralReefConnectivity.LoadHYCOMGOMl0044DCurrentsIntoSimulation, u'updatedSimulationDirectory')
+
+# Public method: CoralReefConnectivity.LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation
+
+AddMethodMetadata(CoralReefConnectivity.LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation,
+    shortDescription=_(u'Downloads HYCOM GLBa0.08 ocean currents into a coral reef connectivity simulation.'),
+    longDescription=_HYCOMGLBa008Equatorial_LongDescription % {u'name': 'tool'},
+    isExposedToPythonCallers=True,
+    isExposedByCOM=True,
+    isExposedAsArcGISTool=True,
+    arcGISDisplayName=_(u'Load HYCOM GLBa0.08 Currents Into Coral Reef Connectivity Simulation'),
+    arcGISToolCategory=_(u'Connectivity Analysis\\Coral Reef Larval Connectivity'),
+    dependencies=[ArcGISDependency(9, 2), ArcGISExtensionDependency(u'spatial'), PythonAggregatedModuleDependency('numpy')])
+
+CopyArgumentMetadata(CoralReefConnectivity.LoadAvisoGeostrophicCurrentsIntoSimulation, u'cls', CoralReefConnectivity.LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation, u'cls')
+
+AddArgumentMetadata(CoralReefConnectivity.LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation, u'simulationDirectory',
+    typeMetadata=DirectoryTypeMetadata(mustExist=True),
+    description=_(
+u"""Existing coral reef connectivity simulation directory that should
+recieve the currents.
+
+The directory must have been created using the Create Coral Reef
+Connectivity Simulation tool.
+
+If you have already loaded HYCOM GLBa0.08 currents into the
+simulation, you can use this tool to add currents for an additional
+range of dates so long as they are for the same depth as the original
+currents. If you try to add a different currents product to the
+simulation (e.g. geostrophic currents from Aviso), or for a different
+depth, this tool will report an error.
+
+If you try to load data for a range of dates that have been already
+loaded into the simulation, the downloads for those dates will be
+skipped. There is no way to delete or overwrite the data that has
+already been loaded into the simulation. If you want to overwrite your
+existing data (e.g. you want to switch to using a different depth),
+you must create a new simulation."""),
+    arcGISDisplayName=_(u'Simulation directory to recieve HYCOM currents'))
+
+CopyArgumentMetadata(CoralReefConnectivity.LoadAvisoGeostrophicCurrentsIntoSimulation, u'startDate', CoralReefConnectivity.LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation, u'startDate')
+CopyArgumentMetadata(CoralReefConnectivity.LoadAvisoGeostrophicCurrentsIntoSimulation, u'endDate', CoralReefConnectivity.LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation, u'endDate')
+
+AddArgumentMetadata(CoralReefConnectivity.LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation, u'depth',
+    typeMetadata=FloatTypeMetadata(allowedValues=[0., 10., 20., 30., 50., 75., 100., 125., 150., 200., 250., 300., 400., 500., 600., 700., 800., 900., 1000., 1100., 1200., 1300., 1400., 1500., 1750., 2000., 2500., 3000., 3500., 4000., 4500., 5000., 5500.]),
+    description=_(
+u"""HYCOM depth layer to download currents from.
+
+This tool was designed primarily to study larvae that float at or near
+the surface. The default depth is 0. If you are studying larvae that
+stay submerged, you can choose a deeper depth, but be aware of two
+important points:
+
+* This tool assumes the larvae remain at that depth for the entire
+  simulation. It does not implement vertical migration or other
+  behaviors that might be appropriate for your species. A newer
+  version of this tool, to be released in 2012, will support vertical
+  migration.
+
+* Be aware that the spatial extent of available currents data will
+  shrink as depth increases. For example, if you choose a deep depth
+  such as 250 m, there will be no data available for regions close to
+  shore because the ocean is typically shallower than 250 m in those
+  regions.
+"""),
+    arcGISDisplayName=_(u'Minimum depth'))
+
+CopyArgumentMetadata(HYCOMGLBa008Equatorial4D.CreateArcGISRasters, u'extendYExtent', CoralReefConnectivity.LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation, u'extendYExtent')
+CopyArgumentMetadata(HYCOMGLBa008Equatorial4D.CreateArcGISRasters, u'timeout', CoralReefConnectivity.LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation, u'timeout')
+CopyArgumentMetadata(HYCOMGLBa008Equatorial4D.CreateArcGISRasters, u'maxRetryTime', CoralReefConnectivity.LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation, u'maxRetryTime')
+CopyArgumentMetadata(HYCOMGLBa008Equatorial4D.CreateArcGISRasters, u'cacheDirectory', CoralReefConnectivity.LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation, u'cacheDirectory')
+
+CopyResultMetadata(CoralReefConnectivity.LoadAvisoGeostrophicCurrentsIntoSimulation, u'updatedSimulationDirectory', CoralReefConnectivity.LoadHYCOMGLBa0084DEquatorialCurrentsIntoSimulation, u'updatedSimulationDirectory')
 
 # Public method: CoralReefConnectivity.RunSimulation

MGET/Branches/Jason/PythonPackage/src/GeoEco/DataProducts/NOAA/OSCAR.py

@@ -367 +367 @@
 
 _OSCAR_LongDescription = _(
-u"""The NOAA Ocean Surface Current Analyses - Real Time (OSCAR)
+u"""The `NOAA Ocean Surface Current Analyses - Real Time (OSCAR) <http://www.oscar.noaa.gov/>`_
 project publishes global estimates of ocean surface currents by
 combining satellite observations from altimeters that measure the
@@ -387 +387 @@
 images occasionally occur 6 days apart according to a regular pattern.
 
-This product is provided in a geographic projection and encompasses
-latitudes 80 S to 80 N and 360 degrees of longitude. The images are
-centered on approximately 160 W to provide an uninterrupted view of
-the tropical Indian, Pacific, and Atlantic Oceans.
+This product is provided in a geographic projection with a cell size
+of 1/3 degree. It encompasses latitudes 80 N to 80 S and 360 degrees
+of longitude. The images are centered on approximately 160 W to
+provide an uninterrupted view of the tropical Indian, Pacific, and
+Atlantic Oceans.
 
 The OSCAR OPeNDAP dataset accessed by this %(name)s is
@@ -444 +445 @@
 the long term mean velocity. The mean is usually computed over all of
 the years that have complete data. For example, at the time this tool
-was developed, in late 2011, the mean was computed over 1993-2010,
+was developed in late 2011, the mean was computed over 1993-2010,
 inclusive. (1992 and 2011 were excluded, presumably because they were
 incomplete years.)
@@ -602 +603 @@
 the date of the most recent image will be used. The OSCAR OPeNDAP
 dataset that is accessed is a long term archive that may not be
-updated daily. For example, when this tool was written, in late 2011,
+updated daily. For example, when this tool was written in late 2011,
 the archive ended in September 2011.
 

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

@@ -915 +915 @@
             else:
                 if start is not None and stop < start:
-                    raise IndexError(_(u'%(dim)sMin (%(value1)i) is greater than %(dim)sMax (%(value2)i). %(dim)sMax must be greater than %(dim)sMin.') % {u'dim': dim, u'value1': start, u'value2': stop})
+                    raise IndexError(_(u'%(dim)sMin (%(value1)s) is greater than %(dim)sMax (%(value2)s). %(dim)sMax must be greater than %(dim)sMin.') % {u'dim': dim, u'value1': repr(start), u'value2': repr(stop)})
                 absStop = bisect.bisect_right(grid.CenterCoords[dim], stop)
                 if absStop == 0:

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

@@ -2390 +2390 @@
                     if sr is not None and sr.IsGeographic():
                         coord = coord - (coord // 360) * 360        # Convert the requested x coordinate to 0 to 360, regardless of what it currently is
-                    if coord >= self.MaxCoords[d, -1]:
-                        coord = coord - 360                         # If it is beyond the right edge of the grid, subtract 360 in case the grid uses -180 to 180 or some other rotated range
+
+                    # If coord is less than the min x extent, add 360
+                    # until it is greater than or equal it, to handle
+                    # coordinate systems such as NOAA OSCAR, which
+                    # uses a 20 to 380 system.
+
+                    if coord < self.MinCoords[d, 0]:
+                        while coord < self.MinCoords[d, 0]:
+                            coord += 360.
+
+                    # Otherwise, if it is greater than or equal to the
+                    # max x extent, subtract 360 until it is less than
+                    # it, to handle coordinate systems such as MODIS
+                    # L3 which uses a -180 to 180 system.
+
+                    elif coord >= self.MaxCoords[d, -1]:
+                        while coord >= self.MaxCoords[d, -1]:
+                            coord -= 360.
 
                 # If this dimension is x, y, or z and has a constant