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

Remove old constructor

Browse Source 
Pass Null pointer as default argument for the EclipseState to enable all
users to use the new constructor.
This commit is contained in:
Tor Harald Sandve 2015-07-10 10:30:29 +02:00
parent 662849637c
commit ab872b15e3
1 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
opm/autodiff/AutoDiffHelpers.hpp
View File

@ -69,7 +69,7 @@ struct HelperOps
/// Constructs all helper vectors and matrices. /// Constructs all helper vectors and matrices.
template<class Grid> template<class Grid>
HelperOps(const Grid& grid, Opm::EclipseStateConstPtr eclState) HelperOps(const Grid& grid, Opm::EclipseStateConstPtr eclState = EclipseStateConstPtr (nullptr) )
{ {
using namespace AutoDiffGrid; using namespace AutoDiffGrid;
const int nc = numCells(grid); const int nc = numCells(grid);
@ -84,8 +84,9 @@ struct HelperOps
int numNNC = 0; int numNNC = 0;
// handle non-neighboring connections // handle non-neighboring connections
std::shared_ptr<const NNC> nnc = eclState->getNNC(); std::shared_ptr<const NNC> nnc = eclState ? eclState->getNNC() : std::make_shared<const NNC> (nullptr, nullptr);
if (nnc->hasNNC()) { const bool has_nnc = nnc && nnc->hasNNC();
if (has_nnc) {
numNNC = nnc->numNNC(); numNNC = nnc->numNNC();
num_connections += numNNC; num_connections += numNNC;
//std::cout << "Added " << numNNC << " NNC" <<std::endl; //std::cout << "Added " << numNNC << " NNC" <<std::endl;
@ -128,7 +129,7 @@ struct HelperOps
caver_tri.emplace_back(i, nbi(i,1), 0.5); caver_tri.emplace_back(i, nbi(i,1), 0.5);
} }
// add contribution from NNC // add contribution from NNC
if (nnc->hasNNC()) { if (has_nnc) {
for (int i = 0; i < numNNC; ++i) { for (int i = 0; i < numNNC; ++i) {
ngrad_tri.emplace_back(i+num_internal, nnc_cells(i,0), 1.0); ngrad_tri.emplace_back(i+num_internal, nnc_cells(i,0), 1.0);
ngrad_tri.emplace_back(i+num_internal, nnc_cells(i,1), -1.0); ngrad_tri.emplace_back(i+num_internal, nnc_cells(i,1), -1.0);
@ -163,53 +164,6 @@ struct HelperOps
fullngrad.setFromTriplets(fullngrad_tri.begin(), fullngrad_tri.end()); fullngrad.setFromTriplets(fullngrad_tri.begin(), fullngrad_tri.end());
fulldiv = fullngrad.transpose(); fulldiv = fullngrad.transpose();
} }
/// Constructs all helper vectors and matrices.
template<class Grid>
HelperOps(const Grid& grid)
{
using namespace AutoDiffGrid;
const int nc = numCells(grid);
const int nf = numFaces(grid);
// Define some neighbourhood-derived helper arrays.
//typedef Eigen::Array<int, Eigen::Dynamic, 2, Eigen::RowMajor> TwoColInt;
TwoColInt nbi;
extractInternalFaces(grid, internal_faces, nbi);
int num_internal=internal_faces.size();
// std::cout << "nbi = \n" << nbi << std::endl;
// Create matrices.
ngrad.resize(num_internal, nc);
caver.resize(num_internal, nc);
typedef Eigen::Triplet<double> Tri;
std::vector<Tri> ngrad_tri;
std::vector<Tri> caver_tri;
ngrad_tri.reserve(2*num_internal);
caver_tri.reserve(2*num_internal);
for (int i = 0; i < num_internal; ++i) {
ngrad_tri.emplace_back(i, nbi(i,0), 1.0);
ngrad_tri.emplace_back(i, nbi(i,1), -1.0);
caver_tri.emplace_back(i, nbi(i,0), 0.5);
caver_tri.emplace_back(i, nbi(i,1), 0.5);
}
ngrad.setFromTriplets(ngrad_tri.begin(), ngrad_tri.end());
caver.setFromTriplets(caver_tri.begin(), caver_tri.end());
grad = -ngrad;
div = ngrad.transpose();
std::vector<Tri> fullngrad_tri;
fullngrad_tri.reserve(2*nf);
typename ADFaceCellTraits<Grid>::Type nb=faceCellsToEigen(grid);
for (int i = 0; i < nf; ++i) {
if (nb(i,0) >= 0) {
fullngrad_tri.emplace_back(i, nb(i,0), 1.0);
}
if (nb(i,1) >= 0) {
fullngrad_tri.emplace_back(i, nb(i,1), -1.0);
}
}
fullngrad.resize(nf, nc);
fullngrad.setFromTriplets(fullngrad_tri.begin(), fullngrad_tri.end());
fulldiv = fullngrad.transpose();
}
}; };
// -------------------- upwinding helper class -------------------- // -------------------- upwinding helper class --------------------