OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-01 03:37:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2317 Update patch file to match new file paths

Browse Source
This commit is contained in:
Magne Sjaastad 2018-01-04 20:37:46 +01:00
parent 11ed06a5d5
commit d8f7e0ce1c
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
patches/fix-synthetic-odb-cases.patch
View File

@ -1,27 +1,29 @@
From 8d2557fe8dd00ac30f524197c8a50db2e89bf720 Mon Sep 17 00:00:00 2001
From 188e8fa023257d7047c576de6160e7c4c4888989 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Tue, 25 Apr 2017 13:11:00 +0200
Subject: [PATCH] #1396 Reapply fix for synthetic odb files
Date: Thu, 4 Jan 2018 20:29:09 +0100
Subject: [PATCH] #2317 Apply fix for synthetic odb files
---
ThirdParty/Ert/libecl/src/ecl_rsthead.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
ThirdParty/Ert/lib/ecl/ecl_rsthead.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/ThirdParty/Ert/libecl/src/ecl_rsthead.c b/ThirdParty/Ert/libecl/src/ecl_rsthead.c
index 52ad954..e382cc1 100644
--- a/ThirdParty/Ert/libecl/src/ecl_rsthead.c
+++ b/ThirdParty/Ert/libecl/src/ecl_rsthead.c
@@ -88,7 +88,8 @@ ecl_rsthead_type * ecl_rsthead_alloc_from_kw( int report_step , const ecl_kw_typ
diff --git a/ThirdParty/Ert/lib/ecl/ecl_rsthead.c b/ThirdParty/Ert/lib/ecl/ecl_rsthead.c
index e8d9cef..2993b1e 100644
--- a/ThirdParty/Ert/lib/ecl/ecl_rsthead.c
+++ b/ThirdParty/Ert/lib/ecl/ecl_rsthead.c
@@ -88,7 +88,10 @@ ecl_rsthead_type * ecl_rsthead_alloc_from_kw( int report_step , const ecl_kw_typ
// The only derived quantity
rsthead->sim_time = rsthead_date( rsthead->day , rsthead->month , rsthead->year );
}
- rsthead->sim_days = ecl_kw_iget_double( doubhead_kw , DOUBHEAD_DAYS_INDEX );
+ if (doubhead_kw)
+ rsthead->sim_days = ecl_kw_iget_double( doubhead_kw , DOUBHEAD_DAYS_INDEX );
+
+ if (doubhead_kw)
+ rsthead->sim_days = ecl_kw_iget_double( doubhead_kw , DOUBHEAD_DAYS_INDEX );
+
if (logihead_kw)
rsthead->dualp = ecl_kw_iget_bool( logihead_kw , LOGIHEAD_DUALP_INDEX);
@@ -109,12 +110,15 @@ ecl_rsthead_type * ecl_rsthead_alloc_from_kw( int report_step , const ecl_kw_typ
@@ -109,12 +112,15 @@ ecl_rsthead_type * ecl_rsthead_alloc_from_kw( int report_step , const ecl_kw_typ
ecl_rsthead_type * ecl_rsthead_alloc( const ecl_file_view_type * rst_view, int report_step) {
const ecl_kw_type * intehead_kw = ecl_file_view_iget_named_kw( rst_view , INTEHEAD_KW , 0);
@ -32,12 +34,12 @@ index 52ad954..e382cc1 100644
if (ecl_file_view_has_kw(rst_view, LOGIHEAD_KW))
logihead_kw = ecl_file_view_iget_named_kw( rst_view , LOGIHEAD_KW , 0);
+ if (ecl_file_view_has_kw(rst_view, DOUBHEAD_KW))
+ doubhead_kw = ecl_file_view_iget_named_kw(rst_view, DOUBHEAD_KW, 0);
+ if (ecl_file_view_has_kw(rst_view, DOUBHEAD_KW))
+ doubhead_kw = ecl_file_view_iget_named_kw(rst_view, DOUBHEAD_KW, 0);
+
if (ecl_file_view_has_kw( rst_view , SEQNUM_KW)) {
const ecl_kw_type * seqnum_kw = ecl_file_view_iget_named_kw( rst_view , SEQNUM_KW , 0);
report_step = ecl_kw_iget_int( seqnum_kw , 0);
--
2.10.2.windows.1