1c1
< # Copyright (c) 2005-2006 The Regents of The University of Michigan
---
> # Copyright (c) 2005-2007 The Regents of The University of Michigan
63c63
< help="ROot directory of Splash2",
---
> help="Root directory of Splash2",
82,84c82,85
< executable = options.rootdir + '/kernels/cholesky/CHOLESKY'
< cmd = 'CHOLESKY -p' + str(options.numcpus) + ' '\
< + options.rootdir + '/kernels/cholesky/inputs/tk23.O'
---
> cwd = options.rootdir + '/kernels/cholesky'
> executable = options.rootdir + '/kernels/cholesky/CHOLESKY'
> cmd = 'CHOLESKY -p' + str(options.numcpus) + ' '\
> + options.rootdir + '/kernels/cholesky/inputs/tk23.O'
87,88c88,90
< executable = options.rootdir + '/kernels/fft/FFT'
< cmd = 'FFT -p' + str(options.numcpus) + ' -m18'
---
> cwd = options.rootdir + '/kernels/fft'
> executable = options.rootdir + '/kernels/fft/FFT'
> cmd = 'FFT -p' + str(options.numcpus) + ' -m18'
91,92c93,95
< executable = options.rootdir + '/kernels/lu/contiguous_blocks/LU'
< cmd = 'LU -p' + str(options.numcpus)
---
> executable = options.rootdir + '/kernels/lu/contiguous_blocks/LU'
> cmd = 'LU -p' + str(options.numcpus)
> cwd = options.rootdir + '/kernels/lu/contiguous_blocks'
95,96c98,100
< executable = options.rootdir + '/kernels/lu/non_contiguous_blocks/LU'
< cmd = 'LU -p' + str(options.numcpus)
---
> executable = options.rootdir + '/kernels/lu/non_contiguous_blocks/LU'
> cmd = 'LU -p' + str(options.numcpus)
> cwd = options.rootdir + '/kernels/lu/non_contiguous_blocks'
99,100c103,105
< executable = options.rootdir + '/kernels/radix/RADIX'
< cmd = 'RADIX -n524288 -p' + str(options.numcpus)
---
> executable = options.rootdir + '/kernels/radix/RADIX'
> cmd = 'RADIX -n524288 -p' + str(options.numcpus)
> cwd = options.rootdir + '/kernels/radix'
103,105c108,111
< executable = options.rootdir + '/apps/barnes/BARNES'
< cmd = 'BARNES'
< input = options.rootdir + '/apps/barnes/input.p' + str(options.numcpus)
---
> executable = options.rootdir + '/apps/barnes/BARNES'
> cmd = 'BARNES'
> input = options.rootdir + '/apps/barnes/input.p' + str(options.numcpus)
> cwd = options.rootdir + '/apps/barnes'
108,109c114,118
< executable = options.rootdir + '/apps/fmm/FMM'
< cmd = 'FMM'
---
> executable = options.rootdir + '/apps/fmm/FMM'
> cmd = 'FMM'
> if str(options.numcpus) == '1':
> input = options.rootdir + '/apps/fmm/inputs/input.2048'
> else:
110a120
> cwd = options.rootdir + '/apps/fmm'
113,114c123,125
< executable = options.rootdir + '/apps/ocean/contiguous_partitions/OCEAN'
< cmd = 'OCEAN -p' + str(options.numcpus)
---
> executable = options.rootdir + '/apps/ocean/contiguous_partitions/OCEAN'
> cmd = 'OCEAN -p' + str(options.numcpus)
> cwd = options.rootdir + '/apps/ocean/contiguous_partitions'
117,118c128,130
< executable = options.rootdir + '/apps/ocean/non_contiguous_partitions/OCEAN'
< cmd = 'OCEAN -p' + str(options.numcpus)
---
> executable = options.rootdir + '/apps/ocean/non_contiguous_partitions/OCEAN'
> cmd = 'OCEAN -p' + str(options.numcpus)
> cwd = options.rootdir + '/apps/ocean/non_contiguous_partitions'
121,123c133,136
< executable = options.rootdir + '/apps/raytrace/RAYTRACE'
< cmd = 'RAYTRACE -p' + str(options.numcpus) + ' ' \
< + options.rootdir + 'apps/raytrace/inputs/teapot.env'
---
> executable = options.rootdir + '/apps/raytrace/RAYTRACE'
> cmd = 'RAYTRACE -p' + str(options.numcpus) + ' ' \
> + options.rootdir + '/apps/raytrace/inputs/teapot.env'
> cwd = options.rootdir + '/apps/raytrace'
126,127c139,143
< executable = options.rootdir + '/apps/water-nsquared/WATER-NSQUARED'
< cmd = 'WATER-NSQUARED'
---
> executable = options.rootdir + '/apps/water-nsquared/WATER-NSQUARED'
> cmd = 'WATER-NSQUARED'
> if options.numcpus==1:
> input = options.rootdir + '/apps/water-nsquared/input'
> else:
128a145
> cwd = options.rootdir + '/apps/water-nsquared'
131,132c148,152
< executable = options.rootdir + '/apps/water-spatial/WATER-SPATIAL'
< cmd = 'WATER-SPATIAL'
---
> executable = options.rootdir + '/apps/water-spatial/WATER-SPATIAL'
> cmd = 'WATER-SPATIAL'
> if options.numcpus==1:
> input = options.rootdir + '/apps/water-spatial/input'
> else:
133a154
> cwd = options.rootdir + '/apps/water-spatial'
135d155
<