Merge branch 'master' into reorder_tof

examples/sim_2p_comp_reorder.cpp

@@ -32,7 +32,6 @@
 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/core/simulator/SimulatorTimer.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
-#include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 
 #include <opm/core/fluid/BlackoilPropertiesBasic.hpp>

examples/sim_wateroil.cpp

@@ -408,7 +408,7 @@ main(int argc, char** argv)
                                 state.saturation(), state.surfacevol());
             // Opm::computeInjectedProduced(*props, state.saturation(), reorder_src, stepsize, injected, produced);
             if (use_segregation_split) {
-                reorder_model.solveGravity(columns, &state.pressure()[0], &initial_porevol[0],
+                reorder_model.solveGravity(columns, 
                                            stepsize, state.saturation(), state.surfacevol());
             }
         }