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 #721 from qilicun/minor-format-change

Browse Source 
Add blank line before and after "Reading Parameters"
This commit is contained in:
Atgeirr Flø Rasmussen 2016-06-16 08:57:55 +02:00 committed by GitHub
commit 691969eb86
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
opm/autodiff/FlowMain.hpp
View File

@ -138,6 +138,7 @@ namespace Opm
return EXIT_FAILURE; return EXIT_FAILURE;
} }
asImpl().setupOutput(); asImpl().setupOutput();
asImpl().setupLogging();
asImpl().readDeckInput(); asImpl().readDeckInput();
asImpl().setupGridAndProps(); asImpl().setupGridAndProps();
asImpl().extractMessages(); asImpl().extractMessages();
@ -295,10 +296,6 @@ namespace Opm
// Returns true if ok, false if not. // Returns true if ok, false if not.
bool setupParameters(int argc, char** argv) bool setupParameters(int argc, char** argv)
{ {
// Read parameters.
if ( output_cout_ ) {
std::cout << "--------------- Reading parameters ---------------" << std::endl;
}
param_ = parameter::ParameterGroup(argc, argv, false, output_cout_); param_ = parameter::ParameterGroup(argc, argv, false, output_cout_);
// See if a deck was specified on the command line. // See if a deck was specified on the command line.
@ -359,12 +356,8 @@ namespace Opm
// Parser the input and creates the Deck and EclipseState objects. // Setup OpmLog backend with output_dir.
// Writes to: void setupLogging()
// deck_
// eclipse_state_
// May throw if errors are encountered, here configured to be somewhat tolerant.
void readDeckInput()
{ {
std::string deck_filename = param_.get<std::string>("deck_filename"); std::string deck_filename = param_.get<std::string>("deck_filename");
// create logFile // create logFile
@ -384,9 +377,6 @@ namespace Opm
logFile_ = baseName + ".PRT"; logFile_ = baseName + ".PRT";
debugFile = "." + baseName + ".DEBUG"; debugFile = "." + baseName + ".DEBUG";
} }
// Create Parser
ParserPtr parser(new Parser());
{
std::shared_ptr<EclipsePRTLog> prtLog = std::make_shared<EclipsePRTLog>(logFile_ , Log::NoDebugMessageTypes); std::shared_ptr<EclipsePRTLog> prtLog = std::make_shared<EclipsePRTLog>(logFile_ , Log::NoDebugMessageTypes);
std::shared_ptr<StreamLog> streamLog = std::make_shared<StreamLog>(std::cout, Log::StdoutMessageTypes); std::shared_ptr<StreamLog> streamLog = std::make_shared<StreamLog>(std::cout, Log::StdoutMessageTypes);
OpmLog::addBackend( "ECLIPSEPRTLOG" , prtLog ); OpmLog::addBackend( "ECLIPSEPRTLOG" , prtLog );
@ -396,8 +386,27 @@ namespace Opm
prtLog->setMessageFormatter(std::make_shared<SimpleMessageFormatter>(false)); prtLog->setMessageFormatter(std::make_shared<SimpleMessageFormatter>(false));
streamLog->setMessageLimiter(std::make_shared<MessageLimiter>(10)); streamLog->setMessageLimiter(std::make_shared<MessageLimiter>(10));
streamLog->setMessageFormatter(std::make_shared<SimpleMessageFormatter>(true)); streamLog->setMessageFormatter(std::make_shared<SimpleMessageFormatter>(true));
// Read parameters.
OpmLog::debug("\n--------------- Reading parameters ---------------\n");
} }
// Parser the input and creates the Deck and EclipseState objects.
// Writes to:
// deck_
// eclipse_state_
// May throw if errors are encountered, here configured to be somewhat tolerant.
void readDeckInput()
{
std::string deck_filename = param_.get<std::string>("deck_filename");
// Create Parser
ParserPtr parser(new Parser());
// Create Deck and EclipseState. // Create Deck and EclipseState.
try { try {
ParseContext parseContext({{ ParseContext::PARSE_RANDOM_SLASH , InputError::IGNORE }}); ParseContext parseContext({{ ParseContext::PARSE_RANDOM_SLASH , InputError::IGNORE }});