Merge branch 'planetary_update' into 'master'

Planetary update

See merge request !1594

examples/Planetary/KelvinHelmholtz_2D/makeIC.py

@@ -42,9 +42,9 @@ numPart2 = L2 * L2
 L1 = int(sqrt(numPart2 / rho2 * rho1))
 numPart1 = L1 * L1
 
-# print "N2 =", numPart2, "N1 =", numPart1
-# print "L2 =", L2, "L1 = ", L1
-# print "rho2 =", rho2, "rho1 =", (float(L1*L1)) / (float(L2*L2))
+print("N2 =", numPart2, "N1 =", numPart1)
+print("L2 =", L2, "L1 = ", L1)
+print("rho2 =", rho2, "rho1 =", (float(L1 * L1)) / (float(L2 * L2)))
 
 coords1 = zeros((numPart1, 3))
 coords2 = zeros((numPart2, 3))
@@ -110,8 +110,8 @@ vel[:, 1] = (
     omega0
     * sin(4 * pi * coords[:, 0])
     * (
-        exp(-(coords[:, 1] - 0.25) ** 2 / (2 * sigma ** 2))
-        + exp(-(coords[:, 1] - 0.75) ** 2 / (2 * sigma ** 2))
+        exp(-((coords[:, 1] - 0.25) ** 2) / (2 * sigma ** 2))
+        + exp(-((coords[:, 1] - 0.75) ** 2) / (2 * sigma ** 2))
     )
 )
 
@@ -155,5 +155,4 @@ ds[()] = ids.reshape((numPart, 1))
 ds = grp.create_dataset("MaterialIDs", (numPart, 1), "i")
 ds[()] = mat.reshape((numPart, 1))
 
-
 fileOutput.close()

src/hydro/Planetary/hydro.h

@@ -472,6 +472,28 @@ __attribute__((always_inline)) INLINE static float hydro_signal_velocity(
   return ci + cj - beta * mu_ij;
 }
 
+/**
+ * @brief returns the signal velocity
+ *
+ * @brief p  the particle
+ */
+__attribute__((always_inline)) INLINE static float hydro_get_signal_velocity(
+    const struct part *restrict p) {
+
+  return p->force.v_sig;
+}
+
+/**
+ * @brief returns the div_v
+ *
+ * @brief p  the particle
+ */
+__attribute__((always_inline)) INLINE static float hydro_get_div_v(
+    const struct part *restrict p) {
+
+  return p->density.div_v;
+}
+
 /**
  * @brief Does some extra hydro operations once the actual physical time step
  * for the particle is known.

src/hydro/Planetary/hydro_part.h

@@ -79,10 +79,10 @@ struct xpart {
   /*! Additional data used by the tracers */
   struct tracers_xpart_data tracers_data;
 
-  /* Additional data used by the star formation */
+  /*! Additional data used by the star formation */
   struct star_formation_xpart_data sf_data;
 
-  /* Additional data used by the feedback */
+  /*! Additional data used by the feedback */
   struct feedback_part_data feedback_data;
 
   /*! Additional data used by the MHD scheme */