Changeset 920

Show
Ignore:
Timestamp:
02/20/12 13:31:47 (15 months ago)
Author:
jjr8
Message:

Incremented build number. Fixed/implemented:
* #525: Add support for R 2.14.1
* #528: MGET should allow user to specify the R version to use with the R_HOME environment variable

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

Legend:

Unmodified
Added
Removed

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

    r808 r920  
    12151215example, when this tool was developed in December 2010, finalized data 
    12161216were available for 1981-2006, interim data were avilable for 
    1217 2007-2009, and no data were available for 2010 yet.""") 
     12172007-2009, and no data were available for 2010 yet. 
     1218 
     1219This tool uses data from Pathfinder version 5.0 for the years 
     12201985-2009 and version 5.1 for all other years (at the time of this 
     1221writing, these years were 1981-1984). This tool cannot access data 
     1222from Pathfinder 5.2 or later. For more information about Pathfinder 
     12235.2, please contact the MGET development team.""") 
    12181224 
    12191225AddClassMetadata(AVHRRPathfinderSSTTimeSeries, 
    … …  
    12321238 
    12331239**References** 
     1240 
     1241Casey, K.S., T.B. Brandon, P. Cornillon, and R. Evans (2010). "The 
     1242Past, Present and Future of the AVHRR Pathfinder SST Program", in 
     1243Oceanography from Space: Revisited, eds. V. Barale, J.F.R. Gower, and 
     1244L. Alberotanza, Springer. doi: 10.1007/978-90-481-8681-5_16. 
    12341245 
    12351246Kilpatrick, K., G. Podesta, and R. Evans. (2001). Overview of the 
    … …  
    16171628**References** 
    16181629 
     1630Casey, K.S., T.B. Brandon, P. Cornillon, and R. Evans (2010). "The 
     1631Past, Present and Future of the AVHRR Pathfinder SST Program", in 
     1632Oceanography from Space: Revisited, eds. V. Barale, J.F.R. Gower, and 
     1633L. Alberotanza, Springer. doi: 10.1007/978-90-481-8681-5_16. 
     1634 
    16191635Kilpatrick, K., G. Podesta, and R. Evans. (2001). Overview of the 
    16201636NOAA/NASA advanced very high resolution radiometer Pathfinder 
    … …  
    18411857 
    18421858**References** 
     1859 
     1860Casey, K.S., T.B. Brandon, P. Cornillon, and R. Evans (2010). "The 
     1861Past, Present and Future of the AVHRR Pathfinder SST Program", in 
     1862Oceanography from Space: Revisited, eds. V. Barale, J.F.R. Gower, and 
     1863L. Alberotanza, Springer. doi: 10.1007/978-90-481-8681-5_16. 
    18431864 
    18441865Kilpatrick, K., G. Podesta, and R. Evans. (2001). Overview of the 
    … …  
    21172138**References** 
    21182139 
     2140Casey, K.S., T.B. Brandon, P. Cornillon, and R. Evans (2010). "The 
     2141Past, Present and Future of the AVHRR Pathfinder SST Program", in 
     2142Oceanography from Space: Revisited, eds. V. Barale, J.F.R. Gower, and 
     2143L. Alberotanza, Springer. doi: 10.1007/978-90-481-8681-5_16. 
     2144 
    21192145Kilpatrick, K., G. Podesta, and R. Evans. (2001). Overview of the 
    21202146NOAA/NASA advanced very high resolution radiometer Pathfinder 
    … …  
    23972423**References** 
    23982424 
     2425Casey, K.S., T.B. Brandon, P. Cornillon, and R. Evans (2010). "The 
     2426Past, Present and Future of the AVHRR Pathfinder SST Program", in 
     2427Oceanography from Space: Revisited, eds. V. Barale, J.F.R. Gower, and 
     2428L. Alberotanza, Springer. doi: 10.1007/978-90-481-8681-5_16. 
     2429 
    23992430Kilpatrick, K., G. Podesta, and R. Evans. (2001). Overview of the 
    24002431NOAA/NASA advanced very high resolution radiometer Pathfinder 

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

    r913 r920  
    13301330 
    13311331            else: 
     1332                import numpy 
     1333 
    13321334                offsets = [] 
    13331335                 
    13341336                for i in range(len(mask.Dimensions)): 
    1335                     gridCoords = self.CenterCoords[mask.Dimensions[i]] 
    1336                     maskCoords = mask.CenterCoords[mask.Dimensions[i]] 
     1337                    gridCoords = numpy.cast['float32'](self.CenterCoords[mask.Dimensions[i]]) 
     1338                    maskCoords = numpy.cast['float32'](mask.CenterCoords[mask.Dimensions[i]]) 
    13371339 
    13381340                    if gridCoords[0] < maskCoords[0] or gridCoords[-1] > maskCoords[-1]: 
    … …  
    31923194                                                    arguments=args, 
    31933195                                                    windowState=u'invisible', 
    3194                                                     maxRunTime=300) 
     3196                                                    maxRunTime=None) 
    31953197                    finally: 
    31963198                        Logger.SetLogInfoAsDebug(oldLogInfoAsDebug) 

  • MGET/Branches/Jason/PythonPackage/src/GeoEco/R.py

    r740 r920  
    682682        try: 
    683683            try: 
    684                 versionString = rpy_tools.get_R_VERSION(force_exec=False) 
     684                homeString = rpy_tools.get_R_HOME() 
     685                Logger.Debug(_(u'RHOME is %(value)s') % {u'value': homeString}) 
     686            except Exception, e: 
     687                homeString = None 
     688                Logger.Debug(_(u'RHOME has not been set.')) 
     689            try: 
     690                versionString = rpy_tools.get_R_VERSION(force_exec=False, RHOME=homeString) 
    685691            except Exception, e: 
    686692                print(str(e).replace('\n', ' ').strip()) 

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

    r903 r920  
    1 __version__ = u'0.8a33' 
     1__version__ = u'0.8a34'