Commit 92de60d2 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Flag the timesteps where STF is run in the timesteps file.

parent 7374b8e4
...@@ -3241,6 +3241,7 @@ void engine_check_for_dumps(struct engine *e) { ...@@ -3241,6 +3241,7 @@ void engine_check_for_dumps(struct engine *e) {
#ifdef HAVE_VELOCIRAPTOR #ifdef HAVE_VELOCIRAPTOR
velociraptor_invoke(e, /*linked_with_snap=*/1); velociraptor_invoke(e, /*linked_with_snap=*/1);
e->step_props |= engine_step_prop_stf;
#else #else
error( error(
"Asking for a VELOCIraptor output but SWIFT was compiled without " "Asking for a VELOCIraptor output but SWIFT was compiled without "
...@@ -3283,6 +3284,7 @@ void engine_check_for_dumps(struct engine *e) { ...@@ -3283,6 +3284,7 @@ void engine_check_for_dumps(struct engine *e) {
#ifdef HAVE_VELOCIRAPTOR #ifdef HAVE_VELOCIRAPTOR
/* Unleash the raptor! */ /* Unleash the raptor! */
velociraptor_invoke(e, /*linked_with_snap=*/0); velociraptor_invoke(e, /*linked_with_snap=*/0);
e->step_props |= engine_step_prop_stf;
/* ... and find the next output time */ /* ... and find the next output time */
engine_compute_next_stf_time(e); engine_compute_next_stf_time(e);
...@@ -4414,10 +4416,11 @@ void engine_config(int restart, struct engine *e, struct swift_params *params, ...@@ -4414,10 +4416,11 @@ void engine_config(int restart, struct engine *e, struct swift_params *params,
fprintf(e->file_timesteps, fprintf(e->file_timesteps,
"# Step Properties: Rebuild=%d, Redistribute=%d, Repartition=%d, " "# Step Properties: Rebuild=%d, Redistribute=%d, Repartition=%d, "
"Statistics=%d, Snapshot=%d, Restarts=%d\n", "Statistics=%d, Snapshot=%d, Restarts=%d STF=%d, logger=%d\n",
engine_step_prop_rebuild, engine_step_prop_redistribute, engine_step_prop_rebuild, engine_step_prop_redistribute,
engine_step_prop_repartition, engine_step_prop_statistics, engine_step_prop_repartition, engine_step_prop_statistics,
engine_step_prop_snapshot, engine_step_prop_restarts); engine_step_prop_snapshot, engine_step_prop_restarts,
engine_step_prop_stf, engine_step_prop_logger_index);
fprintf(e->file_timesteps, fprintf(e->file_timesteps,
"# %6s %14s %12s %12s %14s %9s %12s %12s %12s %16s [%s] %6s\n", "# %6s %14s %12s %12s %14s %9s %12s %12s %12s %16s [%s] %6s\n",
......
...@@ -91,7 +91,8 @@ enum engine_step_properties { ...@@ -91,7 +91,8 @@ enum engine_step_properties {
engine_step_prop_statistics = (1 << 3), engine_step_prop_statistics = (1 << 3),
engine_step_prop_snapshot = (1 << 4), engine_step_prop_snapshot = (1 << 4),
engine_step_prop_restarts = (1 << 5), engine_step_prop_restarts = (1 << 5),
engine_step_prop_logger_index = (1 << 6) engine_step_prop_stf = (1 << 6),
engine_step_prop_logger_index = (1 << 7)
}; };
/* Some constants */ /* Some constants */
......
Supports Markdown
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