From e3ac74b1eae7a070dcb165c29cab75ae9f6500ce Mon Sep 17 00:00:00 2001 From: Elias Pipping <elias.pipping@fu-berlin.de> Date: Thu, 29 Aug 2013 22:59:37 +0200 Subject: [PATCH] [Cleanup] Kill comments, use `or` --- src/one-body-sample.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc index d97fcce4..04e780cb 100644 --- a/src/one-body-sample.cc +++ b/src/one-body-sample.cc @@ -538,11 +538,12 @@ int main(int argc, char *argv[]) { SingletonVectorType computed_state; stateUpdater->extractState(computed_state); double const correction = stateEnergyNorm.diff(computed_state, alpha); - if (state_fpi <= 2 // Let the first two steps pass through unchanged - || correction < requiredReduction * lastCorrection) { + + if (state_fpi <= 2 or correction < + requiredReduction * lastCorrection) { alpha = computed_state; relaxationWriter << "N "; - } else { // alpha is still the old time step here + } else { alpha *= relaxation; Arithmetic::addProduct(alpha, 1.0 - relaxation, computed_state); relaxationWriter << "Y "; -- GitLab