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

#1396 Add patch for synthetic ODB files

Browse Source
This commit is contained in:
Magne Sjaastad
2017-04-25 13:28:51 +02:00
parent 63cd817b85
commit 8ec0d2d685
2 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
patches/fix-synthetic-odb-cases.patch Normal file
View File

@@ -0,0 +1,43 @@
From 8d2557fe8dd00ac30f524197c8a50db2e89bf720 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
---
ThirdParty/Ert/libecl/src/ecl_rsthead.c | 8 ++++++--
1 file changed, 6 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
// 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 (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
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);
- const ecl_kw_type * doubhead_kw = ecl_file_view_iget_named_kw( rst_view , DOUBHEAD_KW , 0);
+ const ecl_kw_type * doubhead_kw = NULL;
const ecl_kw_type * logihead_kw = NULL;
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 , 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

6
patches/readme.txt Normal file
View File

@@ -0,0 +1,6 @@
Command line:
git apply --reject --whitespace=fix patches/fix-synthetic-odb-cases.patch
Description:
Will fix reading of special Eclipse cases related to synthetic ODB test cases. Required for regression testing.