Changeset 913

Show
Ignore:
Timestamp:
02/16/12 16:01:51 (15 months ago)
Author:
jjr8
Message:

Continued work on:
* #518: MGET tools should utilize the ArcGIS progress bar (ArcGIS 9.3 and higher)
* #519: Ocean currents tools (Aviso, OSCAR, HYCOM, ROMS-CoSiNE) should calculate eddy kinetic energy, current direction, and current magnitude grids

Location:
MGET/Branches/Jason/PythonPackage/src/GeoEco
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • MGET/Branches/Jason/PythonPackage/src/GeoEco/DataProducts/Aviso.py

    r911 r913  
    510510         
    511511        if parameter in [u'u', u'v']: 
    512             AvisoGriddedGeostrophicCurrents(productName, parameter, temporalResolution, username, password, timeout, maxRetryTime, cacheDirectory) 
     512            return AvisoGriddedGeostrophicCurrents(productName, parameter, temporalResolution, username, password, timeout, maxRetryTime, cacheDirectory) 
    513513 
    514514        # The caller wants something derived from both u and v. First 

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

    r911 r913  
    169169        if name in ['CornerCoords', 'Shape']: 
    170170            if self._Grid is None: 
    171                 self._Grid = cls._ConstructGridForParameter(self._Parameter, self._Timeout, self._MaxRetryTime, self._CacheDirectory) 
     171                self._Grid = self._ConstructGridForParameter(self._Parameter, self._Timeout, self._MaxRetryTime, self._CacheDirectory) 
    172172 
    173173            if name == 'CornerCoords': 
    … …  
    189189 
    190190        if self._Grid is None: 
    191             self._Grid = cls._ConstructGridForParameter(self._Parameter, self._Timeout, self._MaxRetryTime, self._CacheDirectory) 
     191            self._Grid = self._ConstructGridForParameter(self._Parameter, self._Timeout, self._MaxRetryTime, self._CacheDirectory) 
    192192         
    193193        return self._Grid._GetCoords(coord, coordNum, slices, sliceDims, fixedIncrementOffset) 
    … …  
    205205 
    206206        if self._Grid is None: 
    207             self._Grid = cls._ConstructGridForParameter(self._Parameter, self._Timeout, self._MaxRetryTime, self._CacheDirectory) 
     207            self._Grid = self._ConstructGridForParameter(self._Parameter, self._Timeout, self._MaxRetryTime, self._CacheDirectory) 
    208208 
    209209        sliceList = [sliceList[0], slice(0, 1), sliceList[1], sliceList[2]] 
    … …  
    215215 
    216216        # If the caller just wants u, v, u_anom, or v_anom, construct 
    217         # and return a OSCAR5DayThirdDegreeCurrents instance. 
     217        # and return a _OSCAR5DayThirdDegreeCurrents4D instance. 
    218218         
    219219        if parameter in [u'u', u'v', u'u_anom', u'v_anom']: 
    220             OSCAR5DayThirdDegreeCurrents(parameter, timeout, maxRetryTime, cacheDirectory) 
     220            return _OSCAR5DayThirdDegreeCurrents4D(parameter, timeout, maxRetryTime, cacheDirectory) 
    221221 
    222222        # The caller wants something derived from both u and v. First 
    … …  
    224224 
    225225        if parameter.endswith('_anom'): 
    226             uGrid = OSCAR5DayThirdDegreeCurrents(u'u_anom', timeout, maxRetryTime, cacheDirectory) 
    227             vGrid = OSCAR5DayThirdDegreeCurrents(u'v_anom', timeout, maxRetryTime, cacheDirectory) 
     226            uGrid = _OSCAR5DayThirdDegreeCurrents4D(u'u_anom', timeout, maxRetryTime, cacheDirectory) 
     227            vGrid = _OSCAR5DayThirdDegreeCurrents4D(u'v_anom', timeout, maxRetryTime, cacheDirectory) 
    228228        else: 
    229             uGrid = OSCAR5DayThirdDegreeCurrents(u'u', timeout, maxRetryTime, cacheDirectory) 
    230             vGrid = OSCAR5DayThirdDegreeCurrents(u'v', timeout, maxRetryTime, cacheDirectory) 
     229            uGrid = _OSCAR5DayThirdDegreeCurrents4D(u'u', timeout, maxRetryTime, cacheDirectory) 
     230            vGrid = _OSCAR5DayThirdDegreeCurrents4D(u'v', timeout, maxRetryTime, cacheDirectory) 
    231231 
    232232        # Now construct and return the appropriate DerivedGrid 
    … …  
    512512* dir_anom - Direction of water flow (from u_anom and v_anom). 
    513513 
    514 * eke - Eddy kinetic energy, in cm^2/s^2, computed as 0.5*(u^2 + v^2). 
     514* eke - Eddy kinetic energy, in m^2/s^2, computed as 0.5*(u^2 + v^2). 
    515515 
    516516* mag - Absolute magnitude (or modulus) of the water velocity vector, 
    517   in cm/s. 
     517  in m/s. 
    518518 
    519519* mag_anom - Absolute magnitude of water velocity (from u_anom and 

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

    r911 r913  
    20082008                                                    completionMessage=_(u'Aggregation complete: %(elapsed)s elapsed, %(opsCompleted)i grids aggregated, %(perOp)s per grid.'), 
    20092009                                                    abortedMessage=_(u'Aggregation stopped before all grids were aggregated: %(elapsed)s elapsed, %(opsCompleted)i grids aggregated, %(perOp)s per grid, %(opsIncomplete)i not aggregated.'), 
    2010                                                     loggingChannel=u'GeoEco.Datasets') 
     2010                                                    loggingChannel=u'GeoEco.Datasets', 
     2011                                                    arcGISProgressorLabel=_(u'Aggregating %(count)i grids') % {u'count': len(self._Grids)} ) 
    20112012                progressReporter.Start(len(self._Grids)) 
    20122013            else: