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

added collapseJacs method.

Browse Source
This commit is contained in:
Robert K 2014-12-01 10:27:44 +01:00
parent 2ac6a211b2
commit efe8ee79f9
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
opm/autodiff/AutoDiffHelpers.hpp
View File

@ -70,7 +70,7 @@ struct HelperOps
TwoColInt nbi; TwoColInt nbi;
extractInternalFaces(grid, internal_faces, nbi); extractInternalFaces(grid, internal_faces, nbi);
int num_internal=internal_faces.size(); int num_internal=internal_faces.size();
// std::cout << "nbi = \n" << nbi << std::endl; // std::cout << "nbi = \n" << nbi << std::endl;
// Create matrices. // Create matrices.
ngrad.resize(num_internal, nc); ngrad.resize(num_internal, nc);
@ -361,9 +361,10 @@ spdiag(const AutoDiffBlock<double>::V& d)
/// Returns the input expression, but with all Jacobians collapsed to one. /// Returns the input expression, but with all Jacobians collapsed to one.
template <class Matrix>
inline inline
AutoDiffBlock<double> void
collapseJacs(const AutoDiffBlock<double>& x) collapseJacs(const AutoDiffBlock<double>& x, Matrix& jacobian)
{ {
typedef AutoDiffBlock<double> ADB; typedef AutoDiffBlock<double> ADB;
const int nb = x.numBlocks(); const int nb = x.numBlocks();
@ -387,9 +388,21 @@ collapseJacs(const AutoDiffBlock<double>& x)
block_col_start += jac.cols(); block_col_start += jac.cols();
} }
// Build final jacobian. // Build final jacobian.
jacobian = Matrix(x.size(), block_col_start);
jacobian.setFromTriplets(t.begin(), t.end());
}
/// Returns the input expression, but with all Jacobians collapsed to one.
inline
AutoDiffBlock<double>
collapseJacs(const AutoDiffBlock<double>& x)
{
typedef AutoDiffBlock<double> ADB;
// Build final jacobian.
std::vector<ADB::M> jacs(1); std::vector<ADB::M> jacs(1);
jacs[0].resize(x.size(), block_col_start); collapseJacs( x, jacs[ 0 ] );
jacs[0].setFromTriplets(t.begin(), t.end());
return ADB::function(x.value(), jacs); return ADB::function(x.value(), jacs);
} }