Commit f9c1d350 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Code formatting

parent 60906bb5
...@@ -431,11 +431,12 @@ void read_ic_parallel(char* fileName, const struct UnitSystem* internal_units, ...@@ -431,11 +431,12 @@ void read_ic_parallel(char* fileName, const struct UnitSystem* internal_units,
*flag_entropy = flag_entropy_temp[0]; *flag_entropy = flag_entropy_temp[0];
readAttribute(h_grp, "BoxSize", DOUBLE, boxSize); readAttribute(h_grp, "BoxSize", DOUBLE, boxSize);
readAttribute(h_grp, "NumPart_Total", LONGLONG, numParticles); readAttribute(h_grp, "NumPart_Total", LONGLONG, numParticles);
readAttribute(h_grp, "NumPart_Total_HighWord", LONGLONG, numParticles_highWord); readAttribute(h_grp, "NumPart_Total_HighWord", LONGLONG,
numParticles_highWord);
for (int ptype = 0; ptype < NUM_PARTICLE_TYPES; ++ptype) for (int ptype = 0; ptype < NUM_PARTICLE_TYPES; ++ptype)
N_total[ptype] = (numParticles[ptype]) + N_total[ptype] =
(numParticles_highWord[ptype] << 32); (numParticles[ptype]) + (numParticles_highWord[ptype] << 32);
dim[0] = boxSize[0]; dim[0] = boxSize[0];
dim[1] = (boxSize[1] < 0) ? boxSize[0] : boxSize[1]; dim[1] = (boxSize[1] < 0) ? boxSize[0] : boxSize[1];
......
...@@ -483,11 +483,12 @@ void read_ic_serial(char* fileName, const struct UnitSystem* internal_units, ...@@ -483,11 +483,12 @@ void read_ic_serial(char* fileName, const struct UnitSystem* internal_units,
*flag_entropy = flag_entropy_temp[0]; *flag_entropy = flag_entropy_temp[0];
readAttribute(h_grp, "BoxSize", DOUBLE, boxSize); readAttribute(h_grp, "BoxSize", DOUBLE, boxSize);
readAttribute(h_grp, "NumPart_Total", LONGLONG, numParticles); readAttribute(h_grp, "NumPart_Total", LONGLONG, numParticles);
readAttribute(h_grp, "NumPart_Total_HighWord", LONGLONG, numParticles_highWord); readAttribute(h_grp, "NumPart_Total_HighWord", LONGLONG,
numParticles_highWord);
for (int ptype = 0; ptype < NUM_PARTICLE_TYPES; ++ptype) for (int ptype = 0; ptype < NUM_PARTICLE_TYPES; ++ptype)
N_total[ptype] = (numParticles[ptype]) + N_total[ptype] =
(numParticles_highWord[ptype] << 32); (numParticles[ptype]) + (numParticles_highWord[ptype] << 32);
dim[0] = boxSize[0]; dim[0] = boxSize[0];
dim[1] = (boxSize[1] < 0) ? boxSize[0] : boxSize[1]; dim[1] = (boxSize[1] < 0) ? boxSize[0] : boxSize[1];
......
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