OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-02 05:49:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor performance updates

Browse Source
This commit is contained in:
babrodtk 2015-09-01 10:30:54 +02:00
parent 466f1947a3
commit 9855d7340f
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
opm/autodiff/AutoDiffHelpers.hpp
View File

@ -580,25 +580,27 @@ vertcatCollapseJacs(const std::vector<AutoDiffBlock<double> >& x)
typedef Eigen::Triplet<double> Tri;
std::vector<Tri> t;
t.reserve(nnz);
int block_row_start = 0;
for (int elem = 0; elem < nx; ++elem) {
int block_col_start = 0;
if (!x[elem].derivative().empty()) {
for (int block = 0; block < num_blocks; ++block) {
// const ADB::M& jac = x[elem].derivative()[block];
M jac;
x[elem].derivative()[block].toSparse(jac);
for (M::Index k = 0; k < jac.outerSize(); ++k) {
for (M::InnerIterator i(jac, k); i ; ++i) {
t.push_back(Tri(i.row() + block_row_start,
i.col() + block_col_start,
i.value()));
{
int block_row_start = 0;
M jac;
for (int elem = 0; elem < nx; ++elem) {
int block_col_start = 0;
if (!x[elem].derivative().empty()) {
for (int block = 0; block < num_blocks; ++block) {
// const ADB::M& jac = x[elem].derivative()[block];
x[elem].derivative()[block].toSparse(jac);
for (M::Index k = 0; k < jac.outerSize(); ++k) {
for (M::InnerIterator i(jac, k); i ; ++i) {
t.push_back(Tri(i.row() + block_row_start,
i.col() + block_col_start,
i.value()));
}
}
block_col_start += jac.cols();
}
block_col_start += jac.cols();
}
block_row_start += x[elem].size();
}
block_row_start += x[elem].size();
}
// Build final jacobian.
@ -606,7 +608,7 @@ vertcatCollapseJacs(const std::vector<AutoDiffBlock<double> >& x)
comb_jac.reserve(nnz);
comb_jac.setFromTriplets(t.begin(), t.end());
std::vector<ADB::M> jac(1);
jac[0] = ADB::M(comb_jac);
jac[0] = ADB::M(std::move(comb_jac));
// Use move semantics to return result efficiently.
return ADB::function(std::move(val), std::move(jac));

8
opm/autodiff/NewtonIterationBlackoilInterleaved.cpp
View File

@ -211,10 +211,12 @@ namespace Opm
typedef Eigen::SparseMatrix<double> Sp;
Sp structure;
eqs[0].derivative()[0].toSparse(structure);
for (int phase = 1; phase < np; ++phase) {
{
Sp s0;
eqs[phase].derivative()[0].toSparse(s0);
structure += s0;
for (int phase = 1; phase < np; ++phase) {
eqs[phase].derivative()[0].toSparse(s0);
structure += s0;
}
}
Eigen::SparseMatrix<double, Eigen::RowMajor> s = structure;

3
opm/autodiff/NewtonIterationUtilities.cpp
View File

@ -112,8 +112,7 @@ namespace Opm
M Bu;
fastSparseProduct(B, u, Bu);
// J -= Bu;
Bu = Bu * -1.0;
J = J + Bu;
J = J + (Bu * -1.0);
}
}