From c4c9d7ec90cafc04646cf6ce86cef3dda4726efd Mon Sep 17 00:00:00 2001
From: Chichi Lalescu <clalesc1@jhu.edu>
Date: Fri, 4 Dec 2015 22:12:05 +0100
Subject: [PATCH] various fixes for convergence and io
io fails at the moment
---
bfps/base.py | 3 +--
bfps/fluid_converter.py | 6 ++++--
bfps/fluid_resize.py | 6 ++++--
setup.py | 3 ---
tests/test_convergence.py | 4 +++-
tox_io.ini | 3 ++-
6 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/bfps/base.py b/bfps/base.py
index 2ed050f8..ecff18ef 100644
--- a/bfps/base.py
+++ b/bfps/base.py
@@ -86,8 +86,7 @@ class base(object):
src_txt += 'return 0;\n}\n' # finishing read_parameters
return src_txt
def cprint_pars(self):
- key = self.parameters.keys()
- key.sort()
+ key = sorted(list(self.parameters.keys()))
src_txt = ''
for i in range(len(key)):
if type(self.parameters[key[i]]) == int:
diff --git a/bfps/fluid_converter.py b/bfps/fluid_converter.py
index b448d8db..04f113c4 100644
--- a/bfps/fluid_converter.py
+++ b/bfps/fluid_converter.py
@@ -37,12 +37,14 @@ class fluid_converter(bfps.fluid_base.fluid_particle_base):
name = 'fluid_converter',
work_dir = './',
simname = 'test',
- fluid_precision = 'single'):
+ fluid_precision = 'single',
+ use_fftw_wisdom = True):
super(fluid_converter, self).__init__(
name = name,
work_dir = work_dir,
simname = simname,
- dtype = fluid_precision)
+ dtype = fluid_precision,
+ use_fftw_wisdom = use_fftw_wisdom)
self.parameters['write_rvelocity'] = 1
self.parameters['write_rvorticity'] = 1
self.parameters['fluid_name'] = 'test'
diff --git a/bfps/fluid_resize.py b/bfps/fluid_resize.py
index c0226279..5c4e6c5e 100644
--- a/bfps/fluid_resize.py
+++ b/bfps/fluid_resize.py
@@ -35,12 +35,14 @@ class fluid_resize(bfps.fluid_base.fluid_particle_base):
name = 'fluid_resize',
work_dir = './',
simname = 'test',
- dtype = np.float32):
+ dtype = np.float32,
+ use_fftw_wisdom = False):
super(fluid_resize, self).__init__(
name = name,
work_dir = work_dir,
simname = simname,
- dtype = dtype)
+ dtype = dtype,
+ use_fftw_wisdom = use_fftw_wisdom)
self.parameters['src_simname'] = 'test'
self.parameters['dst_iter'] = 0
self.parameters['dst_nx'] = 32
diff --git a/setup.py b/setup.py
index 094c4fb5..5ef07d29 100644
--- a/setup.py
+++ b/setup.py
@@ -110,9 +110,6 @@ class CustomBuild(DistutilsBuild):
subprocess.call(command_strings)
command_strings = ['ar', 'rvs', 'bfps/libbfps.a']
command_strings += ['obj/' + fname + '.o' for fname in src_file_list]
- #command_strings += ['-l' + libname for libname in libraries]
- #command_strings += ['-L' + ldir for ldir in library_dirs]
- #command_strings += ['-o', 'libbfps.a']
print(' '.join(command_strings))
subprocess.call(command_strings)
DistutilsBuild.run(self)
diff --git a/tests/test_convergence.py b/tests/test_convergence.py
index 0b27504d..636dea9b 100755
--- a/tests/test_convergence.py
+++ b/tests/test_convergence.py
@@ -71,7 +71,9 @@ def convergence_test(
code_class = code_class,
tracer_state_file = h5py.File(os.path.join(c0.work_dir, c0.simname + '.h5'), 'r'))
# get real space fields
- converter = bfps.fluid_converter(fluid_precision = opt.precision)
+ converter = bfps.fluid_converter(
+ fluid_precision = opt.precision,
+ use_fftw_wisdom = False)
converter.write_src()
converter.set_host_info({'type' : 'pc'})
for c in [c0, c1, c2]:
diff --git a/tox_io.ini b/tox_io.ini
index 994d3552..f754e7b8 100644
--- a/tox_io.ini
+++ b/tox_io.ini
@@ -1,6 +1,7 @@
[tox]
-envlist = py27
+envlist = py34
[testenv]
+deps = matplotlib
whitelist_externals =
echo
cp
--
GitLab