Skip to content
Snippets Groups Projects
Commit 7b19ce53 authored by Loic Hausammann's avatar Loic Hausammann
Browse files

format

parent 3629ccc3
Branches
Tags
1 merge request!1125Remove string argument in some logger function
Hide whitespace changes
Inline Side-by-side
src/gravity/MultiSoftening/gravity_logger.h
+ 19
− 23
View file @ 7b19ce53
......@@ -93,27 +93,24 @@ INLINE static void gravity_logger_compute_size_and_mask(
/* Here you can decide your own writing logic */
/* Add the coordinates. */
*mask |= logger_add_field_to_mask(
masks[gravity_logger_field_coordinates],
buffer_size);
*mask |= logger_add_field_to_mask(masks[gravity_logger_field_coordinates],
buffer_size);
/* Add the velocities. */
*mask |= logger_add_field_to_mask(
masks[gravity_logger_field_velocities], buffer_size);
*mask |= logger_add_field_to_mask(masks[gravity_logger_field_velocities],
buffer_size);
/* Add the accelerations. */
*mask |= logger_add_field_to_mask(
masks[gravity_logger_field_accelerations],
buffer_size);
*mask |= logger_add_field_to_mask(masks[gravity_logger_field_accelerations],
buffer_size);
/* Add the masses. */
*mask |= logger_add_field_to_mask(
masks[gravity_logger_field_masses], buffer_size);
*mask |=
logger_add_field_to_mask(masks[gravity_logger_field_masses], buffer_size);
/* Add the ID. */
*mask |= logger_add_field_to_mask(
masks[gravity_logger_field_particle_ids],
buffer_size);
*mask |= logger_add_field_to_mask(masks[gravity_logger_field_particle_ids],
buffer_size);
}
/**
......@@ -133,36 +130,35 @@ INLINE static char *gravity_logger_write_particle(
unsigned int *mask, char *buff) {
/* Write the coordinate. */
if (logger_should_write_field(
mask_data[gravity_logger_field_coordinates], mask)) {
if (logger_should_write_field(mask_data[gravity_logger_field_coordinates],
mask)) {
memcpy(buff, p->x, 3 * sizeof(double));
buff += 3 * sizeof(double);
}
/* Write the velocity. */
if (logger_should_write_field(
mask_data[gravity_logger_field_velocities], mask)) {
if (logger_should_write_field(mask_data[gravity_logger_field_velocities],
mask)) {
memcpy(buff, p->v_full, 3 * sizeof(float));
buff += 3 * sizeof(float);
}
/* Write the acceleration. */
if (logger_should_write_field(
mask_data[gravity_logger_field_accelerations], mask)) {
if (logger_should_write_field(mask_data[gravity_logger_field_accelerations],
mask)) {
memcpy(buff, p->a_grav, 3 * sizeof(float));
buff += 3 * sizeof(float);
}
/* Write the mass. */
if (logger_should_write_field(
mask_data[gravity_logger_field_masses], mask)) {
if (logger_should_write_field(mask_data[gravity_logger_field_masses], mask)) {
memcpy(buff, &p->mass, sizeof(float));
buff += sizeof(float);
}
/* Write the Id. */
if (logger_should_write_field(
mask_data[gravity_logger_field_particle_ids], mask)) {
if (logger_should_write_field(mask_data[gravity_logger_field_particle_ids],
mask)) {
memcpy(buff, &p->id_or_neg_offset, sizeof(long long));
buff += sizeof(long long);
}
......
src/hydro/Gadget2/hydro_logger.h
+ 31
− 33
View file @ 7b19ce53
......@@ -107,37 +107,36 @@ INLINE static void hydro_logger_compute_size_and_mask(
/* Here you can decide your own writing logic */
/* Add the coordinates. */
*mask |= logger_add_field_to_mask(
masks[hydro_logger_field_coordinates], buffer_size);
*mask |= logger_add_field_to_mask(masks[hydro_logger_field_coordinates],
buffer_size);
/* Add the velocities. */
*mask |= logger_add_field_to_mask(
masks[hydro_logger_field_velocities], buffer_size);
*mask |= logger_add_field_to_mask(masks[hydro_logger_field_velocities],
buffer_size);
/* Add the accelerations. */
*mask |= logger_add_field_to_mask(
masks[hydro_logger_field_accelerations], buffer_size);
*mask |= logger_add_field_to_mask(masks[hydro_logger_field_accelerations],
buffer_size);
/* Add the masses. */
*mask |= logger_add_field_to_mask(
masks[hydro_logger_field_masses], buffer_size);
*mask |=
logger_add_field_to_mask(masks[hydro_logger_field_masses], buffer_size);
/* Add the smoothing lengths. */
*mask |= logger_add_field_to_mask(
masks[hydro_logger_field_smoothing_lengths],
buffer_size);
*mask |= logger_add_field_to_mask(masks[hydro_logger_field_smoothing_lengths],
buffer_size);
/* Add the entropies. */
*mask |= logger_add_field_to_mask(
masks[hydro_logger_field_entropies], buffer_size);
*mask |= logger_add_field_to_mask(masks[hydro_logger_field_entropies],
buffer_size);
/* Add the ID. */
*mask |= logger_add_field_to_mask(
masks[hydro_logger_field_particle_ids], buffer_size);
*mask |= logger_add_field_to_mask(masks[hydro_logger_field_particle_ids],
buffer_size);
/* Add the density. */
*mask |= logger_add_field_to_mask(
masks[hydro_logger_field_densities], buffer_size);
*mask |= logger_add_field_to_mask(masks[hydro_logger_field_densities],
buffer_size);
}
/**
......@@ -158,22 +157,22 @@ INLINE static char *hydro_logger_write_particle(
const struct xpart *xp, unsigned int *mask, char *buff) {
/* Write the coordinate. */
if (logger_should_write_field(
mask_data[hydro_logger_field_coordinates], mask)) {
if (logger_should_write_field(mask_data[hydro_logger_field_coordinates],
mask)) {
memcpy(buff, p->x, 3 * sizeof(double));
buff += 3 * sizeof(double);
}
/* Write the velocity. */
if (logger_should_write_field(
mask_data[hydro_logger_field_velocities], mask)) {
if (logger_should_write_field(mask_data[hydro_logger_field_velocities],
mask)) {
memcpy(buff, p->v, 3 * sizeof(float));
buff += 3 * sizeof(float);
}
/* Write the acceleration. */
if (logger_should_write_field(
mask_data[hydro_logger_field_accelerations], mask)) {
if (logger_should_write_field(mask_data[hydro_logger_field_accelerations],
mask)) {
/* Compute the acceleration due to hydro and gravity */
float *acc = (float *)buff;
......@@ -186,36 +185,35 @@ INLINE static char *hydro_logger_write_particle(
}
/* Write the mass. */
if (logger_should_write_field(
mask_data[hydro_logger_field_masses], mask)) {
if (logger_should_write_field(mask_data[hydro_logger_field_masses], mask)) {
memcpy(buff, &p->mass, sizeof(float));
buff += sizeof(float);
}
/* Write the smoothing length. */
if (logger_should_write_field(
mask_data[hydro_logger_field_smoothing_lengths], mask)) {
if (logger_should_write_field(mask_data[hydro_logger_field_smoothing_lengths],
mask)) {
memcpy(buff, &p->h, sizeof(float));
buff += sizeof(float);
}
/* Write the entropy. */
if (logger_should_write_field(
mask_data[hydro_logger_field_entropies], mask)) {
if (logger_should_write_field(mask_data[hydro_logger_field_entropies],
mask)) {
memcpy(buff, &p->entropy, sizeof(float));
buff += sizeof(float);
}
/* Write the Id. */
if (logger_should_write_field(
mask_data[hydro_logger_field_particle_ids], mask)) {
if (logger_should_write_field(mask_data[hydro_logger_field_particle_ids],
mask)) {
memcpy(buff, &p->id, sizeof(long long));
buff += sizeof(long long);
}
/* Write the density. */
if (logger_should_write_field(
mask_data[hydro_logger_field_densities], mask)) {
if (logger_should_write_field(mask_data[hydro_logger_field_densities],
mask)) {
memcpy(buff, &p->rho, sizeof(float));
buff += sizeof(float);
}
......
src/stars/Default/stars_logger.h
+ 23
− 25
View file @ 7b19ce53
......@@ -96,29 +96,28 @@ INLINE static void stars_logger_compute_size_and_mask(
/* Here you can decide your own writing logic */
/* Add the coordinates. */
*mask |= logger_add_field_to_mask(
masks[stars_logger_field_coordinates], buffer_size);
*mask |= logger_add_field_to_mask(masks[stars_logger_field_coordinates],
buffer_size);
/* Add the velocities. */
*mask |= logger_add_field_to_mask(
masks[stars_logger_field_velocities], buffer_size);
*mask |= logger_add_field_to_mask(masks[stars_logger_field_velocities],
buffer_size);
/* Add the accelerations. */
*mask |= logger_add_field_to_mask(
masks[stars_logger_field_accelerations], buffer_size);
*mask |= logger_add_field_to_mask(masks[stars_logger_field_accelerations],
buffer_size);
/* Add the masses. */
*mask |= logger_add_field_to_mask(
masks[stars_logger_field_masses], buffer_size);
*mask |=
logger_add_field_to_mask(masks[stars_logger_field_masses], buffer_size);
/* Add the smoothing lengths. */
*mask |= logger_add_field_to_mask(
masks[stars_logger_field_smoothing_lengths],
buffer_size);
*mask |= logger_add_field_to_mask(masks[stars_logger_field_smoothing_lengths],
buffer_size);
/* Add the ID. */
*mask |= logger_add_field_to_mask(
masks[stars_logger_field_particle_ids], buffer_size);
*mask |= logger_add_field_to_mask(masks[stars_logger_field_particle_ids],
buffer_size);
}
/**
......@@ -138,43 +137,42 @@ INLINE static char *stars_logger_write_particle(
unsigned int *mask, char *buff) {
/* Write the coordinate. */
if (logger_should_write_field(
mask_data[stars_logger_field_coordinates], mask)) {
if (logger_should_write_field(mask_data[stars_logger_field_coordinates],
mask)) {
memcpy(buff, p->x, 3 * sizeof(double));
buff += 3 * sizeof(double);
}
/* Write the velocity. */
if (logger_should_write_field(
mask_data[stars_logger_field_velocities], mask)) {
if (logger_should_write_field(mask_data[stars_logger_field_velocities],
mask)) {
memcpy(buff, p->v, 3 * sizeof(float));
buff += 3 * sizeof(float);
}
/* Write the acceleration. */
if (logger_should_write_field(
mask_data[stars_logger_field_accelerations], mask)) {
if (logger_should_write_field(mask_data[stars_logger_field_accelerations],
mask)) {
memcpy(buff, p->gpart->a_grav, 3 * sizeof(float));
buff += 3 * sizeof(float);
}
/* Write the mass. */
if (logger_should_write_field(
mask_data[stars_logger_field_masses], mask)) {
if (logger_should_write_field(mask_data[stars_logger_field_masses], mask)) {
memcpy(buff, &p->mass, sizeof(float));
buff += sizeof(float);
}
/* Write the smoothing length. */
if (logger_should_write_field(
mask_data[stars_logger_field_smoothing_lengths], mask)) {
if (logger_should_write_field(mask_data[stars_logger_field_smoothing_lengths],
mask)) {
memcpy(buff, &p->h, sizeof(float));
buff += sizeof(float);
}
/* Write the Id. */
if (logger_should_write_field(
mask_data[stars_logger_field_particle_ids], mask)) {
if (logger_should_write_field(mask_data[stars_logger_field_particle_ids],
mask)) {
memcpy(buff, &p->id, sizeof(long long));
buff += sizeof(long long);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment