Skip to content
Snippets Groups Projects
Commit bd3491d1 authored by Orestis Karapiperis's avatar Orestis Karapiperis
Browse files

Small fix to Nikyta's diagnostics because of new code changes

parent 78f36fe9
No related branches found
No related tags found
2 merge requests!2142Anti-symmetric div(B) cleaning and Hopkins2016 artificial resistivity,!2124Karapiperis/antisymmetric and faster dedner
...@@ -538,8 +538,7 @@ __attribute__((always_inline)) INLINE static void runner_iact_mhd_force( ...@@ -538,8 +538,7 @@ __attribute__((always_inline)) INLINE static void runner_iact_mhd_force(
pi->mhd_data.u_dt_AR -= 0.5f * mj * permeability_inv * art_diff_pref_i * dB_2; pi->mhd_data.u_dt_AR -= 0.5f * mj * permeability_inv * art_diff_pref_i * dB_2;
pj->mhd_data.u_dt_AR -= 0.5f * mi * permeability_inv * art_diff_pref_j * dB_2; pj->mhd_data.u_dt_AR -= 0.5f * mi * permeability_inv * art_diff_pref_j * dB_2;
/*Divergence diffusion */ /* Divergence diffusion */
const float vsig_Dedner_i = 0.5f * pi->viscosity.v_sig; const float vsig_Dedner_i = 0.5f * pi->viscosity.v_sig;
const float vsig_Dedner_j = 0.5f * pj->viscosity.v_sig; const float vsig_Dedner_j = 0.5f * pj->viscosity.v_sig;
...@@ -555,7 +554,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_mhd_force( ...@@ -555,7 +554,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_mhd_force(
pj->mhd_data.B_over_rho_dt[2] += mi * grad_psi * dx[2]; pj->mhd_data.B_over_rho_dt[2] += mi * grad_psi * dx[2];
/* Save induction sources */ /* Save induction sources */
const float dB_dt_pref_Lap_i = 2.0f * r_inv / rhoj; const float dB_dt_pref_Lap_i = 2.0f * r_inv / rhoj;
const float dB_dt_pref_Lap_j = 2.0f * r_inv / rhoi; const float dB_dt_pref_Lap_j = 2.0f * r_inv / rhoi;
...@@ -564,8 +562,8 @@ __attribute__((always_inline)) INLINE static void runner_iact_mhd_force( ...@@ -564,8 +562,8 @@ __attribute__((always_inline)) INLINE static void runner_iact_mhd_force(
pj->mhd_data.Adv_B_source[i] += mi * dB_dt_pref_j * dB_dt_j[i]; pj->mhd_data.Adv_B_source[i] += mi * dB_dt_pref_j * dB_dt_j[i];
pi->mhd_data.Adv_B_source[i] -= mj * grad_psi * dx[i]; pi->mhd_data.Adv_B_source[i] -= mj * grad_psi * dx[i];
pj->mhd_data.Adv_B_source[i] += mi * grad_psi * dx[i]; pj->mhd_data.Adv_B_source[i] += mi * grad_psi * dx[i];
pi->mhd_data.Diff_B_source[i] += mj * dB_dt_pref_PR_i * wi_dr * dB[i]; pi->mhd_data.Diff_B_source[i] += mj * resistive_eta_i * mj * dB_dt_pref_PR * dB[i];
pj->mhd_data.Diff_B_source[i] -= mi * dB_dt_pref_PR_j * wj_dr * dB[i]; pj->mhd_data.Diff_B_source[i] -= mi * resistive_eta_j * mi * dB_dt_pref_PR * dB[i];
pi->mhd_data.Diff_B_source[i] += mj * art_diff_pref_i* dB[i]; pi->mhd_data.Diff_B_source[i] += mj * art_diff_pref_i* dB[i];
pj->mhd_data.Diff_B_source[i] -= mi * art_diff_pref_j * dB[i]; pj->mhd_data.Diff_B_source[i] -= mi * art_diff_pref_j * dB[i];
pi->mhd_data.Delta_B[i] += mj * dB_dt_pref_Lap_i * wi_dr * dB[i]; pi->mhd_data.Delta_B[i] += mj * dB_dt_pref_Lap_i * wi_dr * dB[i];
...@@ -806,7 +804,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_mhd_force( ...@@ -806,7 +804,6 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_mhd_force(
pi->mhd_data.u_dt_AR -= 0.5f * mj * permeability_inv * art_diff_pref * dB_2; pi->mhd_data.u_dt_AR -= 0.5f * mj * permeability_inv * art_diff_pref * dB_2;
/* Divergence diffusion */ /* Divergence diffusion */
const float vsig_Dedner_i = 0.5f * pi->viscosity.v_sig; const float vsig_Dedner_i = 0.5f * pi->viscosity.v_sig;
const float vsig_Dedner_j = 0.5f * pj->viscosity.v_sig; const float vsig_Dedner_j = 0.5f * pj->viscosity.v_sig;
...@@ -823,7 +820,7 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_mhd_force( ...@@ -823,7 +820,7 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_mhd_force(
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
pi->mhd_data.Adv_B_source[i] += mj * dB_dt_pref_i * dB_dt_i[i]; pi->mhd_data.Adv_B_source[i] += mj * dB_dt_pref_i * dB_dt_i[i];
pi->mhd_data.Adv_B_source[i] -= mj * grad_psi * dx[i]; pi->mhd_data.Adv_B_source[i] -= mj * grad_psi * dx[i];
pi->mhd_data.Diff_B_source[i] += mj * dB_dt_pref_PR * wi_dr * dB[i]; pi->mhd_data.Diff_B_source[i] += resistive_eta_i * mj * dB_dt_pref_PR * dB[i];
pi->mhd_data.Diff_B_source[i] += mj * art_diff_pref * dB[i]; pi->mhd_data.Diff_B_source[i] += mj * art_diff_pref * dB[i];
pi->mhd_data.Delta_B[i] += mj * dB_dt_pref_Lap * wi_dr * dB[i]; pi->mhd_data.Delta_B[i] += mj * dB_dt_pref_Lap * wi_dr * dB[i];
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment