OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-19 05:53:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Hide memory management aspects of struct WellControls.

Browse Source
This commit is contained in:
Bård Skaflestad 2012-04-21 11:34:11 +02:00
parent 7bd5e1c0b5
commit 3bca737913
2 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/core/newwells.h
View File

@ -59,10 +59,11 @@ enum SurfaceComponent { WATER = 0, OIL = 1, GAS = 2 };
struct WellControls struct WellControls
{ {
int num; /** Number of controls. */ int num; /** Number of controls. */
int cpty; /** Allocated capacity, for internal use only. */
enum WellControlType *type; /** Array of control types. */ enum WellControlType *type; /** Array of control types. */
double *target; /** Array of control targets. */ double *target; /** Array of control targets. */
int current; /** Index of current active control. */ int current; /** Index of current active control. */
void *data; /** Internal management structure. */
}; };

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

@ -41,14 +41,42 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
struct WellControlMgmt {
int cpty;
};
static void
destroy_ctrl_mgmt(struct WellControlMgmt *m)
{
free(m);
}
static struct WellControlMgmt *
create_ctrl_mgmt(void)
{
struct WellControlMgmt *m;
m = malloc(1 * sizeof *m);
if (m != NULL) {
m->cpty = 0;
}
return m;
}
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void static void
well_controls_destroy(struct WellControls *ctrl) well_controls_destroy(struct WellControls *ctrl)
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
if (ctrl != NULL) { if (ctrl != NULL) {
free(ctrl->target); destroy_ctrl_mgmt(ctrl->data);
free(ctrl->type); free (ctrl->target);
free (ctrl->type);
} }
free(ctrl); free(ctrl);
@ -67,10 +95,16 @@ well_controls_create(void)
if (ctrl != NULL) { if (ctrl != NULL) {
/* Initialise empty control set */ /* Initialise empty control set */
ctrl->num = 0; ctrl->num = 0;
ctrl->cpty = 0;
ctrl->type = NULL; ctrl->type = NULL;
ctrl->target = NULL; ctrl->target = NULL;
ctrl->current = -1; ctrl->current = -1;
ctrl->data = create_ctrl_mgmt();
if (ctrl->data == NULL) {
well_controls_destroy(ctrl);
ctrl = NULL;
}
} }
return ctrl; return ctrl;
@ -85,6 +119,8 @@ well_controls_reserve(int nctrl, struct WellControls *ctrl)
int c, ok; int c, ok;
void *type, *target; void *type, *target;
struct WellControlMgmt *m;
type = realloc(ctrl->type , nctrl * sizeof *ctrl->type ); type = realloc(ctrl->type , nctrl * sizeof *ctrl->type );
target = realloc(ctrl->target, nctrl * sizeof *ctrl->target); target = realloc(ctrl->target, nctrl * sizeof *ctrl->target);
@ -93,12 +129,13 @@ well_controls_reserve(int nctrl, struct WellControls *ctrl)
if (target != NULL) { ctrl->target = target; ok++; } if (target != NULL) { ctrl->target = target; ok++; }
if (ok == 2) { if (ok == 2) {
for (c = ctrl->cpty; c < nctrl; c++) { m = ctrl->data;
for (c = m->cpty; c < nctrl; c++) {
ctrl->type [c] = BHP; ctrl->type [c] = BHP;
ctrl->target[c] = -1.0; ctrl->target[c] = -1.0;
} }
ctrl->cpty = nctrl; m->cpty = nctrl;
} }
return ok == 2; return ok == 2;
@ -393,12 +430,15 @@ append_well_controls(enum WellControlType type ,
{ {
int ok, alloc; int ok, alloc;
struct WellControlMgmt *m;
assert (ctrl != NULL); assert (ctrl != NULL);
ok = ctrl->num < ctrl->cpty; m = ctrl->data;
ok = ctrl->num < m->cpty;
if (! ok) { if (! ok) {
alloc = alloc_size(ctrl->num, 1, ctrl->cpty); alloc = alloc_size(ctrl->num, 1, m->cpty);
ok = well_controls_reserve(alloc, ctrl); ok = well_controls_reserve(alloc, ctrl);
} }