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 #477 from dr-robertk/PR/terminal-output-in-parallel

Browse Source 
SolverFullyImpl: avoid multiple output of redundant information in parallel.
This commit is contained in:
Atgeirr Flø Rasmussen
2015-09-16 18:43:45 +02:00
parent 57840a3153 e8fad08d81
commit e49f852b98
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@@ -1481,7 +1481,9 @@ namespace detail {
} while (it < 15);
if (converged) {
std::cout << "well converged iter: " << it << std::endl;
if ( terminal_output_ ) {
std::cout << "well converged iter: " << it << std::endl;
}
const int nw = wells().number_of_wells;
{
// We will set the bhp primary variable to the new ones,

8
opm/autodiff/ParallelDebugOutput.hpp
View File

@@ -251,8 +251,8 @@ namespace Opm
unsigned int count = 0;
auto gridView = globalGrid.leafGridView();
for( auto it = gridView.template begin< 0 >(),
end = gridView.template end< 0 >(); it != end; ++it, ++count )
for( auto it = gridView.begin< 0 >(),
end = gridView.end< 0 >(); it != end; ++it, ++count )
{
}
assert( count == globalIndex_.size() );
@@ -275,8 +275,8 @@ namespace Opm
unsigned int index = 0;
auto localView = otherGrid.leafGridView();
for( auto it = localView.template begin< 0 >(),
end = localView.template end< 0 >(); it != end; ++it, ++index )
for( auto it = localView.begin< 0 >(),
end = localView.end< 0 >(); it != end; ++it, ++index )
{
const auto element = *it ;
// only store interior element for collection

2
opm/autodiff/SimulatorBase_impl.hpp
View File

@@ -92,7 +92,7 @@ namespace Opm
std::unique_ptr< AdaptiveTimeStepping > adaptiveTimeStepping;
if( param_.getDefault("timestep.adaptive", true ) )
{
adaptiveTimeStepping.reset( new AdaptiveTimeStepping( param_, solver_.parallelInformation() ) );
adaptiveTimeStepping.reset( new AdaptiveTimeStepping( param_, solver_.parallelInformation(), terminal_output_ ) );
}
// init output writer