OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-18 21:43:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a compilation bug, also adjusted computeWDP slightly to allow for either a saturation vector by grid cells or by well cells

Browse Source
This commit is contained in:
Kjetil Olsen Lye 2012-04-17 09:19:06 +02:00
parent 95818d1f02
commit b0b13c71f9
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
opm/core/WellsGroup.cpp
View File

@ -7,6 +7,7 @@
#include <opm/core/WellsGroup.hpp>
#include <cmath>
#include <opm/core/newwells.h>
namespace Opm
{
@ -146,7 +147,7 @@ namespace Opm
const ProductionSpecification& prod_spec = prodSpec();
bhp_target = prod_spec.BHP_limit_ / number_of_leaf_nodes;
rate_target = prod_spec.fluid_volume_max_rate_ / number_of_leaf_nodes;
shut_down_on_exceed = prodSpec().procedure_ == ProductionSpecification::Well;
shut_down_on_exceed = prodSpec().procedure_ == ProductionSpecification::WELL;
break;
}
}
@ -158,7 +159,9 @@ namespace Opm
if(shut_down_on_exceed) {
// Shut down well
wells->ctrls->target = 0.0;
// Dirty hack for now
struct Wells* non_const_wells = const_cast<struct Wells*>(wells);
non_const_wells->ctrls[index_of_well]->target[0] = 0.0;
}
return false;
}
@ -169,7 +172,9 @@ namespace Opm
if(shut_down_on_exceed) {
// Shut down well
wells->ctrls->target = 0.0;
// Dirty hack for now
struct Wells* non_const_wells = const_cast<struct Wells*>(wells);
non_const_wells->ctrls[index_of_well]->target[0] = 0.0;
}
return false;
}

22
opm/core/utility/miscUtilities.cpp
View File

@ -406,12 +406,12 @@ namespace Opm
void computeWDP(const Wells& wells, const UnstructuredGrid& grid, const std::vector<double>& saturations,
const std::vector<double>& densities, std::vector<double>& wdp)
const std::vector<double>& densities, std::vector<double>& wdp, bool per_grid_cell)
{
const size_t np = densities.size();
const int nw = wells.number_of_wells;
// Simple for now:
for(int i = 0; i < wells.number_of_wells; i++) {
for(int i = 0; i < nw; i++) {
double depth_ref = wells.depth_ref[i];
for(int j = wells.well_connpos[i]; j < wells.well_connpos[i+1]; j++) {
int cell = wells.well_cells[j];
@ -421,15 +421,25 @@ namespace Opm
double saturation_sum = 0.0;
for(size_t p = 0; p < np; p++) {
saturation_sum += saturations[np*cell + p];
if(per_grid_cell) {
saturation_sum += saturations[i*nw*np + j*np + p];
}
else {
saturation_sum += saturations[np*cell + p];
}
}
if(saturation_sum == 0) {
saturation_sum = 1.0;
}
double density = 0.0;
for(size_t p = 0; p < np; p++) {
// Is this a smart way of doing it?
density += saturations[np*cell + p] * densities[p] / saturation_sum;
if(per_grid_cell) {
density += saturations[i*nw*np + j*np + p] * densities[p] / saturation_sum;
}
else {
// Is this a smart way of doing it?
density += saturations[np*cell + p] * densities[p] / saturation_sum;
}
}
// Is the sign correct?

6
opm/core/utility/miscUtilities.hpp
View File

@ -180,13 +180,15 @@ namespace Opm
/// \param[in] wells Wells that need their wdp calculated.
/// \param[in] grid The associated grid to make cell lookups.
/// \param[in] saturations A vector of weights for each cell for each phase
/// in the grid. So for cell i,
/// in the grid (or well, see per_grid_cell parameter). So for cell i,
/// saturations[i*densities.size() + p] should give the weight
/// of phase p in cell i.
/// \param[in] densities Density for each phase.
/// \param[out] wdp Will contain, for each well, the wdp of the well.
/// \param[in] per_grid_cell Whether or not the saturations are per grid cell or per
/// well cell.
void computeWDP(const Wells& wells, const UnstructuredGrid& grid, const std::vector<double>& saturations,
const std::vector<double>& densities, std::vector<double>& wdp);
const std::vector<double>& densities, std::vector<double>& wdp, bool per_grid_cell = true);
/// Computes (sums) the flow rate for each well.
/// \param[in] wells The wells for which the flow rate should be computed.