Changeset 53 for FCC2


Ignore:
Timestamp:
19/07/13 09:57:52 (6 years ago)
Author:
mjuckes
Message:

verion 0.84: accept file name time periods with matching end points (for time mean fields)

Location:
FCC2/trunk/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • FCC2/trunk/source/fcc_utils.py

    r51 r53  
    322322  def parse(self,dsclass, dsid, files, inFileChecks=False, forceInFileChecks=True): 
    323323      self.h.nofail = True 
     324## allowEndPeriodEqual should only be permitted for time averaged fields, but in this version it is set true for all fields. 
     325      allowEndPeriodEqual = True 
    324326      try: 
    325327        fns = map( lambda x: x[1], self.qcc.fileNameSegments.segments ) 
     
    373375              cc = '' 
    374376              for k in range( len(tbl) -1 ): 
    375                 if tbl[k+1][0] <= tbl[k][1]: 
     377                if tbl[k+1][0] < tbl[k][1] or (tbl[k+1][0] == tbl[k][1] and not allowEndPeriodEqual): 
    376378                  thisOk = False 
    377379                  cc += '%s, %s [%s,%s];' % (str(files[k]), str(files[k+1]),tbl[k][1],tbl[k+1][0]) 
  • FCC2/trunk/source/run_fcc.py

    r52 r53  
    7575 
    7676        baseDir = thisDir 
    77         scriptVersion = 0.83 
     77        scriptVersion = 0.84 
    7878        scriptName = 'run_fcc' 
    7979 
Note: See TracChangeset for help on using the changeset viewer.