yohai/phigrape
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed the control output problem

Browse source
This commit is contained in:
Yohai Meiron 2020-03-18 22:50:00 -04:00
parent 22f983cf17
commit c4830423a3
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
phigrape.cpp
View file

@ -1337,7 +1337,7 @@ DT_EXT_GRAV += (CPU_tmp_user - CPU_tmp_user0);
#endif // EXTPOT #endif // EXTPOT
} }
void energy_contr(const double time_cur, const double timesteps, int n_act_sum, int g6_calls, double& rcm_sum, double& vcm_sum, double& E_tot_0, double& E_tot_corr_0, double& E_tot_corr_sd_0, int skip_con) // TODO how do we know N? void energy_contr(const double time_cur, const double timesteps, const double n_act_sum, const double g6_calls, double& rcm_sum, double& vcm_sum, double& E_tot_0, double& E_tot_corr_0, double& E_tot_corr_sd_0, int &skip_con) // TODO how do we know N?
{ {
// TODO maybe use static variables here for the previous step energy? // TODO maybe use static variables here for the previous step energy?
double E_pot = 0.0; double E_pot = 0.0;
@ -1420,6 +1420,7 @@ void energy_contr(const double time_cur, const double timesteps, int n_act_sum,
} }
double DE_tot = E_tot - E_tot_0; double DE_tot = E_tot - E_tot_0;
/* This is the only output to screen */
printf("%.3E %.3E % .4E %.4E % .4E % .4E % .4E %.2E\n", printf("%.3E %.3E % .4E %.4E % .4E % .4E % .4E %.2E\n",
time_cur, timesteps, time_cur, timesteps,
E_pot, E_kin, E_pot_ext, E_tot, DE_tot, E_pot, E_kin, E_pot_ext, E_tot, DE_tot,