Skip to content
Snippets Groups Projects
Commit cbf0c9fe authored by Cristian Lalescu's avatar Cristian Lalescu
Browse files

tox_plain works for py3

parent 756afc2d
No related branches found
No related tags found
No related merge requests found
...@@ -49,7 +49,7 @@ except DistributionNotFound: ...@@ -49,7 +49,7 @@ except DistributionNotFound:
install_info = pickle.load( install_info = pickle.load(
open(os.path.join(os.path.dirname(here), open(os.path.join(os.path.dirname(here),
'install_info.pickle'), 'install_info.pickle'),
'r')) 'rb'))
from .code import code from .code import code
from .fluid_converter import fluid_converter from .fluid_converter import fluid_converter
......
...@@ -48,8 +48,7 @@ class base(object): ...@@ -48,8 +48,7 @@ class base(object):
self.simname = simname self.simname = simname
return None return None
def cdef_pars(self): def cdef_pars(self):
key = self.parameters.keys() key = sorted(list(self.parameters.keys()))
key.sort()
src_txt = '' src_txt = ''
for i in range(len(key)): for i in range(len(key)):
if type(self.parameters[key[i]]) == int: if type(self.parameters[key[i]]) == int:
...@@ -60,8 +59,7 @@ class base(object): ...@@ -60,8 +59,7 @@ class base(object):
src_txt += 'double ' + key[i] + ';\n' src_txt += 'double ' + key[i] + ';\n'
return src_txt return src_txt
def cread_pars(self): def cread_pars(self):
key = self.parameters.keys() key = sorted(list(self.parameters.keys()))
key.sort()
src_txt = ('int read_parameters(hid_t data_file_id)\n{\n' src_txt = ('int read_parameters(hid_t data_file_id)\n{\n'
+ 'hid_t dset, memtype, space;\n' + 'hid_t dset, memtype, space;\n'
+ 'hsize_t dims[1];\n' + 'hsize_t dims[1];\n'
......
...@@ -139,7 +139,7 @@ class code(base): ...@@ -139,7 +139,7 @@ class code(base):
raise IOError('header not there:\n' + raise IOError('header not there:\n' +
'{0}\n'.format(os.path.join(bfps.header_dir, 'base.hpp')) + '{0}\n'.format(os.path.join(bfps.header_dir, 'base.hpp')) +
'{0}\n'.format(bfps.dist_loc)) '{0}\n'.format(bfps.dist_loc))
libraries = ['bfps'] + bfps.install_info['libraries'] libraries = ['bfps.cpython-34m'] + bfps.install_info['libraries']
command_strings = ['g++'] command_strings = ['g++']
command_strings += [self.name + '.cpp', '-o', self.name] command_strings += [self.name + '.cpp', '-o', self.name]
......
...@@ -46,12 +46,12 @@ def plain(opt): ...@@ -46,12 +46,12 @@ def plain(opt):
assert(opt.niter_todo % 3 == 0) assert(opt.niter_todo % 3 == 0)
opt.work_dir = wd + '/N{0:0>3x}_2'.format(opt.n) opt.work_dir = wd + '/N{0:0>3x}_2'.format(opt.n)
opt.njobs *= 2 opt.njobs *= 2
opt.niter_todo /= 2 opt.niter_todo = opt.niter_todo//2
c1 = launch(opt, dt = c0.parameters['dt']) c1 = launch(opt, dt = c0.parameters['dt'])
c1.compute_statistics() c1.compute_statistics()
opt.work_dir = wd + '/N{0:0>3x}_3'.format(opt.n) opt.work_dir = wd + '/N{0:0>3x}_3'.format(opt.n)
opt.njobs = 3*opt.njobs/2 opt.njobs = 3*opt.njobs//2
opt.niter_todo = 2*opt.niter_todo/3 opt.niter_todo = 2*opt.niter_todo//3
c2 = launch(opt, dt = c0.parameters['dt']) c2 = launch(opt, dt = c0.parameters['dt'])
c2.compute_statistics() c2.compute_statistics()
# plot energy and enstrophy # plot energy and enstrophy
......
[tox] [tox]
envlist = py27 envlist = py34
[testenv] [testenv]
deps = matplotlib
whitelist_externals = whitelist_externals =
echo echo
cp cp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment