fixing wrong codes from the rebase process and cleanup.

This commit is contained in:
Kai Bao 2016-04-05 11:20:47 +02:00
parent 8a52dd743b
commit 4ad5d81296
2 changed files with 0 additions and 4 deletions

View File

@ -194,10 +194,8 @@ namespace detail {
// Only rank 0 does print to std::cout if terminal_output is enabled
terminal_output_ = (info.communicator().rank()==0);
}
// int local_number_of_wells = std_wells_.wells_ ? std_wells_.wells_->number_of_wells : 0;
int local_number_of_wells = stdWells().localWellsActive() ? stdWells().wells().number_of_wells : 0;
int global_number_of_wells = info.communicator().sum(local_number_of_wells);
// std_wells_.wells_active_ = ( std_wells_.wells_ && global_number_of_wells > 0 );
stdWells().wellsActive() = ( stdWells().localWellsActive() && global_number_of_wells > 0 );
// Compute the global number of cells
std::vector<int> v( Opm::AutoDiffGrid::numCells(grid_), 1);

View File

@ -389,8 +389,6 @@ namespace Opm {
std::vector<double>& rvmax_perf,
std::vector<double>& surf_dens_perf)
{
if( ! stdWells().localWellsActive() ) return ;
using namespace Opm::AutoDiffGrid;
// 1. Compute properties required by computeConnectionPressureDelta().
// Note that some of the complexity of this part is due to the function