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

Handle flow_conditions_construct(0) correctly.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2012-03-08 15:24:50 +01:00
parent c27e881c1a
commit c68ccff998
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opm/core/pressure/flow_bc.c
View File

@@ -47,7 +47,7 @@ alloc_size(size_t n, size_t c)
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
/* Put structure in a well-defined, initial state */ /* Put structure in a well-defined, initial state */
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void static int
initialise_structure(struct FlowBoundaryConditions *fbc) initialise_structure(struct FlowBoundaryConditions *fbc)
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
{ {
@@ -55,10 +55,12 @@ initialise_structure(struct FlowBoundaryConditions *fbc)
fbc->cond_cpty = 0; fbc->cond_cpty = 0;
fbc->face_cpty = 0; fbc->face_cpty = 0;
fbc->cond_pos = NULL; fbc->cond_pos = malloc(1 * sizeof *fbc->cond_pos);
fbc->type = NULL; fbc->type = NULL;
fbc->value = NULL; fbc->value = NULL;
fbc->face = NULL; fbc->face = NULL;
return fbc->cond_pos != NULL;
} }
@@ -130,9 +132,9 @@ flow_conditions_construct(size_t nbc)
fbc = malloc(1 * sizeof *fbc); fbc = malloc(1 * sizeof *fbc);
if (fbc != NULL) { if (fbc != NULL) {
initialise_structure(fbc); ok = initialise_structure(fbc);
ok = expand_tables(nbc, nbc, fbc); ok = ok && expand_tables(nbc, nbc, fbc);
if (! ok) { if (! ok) {
flow_conditions_destroy(fbc); flow_conditions_destroy(fbc);