Merge pull request leiyangleon#4 from leiyangleon/update_v1.0.7

update Geogrid to v1.0.7

Author: leiyangleon

testGeogridOptical.py

@@ -119,7 +119,13 @@ def runGeogrid(info, info1, dem, dhdx, dhdy, vx, vy, srx, sry, csminx, csminy, c
     obj.startingY = info.startingY
     obj.XSize = info.XSize
     obj.YSize = info.YSize
-    obj.repeatTime = (info1.time - info.time) * 24.0 * 3600.0
+    from datetime import date
+    import numpy as np
+    d0 = date(np.int(info.time[0:4]),np.int(info.time[4:6]),np.int(info.time[6:8]))
+    d1 = date(np.int(info1.time[0:4]),np.int(info1.time[4:6]),np.int(info1.time[6:8]))
+    date_dt_base = d1 - d0
+    obj.repeatTime = np.abs(date_dt_base.total_seconds())
+#    obj.repeatTime = (info1.time - info.time) * 24.0 * 3600.0
     obj.numberOfLines = info.numberOfLines
     obj.numberOfSamples = info.numberOfSamples
     obj.nodata_out = -32767

testGeogrid_ISCE.py

@@ -162,7 +162,7 @@ def loadMetadataOptical(indir):
     info.YSize = trans[5]
 
     nameString = os.path.basename(DS.GetDescription())
-    info.time = float(nameString.split('_')[3])
+    info.time = nameString.split('_')[3]
 
     info.numberOfLines = DS.RasterYSize
     info.numberOfSamples = DS.RasterXSize
@@ -226,8 +226,8 @@ def runGeogrid(info, info1, dem, dhdx, dhdy, vx, vy, srx, sry, csminx, csminy, c
 
 def runGeogridOptical(info, info1, dem, dhdx, dhdy, vx, vy, srx, sry, csminx, csminy, csmaxx, csmaxy, ssm):
     '''
-        Wire and run geogrid.
-        '''
+    Wire and run geogrid.
+    '''
 
     from components.contrib.geo_autoRIFT.geogrid import GeogridOptical
 #    from geogrid import GeogridOptical
@@ -238,7 +238,13 @@ def runGeogridOptical(info, info1, dem, dhdx, dhdy, vx, vy, srx, sry, csminx, cs
     obj.startingY = info.startingY
     obj.XSize = info.XSize
     obj.YSize = info.YSize
-    obj.repeatTime = (info1.time - info.time) * 24.0 * 3600.0
+    from datetime import date
+    import numpy as np
+    d0 = date(np.int(info.time[0:4]),np.int(info.time[4:6]),np.int(info.time[6:8]))
+    d1 = date(np.int(info1.time[0:4]),np.int(info1.time[4:6]),np.int(info1.time[6:8]))
+    date_dt_base = d1 - d0
+    obj.repeatTime = np.abs(date_dt_base.total_seconds())
+#    obj.repeatTime = (info1.time - info.time) * 24.0 * 3600.0
     obj.numberOfLines = info.numberOfLines
     obj.numberOfSamples = info.numberOfSamples
     obj.nodata_out = -32767