Merge branch 'engineering_optim_trials' of github.com:OceanParcels/pa…

…rcels into engineering_optim_trials
OceanParcels · Dec 31, 2020 · 2a7e9ae · 2a7e9ae
2 parents 42ba546 + 77730ef
commit 2a7e9ae
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/parcels/particleset_benchmark.py b/parcels/particleset_benchmark.py
@@ -48,7 +48,7 @@ def measure_mem_usage():
         return rsc.ru_maxrss*1024
     return rsc.ru_maxrss
 
-USE_ASYNC_MEMLOG = True
+USE_ASYNC_MEMLOG = False
 USE_RUSE_SYNC_MEMLOG = False  # can be faulty
 
 class ParticleSet_Benchmark(ParticleSet):
@@ -206,6 +206,7 @@ def execute(self, pyfunc=AdvectionRK4, endtime=None, runtime=None, dt=1.,
         if verbose_progress:
             pbar = self._create_progressbar_(_starttime, endtime)
 
+        mem_used_start = 0
         if USE_ASYNC_MEMLOG:
             self.async_mem_log.measure_func = measure_mem
             mem_used_start = measure_mem()