|
|
@@
-520,9
+520,8
class Reader(object):
|
|
|
520
|
|
|
520
|
|
|
|
521
|
def find_files(self, folders, ext, filefmt, startDate=None, endDate=None,
|
|
521
|
def find_files(self, folders, ext, filefmt, startDate=None, endDate=None,
|
|
|
522
|
expLabel='', last=False):
|
|
522
|
expLabel='', last=False):
|
|
|
523
|
|
|
|
|
|
|
524
|
for path in folders:
|
|
523
|
for path in folders:
|
|
|
525
|
files = glob.glob1(path, '*{}'.format(ext))
|
|
524
|
files = glob.glob1(path+'/'+expLabel, '*{}'.format(ext))
|
|
|
526
|
files.sort()
|
|
525
|
files.sort()
|
|
|
527
|
if last:
|
|
526
|
if last:
|
|
|
528
|
if files:
|
|
527
|
if files:
|
|
|
@@
-600,7
+599,6
class Reader(object):
|
|
|
600
|
newFile = self.setNextFileOnline()
|
|
599
|
newFile = self.setNextFileOnline()
|
|
|
601
|
else:
|
|
600
|
else:
|
|
|
602
|
newFile = self.setNextFileOffline()
|
|
601
|
newFile = self.setNextFileOffline()
|
|
|
603
|
|
|
|
|
|
|
604
|
if not(newFile):
|
|
602
|
if not(newFile):
|
|
|
605
|
if self.online:
|
|
603
|
if self.online:
|
|
|
606
|
raise schainpy.admin.SchainError('Time to wait for new files reach')
|
|
604
|
raise schainpy.admin.SchainError('Time to wait for new files reach')
|
|
|
@@
-630,6
+628,7
class Reader(object):
|
|
|
630
|
boolean
|
|
628
|
boolean
|
|
|
631
|
|
|
629
|
|
|
|
632
|
"""
|
|
630
|
"""
|
|
|
|
|
|
631
|
|
|
|
633
|
nextFile = True
|
|
632
|
nextFile = True
|
|
|
634
|
nextDay = False
|
|
633
|
nextDay = False
|
|
|
635
|
|
|
634
|
|
|
|
@@
-784,7
+783,6
class JRODataReader(Reader):
|
|
|
784
|
str -- fullpath of the file
|
|
783
|
str -- fullpath of the file
|
|
|
785
|
"""
|
|
784
|
"""
|
|
|
786
|
|
|
785
|
|
|
|
787
|
|
|
|
|
|
|
788
|
if nextFile:
|
|
786
|
if nextFile:
|
|
|
789
|
self.set += 1
|
|
787
|
self.set += 1
|
|
|
790
|
if nextDay:
|
|
788
|
if nextDay:
|
|
|
@@
-892,7
+890,6
class JRODataReader(Reader):
|
|
|
892
|
self.lastUTTime = self.basicHeaderObj.utc
|
|
890
|
self.lastUTTime = self.basicHeaderObj.utc
|
|
|
893
|
|
|
891
|
|
|
|
894
|
self.flagDiscontinuousBlock = 0
|
|
892
|
self.flagDiscontinuousBlock = 0
|
|
|
895
|
|
|
|
|
|
|
896
|
if deltaTime > self.maxTimeStep:
|
|
893
|
if deltaTime > self.maxTimeStep:
|
|
|
897
|
self.flagDiscontinuousBlock = 1
|
|
894
|
self.flagDiscontinuousBlock = 1
|
|
|
898
|
|
|
895
|
|
