Skip to content
Snippets Groups Projects
Commit daa0fc75 authored by Josh Borrow's avatar Josh Borrow
Browse files

Formatting changes.

parent 4e8ae1d4
Branches
Tags
1 merge request!561Change gradient loops
Hide whitespace changes
Inline Side-by-side
src/hydro/GizmoMFM/hydro.h
+ 6
− 6
View file @ daa0fc75
...@@ -447,15 +447,15 @@ __attribute__((always_inline)) INLINE static void hydro_prepare_gradient( ...@@ -447,15 +447,15 @@ __attribute__((always_inline)) INLINE static void hydro_prepare_gradient(
/** /**
* @brief Resets the variables that are required for a gradient calculation. * @brief Resets the variables that are required for a gradient calculation.
* *
* This function is called after hydro_prepare_gradient. * This function is called after hydro_prepare_gradient.
* *
* @param p The particle to act upon. * @param p The particle to act upon.
* @param xp The extended particle data to act upon. * @param xp The extended particle data to act upon.
* @param cosmo The cosmological model. * @param cosmo The cosmological model.
*/ */
__attribute__((always_inline)) INLINE static void hydro_reset_gradient( __attribute__((always_inline)) INLINE static void hydro_reset_gradient(
struct part *restrict p) {} struct part* restrict p) {}
/** /**
* @brief Finishes the gradient calculation. * @brief Finishes the gradient calculation.
...@@ -481,9 +481,9 @@ __attribute__((always_inline)) INLINE static void hydro_end_gradient( ...@@ -481,9 +481,9 @@ __attribute__((always_inline)) INLINE static void hydro_end_gradient(
/** /**
* @brief Prepare a particle for the force calculation. * @brief Prepare a particle for the force calculation.
* *
* This function is called in the extra_ghost task to convert some quantities coming * This function is called in the extra_ghost task to convert some quantities
* from the gradient loop over neighbours into quantities ready to be used in the * coming from the gradient loop over neighbours into quantities ready to be
* force loop over neighbours. * used in the force loop over neighbours.
* *
* @param p The particle to act upon * @param p The particle to act upon
* @param xp The extended particle data to act upon * @param xp The extended particle data to act upon
......
src/hydro/GizmoMFV/hydro.h
+ 6
− 6
View file @ daa0fc75
...@@ -467,9 +467,9 @@ __attribute__((always_inline)) INLINE static void hydro_end_gradient( ...@@ -467,9 +467,9 @@ __attribute__((always_inline)) INLINE static void hydro_end_gradient(
/** /**
* @brief Prepare a particle for the force calculation. * @brief Prepare a particle for the force calculation.
* *
* This function is called in the extra_ghost task to convert some quantities coming * This function is called in the extra_ghost task to convert some quantities
* from the gradient loop over neighbours into quantities ready to be used in the * coming from the gradient loop over neighbours into quantities ready to be
* force loop over neighbours. * used in the force loop over neighbours.
* *
* @param p The particle to act upon * @param p The particle to act upon
* @param xp The extended particle data to act upon * @param xp The extended particle data to act upon
...@@ -513,15 +513,15 @@ __attribute__((always_inline)) INLINE static void hydro_reset_acceleration( ...@@ -513,15 +513,15 @@ __attribute__((always_inline)) INLINE static void hydro_reset_acceleration(
/** /**
* @brief Resets the variables that are required for a gradient calculation. * @brief Resets the variables that are required for a gradient calculation.
* *
* This function is called after hydro_prepare_gradient. * This function is called after hydro_prepare_gradient.
* *
* @param p The particle to act upon. * @param p The particle to act upon.
* @param xp The extended particle data to act upon. * @param xp The extended particle data to act upon.
* @param cosmo The cosmological model. * @param cosmo The cosmological model.
*/ */
__attribute__((always_inline)) INLINE static void hydro_reset_gradient( __attribute__((always_inline)) INLINE static void hydro_reset_gradient(
struct part *restrict p) {} struct part* restrict p) {}
/** /**
* @brief Sets the values to be predicted in the drifts to their values at a * @brief Sets the values to be predicted in the drifts to their values at a
......
src/hydro/Shadowswift/hydro_gradients.h
+ 61
− 51
View file @ daa0fc75
...@@ -133,57 +133,67 @@ __attribute__((always_inline)) INLINE static void hydro_gradients_predict( ...@@ -133,57 +133,67 @@ __attribute__((always_inline)) INLINE static void hydro_gradients_predict(
hydro_slope_limit_face(Wi, Wj, dWi, dWj, xij_i, xij_j, r); hydro_slope_limit_face(Wi, Wj, dWi, dWj, xij_i, xij_j, r);
/* time */ /* time */
dWi[0] -= 0.5 * mindt * (Wi[1] * pi->primitives.gradients.rho[0] + dWi[0] -= 0.5 * mindt *
Wi[2] * pi->primitives.gradients.rho[1] + (Wi[1] * pi->primitives.gradients.rho[0] +
Wi[3] * pi->primitives.gradients.rho[2] + Wi[2] * pi->primitives.gradients.rho[1] +
Wi[0] * (pi->primitives.gradients.v[0][0] + Wi[3] * pi->primitives.gradients.rho[2] +
pi->primitives.gradients.v[1][1] + Wi[0] * (pi->primitives.gradients.v[0][0] +
pi->primitives.gradients.v[2][2])); pi->primitives.gradients.v[1][1] +
dWi[1] -= 0.5 * mindt * (Wi[1] * pi->primitives.gradients.v[0][0] + pi->primitives.gradients.v[2][2]));
Wi[2] * pi->primitives.gradients.v[0][1] + dWi[1] -= 0.5 * mindt *
Wi[3] * pi->primitives.gradients.v[0][2] + (Wi[1] * pi->primitives.gradients.v[0][0] +
pi->primitives.gradients.P[0] / Wi[0]); Wi[2] * pi->primitives.gradients.v[0][1] +
dWi[2] -= 0.5 * mindt * (Wi[1] * pi->primitives.gradients.v[1][0] + Wi[3] * pi->primitives.gradients.v[0][2] +
Wi[2] * pi->primitives.gradients.v[1][1] + pi->primitives.gradients.P[0] / Wi[0]);
Wi[3] * pi->primitives.gradients.v[1][2] + dWi[2] -= 0.5 * mindt *
pi->primitives.gradients.P[1] / Wi[0]); (Wi[1] * pi->primitives.gradients.v[1][0] +
dWi[3] -= 0.5 * mindt * (Wi[1] * pi->primitives.gradients.v[2][0] + Wi[2] * pi->primitives.gradients.v[1][1] +
Wi[2] * pi->primitives.gradients.v[2][1] + Wi[3] * pi->primitives.gradients.v[1][2] +
Wi[3] * pi->primitives.gradients.v[2][2] + pi->primitives.gradients.P[1] / Wi[0]);
pi->primitives.gradients.P[2] / Wi[0]); dWi[3] -= 0.5 * mindt *
dWi[4] -= (Wi[1] * pi->primitives.gradients.v[2][0] +
0.5 * mindt * (Wi[1] * pi->primitives.gradients.P[0] + Wi[2] * pi->primitives.gradients.v[2][1] +
Wi[2] * pi->primitives.gradients.P[1] + Wi[3] * pi->primitives.gradients.v[2][2] +
Wi[3] * pi->primitives.gradients.P[2] + pi->primitives.gradients.P[2] / Wi[0]);
hydro_gamma * Wi[4] * (pi->primitives.gradients.v[0][0] + dWi[4] -= 0.5 * mindt *
pi->primitives.gradients.v[1][1] + (Wi[1] * pi->primitives.gradients.P[0] +
pi->primitives.gradients.v[2][2])); Wi[2] * pi->primitives.gradients.P[1] +
Wi[3] * pi->primitives.gradients.P[2] +
dWj[0] -= 0.5 * mindt * (Wj[1] * pj->primitives.gradients.rho[0] + hydro_gamma * Wi[4] *
Wj[2] * pj->primitives.gradients.rho[1] + (pi->primitives.gradients.v[0][0] +
Wj[3] * pj->primitives.gradients.rho[2] + pi->primitives.gradients.v[1][1] +
Wj[0] * (pj->primitives.gradients.v[0][0] + pi->primitives.gradients.v[2][2]));
pj->primitives.gradients.v[1][1] +
pj->primitives.gradients.v[2][2])); dWj[0] -= 0.5 * mindt *
dWj[1] -= 0.5 * mindt * (Wj[1] * pj->primitives.gradients.v[0][0] + (Wj[1] * pj->primitives.gradients.rho[0] +
Wj[2] * pj->primitives.gradients.v[0][1] + Wj[2] * pj->primitives.gradients.rho[1] +
Wj[3] * pj->primitives.gradients.v[0][2] + Wj[3] * pj->primitives.gradients.rho[2] +
pj->primitives.gradients.P[0] / Wj[0]); Wj[0] * (pj->primitives.gradients.v[0][0] +
dWj[2] -= 0.5 * mindt * (Wj[1] * pj->primitives.gradients.v[1][0] + pj->primitives.gradients.v[1][1] +
Wj[2] * pj->primitives.gradients.v[1][1] + pj->primitives.gradients.v[2][2]));
Wj[3] * pj->primitives.gradients.v[1][2] + dWj[1] -= 0.5 * mindt *
pj->primitives.gradients.P[1] / Wj[0]); (Wj[1] * pj->primitives.gradients.v[0][0] +
dWj[3] -= 0.5 * mindt * (Wj[1] * pj->primitives.gradients.v[2][0] + Wj[2] * pj->primitives.gradients.v[0][1] +
Wj[2] * pj->primitives.gradients.v[2][1] + Wj[3] * pj->primitives.gradients.v[0][2] +
Wj[3] * pj->primitives.gradients.v[2][2] + pj->primitives.gradients.P[0] / Wj[0]);
pj->primitives.gradients.P[2] / Wj[0]); dWj[2] -= 0.5 * mindt *
dWj[4] -= (Wj[1] * pj->primitives.gradients.v[1][0] +
0.5 * mindt * (Wj[1] * pj->primitives.gradients.P[0] + Wj[2] * pj->primitives.gradients.v[1][1] +
Wj[2] * pj->primitives.gradients.P[1] + Wj[3] * pj->primitives.gradients.v[1][2] +
Wj[3] * pj->primitives.gradients.P[2] + pj->primitives.gradients.P[1] / Wj[0]);
hydro_gamma * Wj[4] * (pj->primitives.gradients.v[0][0] + dWj[3] -= 0.5 * mindt *
pj->primitives.gradients.v[1][1] + (Wj[1] * pj->primitives.gradients.v[2][0] +
pj->primitives.gradients.v[2][2])); Wj[2] * pj->primitives.gradients.v[2][1] +
Wj[3] * pj->primitives.gradients.v[2][2] +
pj->primitives.gradients.P[2] / Wj[0]);
dWj[4] -= 0.5 * mindt *
(Wj[1] * pj->primitives.gradients.P[0] +
Wj[2] * pj->primitives.gradients.P[1] +
Wj[3] * pj->primitives.gradients.P[2] +
hydro_gamma * Wj[4] *
(pj->primitives.gradients.v[0][0] +
pj->primitives.gradients.v[1][1] +
pj->primitives.gradients.v[2][2]));
Wi[0] += dWi[0]; Wi[0] += dWi[0];
Wi[1] += dWi[1]; Wi[1] += dWi[1];
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment