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

Merge branch 'bugfix/particle-file' into v1.2

parents 9d489684 a3b4f321
No related branches found
No related tags found
No related merge requests found
...@@ -1001,7 +1001,8 @@ class NavierStokes(_fluid_particle_base): ...@@ -1001,7 +1001,8 @@ class NavierStokes(_fluid_particle_base):
return None return None
def prepare_launch( def prepare_launch(
self, self,
args = []): args = [],
noparticles = False):
opt = _code.prepare_launch(self, args = args) opt = _code.prepare_launch(self, args = args)
# with the default Lundgren forcing, I can estimate the dissipation # with the default Lundgren forcing, I can estimate the dissipation
# with nondefault forcing, figure out the amplitude for this viscosity # with nondefault forcing, figure out the amplitude for this viscosity
...@@ -1028,6 +1029,18 @@ class NavierStokes(_fluid_particle_base): ...@@ -1028,6 +1029,18 @@ class NavierStokes(_fluid_particle_base):
self.name += '-QR' self.name += '-QR'
if len(opt.src_work_dir) == 0: if len(opt.src_work_dir) == 0:
opt.src_work_dir = opt.work_dir opt.src_work_dir = opt.work_dir
if noparticles:
opt.nparticles = 0
elif opt.nparticles > 0:
self.add_3D_rFFTW_field(name = 'rFFTW_acc')
self.add_interpolator(
name = 'cubic_spline',
neighbours = 1,
smoothness = 1)
self.add_particles(
integration_steps = [4],
interpolator = 'cubic_spline',
acc_name = 'rFFTW_acc')
self.pars_from_namespace(opt) self.pars_from_namespace(opt)
return opt return opt
def launch( def launch(
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment