Merge pull request #726 from atgeirr/const-preparestep

Use const reference parameters for prepareStep()

opm/autodiff/BlackoilModelBase.hpp

@@ -164,8 +164,8 @@ namespace Opm {
         /// \param[in, out] reservoir_state   reservoir state variables
         /// \param[in, out] well_state        well state variables
         void prepareStep(const double dt,
-                         ReservoirState& reservoir_state,
-                         WellState& well_state);
+                         const ReservoirState& reservoir_state,
+                         const WellState& well_state);
 
         /// Called once per nonlinear iteration.
         /// This model will perform a Newton-Raphson update, changing reservoir_state

opm/autodiff/BlackoilModelBase_impl.hpp

@@ -258,8 +258,8 @@ namespace detail {
     void
     BlackoilModelBase<Grid, WellModel, Implementation>::
     prepareStep(const double dt,
-                ReservoirState& reservoir_state,
-                WellState& /* well_state */)
+                const ReservoirState& reservoir_state,
+                const WellState& /* well_state */)
     {
         pvdt_ = geo_.poreVolume() / dt;
         if (active_[Gas]) {

opm/autodiff/BlackoilMultiSegmentModel.hpp

@@ -97,8 +97,8 @@ namespace Opm {
         /// \param[in, out] reservoir_state   reservoir state variables
         /// \param[in, out] well_state        well state variables
         void prepareStep(const double dt,
-                         ReservoirState& reservoir_state,
-                         WellState& well_state);
+                         const ReservoirState& reservoir_state,
+                         const WellState& well_state);
 
 
         /// Assemble the residual and Jacobian of the nonlinear system.

opm/autodiff/BlackoilMultiSegmentModel_impl.hpp

@@ -81,8 +81,8 @@ namespace Opm {
     void
     BlackoilMultiSegmentModel<Grid>::
     prepareStep(const double dt,
-                ReservoirState& reservoir_state,
-                WellState& well_state)
+                const ReservoirState& reservoir_state,
+                const WellState& well_state)
     {
         pvdt_ = geo_.poreVolume() / dt;
         if (active_[Gas]) {

opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp

@@ -97,8 +97,8 @@ namespace Opm {
         /// \param[in, out] reservoir_state   reservoir state variables
         /// \param[in, out] well_state        well state variables
         void prepareStep(const double dt,
-                         ReservoirState& reservoir_state,
-                         WellState& well_state);
+                         const ReservoirState& reservoir_state,
+                         const WellState& well_state);
 
         /// Called once after each time step.
         /// \param[in] dt                     time step size

opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp

@@ -122,8 +122,8 @@ namespace Opm {
     void
     BlackoilPolymerModel<Grid>::
     prepareStep(const double dt,
-                ReservoirState& reservoir_state,
-                WellState& well_state)
+                const ReservoirState& reservoir_state,
+                const WellState& well_state)
     {
         Base::prepareStep(dt, reservoir_state, well_state);
         auto& max_concentration = reservoir_state.getCellData( reservoir_state.CMAX );