Skip to content

Commit

Permalink
Fix #12 - Updated to include explicit css01 _gc dir scan
Browse files Browse the repository at this point in the history
  • Loading branch information
durack1 committed Jul 16, 2015
1 parent f6da227 commit 9ce93c1
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions make_cmip5_xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,10 @@ def xmlWrite(inpath,outfile,host_path,cdat_path,start_time,queue1):
queue8 = manager0.Queue(maxsize=0)
p8 = Process(target=pathToFile,args=('/cmip5_css02/scratch/_gc/',start_time,queue8))
p8.start() ; print "".join(['p8 pid: ',str(p8.ident)])
# css01_\_gc
queue9 = manager0.Queue(maxsize=0)
p9 = Process(target=pathToFile,args=('/cmip5_css01/scratch/_gc/',start_time,queue9))
p9.start() ; print "".join(['p9 pid: ',str(p9.ident)])

# Consider parallelising css02_scratch in particular - queue object doesn't play with p.map
'''
Expand Down Expand Up @@ -694,6 +698,9 @@ def job(path,id):
p8.join()
[css02_gc_outfiles,css02_gc_outfiles_paths,time_since_start,i1,i2,len_vars] = queue8.get_nowait()
logWrite(logfile,time_since_start,'css02_gc',i1,css02_gc_outfiles,len_vars)
p9.join()
[css01_gc_outfiles,css01_gc_outfiles_paths,time_since_start,i1,i2,len_vars] = queue9.get_nowait()
logWrite(logfile,time_since_start,'css01_gc',i1,css01_gc_outfiles,len_vars)

# Generate master lists from sublists
outfiles_paths = list(gdo2_data_outfiles_paths)
Expand All @@ -704,6 +711,7 @@ def job(path,id):
outfiles_paths.extend(css02_scratch_outfiles_paths) ; # Add css02_scratch to master
outfiles_paths.extend(css02_cm5_outfiles_paths) ; # Add css02_cmip5 to master
outfiles_paths.extend(css02_gc_outfiles_paths) ; # Add css02_gc to master
outfiles_paths.extend(css01_gc_outfiles_paths) ; # Add css01_gc to master

outfiles = list(gdo2_data_outfiles)
outfiles.extend(gdo2_scratch_outfiles) ; # Add gdo2_scratch to master
Expand All @@ -713,6 +721,7 @@ def job(path,id):
outfiles.extend(css02_scratch_outfiles) ; # Add css02_scratch to master
outfiles.extend(css02_cm5_outfiles) ; # Add css02_cmip5 to master
outfiles.extend(css02_gc_outfiles) ; # Add css02_gc to master
outfiles.extend(css01_gc_outfiles) ; # Add css01_gc to master

# Sort lists by outfiles
outfilesAndPaths = zip(outfiles,outfiles_paths)
Expand Down

0 comments on commit 9ce93c1

Please sign in to comment.