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

Fixed IpmesTPFAAD.cpp

Browse Source
This commit is contained in:
babrodtk
2015-08-27 13:31:19 +02:00
parent 945593295d
commit 6deb3e2c4a
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@@ -33,7 +33,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/autodiff/NewtonIterationBlackoilSimple.cpp opm/autodiff/NewtonIterationBlackoilSimple.cpp
opm/autodiff/NewtonIterationUtilities.cpp opm/autodiff/NewtonIterationUtilities.cpp
opm/autodiff/GridHelpers.cpp opm/autodiff/GridHelpers.cpp
# opm/autodiff/ImpesTPFAAD.cpp opm/autodiff/ImpesTPFAAD.cpp
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.cpp opm/autodiff/SimulatorFullyImplicitBlackoilOutput.cpp
# opm/autodiff/SimulatorIncompTwophaseAd.cpp # opm/autodiff/SimulatorIncompTwophaseAd.cpp
# opm/autodiff/TransportSolverTwophaseAd.cpp # opm/autodiff/TransportSolverTwophaseAd.cpp

2
opm/autodiff/AutoDiffHelpers.hpp
View File

@@ -496,7 +496,6 @@ collapseJacs(const AutoDiffBlock<double>& x)
} }
/*
/// Returns the vertical concatenation [ x; y ] of the inputs. /// Returns the vertical concatenation [ x; y ] of the inputs.
inline inline
@@ -519,7 +518,6 @@ vertcat(const AutoDiffBlock<double>& x,
} }
*/
/// Returns the vertical concatenation [ x[0]; x[1]; ...; x[n-1] ] of the inputs. /// Returns the vertical concatenation [ x[0]; x[1]; ...; x[n-1] ] of the inputs.

6
opm/autodiff/AutoDiffMatrix.hpp
View File

@@ -414,12 +414,12 @@ namespace Opm
} }
template<class Scalar, int Options, class Index>
void toSparse(Eigen::SparseMatrix<double>& s) const void toSparse(Eigen::SparseMatrix<Scalar, Options, Index>& s) const
{ {
switch (type_) { switch (type_) {
case Z: case Z:
s = Eigen::SparseMatrix<double>(rows_, cols_); s = Eigen::SparseMatrix<Scalar, Options, Index>(rows_, cols_);
return; return;
case I: case I:
s = spdiag(Eigen::VectorXd::Ones(rows_)); s = spdiag(Eigen::VectorXd::Ones(rows_));

18
opm/autodiff/ImpesTPFAAD.cpp
View File

@@ -38,6 +38,7 @@ namespace Opm {
typedef AutoDiffBlock<double> ADB; typedef AutoDiffBlock<double> ADB;
typedef ADB::V V; typedef ADB::V V;
typedef ADB::M M; typedef ADB::M M;
typedef Eigen::SparseMatrix<double> S;
namespace { namespace {
@@ -103,7 +104,9 @@ namespace {
grav.push_back(Tri(i, c2, - t * dG2)); grav.push_back(Tri(i, c2, - t * dG2));
} }
M G(ni, nc); G.setFromTriplets(grav.begin(), grav.end()); S G_s(ni, nc);
G_s.setFromTriplets(grav.begin(), grav.end());
M G(G_s);
return G; return G;
} }
@@ -336,7 +339,7 @@ namespace {
const ADB p_perfcell = subset(p, well_cells); const ADB p_perfcell = subset(p, well_cells);
const ADB T_perfcell = subset(T, well_cells); const ADB T_perfcell = subset(T, well_cells);
// Construct matrix to map wells->perforations. // Construct matrix to map wells->perforations.
M well_to_perf(well_cells.size(), nw); S well_to_perf(well_cells.size(), nw);
typedef Eigen::Triplet<double> Tri; typedef Eigen::Triplet<double> Tri;
std::vector<Tri> w2p; std::vector<Tri> w2p;
for (int w = 0; w < nw; ++w) { for (int w = 0; w < nw; ++w) {
@@ -345,7 +348,7 @@ namespace {
} }
} }
well_to_perf.setFromTriplets(w2p.begin(), w2p.end()); well_to_perf.setFromTriplets(w2p.begin(), w2p.end());
const M perf_to_well = well_to_perf.transpose(); const S perf_to_well = well_to_perf.transpose();
// Finally construct well perforation pressures and well flows. // Finally construct well perforation pressures and well flows.
const ADB p_perfwell = well_to_perf*bhp + well_perf_dp_; const ADB p_perfwell = well_to_perf*bhp + well_perf_dp_;
const ADB nkgradp_well = transw * (p_perfcell - p_perfwell); const ADB nkgradp_well = transw * (p_perfcell - p_perfwell);
@@ -392,7 +395,7 @@ namespace {
// Handling BHP and SURFACE_RATE wells. // Handling BHP and SURFACE_RATE wells.
V bhp_targets(nw,1); V bhp_targets(nw,1);
V rate_targets(nw,1); V rate_targets(nw,1);
M rate_distr(nw, np*nw); S rate_distr(nw, np*nw);
for (int w = 0; w < nw; ++w) { for (int w = 0; w < nw; ++w) {
const WellControls* wc = wells_.ctrls[w]; const WellControls* wc = wells_.ctrls[w];
if (well_controls_get_current_type(wc) == BHP) { if (well_controls_get_current_type(wc) == BHP) {
@@ -438,7 +441,8 @@ namespace {
const int nw = wells_.number_of_wells; const int nw = wells_.number_of_wells;
// const int np = state.numPhases(); // const int np = state.numPhases();
Eigen::SparseMatrix<double, Eigen::RowMajor> matr = total_residual_.derivative()[0]; Eigen::SparseMatrix<double, Eigen::RowMajor> matr;
total_residual_.derivative()[0].toSparse(matr);
V dx(V::Zero(total_residual_.size())); V dx(V::Zero(total_residual_.size()));
Opm::LinearSolverInterface::LinearSolverReport rep Opm::LinearSolverInterface::LinearSolverReport rep
@@ -490,7 +494,7 @@ namespace {
const std::vector<int> well_cells(wells_.well_cells, const std::vector<int> well_cells(wells_.well_cells,
wells_.well_cells + nperf); wells_.well_cells + nperf);
// Construct matrix to map wells->perforations. // Construct matrix to map wells->perforations.
M well_to_perf(well_cells.size(), nw); S well_to_perf(well_cells.size(), nw);
typedef Eigen::Triplet<double> Tri; typedef Eigen::Triplet<double> Tri;
std::vector<Tri> w2p; std::vector<Tri> w2p;
for (int w = 0; w < nw; ++w) { for (int w = 0; w < nw; ++w) {
@@ -499,7 +503,7 @@ namespace {
} }
} }
well_to_perf.setFromTriplets(w2p.begin(), w2p.end()); well_to_perf.setFromTriplets(w2p.begin(), w2p.end());
const M perf_to_well = well_to_perf.transpose(); const S perf_to_well = well_to_perf.transpose();
const V transw = Eigen::Map<const V>(wells_.WI, nperf, 1); const V transw = Eigen::Map<const V>(wells_.WI, nperf, 1);
const V p = Eigen::Map<const V>(&state.pressure()[0], nc, 1); const V p = Eigen::Map<const V>(&state.pressure()[0], nc, 1);