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

Merge pull request #553 from totto82/sync_logging

Browse Source 
Adapt to make logging possible from ebos
This commit is contained in:
dr-robertk 2019-10-15 14:14:25 +02:00 committed by GitHub
commit 20b2c57829
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/models/nonlinear/newtonmethod.hh
View File

@ -614,6 +614,8 @@ protected:
*/
void beginIteration_()
{
// start with a clean message stream
endIterMsgStream_.str("");
const auto& comm = simulator_.gridView().comm();
bool succeeded = true;
try {
@ -891,8 +893,6 @@ protected:
<< " error: " << error_
<< endIterMsg().str() << "\n" << std::flush;
}
endIterMsgStream_.str("");
}
/*!

4
opm/models/utils/start.hh
View File

@ -279,7 +279,7 @@ static inline void resetTerminal_(int signum)
* \param argv The array of the command line arguments
*/
template <class TypeTag>
static inline int start(int argc, char **argv)
static inline int start(int argc, char **argv, bool registerParams=true)
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
@ -303,7 +303,7 @@ static inline int start(int argc, char **argv)
int myRank = 0;
try
{
int paramStatus = setupParameters_<TypeTag>(argc, const_cast<const char**>(argv));
int paramStatus = setupParameters_<TypeTag>(argc, const_cast<const char**>(argv), registerParams);
if (paramStatus == 1)
return 1;
if (paramStatus == 2)