Moved argument 'sub_step' to 2. in argument list.

opm/output/eclipse/EclipseWriter.hpp

@@ -74,10 +74,10 @@ public:
      * meaningful after the first time step has been completed.
      */
     void writeTimeStep( int report_step,
+                        bool isSubstep,
                         double seconds_elapsed,
                         data::Solution,
                         data::Wells,
-                        bool isSubstep,
                         bool write_float = true);
 
     EclipseWriter( const EclipseWriter& ) = delete;

src/opm/output/eclipse/EclipseWriter.cpp

@@ -636,10 +636,10 @@ void EclipseWriter::writeInitAndEgrid(const std::vector<data::CellData>& simProp
 
 // implementation of the writeTimeStep method
 void EclipseWriter::writeTimeStep(int report_step,
+                                  bool  isSubstep,
                                   double secs_elapsed,
                                   data::Solution cells,
                                   data::Wells wells,
-                                  bool  isSubstep,
                                   bool  write_float)
 {
 

tests/test_EclipseWriter.cpp

@@ -290,9 +290,10 @@ BOOST_AUTO_TEST_CASE(EclipseWriterIntegration)
 
         for( int i = 0; i < 5; ++i ) {
             eclWriter.writeTimeStep( i,
+                                     false,
                                      first_step - start_time,
                                      createBlackoilState( i, 3 * 3 * 3 ),
-                                     wells, false);
+                                     wells);
 
             checkRestartFile( i );
 

tests/test_RFT.cpp

@@ -134,9 +134,10 @@ BOOST_AUTO_TEST_CASE(test_RFT) {
         };
 
         eclipseWriter.writeTimeStep( 2,
-                step_time - start_time,
-                createBlackoilState( 2, numCells ),
-                wells, false);
+                                     false,
+                                     step_time - start_time,
+                                     createBlackoilState( 2, numCells ),
+                                     wells);
     }
 
     verifyRFTFile("TESTRFT.RFT");

tests/test_Restart.cpp

@@ -237,8 +237,9 @@ first_sim(test_work_area_type * test_area) {
     auto wells = mkWells();
 
     eclWriter.writeTimeStep( 1,
+                             false,
                              first_step - start_time,
-                             sol, wells, false);
+                             sol, wells);
 
     return { sol, wells };
 }

tests/test_writenumwells.cpp

@@ -159,9 +159,10 @@ BOOST_AUTO_TEST_CASE(EclipseWriteRestartWellInfo) {
 
     for(int timestep = 0; timestep <= countTimeStep; ++timestep){
         eclipseWriter.writeTimeStep( timestep,
+                                     false, 
                                      timestep,
                                      solution,
-                                     wells, false);
+                                     wells );
     }
 
     verifyWellState(eclipse_restart_filename, eclipseState->getInputGrid(), eclipseState->getSchedule());