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

Build system fixes to handle new Ert version

Browse Source 
p4#: 20319
This commit is contained in:
Jacob Støren
2013-01-31 15:39:40 +01:00
parent 0ac6dc32a5
commit 85238529ef
588 changed files with 4324 additions and 6276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

273
ThirdParty/Ert/README vendored Normal file
View File

@@ -0,0 +1,273 @@
_________________________________
/ \
| ______ ______ _______ |
| | ____| | __ \ |__ __| |
| | |__ | |__) | | | |
| | __| | _ / | | |
| | |____ | | \ \ | | |
| |______| |_| \_\ |_| |
| |
| Ensemble based Reservoir Tool |
\_________________________________/
------------------------------------------------------------------------
1. ERT
2. ECLIPSE utilities.
3. Building ERT
3.1 CMake settings you might want to adjust
4. The code:
4.1 The different libraries
4.2 The general structure
4.3 Python wrappers
5. Tests
------------------------------------------------------------------------
1. ERT
ERT - Ensemble based Reservoir Tool is a tool for managing en ensemble
of reservoir models. The initial motivation for creating ERT was a as
tool to do assisted history matching with Ensemble Kalman Filter
(EnKF). Very briefly use of EnKF can be summarized as:
1. Sample initial reservoir parameters from a (Gaussian) prior
distribution.
2. Simulate the ensemble of of reservoir forward in time through
part of the historical period.
3. Load the results, compare with observed data, update the
parameters and the state of reservoir and restart the
simulations.
This recipe is quite complex technically, and in particular involves
the ability to read and write input and output files from the
reservoir simulator (i.e. ECLIPSE in the case of ERT), run simulations
with arbitrary external programs, plotting data and so on. This
implies that a quite significant technical machinery must be in place
before the EnKF algorithm as such can be utilizied. This in particular
applies to real industry reservoir models, where typically
imperfections of all kinds flourish.
The initial motivation for creating ERT was to be able to use the EnKF
algorithm for history matching. Currently ERT is more used with the
Ensemble Smoother and also purely as a worklfow manager; herding a
large collection of reservoir models through the required simulations
steps.
2. ECLIPSE Utilities
ERT has a quite large amount of code devoted to reading and writing
the ECLIPSE output files (grid/rft/restart/init/summary). In addition
there is also reasonable support for reading and writing the grdecl
input files, but there is no general .DATA file parser. The ability to
read and write ECLIPSE output files is valuable in many reservoir
applications, and it is possible to only build and use the libecl
(with support libraries) library for working with ECLIPSE files. In
fact the default build setup is to only build the ECLIPSE related
library and utilities. This part of the ERT distribution can also be
built on Windows with Visual Studio (albeit with maaaany warnings) and
with MinGW.
3. Building ERT
CMake is the build system for ERT. The top level CMakeLists.txt file
is located in the devel/ directory, and this CMakeLists.txt file
includes individual CMakeLists.txt files for the different libraries.
Building with CMake is performed like this:
1. Create a build directory, this can in principle be anywhere in
the filesystem. At the same level as the devel/ directory is a
practical choice.
2. Go to the build directory and invoke the command:
ccmake <path/to/directory/containing/CMakeLists.txt>
Go through several 'configure' steps with CMake and generate
native build files.
3. Exit ccmake and invoke the native build system, i.e. ordinaray
make on Linux.
4. Subsequent builds can be performed using just the native make
command, as in step 3.
3.1 CMake settings you might want to adjust
The main setting you should adjust is BUILD_ERT which is default to
OFF, i.e. by default only the ECLIPSE related utilities will be
built. The build system has numerous configurations checks; the
ECLIPSE utilities should build on Windows, but to build all of ERT you
will need a Linux (Posix) system.
4. The code
The code is mainly written as a collection of libraries written in C.
4.1 The different libraries
The different libraries are:
libert_util: This library is a collection of utilities of various
sorts; if C++ had been chosen as implementation language most of
these utilities would probably have been in libstdc++.
libgeometry: This is a very small geometry library; the main code
is a small implementantion of an alorithm to determine whether a
point is inside a polyhedron. The ECLIPSE library has some
geometry related code which should be moved here.
libwell: This library will load well information from an ECLIPSE
restart file. This is mainly for the purpose of visualization
of the existing wells, and can not be used to update or model
the well configuration.
libecl: This library will read and (partly) write the various
binary ECLIPSE files, including GRID/EGRID, summary, INIT,
restart and RFT files. There is also support for reading an
writing grdecl formatted files, but there is no support for
general parsing of the ECLIPSE input format.
----------------------------------------------------------------------------
librms: This is a library for reading and writing RMS Roff
files. It turns out that ECLIPSE file formats is the most common
external file format for RMS and the ROFF support is not
essential.
libconfig: This library implements a parser for the ERT config file
format, this format is used in the main ERT configuration file,
and also in several small special topic configuration files used
by ERT. The config format parsed by this library was inspired by
the ECLIPSE format, in retrospect that was a mistake - it should
have been based on a standard format like xml.
To confuse things evan further the libconfig library implements
/two/ config formats, the 'second format' is implemented in the
file conf.c, and only used as format for the observations in
ERT.
libplot: A *very* simple librarry for creating plots, just exactly
satisfies the needs of ERT.
libanalysis: The EnKF algorithm is implemented in this library.
libjob_queue: This library implements a system to manage and run
simulations in the form of external programs. The library has a
queue manager, and a system with drivers which communicate with
the underlying system. Currently the library has a LSF driver to
work with LSF, a LOCAL driver which starts simulations on the
current workstation and a RSH driver which submits to a
'cluster' of workstation with ssh.
libenkf: This is the main functionality which is ERT specific; this
library is to large.
4.2 General structure
The code is written in C, but conventions give a 'scent of object
oriented'. Common to a very large part of the code is the following:
- Every file 'xxx' implements a datatype 'xxx_type' - the naming
convention is quite strong.
- All the struct defintions are in the source files, i.e. external
scope must access the fields of a structure through accessor
functions.
- All functions which operate on a type 'xxx_type' take a pointer
to xxx_type as the first argument, the structure closely resemble
the 'self' argument used when implementing Python classes.
- Memory management is manual; however there are some conventions:
* Functions allocating storage have _alloc_ as part of the name.
* For all functions xxx_alloc() allocating storage there should
be a matching xxx_free() to discard the objects.
* Containers can optionally destroy their content is the content
is installed with a destructor.
- In libert_util/src/type_macros.h there is a macro based
'type-system' which is used to runtime check casts of (void *).
4.3 Python wrappers
Some of the code, in particular the ECLIPSE related functionality, has
been wrapped in Python. Using these wrappers it is quite easy work
with ECLIPSE files. The python wrappers are quite well documented both
in the devel/python/docs directory and in the Python classes
themselves.
5. Testing
The ERT is very weak on tests, but that is being improved. There are two different
categories of tests:
CMake tests: CMake has a system for adding and running tests, and
these can be invoked with the command 'make test' after the
normal build process has completed, or alternatively the
'ctest' test-runner which allows more options on which tests to run.
Python test: The python directory devel/python/test has several
python unittests. These tests test both the Python wrappers
and the underlying C code and serve as quite good integration
tests. Read the content of devel/python/test/README carfully
before you invoke the Python tests, you might have to update
the local_(csh|bash) scripts to reflect your build output
path.
5.1 Test data & labels
Unfortunately a large fraction of the test data is based on Statoil
internal data, and is not available on GitHub. All the tests which are
based on Statoil internal test data are labeled with the label
'Statoil', and using the 'ctest' program you can use the -L and -LE
options to include/exclude tests based on their label.
ctest -L Statoil # Run all the tests with the 'Statoil' label
ctest -LE Statoil # Run all the tests without the 'Statoil' label
The argument to the -L and -LE options are regular expressions,
i.e. in the case above all tests which have a label matching the
regexp 'Statoil' will be run. A test can only have one single label,
but due to to the regexp mechanism we can create a 'list-like'
structure by chaining labels together; by convention the label
elements are joined with ':'. In the example
set_property( TEST test_name PROPERTY LABELS Statoil:Python )
the labels 'Statoil' and 'Python' are applied to the test. The labels
in use are:
Statoil: This indicates that the test makes use of Statoil internal
test data, and will fail if the Statoil test data have not
been made available according to the description in
devel/test-data/README.txt
Python: This indicates that the test is a Python unittest, and the
Python interpreter will be the test runner for the test.
5.2 Test names
The tests in the cmake build system follow the naming convention of
the library which functionality they are testing - i.e. all tests in
the libecl library have a name starting with 'ecl' and all tests in
the config library start with 'config'. The options -R and -E to ctest
can be used to include and exclude tests based on their name
ctest -R ecl # Run all tests mathing the regexp 'ecl'
ctest -E ecl # Run all tests NOT matching the regexp 'ecl'
The python tests are not yet integrated into this convention....

42
ThirdParty/Ert/devel/CMake/Modules/UseMultiArch.cmake vendored Normal file
View File

@@ -0,0 +1,42 @@
# - Multiarch support in object code library directories
#
# This module sets the following variable
# CMAKE_INSTALL_LIBDIR to lib, lib64 or lib/x86_64-linux-gnu
# depending on the platform; use this path
# for platform-specific binaries.
#
# CMAKE_INSTALL_LIBDIR_NOARCH to lib or lib64 depending on the platform;
# use this path for architecture-independent
# files.
#
# Note that it will override the results of GNUInstallDirs if included after
# that module.
# Fedora uses lib64/ for 64-bit systems, Debian uses lib/x86_64-linux-gnu;
# Fedora put module files in lib64/ too, but Debian uses lib/ for that
if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
# Debian or Ubuntu?
if (EXISTS "/etc/debian_version")
set (_libdir_def "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
set (_libdir_noarch "lib")
else (EXISTS "/etc/debian_version")
# 64-bit system?
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set (_libdir_noarch "lib64")
else (CMAKE_SIZEOF_VOID_P EQUAL 8)
set (_libdir_noarch "lib")
endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
set (_libdir_def "${_libdir_noarch}")
endif (EXISTS "/etc/debian_version")
else ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
set (_libdir_def "lib")
set (_libdir_noarch "lib")
endif ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
# let the user override if somewhere else is desirable
set (CMAKE_INSTALL_LIBDIR "${_libdir_def}" CACHE PATH "Object code libraries")
set (CMAKE_INSTALL_LIBDIR_NOARCH "${_libdir_noarch}" CACHE PATH "Architecture-independent library files")
mark_as_advanced (
CMAKE_INSTALL_LIBDIR
CMAKE_INSTALL_LIBDIR_NOARCH
)

109
ThirdParty/Ert/devel/CMake/ert_check.cmake vendored Normal file
View File

@@ -0,0 +1,109 @@
check_function_exists( regexec HAVE_REGEXP )
if (HAVE_REGEXP)
add_definitions( -DHAVE_REGEXP )
endif()
check_function_exists( realpath HAVE_REALPATH )
if (HAVE_REALPATH)
add_definitions( -DHAVE_REALPATH )
endif()
check_function_exists( fork HAVE_FORK )
if (HAVE_FORK)
add_definitions( -DHAVE_FORK )
endif()
check_function_exists( round HAVE_ROUND )
if (HAVE_ROUND)
add_definitions( -DHAVE_ROUND )
endif()
check_function_exists( ftruncate HAVE_FTRUNCATE )
if (HAVE_FTRUNCATE)
add_definitions( -DHAVE_FTRUNCATE )
endif()
check_function_exists( readlinkat HAVE_READLINKAT )
if (HAVE_READLINKAT)
add_definitions( -DHAVE_READLINKAT )
endif()
check_function_exists( symlink HAVE_SYMLINK )
if (HAVE_SYMLINK)
add_definitions( -DHAVE_SYMLINK )
endif()
check_function_exists( getuid HAVE_GETUID )
if (HAVE_GETUID)
add_definitions( -DHAVE_GETUID )
endif()
check_function_exists( localtime_r HAVE_LOCALTIME_R )
if (HAVE_LOCALTIME_R)
add_definitions( -DHAVE_LOCALTIME_R )
endif()
check_function_exists( lockf HAVE_LOCKF )
if (HAVE_LOCKF)
add_definitions( -DHAVE_LOCKF )
endif()
check_function_exists( glob HAVE_GLOB )
if (HAVE_GLOB)
add_definitions( -DHAVE_GLOB )
endif()
check_function_exists( fnmatch HAVE_FNMATCH )
if (HAVE_FNMATCH)
add_definitions( -DHAVE_FNMATCH )
endif()
check_function_exists( fsync HAVE_FSYNC )
if (HAVE_FSYNC)
add_definitions( -DHAVE_FSYNC )
endif()
check_function_exists( setenv HAVE_SETENV )
if (HAVE_SETENV)
add_definitions( -DPOSIX_SETENV )
endif()
check_function_exists( opendir HAVE_OPENDIR )
if (HAVE_OPENDIR)
add_definitions( -DHAVE_OPENDIR )
endif()
check_function_exists( usleep HAVE_USLEEP )
if (HAVE_OPENDIR)
add_definitions( -DHAVE_USLEEP )
endif()
try_compile( HAVE_ISFINITE ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_isfinite.c )
if (HAVE_ISFINITE)
add_definitions( -DHAVE_ISFINITE )
endif()
try_compile( MKDIR_POSIX ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_mkdir.c )
if (MKDIR_POSIX)
add_definitions( -DMKDIR_POSIX )
endif()
try_compile( HAVE_PID_T ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_pid_t.c )
if (HAVE_PID_T)
add_definitions( -DHAVE_PID_T )
endif()
try_compile( HAVE_VA_COPY ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_va_copy.c )
if (HAVE_VA_COPY)
add_definitions( -DHAVE_VA_COPY )
endif()
try_compile( ISREG_POSIX ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_isreg.c )
if (ISREG_POSIX)
add_definitions( -DHAVE_ISREG )
endif()

68
ThirdParty/Ert/devel/CMake/ert_find.cmake vendored Normal file
View File

@@ -0,0 +1,68 @@
#-----------------------------------------------------------------
find_library( ZLIB_LIBRARY NAMES z )
find_path( ZLIB_HEADER zlib.h /usr/include )
if (ZLIB_LIBRARY AND ZLIB_HEADER)
option(WITH_ZLIB "Include support for zlib functions compress()/uncompress()" ON)
if (WITH_ZLIB)
add_definitions( -DWITH_ZLIB )
endif()
else()
set( WITH_ZLIB FALSE )
message("ZLib not found - zlib support will not be included." )
endif()
#-----------------------------------------------------------------
find_library( PTHREAD_LIBRARY NAMES pthread )
if (PTHREAD_LIBRARY)
option( WITH_PTHREAD "Include support for pthreads" ON )
if (WITH_PTHREAD)
add_definitions( -DWITH_PTHREAD )
endif()
else()
set( WITH_PTHREAD FALSE )
message("pthread library not found - pthread support will not be included")
endif()
#-----------------------------------------------------------------
find_library( LAPACK_LIBRARY NAMES lapack)
if (LAPACK_LIBRARY)
set(CMAKE_REQUIRED_LIBS LAPACK_LIBRARY)
try_compile( BLAS0 ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_blas.c )
if (BLAS0)
set(NEED_BLAS OFF)
else()
set(NEED_BLAS ON)
find_library( BLAS_LIBRARY NAMES blas)
endif()
option(WITH_LAPACK "Build LAPACK enabled code" ON)
if (WITH_LAPACK)
add_definitions( -DWITH_LAPACK )
endif()
else()
set( WITH_LAPACK OFF)
message("LAPACK library not found - LAPACK support will not be included")
endif()
#-----------------------------------------------------------------
find_program(LATEX_PATH NAMES pdflatex)
if (LATEX_PATH)
option( WITH_LATEX "Build small class for compiling LaTeX files" ON)
if (WITH_LATEX)
set( WITH_LATEX ON)
add_definitions( -DWITH_LATEX )
endif()
else()
set( WITH_LATEX OFF )
endif()
#-----------------------------------------------------------------
find_path( EXECINFO_HEADER execinfo.h /usr/include )
if (EXECINFO_HEADER)
add_definitions( -DHAVE_EXECINFO )
endif()
#-----------------------------------------------------------------
find_path( GETOPT_HEADER getopt.h /usr/include )
if (GETOPT_HEADER)
add_definitions( -DHAVE_GETOPT )
endif()
#-----------------------------------------------------------------
if (ERT_WINDOWS)
find_library( SHLWAPI_LIBRARY NAMES Shlwapi )
endif()

20
ThirdParty/Ert/devel/CMake/python.cmake vendored Normal file
View File

@@ -0,0 +1,20 @@
macro(add_python_target tgt PYTHON_INSTALL_PATH ARGN)
SET(OUT_FILES "")
foreach(file ${ARGN})
set(OUT ${CMAKE_CURRENT_BINARY_DIR}/${file}.pyc)
list(APPEND OUT_FILES ${OUT})
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file}.pyc
COMMAND python -m py_compile
ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.py
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND mv
ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.pyc ${CMAKE_CURRENT_BINARY_DIR}
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}.pyc DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_PATH})
endforeach(file)
list(REMOVE_DUPLICATES OUT_FILES)
ADD_CUSTOM_TARGET(
${tgt} ALL
DEPENDS ${OUT_FILES})
endmacro()

289
ThirdParty/Ert/devel/CMakeLists.txt vendored
View File

@@ -1,9 +1,19 @@
cmake_minimum_required( VERSION 2.6 )
project( ERT C CXX )
set( ERT_VERSION_MAJOR 1 )
set( ERT_VERSION_MINOR 0 )
option( BUILD_ERT "Build the full ERT application - Linux only" OFF)
option( BUILD_ENS_PLOT "Build small Eclipse plotting program - no" OFF)
option( BUILD_TESTS "Should the tests be built" OFF)
option( BUILD_APPLICATONS "Should we build small utility applications" OFF)
option( BUILD_ECL_SUMMARY "Build the commandline application ecl_summary" OFF)
option( BUILD_PYTHON "Run py_compile on the python wrappers" OFF)
include( CheckFunctionExists )
ENABLE_TESTING()
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(ERT_LINUX TRUE )
add_definitions( -DERT_LINUX )
@@ -12,16 +22,22 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
add_definitions( -DERT_WINDOWS )
endif()
set( CMAKE_C_FLAGS "-g -O2 -Wall -std=gnu99 -fno-leading-underscore" )
set( CMAKE_CXX_FLAGS "-g -O2 -Wall" )
include(cmake/ert_check.cmake)
include(cmake/ert_find.cmake)
include(cmake/Modules/UseMultiArch.cmake)
include(cmake/python.cmake)
set( INSTALL_GROUP "" CACHE STRING "Group to install as - blank to install as current group")
set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin)
if (MSVC)
set(SHARED_LIB OFF)
else()
option( SHARED_LIB "Build shared libraries" OFF)
option( SHARED_LIB "Build shared libraries" ON)
endif()
if (SHARED_LIB)
@@ -30,190 +46,12 @@ else()
set( LIBRARY_TYPE STATIC )
endif()
set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin)
#-----------------------------------------------------------------
find_library( ZLIB_LIBRARY NAMES z )
find_path( ZLIB_HEADER zlib.h /usr/include )
if (ZLIB_LIBRARY AND ZLIB_HEADER)
option(WITH_ZLIB "Include support for zlib functions compress()/uncompress()" ON)
if (WITH_ZLIB)
add_definitions( -DWITH_ZLIB )
endif()
else()
set( WITH_ZLIB FALSE )
message("ZLib not found - zlib support will not be included." )
endif()
#-----------------------------------------------------------------
find_library( PTHREAD_LIBRARY NAMES pthread )
if (PTHREAD_LIBRARY)
option( WITH_PTHREAD "Include support for pthreads" ON )
if (WITH_PTHREAD)
add_definitions( -DWITH_PTHREAD )
endif()
else()
set( WITH_PTHREAD FALSE )
message("pthread library not found - pthread support will not be included")
endif()
#-----------------------------------------------------------------
find_library( LAPACK_LIBRARY NAMES lapack)
if (LAPACK_LIBRARY)
set(CMAKE_REQUIRED_LIBS LAPACK_LIBRARY)
try_compile( BLAS0 ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_blas.c )
if (BLAS0)
set(NEED_BLAS OFF)
else()
set(NEED_BLAS ON)
find_library( BLAS_LIBRARY NAMES blas)
endif()
option(WITH_LAPACK "Build LAPACK enabled code" ON)
if (WITH_LAPACK)
add_definitions( -DWITH_LAPACK )
endif()
else()
set( WITH_LAPACK OFF)
message("LAPACK library not found - LAPACK support will not be included")
endif()
#-----------------------------------------------------------------
find_program(LATEX_PATH NAMES pdflatex)
if (LATEX_PATH)
option( WITH_LATEX "Build small class for compiling LaTeX files" ON)
if (WITH_LATEX)
set( WITH_LATEX ON)
add_definitions( -DWITH_LATEX )
endif()
else()
set( WITH_LATEX OFF )
endif()
#-----------------------------------------------------------------
find_path( EXECINFO_HEADER execinfo.h /usr/include )
if (EXECINFO_HEADER)
add_definitions( -DHAVE_EXECINFO )
endif()
#-----------------------------------------------------------------
find_path( GETOPT_HEADER getopt.h /usr/include )
if (GETOPT_HEADER)
add_definitions( -DHAVE_GETOPT )
endif()
#-----------------------------------------------------------------
if (ERT_WINDOWS)
find_library( SHLWAPI_LIBRARY NAMES Shlwapi )
endif()
if (MSVC)
add_definitions( -D__func__="\\"????\\"")
endif()
check_function_exists( regexec HAVE_REGEXP )
if (HAVE_REGEXP)
add_definitions( -DHAVE_REGEXP )
endif()
check_function_exists( realpath HAVE_REALPATH )
if (HAVE_REALPATH)
add_definitions( -DHAVE_REALPATH )
endif()
check_function_exists( fork HAVE_FORK )
if (HAVE_FORK)
add_definitions( -DHAVE_FORK )
endif()
check_function_exists( round HAVE_ROUND )
if (HAVE_ROUND)
add_definitions( -DHAVE_ROUND )
endif()
check_function_exists( ftruncate HAVE_FTRUNCATE )
if (HAVE_FTRUNCATE)
add_definitions( -DHAVE_FTRUNCATE )
endif()
check_function_exists( readlinkat HAVE_READLINKAT )
if (HAVE_READLINKAT)
add_definitions( -DHAVE_READLINKAT )
endif()
check_function_exists( symlink HAVE_SYMLINK )
if (HAVE_SYMLINK)
add_definitions( -DHAVE_SYMLINK )
endif()
check_function_exists( getuid HAVE_GETUID )
if (HAVE_GETUID)
add_definitions( -DHAVE_GETUID )
endif()
check_function_exists( localtime_r HAVE_LOCALTIME_R )
if (HAVE_LOCALTIME_R)
add_definitions( -DHAVE_LOCALTIME_R )
endif()
check_function_exists( lockf HAVE_LOCKF )
if (HAVE_LOCKF)
add_definitions( -DHAVE_LOCKF )
endif()
check_function_exists( glob HAVE_GLOB )
if (HAVE_GLOB)
add_definitions( -DHAVE_GLOB )
endif()
check_function_exists( fnmatch HAVE_FNMATCH )
if (HAVE_FNMATCH)
add_definitions( -DHAVE_FNMATCH )
endif()
check_function_exists( fsync HAVE_FSYNC )
if (HAVE_FSYNC)
add_definitions( -DHAVE_FSYNC )
endif()
check_function_exists( setenv HAVE_SETENV )
if (HAVE_SETENV)
add_definitions( -DPOSIX_SETENV )
endif()
check_function_exists( opendir HAVE_OPENDIR )
if (HAVE_OPENDIR)
add_definitions( -DHAVE_OPENDIR )
endif()
check_function_exists( usleep HAVE_USLEEP )
if (HAVE_OPENDIR)
add_definitions( -DHAVE_USLEEP )
endif()
try_compile( HAVE_ISFINITE ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_isfinite.c )
if (HAVE_ISFINITE)
add_definitions( -DHAVE_ISFINITE )
endif()
try_compile( MKDIR_POSIX ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_mkdir.c )
if (MKDIR_POSIX)
add_definitions( -DMKDIR_POSIX )
endif()
try_compile( HAVE_PID_T ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_pid_t.c )
if (HAVE_PID_T)
add_definitions( -DHAVE_PID_T )
endif()
try_compile( HAVE_VA_COPY ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_va_copy.c )
if (HAVE_VA_COPY)
add_definitions( -DHAVE_VA_COPY )
endif()
try_compile( ISREG_POSIX ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_isreg.c )
if (ISREG_POSIX)
add_definitions( -DHAVE_ISREG )
endif()
if (ERT_LINUX)
set( NEED_LIBM TRUE )
@@ -225,32 +63,36 @@ else()
endif()
configure_file( ${PROJECT_SOURCE_DIR}/CMake/config/ert_build_config.h.in
configure_file( ${PROJECT_SOURCE_DIR}/cmake/config/ert_build_config.h.in
${PROJECT_BINARY_DIR}/ert_build_config.h )
set( libert_util_build_path ${PROJECT_BINARY_DIR}/libert_util/src )
set( libert_util_src_path ${PROJECT_SOURCE_DIR}/libert_util/src )
set( libecl_src_path ${PROJECT_SOURCE_DIR}/libecl/src )
set( libgeometry_src_path ${PROJECT_SOURCE_DIR}/libgeometry/src )
set( libwell_src_path ${PROJECT_SOURCE_DIR}/libwell/src )
set( libplot_src_path ${PROJECT_SOURCE_DIR}/libplot/src )
include_directories( ${libert_util_build_path})
include_directories( ${libert_util_src_path} )
include_directories( ${PROJECT_SOURCE_DIR}/libert_util/include )
include_directories( ${PROJECT_BINARY_DIR}/libert_util/include )
if (MSVC)
include_directories( ${PROJECT_BINARY_DIR}/libert_util/include/ert/util )
endif()
add_subdirectory( libert_util )
add_subdirectory( libgeometry )
add_subdirectory( libecl )
add_subdirectory( libwell )
option( BUILD_ERT "Build the full ERT application - Linux only" OFF)
option( BUILD_ENS_PLOT "Build small Eclipse plotting program - no" OFF)
include_directories( ${PROJECT_SOURCE_DIR}/libgeometry/include )
add_subdirectory( libgeometry )
if (BUILD_ERT OR BUILD_ENS_PLOT)
include_directories( ${PROJECT_SOURCE_DIR}/libplot/include )
add_subdirectory( libplot )
endif()
include_directories( ${PROJECT_SOURCE_DIR}/libecl/include )
add_subdirectory( libecl )
include_directories( ${PROJECT_SOURCE_DIR}/libecl_well/include )
add_subdirectory( libecl_well )
#-----------------------------------------------------------------
if (BUILD_ERT)
#-----------------------------------------------------------------
try_compile( DLOPEN ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_dlopen.c )
try_compile( DLOPEN ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_dlopen.c )
if (DLOPEN)
set(NEED_LIBDL OFF)
else()
@@ -258,37 +100,28 @@ if (BUILD_ERT)
endif()
option(USE_LSF "Include support for LSF" ON)
set( libconfig_src_path ${CMAKE_SOURCE_DIR}/libconfig/src )
set( libsched_src_path ${CMAKE_SOURCE_DIR}/libsched/src )
set( librms_src_path ${CMAKE_SOURCE_DIR}/librms/src )
set( libanalysis_src_path ${CMAKE_SOURCE_DIR}/libanalysis/src )
set( libjob_queue_src_path ${CMAKE_SOURCE_DIR}/libjob_queue/src )
set( libenkf_src_path ${CMAKE_SOURCE_DIR}/libenkf/src )
include_directories( ${PROJECT_SOURCE_DIR}/libconfig/include )
add_subdirectory( libconfig )
add_subdirectory( libanalysis )
add_subdirectory( librms )
add_subdirectory( libsched )
add_subdirectory( libjob_queue )
add_subdirectory( libplot )
add_subdirectory( libenkf)
#add_dependencies( config_shared util_shared )
##add_dependencies( analysis_shared util_shared )
#add_dependencies( rms_shared geometry_shared util_shared )
#add_dependencies( sched_shared util_shared ecl_shared )
#add_dependencies( job_queue_shared config_shared util )
#add_dependencies( plot_shared util_shared )
#add_dependencies( enkf_shared plot_shared ecl_shared util_shared config_shared sched_shared rms_shared analysis job_queue_shared )
#add_dependencies( ert_shared enkf_shared plot_shared )
#
#add_dependencies( config_static util_static )
##add_dependencies( analysis_static util_static )
#add_dependencies( rms_static geometry_static util_static )
#add_dependencies( sched_static util_static ecl_static )
#add_dependencies( job_queue_static config_static util )
#add_dependencies( plot_static util_static )
#add_dependencies( enkf_static plot_static ecl_static util_static config_static sched_static rms_static analysis job_queue_static )
#add_dependencies( ert enkf_static plot_static )
include_directories( ${PROJECT_SOURCE_DIR}/libsched/include )
add_subdirectory( libsched )
include_directories( ${PROJECT_SOURCE_DIR}/librms/include )
add_subdirectory( librms )
include_directories( ${PROJECT_SOURCE_DIR}/libanalysis/include )
add_subdirectory( libanalysis )
include_directories( ${PROJECT_SOURCE_DIR}/libjob_queue/include )
add_subdirectory( libjob_queue )
include_directories( ${PROJECT_SOURCE_DIR}/libenkf/include )
add_subdirectory( libenkf )
endif()
if (BUILD_PYTHON)
add_subdirectory( python )
endif()

11
ThirdParty/Ert/devel/debian/README.Debian vendored
View File

@@ -1,6 +1,13 @@
libert for Debian
libert.ecl for Debian
-----------------
<possible notes regarding this package - if none, delete this file>
ERT - Ensemble based Reservoir Tool is a tool for managing en ensemble
of reservoir models. This package contains the ERT functionality for
working with ECLIPSE output files. The package contains functionality
for reading, and partly writing, ECLIPSE INIT/GRID/EGRID/RFT and
summary and restart files. There is also some functionality for
working with .grdecl formatted ECLIPSE input files.
-- Joakim Hove <joaho@statoil.com> Wed, 23 Jan 2013 13:41:00 +0100
-- Arne Morten Kvarving <arne.morten.kvarving@sintef.no> Wed, 16 Jan 2013 11:21:17 +0100

9
ThirdParty/Ert/devel/debian/README.source vendored
View File

@@ -1,9 +0,0 @@
libert for Debian
-----------------
<this file describes information about the source package, see Debian policy
manual section 4.14. You WILL either need to modify or delete this file>

2
ThirdParty/Ert/devel/debian/changelog vendored
View File

@@ -1,4 +1,4 @@
libert (0.1-1) unstable; urgency=low
libert.ecl (1.0-1) unstable; urgency=low
* Initial release

12
ThirdParty/Ert/devel/debian/control vendored
View File

@@ -1,22 +1,22 @@
Source: libert
Source: libert.ecl
Priority: extra
Maintainer: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Build-Depends: debhelper (>= 8.0.0), cmake
Build-Depends: debhelper (>= 8.0.0), cmake, liblapack-dev, libquadmath0
Standards-Version: 3.9.2
Section: libs
Homepage: <add me>
Homepage: http://ert.nr.no
Vcs-Git: git://github.com/Ensembles/ert.git
Vcs-Browser: https://github.com/Ensembles/ert
Package: libert-dev
Package: libert.ecl-dev
Section: libdevel
Architecture: any
Depends: libert1 (= ${binary:Version})
Depends: libert.ecl1 (= ${binary:Version})
Description: The Ensemble based Reservoir Tool -- Development files
ERT - Ensemble based Reservoir Tool is a tool for managing en ensemble
of reservoir models.
Package: libert1
Package: libert.ecl1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}

28
ThirdParty/Ert/devel/debian/copyright vendored
View File

@@ -1,36 +1,22 @@
Format: http://dep.debian.net/deps/dep5
Upstream-Name: libert
Source: <url://example.com>
Upstream-Name: libert.ecl
Source: https://github.com/Ensembles/ert
Files: *
Copyright: <years> <put author's name and email here>
<years> <likewise for another author>
License: <special license>
<Put the license of the package here indented by 1 space>
<This follows the format of Description: lines in control file>
.
<Including paragraphs>
# If you want to use GPL v2 or later for the /debian/* files use
# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
Copyright: 2013 Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
License: GPL-2+
Copyright: 2013 Statoil
License: GPL-3+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
# Please also look if there are files or directories which have a
# different copyright/license attached and list them here.
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

1
ThirdParty/Ert/devel/debian/docs vendored
View File

@@ -1 +0,0 @@
Windows.txt

1
ThirdParty/Ert/devel/debian/libert-dev.install vendored
View File

@@ -1 +0,0 @@
usr/include/*

0
ThirdParty/Ert/devel/debian/libert-dev.dirs → ThirdParty/Ert/devel/debian/libert.ecl-dev.dirs vendored
View File

2
ThirdParty/Ert/devel/debian/libert.ecl-dev.install vendored Normal file
View File

@@ -0,0 +1,2 @@
usr/include/*
usr/lib/*/*.so

0
ThirdParty/Ert/devel/debian/libert1.dirs → ThirdParty/Ert/devel/debian/libert.ecl1.dirs vendored
View File

1
ThirdParty/Ert/devel/debian/libert.ecl1.install vendored Normal file
View File

@@ -0,0 +1 @@
usr/lib/*/lib*.so.*

1
ThirdParty/Ert/devel/debian/libert1.install vendored
View File

@@ -1 +0,0 @@
usr/lib/lib*.so

12
ThirdParty/Ert/devel/libanalysis/CMakeLists.txt vendored
View File

@@ -1,5 +1,9 @@
set( ANALYSIS_INSTALL_PREFIX "" CACHE STRING "Prefix for installation of libanalysis")
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src )
add_subdirectory( src )
#if (BUILD_APPLICATONS)
# add_subdirectory( applications )
#endif()
#if (BUILD_TESTS)
# add_subdirectory( tests )
#endif()

2
ThirdParty/Ert/devel/libanalysis/src/analysis_module.h → ThirdParty/Ert/devel/libanalysis/include/ert/analysis/analysis_module.h vendored
View File

@@ -22,7 +22,7 @@
extern "C" {
#endif
#include <matrix.h>
#include <ert/util/matrix.h>
/*

4
ThirdParty/Ert/devel/libanalysis/src/analysis_table.h → ThirdParty/Ert/devel/libanalysis/include/ert/analysis/analysis_table.h vendored
View File

@@ -6,8 +6,8 @@ extern "C" {
#endif
#include <matrix.h>
#include <rng.h>
#include <ert/util/matrix.h>
#include <ert/util/rng.h>
typedef void (analysis_updateA_ftype) (void * module_data ,

4
ThirdParty/Ert/devel/libanalysis/src/cv_enkf.h → ThirdParty/Ert/devel/libanalysis/include/ert/analysis/cv_enkf.h vendored
View File

@@ -16,8 +16,8 @@
for more details.
*/
#include <rng.h>
#include <matrix.h>
#include <ert/util/rng.h>
#include <ert/util/matrix.h>
typedef struct cv_enkf_data_struct cv_enkf_data_type;

6
ThirdParty/Ert/devel/libanalysis/src/enkf_linalg.h → ThirdParty/Ert/devel/libanalysis/include/ert/analysis/enkf_linalg.h vendored
View File

@@ -1,8 +1,8 @@
#ifndef __ENKF_LINALG_H__
#define __ENKF_LINALG_H__
#include <matrix_lapack.h>
#include <matrix.h>
#include <ert/util/matrix_lapack.h>
#include <ert/util/matrix.h>
void enkf_linalg_get_PC( const matrix_type * S0,
@@ -39,7 +39,7 @@ int enkf_linalg_svd_truncation(const matrix_type * S ,
dgesvd_vector_enum store_V0T ,
double * sig0,
matrix_type * U0 ,
matrix_type * V0T);
matrix_type * V0T);
int enkf_linalg_svdS(const matrix_type * S ,

4
ThirdParty/Ert/devel/libanalysis/src/fwd_step_enkf.h → ThirdParty/Ert/devel/libanalysis/include/ert/analysis/fwd_step_enkf.h vendored
View File

@@ -16,8 +16,8 @@
for more details.
*/
#include <rng.h>
#include <matrix.h>
#include <ert/util/rng.h>
#include <ert/util/matrix.h>
typedef struct fwd_step_enkf_data_struct fwd_step_enkf_data_type;

0
ThirdParty/Ert/devel/libanalysis/src/rml_enkf_common.h → ThirdParty/Ert/devel/libanalysis/include/ert/analysis/rml_enkf_common.h vendored
View File

4
ThirdParty/Ert/devel/libanalysis/src/std_enkf.h → ThirdParty/Ert/devel/libanalysis/include/ert/analysis/std_enkf.h vendored
View File

@@ -7,8 +7,8 @@ extern "C" {
#include <stdbool.h>
#include <matrix.h>
#include <rng.h>
#include <ert/util/matrix.h>
#include <ert/util/rng.h>
#define DEFAULT_ENKF_TRUNCATION_ 0.98
#define ENKF_TRUNCATION_KEY_ "ENKF_TRUNCATION"

12
ThirdParty/Ert/devel/libanalysis/src/CMakeLists.txt vendored
View File

@@ -3,6 +3,7 @@ set( source_files analysis_module.c enkf_linalg.c std_enkf.c sqrt_enkf.c cv_enkf
set( header_files analysis_module.h enkf_linalg.h analysis_table.h)
add_library( analysis SHARED ${source_files} )
set_target_properties( analysis PROPERTIES COMPILE_DEFINITIONS INTERNAL_LINK)
set_target_properties( analysis PROPERTIES VERSION 1.0 SOVERSION 1.0 )
target_link_libraries( analysis ert_util )
if (NEED_LIBDL)
@@ -18,12 +19,9 @@ add_library( sqrt_enkf MODULE sqrt_enkf.c )
#-----------------------------------------------------------------
if (ANALYSIS_INSTALL_PREFIX)
install(TARGETS analysis DESTINATION ${ANALYSIS_INSTALL_PREFIX}/lib)
install(FILES ${header_files} DESTINATION ${ANALYSIS_INSTALL_PREFIX}/include)
else()
install(TARGETS analysis DESTINATION lib)
install(FILES ${header_files} DESTINATION include)
endif()
install(TARGETS analysis DESTINATION ${CMAKE_INSTALL_LIBDIR})
foreach(header ${header_files})
install(FILES ../include/ert/analysis/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/analysis)
endforeach()

48
ThirdParty/Ert/devel/libanalysis/src/SConscript vendored
View File

@@ -1,48 +0,0 @@
import os
import os.path
import sys
sys.path += ["../../scons-config"]
import global_config
from global_config import LIBUTIL
from global_config import LIBANALYSIS
from global_config import add_static_library
from global_config import add_shared_library
from global_config import add_header
from global_config import get_target
from global_config import add_program
package = "analysis"
lib_path = "../lib"
slib_path = "../lib"
include_path = "../include"
module_path = "../modules"
conf = global_config.get_conf(os.getcwd() , 2)
env = Environment()
conf.update_env( env , [ LIBUTIL , LIBANALYSIS ] , link = False)
src_list = Split("analysis_module.c enkf_linalg.c")
src_list.append("std_enkf.c")
src_list.append("sqrt_enkf.c")
src_list.append("cv_enkf.c")
src_list.append("bootstrap_enkf.c")
src_list.append("null_enkf.c")
src_list.append("fwd_step_enkf.c")
header_list = Split("analysis_module.h analysis_table.h enkf_linalg.h")
add_shared_library( env , conf , slib_path , package , src_list)
add_header( env , conf , include_path , header_list )
env['SHLIBPREFIX'] = ""
add_shared_library( env , conf , module_path , "std_enkf.so" , ["std_enkf.c"] )
add_shared_library( env , conf , module_path , "sqrt_enkf.so" , ["sqrt_enkf.c"] )
add_shared_library( env , conf , module_path , "cv_enkf.so" , ["cv_enkf.c"] )
add_shared_library( env , conf , module_path , "bootstrap_enkf.so" , ["bootstrap_enkf.c"] )
add_shared_library( env , conf , module_path , "null_enkf.so" , ["null_enkf.c"] )
add_shared_library( env , conf , module_path , "fwd_step_enkf.so" , ["fwd_step_enkf.c"] )
Default( include_path , slib_path , module_path )

11
ThirdParty/Ert/devel/libanalysis/src/analysis_module.c vendored
View File

@@ -21,12 +21,13 @@
#include <stdbool.h>
#include <stdio.h>
#include <dlfcn.h>
#include <matrix.h>
#include <util.h>
#include <rng.h>
#include <analysis_module.h>
#include <analysis_table.h>
#include <ert/util/matrix.h>
#include <ert/util/util.h>
#include <ert/util/rng.h>
#include <ert/analysis/analysis_module.h>
#include <ert/analysis/analysis_table.h>
#define ANALYSIS_MODULE_TYPE_ID 6610123

20
ThirdParty/Ert/devel/libanalysis/src/bootstrap_enkf.c vendored
View File

@@ -21,17 +21,17 @@
#include <stdio.h>
#include <math.h>
#include <int_vector.h>
#include <util.h>
#include <rng.h>
#include <matrix.h>
#include <matrix_blas.h>
#include <ert/util/int_vector.h>
#include <ert/util/util.h>
#include <ert/util/rng.h>
#include <ert/util/matrix.h>
#include <ert/util/matrix_blas.h>
#include <std_enkf.h>
#include <cv_enkf.h>
#include <analysis_table.h>
#include <analysis_module.h>
#include <enkf_linalg.h>
#include <ert/analysis/std_enkf.h>
#include <ert/analysis/cv_enkf.h>
#include <ert/analysis/analysis_table.h>
#include <ert/analysis/analysis_module.h>
#include <ert/analysis/enkf_linalg.h>
#define BOOTSTRAP_ENKF_TYPE_ID 741223

18
ThirdParty/Ert/devel/libanalysis/src/cv_enkf.c vendored
View File

@@ -21,16 +21,16 @@
#include <stdio.h>
#include <math.h>
#include <util.h>
#include <rng.h>
#include <matrix.h>
#include <matrix_blas.h>
#include <ert/util/util.h>
#include <ert/util/rng.h>
#include <ert/util/matrix.h>
#include <ert/util/matrix_blas.h>
#include <analysis_table.h>
#include <analysis_module.h>
#include <enkf_linalg.h>
#include <std_enkf.h>
#include <cv_enkf.h>
#include <ert/analysis/enkf_linalg.h>
#include <ert/analysis/analysis_table.h>
#include <ert/analysis/analysis_module.h>
#include <ert/analysis/std_enkf.h>
#include <ert/analysis/cv_enkf.h>
#define CV_ENKF_TYPE_ID 765523

10
ThirdParty/Ert/devel/libanalysis/src/enkf_linalg.c vendored
View File

@@ -2,12 +2,12 @@
#include <stdio.h>
#include <math.h>
#include <matrix.h>
#include <matrix_lapack.h>
#include <matrix_blas.h>
#include <util.h>
#include <ert/util/matrix.h>
#include <ert/util/matrix_lapack.h>
#include <ert/util/matrix_blas.h>
#include <ert/util/util.h>
#include <enkf_linalg.h>
#include <ert/analysis/enkf_linalg.h>
void enkf_linalg_genX3(matrix_type * X3 , const matrix_type * W , const matrix_type * D , const double * eig) {
const int nrobs = matrix_get_rows( D );

6
ThirdParty/Ert/devel/libanalysis/src/ert_module vendored
View File

@@ -5,9 +5,9 @@ from optparse import OptionParser
#-----------------------------------------------------------------
lib_list = ["analysis" , "ert_util"]
lib_path_list = ["./" , "../../libutil/slib"]
include_path_list = ["./" , "../../libutil/src"]
lib_list = ["analysis" , "ert_util"]
lib_path_list = ["./" , "../../libutil/slib"]
include_path_list = ["../include" , "../../libutil/src"]
define_list = ["HAVE_PTHREAD"]

22
ThirdParty/Ert/devel/libanalysis/src/fwd_step_enkf.c vendored
View File

@@ -18,17 +18,19 @@
#include <stdlib.h>
#include <string.h>
#include <util.h>
#include <rng.h>
#include <matrix.h>
#include <matrix_blas.h>
#include <stdio.h>
#include <analysis_table.h>
#include <analysis_module.h>
/*#include <enkf_linalg.h>*/
#include <stepwise.h>
#include <fwd_step_enkf.h>
#include <math.h>
#include <stdio.h>
#include <ert/util/util.h>
#include <ert/util/rng.h>
#include <ert/util/matrix.h>
#include <ert/util/matrix_blas.h>
#include <ert/util/stepwise.h>
#include <ert/analysis/fwd_step_enkf.h>
#include <ert/analysis/analysis_table.h>
#include <ert/analysis/analysis_module.h>
#define FWD_STEP_ENKF_TYPE_ID 765524

18
ThirdParty/Ert/devel/libanalysis/src/null_enkf.c vendored
View File

@@ -18,20 +18,16 @@
#include <stdlib.h>
#include <string.h>
#include <util.h>
#include <matrix.h>
#include <matrix_blas.h>
#include <stdio.h>
#include <analysis_module.h>
#include <analysis_table.h>
#include <enkf_linalg.h>
#include <rng.h>
#include <ert/util/util.h>
#include <ert/util/matrix.h>
#include <ert/util/matrix_blas.h>
#include <ert/util/rng.h>
#include <ert/analysis/analysis_module.h>
#include <ert/analysis/analysis_table.h>
#include <ert/analysis/enkf_linalg.h>
void null_enkf_initX(void * module_data ,

20
ThirdParty/Ert/devel/libanalysis/src/rml_enkf.c vendored
View File

@@ -21,17 +21,17 @@
#include <stdio.h>
#include <math.h>
#include <type_macros.h>
#include <util.h>
#include <rng.h>
#include <matrix.h>
#include <matrix_blas.h>
#include <ert/util/type_macros.h>
#include <ert/util/util.h>
#include <ert/util/rng.h>
#include <ert/util/matrix.h>
#include <ert/util/matrix_blas.h>
#include <analysis_module.h>
#include <analysis_table.h>
#include <enkf_linalg.h>
#include <rml_enkf_common.h>
#include <std_enkf.h>
#include <ert/analysis/analysis_module.h>
#include <ert/analysis/analysis_table.h>
#include <ert/analysis/enkf_linalg.h>
#include <ert/analysis/rml_enkf_common.h>
#include <ert/analysis/std_enkf.h>
/*
A random 'magic' integer id which is used for run-time type checking

16
ThirdParty/Ert/devel/libanalysis/src/rml_enkf_common.c vendored
View File

@@ -23,15 +23,15 @@
#include <stdio.h>
#include <math.h>
#include <util.h>
#include <matrix.h>
#include <matrix_blas.h>
#include <rng.h>
#include <ert/util/util.h>
#include <ert/util/matrix.h>
#include <ert/util/matrix_blas.h>
#include <ert/util/rng.h>
#include <analysis_module.h>
#include <analysis_table.h>
#include <enkf_linalg.h>
#include <rml_enkf_common.h>
#include <ert/analysis/analysis_module.h>
#include <ert/analysis/analysis_table.h>
#include <ert/analysis/enkf_linalg.h>
#include <ert/analysis/rml_enkf_common.h>

20
ThirdParty/Ert/devel/libanalysis/src/rml_enkf_imodel.c vendored
View File

@@ -22,18 +22,18 @@
#include <string.h>
#include <stdio.h>
#include <util.h>
#include <type_macros.h>
#include <rng.h>
#include <matrix.h>
#include <matrix_blas.h>
#include <ert/util/util.h>
#include <ert/util/type_macros.h>
#include <ert/util/rng.h>
#include <ert/util/matrix.h>
#include <ert/util/matrix_blas.h>
#include <analysis_module.h>
#include <analysis_table.h>
#include <enkf_linalg.h>
#include <rml_enkf_common.h>
#include <std_enkf.h>
#include <ert/analysis/analysis_module.h>
#include <ert/analysis/analysis_table.h>
#include <ert/analysis/enkf_linalg.h>
#include <ert/analysis/rml_enkf_common.h>
#include <ert/analysis/std_enkf.h>
/*
A random 'magic' integer id which is used for run-time type checking

16
ThirdParty/Ert/devel/libanalysis/src/sqrt_enkf.c vendored
View File

@@ -18,14 +18,16 @@
#include <stdlib.h>
#include <string.h>
#include <util.h>
#include <matrix.h>
#include <matrix_blas.h>
#include <stdio.h>
#include <analysis_table.h>
#include <analysis_module.h>
#include <enkf_linalg.h>
#include <std_enkf.h>
#include <ert/util/util.h>
#include <ert/util/matrix.h>
#include <ert/util/matrix_blas.h>
#include <ert/analysis/analysis_table.h>
#include <ert/analysis/analysis_module.h>
#include <ert/analysis/enkf_linalg.h>
#include <ert/analysis/std_enkf.h>
/*

16
ThirdParty/Ert/devel/libanalysis/src/std_enkf.c vendored
View File

@@ -20,15 +20,15 @@
#include <string.h>
#include <stdio.h>
#include <util.h>
#include <matrix.h>
#include <matrix_blas.h>
#include <rng.h>
#include <ert/util/util.h>
#include <ert/util/matrix.h>
#include <ert/util/matrix_blas.h>
#include <ert/util/rng.h>
#include <analysis_module.h>
#include <analysis_table.h>
#include <enkf_linalg.h>
#include <std_enkf.h>
#include <ert/analysis/analysis_module.h>
#include <ert/analysis/analysis_table.h>
#include <ert/analysis/enkf_linalg.h>
#include <ert/analysis/std_enkf.h>
/*

4
ThirdParty/Ert/devel/libconfig/CMakeLists.txt vendored
View File

@@ -1,5 +1 @@
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src )
include_directories( ${libert_util_build_path} )
include_directories( ${libert_util_src_path} )
add_subdirectory( src )

19
ThirdParty/Ert/devel/libconfig/src/conf.h → ThirdParty/Ert/devel/libconfig/include/ert/config/conf.h vendored
View File

@@ -104,16 +104,19 @@ extern "C" {
#endif
#include <stdbool.h>
#include <set.h>
#include <conf_data.h>
#include <stringlist.h>
#include <ert/util/set.h>
#include <ert/util/stringlist.h>
#include <ert/config/conf_data.h>
typedef struct conf_class_struct conf_class_type;
typedef struct conf_instance_struct conf_instance_type;
typedef struct conf_item_spec_struct conf_item_spec_type;
typedef struct conf_item_struct conf_item_type;
typedef struct conf_item_mutex_struct conf_item_mutex_type;
typedef struct conf_class_struct conf_class_type;
typedef struct conf_instance_struct conf_instance_type;
typedef struct conf_item_spec_struct conf_item_spec_type;
typedef struct conf_item_struct conf_item_type;
typedef struct conf_item_mutex_struct conf_item_mutex_type;
/** D E F A U L T A L L O C / F R E E F U N C T I O N S */

0
ThirdParty/Ert/devel/libconfig/src/conf_data.h → ThirdParty/Ert/devel/libconfig/include/ert/config/conf_data.h vendored
View File

0
ThirdParty/Ert/devel/libconfig/src/conf_util.h → ThirdParty/Ert/devel/libconfig/include/ert/config/conf_util.h vendored
View File

5
ThirdParty/Ert/devel/libconfig/src/config.h → ThirdParty/Ert/devel/libconfig/include/ert/config/config.h vendored
View File

@@ -24,8 +24,9 @@ extern "C" {
#include <stdlib.h>
#include <stdbool.h>
#include <stringlist.h>
#include <hash.h>
#include <ert/util/stringlist.h>
#include <ert/util/hash.h>
#define ECL_COM_KW "--"
#define ENKF_COM_KW "--"

12
ThirdParty/Ert/devel/libconfig/src/CMakeLists.txt vendored
View File

@@ -2,13 +2,11 @@ set( source_files config.c conf.c conf_util.c conf_data.c)
set( header_files config.h conf.h conf_data.h)
add_library( config ${LIBRARY_TYPE} ${source_files} )
set_target_properties( config PROPERTIES VERSION 1.0 SOVERSION 1.0 )
target_link_libraries( config ert_util )
if (CONFIG_INSTALL_PREFIX)
install(TARGETS config DESTINATION ${CONFIG_INSTALL_PREFIX}/lib)
install(FILES ${header_files} DESTINATION ${CONFIG_INSTALL_PREFIX}/include)
else()
install(TARGETS config DESTINATION lib)
install(FILES ${header_files} DESTINATION include)
endif()
install(TARGETS config DESTINATION ${CMAKE_INSTALL_LIBDIR})
foreach(header ${header_files})
install(FILES ../include/ert/config/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/config)
endforeach()

15
ThirdParty/Ert/devel/libconfig/src/conf.c vendored
View File

@@ -18,12 +18,15 @@
#include <assert.h>
#include <string.h>
#include <hash.h>
#include <set.h>
#include <util.h>
#include <conf.h>
#include <conf_util.h>
#include <vector.h>
#include <ert/util/hash.h>
#include <ert/util/set.h>
#include <ert/util/util.h>
#include <ert/util/vector.h>
#include <ert/config/conf.h>
#include <ert/config/conf_util.h>
/** S T R U C T D E F I N I T I O N S */

8
ThirdParty/Ert/devel/libconfig/src/conf_data.c vendored
View File

@@ -19,8 +19,12 @@
#include <stdlib.h>
#include <assert.h>
#include <string.h>
#include <conf_data.h>
#include <util.h>
#include <ert/util/util.h>
#include <ert/config/conf_data.h>
#define DT_STR_STRING "string"
#define DT_INT_STRING "integer"

8
ThirdParty/Ert/devel/libconfig/src/conf_util.c vendored
View File

@@ -17,10 +17,12 @@
*/
#include <assert.h>
#include <util.h>
#include <string.h>
#include <conf_util.h>
#include <parser.h>
#include <ert/util/util.h>
#include <ert/util/parser.h>
#include <ert/config/conf_util.h>
/*

18
ThirdParty/Ert/devel/libconfig/src/config.c vendored
View File

@@ -21,16 +21,16 @@
#include <string.h>
#include <stdio.h>
#include <type_macros.h>
#include <util.h>
#include <parser.h>
#include <hash.h>
#include <stringlist.h>
#include <set.h>
#include <subst_list.h>
#include <vector.h>
#include <ert/util/type_macros.h>
#include <ert/util/util.h>
#include <ert/util/parser.h>
#include <ert/util/hash.h>
#include <ert/util/stringlist.h>
#include <ert/util/set.h>
#include <ert/util/subst_list.h>
#include <ert/util/vector.h>
#include <config.h>
#include <ert/config/config.h>
#define CLEAR_STRING "__RESET__"

5
ThirdParty/Ert/devel/libconfig/src/dependencies vendored
View File

@@ -1,5 +0,0 @@
conf.o : conf.c conf.h conf_util.o
conf_data.o : conf_data.c conf_data.h
conf_util.o : conf_util.c conf_util.h
config.o : config.c config.h
tokenizer.o : tokenizer.c tokenizer.h

15
ThirdParty/Ert/devel/libecl/CMakeLists.txt vendored
View File

@@ -1,10 +1,9 @@
set( ECL_INSTALL_PREFIX "" CACHE STRING "Prefix for installation of libecl")
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src )
include_directories( ${libgeometry_src_path} )
add_subdirectory( src )
add_subdirectory( applications )
add_subdirectory( tests )
if (BUILD_APPLICATONS OR BUILD_ECL_SUMMARY)
add_subdirectory( applications )
endif()
if (BUILD_TESTS)
add_subdirectory( tests )
endif()

111
ThirdParty/Ert/devel/libecl/applications/CMakeLists.txt vendored
View File

@@ -1,68 +1,73 @@
add_executable( sum_write sum_write.c )
add_executable( make_grid make_grid.c )
add_executable( grdecl_grid grdecl_grid.c )
add_executable( summary2csv summary2csv.c )
if (ERT_LINUX)
add_executable( convert.x convert.c )
add_executable( grdecl_test.x grdecl_test.c )
add_executable( kw_list.x kw_list.c )
add_executable( kw_extract.x kw_extract.c )
add_executable( grid_info.x grid_info.c )
add_executable( grid_dump.x grid_dump.c )
add_executable( grid_dump_ascii.x grid_dump_ascii.c )
add_executable( summary.x view_summary.c )
add_executable( select_test.x select_test.c )
add_executable( load_test.x load_test.c )
set(program_list summary2csv kw_extract.x grdecl_grid make_grid sum_write load_test.x grdecl_test.x grid_dump_ascii.x select_test.x grid_dump.x convert.x kw_list.x grid_info.x summary.x)
else()
# The stupid .x extension creates problems on windows
add_executable( convert convert.c )
add_executable( grdecl_test grdecl_test.c )
add_executable( kw_list kw_list.c )
add_executable( kw_extract kw_extract.c )
add_executable( grid_info grid_info.c )
add_executable( grid_dump grid_dump.c )
add_executable( grid_dump_ascii grid_dump_ascii.c )
add_executable( summary view_summary.c )
add_executable( select_test select_test.c )
add_executable( load_test load_test.c )
set(program_list summary2csv kw_extract grdecl_grid make_grid sum_write load_test grdecl_test grid_dump_ascii select_test grid_dump convert kw_list grid_info summary)
endif()
foreach(prog ${program_list})
target_link_libraries( ${prog} ecl ert_util geometry )
#-----------------------------------------------------------------
if (ECL_INSTALL_PREFIX)
set (destination ${CMAKE_INSTALL_PREFIX}/${ECL_INSTALL_PREFIX}/bin)
if (BUILD_APPLICATIONS)
add_executable( sum_write sum_write.c )
add_executable( make_grid make_grid.c )
add_executable( grdecl_grid grdecl_grid.c )
add_executable( summary2csv summary2csv.c )
if (ERT_LINUX)
add_executable( convert.x convert.c )
add_executable( grdecl_test.x grdecl_test.c )
add_executable( kw_list.x kw_list.c )
add_executable( kw_extract.x kw_extract.c )
add_executable( grid_info.x grid_info.c )
add_executable( grid_dump.x grid_dump.c )
add_executable( grid_dump_ascii.x grid_dump_ascii.c )
add_executable( summary.x view_summary.c )
add_executable( select_test.x select_test.c )
add_executable( load_test.x load_test.c )
set(program_list summary2csv kw_extract.x grdecl_grid make_grid sum_write load_test.x grdecl_test.x grid_dump_ascii.x select_test.x grid_dump.x convert.x kw_list.x grid_info.x summary.x)
else()
set (destination ${CMAKE_INSTALL_PREFIX}/bin)
# The stupid .x extension creates problems on windows
add_executable( convert convert.c )
add_executable( grdecl_test grdecl_test.c )
add_executable( kw_list kw_list.c )
add_executable( kw_extract kw_extract.c )
add_executable( grid_info grid_info.c )
add_executable( grid_dump grid_dump.c )
add_executable( grid_dump_ascii grid_dump_ascii.c )
add_executable( summary view_summary.c )
add_executable( select_test select_test.c )
add_executable( load_test load_test.c )
set(program_list summary2csv kw_extract grdecl_grid make_grid sum_write load_test grdecl_test grid_dump_ascii select_test grid_dump convert kw_list grid_info summary)
endif()
install(TARGETS ${prog} DESTINATION ${destination})
if (INSTALL_GROUP)
install(CODE "EXECUTE_PROCESS(COMMAND chgrp ${INSTALL_GROUP} ${destination}/${prog})")
install(CODE "EXECUTE_PROCESS(COMMAND chmod g+w ${destination}/${prog})")
endif()
endforeach()
foreach(prog ${program_list})
target_link_libraries( ${prog} ecl ert_util )
#-----------------------------------------------------------------
set (destination ${CMAKE_INSTALL_PREFIX}/bin)
install(TARGETS ${prog} DESTINATION ${destination})
if (INSTALL_GROUP)
install(CODE "EXECUTE_PROCESS(COMMAND chgrp ${INSTALL_GROUP} ${destination}/${prog})")
install(CODE "EXECUTE_PROCESS(COMMAND chmod g+w ${destination}/${prog})")
endif()
endforeach()
endif()
if (BUILD_ENS_PLOT)
include_directories( ${PLPLOT_HEADER} )
include_directories( ${libplot_src_path} )
add_executable( ens_plot.x ens_plot.c )
target_link_libraries( ens_plot.x plot ecl util)
if (ECL_INSTALL_PREFIX)
set (destination ${CMAKE_INSTALL_PREFIX}/${ECL_INSTALL_PREFIX}/bin)
else()
set (destination ${CMAKE_INSTALL_PREFIX}/bin)
endif()
target_link_libraries( ens_plot.x plot ecl ert_util)
set (destination ${CMAKE_INSTALL_PREFIX}/bin)
install(TARGETS ens_plot.x DESTINATION ${destination})
if (INSTALL_GROUP)
install(CODE "EXECUTE_PROCESS(COMMAND chgrp ${INSTALL_GROUP} ${destination}/ens_plot.x)")
install(CODE "EXECUTE_PROCESS(COMMAND chmod g+w ${destination}/ens_plot.x)")
endif()
endif()
if (BUILD_ECL_SUMMARY)
add_executable( ecl_summary view_summary.c )
target_link_libraries( ecl_summary ecl ert_util)
set (destination ${CMAKE_INSTALL_PREFIX}/bin)
install(TARGETS ecl_summary DESTINATION ${destination})
if (INSTALL_GROUP)
install(CODE "EXECUTE_PROCESS(COMMAND chgrp ${INSTALL_GROUP} ${destination}/ecl_summary)")
install(CODE "EXECUTE_PROCESS(COMMAND chmod g+w ${destination}/ecl_summary)")
endif()
endif()

12
ThirdParty/Ert/devel/libecl/applications/convert.c vendored
View File

@@ -19,12 +19,14 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include <ecl_kw.h>
#include <fortio.h>
#include <string.h>
#include <util.h>
#include <ecl_util.h>
#include <ecl_endian_flip.h>
#include <ert/util/util.h>
#include <ert/ecl/ecl_kw.h>
#include <ert/ecl/fortio.h>
#include <ert/ecl/ecl_util.h>
#include <ert/ecl/ecl_endian_flip.h>
void file_convert(const char * src_file , const char * target_file, ecl_file_enum file_type , bool fmt_src) {

15
ThirdParty/Ert/devel/libecl/applications/ecl_pack.c vendored
View File

@@ -16,13 +16,16 @@
for more details.
*/
#include <util.h>
#include <ecl_file.h>
#include <ecl_util.h>
#include <stdlib.h>
#include <msg.h>
#include <ecl_endian_flip.h>
#include <stringlist.h>
#include <ert/util/util.h>
#include <ert/util/stringlist.h>
#include <ert/util/msg.h>
#include <ert/ecl/ecl_file.h>
#include <ert/ecl/ecl_util.h>
#include <ert/ecl/ecl_endian_flip.h>
int main(int argc, char ** argv) {

18
ThirdParty/Ert/devel/libecl/applications/ecl_quantile.c vendored
View File

@@ -24,17 +24,17 @@
#include <pthread.h>
#include <glob.h>
#include <util.h>
#include <double_vector.h>
#include <time_t_vector.h>
#include <statistics.h>
#include <vector.h>
#include <arg_pack.h>
#include <thread_pool.h>
#include <ert/util/util.h>
#include <ert/util/double_vector.h>
#include <ert/util/time_t_vector.h>
#include <ert/util/statistics.h>
#include <ert/util/vector.h>
#include <ert/util/arg_pack.h>
#include <ert/util/thread_pool.h>
#include <config.h>
#include <ert/config/config.h>
#include <ecl_sum.h>
#include <ert/ecl/ecl_sum.h>
#define DEFAULT_NUM_INTERP 50
#define SUMMARY_JOIN ":"

36
ThirdParty/Ert/devel/libecl/applications/ens_plot.c vendored
View File

@@ -311,27 +311,31 @@ Q | Quit
#define NEW_VECTOR_CMD "_newplotvector_"
#include <util.h>
#include <vector.h>
#include <ecl_sum.h>
#include <ecl_rft_file.h>
#include <hash.h>
#include <menu.h>
#include <plot_const.h>
#include <plot_range.h>
#include <ecl_util.h>
#include <plot.h>
#include <plot_dataset.h>
#include <path_fmt.h>
#include <stdio.h>
#include <string.h>
#include <int_vector.h>
#include <arg_pack.h>
#include <statistics.h>
#include <thread_pool.h>
#include <signal.h>
#include <pthread.h>
#include <ert/util/util.h>
#include <ert/util/vector.h>
#include <ert/util/hash.h>
#include <ert/util/menu.h>
#include <ert/util/int_vector.h>
#include <ert/util/arg_pack.h>
#include <ert/util/statistics.h>
#include <ert/util/thread_pool.h>
#include <ert/util/path_fmt.h>
#include <ert/ecl/ecl_util.h>
#include <ert/ecl/ecl_sum.h>
#include <ert/ecl/ecl_rft_file.h>
#include <ert/plot/plot.h>
#include <ert/plot/plot_dataset.h>
#include <ert/plot/plot_const.h>
#include <ert/plot/plot_range.h>

9
ThirdParty/Ert/devel/libecl/applications/grdecl_grid.c vendored
View File

@@ -19,10 +19,11 @@
#include <stdlib.h>
#include <stdio.h>
#include <util.h>
#include <ecl_kw.h>
#include <ecl_grid.h>
#include <ecl_kw_magic.h>
#include <ert/util/util.h>
#include <ert/ecl/ecl_kw.h>
#include <ert/ecl/ecl_grid.h>
#include <ert/ecl/ecl_kw_magic.h>
int main(int argc , char ** argv) {

6
ThirdParty/Ert/devel/libecl/applications/grdecl_test.c vendored
View File

@@ -19,10 +19,10 @@
#include <stdlib.h>
#include <stdio.h>
#include <util.h>
#include <timer.h>
#include <ert/util/util.h>
#include <ert/util/timer.h>
#include <ecl_kw.h>
#include <ert/ecl/ecl_kw.h>
int main(int argc , char ** argv) {

4
ThirdParty/Ert/devel/libecl/applications/grid_dump.c vendored
View File

@@ -19,9 +19,9 @@
#include <stdlib.h>
#include <stdio.h>
#include <util.h>
#include <ert/util/util.h>
#include <ecl_grid.h>
#include <ert/ecl/ecl_grid.h>

4
ThirdParty/Ert/devel/libecl/applications/grid_dump_ascii.c vendored
View File

@@ -19,9 +19,9 @@
#include <stdlib.h>
#include <stdio.h>
#include <util.h>
#include <ert/util/util.h>
#include <ecl_grid.h>
#include <ert/ecl/ecl_grid.h>

6
ThirdParty/Ert/devel/libecl/applications/grid_info.c vendored
View File

@@ -19,9 +19,11 @@
#include <stdlib.h>
#include <stdio.h>
#include <ecl_grid.h>
#include <ert/util/util.h>
#include <ert/ecl/ecl_grid.h>
#include <util.h>
int main(int argc, char ** argv) {

25
ThirdParty/Ert/devel/libecl/applications/kw_extract.c vendored
View File

@@ -17,18 +17,21 @@
*/
#include <stdlib.h>
#include <ecl_kw.h>
#include <fortio.h>
#include <set.h>
#include <util.h>
#include <string.h>
#include <ecl_util.h>
#include <ecl_sum.h>
#include <hash.h>
#include <stdbool.h>
#include <ecl_grid.h>
#include <ecl_endian_flip.h>
#include <msg.h>
#include <string.h>
#include <ert/util/set.h>
#include <ert/util/util.h>
#include <ert/util/hash.h>
#include <ert/util/msg.h>
#include <ert/ecl/ecl_kw.h>
#include <ert/ecl/fortio.h>
#include <ert/ecl/ecl_util.h>
#include <ert/ecl/ecl_sum.h>
#include <ert/ecl/ecl_grid.h>
#include <ert/ecl/ecl_endian_flip.h>
/**
This file will extract all occurences of kw1,kw2,...,kwn from the

9
ThirdParty/Ert/devel/libecl/applications/kw_list.c vendored
View File

@@ -19,11 +19,12 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include <ecl_kw.h>
#include <fortio.h>
#include <string.h>
#include <ecl_util.h>
#include <ecl_endian_flip.h>
#include <ert/ecl/ecl_kw.h>
#include <ert/ecl/fortio.h>
#include <ert/ecl/ecl_util.h>
#include <ert/ecl/ecl_endian_flip.h>
void kw_list(const char *filename) {

6
ThirdParty/Ert/devel/libecl/applications/load_test.c vendored
View File

@@ -20,10 +20,10 @@
#include <stdio.h>
#include <stdbool.h>
#include <timer.h>
#include <ert/util/timer.h>
#include <ecl_grid.h>
#include <ecl_file.h>
#include <ert/ecl/ecl_grid.h>
#include <ert/ecl/ecl_file.h>
void test_case( const char * base , bool load_all) {

4
ThirdParty/Ert/devel/libecl/applications/make_grid.c vendored
View File

@@ -19,9 +19,9 @@
#include <stdlib.h>
#include <stdio.h>
#include <util.h>
#include <ert/util/util.h>
#include <ecl_grid.h>
#include <ert/ecl/ecl_grid.h>

6
ThirdParty/Ert/devel/libecl/applications/select_test.c vendored
View File

@@ -19,10 +19,10 @@
#include <stdlib.h>
#include <stdio.h>
#include <util.h>
#include <stringlist.h>
#include <ert/util/util.h>
#include <ert/util/stringlist.h>
#include <ecl_kw.h>
#include <ert/ecl/ecl_kw.h>
int main(int argc , char ** argv) {

12
ThirdParty/Ert/devel/libecl/applications/sum_write.c vendored
View File

@@ -16,14 +16,14 @@
*/
#include <stdlib.h>
#include <util.h>
#include <string.h>
#include <vector.h>
#include <ecl_kw.h>
#include <ecl_sum.h>
#include <smspec_node.h>
#include <ert/util/util.h>
#include <ert/util/vector.h>
#include <ert/ecl/ecl_kw.h>
#include <ert/ecl/ecl_sum.h>
#include <ert/ecl/smspec_node.h>
/*

6
ThirdParty/Ert/devel/libecl/applications/summary2csv.c vendored
View File

@@ -20,10 +20,10 @@
#include <signal.h>
#include <stdbool.h>
#include <util.h>
#include <stringlist.h>
#include <ert/util/util.h>
#include <ert/util/stringlist.h>
#include <ecl_sum.h>
#include <ert/ecl/ecl_sum.h>

8
ThirdParty/Ert/devel/libecl/applications/view_summary.c vendored
View File

@@ -23,11 +23,11 @@
#include <getopt.h>
#endif
#include <util.h>
#include <stringlist.h>
#include <ert/util/util.h>
#include <ert/util/stringlist.h>
#include <ecl_kw.h>
#include <ecl_sum.h>
#include <ert/ecl/ecl_kw.h>
#include <ert/ecl/ecl_sum.h>

2
ThirdParty/Ert/devel/libecl/cxx/src/CMakeLists.txt vendored
View File

@@ -15,6 +15,6 @@ if (ECL_INSTALL_PREFIX)
install(FILES ${header_files} DESTINATION ${ECL_INSTALL_PREFIX}/include)
else()
#
install(TARGETS eclxx_static DESTINATION lib)
install(TARGETS eclxx_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(FILES ${header_files} DESTINATION include)
endif()

8
ThirdParty/Ert/devel/libecl/src/ecl_box.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_box.h vendored
View File

@@ -22,7 +22,7 @@
extern "C" {
#endif
#include <ecl_grid.h>
#include <ert/ecl/ecl_grid.h>
typedef struct ecl_box_struct ecl_box_type;
@@ -30,9 +30,9 @@ typedef struct ecl_box_struct ecl_box_type;
void ecl_box_set_size (ecl_box_type * , int , int , int , int , int , int );
ecl_box_type * ecl_box_alloc(const ecl_grid_type * ecl_grid , int i1,int i2 , int j1 , int j2 , int k1, int k2);
void ecl_box_free (ecl_box_type * );
void ecl_box_set_values(const ecl_box_type * , char * , const char * , int );
int ecl_box_get_total_size(const ecl_box_type * );
void ecl_box_free (ecl_box_type * );
void ecl_box_set_values(const ecl_box_type * , char * , const char * , int );
int ecl_box_get_total_size(const ecl_box_type * );
int ecl_box_get_active_size( const ecl_box_type * ecl_box );
const int * ecl_box_get_active_list( const ecl_box_type * ecl_box );
int ecl_box_get_global_size( const ecl_box_type * ecl_box );

0
ThirdParty/Ert/devel/libecl/src/ecl_coarse_cell.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_coarse_cell.h vendored
View File

0
ThirdParty/Ert/devel/libecl/src/ecl_endian_flip.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_endian_flip.h vendored
View File

8
ThirdParty/Ert/devel/libecl/src/ecl_file.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_file.h vendored
View File

@@ -27,10 +27,10 @@ extern "C" {
#include <time.h>
#include <ecl_kw.h>
#include <ecl_file_kw.h>
#include <fortio.h>
#include <ecl_util.h>
#include <ert/ecl/ecl_kw.h>
#include <ert/ecl/ecl_file_kw.h>
#include <ert/ecl/fortio.h>
#include <ert/ecl/ecl_util.h>
typedef struct ecl_file_struct ecl_file_type;

4
ThirdParty/Ert/devel/libecl/src/ecl_file_kw.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_file_kw.h vendored
View File

@@ -25,8 +25,8 @@ extern "C" {
#include <stdbool.h>
#include <ecl_kw.h>
#include <fortio.h>
#include <ert/ecl/ecl_kw.h>
#include <ert/ecl/fortio.h>
typedef struct ecl_file_kw_struct ecl_file_kw_type;
typedef struct inv_map_struct inv_map_type;

6
ThirdParty/Ert/devel/libecl/src/ecl_grav.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grav.h vendored
View File

@@ -23,9 +23,9 @@
extern "C" {
#endif
#include <ecl_file.h>
#include <ecl_grid.h>
#include <ecl_region.h>
#include <ert/ecl/ecl_file.h>
#include <ert/ecl/ecl_grid.h>
#include <ert/ecl/ecl_region.h>
typedef struct ecl_grav_struct ecl_grav_type;
typedef struct ecl_grav_survey_struct ecl_grav_survey_type;

6
ThirdParty/Ert/devel/libecl/src/ecl_grav_calc.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grav_calc.h vendored
View File

@@ -22,9 +22,9 @@
extern "C" {
#endif
#include <ecl_kw.h>
#include <ecl_grid.h>
#include <ecl_file.h>
#include <etr/ecl/ecl_kw.h>
#include <etr/ecl/ecl_grid.h>
#include <etr/ecl/ecl_file.h>
double ecl_grav_phase_deltag( double utm_x ,
double utm_y ,

4
ThirdParty/Ert/devel/libecl/src/ecl_grav_common.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grav_common.h vendored
View File

@@ -25,8 +25,8 @@ extern "C" {
#endif
#include <stdbool.h>
#include <ecl_grid_cache.h>
#include <ecl_file.h>
#include <ert/ecl/ecl_grid_cache.h>
#include <ert/ecl/ecl_file.h>
bool * ecl_grav_common_alloc_aquifer_cell( const ecl_grid_cache_type * grid_cache , const ecl_file_type * init_file);
double ecl_grav_common_eval_biot_savart( const ecl_grid_cache_type * grid_cache , ecl_region_type * region , const bool * aquifer , const double * weight , double utm_x , double utm_y , double depth);

10
ThirdParty/Ert/devel/libecl/src/ecl_grid.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grid.h vendored
View File

@@ -23,12 +23,12 @@ extern "C" {
#endif
#include <stdbool.h>
#include <double_vector.h>
#include <int_vector.h>
#include <stringlist.h>
#include <ert/util/double_vector.h>
#include <ert/util/int_vector.h>
#include <ert/util/stringlist.h>
#include <ecl_coarse_cell.h>
#include <ecl_kw.h>
#include <ert/ecl/ecl_coarse_cell.h>
#include <ert/ecl/ecl_kw.h>
typedef double (block_function_ftype) ( const double_vector_type *);

2
ThirdParty/Ert/devel/libecl/src/ecl_grid_cache.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grid_cache.h vendored
View File

@@ -20,7 +20,7 @@
#ifndef __ECL_GRID_CACHE_H__
#define __ECL_GRID_CACHE_H__
#include <ecl_grid.h>
#include <ert/ecl/ecl_grid.h>
#ifdef __cplusplus
extern "C" {

6
ThirdParty/Ert/devel/libecl/src/ecl_init_file.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_init_file.h vendored
View File

@@ -25,9 +25,9 @@ extern "C" {
#include <time.h>
#include <fortio.h>
#include <ecl_kw.h>
#include <ecl_grid.h>
#include <ert/ecl/fortio.h>
#include <ert/ecl/ecl_kw.h>
#include <ert/ecl/ecl_grid.h>
void ecl_init_file_fwrite_header( fortio_type * fortio , const ecl_grid_type * grid , const ecl_kw_type * poro , int phases , time_t start_date);

3
ThirdParty/Ert/devel/libecl/src/ecl_intehead.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_intehead.h vendored
View File

@@ -24,7 +24,8 @@ extern "C" {
#endif
#include <time.h>
#include <ecl_kw.h>
#include <ert/ecl/ecl_kw.h>
#define INTEHEAD_KW "INTEHEAD" /* Long array with lots of data. */

0
ThirdParty/Ert/devel/libecl/src/ecl_io_config.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_io_config.h vendored
View File

8
ThirdParty/Ert/devel/libecl/src/ecl_kw.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_kw.h vendored
View File

@@ -25,10 +25,10 @@ extern "C" {
#include <stdlib.h>
#include <stdio.h>
#include <buffer.h>
#include <ert/util/buffer.h>
#include <fortio.h>
#include <ecl_util.h>
#include <ert/ecl/fortio.h>
#include <ert/ecl/ecl_util.h>
UTIL_IS_INSTANCE_HEADER(ecl_kw);
@@ -220,7 +220,7 @@ extern "C" {
ECL_KW_MAX_MIN_HEADER( double );
#undef ECL_KW_MAX_MIN_HEADER
#include <ecl_kw_grdecl.h>
#include <ert/ecl/ecl_kw_grdecl.h>
#ifdef __cplusplus
}

0
ThirdParty/Ert/devel/libecl/src/ecl_kw_grdecl.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_kw_grdecl.h vendored
View File

0
ThirdParty/Ert/devel/libecl/src/ecl_kw_magic.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_kw_magic.h vendored
View File

8
ThirdParty/Ert/devel/libecl/src/ecl_region.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_region.h vendored
View File

@@ -23,12 +23,12 @@ extern "C" {
#endif
#include <stdbool.h>
#include <int_vector.h>
#include <ert/util/int_vector.h>
#include <geo_polygon.h>
#include <ert/geometry/geo_polygon.h>
#include <ecl_box.h>
#include <ecl_grid.h>
#include <ert/ecl/ecl_box.h>
#include <ert/ecl/ecl_grid.h>
typedef enum {

8
ThirdParty/Ert/devel/libecl/src/ecl_rft_file.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_rft_file.h vendored
View File

@@ -23,9 +23,9 @@ extern "C" {
#endif
#include <stdbool.h>
#include <stringlist.h>
#include <ert/util/stringlist.h>
#include <ecl_rft_node.h>
#include <ert/ecl/ecl_rft_node.h>
typedef struct ecl_rft_file_struct ecl_rft_file_type;
@@ -48,8 +48,8 @@ int ecl_rft_file_get_size__( const ecl_rft_file_type * rft
int ecl_rft_file_get_size( const ecl_rft_file_type * rft_file);
const ecl_rft_node_type * ecl_rft_file_iget_node( const ecl_rft_file_type * rft_file , int index);
const ecl_rft_node_type * ecl_rft_file_iget_well_rft( const ecl_rft_file_type * rft_file , const char * well, int index);
bool ecl_rft_file_has_well( const ecl_rft_file_type * rft_file , const char * well);
int ecl_rft_file_get_well_occurences( const ecl_rft_file_type * rft_file , const char * well);
bool ecl_rft_file_has_well( const ecl_rft_file_type * rft_file , const char * well);
int ecl_rft_file_get_well_occurences( const ecl_rft_file_type * rft_file , const char * well);
stringlist_type * ecl_rft_file_alloc_well_list(const ecl_rft_file_type * rft_file );
int ecl_rft_file_get_num_wells( const ecl_rft_file_type * rft_file );
void ecl_rft_file_free__( void * arg);

2
ThirdParty/Ert/devel/libecl/src/ecl_rft_node.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_rft_node.h vendored
View File

@@ -23,7 +23,7 @@ extern "C" {
#endif
#include <stdbool.h>
#include <ecl_file.h>
#include <ert/ecl/ecl_file.h>
typedef enum { RFT = 1 ,
PLT = 2 ,

0
ThirdParty/Ert/devel/libecl/src/ecl_rst_file.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_rst_file.h vendored
View File

6
ThirdParty/Ert/devel/libecl/src/ecl_smspec.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_smspec.h vendored
View File

@@ -26,10 +26,10 @@ extern "C" {
#include <time.h>
#include <stdbool.h>
#include <float_vector.h>
#include <stringlist.h>
#include <ert/util/float_vector.h>
#include <ert/util/stringlist.h>
#include <smspec_node.h>
#include <ert/ecl/smspec_node.h>
typedef struct ecl_smspec_struct ecl_smspec_type;

6
ThirdParty/Ert/devel/libecl/src/ecl_subsidence.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_subsidence.h vendored
View File

@@ -23,9 +23,9 @@
extern "C" {
#endif
#include <ecl_file.h>
#include <ecl_grid.h>
#include <ecl_region.h>
#include <ert/ecl/ecl_file.h>
#include <ert/ecl/ecl_grid.h>
#include <ert/ecl/ecl_region.h>
typedef struct ecl_subsidence_struct ecl_subsidence_type;
typedef struct ecl_subsidence_survey_struct ecl_subsidence_survey_type;

12
ThirdParty/Ert/devel/libecl/src/ecl_sum.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum.h vendored
View File

@@ -27,13 +27,13 @@ extern "C" {
#include <stdbool.h>
#include <time.h>
#include <stringlist.h>
#include <time_t_vector.h>
#include <double_vector.h>
#include <ert/util/stringlist.h>
#include <ert/util/time_t_vector.h>
#include <ert/util/double_vector.h>
#include <ecl_smspec.h>
#include <ecl_sum_tstep.h>
#include <smspec_node.h>
#include <ert/ecl/ecl_smspec.h>
#include <ert/ecl/ecl_sum_tstep.h>
#include <ert/ecl/smspec_node.h>
typedef struct {

10
ThirdParty/Ert/devel/libecl/src/ecl_sum_data.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum_data.h vendored
View File

@@ -26,12 +26,12 @@ extern "C" {
#include <stdlib.h>
#include <time.h>
#include <time_t_vector.h>
#include <double_vector.h>
#include <stringlist.h>
#include <ert/util/time_t_vector.h>
#include <ert/util/double_vector.h>
#include <ert/util/stringlist.h>
#include <ecl_sum_tstep.h>
#include <smspec_node.h>
#include <ert/ecl/ecl_sum_tstep.h>
#include <ert/ecl/smspec_node.h>
typedef struct ecl_sum_data_struct ecl_sum_data_type ;
void ecl_sum_data_fwrite_step( const ecl_sum_data_type * data , const char * ecl_case , bool fmt_case , bool unified, int report_step);

0
ThirdParty/Ert/devel/libecl/src/ecl_sum_index.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum_index.h vendored
View File

6
ThirdParty/Ert/devel/libecl/src/ecl_sum_tstep.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum_tstep.h vendored
View File

@@ -23,10 +23,10 @@
extern "C" {
#endif
#include <int_vector.h>
#include <ert/util/int_vector.h>
#include <ecl_smspec.h>
#include <ecl_kw.h>
#include <ert/ecl/ecl_smspec.h>
#include <ert/ecl/ecl_kw.h>
typedef struct ecl_sum_tstep_struct ecl_sum_tstep_type;

3
ThirdParty/Ert/devel/libecl/src/ecl_util.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_util.h vendored
View File

@@ -23,7 +23,8 @@ extern "C" {
#endif
#include <stdbool.h>
#include <time.h>
#include <stringlist.h>
#include <ert/util/stringlist.h>
typedef enum { ECL_OTHER_FILE = 0 ,
ECL_RESTART_FILE = 1 ,

0
ThirdParty/Ert/devel/libecl/src/fortio.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/fortio.h vendored
View File

0
ThirdParty/Ert/devel/libecl/src/point.h → ThirdParty/Ert/devel/libecl/include/ert/ecl/point.h vendored
View File

Some files were not shown because too many files have changed in this diff Show More