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

naming M to Matrix for better readability in WellMultiSegment

Browse Source
This commit is contained in:
Kai Bao 2015-12-01 10:44:05 +01:00
parent f7782c30b7
commit 5a23406d9e
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opm/autodiff/WellMultiSegment.cpp
View File

@ -230,8 +230,8 @@ namespace Opm
}
void WellMultiSegment::updateWellOps() {
m_wops_.s2p = M(m_number_of_perforations_, m_number_of_segments_);
m_wops_.p2s = M(m_number_of_segments_, m_number_of_perforations_);
m_wops_.s2p = Matrix(m_number_of_perforations_, m_number_of_segments_);
m_wops_.p2s = Matrix(m_number_of_segments_, m_number_of_perforations_);
typedef Eigen::Triplet<double> Tri;
@ -254,7 +254,7 @@ namespace Opm
m_wops_.s2p.setFromTriplets(s2p.begin(), s2p.end());
m_wops_.p2s.setFromTriplets(p2s.begin(), p2s.end());
m_wops_.s2s_gather = M(m_number_of_segments_, m_number_of_segments_);
m_wops_.s2s_gather = Matrix(m_number_of_segments_, m_number_of_segments_);
std::vector<Tri> s2s_gather;
s2s_gather.reserve(m_number_of_segments_ * m_number_of_segments_);
@ -280,16 +280,16 @@ namespace Opm
m_wops_.s2s_gather.setFromTriplets(s2s_gather.begin(), s2s_gather.end());
m_wops_.p2s_gather = M(m_number_of_segments_, m_number_of_perforations_);
m_wops_.p2s_gather = Matrix(m_number_of_segments_, m_number_of_perforations_);
m_wops_.p2s_gather = m_wops_.s2s_gather * m_wops_.p2s;
m_wops_.s2s_inlets = M(m_number_of_segments_, m_number_of_segments_);
m_wops_.s2s_inlets = Matrix(m_number_of_segments_, m_number_of_segments_);
m_wops_.s2s_inlets.setFromTriplets(s2s_inlets.begin(), s2s_inlets.end());
m_wops_.s2s_outlet = M(m_number_of_segments_, m_number_of_segments_);
m_wops_.s2s_outlet = Matrix(m_number_of_segments_, m_number_of_segments_);
m_wops_.s2s_outlet.setFromTriplets(s2s_outlet.begin(), s2s_outlet.end());
m_wops_.p2s_average = M(m_number_of_segments_, m_number_of_perforations_);
m_wops_.p2s_average = Matrix(m_number_of_segments_, m_number_of_perforations_);
std::vector<Tri> p2s_average;
p2s_average.reserve(m_number_of_segments_);
@ -301,7 +301,7 @@ namespace Opm
}
// constructing the diagonal matrix to do the averaging for p2s
M temp_averaging_p2s = M(m_number_of_segments_, m_number_of_segments_);
Matrix temp_averaging_p2s = Matrix(m_number_of_segments_, m_number_of_segments_);
temp_averaging_p2s.setFromTriplets(p2s_average.begin(), p2s_average.end());
m_wops_.p2s_average = temp_averaging_p2s * m_wops_.p2s;
}

17
opm/autodiff/WellMultiSegment.hpp
View File

@ -48,8 +48,7 @@ namespace Opm
{
public:
typedef Eigen::Array<double, Eigen::Dynamic, 1> V;
typedef Eigen::SparseMatrix<double> M;
typedef Eigen::SparseMatrix<double> Matrix;
/// Constructor of WellMultiSegment
/// \param[in] well information from EclipseState
@ -130,15 +129,15 @@ namespace Opm
/// Struct for the well operator matrices.
/// All the operator matrics only apply to the one specifi well.
struct WellOps {
M s2p; // segment -> perf (scatter)
M p2s; // perf -> segment (gather)
M p2s_average; // perf -> segment (avarage)
M s2s_gather; // segment -> segment (in an accumlative way)
Matrix s2p; // segment -> perf (scatter)
Matrix p2s; // perf -> segment (gather)
Matrix p2s_average; // perf -> segment (avarage)
Matrix s2s_gather; // segment -> segment (in an accumlative way)
// means the outlet segments will gather all the contribution
// from all the inlet segments in a recurisive way
M p2s_gather; // perforation -> segment (in an accumative way)
M s2s_inlets; // segment -> its inlet segments
M s2s_outlet; // segment -> its outlet segment
Matrix p2s_gather; // perforation -> segment (in an accumative way)
Matrix s2s_inlets; // segment -> its inlet segments
Matrix s2s_outlet; // segment -> its outlet segment
};
/// Well operator matrics

1
opm/autodiff/WellStateMultiSegment.hpp
View File

@ -47,7 +47,6 @@ namespace Opm
public:
typedef WellStateFullyImplicitBlackoil Base;
typedef WellMultiSegment::V V;
typedef struct {
int well_number;