diff --git a/src/velociraptor_dummy.c b/src/velociraptor_dummy.c index 71d933c2587593354a81bf1c0032367bee67a0dd..109c05f630493d6781794d0a89f2252d781899dc 100644 --- a/src/velociraptor_dummy.c +++ b/src/velociraptor_dummy.c @@ -38,7 +38,7 @@ struct siminfo {}; int InitVelociraptor(char *config_name, char *output_name, struct cosmoinfo cosmo_info, struct unitinfo unit_info, - struct siminfo sim_info) { + struct siminfo sim_info, const int numthreads) { error("This is only a dummy. Call the real one!"); return 0; @@ -47,7 +47,8 @@ int InvokeVelociraptor(const size_t num_gravity_parts, const size_t num_hydro_parts, const int snapnum, struct swift_vel_part *swift_parts, - const int *cell_node_ids, char *output_name) { + const int *cell_node_ids, char *output_name, + const int numthreads) { error("This is only a dummy. Call the real one!"); return 0; diff --git a/src/velociraptor_interface.c b/src/velociraptor_interface.c index 275624ab6ff2b6d03233d8f14b499d06332a4313..43ede272467661ffc2e41ff48273ffa681572ba1 100644 --- a/src/velociraptor_interface.c +++ b/src/velociraptor_interface.c @@ -111,12 +111,12 @@ struct siminfo { /* VELOCIraptor interface. */ int InitVelociraptor(char *config_name, char *output_name, struct cosmoinfo cosmo_info, struct unitinfo unit_info, - struct siminfo sim_info); + struct siminfo sim_info, const int numthreads); int InvokeVelociraptor(const size_t num_gravity_parts, const size_t num_hydro_parts, const int snapnum, struct swift_vel_part *swift_parts, - const int *cell_node_ids, char *output_name); + const int *cell_node_ids, char *output_name, const int numthreads); #endif /* HAVE_VELOCIRAPTOR */ @@ -240,7 +240,7 @@ void velociraptor_init(struct engine *e) { /* Initialise VELOCIraptor. */ if (!InitVelociraptor(configfilename, outputFileName, cosmo_info, unit_info, - sim_info)) + sim_info, e->nr_threads)) error("Exiting. VELOCIraptor initialisation failed."); #else error("SWIFT not configure to run with VELOCIraptor."); @@ -349,7 +349,7 @@ void velociraptor_invoke(struct engine *e) { /* Call VELOCIraptor. */ if (!InvokeVelociraptor(nr_gparts, nr_hydro_parts, active_stf_output_count, swift_parts, cell_node_ids, - outputFileName)) + outputFileName, e->nr_threads)) error("Exiting. Call to VELOCIraptor failed on rank: %d.", e->nodeID); /* Reset the pthread affinity mask after VELOCIraptor returns. */