OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed to conform with new interface (ifsh now wants effective inner products etc.).

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2010-10-26 12:51:34 +02:00
parent 9315bae82f
commit 8fee3b3963
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
HybridPressureSolver.hpp
View File

@ -143,19 +143,20 @@ public:
// Source terms from user. // Source terms from user.
double* src = const_cast<double*>(&sources[0]); // Ugly? Yes. Safe? I think so. double* src = const_cast<double*>(&sources[0]); // Ugly? Yes. Safe? I think so.
// Inner products are precomputed.
double* Binv = &Binv_[0];
// Gravity contribs are precomputed.
double* gpress = &gpress_[0];
// All well related things are zero. // All well related things are zero.
well_control_t* wctrl = 0; well_control_t* wctrl = 0;
double* WI = 0; double* WI = 0;
double* wdp = 0; double* wdp = 0;
double* totmob = const_cast<double*>(&total_mobilities[0]); // Scale inner products and gravity terms by saturation-dependent factors.
double* omega = const_cast<double*>(&omegas[0]); grid_t* g = grid_.c_grid();
Binv_mobilityweighted_.resize(Binv_.size());
mim_ip_mobility_update(g->number_of_cells, g->cell_facepos, &total_mobilities[0],
&Binv_[0], &Binv_mobilityweighted_[0]);
gpress_omegaweighted_.resize(gpress_.size());
mim_ip_density_update(g->number_of_cells, g->cell_facepos, &omegas[0],
&gpress_[0], &gpress_omegaweighted_[0]);
// Zero the linalg structures. // Zero the linalg structures.
csrmatrix_zero(data_->A); csrmatrix_zero(data_->A);
@ -164,7 +165,8 @@ public:
} }
// Assemble the embedded linear system. // Assemble the embedded linear system.
ifsh_assemble(&bc, src, Binv, gpress, wctrl, WI, wdp, totmob, omega, data_); ifsh_assemble(&bc, src, &Binv_mobilityweighted_[0], &gpress_omegaweighted_[0],
wctrl, WI, wdp, data_);
state_ = Assembled; state_ = Assembled;
} }
@ -217,15 +219,14 @@ public:
"You must call assemble() (and solve the linear system) " "You must call assemble() (and solve the linear system) "
"prior to calling computePressuresAndFluxes()."); "prior to calling computePressuresAndFluxes().");
} }
const double* Binv = &Binv_[0];
const double* gpress = &gpress_[0];
int num_cells = grid_.c_grid()->number_of_cells; int num_cells = grid_.c_grid()->number_of_cells;
int num_faces = grid_.c_grid()->number_of_faces; int num_faces = grid_.c_grid()->number_of_faces;
cell_pressures.clear(); cell_pressures.clear();
cell_pressures.resize(num_cells, 0.0); cell_pressures.resize(num_cells, 0.0);
face_fluxes.clear(); face_fluxes.clear();
face_fluxes.resize(num_faces, 0.0); face_fluxes.resize(num_faces, 0.0);
ifsh_press_flux(grid_.c_grid(), Binv, gpress, data_, &cell_pressures[0], &face_fluxes[0], 0, 0); ifsh_press_flux(grid_.c_grid(), &Binv_mobilityweighted_[0], &gpress_omegaweighted_[0],
data_, &cell_pressures[0], &face_fluxes[0], 0, 0);
} }
/// @brief /// @brief
@ -283,8 +284,10 @@ private:
std::vector<int> ncf_; std::vector<int> ncf_;
// B^{-1} storage. // B^{-1} storage.
std::vector<double> Binv_; std::vector<double> Binv_;
std::vector<double> Binv_mobilityweighted_;
// Gravity contributions. // Gravity contributions.
std::vector<double> gpress_; std::vector<double> gpress_;
std::vector<double> gpress_omegaweighted_;
// Total mobilities. // Total mobilities.
std::vector<double> totmob_; std::vector<double> totmob_;
// Gravity coefficients (\omega = sum_{i = 1}^{num phases}f_i \rho_i[TODO: check this]). // Gravity coefficients (\omega = sum_{i = 1}^{num phases}f_i \rho_i[TODO: check this]).