diff --git a/.gitignore b/.gitignore index 9a8c7cc..737bf91 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ grapite-dev-exec-threshold phigrape *.h5 +.* +.gitignore diff --git a/io.cpp b/io.cpp index a2c0d3d..e739e30 100644 --- a/io.cpp +++ b/io.cpp @@ -81,7 +81,7 @@ void h5_read(const std::string file_name, int *step_num, int *N, double *t, doub H5Gget_info(group_id, &object_info); // Iterate over objects and add the number of each "step" group into a vector std::vector step_num_arr; - for (int i=0; i &external_gravity_components, int n_act, double3 *x_act_new, double3 *v_act_new, double *pot_act_ext, double3 *a_act_new, double3* adot_act_new) { +#ifdef TIMING + get_CPU_time(&CPU_tmp_real0, &CPU_tmp_user0, &CPU_tmp_syst0); +#endif -/* Define the external potential for all active particles on all nodes */ - -int ni = n_act; // TODO redundant? + /* Define the external potential for all active particles on all nodes */ std::fill(pot_act_ext, pot_act_ext+n_act, 0.); @@ -348,15 +349,11 @@ int ni = n_act; // TODO redundant? component->apply(n_act, x_act_new, v_act_new, pot_act_ext, a_act_new, adot_act_new); } -#ifdef TIMING -get_CPU_time(&CPU_tmp_real0, &CPU_tmp_user0, &CPU_tmp_syst0); -#endif - /* For simple Plummer potential... */ #ifdef TIMING -get_CPU_time(&CPU_tmp_real, &CPU_tmp_user, &CPU_tmp_syst); -DT_EXT_GRAV += (CPU_tmp_user - CPU_tmp_user0); + get_CPU_time(&CPU_tmp_real, &CPU_tmp_user, &CPU_tmp_syst); + DT_EXT_GRAV += (CPU_tmp_user - CPU_tmp_user0); #endif } @@ -679,12 +676,11 @@ void adjust_bsmbh_softening(const double eps, const double eps_bh, const int i_b // calculate and "minus" the BH <-> BH softened pot, acc & jerk - double tmp_i; - tmp_i = calc_force_n_BH(m_bh1, x_bh1, v_bh1, - m_bh2, x_bh2, v_bh2, - eps, - &pot_bh1, a_bh1, adot_bh1, - &pot_bh2, a_bh2, adot_bh2); + calc_force_n_BH(m_bh1, x_bh1, v_bh1, + m_bh2, x_bh2, v_bh2, + eps, + &pot_bh1, a_bh1, adot_bh1, + &pot_bh2, a_bh2, adot_bh2); pot_act_new[i_bh1] -= pot_bh1; pot_act_new[i_bh2] -= pot_bh2; @@ -697,11 +693,11 @@ void adjust_bsmbh_softening(const double eps, const double eps_bh, const int i_b // calculate and "plus" the new BH <-> BH unsoftened pot, acc, jerk - tmp_i = calc_force_n_BH(m_bh1, x_bh1, v_bh1, - m_bh2, x_bh2, v_bh2, - eps_bh, - &pot_bh1, a_bh1, adot_bh1, - &pot_bh2, a_bh2, adot_bh2); + calc_force_n_BH(m_bh1, x_bh1, v_bh1, + m_bh2, x_bh2, v_bh2, + eps_bh, + &pot_bh1, a_bh1, adot_bh1, + &pot_bh2, a_bh2, adot_bh2); pot_act_new[i_bh1] += pot_bh1; pot_act_new[i_bh2] += pot_bh2; @@ -711,28 +707,24 @@ void adjust_bsmbh_softening(const double eps, const double eps_bh, const int i_b adot_act_new[i_bh1] += adot_bh1; adot_act_new[i_bh2] += adot_bh2; - } int main(int argc, char *argv[]) { int name_proc, n_proc=1, myRank=0, rootRank=0, cur_rank, - nj, diskstep=0, power, jjj, iii, + diskstep=0, power, jjj, iii, skip_con=0, tmp_i; double dt_disk, dt_contr, t_disk=0.0, t_contr=0.0, dt_bh, t_bh=0.0, dt_bh_tmp, - t_end, time_cur, dt_min, dt_max, min_t, min_t_loc, dt_new, + t_end, time_cur, dt_min, dt_max, min_t, min_t_loc, eta_s, eta, eta_bh, E_tot_0, E_tot_corr_0, E_tot_corr_sd_0, rcm_sum=0.0, vcm_sum=0.0, eps=0.0, eps2, a2_mod, adot2_mod, - dt_tmp, dt2half, dt3over6, dt4over24, dt5over120, - dtinv, dt2inv, dt3inv, - a1abs, adot1abs, a2dot1abs, a3dot1abs, - timesteps=0.0, n_act_sum=0.0, n_act_distr[N_MAX], g6_calls=0.0, g6_calls_sum=0.0, - tmp; + dt_tmp, dt2half, dt3over6, + timesteps=0.0, n_act_sum=0.0, n_act_distr[N_MAX], g6_calls=0.0, g6_calls_sum=0.0; double3 xcm, vcm, mom, xdc, vdc, @@ -785,9 +777,7 @@ int main(int argc, char *argv[]) double m_bh1, m_bh2; int inf_event[N_MAX]; - double DR2, tmp_r2; double3 x_bbhc, v_bbhc; - double DV2, EB, SEMI_a, SEMI_a2; double s_bh1[3] = {0.0, 0.0, 1.0}; double s_bh2[3] = {0.0, 0.0, 1.0}; @@ -823,7 +813,7 @@ int main(int argc, char *argv[]) if (is_hdf5(config->input_file_name)) { #ifndef HAS_HDF5 - fprintf(stderr, "ERROR: input file is in HDF5 format, but the code was compiled without HDF5 support\n") + fprintf(stderr, "ERROR: input file is in HDF5 format, but the code was compiled without HDF5 support\n"); return -1; #endif h5_read(config->input_file_name, &diskstep, &N, &time_cur, m, x, v); @@ -1097,11 +1087,11 @@ int main(int argc, char *argv[]) // calculate and "minus" the BH <-> BH _softened_ pot, acc & jerk - tmp_i = calc_force_n_BH(m_bh1, x_bh1, v_bh1, - m_bh2, x_bh2, v_bh2, - eps, - &pot_bh1, a_bh1, adot_bh1, - &pot_bh2, a_bh2, adot_bh2); + calc_force_n_BH(m_bh1, x_bh1, v_bh1, + m_bh2, x_bh2, v_bh2, + eps, + &pot_bh1, a_bh1, adot_bh1, + &pot_bh2, a_bh2, adot_bh2); pot[i_bh1] -= pot_bh1; pot[i_bh2] -= pot_bh2; @@ -1114,11 +1104,11 @@ int main(int argc, char *argv[]) // calculate and "plus" the new BH <-> BH _unsoftened_ pot, acc, jerk - tmp_i = calc_force_n_BH(m_bh1, x_bh1, v_bh1, - m_bh2, x_bh2, v_bh2, - config->live_smbh_custom_eps, - &pot_bh1, a_bh1, adot_bh1, - &pot_bh2, a_bh2, adot_bh2); + calc_force_n_BH(m_bh1, x_bh1, v_bh1, + m_bh2, x_bh2, v_bh2, + config->live_smbh_custom_eps, + &pot_bh1, a_bh1, adot_bh1, + &pot_bh2, a_bh2, adot_bh2); pot[i_bh1] += pot_bh1; pot[i_bh2] += pot_bh2; @@ -1427,11 +1417,11 @@ int main(int argc, char *argv[]) dt_bh_tmp = dt[0]; - tmp_i = calc_force_pn_BH(m_bh1, x_bh1, v_bh1, s_bh1, - m_bh2, x_bh2, v_bh2, s_bh2, - C_NB, dt_bh_tmp, usedOrNot, - (double(*)[3])a_pn1, (double(*)[3])adot_pn1, - (double(*)[3])a_pn2, (double(*)[3])adot_pn2, myRank, rootRank); + tmp_i = calc_force_pn_BH(m_bh1, x_act_new[i_bh1], v_act_new[i_bh1], s_bh1, + m_bh2, x_act_new[i_bh2], v_act_new[i_bh2], s_bh2, + C_NB, dt_bh_tmp, usedOrNot, + (double(*)[3])a_pn1, (double(*)[3])adot_pn1, + (double(*)[3])a_pn2, (double(*)[3])adot_pn2, myRank, rootRank); a_act_new[i_bh1] += a_pn1[1] + a_pn1[2] + a_pn1[3] + a_pn1[4] + a_pn1[5] + a_pn1[6]; a_act_new[i_bh2] += a_pn2[1] + a_pn2[2] + a_pn2[3] + a_pn2[4] + a_pn2[5] + a_pn2[6];