Skip to content
Snippets Groups Projects
Commit 8e1c982d authored by James Willis's avatar James Willis
Browse files

VELOCIraptor init and invoke functions now return 1 or 0 depending on if an error occurred.

parent e13eb63a
Branches
Tags
1 merge request!578Swift velociraptor
...@@ -135,7 +135,7 @@ void velociraptor_init(struct engine *e) { ...@@ -135,7 +135,7 @@ void velociraptor_init(struct engine *e) {
message("No. of top-level cells: %d", sim_info.numcells); message("No. of top-level cells: %d", sim_info.numcells);
message("Top-level cell locations range: (%e,%e,%e) -> (%e,%e,%e)", sim_info.cellloc[0].loc[0], sim_info.cellloc[0].loc[1], sim_info.cellloc[0].loc[2], sim_info.cellloc[sim_info.numcells - 1].loc[0], sim_info.cellloc[sim_info.numcells - 1].loc[1], sim_info.cellloc[sim_info.numcells - 1].loc[2]); message("Top-level cell locations range: (%e,%e,%e) -> (%e,%e,%e)", sim_info.cellloc[0].loc[0], sim_info.cellloc[0].loc[1], sim_info.cellloc[0].loc[2], sim_info.cellloc[sim_info.numcells - 1].loc[0], sim_info.cellloc[sim_info.numcells - 1].loc[1], sim_info.cellloc[sim_info.numcells - 1].loc[2]);
InitVelociraptor(configfilename, outputFileName, cosmo_info, unit_info, sim_info); if(!InitVelociraptor(configfilename, outputFileName, cosmo_info, unit_info, sim_info)) error("Exiting. VELOCIraptor initialisation failed.");
/* Free cell locations after VELOCIraptor has copied them. */ /* Free cell locations after VELOCIraptor has copied them. */
//free(sim_info.cellloc); //free(sim_info.cellloc);
...@@ -194,7 +194,7 @@ void velociraptor_invoke(struct engine *e) { ...@@ -194,7 +194,7 @@ void velociraptor_invoke(struct engine *e) {
e->time); e->time);
} }
InvokeVelociraptor(nr_gparts, nr_hydro_parts, gparts, cell_node_ids, outputFileName); if(!InvokeVelociraptor(nr_gparts, nr_hydro_parts, gparts, cell_node_ids, outputFileName)) error("Exiting. Call to VELOCIraptor failed.");
/* Reset the pthread affinity mask after VELOCIraptor returns. */ /* Reset the pthread affinity mask after VELOCIraptor returns. */
pthread_setaffinity_np(thread, sizeof(cpu_set_t), engine_entry_affinity()); pthread_setaffinity_np(thread, sizeof(cpu_set_t), engine_entry_affinity());
......
...@@ -68,8 +68,8 @@ struct siminfo { ...@@ -68,8 +68,8 @@ struct siminfo {
}; };
/* VELOCIraptor interface. */ /* VELOCIraptor interface. */
void InitVelociraptor(char* config_name, char* output_name, struct cosmoinfo cosmo_info, struct unitinfo unit_info, struct siminfo sim_info); int InitVelociraptor(char* config_name, char* output_name, struct cosmoinfo cosmo_info, struct unitinfo unit_info, struct siminfo sim_info);
void InvokeVelociraptor(const int num_gravity_parts, const int num_hydro_parts, struct gpart *gravity_parts, const int *cell_node_ids, char* output_name); int InvokeVelociraptor(const int num_gravity_parts, const int num_hydro_parts, struct gpart *gravity_parts, const int *cell_node_ids, char* output_name);
/* VELOCIraptor wrapper functions. */ /* VELOCIraptor wrapper functions. */
void velociraptor_init(struct engine *e); void velociraptor_init(struct engine *e);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment