sm/smbinterp
1
0
Fork 0
Code Issues Pull Requests Activity

improved the sheep

Browse Source
This commit is contained in:
Stephen McQuay 2011-05-18 12:59:57 -06:00
parent dc15bd17bb
commit 81d48561e6
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bin/sheep.py
View File

@ -13,12 +13,12 @@ import numpy as np
import interp.bootstrap import interp.bootstrap
from interp.grid.gmsh import ggrid from interp.grid.gmsh import ggrid
from interp.tools import baker_exact_3D as exact from interp.tools import *
from interp.cluster import QueueManager, get_qs from interp.cluster import QueueManager, get_qs
if __name__ == '__main__': if __name__ == '__main__':
parser = OptionParser(usage = "usage: %s [options] <server> <gmsh file>") parser = OptionParser(usage = "usage: %s [options] <server> <gmsh file> <dimension> <baker|friendly>")
parser.add_option("-v", "--verbose", parser.add_option("-v", "--verbose",
action="store_true", dest="verbose", default=False, action="store_true", dest="verbose", default=False,
@ -30,11 +30,22 @@ if __name__ == '__main__':
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
if len(args) != 2: if len(args) != 4:
parser.print_usage() parser.print_usage()
sys.exit(1) sys.exit(1)
server, input_file = args server, input_file, dimension, exact_type = args
dimension = int(dimension)
if dimension == 2 and exact_type == 'baker':
exact = baker_exact_2D
elif dimension == 2 and exact_type == 'friendly':
exact = friendly_exact_2D
elif dimension == 3 and exact_type == 'baker':
exact = baker_exact_3D
elif dimension == 3 and exact_type == 'friendly':
exact = friendly_exact_3D
myname = "%s-%d" % (os.uname()[1], os.getpid()) myname = "%s-%d" % (os.uname()[1], os.getpid())
if options.verbose: if options.verbose:
@ -48,7 +59,7 @@ if __name__ == '__main__':
if options.verbose: if options.verbose:
print "%s: starting parse input file" % myname print "%s: starting parse input file" % myname
g = ggrid(input_file) g = ggrid(input_file, dimension)
g.q = np.array([exact(x) for x in g.verts]) g.q = np.array([exact(x) for x in g.verts])
if options.verbose: if options.verbose:
print "%s: done parsing input file" % myname print "%s: done parsing input file" % myname
@ -63,7 +74,7 @@ if __name__ == '__main__':
print "%s: waiting for master to tell me to start" % myname print "%s: waiting for master to tell me to start" % myname
action = minionsq.get() action = minionsq.get()
if options.verbose: if options.verbose:
print "%s: master said go!!" % myname print "%s: got message from master: %s" % (myname, action)
if action in ('teardown', 'slay'): if action in ('teardown', 'slay'):
break break
@ -87,8 +98,7 @@ if __name__ == '__main__':
cur_exact = 0.0 cur_exact = 0.0
duration = 0 duration = 0
resultsq.put(( resultsq.put((i,
i,
cur_qlin, cur_qlin,
cur_error, cur_error,
cur_final, cur_final,