diff --git a/bfps/NSVorticityEquation.py b/bfps/NSVorticityEquation.py index bac06e027f73b1b41c2c9d19c7d763f7d6a8f4bd..022fcd59a7432e2d9053f7602a987ccc1cad23b0 100644 --- a/bfps/NSVorticityEquation.py +++ b/bfps/NSVorticityEquation.py @@ -123,13 +123,14 @@ class NSVorticityEquation(_fluid_particle_base): neighbours = 1, smoothness = 1): assert(integration_steps > 0 and integration_steps < 6) + self.particle_species = 1 self.parameters['tracers0_integration_steps'] = int(integration_steps) self.parameters['tracers0_neighbours'] = int(neighbours) self.parameters['tracers0_smoothness'] = int(smoothness) self.parameters['tracers0_interpolator'] = 'spline' self.particle_includes += """ - #include "particles_system_builder.hpp" - #include "particles_output_hdf5.hpp" + #include "particles/particles_system_builder.hpp" + #include "particles/particles_output_hdf5.hpp" """ ## initialize self.particle_start += """ @@ -158,8 +159,7 @@ class NSVorticityEquation(_fluid_particle_base): iteration); """ self.fluid_output += output_particles - self.particle_end += 'ps.realease();\n' - + self.particle_end += 'ps.release();\n' return None def create_stat_output( self, diff --git a/setup.py b/setup.py index 21acd26305646d06511437335e59c49a4c5273ac..f2041cdbb824632cd3c4b30faf23d1c745ed1b06 100644 --- a/setup.py +++ b/setup.py @@ -113,11 +113,29 @@ src_file_list = ['vorticity_equation', 'Lagrange_polys', 'scope_timer'] +particle_headers = [ + 'cpp/particles/abstract_particles_distr.hpp', + 'cpp/particles/abstract_particles_input.hpp', + 'cpp/particles/abstract_particles_output.hpp', + 'cpp/particles/abstract_particles_system.hpp', + 'cpp/particles/alltoall_exchanger.hpp', + 'cpp/particles/field_accessor.hpp', + 'cpp/particles/particles_adams_bashforth.hpp', + 'cpp/particles/particles_field_computer.hpp', + 'cpp/particles/particles_input_hdf5.hpp', + 'cpp/particles/particles_interp_spline.hpp', + 'cpp/particles/particles_output_hdf5.hpp', + 'cpp/particles/particles_output_mpiio.hpp', + 'cpp/particles/particles_system_builder.hpp', + 'cpp/particles/particles_system.hpp', + 'cpp/particles/particles_utils.hpp'] + header_list = (['cpp/base.hpp'] + ['cpp/fftw_interface.hpp'] + ['cpp/bfps_timer.hpp'] + ['cpp/' + fname + '.hpp' - for fname in src_file_list]) + for fname in src_file_list] + + particle_headers) with open('MANIFEST.in', 'w') as manifest_in_file: for fname in (['bfps/cpp/' + ff + '.cpp' for ff in src_file_list] +