Fixed BH softening correction when grapite_smbh_star_eps is defined

This commit is contained in:
Yohai Meiron 2021-12-26 21:40:50 -05:00
parent 8b71f4fe92
commit 1fe119fdb2

View file

@ -441,7 +441,12 @@ int main(int argc, char *argv[])
black_hole_physics = Black_hole_physics(m[0], m[1], myRank, rootRank); black_hole_physics = Black_hole_physics(m[0], m[1], myRank, rootRank);
black_hole_physics.set_xv(x[0], x[1], v[0], v[1]); black_hole_physics.set_xv(x[0], x[1], v[0], v[1]);
if (config.live_smbh_custom_eps >= 0) { if (config.live_smbh_custom_eps >= 0) {
black_hole_physics.set_softening(config.eps, config.live_smbh_custom_eps); #ifdef ETICS
double eps = (config.grapite_smbh_star_eps >= 0)?config.grapite_smbh_star_eps:config.eps;
#else
double eps = config.eps;
#endif
black_hole_physics.set_softening(eps, config.live_smbh_custom_eps);
black_hole_physics.adjust_softening(pot[0], pot[1], a[0], a[1], adot[0], adot[1]); black_hole_physics.adjust_softening(pot[0], pot[1], a[0], a[1], adot[0], adot[1]);
} }
if (config.binary_smbh_pn) black_hole_physics.adjust_post_newtonian(dt_min, a[0], a[1], adot[0], adot[1]); if (config.binary_smbh_pn) black_hole_physics.adjust_post_newtonian(dt_min, a[0], a[1], adot[0], adot[1]);