From 032fe7b8299a3eeedb10befe00ff3a0c44ca8a3d Mon Sep 17 00:00:00 2001
From: Cristian C Lalescu <Cristian.Lalescu@ds.mpg.de>
Date: Thu, 14 Jan 2016 16:27:23 +0100
Subject: [PATCH] compute stats at proper times
---
bfps/fluid_base.py | 7 ++-----
tests/base.py | 1 -
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/bfps/fluid_base.py b/bfps/fluid_base.py
index ba0be9ed..a96d3c3f 100644
--- a/bfps/fluid_base.py
+++ b/bfps/fluid_base.py
@@ -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'
diff --git a/tests/base.py b/tests/base.py
index a88f3562..948a1f8a 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -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:
--
GitLab