schain Commit - r1401:c018ae3094fa · Jicamarca Repository

Límite de bloques, hora, zona horaria

joabAM -

r1401:c018ae3094fa

parent child

Context file:

r1401:c018ae3094fa

Collapse all files

schainpy/model/io/jroIO_param.py +28 -14

                     self.__setBlockList()
                     if 'type' in self.meta:
+                        ##print("Creting dataOut...")
                         self.dataOut = eval(self.meta['type'])()
+                        ##print(vars(self.dataOut))
                     for attr in self.meta:
-                        #print("attr: ", attr)
+                        ##print("attr: ", attr)
+                        ##print(type(self.dataOut).__name__)
                         setattr(self.dataOut, attr, self.meta[attr])
                     self.blockIndex = 0
                     return
                         #self.dataOut.error = True      TERMINA EL PROGRAMA, removido
                         return
                     for attr in self.data:
+                        #print("attr ",attr)
                         if self.data[attr].ndim == 1:
                             setattr(self.dataOut, attr, self.data[attr][self.blockIndex])
                         else:
                             setattr(self.dataOut, attr, self.data[attr][:, self.blockIndex])
-                    self.dataOut.flagNoData = False
                     self.blockIndex += 1
                     if self.blockIndex == 1:
                             self.blockIndex,
                             self.blocksPerFile),self.name)
+                    self.dataOut.flagNoData = False
+                    self.dataOut.error = False
                     return
                 def run(self, **kwargs):
                 metadataList = None
                 currentDay = None
                 lastTime = None
+                typeTime = "ut"
+                hourLimit = 3
+                breakDays = True
                 def __init__(self):
                     Operation.__init__(self)
                     return
-                def setup(self, path=None, blocksPerFile=10, metadataList=None, dataList=None, setType=None, description=None):
+                def setup(self, path=None, blocksPerFile=10, metadataList=None, dataList=None, setType=None,
+                            description=None,typeTime = "ut",hourLimit = 3, breakDays=True):
                     self.path = path
                     self.blocksPerFile = blocksPerFile
                     self.metadataList = metadataList
                     self.dataList = [s.strip() for s in dataList]
                     self.setType = setType
                     self.description = description
+                    self.timeZone = typeTime
+                    self.hourLimit = hourLimit
+                    self.breakDays = breakDays
                     if self.metadataList is None:
                         self.metadataList = self.dataOut.metadata_list
                 def timeFlag(self):
                     currentTime = self.dataOut.utctime
+                    if self.timeZone == "lt":
                         timeTuple = time.localtime(currentTime)
+                    elif self.timeZone == "ut":
+                        timeTuple = time.gmtime(currentTime)
                     dataDay = timeTuple.tm_yday
                     #print("time UTC: ",currentTime, self.dataOut.datatime)
                     if self.lastTime is None:
                     timeDiff = currentTime - self.lastTime
-                    #Si el dia es diferente o si la diferencia entre un dato y otro supera la hora
+                    #Si el dia es diferente o si la diferencia entre un dato y otro supera self.hourLimit
-                    if dataDay != self.currentDay:
+                    if (dataDay != self.currentDay) and self.breakDays:
                         self.currentDay = dataDay
                         return True
-                    elif timeDiff > 3*60*60:
+                    elif timeDiff > self.hourLimit*60*60:
                         self.lastTime = currentTime
                         return True
                     else:
                         self.lastTime = currentTime
                         return False
-                def run(self, dataOut, path, blocksPerFile=10, metadataList=None,
+                def run(self, dataOut,**kwargs):
-                        dataList=[], setType=None, description={}):
                     self.dataOut = dataOut
                     if not(self.isConfig):
-                        self.setup(path=path, blocksPerFile=blocksPerFile,
+                        self.setup(**kwargs)
-                                   metadataList=metadataList, dataList=dataList,
-                                   setType=setType, description=description)
                         self.isConfig = True
                         self.setNextFile()
                     ext = self.ext
                     path = self.path
                     setFile = self.setFile
+                    if self.timeZone == "lt":
+                        timeTuple = time.localtime(self.dataOut.utctime)
+                    elif self.timeZone == "ut":
                         timeTuple = time.gmtime(self.dataOut.utctime)
                     #print("path: ",timeTuple)
                     subfolder = 'd%4.4d%3.3d' % (timeTuple.tm_year,timeTuple.tm_yday)

schainpy/model/proc/jroproc_spectra.py 0 0

NO CONTENT: modified file

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages