Skip to content

Commit 748f061

Browse files
author
Magne Sjaastad
committed
Updated ERT to SVN revision 4077. Use new folder structure for ThirdParty/Ert, one folder for libs and one folder for includes. Minor application changes to be compatible with API changes in ERT.
1 parent 3f96c61 commit 748f061

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1125
-1147
lines changed

‎ApplicationCode/CMakeLists.txt

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,13 @@ include_directories(
3232
# variable you can point to a different ERT distribution.
3333

3434
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
35-
set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert" CACHE PATH "Root path for ERT distribution to link with")
35+
set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert")
3636
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
37-
set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows" CACHE PATH "Root path for ERT distribution to link with")
37+
if (${CMAKE_SIZEOF_VOID_P} MATCHES "8" )
38+
set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows-x64")
39+
else()
40+
set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows")
41+
endif()
3842
endif()
3943

4044

@@ -67,6 +71,7 @@ mark_as_advanced( ERT_UTIL_PREFIX ERT_ECL_PREFIX ERT_WELL_PREFIX ERT_GEO_PREFIX
6771

6872
# Setting up include directories for ERT
6973
set( ERT_INCLUDE_LIST
74+
${ERT_ROOT_PATH}/include
7075
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/include
7176
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/include
7277
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/include
@@ -75,16 +80,24 @@ set( ERT_INCLUDE_LIST
7580
# Link to these ERT libraries
7681
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
7782
set( ERT_LIBRARY_LIST
78-
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.a
79-
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.a
80-
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.a
81-
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.a )
83+
${ERT_ROOT_PATH}/lib/libecl.a
84+
${ERT_ROOT_PATH}/lib/libert_util.a
85+
${ERT_ROOT_PATH}/lib/libgeometry.a
86+
${ERT_ROOT_PATH}/lib/libwell.a )
8287
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
88+
if (${CMAKE_SIZEOF_VOID_P} MATCHES "8" )
89+
set( ERT_LIBRARY_LIST
90+
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/ecl.lib
91+
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/ert_util.lib
92+
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/geometry.lib
93+
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/well.lib )
94+
else()
8395
set( ERT_LIBRARY_LIST
8496
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.lib
8597
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.lib
8698
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.lib
8799
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.lib )
100+
endif()
88101
endif()
89102

90103
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")

‎ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,32 +27,46 @@ include_directories(
2727
#-----------------------------------------------------------------
2828
# Ert configuration
2929
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
30-
set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert" CACHE PATH "Root path for ERT distribution to link with")
30+
set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert")
3131
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
32-
set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert-windows" CACHE PATH "Root path for ERT distribution to link with")
32+
if (${CMAKE_SIZEOF_VOID_P} MATCHES "8" )
33+
set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert-windows-x64")
34+
else()
35+
set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert-windows")
36+
endif()
3337
endif()
38+
3439
set( ERT_ECL_PREFIX "ecl" CACHE STRING "Prefix path to use for ecl code in ert")
3540
set( ERT_UTIL_PREFIX "util" CACHE STRING "Prefix path to use for util code in ert")
3641
set( ERT_WELL_PREFIX "well" CACHE STRING "Prefix path to use for well code in ert")
3742

3843
set( ERT_INCLUDE_LIST
44+
${ERT_ROOT_PATH}/include
3945
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/include
4046
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/include
4147
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/include )
4248

4349
# Link to these ERT libraries
4450
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
4551
set( ERT_LIBRARY_LIST
46-
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.a
47-
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.a
48-
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.a
49-
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.a )
52+
${ERT_ROOT_PATH}/lib/libecl.a
53+
${ERT_ROOT_PATH}/lib/libert_util.a
54+
${ERT_ROOT_PATH}/lib/libgeometry.a
55+
${ERT_ROOT_PATH}/lib/libwell.a )
5056
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
57+
if (${CMAKE_SIZEOF_VOID_P} MATCHES "8" )
58+
set( ERT_LIBRARY_LIST
59+
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/ecl.lib
60+
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/ert_util.lib
61+
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/geometry.lib
62+
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/well.lib )
63+
else()
5164
set( ERT_LIBRARY_LIST
5265
${ERT_ROOT_PATH}/${ERT_ECL_PREFIX}/lib/libecl.lib
5366
${ERT_ROOT_PATH}/${ERT_UTIL_PREFIX}/lib/libutil.lib
5467
${ERT_ROOT_PATH}/${ERT_GEO_PREFIX}/lib/libgeometry.lib
5568
${ERT_ROOT_PATH}/${ERT_WELL_PREFIX}/lib/libwell.lib )
69+
endif()
5670
endif()
5771

5872
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")

‎ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,7 @@ bool RifEclipseOutputFileTools::timeStepsText(QStringList* timeSteps)
186186
if (kwINTEHEAD)
187187
{
188188
// Get date info
189-
time_t stepTime = util_make_date(ecl_kw_iget_int(kwINTEHEAD, INTEHEAD_DAY_INDEX),
190-
ecl_kw_iget_int(kwINTEHEAD, INTEHEAD_MONTH_INDEX),
191-
ecl_kw_iget_int(kwINTEHEAD, INTEHEAD_YEAR_INDEX));
189+
time_t stepTime = ecl_intehead_date(kwINTEHEAD);
192190

193191
// Hack!!! We seem to get 01/01/1970 (time -1) for sub grids!
194192
if (stepTime < 0) continue;
@@ -235,9 +233,7 @@ bool RifEclipseOutputFileTools::timeSteps(QList<QDateTime>* timeSteps)
235233
if (kwINTEHEAD)
236234
{
237235
// Get date info
238-
time_t stepTime = util_make_date(ecl_kw_iget_int(kwINTEHEAD, INTEHEAD_DAY_INDEX),
239-
ecl_kw_iget_int(kwINTEHEAD, INTEHEAD_MONTH_INDEX),
240-
ecl_kw_iget_int(kwINTEHEAD, INTEHEAD_YEAR_INDEX));
236+
time_t stepTime = ecl_intehead_date(kwINTEHEAD);
241237

242238
// Hack!!! We seem to get 01/01/1970 (time -1) for sub grids!
243239
if (stepTime < 0) continue;

‎ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -582,10 +582,13 @@ void RifReaderEclipseOutput::readWellCells(RigReservoir* reservoir)
582582
if (ert_wellhead)
583583
{
584584
wellResFrame.m_wellHead.m_gridIndex = gridNr;
585-
int gridK = CVF_MAX(0, ert_wellhead->k); // Why this ?
586-
wellResFrame.m_wellHead.m_gridCellIndex = grids[gridNr]->cellIndexFromIJK(ert_wellhead->i, ert_wellhead->j, gridK);
585+
int gridK = CVF_MAX(0, well_conn_get_k(ert_wellhead)); // Why this ?
586+
int gridI = well_conn_get_i( ert_wellhead );
587+
int gridJ = well_conn_get_j( ert_wellhead );
588+
wellResFrame.m_wellHead.m_gridCellIndex = grids[gridNr]->cellIndexFromIJK(gridI, gridJ, gridK);
587589
}
588590

591+
589592
int branchCount = well_state_iget_lgr_num_branches(ert_well_state, gridNr);
590593
if (branchCount > 0)
591594
{
@@ -611,10 +614,20 @@ void RifReaderEclipseOutput::readWellCells(RigReservoir* reservoir)
611614

612615
RigWellResultCell& data = wellSegment.m_wellCells[existingConnCount + connIdx];
613616
data.m_gridIndex = gridNr;
614-
data.m_gridCellIndex = grids[gridNr]->cellIndexFromIJK(ert_connection->i, ert_connection->j, ert_connection->k);
615-
data.m_isOpen = ert_connection->open;
616-
data.m_branchId = ert_connection->branch;
617-
data.m_segmentId = ert_connection->segment;
617+
{
618+
int connI = well_conn_get_i( ert_connection );
619+
int connJ = well_conn_get_j( ert_connection );
620+
int connK = well_conn_get_k( ert_connection );
621+
bool open = well_conn_open( ert_connection );
622+
int branch = well_conn_get_branch( ert_connection );
623+
int segment = well_conn_get_segment( ert_connection );
624+
625+
data.m_gridCellIndex = grids[gridNr]->cellIndexFromIJK(connI , connJ , connK);
626+
627+
data.m_isOpen = open;
628+
data.m_branchId = branch;
629+
data.m_segmentId = segment;
630+
}
618631
}
619632
}
620633
}

‎ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ add_executable( ${ProjectName}
5656

5757
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
5858
set ( LINUX_LINK_LIBRARIES
59-
${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/ecl/lib/libecl.a
60-
${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/util/lib/libutil.a
61-
${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/well/lib/libwell.a
59+
${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/lib/libecl.a
60+
${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/lib/libert_util.a
61+
${CMAKE_CURRENT_SOURCE_DIR}/../../../ThirdParty/Ert/lib/libwell.a
6262
lapack
6363
pthread
6464
)

‎ThirdParty/Ert/ecl/include/ecl_region.h

Lines changed: 0 additions & 185 deletions
This file was deleted.

0 commit comments

Comments
 (0)