From 42bcb5f0c8c517d42800ec5800b7439c7e7bae6c Mon Sep 17 00:00:00 2001
From: Robert Kloefkorn <robert.kloefkorn@iris.no>
Date: Mon, 20 Oct 2014 12:32:11 +0200
Subject: [PATCH] address Atgeirs comments.

---
 opm/core/simulator/AdaptiveTimeStepping_impl.hpp | 13 ++++++++-----
 opm/core/simulator/PIDTimeStepControl.cpp        |  9 ++++++---
 opm/core/simulator/PIDTimeStepControl.hpp        |  3 ++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/opm/core/simulator/AdaptiveTimeStepping_impl.hpp b/opm/core/simulator/AdaptiveTimeStepping_impl.hpp
index 0d330dc7..43900f6d 100644
--- a/opm/core/simulator/AdaptiveTimeStepping_impl.hpp
+++ b/opm/core/simulator/AdaptiveTimeStepping_impl.hpp
@@ -26,8 +26,9 @@ namespace Opm {
         std::string control = param.getDefault("timestep.control", std::string("pid") );
         
         const double tol = param.getDefault("timestep.control.tol", double(1e-3) );
-        if( control == "pid" ) 
+        if( control == "pid" ) {
             timeStepControl_ = TimeStepControlType( new PIDTimeStepControl( tol ) );
+        }
         else if ( control == "pid+iteration" ) 
         {
             const int iterations = param.getDefault("timestep.control.targetiteration", int(25) );
@@ -44,8 +45,9 @@ namespace Opm {
           const double time, const double timestep )
     {
         // init last time step as a fraction of the given time step
-        if( last_timestep_ < 0 )
+        if( last_timestep_ < 0 ) {
             last_timestep_ = initial_fraction_ * timestep ;
+        }
 
         // create adaptive step timer with previously used sub step size
         AdaptiveSimulatorTimer timer( time, time+timestep, last_timestep_ );
@@ -85,7 +87,7 @@ namespace Opm {
                 // also catch linear solver not converged
             }
 
-            // (linearIterations < 0 means on convergence in solver)
+            // (linearIterations < 0 means no convergence in solver)
             if( linearIterations >= 0 )
             {
                 // advance by current dt
@@ -104,7 +106,7 @@ namespace Opm {
                 last_state      = state ;
                 last_well_state = well_state;
             }
-            else // in case of no convergence
+            else // in case of no convergence (linearIterations < 0)
             {
                 // increase restart counter
                 if( restarts >= solver_restart_max_ ) {
@@ -135,8 +137,9 @@ namespace Opm {
             std::cout << "Last suggested step size = " << unit::convert::to( last_timestep_, unit::day ) << " (days)" << std::endl;
         }
 
-        if( ! std::isfinite( last_timestep_ ) ) // check for NaN
+        if( ! std::isfinite( last_timestep_ ) ) { // check for NaN
             last_timestep_ = timestep;
+        }
     }
 }
 
diff --git a/opm/core/simulator/PIDTimeStepControl.cpp b/opm/core/simulator/PIDTimeStepControl.cpp
index c3cd241d..5d1014d1 100644
--- a/opm/core/simulator/PIDTimeStepControl.cpp
+++ b/opm/core/simulator/PIDTimeStepControl.cpp
@@ -50,11 +50,13 @@ namespace Opm
         assert( state.saturation().size() == satSize );
 
         // compute u^n - u^n+1 
-        for( std::size_t i=0; i<pSize; ++i )
+        for( std::size_t i=0; i<pSize; ++i ) {
             p0_[ i ]   -= state.pressure()[ i ];
+        }
 
-        for( std::size_t i=0; i<satSize; ++i )
+        for( std::size_t i=0; i<satSize; ++i ) {
             sat0_[ i ] -= state.saturation()[ i ];
+        }
 
         // compute || u^n - u^n+1 || 
         const double stateOld  = euclidianNormSquared( p0_.begin(),   p0_.end() ) +
@@ -65,8 +67,9 @@ namespace Opm
                                  euclidianNormSquared( state.saturation().begin(), state.saturation().end() );
 
         // shift errors
-        for( int i=0; i<2; ++i )
+        for( int i=0; i<2; ++i ) {
           errors_[ i ] = errors_[i+1];
+        }
 
         // store new error
         const double error = stateOld / stateNew;
diff --git a/opm/core/simulator/PIDTimeStepControl.hpp b/opm/core/simulator/PIDTimeStepControl.hpp
index ce10376a..5565a66a 100644
--- a/opm/core/simulator/PIDTimeStepControl.hpp
+++ b/opm/core/simulator/PIDTimeStepControl.hpp
@@ -60,8 +60,9 @@ namespace Opm
         double euclidianNormSquared( Iterator it, const Iterator end ) const 
         {
             double product = 0.0 ;
-            for( ; it != end; ++it ) 
+            for( ; it != end; ++it ) {
                 product += ( *it * *it );
+            }
             return product;
         }