From c4830423a34bb107ee7813a82b5c32977c2b61b8 Mon Sep 17 00:00:00 2001 From: Yohai Meiron Date: Wed, 18 Mar 2020 22:50:00 -0400 Subject: [PATCH] Fixed the control output problem --- phigrape.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phigrape.cpp b/phigrape.cpp index b545836..a82b749 100644 --- a/phigrape.cpp +++ b/phigrape.cpp @@ -1337,7 +1337,7 @@ DT_EXT_GRAV += (CPU_tmp_user - CPU_tmp_user0); #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? 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; + /* This is the only output to screen */ printf("%.3E %.3E % .4E %.4E % .4E % .4E % .4E %.2E\n", time_cur, timesteps, E_pot, E_kin, E_pot_ext, E_tot, DE_tot,