Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix segfault in rd_grav_add_survey_FIP #990

Merged
merged 1 commit into from
Aug 6, 2024
Merged

Fix segfault in rd_grav_add_survey_FIP #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 63 additions & 27 deletions lib/resdata/rd_grav.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,21 @@ struct rd_grav_phase_struct {
rd_phase_enum phase;
};

static void rd_grav_phase_free(rd_grav_phase_type *grav_phase) {
free(grav_phase->work);
free(grav_phase->fluid_mass);
delete grav_phase;
}

static void rd_grav_survey_free(rd_grav_survey_type *grav_survey) {
free(grav_survey->name);
free(grav_survey->porv);
for (auto *phase : grav_survey->phase_list)
rd_grav_phase_free(phase);

delete grav_survey;
}

static const char *get_den_kw(rd_phase_enum phase, rd_version_enum rd_version) {
if (rd_version == ECLIPSE100) {
switch (phase) {
Expand Down Expand Up @@ -203,6 +218,7 @@ rd_grav_phase_alloc(rd_grav_type *rd_grav, rd_grav_survey_type *survey,
rd_file_iget_named_kw(init_file, PVTNUM_KW, 0);
const std::vector<double> std_density =
rd_grav->std_density[std::string(rd_get_phase_name(phase))];

rd_kw_type *fip_kw;

if (phase == RD_OIL_PHASE)
Expand All @@ -212,13 +228,14 @@ rd_grav_phase_alloc(rd_grav_type *rd_grav, rd_grav_survey_type *survey,
else
fip_kw = rd_file_view_iget_named_kw(restart_file, FIPWAT_KW, 0);

{
int iactive;
for (iactive = 0; iactive < size; iactive++) {
double fip = rd_kw_iget_as_double(fip_kw, iactive);
int pvtnum = rd_kw_iget_int(pvtnum_kw, iactive);
grav_phase->fluid_mass[iactive] = fip * std_density[pvtnum];
for (int iactive = 0; iactive < size; iactive++) {
double fip = rd_kw_iget_as_double(fip_kw, iactive);
int pvtnum = rd_kw_iget_int(pvtnum_kw, iactive);
if (std_density.size() <= pvtnum) {
rd_grav_phase_free(grav_phase);
return NULL;
}
grav_phase->fluid_mass[iactive] = fip * std_density[pvtnum];
}
} else {
rd_version_enum rd_version = rd_file_get_rd_version(init_file);
Expand Down Expand Up @@ -288,41 +305,42 @@ rd_grav_phase_alloc(rd_grav_type *rd_grav, rd_grav_survey_type *survey,
}
}

static void rd_grav_phase_free(rd_grav_phase_type *grav_phase) {
free(grav_phase->work);
free(grav_phase->fluid_mass);
delete grav_phase;
}

static void rd_grav_survey_add_phase(rd_grav_survey_type *survey,
rd_phase_enum phase,
rd_grav_phase_type *grav_phase) {
survey->phase_list.push_back(grav_phase);
survey->phase_map[std::string(rd_get_phase_name(phase))] = grav_phase;
}

static void rd_grav_survey_add_phases(rd_grav_type *rd_grav,
static bool rd_grav_survey_add_phases(rd_grav_type *rd_grav,
rd_grav_survey_type *survey,
const rd_file_view_type *restart_file,
grav_calc_type calc_type) {
int phases = rd_file_get_phases(rd_grav->init_file);
if (phases & RD_OIL_PHASE) {
rd_grav_phase_type *oil_phase = rd_grav_phase_alloc(
rd_grav, survey, RD_OIL_PHASE, restart_file, calc_type);
if (oil_phase == NULL)
return false;
rd_grav_survey_add_phase(survey, RD_OIL_PHASE, oil_phase);
}

if (phases & RD_GAS_PHASE) {
rd_grav_phase_type *gas_phase = rd_grav_phase_alloc(
rd_grav, survey, RD_GAS_PHASE, restart_file, calc_type);
if (gas_phase == NULL)
return false;
rd_grav_survey_add_phase(survey, RD_GAS_PHASE, gas_phase);
}

if (phases & RD_WATER_PHASE) {
rd_grav_phase_type *water_phase = rd_grav_phase_alloc(
rd_grav, survey, RD_WATER_PHASE, restart_file, calc_type);
if (water_phase == NULL)
return false;
rd_grav_survey_add_phase(survey, RD_WATER_PHASE, water_phase);
}
return true;
}

static rd_grav_survey_type *
Expand Down Expand Up @@ -440,6 +458,7 @@ rd_grav_survey_alloc_RPORV(rd_grav_type *rd_grav,
const char *name) {
rd_grav_survey_type *survey =
rd_grav_survey_alloc_empty(rd_grav, name, GRAV_CALC_RPORV);

if (rd_file_view_has_kw(restart_file, RPORV_KW)) {
rd_kw_type *rporv_kw =
rd_file_view_iget_named_kw(restart_file, RPORV_KW, 0);
Expand All @@ -453,8 +472,11 @@ rd_grav_survey_alloc_RPORV(rd_grav_type *rd_grav,
{
const rd_file_type *init_file = rd_grav->init_file;
rd_grav_survey_assert_RPORV(survey, init_file);
rd_grav_survey_add_phases(rd_grav, survey, restart_file,
GRAV_CALC_RPORV);
if (!rd_grav_survey_add_phases(rd_grav, survey, restart_file,
GRAV_CALC_RPORV)) {
rd_grav_survey_free(survey);
return NULL;
}
}
return survey;
}
Expand All @@ -466,6 +488,7 @@ rd_grav_survey_alloc_PORMOD(rd_grav_type *rd_grav,
rd::rd_grid_cache &grid_cache = *(rd_grav->grid_cache);
rd_grav_survey_type *survey =
rd_grav_survey_alloc_empty(rd_grav, name, GRAV_CALC_PORMOD);

rd_kw_type *init_porv_kw = rd_file_iget_named_kw(
rd_grav->init_file, PORV_KW, 0); /* Global indexing */
rd_kw_type *pormod_kw = rd_file_view_iget_named_kw(restart_file, PORMOD_KW,
Expand All @@ -479,7 +502,11 @@ rd_grav_survey_alloc_PORMOD(rd_grav_type *rd_grav,
rd_kw_iget_float(pormod_kw, active_index) *
rd_kw_iget_float(init_porv_kw, global_index[active_index]);

rd_grav_survey_add_phases(rd_grav, survey, restart_file, GRAV_CALC_PORMOD);
if (!rd_grav_survey_add_phases(rd_grav, survey, restart_file,
GRAV_CALC_PORMOD)) {
rd_grav_survey_free(survey);
return NULL;
}

return survey;
}
Expand All @@ -497,7 +524,12 @@ rd_grav_survey_alloc_FIP(rd_grav_type *rd_grav,

rd_grav_survey_type *survey =
rd_grav_survey_alloc_empty(rd_grav, name, GRAV_CALC_FIP);
rd_grav_survey_add_phases(rd_grav, survey, restart_file, GRAV_CALC_FIP);

if (!rd_grav_survey_add_phases(rd_grav, survey, restart_file,
GRAV_CALC_FIP)) {
rd_grav_survey_free(survey);
return NULL;
}

return survey;
}
Expand All @@ -509,18 +541,14 @@ rd_grav_survey_alloc_RFIP(rd_grav_type *rd_grav,

rd_grav_survey_type *survey =
rd_grav_survey_alloc_empty(rd_grav, name, GRAV_CALC_RFIP);
rd_grav_survey_add_phases(rd_grav, survey, restart_file, GRAV_CALC_RFIP);

return survey;
}

static void rd_grav_survey_free(rd_grav_survey_type *grav_survey) {
free(grav_survey->name);
free(grav_survey->porv);
for (auto *phase : grav_survey->phase_list)
rd_grav_phase_free(phase);
if (!rd_grav_survey_add_phases(rd_grav, survey, restart_file,
GRAV_CALC_RFIP)) {
rd_grav_survey_free(survey);
return NULL;
}

delete grav_survey;
return survey;
}

static double rd_grav_survey_eval(const rd_grav_survey_type *base_survey,
Expand Down Expand Up @@ -574,6 +602,8 @@ rd_grav_add_survey_RPORV(rd_grav_type *grav, const char *name,
const rd_file_view_type *restart_file) {
rd_grav_survey_type *survey =
rd_grav_survey_alloc_RPORV(grav, restart_file, name);
if (survey == NULL)
return NULL;
rd_grav_add_survey__(grav, name, survey);
return survey;
}
Expand All @@ -583,6 +613,8 @@ rd_grav_add_survey_FIP(rd_grav_type *grav, const char *name,
const rd_file_view_type *restart_file) {
rd_grav_survey_type *survey =
rd_grav_survey_alloc_FIP(grav, restart_file, name);
if (survey == NULL)
return NULL;
rd_grav_add_survey__(grav, name, survey);
return survey;
}
Expand All @@ -592,6 +624,8 @@ rd_grav_add_survey_RFIP(rd_grav_type *grav, const char *name,
const rd_file_view_type *restart_file) {
rd_grav_survey_type *survey =
rd_grav_survey_alloc_RFIP(grav, restart_file, name);
if (survey == NULL)
return NULL;
rd_grav_add_survey__(grav, name, survey);
return survey;
}
Expand All @@ -601,6 +635,8 @@ rd_grav_add_survey_PORMOD(rd_grav_type *grav, const char *name,
const rd_file_view_type *restart_file) {
rd_grav_survey_type *survey =
rd_grav_survey_alloc_PORMOD(grav, restart_file, name);
if (survey == NULL)
return NULL;
rd_grav_add_survey__(grav, name, survey);
return survey;
}
Expand Down
4 changes: 3 additions & 1 deletion python/resdata/gravimetry/rd_grav.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@ def add_survey_FIP(self, survey_name: str, restart_view: ResdataFileView):
the new_std_density() (and possibly also add_std_density())
method before calling the add_survey_FIP() method.
"""
self._add_survey_FIP(survey_name, restart_view)
void_ptr = self._add_survey_FIP(survey_name, restart_view)
if void_ptr is None:
raise ValueError("Could not add FIP survey due to missing std_density")

def add_survey_RFIP(self, survey_name: str, restart_view: ResdataFileView):
"""
Expand Down
5 changes: 5 additions & 0 deletions python/tests/rd_tests/test_grav.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,8 @@ def test_create(self):
grav.add_survey_RFIP("fip", restart_view)

grav.eval("rporv", "pormod", (0, 0, 0), phase_mask=1)

# Test that missing std_density raises
grav = ResdataGrav(self.grid, self.init)
with self.assertRaises(ValueError):
grav.add_survey_FIP("fip", restart_view)