Commit 485c0734 authored by Cristian Lalescu's avatar Cristian Lalescu
Browse files

Merge branch 'bugfix/niter_part' into develop

parents f01950ed 25f718d6
......@@ -193,8 +193,6 @@ class fluid_particle_base(bfps.code):
MPI_Finalize();
return EXIT_SUCCESS;
}
do_stats();
do_particle_stats();
//endcpp
"""
output_time_difference = ('time1 = clock();\n' +
......@@ -209,12 +207,11 @@ class fluid_particle_base(bfps.code):
self.main += 'for (int max_iter = iteration+niter_todo; iteration < max_iter; iteration++)\n'
self.main += '{\n'
self.main += output_time_difference
if self.particle_species > 0:
self.main += self.particle_loop
self.main += self.fluid_loop
self.main += 'if (iteration % niter_stat == 0) do_stats();\n'
if self.particle_species > 0:
self.main += 'if (iteration % niter_part == 0) do_particle_stats();\n'
self.main += self.particle_loop
self.main += self.fluid_loop
self.main += '}\n'
self.main += output_time_difference
self.main += 'do_stats();\n'
......
......@@ -99,7 +99,6 @@ def launch(
else:
c.parameters['dt'] = dt
c.parameters['niter_out'] = c.parameters['niter_todo']
c.parameters['niter_part'] = 1
c.parameters['famplitude'] = 0.2
c.fill_up_fluid_code()
if c.parameters['nparticles'] > 0:
......
......@@ -49,6 +49,7 @@ def convergence_test(
opt.n *= 2
opt.niter_todo *= 2
opt.niter_stat *= 2
opt.niter_part *= 2
opt.ncpu *= 2
opt.simname = 'N{0:0>3x}'.format(opt.n)
c1 = code_launch_routine(
......@@ -61,6 +62,7 @@ def convergence_test(
opt.n *= 2
opt.niter_todo *= 2
opt.niter_stat *= 2
opt.niter_part *= 2
opt.ncpu *= 2
opt.simname = 'N{0:0>3x}'.format(opt.n)
c2 = code_launch_routine(
......
......@@ -138,7 +138,7 @@ class err_finder:
errlist = []
for i in range(len(self.clist)):
self.xx.append(cRK(
traj_list[i][self.clist[i].parameters['niter_todo']//2],
traj_list[i][self.clist[i].parameters['niter_todo']//(2*self.clist[i].parameters['niter_part'])],
self.clist[i].parameters['dt'],
self.clist[i].parameters['niter_todo']//2,
ABC_flow))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment