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

Hide memory management aspects of struct Wells.

Browse Source
This commit is contained in:
Bård Skaflestad 2012-04-21 13:57:41 +02:00
parent 3807506aeb
commit 1e9748cdb8
2 changed files with 70 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/core/newwells.h
View File

@ -72,8 +72,7 @@ struct WellControls
struct Wells
{
int number_of_wells; /** Number of wells. */
int well_cpty; /** Allocated well capacity, for internal use only. */
int perf_cpty; /** Allocated perforation capacity, for internal use only. */
enum WellType *type; /** Array of well types. */
double *depth_ref; /** Array of well bhp reference depths. */
double *zfrac; /** Component volume fractions for each well, size is (3*number_of_wells).
@ -90,6 +89,9 @@ struct Wells
*/
double *WI; /** Well productivity index, same size and structure as well_cells. */
struct WellControls **ctrls; /** Well controls, one struct for each well. */
void *data; /** Internal management structure. */
};

82
opm/core/utility/newwells.c
View File

@ -45,6 +45,11 @@ struct WellControlMgmt {
int cpty;
};
struct WellMgmt {
int well_cpty;
int perf_cpty;
};
static void
destroy_ctrl_mgmt(struct WellControlMgmt *m)
@ -68,6 +73,29 @@ create_ctrl_mgmt(void)
}
static void
destroy_well_mgmt(struct WellMgmt *m)
{
free(m);
}
static struct WellMgmt *
create_well_mgmt(void)
{
struct WellMgmt *m;
m = malloc(1 * sizeof *m);
if (m != NULL) {
m->well_cpty = 0;
m->perf_cpty = 0;
}
return m;
}
/* ---------------------------------------------------------------------- */
static void
well_controls_destroy(struct WellControls *ctrl)
@ -197,7 +225,11 @@ initialise_new_wells(int nwells, struct Wells *W)
{
int ok, w;
for (w = W->well_cpty; w < nwells; w++) {
struct WellMgmt *m;
m = W->data;
for (w = m->well_cpty; w < nwells; w++) {
W->type [w] = PRODUCER;
W->depth_ref[w] = -1.0;
@ -208,7 +240,7 @@ initialise_new_wells(int nwells, struct Wells *W)
W->well_connpos[w + 1] = W->well_connpos[w];
}
for (w = W->well_cpty, ok = 1; ok && (w < nwells); w++) {
for (w = m->well_cpty, ok = 1; ok && (w < nwells); w++) {
W->ctrls[w] = well_controls_create();
ok = W->ctrls[w] != NULL;
@ -231,7 +263,11 @@ initialise_new_perfs(int nperf, struct Wells *W)
{
int k;
for (k = W->perf_cpty; k < nperf; k++) {
struct WellMgmt *m;
m = W->data;
for (k = m->perf_cpty; k < nperf; k++) {
W->well_cells[k] = -1 ;
W->WI [k] = 0.0;
}
@ -245,12 +281,16 @@ wells_reserve(int nwells, int nperf, struct Wells *W)
{
int ok;
assert (nwells >= W->well_cpty);
assert (nperf >= W->perf_cpty);
struct WellMgmt *m;
m = W->data;
assert (nwells >= m->well_cpty);
assert (nperf >= m->perf_cpty);
ok = 1;
if (nwells > W->well_cpty) {
if (nwells > m->well_cpty) {
ok = wells_allocate(nwells, W);
if (ok) {
@ -258,16 +298,16 @@ wells_reserve(int nwells, int nperf, struct Wells *W)
}
if (ok) {
W->well_cpty = nwells;
m->well_cpty = nwells;
}
}
if (ok && (nperf > W->perf_cpty)) {
if (ok && (nperf > m->perf_cpty)) {
ok = perfs_allocate(nperf, W);
if (ok) {
initialise_new_perfs(nperf, W);
W->perf_cpty = nperf;
m->perf_cpty = nperf;
}
}
@ -292,8 +332,6 @@ create_wells(int nwells_reserve_cap, int nperf_reserve_cap)
if (W != NULL) {
W->number_of_wells = 0;
W->well_cpty = 0;
W->perf_cpty = 0;
W->type = NULL;
W->depth_ref = NULL;
@ -305,7 +343,9 @@ create_wells(int nwells_reserve_cap, int nperf_reserve_cap)
W->ctrls = NULL;
ok = W->well_connpos != NULL;
W->data = create_well_mgmt();
ok = (W->well_connpos != NULL) && (W->data != NULL);
if (ok) {
W->well_connpos[0] = 0;
@ -331,11 +371,17 @@ destroy_wells(struct Wells *W)
{
int w;
struct WellMgmt *m;
if (W != NULL) {
for (w = 0; w < W->well_cpty; w++) {
m = W->data;
for (w = 0; w < m->well_cpty; w++) {
well_controls_destroy(W->ctrls[w]);
}
destroy_well_mgmt(m);
free(W->ctrls);
free(W->WI);
free(W->well_cells);
@ -380,14 +426,18 @@ add_well(enum WellType type ,
int ok, nw, nperf_tot, off;
int nwalloc, nperfalloc;
struct WellMgmt *m;
nw = W->number_of_wells;
nperf_tot = W->well_connpos[nw];
ok = (nw < W->well_cpty) && (nperf_tot + nperf <= W->perf_cpty);
m = W->data;
ok = (nw < m->well_cpty) && (nperf_tot + nperf <= m->perf_cpty);
if (! ok) {
nwalloc = alloc_size(nw , 1 , W->well_cpty);
nperfalloc = alloc_size(nperf_tot, nperf, W->perf_cpty);
nwalloc = alloc_size(nw , 1 , m->well_cpty);
nperfalloc = alloc_size(nperf_tot, nperf, m->perf_cpty);
ok = wells_reserve(nwalloc, nperfalloc, W);
}