sim_fibo_ad: remove compatibility code for old parser

this makes the simulator quite a bit more maintainable: setting
USE_NEW_PARSER to 0 did not even compile after the the constructor for
the wells manager which took the old deck was removed last
week. Since, according to Atgeirr, SPE-1 is now producing exactly the
same results as before, it also does no longer make too much sense to
keep that code on life support...

examples/sim_fibo_ad.cpp

@@ -99,51 +99,25 @@ try
     double gravity[3] = { 0.0 };
     std::string deck_filename = param.get<std::string>("deck_filename");
 
-#define USE_NEW_PARSER 1
-#if USE_NEW_PARSER
     Opm::ParserPtr newParser(new Opm::Parser() );
     Opm::DeckConstPtr newParserDeck = newParser->parseFile( deck_filename );
-#else
-    std::shared_ptr<EclipseGridParser> deck;
-    deck.reset(new EclipseGridParser(deck_filename));
-#endif
 
     // Grid init
-#if USE_NEW_PARSER
     grid.reset(new GridManager(newParserDeck));
-#else
-    grid.reset(new GridManager(*deck));
-#endif
-
-#if USE_NEW_PARSER
     Opm::EclipseWriter outputWriter(param, newParserDeck, share_obj(*grid->c_grid()));
-#else
-    Opm::EclipseWriter outputWriter(param, deck, share_obj(*grid->c_grid()));
-#endif
 
     // Rock and fluid init
-#if USE_NEW_PARSER
     props.reset(new BlackoilPropertiesFromDeck(newParserDeck, *grid->c_grid(), param));
     new_props.reset(new BlackoilPropsAdFromDeck(newParserDeck, *grid->c_grid()));
-#else
-    props.reset(new BlackoilPropertiesFromDeck(*deck, *grid->c_grid(), param));
-    new_props.reset(new BlackoilPropsAdFromDeck(*deck, *grid->c_grid()));
-#endif
 
     // check_well_controls = param.getDefault("check_well_controls", false);
     // max_well_control_iterations = param.getDefault("max_well_control_iterations", 10);
     // Rock compressibility.
-#if USE_NEW_PARSER
     rock_comp.reset(new RockCompressibility(newParserDeck));
-#else
+
-    rock_comp.reset(new RockCompressibility(*deck));
-#endif
     // Gravity.
-#if USE_NEW_PARSER
     gravity[2] = newParserDeck->hasKeyword("NOGRAV") ? 0.0 : unit::gravity;
-#else
+
-    gravity[2] = deck->hasField("NOGRAV") ? 0.0 : unit::gravity;
-#endif
     // Init state variables (saturation and pressure).
     if (param.has("init_saturation")) {
         initStateBasic(*grid->c_grid(), *props, param, gravity[2], state);
@@ -159,11 +133,7 @@ try
             }
         }
     } else {
-#if USE_NEW_PARSER
         initBlackoilStateFromDeck(*grid->c_grid(), *props, newParserDeck, gravity[2], state);
-#else
-        initBlackoilStateFromDeck(*grid->c_grid(), *props, *deck, gravity[2], state);
-#endif
     }
 
     bool use_gravity = (gravity[0] != 0.0 || gravity[1] != 0.0 || gravity[2] != 0.0);
@@ -195,7 +165,6 @@ try
         param.writeParam(output_dir + "/simulation.param");
     }
 
-#if USE_NEW_PARSER
     std::cout << "\n\n================    Starting main simulation loop     ===============\n"
               << std::flush;
 
@@ -260,85 +229,6 @@ try
         fullReport.reportParam(tot_os);
         warnIfUnusedParams(param);
     }
-#else
-    std::cout << "\n\n================    Starting main simulation loop     ===============\n"
-              << "                        (number of epochs: "
-              << (deck->numberOfEpochs()) << ")\n\n" << std::flush;
-
-    SimulatorReport rep;
-    // With a deck, we may have more epochs etc.
-    WellStateFullyImplicitBlackoil well_state;
-    int step = 0;
-    SimulatorTimer simtimer;
-    // Use timer for last epoch to obtain total time.
-    deck->setCurrentEpoch(deck->numberOfEpochs() - 1);
-    simtimer.init(*deck);
-
-    const double total_time = simtimer.totalTime();
-    for (int epoch = 0; epoch < deck->numberOfEpochs(); ++epoch) {
-        // Set epoch index.
-        deck->setCurrentEpoch(epoch);
-
-        // Update the timer.
-        if (deck->hasField("TSTEP")) {
-            simtimer.init(*deck);
-        } else {
-            if (epoch != 0) {
-                OPM_THROW(std::runtime_error, "No TSTEP in deck for epoch " << epoch);
-            }
-            simtimer.init(param);
-        }
-        simtimer.setCurrentStepNum(step);
-        simtimer.setTotalTime(total_time);
-
-        // Report on start of epoch.
-        std::cout << "\n\n--------------    Starting epoch " << epoch << "    --------------"
-                  << "\n                  (number of steps: "
-                  << simtimer.numSteps() - step << ")\n\n" << std::flush;
-
-        // 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,
-        // since number of wells may change etc.
-        if (epoch == 0) {
-            well_state.init(wells.c_wells(), state);
-        }
-
-        if (epoch == 0)
-            outputWriter.writeInit(simtimer, state, well_state.basicWellState());
-
-        // Create and run simulator.
-        SimulatorFullyImplicitBlackoil simulator(param,
-                                                 *grid->c_grid(),
-                                                 *new_props,
-                                                 rock_comp->isActive() ? rock_comp.get() : 0,
-                                                 wells,
-                                                 linsolver,
-                                                 grav);
-        outputWriter.writeTimeStep(simtimer, state, well_state.basicWellState());
-
-        if (epoch == 0) {
-            warnIfUnusedParams(param);
-        }
-        SimulatorReport epoch_rep = simulator.run(simtimer, state, well_state);
-        if (output) {
-            epoch_rep.reportParam(outStream);
-        }
-        // Update total timing report and remember step number.
-        rep += epoch_rep;
-        step = simtimer.currentStepNum();
-    }
-
-    std::cout << "\n\n================    End of simulation     ===============\n\n";
-    rep.report(std::cout);
-
-    if (output) {
-        std::string filename = output_dir + "/walltime.param";
-        std::fstream tot_os(filename.c_str(),std::fstream::trunc | std::fstream::out);
-        rep.reportParam(tot_os);
-    }
-#endif
 }
 catch (const std::exception &e) {
     std::cerr << "Program threw an exception: " << e.what() << "\n";