Few fixes

Author: brownbaerchen

pySDC/implementations/hooks/log_solution.py

@@ -239,6 +239,7 @@ def pre_run(self, step, level_number):
                 self.logger.info(f'Written initial conditions at t={L.time:4f} to file')
 
         type(self).counter = len(self.outfile.times)
+        self.logger.info(f'Will write to disk every {self.time_increment:.4e} time units')
 
     def post_step(self, step, level_number):
         if level_number > 0:

pySDC/implementations/problem_classes/RayleighBenard.py

@@ -403,12 +403,6 @@ def processSolutionForOutput(self, u):
         me[:-1] = u_real
         me[-1] = vorticity
         return me
-        print(u.shape, vorticity.shape)
-        exit()
-        if self.spectral_space:
-            return np.array(self.itransform(u).real)
-        else:
-            return np.array(u.real)
 
     def compute_Nusselt_numbers(self, u):
         """

pySDC/projects/GPU/configs/base_config.py

@@ -224,15 +224,13 @@ def setup(self, controller, params, *args, **kwargs):
     def post_step_processing(self, controller, S, **kwargs):
         hook = self.params.hook
 
-        for _hook in controller.hooks:
-            _hook.post_step(S, 0)
-
         P = S.levels[0].prob
 
-        if S.time > 0 and self.counter == 0:
+        if self.counter == 0:
             self.counter = hook.counter - 1
+
         while self.counter < hook.counter:
-            path = self.get_stats_path(index=self.counter)
+            path = self.get_stats_path(index=self.counter - 1)
             stats = controller.return_stats()
             store = True
             if hasattr(S.levels[0].sweep, 'comm') and S.levels[0].sweep.comm.rank > 0:

pySDC/projects/GPU/run_experiment.py

@@ -32,12 +32,15 @@ def str_to_procs(me):
 
 def run_experiment(args, config, **kwargs):
     import pickle
+    import os
 
     # from pySDC.implementations.controller_classes.controller_MPI import controller_MPI
     from pySDC.implementations.controller_classes.controller_nonMPI import controller_nonMPI
     from pySDC.helpers.stats_helper import filter_stats
 
     type(config).base_path = args['o']
+    os.makedirs(f'{args["o"]}/data', exist_ok=True)
+
     description = config.get_description(
         useGPU=args['useGPU'], MPIsweeper=args['procs'][1] > 1, res=args['res'], **kwargs
     )

pySDC/projects/GPU/tests/test_configs.py

@@ -35,6 +35,41 @@ def create_directories():
     os.makedirs(path, exist_ok=True)
 
 
+def test_run(tmpdir):
+    from pySDC.projects.GPU.configs.base_config import get_config
+    from pySDC.projects.GPU.run_experiment import run_experiment
+
+    args = {
+        'config': 'RBC',
+        'procs': [1, 1, 1],
+        'res': 16,
+        'mode': 'run',
+        'useGPU': False,
+        'o': tmpdir,
+        'logger_level': 15,
+        'restart_idx': 0,
+    }
+    config = get_config(args)
+
+    def get_LogToFile(self, *args, **kwargs):
+        if self.comms[1].rank > 0:
+            return None
+        from pySDC.implementations.hooks.log_solution import LogToFile
+
+        LogToFile.filename = self.get_file_name()
+        LogToFile.time_increment = 0
+        LogToFile.allow_overwriting = True
+
+        return LogToFile
+
+    type(config).get_LogToFile = get_LogToFile
+
+    # first run for a short time
+    dt = config.get_description()['level_params']['dt']
+    config.Tend = 2 * dt
+    run_experiment(args, config)
+
+
 @pytest.mark.order(1)
 def test_run_experiment(restart_idx=0):
     from pySDC.projects.GPU.configs.base_config import Config
@@ -108,6 +143,9 @@ def test_restart():
 
 
 if __name__ == '__main__':
+    test_run('.')
+    exit()
+
     import argparse
 
     parser = argparse.ArgumentParser()