OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-27 21:06:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix the merge fallout

Browse Source
This commit is contained in:
Robert Kloefkorn 2016-12-06 20:05:24 +01:00 committed by Andreas Lauser
parent ef15d76831
commit bf18ee7fb9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/autodiff/FlowMainEbos.hpp
View File

@ -32,6 +32,7 @@
#include <opm/autodiff/MissingFeatures.hpp>
#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
#include <opm/autodiff/moduleVersion.hpp>
#include <opm/autodiff/ExtractParallelGridInformationToISTL.hpp>
#include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
@ -242,12 +243,12 @@ namespace Opm
}
}
// Setup OpmLog backend with output_dir.
// Setup OpmLog backend with output_dir.
void setupLogging()
{
std::string deck_filename = param_.get<std::string>("deck_filename");
// create logFile
using boost::filesystem::path;
using boost::filesystem::path;
path fpath(deck_filename);
std::string baseName;
std::ostringstream debugFileStream;
@ -630,6 +631,8 @@ namespace Opm
void setupLinearSolver()
{
typedef typename BlackoilModelEbos :: ISTLSolverType ISTLSolverType;
extractParallelGridInformationToISTL(grid(), parallel_information_);
fis_solver_.reset( new ISTLSolverType( param_, parallel_information_ ) );
}