diff --git a/src/hydro/Default/hydro_io.h b/src/hydro/Default/hydro_io.h index 2567545b25f55e03b104844a4142da9cbe397fb5..bfff08dcdf061d86986ffdeabee6e7a84cba1c7b 100644 --- a/src/hydro/Default/hydro_io.h +++ b/src/hydro/Default/hydro_io.h @@ -77,7 +77,7 @@ void convert_part_pos(const struct engine* e, const struct part* p, void hydro_write_particles(struct part* parts, struct io_props* list, int* num_fields) { - *num_fields = 8; + *num_fields = 7; /* List what we want to write */ list[0] = io_make_output_field_convert_part( @@ -92,9 +92,7 @@ void hydro_write_particles(struct part* parts, struct io_props* list, UNIT_CONV_ENERGY_PER_UNIT_MASS, parts, u); list[5] = io_make_output_field("ParticleIDs", ULONGLONG, 1, UNIT_CONV_NO_UNITS, parts, id); - list[6] = io_make_output_field("Acceleration", FLOAT, 3, - UNIT_CONV_ACCELERATION, parts, a_hydro); - list[7] = + list[6] = io_make_output_field("Density", FLOAT, 1, UNIT_CONV_DENSITY, parts, rho); } diff --git a/src/hydro/Gadget2/hydro_io.h b/src/hydro/Gadget2/hydro_io.h index 1d1f5ed453f249191b6853a3a699de847ed501f2..5c329e9d7297109c378e04f0e4931a0717e07278 100644 --- a/src/hydro/Gadget2/hydro_io.h +++ b/src/hydro/Gadget2/hydro_io.h @@ -89,7 +89,7 @@ void convert_part_pos(const struct engine* e, const struct part* p, void hydro_write_particles(const struct part* parts, struct io_props* list, int* num_fields) { - *num_fields = 10; + *num_fields = 9; /* List what we want to write */ list[0] = io_make_output_field_convert_part( @@ -104,14 +104,12 @@ void hydro_write_particles(const struct part* parts, struct io_props* list, "Entropy", FLOAT, 1, UNIT_CONV_ENTROPY_PER_UNIT_MASS, parts, entropy); list[5] = io_make_output_field("ParticleIDs", ULONGLONG, 1, UNIT_CONV_NO_UNITS, parts, id); - list[6] = io_make_output_field("Acceleration", FLOAT, 3, - UNIT_CONV_ACCELERATION, parts, a_hydro); - list[7] = + list[6] = io_make_output_field("Density", FLOAT, 1, UNIT_CONV_DENSITY, parts, rho); - list[8] = io_make_output_field_convert_part("InternalEnergy", FLOAT, 1, + list[7] = io_make_output_field_convert_part("InternalEnergy", FLOAT, 1, UNIT_CONV_ENERGY_PER_UNIT_MASS, parts, convert_u); - list[9] = io_make_output_field_convert_part( + list[8] = io_make_output_field_convert_part( "Pressure", FLOAT, 1, UNIT_CONV_PRESSURE, parts, convert_P); #ifdef DEBUG_INTERACTIONS_SPH diff --git a/src/hydro/Minimal/hydro_io.h b/src/hydro/Minimal/hydro_io.h index 5922834e12f6dd74e951b46c2c93f975d7e8b82e..2ff70fd2f7e95344c17ba0f3237c3b2ee131752c 100644 --- a/src/hydro/Minimal/hydro_io.h +++ b/src/hydro/Minimal/hydro_io.h @@ -103,7 +103,7 @@ void convert_part_pos(const struct engine* e, const struct part* p, void hydro_write_particles(struct part* parts, struct io_props* list, int* num_fields) { - *num_fields = 10; + *num_fields = 9; /* List what we want to write */ list[0] = io_make_output_field_convert_part( @@ -118,13 +118,11 @@ void hydro_write_particles(struct part* parts, struct io_props* list, UNIT_CONV_ENERGY_PER_UNIT_MASS, parts, u); list[5] = io_make_output_field("ParticleIDs", ULONGLONG, 1, UNIT_CONV_NO_UNITS, parts, id); - list[6] = io_make_output_field("Acceleration", FLOAT, 3, - UNIT_CONV_ACCELERATION, parts, a_hydro); - list[7] = + list[6] = io_make_output_field("Density", FLOAT, 1, UNIT_CONV_DENSITY, parts, rho); - list[8] = io_make_output_field_convert_part( + list[7] = io_make_output_field_convert_part( "Entropy", FLOAT, 1, UNIT_CONV_ENTROPY_PER_UNIT_MASS, parts, convert_S); - list[9] = io_make_output_field_convert_part( + list[8] = io_make_output_field_convert_part( "Pressure", FLOAT, 1, UNIT_CONV_PRESSURE, parts, convert_P); } diff --git a/src/hydro/PressureEntropy/hydro_io.h b/src/hydro/PressureEntropy/hydro_io.h index 454d999b6dcd604e25da4c513d902854c43c781b..ed8e0e45d240ea37ebfb7df6339afd454dc0e4c4 100644 --- a/src/hydro/PressureEntropy/hydro_io.h +++ b/src/hydro/PressureEntropy/hydro_io.h @@ -101,7 +101,7 @@ void convert_part_pos(const struct engine* e, const struct part* p, void hydro_write_particles(struct part* parts, struct io_props* list, int* num_fields) { - *num_fields = 11; + *num_fields = 10; /* List what we want to write */ list[0] = io_make_output_field_convert_part( @@ -116,17 +116,15 @@ void hydro_write_particles(struct part* parts, struct io_props* list, "Entropy", FLOAT, 1, UNIT_CONV_ENTROPY_PER_UNIT_MASS, parts, entropy); list[5] = io_make_output_field("ParticleIDs", ULONGLONG, 1, UNIT_CONV_NO_UNITS, parts, id); - list[6] = io_make_output_field("Acceleration", FLOAT, 3, - UNIT_CONV_ACCELERATION, parts, a_hydro); - list[7] = + list[6] = io_make_output_field("Density", FLOAT, 1, UNIT_CONV_DENSITY, parts, rho); - list[8] = io_make_output_field_convert_part("InternalEnergy", FLOAT, 1, + list[7] = io_make_output_field_convert_part("InternalEnergy", FLOAT, 1, UNIT_CONV_ENERGY_PER_UNIT_MASS, parts, convert_u); - list[9] = io_make_output_field_convert_part( + list[8] = io_make_output_field_convert_part( "Pressure", FLOAT, 1, UNIT_CONV_PRESSURE, parts, convert_P); - list[10] = io_make_output_field("WeightedDensity", FLOAT, 1, - UNIT_CONV_DENSITY, parts, rho_bar); + list[9] = io_make_output_field("WeightedDensity", FLOAT, 1, UNIT_CONV_DENSITY, + parts, rho_bar); } /**