OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2497 from akva2/deck_avoid

Browse Source 
Avoid deck usage in simulator
This commit is contained in:
Arne Morten Kvarving 2020-03-24 08:28:21 +01:00 committed by GitHub
commit 5fd85c1446
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/eclwriter.hh
View File

@ -579,7 +579,7 @@ private:
std::size_t ny = eclState().getInputGrid().getNY(); std::size_t ny = eclState().getInputGrid().getNY();
auto nncData = sortNncAndApplyEditnnc(eclState().getInputNNC().data(), auto nncData = sortNncAndApplyEditnnc(eclState().getInputNNC().data(),
eclState().getInputEDITNNC().data()); eclState().getInputEDITNNC().data());
const auto& unitSystem = simulator_.vanguard().deck().getActiveUnitSystem(); const auto& unitSystem = simulator_.vanguard().eclState().getDeckUnitSystem();
std::vector<Opm::NNCdata> outputNnc; std::vector<Opm::NNCdata> outputNnc;
std::size_t index = 0; std::size_t index = 0;

9
opm/simulators/flow/FlowMainEbos.hpp
View File

@ -26,7 +26,6 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#include <opm/simulators/flow/BlackoilModelEbos.hpp> #include <opm/simulators/flow/BlackoilModelEbos.hpp>
#include <opm/simulators/flow/MissingFeatures.hpp>
#include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp> #include <opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp>
#include <opm/simulators/utils/ParallelFileMerger.hpp> #include <opm/simulators/utils/ParallelFileMerger.hpp>
#include <opm/simulators/utils/moduleVersion.hpp> #include <opm/simulators/utils/moduleVersion.hpp>
@ -254,7 +253,7 @@ namespace Opm
return status; return status;
setupParallelism(); setupParallelism();
setupEbosSimulator(output_cout); setupEbosSimulator();
runDiagnostics(output_cout); runDiagnostics(output_cout);
createSimulator(); createSimulator();
@ -385,17 +384,13 @@ namespace Opm
EWOMS_GET_PARAM(TypeTag, bool, EnableLoggingFalloutWarning))); EWOMS_GET_PARAM(TypeTag, bool, EnableLoggingFalloutWarning)));
} }
void setupEbosSimulator(bool output_cout) void setupEbosSimulator()
{ {
ebosSimulator_.reset(new EbosSimulator(/*verbose=*/false)); ebosSimulator_.reset(new EbosSimulator(/*verbose=*/false));
ebosSimulator_->executionTimer().start(); ebosSimulator_->executionTimer().start();
ebosSimulator_->model().applyInitialSolution(); ebosSimulator_->model().applyInitialSolution();
try { try {
if (output_cout) {
MissingFeatures::checkKeywords(deck());
}
// Possible to force initialization only behavior (NOSIM). // Possible to force initialization only behavior (NOSIM).
const std::string& dryRunString = EWOMS_GET_PARAM(TypeTag, std::string, EnableDryRun); const std::string& dryRunString = EWOMS_GET_PARAM(TypeTag, std::string, EnableDryRun);
if (dryRunString != "" && dryRunString != "auto") { if (dryRunString != "" && dryRunString != "auto") {