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

Moving findOverlapRowsAndColumns() to a separate file.

Browse Source
This commit is contained in:
Andreas Thune 2019-06-19 15:04:14 +02:00 committed by Atgeirr Flø Rasmussen
parent 1593d431ce
commit c4e0bc2385
5 changed files with 84 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists_files.cmake
View File

@ -178,6 +178,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/linalg/PressureTransferPolicy.hpp
opm/simulators/linalg/PreconditionerFactory.hpp
opm/simulators/linalg/PreconditionerWithUpdate.hpp
opm/simulators/linalg/findOverlapRowsAndColumns.hpp
opm/simulators/linalg/getQuasiImpesWeights.hpp
opm/simulators/linalg/setupPropertyTree.hpp
opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp

50
opm/autodiff/BlackoilDetails.hpp
View File

@ -197,56 +197,6 @@ namespace detail {
return grid.comm().sum(count);
}
/// \brief Find the rows corresponding to overlap cells
///
/// Loop over grid and store cell ids of row-column pairs
/// corresponding to overlap cells.
/// \tparam The type of the DUNE grid.
/// \param grid The grid where we look for overlap cells.
/// \param overlapRowAndColumns List where overlap rows and columns are stored.
template<class Grid>
void findOverlapRowsAndColumns(const Grid& grid, std::vector<std::pair<int,std::vector<int>>>& overlapRowAndColumns )
{
//only relevant in parallel case.
if ( grid.comm().size() > 1)
{
//Numbering of cells
auto lid = grid.localIdSet();
const auto& gridView = grid.leafGridView();
auto elemIt = gridView.template begin<0>();
const auto& elemEndIt = gridView.template end<0>();
//loop over cells in mesh
for (; elemIt != elemEndIt; ++elemIt)
{
const auto& elem = *elemIt;
//If cell has partition type not equal to interior save row
if (elem.partitionType() != Dune::InteriorEntity)
{
//local id of overlap cell
int lcell = lid.id(elem);
std::vector<int> columns;
//loop over faces of cell
auto isend = gridView.iend(elem);
for (auto is = gridView.ibegin(elem); is!=isend; ++is)
{
//check if face has neighbor
if (is->neighbor())
{
//get index of neighbor cell
int ncell = lid.id(is->outside());
columns.push_back(ncell);
}
}
//add row to list
overlapRowAndColumns.push_back(std::pair<int,std::vector<int>>(lcell,columns));
}
}
}
}
} // namespace detail
} // namespace Opm

2
opm/simulators/linalg/ISTLSolverEbos.hpp
View File

@ -28,7 +28,7 @@
#include <opm/simulators/linalg/ParallelRestrictedAdditiveSchwarz.hpp>
#include <opm/simulators/linalg/ParallelOverlappingILU0.hpp>
#include <opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp>
#include <opm/autodiff/BlackoilDetails.hpp>
#include <opm/simulators/linalg/findOverlapRowsAndColumns.hpp>
#include <opm/common/Exceptions.hpp>
#include <opm/simulators/linalg/ParallelIstlInformation.hpp>
#include <opm/common/utility/platform_dependent/disable_warnings.h>

3
opm/simulators/linalg/ISTLSolverEbosFlexible.hpp
View File

@ -21,7 +21,7 @@
#define OPM_ISTLSOLVEREBOSFLEXIBLE_HEADER_INCLUDED
#include <ewoms/linear/matrixblock.hh>
#include <opm/autodiff/BlackoilDetails.hpp>
#include <opm/simulators/linalg/findOverlapRowsAndColumns.hpp>
#include <opm/simulators/linalg/FlexibleSolver.hpp>
#include <opm/simulators/linalg/setupPropertyTree.hpp>
@ -32,7 +32,6 @@ BEGIN_PROPERTIES
NEW_TYPE_TAG(FlowIstlSolverFlexible, INHERITS_FROM(FlowIstlSolverParams));
NEW_PROP_TAG(LinearSolverConfiguration);
NEW_PROP_TAG(GlobalEqVector);
NEW_PROP_TAG(SparseMatrixAdapter);
NEW_PROP_TAG(Simulator);

81
opm/simulators/linalg/findOverlapRowsAndColumns.hpp Normal file
View File

@ -0,0 +1,81 @@
/*
Copyright 2018 Andreas Thune
This file is part of the Open Porous Media project (OPM).
OPM is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OPM is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef OPM_FINDOVERLAPROWSANDCOLUMNS_HEADER_INCLUDED
#define OPM_FINDOVERLAPROWSANDCOLUMNS_HEADER_INCLUDED
#include <vector>
#include <utility>
namespace Opm
{
namespace detail
{
/// \brief Find the rows corresponding to overlap cells
///
/// Loop over grid and store cell ids of row-column pairs
/// corresponding to overlap cells.
/// \tparam The type of the DUNE grid.
/// \param grid The grid where we look for overlap cells.
/// \param overlapRowAndColumns List where overlap rows and columns are stored.
template <class Grid>
void findOverlapRowsAndColumns(const Grid& grid,
std::vector<std::pair<int, std::vector<int>>>& overlapRowAndColumns)
{
// only relevant in parallel case.
if (grid.comm().size() > 1) {
// Numbering of cells
auto lid = grid.localIdSet();
const auto& gridView = grid.leafGridView();
auto elemIt = gridView.template begin<0>();
const auto& elemEndIt = gridView.template end<0>();
// loop over cells in mesh
for (; elemIt != elemEndIt; ++elemIt) {
const auto& elem = *elemIt;
// If cell has partition type not equal to interior save row
if (elem.partitionType() != Dune::InteriorEntity) {
// local id of overlap cell
int lcell = lid.id(elem);
std::vector<int> columns;
// loop over faces of cell
auto isend = gridView.iend(elem);
for (auto is = gridView.ibegin(elem); is != isend; ++is) {
// check if face has neighbor
if (is->neighbor()) {
// get index of neighbor cell
int ncell = lid.id(is->outside());
columns.push_back(ncell);
}
}
// add row to list
overlapRowAndColumns.push_back(std::pair<int, std::vector<int>>(lcell, columns));
}
}
}
}
} // namespace detail
} // namespace Opm
#endif // OPM_FINDOVERLAPROWSANDCOLUMNS_HEADER_INCLUDED