mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #2497 from akva2/deck_avoid
Avoid deck usage in simulator
This commit is contained in:
commit
5fd85c1446
@ -579,7 +579,7 @@ private:
|
||||
std::size_t ny = eclState().getInputGrid().getNY();
|
||||
auto nncData = sortNncAndApplyEditnnc(eclState().getInputNNC().data(),
|
||||
eclState().getInputEDITNNC().data());
|
||||
const auto& unitSystem = simulator_.vanguard().deck().getActiveUnitSystem();
|
||||
const auto& unitSystem = simulator_.vanguard().eclState().getDeckUnitSystem();
|
||||
std::vector<Opm::NNCdata> outputNnc;
|
||||
std::size_t index = 0;
|
||||
|
||||
|
@ -26,7 +26,6 @@
|
||||
#include <sys/utsname.h>
|
||||
|
||||
#include <opm/simulators/flow/BlackoilModelEbos.hpp>
|
||||
#include <opm/simulators/flow/MissingFeatures.hpp>
|
||||
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
|
||||
#include <opm/simulators/utils/ParallelFileMerger.hpp>
|
||||
#include <opm/simulators/utils/moduleVersion.hpp>
|
||||
@ -254,7 +253,7 @@ namespace Opm
|
||||
return status;
|
||||
|
||||
setupParallelism();
|
||||
setupEbosSimulator(output_cout);
|
||||
setupEbosSimulator();
|
||||
runDiagnostics(output_cout);
|
||||
createSimulator();
|
||||
|
||||
@ -385,17 +384,13 @@ namespace Opm
|
||||
EWOMS_GET_PARAM(TypeTag, bool, EnableLoggingFalloutWarning)));
|
||||
}
|
||||
|
||||
void setupEbosSimulator(bool output_cout)
|
||||
void setupEbosSimulator()
|
||||
{
|
||||
ebosSimulator_.reset(new EbosSimulator(/*verbose=*/false));
|
||||
ebosSimulator_->executionTimer().start();
|
||||
ebosSimulator_->model().applyInitialSolution();
|
||||
|
||||
try {
|
||||
if (output_cout) {
|
||||
MissingFeatures::checkKeywords(deck());
|
||||
}
|
||||
|
||||
// Possible to force initialization only behavior (NOSIM).
|
||||
const std::string& dryRunString = EWOMS_GET_PARAM(TypeTag, std::string, EnableDryRun);
|
||||
if (dryRunString != "" && dryRunString != "auto") {
|
||||
|
Loading…
Reference in New Issue
Block a user