OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2024-12-29 02:11:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4289 libecl : Apply external ACTNUM instead of combining with file ACTNUM

Browse Source
This commit is contained in:
Magne Sjaastad 2019-04-05 11:20:57 +02:00
parent 7d242bffb5
commit aa72b384f1
2 changed files with 64 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ThirdParty/Ert/lib/ecl/ecl_grid.cpp vendored
View File

@ -3021,23 +3021,19 @@ static ecl_grid_type * ecl_grid_alloc_EGRID__( ecl_grid_type * main_grid , const
eclipse_version = main_grid->eclipse_version;
}
// If ACTNUM and ext_actnum are not present - that is is interpreted as all active.
const int * actnum_data;
std::vector<int> actnum_product;
if (ecl_file_get_num_named_kw(ecl_file , ACTNUM_KW) > grid_nr) {
actnum_kw = ecl_file_iget_named_kw( ecl_file , ACTNUM_KW , grid_nr);
actnum_data = ecl_kw_get_int_ptr(actnum_kw);
if (ext_actnum) {
int size = ecl_kw_get_size(actnum_kw);
actnum_product.resize(size);
for (int i = 0; i < size; i++)
actnum_product[i] = actnum_data[i] * ext_actnum[i];
actnum_data = actnum_product.data();
}
/*
If ext_actnum is present that is used as ACTNUM, and the file is not checked
for an ACTNUM keyword at all.
*/
const int * actnum_data = NULL;
if (ext_actnum)
actnum_data = ext_actnum;
else {
if (ecl_file_get_num_named_kw(ecl_file, ACTNUM_KW) > grid_nr) {
actnum_kw = ecl_file_iget_named_kw(ecl_file, ACTNUM_KW, grid_nr);
actnum_data = ecl_kw_get_int_ptr(actnum_kw);
}
}
else
actnum_data = ext_actnum;
if (grid_nr == 0) {
/* MAPAXES and COARSENING only apply to the global grid. */

52
patches/libecl-use-external-actnum.patch Normal file
View File

@ -0,0 +1,52 @@
From 7339186f7288b625bc642a4511e5e626e8832616 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 5 Apr 2019 11:12:15 +0200
Subject: [PATCH] patch
---
ThirdParty/Ert/lib/ecl/ecl_grid.cpp | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/ThirdParty/Ert/lib/ecl/ecl_grid.cpp b/ThirdParty/Ert/lib/ecl/ecl_grid.cpp
index 9883cba1b..c01ece639 100644
--- a/ThirdParty/Ert/lib/ecl/ecl_grid.cpp
+++ b/ThirdParty/Ert/lib/ecl/ecl_grid.cpp
@@ -3021,23 +3021,19 @@ static ecl_grid_type * ecl_grid_alloc_EGRID__( ecl_grid_type * main_grid , const
eclipse_version = main_grid->eclipse_version;
}
- // If ACTNUM and ext_actnum are not present - that is is interpreted as all active.
- const int * actnum_data;
- std::vector<int> actnum_product;
- if (ecl_file_get_num_named_kw(ecl_file , ACTNUM_KW) > grid_nr) {
- actnum_kw = ecl_file_iget_named_kw( ecl_file , ACTNUM_KW , grid_nr);
- actnum_data = ecl_kw_get_int_ptr(actnum_kw);
- if (ext_actnum) {
- int size = ecl_kw_get_size(actnum_kw);
- actnum_product.resize(size);
- for (int i = 0; i < size; i++)
- actnum_product[i] = actnum_data[i] * ext_actnum[i];
- actnum_data = actnum_product.data();
- }
+ /*
+ If ext_actnum is present that is used as ACTNUM, and the file is not checked
+ for an ACTNUM keyword at all.
+ */
+ const int * actnum_data = NULL;
+ if (ext_actnum)
+ actnum_data = ext_actnum;
+ else {
+ if (ecl_file_get_num_named_kw(ecl_file, ACTNUM_KW) > grid_nr) {
+ actnum_kw = ecl_file_iget_named_kw(ecl_file, ACTNUM_KW, grid_nr);
+ actnum_data = ecl_kw_get_int_ptr(actnum_kw);
+ }
}
- else
- actnum_data = ext_actnum;
-
if (grid_nr == 0) {
/* MAPAXES and COARSENING only apply to the global grid. */
--
2.21.0.windows.1