Take into account csds_init for the time in engine_init

Currently, the time spent within csds_init is accounted twice. Once within the previous function and once in engine_init. Here I am changing a bit the API in order to return the time already accounted for in engine_init.

changed milestone to %Continuous Simulation Data Stream

added bug label

added 1 commit

• 1e262969 - Avoid counting twice the time spent in csds_init

Compare with previous version

Except from my question, everything is ready.

added 1 commit

• c973cd6b - Update timed functions

Compare with previous version

Have you tested it?

resolved all threads

Compiled with and without CSDS and run the SedovBlast_3D with the CSDS. Everything seems to work.

Try it over MPI and check again please.

Everything is fine over MPI with and without the CSDS.

You are using engine_rank in engine_init() before it was set in engine_config(), hence my question.

You are correct, but in fact we set it twice. https://gitlab.cosma.dur.ac.uk/swift/swiftsim/-/blob/master/examples/main.c#L133

Do you wish to remove the one in engine_config.c?

Well spotted. Yes, let's remove it from engine_config then so I won't get confused again.

Just make sure the one in main() is also set when restarting and that it is also set in main_fof.c

added 1 commit

• 29095f2a - Remove useless line

Compare with previous version

It is the first thing we do in both main.c and main_fof.c, thus the variable is set in any case.

approved this merge request

merged

mentioned in commit bb063b90