Small improvements, outputs unused params at the correct time.

examples/sim_2p_incomp_reorder.cpp

@@ -54,6 +54,18 @@
 #include <numeric>
 
 
+namespace
+{
+    void warnIfUnusedParams(const Opm::parameter::ParameterGroup& param)
+    {
+        if (param.anyUnused()) {
+            std::cout << "--------------------   Unused parameters:   --------------------\n";
+            param.displayUsage();
+            std::cout << "----------------------------------------------------------------" << std::endl;
+        }
+    }
+} // anon namespace
+
 
 
 // ----------------- Main program -----------------
@@ -156,13 +168,6 @@ main(int argc, char** argv)
     // Linear solver.
     LinearSolverFactory linsolver(param);
 
-    //Warn if any parameters are unused.
-    if (param.anyUnused()) {
-         std::cout << "--------------------   Unused parameters:   --------------------\n";
-         param.displayUsage();
-        std::cout << "----------------------------------------------------------------" << std::endl;
-    }
-    
     // Write parameters used for later reference.
     bool output = param.getDefault("output", true);
     if (output) {
@@ -197,6 +202,7 @@ main(int argc, char** argv)
                                     grav);
         SimulatorTimer simtimer;
         simtimer.init(param);
+        warnIfUnusedParams(param);
         WellState well_state;
         well_state.init(0, state);
         rep = simulator.run(simtimer, state, well_state);
@@ -230,7 +236,7 @@ main(int argc, char** argv)
                       << "\n                  (number of steps: "
                       << simtimer.numSteps() - step << ")\n\n" << std::flush;
 
-            // Create new wells, well_satate
+            // Create new wells, well_state
             WellsManager wells(*deck, *grid->c_grid(), props->permeability());
             // @@@ HACK: we should really make a new well state and
             // properly transfer old well state to it every epoch,
@@ -249,6 +255,9 @@ main(int argc, char** argv)
                                         bcs.c_bcs(),
                                         linsolver,
                                         grav);
+            if (epoch == 0) {
+                warnIfUnusedParams(param);
+            }
             SimulatorReport epoch_rep = simulator.run(simtimer, state, well_state);
 
             // Update total timing report and remember step number.