Skip to content
GitLab
Commit 35370a29 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'gear_meta_data' into 'snapshot_meta_data' 

GEAR: Update io fields

See merge request !837
parents b578d4f6 58f1666a
Hide whitespace changes
Inline Side-by-side
src/chemistry/GEAR/chemistry_io.h
View file @ 35370a29
......@@ -74,15 +74,17 @@ INLINE static int chemistry_write_particles(const struct part* parts,
/* List what we want to write */
list[0] = io_make_output_field(
"SmoothedElementAbundance", FLOAT, chemistry_element_count,
UNIT_CONV_NO_UNITS, parts, chemistry_data.smoothed_metal_mass_fraction);
"SmoothedElementAbundances", FLOAT, chemistry_element_count,
UNIT_CONV_NO_UNITS, 0.f, parts, chemistry_data.smoothed_metal_mass_fraction,
"Element abundances smoothed over the neighbors");
list[1] = io_make_output_field("Z", FLOAT, 1, UNIT_CONV_NO_UNITS, parts,
chemistry_data.Z);
list[1] = io_make_output_field("Z", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, parts,
chemistry_data.Z, "Temporary field");
list[2] = io_make_output_field("ElementAbundance", FLOAT,
list[2] = io_make_output_field("ElementAbundances", FLOAT,
chemistry_element_count, UNIT_CONV_NO_UNITS,
parts, chemistry_data.metal_mass_fraction);
0.f, parts, chemistry_data.metal_mass_fraction,
"Mass fraction of each element");
return 3;
}
......@@ -100,15 +102,17 @@ INLINE static int chemistry_write_sparticles(const struct spart* sparts,
/* List what we want to write */
list[0] = io_make_output_field(
"SmoothedElementAbundance", FLOAT, chemistry_element_count,
UNIT_CONV_NO_UNITS, sparts, chemistry_data.smoothed_metal_mass_fraction);
"SmoothedElementAbundances", FLOAT, chemistry_element_count,
UNIT_CONV_NO_UNITS, 0.f, sparts, chemistry_data.smoothed_metal_mass_fraction,
"Element abundances smoothed over the neighbors");
list[1] = io_make_output_field("Z", FLOAT, 1, UNIT_CONV_NO_UNITS, sparts,
chemistry_data.Z);
list[1] = io_make_output_field("Z", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, sparts,
chemistry_data.Z, "Temporary field");
list[2] = io_make_output_field("ElementAbundance", FLOAT,
chemistry_element_count, UNIT_CONV_NO_UNITS,
sparts, chemistry_data.metal_mass_fraction);
0.f, sparts, chemistry_data.metal_mass_fraction,
"Mass fraction of each element");
return 3;
}
......
src/cooling/grackle/cooling_io.h
View file @ 35370a29
......@@ -63,23 +63,23 @@ __attribute__((always_inline)) INLINE static int cooling_write_particles(
#if COOLING_GRACKLE_MODE >= 1
/* List what we want to write */
list[0] = io_make_output_field("HI", FLOAT, 1, UNIT_CONV_NO_UNITS, xparts,
cooling_data.HI_frac);
list[0] = io_make_output_field("HI", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, xparts,
cooling_data.HI_frac, "HI mass fraction");
list[1] = io_make_output_field("HII", FLOAT, 1, UNIT_CONV_NO_UNITS, xparts,
cooling_data.HII_frac);
list[1] = io_make_output_field("HII", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, xparts,
cooling_data.HII_frac, "HII mass fraction");
list[2] = io_make_output_field("HeI", FLOAT, 1, UNIT_CONV_NO_UNITS, xparts,
cooling_data.HeI_frac);
list[2] = io_make_output_field("HeI", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, xparts,
cooling_data.HeI_frac, "HeI mass fraction");
list[3] = io_make_output_field("HeII", FLOAT, 1, UNIT_CONV_NO_UNITS, xparts,
cooling_data.HeII_frac);
list[3] = io_make_output_field("HeII", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, xparts,
cooling_data.HeII_frac, "HeII mass fraction");
list[4] = io_make_output_field("HeIII", FLOAT, 1, UNIT_CONV_NO_UNITS, xparts,
cooling_data.HeIII_frac);
list[4] = io_make_output_field("HeIII", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, xparts,
cooling_data.HeIII_frac, "HeIII mass fraction");
list[5] = io_make_output_field("e", FLOAT, 1, UNIT_CONV_NO_UNITS, xparts,
cooling_data.e_frac);
list[5] = io_make_output_field("e", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, xparts,
cooling_data.e_frac, "free electron mass fraction");
num += 6;
#endif
......@@ -87,14 +87,14 @@ __attribute__((always_inline)) INLINE static int cooling_write_particles(
#if COOLING_GRACKLE_MODE >= 2
list += num;
list[0] = io_make_output_field("HM", FLOAT, 1, UNIT_CONV_NO_UNITS, xparts,
cooling_data.HM_frac);
list[0] = io_make_output_field("HM", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, xparts,
cooling_data.HM_frac, "H- mass fraction");
list[1] = io_make_output_field("H2I", FLOAT, 1, UNIT_CONV_NO_UNITS, xparts,
cooling_data.H2I_frac);
list[1] = io_make_output_field("H2I", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, xparts,
cooling_data.H2I_frac, "H2I mass fraction");
list[2] = io_make_output_field("H2II", FLOAT, 1, UNIT_CONV_NO_UNITS, xparts,
cooling_data.H2II_frac);
list[2] = io_make_output_field("H2II", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, xparts,
cooling_data.H2II_frac, "H2II mass fraction");
num += 3;
#endif
......@@ -102,14 +102,14 @@ __attribute__((always_inline)) INLINE static int cooling_write_particles(
#if COOLING_GRACKLE_MODE >= 3
list += num;
list[0] = io_make_output_field("DI", FLOAT, 1, UNIT_CONV_NO_UNITS, xparts,
cooling_data.DI_frac);
list[0] = io_make_output_field("DI", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, xparts,
cooling_data.DI_frac, "DI mass fraction");
list[1] = io_make_output_field("DII", FLOAT, 1, UNIT_CONV_NO_UNITS, xparts,
cooling_data.DII_frac);
list[1] = io_make_output_field("DII", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, xparts,
cooling_data.DII_frac, "DII mass fraction");
list[2] = io_make_output_field("HDI", FLOAT, 1, UNIT_CONV_NO_UNITS, xparts,
cooling_data.HDI_frac);
list[2] = io_make_output_field("HDI", FLOAT, 1, UNIT_CONV_NO_UNITS, 0.f, xparts,
cooling_data.HDI_frac, "HDI mass fraction");
num += 3;
#endif
......
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