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

Revert to using standard algorithms instead of using masks.

Browse Source 
This is now possible as the values stored for ghost/overlap elements
(minimum where we compute the maxiumum, zero where we sum up)
will not influence the result of the computation any more.
This commit is contained in:
Markus Blatt
2017-04-12 13:34:13 +02:00
parent 0db663fe51
commit b5612806ac
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
opm/autodiff/BlackoilModelEbos.hpp
View File

@@ -803,24 +803,12 @@ namespace Opm {
// computation
for ( int idx = 0; idx < np; ++idx )
{
B_avg[idx] = accumulateMaskedValues(B[ idx ], mask) / double(ncGlobal);
R_sum[idx] = accumulateMaskedValues(R[ idx ], mask);
B_avg[idx] = std::accumulate( B[ idx ].begin(), B[ idx ].end(),
0.0 ) / double(ncGlobal);
R_sum[idx] = std::accumulate( R[ idx ].begin(), R[ idx ].end(),
0.0 );
if(comm.size()>1)
{
auto mi = mask->begin();
for(auto elem = tempV[idx].begin(), end = tempV[idx].end(); elem != end; ++elem, ++mi)
{
if ( *mi )
{
maxCoeff[idx] = std::max( maxCoeff[idx], *elem);
}
}
}
else
{
maxCoeff[idx] = *(std::max_element( tempV[ idx ].begin(), tempV[ idx ].end() ));
}
assert(np >= np);
if (idx < np) {