Merge branch 'Gravity_basics' of gitlab.cosma.dur.ac.uk:swift/swiftsim into Gravity_basics

examples/SodShock/makeIC.py

@@ -87,7 +87,7 @@ u = append(u1, u2,0)
 m = append(m1, m2,0)
 ids = zeros(numPart, dtype='L')
 for i in range(1, numPart+1):
-    ids[i] = i
+    ids[i-1] = i
 
 #Final operations
 h /= 2

src/gravity/Default/gravity_io.h

@@ -18,14 +18,14 @@
  ******************************************************************************/
 
 /**
- * @brief Reads the different particles to the HDF5 file
+ * @brief Read dark matter particles from HDF5.
  *
  * @param h_grp The HDF5 group in which to read the arrays.
  * @param N The number of particles on that MPI rank.
  * @param N_total The total number of particles (only used in MPI mode)
  * @param offset The offset of the particles for this MPI rank (only used in MPI
  *mode)
- * @param parts The particle array
+ * @param gparts The particle array
  *
  */
 __attribute__((always_inline)) INLINE static void darkmatter_read_particles(

src/single_io.c

@@ -309,9 +309,11 @@ void writeArrayBackEnd(hid_t grp, char* fileName, FILE* xmfFile, char* name,
  * @brief Reads an HDF5 initial condition file (GADGET-3 type)
  *
  * @param fileName The file to read.
- * @param dim (output) The dimension of the volume read from the file.
- * @param parts (output) The array of #part read from the file.
- * @param N (output) The number of particles read from the file.
+ * @param dim (output) The dimension of the volume.
+ * @param parts (output) Array of Gas particles.
+ * @param gparts (output) Array of DM particles.
+ * @param Ngas (output) number of Gas particles read.
+ * @param Ngparts (output) The number of DM particles read.
  * @param periodic (output) 1 if the volume is periodic, 0 if not.
  *
  * Opens the HDF5 file fileName and reads the particles contained

src/space.c

@@ -1233,8 +1233,10 @@ struct cell *space_getcell(struct space *s) {
  *
  * @param s The #space to initialize.
  * @param dim Spatial dimensions of the domain.
- * @param parts Pointer to an array of #part.
- * @param N The number of parts in the space.
+ * @param parts Array of Gas particles.
+ * @param gparts Array of Gravity particles.
+ * @param Ngas The number of Gas particles in the space.
+ * @param Ngpart The number of Gravity particles in the space.
  * @param periodic flag whether the domain is periodic or not.
  * @param h_max The maximal interaction radius.
  * @param verbose Print messages to stdout or not