Merge pull request #725 from atgeirr/add-to-helperops

Add connection_cells member of HelperOps.
This commit is contained in:
Atgeirr Flø Rasmussen 2016-06-17 09:03:26 +02:00 committed by GitHub
commit b21f4e16da

View File

@ -71,6 +71,9 @@ struct HelperOps
/// The NNC transmissibilities /// The NNC transmissibilities
V nnc_trans; V nnc_trans;
/// The set of all connections' cells (face or nnc).
TwoColInt connection_cells;
/// Constructs all helper vectors and matrices. /// Constructs all helper vectors and matrices.
template<class Grid> template<class Grid>
HelperOps(const Grid& grid, const NNC& nnc = NNC()) HelperOps(const Grid& grid, const NNC& nnc = NNC())
@ -160,6 +163,13 @@ struct HelperOps
fullngrad.resize(nf+numNNC, nc); fullngrad.resize(nf+numNNC, nc);
fullngrad.setFromTriplets(fullngrad_tri.begin(), fullngrad_tri.end()); fullngrad.setFromTriplets(fullngrad_tri.begin(), fullngrad_tri.end());
fulldiv = fullngrad.transpose(); fulldiv = fullngrad.transpose();
if (has_nnc) {
connection_cells.resize(nbi.rows() + nnc_cells.rows(), 2);
connection_cells << nbi, nnc_cells;
} else {
connection_cells = nbi;
}
} }
}; };
// -------------------- upwinding helper class -------------------- // -------------------- upwinding helper class --------------------