OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-20 11:48:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removing unnessary arrays and eliminate some code duplication

Browse Source
This commit is contained in:
Vegard Kippe 2024-10-08 11:47:47 +02:00
parent ca9cad3f07
commit a62a326cfa
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
opm/simulators/wells/WellFilterCake.cpp
View File

@ -50,18 +50,14 @@ updatePostStep(const WellInterfaceGeneric<Scalar>& well,
assert (conc > 0.);
auto& ws = well_state.well(well.indexOfWell());
const auto nperf = ws.perf_data.size();
if (prev_skin_factor_.empty()) {
prev_skin_factor_.assign(nperf, 0.);
if (skin_factor_.empty()) {
skin_factor_.assign(nperf, 0.);
thickness_.assign(nperf, 0.);
prev_thickness_.assign(nperf, 0.);
}
prev_skin_factor_ = skin_factor_;
prev_thickness_ = thickness_;
ws.filtrate_conc = conc;
updateMultipliers(well, well_state, dt, water_index, deferred_logger);
updateSkinFactorsAndMultipliers(well, well_state, dt, water_index, deferred_logger);
}
template<class Scalar>
@ -92,18 +88,17 @@ applyCleaning(const WellInterfaceGeneric<Scalar>& well,
filter_cake.sf_multiplier = 1.0;
skin_factor_[perf] *= factor;
const auto denom = connection.ctfProperties().peaceman_denom;
inj_fc_multiplier_[perf] = denom / (denom + skin_factor_[perf]);
updateMultiplier(connection, perf);
const Scalar rw = connection.getFilterCakeRadius();
switch (filter_cake.geometry) {
case FilterCake::FilterCakeGeometry::LINEAR: {
// Previuos thickness adjusted to give correct cleaning multiplier at start of time step
// Previous thickness adjusted to give correct cleaning multiplier at start of time step
thickness_[perf] *= factor;
break;
}
case FilterCake::FilterCakeGeometry::RADIAL: {
Scalar rc_prev = std::sqrt(rw * rw + 2. * rw * prev_thickness_[perf]);
// Previuos thickness and rc adjusted to give correct cleaning multiplier at start of time step
Scalar rc_prev = std::sqrt(rw * rw + 2. * rw * thickness_[perf]);
// Previous thickness and rc adjusted to give correct cleaning multiplier at start of time step
rc_prev = rw*std::exp(factor*std::log(rc_prev/rw));
thickness_[perf] = (rc_prev * rc_prev - rw * rw) / (2. * rw);
break;
@ -122,7 +117,7 @@ applyCleaning(const WellInterfaceGeneric<Scalar>& well,
template<class Scalar>
void WellFilterCake<Scalar>::
updateMultipliers(const WellInterfaceGeneric<Scalar>& well,
updateSkinFactorsAndMultipliers(const WellInterfaceGeneric<Scalar>& well,
WellState<Scalar>& well_state,
const double dt,
const std::size_t water_index,
@ -174,13 +169,13 @@ updateMultipliers(const WellInterfaceGeneric<Scalar>& well,
Scalar thickness = 0.;
switch (filter_cake.geometry) {
case FilterCake::FilterCakeGeometry::LINEAR: {
thickness = prev_thickness_[perf] + delta_thickness;
thickness = thickness_[perf] + delta_thickness;
filtrate_data.thickness[perf] = thickness;
delta_skin_factor = delta_thickness / rw * K / perm;
break;
}
case FilterCake::FilterCakeGeometry::RADIAL: {
const auto prev_thickness = prev_thickness_[perf];
const auto prev_thickness = thickness_[perf];
Scalar rc_prev = std::sqrt(rw * rw + 2. * rw * prev_thickness);
thickness = prev_thickness + delta_thickness;
@ -197,16 +192,23 @@ updateMultipliers(const WellInterfaceGeneric<Scalar>& well,
geometry, well.name()),
deferred_logger);
}
skin_factor_[perf] = prev_skin_factor_[perf] + delta_skin_factor;
skin_factor_[perf] += delta_skin_factor;
filtrate_data.skin_factor[perf] = skin_factor_[perf];
thickness_[perf] = thickness;
const auto denom = connection.ctfProperties().peaceman_denom;
const auto denom2 = denom + skin_factor_[perf];
inj_fc_multiplier_[perf] = denom / denom2;
updateMultiplier(connection, perf);
}
}
template<class Scalar> template <class Conn>
void WellFilterCake<Scalar>::
updateMultiplier(const Conn& connection, const int perf)
{
const auto denom = connection.ctfProperties().peaceman_denom;
const auto denom2 = denom + skin_factor_[perf];
inj_fc_multiplier_[perf] = denom / denom2;
}
template class WellFilterCake<double>;
#if FLOW_INSTANTIATE_FLOAT

14
opm/simulators/wells/WellFilterCake.hpp
View File

@ -52,11 +52,13 @@ public:
private:
//! \brief Update the multiplier for well transmissbility due to cake filtration.
void updateMultipliers(const WellInterfaceGeneric<Scalar>& well,
WellState<Scalar>& well_state,
const double dt,
const std::size_t water_index,
DeferredLogger& deferred_logger);
void updateSkinFactorsAndMultipliers(const WellInterfaceGeneric<Scalar>& well,
WellState<Scalar>& well_state,
const double dt,
const std::size_t water_index,
DeferredLogger& deferred_logger);
template<class Conn>
void updateMultiplier(const Conn& conn, const int perf);
//! \brief Apply cleaning multipliers to skin factors and reduce cake thickness accordingly
//! \details The cake thickness is re-computed to give the new (reduced) skin factor with current cake properties
@ -66,9 +68,7 @@ private:
std::vector<Scalar> inj_fc_multiplier_; //!< Multiplier due to injection filtration cake
std::vector<Scalar> skin_factor_;
std::vector<Scalar> prev_skin_factor_;
std::vector<Scalar> thickness_;
std::vector<Scalar> prev_thickness_;
};
}