mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-12-26 01:01:00 -06:00
-prototype on trueimpes in new system
-probably better threading
This commit is contained in:
parent
6d3b0a7c1f
commit
4f6755025c
@ -108,8 +108,8 @@ namespace Amg
|
||||
elemCtx.updatePrimaryIntensiveQuantities(/*timeIdx=*/0);
|
||||
Dune::FieldVector<Evaluation, numEq> storage;
|
||||
model.localLinearizer(threadId).localResidual().computeStorage(storage,elemCtx,/*spaceIdx=*/0, /*timeIdx=*/0);
|
||||
auto extrusionFactor = elemCtx.intensiveQuantities(0, /*timeIdx=*/0).extrusionFactor();
|
||||
auto scvVolume = elemCtx.stencil(/*timeIdx=*/0).subControlVolume(0).volume() * extrusionFactor;
|
||||
//auto extrusionFactor = elemCtx.intensiveQuantities(0, /*timeIdx=*/0).extrusionFactor();
|
||||
auto scvVolume = elemCtx.stencil(/*timeIdx=*/0).subControlVolume(0).volume();// * extrusionFactor;
|
||||
auto storage_scale = scvVolume / elemCtx.simulator().timeStepSize();
|
||||
MatrixBlockType block;
|
||||
double pressure_scale = 50e5;
|
||||
@ -130,6 +130,49 @@ namespace Amg
|
||||
}
|
||||
OPM_END_PARALLEL_TRY_CATCH("getTrueImpesWeights() failed: ", elemCtx.simulator().vanguard().grid().comm());
|
||||
}
|
||||
|
||||
template<class Vector, class Model, class Evaluation>
|
||||
void getTrueImpesWeights(int pressureVarIndex, Vector& weights, const Model& model)
|
||||
{
|
||||
using VectorBlockType = typename Vector::block_type;
|
||||
using Matrix = typename std::decay_t<decltype(model.linearizer().jacobian())>;
|
||||
using MatrixBlockType = typename Matrix::MatrixBlock;
|
||||
constexpr int numEq = VectorBlockType::size();
|
||||
unsigned numCells = model.numTotalDof();
|
||||
VectorBlockType rhs(0.0);
|
||||
rhs[pressureVarIndex] = 1.0;
|
||||
//NB !!OPM_BEGIN_PARALLEL_TRY_CATCH();
|
||||
#ifdef _OPENMP
|
||||
#pragma omp parallel for
|
||||
#endif
|
||||
for(unsigned globI = 0; globI < numCells; globI++){
|
||||
Dune::FieldVector<Evaluation, numEq> storage;
|
||||
const auto* intQuantsInP = model.cachedIntensiveQuantities(globI, /*timeIdx*/0);
|
||||
assert(intQuantsInP);
|
||||
const auto& intQuantsIn = *intQuantsInP;
|
||||
//NB !!!!! LocalResidual::computeStorage(storage,intQuantsIn, 0);
|
||||
double scvVolume = model.dofTotalVolume(globI);
|
||||
double dt = 3600*24;
|
||||
auto storage_scale = scvVolume / dt;
|
||||
MatrixBlockType block;
|
||||
double pressure_scale = 50e5;
|
||||
for (int ii = 0; ii < numEq; ++ii) {
|
||||
for (int jj = 0; jj < numEq; ++jj) {
|
||||
block[ii][jj] = storage[ii].derivative(jj)/storage_scale;
|
||||
if (jj == pressureVarIndex) {
|
||||
block[ii][jj] *= pressure_scale;
|
||||
}
|
||||
}
|
||||
}
|
||||
VectorBlockType bweights;
|
||||
MatrixBlockType block_transpose = Details::transposeDenseMatrix(block);
|
||||
block_transpose.solve(bweights, rhs);
|
||||
bweights /= 1000.0; // given normal densities this scales weights to about 1.
|
||||
weights[globI] = bweights;
|
||||
}
|
||||
//NB!! OPM_END_PARALLEL_TRY_CATCH("getTrueImpesWeights() failed: ", elemCtx.simulator().vanguard().grid().comm());
|
||||
}
|
||||
|
||||
} // namespace Amg
|
||||
|
||||
} // namespace Opm
|
||||
|
@ -276,10 +276,12 @@ namespace Opm {
|
||||
void addReseroirSourceTerms(GlobalEqVector& residual,
|
||||
SparseMatrixAdapter& jacobian) const
|
||||
{
|
||||
// NB this loop may write to same element if a cell has more than one perforation
|
||||
#ifdef _OPENMP
|
||||
#pragma omp parallel
|
||||
#pragma omp parallel for
|
||||
#endif
|
||||
for ( const auto& well: well_container_ ) {
|
||||
for(size_t i = 0; i < well_container_.size(); i++){// to be sure open understand
|
||||
const auto& well = well_container_[i];
|
||||
if(!well->isOperableAndSolvable() && !well->wellIsStopped())
|
||||
continue;
|
||||
|
||||
@ -288,7 +290,7 @@ namespace Opm {
|
||||
for (unsigned perfIdx = 0; perfIdx < rates.size(); ++perfIdx) {
|
||||
unsigned cellIdx = cells[perfIdx];
|
||||
auto rate = rates[perfIdx];
|
||||
Scalar volume = ebosSimulator_.problem().volume(cellIdx,0);
|
||||
// Scalar volume = ebosSimulator_.problem().volume(cellIdx,0);
|
||||
rate *= -1.0;
|
||||
VectorBlockType res(0.0);
|
||||
MatrixBlockType bMat(0.0);
|
||||
|
Loading…
Reference in New Issue
Block a user