From 4e59c12c77962ca226b0503cb75c180ddb8bd30b Mon Sep 17 00:00:00 2001 From: Mark Abraham Date: Thu, 19 Aug 2021 07:45:25 +0200 Subject: [PATCH] Restrict scope of step and step_rel This prevents use-before-set issues --- src/gromacs/mdrun/md.cpp | 5 ++--- src/gromacs/mdrun/mimic.cpp | 5 ++--- src/gromacs/mdrun/rerun.cpp | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/gromacs/mdrun/md.cpp b/src/gromacs/mdrun/md.cpp index 3b7466c229..1490fd893c 100644 --- a/src/gromacs/mdrun/md.cpp +++ b/src/gromacs/mdrun/md.cpp @@ -167,7 +167,6 @@ void gmx::LegacySimulator::do_md() // will go away eventually. const t_inputrec* ir = inputrec; - int64_t step, step_rel; double t, t0 = ir->init_t; gmx_bool bGStatEveryStep, bGStat, bCalcVir, bCalcEnerStep, bCalcEner; gmx_bool bNS = FALSE, bNStList, bStopCM, bFirstStep, bInitStep, bLastStep = FALSE; @@ -802,8 +801,8 @@ void gmx::LegacySimulator::do_md() bExchanged = FALSE; bNeedRepartition = FALSE; - step = ir->init_step; - step_rel = 0; + int64_t step = ir->init_step; + int64_t step_rel = 0; auto stopHandler = stopHandlerBuilder->getStopHandlerMD( compat::not_null(&signals[eglsSTOPCOND]), diff --git a/src/gromacs/mdrun/mimic.cpp b/src/gromacs/mdrun/mimic.cpp index 5c6fa4debb..ec45896922 100644 --- a/src/gromacs/mdrun/mimic.cpp +++ b/src/gromacs/mdrun/mimic.cpp @@ -143,7 +143,6 @@ using gmx::SimulationSignaller; void gmx::LegacySimulator::do_mimic() { const t_inputrec* ir = inputrec; - int64_t step, step_rel; double t; bool isLastStep = false; bool doFreeEnergyPerturbation = false; @@ -415,8 +414,8 @@ void gmx::LegacySimulator::do_mimic() "MiMiC does not report kinetic energy, total energy, temperature, virial and " "pressure."); - step = ir->init_step; - step_rel = 0; + int64_t step = ir->init_step; + int64_t step_rel = 0; auto stopHandler = stopHandlerBuilder->getStopHandlerMD( compat::not_null(&signals[eglsSTOPCOND]), diff --git a/src/gromacs/mdrun/rerun.cpp b/src/gromacs/mdrun/rerun.cpp index 407c0190f6..cd648a504e 100644 --- a/src/gromacs/mdrun/rerun.cpp +++ b/src/gromacs/mdrun/rerun.cpp @@ -174,7 +174,6 @@ void gmx::LegacySimulator::do_rerun() // t_inputrec is being replaced by IMdpOptionsProvider, so this // will go away eventually. const t_inputrec* ir = inputrec; - int64_t step, step_rel; double t; bool isLastStep = false; bool doFreeEnergyPerturbation = false; @@ -511,8 +510,8 @@ void gmx::LegacySimulator::do_rerun() calc_shifts(rerun_fr.box, fr->shift_vec); } - step = ir->init_step; - step_rel = 0; + int64_t step = ir->init_step; + int64_t step_rel = 0; auto stopHandler = stopHandlerBuilder->getStopHandlerMD( compat::not_null(&signals[eglsSTOPCOND]), -- 2.22.0