Skip to content
Snippets Groups Projects
Commit 187597b3 authored by Loic Hausammann's avatar Loic Hausammann
Browse files

Remove drho_dh

parent c6a9b81b
Branches
Tags
1 merge request!890Remove drho_dh
...@@ -503,7 +503,6 @@ __attribute__((always_inline)) INLINE static void hydro_init_part( ...@@ -503,7 +503,6 @@ __attribute__((always_inline)) INLINE static void hydro_init_part(
p->density.wcount = 0.f; p->density.wcount = 0.f;
p->density.wcount_dh = 0.f; p->density.wcount_dh = 0.f;
p->rho = 0.f; p->rho = 0.f;
p->density.rho_dh = 0.f;
p->pressure_bar = 0.f; p->pressure_bar = 0.f;
p->density.pressure_bar_dh = 0.f; p->density.pressure_bar_dh = 0.f;
...@@ -537,7 +536,6 @@ __attribute__((always_inline)) INLINE static void hydro_end_density( ...@@ -537,7 +536,6 @@ __attribute__((always_inline)) INLINE static void hydro_end_density(
/* Final operation on the density (add self-contribution). */ /* Final operation on the density (add self-contribution). */
p->rho += p->mass * kernel_root; p->rho += p->mass * kernel_root;
p->density.rho_dh -= hydro_dimension * p->mass * kernel_root;
p->pressure_bar += p->mass * p->u * kernel_root; p->pressure_bar += p->mass * p->u * kernel_root;
p->density.pressure_bar_dh -= hydro_dimension * p->mass * p->u * kernel_root; p->density.pressure_bar_dh -= hydro_dimension * p->mass * p->u * kernel_root;
p->density.wcount += kernel_root; p->density.wcount += kernel_root;
...@@ -545,7 +543,6 @@ __attribute__((always_inline)) INLINE static void hydro_end_density( ...@@ -545,7 +543,6 @@ __attribute__((always_inline)) INLINE static void hydro_end_density(
/* Finish the calculation by inserting the missing h-factors */ /* Finish the calculation by inserting the missing h-factors */
p->rho *= h_inv_dim; p->rho *= h_inv_dim;
p->density.rho_dh *= h_inv_dim_plus_one;
p->pressure_bar *= (h_inv_dim * hydro_gamma_minus_one); p->pressure_bar *= (h_inv_dim * hydro_gamma_minus_one);
p->density.pressure_bar_dh *= (h_inv_dim_plus_one * hydro_gamma_minus_one); p->density.pressure_bar_dh *= (h_inv_dim_plus_one * hydro_gamma_minus_one);
p->density.wcount *= h_inv_dim; p->density.wcount *= h_inv_dim;
...@@ -590,7 +587,6 @@ __attribute__((always_inline)) INLINE static void hydro_part_has_no_neighbours( ...@@ -590,7 +587,6 @@ __attribute__((always_inline)) INLINE static void hydro_part_has_no_neighbours(
p->pressure_bar = p->pressure_bar =
p->mass * p->u * hydro_gamma_minus_one * kernel_root * h_inv_dim; p->mass * p->u * hydro_gamma_minus_one * kernel_root * h_inv_dim;
p->density.wcount = kernel_root * h_inv_dim; p->density.wcount = kernel_root * h_inv_dim;
p->density.rho_dh = 0.f;
p->density.wcount_dh = 0.f; p->density.wcount_dh = 0.f;
p->density.pressure_bar_dh = 0.f; p->density.pressure_bar_dh = 0.f;
......
...@@ -30,13 +30,13 @@ __attribute__((always_inline)) INLINE static void hydro_debug_particle( ...@@ -30,13 +30,13 @@ __attribute__((always_inline)) INLINE static void hydro_debug_particle(
"x=[%.3e,%.3e,%.3e], " "x=[%.3e,%.3e,%.3e], "
"v=[%.3e,%.3e,%.3e],v_full=[%.3e,%.3e,%.3e] \n a=[%.3e,%.3e,%.3e], " "v=[%.3e,%.3e,%.3e],v_full=[%.3e,%.3e,%.3e] \n a=[%.3e,%.3e,%.3e], "
"u=%.3e, du/dt=%.3e v_sig=%.3e, P=%.3e\n" "u=%.3e, du/dt=%.3e v_sig=%.3e, P=%.3e\n"
"h=%.3e, dh/dt=%.3e wcount=%d, m=%.3e, dh_drho=%.3e, rho=%.3e, \n" "h=%.3e, dh/dt=%.3e wcount=%d, m=%.3e, rho=%.3e, \n"
"p_dh=%.3e, p_bar=%.3e \n" "p_dh=%.3e, p_bar=%.3e \n"
"time_bin=%d wakeup=%d\n", "time_bin=%d wakeup=%d\n",
p->x[0], p->x[1], p->x[2], p->v[0], p->v[1], p->v[2], xp->v_full[0], p->x[0], p->x[1], p->x[2], p->v[0], p->v[1], p->v[2], xp->v_full[0],
xp->v_full[1], xp->v_full[2], p->a_hydro[0], p->a_hydro[1], p->a_hydro[2], xp->v_full[1], xp->v_full[2], p->a_hydro[0], p->a_hydro[1], p->a_hydro[2],
p->u, p->u_dt, p->force.v_sig, hydro_get_comoving_pressure(p), p->h, p->u, p->u_dt, p->force.v_sig, hydro_get_comoving_pressure(p), p->h,
p->force.h_dt, (int)p->density.wcount, p->mass, p->density.rho_dh, p->rho, p->force.h_dt, (int)p->density.wcount, p->mass, p->rho,
p->density.pressure_bar_dh, p->pressure_bar, p->time_bin, p->wakeup); p->density.pressure_bar_dh, p->pressure_bar, p->time_bin, p->wakeup);
} }
......
...@@ -69,7 +69,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_density( ...@@ -69,7 +69,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_density(
kernel_deval(ui, &wi, &wi_dx); kernel_deval(ui, &wi, &wi_dx);
pi->rho += mj * wi; pi->rho += mj * wi;
pi->density.rho_dh -= mj * (hydro_dimension * wi + ui * wi_dx);
pi->pressure_bar += mj * wi * pj->u; pi->pressure_bar += mj * wi * pj->u;
pi->density.pressure_bar_dh -= pi->density.pressure_bar_dh -=
...@@ -83,7 +82,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_density( ...@@ -83,7 +82,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_density(
kernel_deval(uj, &wj, &wj_dx); kernel_deval(uj, &wj, &wj_dx);
pj->rho += mi * wj; pj->rho += mi * wj;
pj->density.rho_dh -= mi * (hydro_dimension * wj + uj * wj_dx);
pj->pressure_bar += mi * wj * pi->u; pj->pressure_bar += mi * wj * pi->u;
pj->density.pressure_bar_dh -= pj->density.pressure_bar_dh -=
mi * pi->u * (hydro_dimension * wj + uj * wj_dx); mi * pi->u * (hydro_dimension * wj + uj * wj_dx);
...@@ -149,7 +147,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_density( ...@@ -149,7 +147,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_density(
kernel_deval(ui, &wi, &wi_dx); kernel_deval(ui, &wi, &wi_dx);
pi->rho += mj * wi; pi->rho += mj * wi;
pi->density.rho_dh -= mj * (hydro_dimension * wi + ui * wi_dx);
pi->pressure_bar += mj * wi * pj->u; pi->pressure_bar += mj * wi * pj->u;
......
...@@ -132,9 +132,6 @@ struct part { ...@@ -132,9 +132,6 @@ struct part {
/*! Derivative of the neighbour number with respect to h. */ /*! Derivative of the neighbour number with respect to h. */
float wcount_dh; float wcount_dh;
/*! Derivative of density with respect to h */
float rho_dh;
/*! Derivative of the weighted pressure with respect to h */ /*! Derivative of the weighted pressure with respect to h */
float pressure_bar_dh; float pressure_bar_dh;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment