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

Updated ERT to SVN 4117 for Linux 64

Browse Source 
p4#: 19185
This commit is contained in:
Magne Sjaastad 2012-10-16 09:12:03 +02:00
parent 427a7cb8c5
commit a8b5d9cee2
16 changed files with 131 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ThirdParty/Ert/include/buffer.h vendored
View File

@ -92,7 +92,7 @@ extern "C" {
buffer_type * buffer_fread_alloc(const char * filename);
void buffer_fread_realloc(buffer_type * buffer , const char * filename);
#ifdef HAVE_ZLIB
#ifdef WITH_ZLIB
size_t buffer_fwrite_compressed(buffer_type * buffer, const void * ptr , size_t byte_size);
size_t buffer_fread_compressed(buffer_type * buffer , size_t compressed_size , void * target_ptr , size_t target_size);
#endif

7
ThirdParty/Ert/include/ecl_grid.h vendored
View File

@ -61,11 +61,15 @@ extern "C" {
bool ecl_grid_ijk_valid(const ecl_grid_type * , int , int , int );
int ecl_grid_get_global_index3(const ecl_grid_type * , int , int , int );
int ecl_grid_get_global_index1A(const ecl_grid_type * ecl_grid , int active_index);
ecl_grid_type * ecl_grid_alloc_GRDECL_kw( int nx, int ny , int nz , const ecl_kw_type * zcorn_kw , const ecl_kw_type * coord_kw , const ecl_kw_type * actnum_kw , const ecl_kw_type * mapaxes_kw );
ecl_grid_type * ecl_grid_alloc_GRDECL_data(int , int , int , const float * , const float * , const int * , const float * mapaxes);
ecl_grid_type * ecl_grid_alloc_GRID_data(int num_coords , int nx, int ny , int nz , int coords_size , int ** coords , float ** corners , const float * mapaxes);
ecl_grid_type * ecl_grid_alloc(const char * );
ecl_grid_type * ecl_grid_load_case( const char * case_input );
ecl_grid_type * ecl_grid_alloc_rectangular( int nx , int ny , int nz , double dx , double dy , double dz , const int * actnum);
ecl_grid_type * ecl_grid_alloc_regular( int nx, int ny , int nz , const double * ivec, const double * jvec , const double * kvec , const int * actnum);
bool ecl_grid_exists( const char * case_input );
char * ecl_grid_alloc_case_filename( const char * case_input );
@ -148,6 +152,9 @@ extern "C" {
ecl_kw_type * ecl_grid_alloc_hostnum_kw( const ecl_grid_type * grid );
ecl_kw_type * ecl_grid_alloc_gridhead_kw( int nx, int ny , int nz , int grid_nr);
void ecl_grid_ri_export( const ecl_grid_type * ecl_grid , double * ri_points);
void ecl_grid_cell_ri_export( const ecl_grid_type * ecl_grid , int global_index , double * ri_points);
#ifdef __cplusplus
}
#endif

61
ThirdParty/Ert/include/ecl_kw.h vendored
View File

@ -103,9 +103,6 @@ extern "C" {
bool ecl_kw_is_grdecl_file(FILE * );
bool ecl_kw_is_kw_file(FILE * , bool );
void ecl_kw_inplace_sub(ecl_kw_type * , const ecl_kw_type * );
void ecl_kw_inplace_mul(ecl_kw_type * , const ecl_kw_type * );
void ecl_kw_inplace_div(ecl_kw_type * , const ecl_kw_type * );
double ecl_kw_element_sum_float( const ecl_kw_type * ecl_kw );
void ecl_kw_inplace_inv(ecl_kw_type * my_kw);
@ -113,8 +110,6 @@ extern "C" {
void ecl_kw_max_min(const ecl_kw_type * , void * , void *);
void * ecl_kw_get_void_ptr(const ecl_kw_type * ecl_kw);
double ecl_kw_iget_as_double(const ecl_kw_type * , int );
ecl_kw_type * ecl_kw_buffer_alloc(buffer_type * buffer);
void ecl_kw_buffer_store(const ecl_kw_type * ecl_kw , buffer_type * buffer);
@ -149,29 +144,29 @@ extern "C" {
void ecl_kw_copy_indexed( ecl_kw_type * target_kw , const int_vector_type * index_set , const ecl_kw_type * src_kw);
bool ecl_kw_assert_binary_numeric( const ecl_kw_type * kw1, const ecl_kw_type * kw2);
#define ECL_KW_ASSERT_TYPED_BINARY_OP_HEADER( ctype ) bool ecl_kw_assert_binary_ ## ctype( const ecl_kw_type * kw1 , const ecl_kw_type * kw2);
ECL_KW_ASSERT_TYPED_BINARY_OP_HEADER( int )
ECL_KW_ASSERT_TYPED_BINARY_OP_HEADER( float )
ECL_KW_ASSERT_TYPED_BINARY_OP_HEADER( double )
#define ECL_KW_ASSERT_TYPED_BINARY_OP_HEADER( ctype ) bool ecl_kw_assert_binary_ ## ctype( const ecl_kw_type * kw1 , const ecl_kw_type * kw2)
ECL_KW_ASSERT_TYPED_BINARY_OP_HEADER( int );
ECL_KW_ASSERT_TYPED_BINARY_OP_HEADER( float );
ECL_KW_ASSERT_TYPED_BINARY_OP_HEADER( double );
#undef ECL_KW_ASSERT_TYPED_BINARY_OP_HEADER
#define ECL_KW_SCALE_TYPED_HEADER( ctype ) void ecl_kw_scale_ ## ctype (ecl_kw_type * ecl_kw , ctype scale_factor);
ECL_KW_SCALE_TYPED_HEADER( int )
ECL_KW_SCALE_TYPED_HEADER( float )
ECL_KW_SCALE_TYPED_HEADER( double )
#define ECL_KW_SCALE_TYPED_HEADER( ctype ) void ecl_kw_scale_ ## ctype (ecl_kw_type * ecl_kw , ctype scale_factor)
ECL_KW_SCALE_TYPED_HEADER( int );
ECL_KW_SCALE_TYPED_HEADER( float );
ECL_KW_SCALE_TYPED_HEADER( double );
#undef ECL_KW_SCALE_TYPED_HEADER
void ecl_kw_scale_float_or_double( ecl_kw_type * ecl_kw , double scale_factor );
#define ECL_KW_SHIFT_TYPED_HEADER( ctype ) void ecl_kw_shift_ ## ctype (ecl_kw_type * ecl_kw , ctype shift_factor);
ECL_KW_SHIFT_TYPED_HEADER( int )
ECL_KW_SHIFT_TYPED_HEADER( float )
ECL_KW_SHIFT_TYPED_HEADER( double )
#define ECL_KW_SHIFT_TYPED_HEADER( ctype ) void ecl_kw_shift_ ## ctype (ecl_kw_type * ecl_kw , ctype shift_factor)
ECL_KW_SHIFT_TYPED_HEADER( int );
ECL_KW_SHIFT_TYPED_HEADER( float );
ECL_KW_SHIFT_TYPED_HEADER( double );
#undef ECL_KW_SHIFT_TYPED_HEADER
void ecl_kw_shift_float_or_double( ecl_kw_type * ecl_kw , double shift_value );
#define ECL_KW_IGET_TYPED_HEADER(type) type ecl_kw_iget_ ## type(const ecl_kw_type * , int);
#define ECL_KW_IGET_TYPED_HEADER(type) type ecl_kw_iget_ ## type(const ecl_kw_type * , int)
ECL_KW_IGET_TYPED_HEADER(double);
ECL_KW_IGET_TYPED_HEADER(float);
ECL_KW_IGET_TYPED_HEADER(int);
@ -179,7 +174,7 @@ extern "C" {
bool ecl_kw_iget_bool( const ecl_kw_type * ecl_kw , int i );
#define ECL_KW_ISET_TYPED_HEADER(type) void ecl_kw_iset_ ## type(ecl_kw_type * , int , type );
#define ECL_KW_ISET_TYPED_HEADER(type) void ecl_kw_iset_ ## type(ecl_kw_type * , int , type )
ECL_KW_ISET_TYPED_HEADER(double);
ECL_KW_ISET_TYPED_HEADER(float);
ECL_KW_ISET_TYPED_HEADER(int);
@ -187,7 +182,7 @@ extern "C" {
void ecl_kw_iset_bool( ecl_kw_type * ecl_kw , int i , bool bool_value);
#define ECL_KW_GET_TYPED_PTR_HEADER(type) type * ecl_kw_get_ ## type ## _ptr(const ecl_kw_type *);
#define ECL_KW_GET_TYPED_PTR_HEADER(type) type * ecl_kw_get_ ## type ## _ptr(const ecl_kw_type *)
ECL_KW_GET_TYPED_PTR_HEADER(double);
ECL_KW_GET_TYPED_PTR_HEADER(float);
ECL_KW_GET_TYPED_PTR_HEADER(int);
@ -195,31 +190,31 @@ extern "C" {
#undef ECL_KW_GET_TYPED_PTR_HEADER
#define ECL_KW_SET_INDEXED_HEADER(ctype ) void ecl_kw_set_indexed_ ## ctype( ecl_kw_type * ecl_kw, const int_vector_type * index_list , ctype value);
#define ECL_KW_SET_INDEXED_HEADER(ctype ) void ecl_kw_set_indexed_ ## ctype( ecl_kw_type * ecl_kw, const int_vector_type * index_list , ctype value)
ECL_KW_SET_INDEXED_HEADER( double );
ECL_KW_SET_INDEXED_HEADER( float );
ECL_KW_SET_INDEXED_HEADER( int );
#undef ECL_KW_SET_INDEXED_HEADER
#define ECL_KW_SHIFT_INDEXED_HEADER(ctype) void ecl_kw_shift_indexed_ ## ctype( ecl_kw_type * ecl_kw, const int_vector_type * index_list , ctype shift);
ECL_KW_SHIFT_INDEXED_HEADER( int )
ECL_KW_SHIFT_INDEXED_HEADER( float )
ECL_KW_SHIFT_INDEXED_HEADER( double )
#define ECL_KW_SHIFT_INDEXED_HEADER(ctype) void ecl_kw_shift_indexed_ ## ctype( ecl_kw_type * ecl_kw, const int_vector_type * index_list , ctype shift)
ECL_KW_SHIFT_INDEXED_HEADER( int );
ECL_KW_SHIFT_INDEXED_HEADER( float );
ECL_KW_SHIFT_INDEXED_HEADER( double );
#undef ECL_KW_SHIFT_INDEXED_HEADER
#define ECL_KW_SCALE_INDEXED_HEADER(ctype) void ecl_kw_scale_indexed_ ## ctype( ecl_kw_type * ecl_kw, const int_vector_type * index_list , ctype scale);
ECL_KW_SCALE_INDEXED_HEADER( int )
ECL_KW_SCALE_INDEXED_HEADER( float )
ECL_KW_SCALE_INDEXED_HEADER( double )
#define ECL_KW_SCALE_INDEXED_HEADER(ctype) void ecl_kw_scale_indexed_ ## ctype( ecl_kw_type * ecl_kw, const int_vector_type * index_list , ctype scale)
ECL_KW_SCALE_INDEXED_HEADER( int );
ECL_KW_SCALE_INDEXED_HEADER( float );
ECL_KW_SCALE_INDEXED_HEADER( double );
#undef ECL_KW_SCALE_INDEXED_HEADER
#define ECL_KW_MAX_MIN_HEADER( ctype ) void ecl_kw_max_min_ ## ctype( const ecl_kw_type * ecl_kw , ctype * _max , ctype * _min);
ECL_KW_MAX_MIN_HEADER( int )
ECL_KW_MAX_MIN_HEADER( float )
ECL_KW_MAX_MIN_HEADER( double )
#define ECL_KW_MAX_MIN_HEADER( ctype ) void ecl_kw_max_min_ ## ctype( const ecl_kw_type * ecl_kw , ctype * _max , ctype * _min)
ECL_KW_MAX_MIN_HEADER( int );
ECL_KW_MAX_MIN_HEADER( float );
ECL_KW_MAX_MIN_HEADER( double );
#undef ECL_KW_MAX_MIN_HEADER
#include <ecl_kw_grdecl.h>

3
ThirdParty/Ert/include/ecl_kw_magic.h vendored
View File

@ -255,6 +255,9 @@ extern "C" {
/* Common keywords */
#define SPECGRID_KW "SPECGRID"
#define SPECGRID_NX_INDEX 0
#define SPECGRID_NY_INDEX 1
#define SPECGRID_NZ_INDEX 2
#define MAPAXES_KW "MAPAXES" /* Keyword used to transform from grid coordinates to
world coordinates. */
#define LGR_KW "LGR" /* Name of LGR; for GRID files it can contain two elements,

5
ThirdParty/Ert/include/ecl_smspec.h vendored
View File

@ -44,7 +44,8 @@ typedef struct ecl_smspec_struct ecl_smspec_type;
ecl_smspec_install_gen_key() must be updated.
*/
const int_vector_type * ecl_smspec_get_index_map( const ecl_smspec_type * smspec );
void ecl_smspec_index_node( ecl_smspec_type * ecl_smspec , smspec_node_type * smspec_node);
void ecl_smspec_insert_node(ecl_smspec_type * ecl_smspec, smspec_node_type * smspec_node);
void ecl_smspec_add_node( ecl_smspec_type * ecl_smspec , smspec_node_type * smspec_node );
ecl_smspec_var_type ecl_smspec_iget_var_type( const ecl_smspec_type * smspec , int index );
bool ecl_smspec_needs_num( ecl_smspec_var_type var_type );
@ -112,7 +113,7 @@ typedef struct ecl_smspec_struct ecl_smspec_type;
void ecl_smspec_init_var( ecl_smspec_type * ecl_smspec , smspec_node_type * smspec_node , const char * keyword , const char * wgname , int num, const char * unit );
void ecl_smspec_select_matching_general_var_list( const ecl_smspec_type * smspec , const char * pattern , stringlist_type * keys);
stringlist_type * ecl_smspec_alloc_matching_general_var_list(const ecl_smspec_type * smspec , const char * pattern);

2
ThirdParty/Ert/include/ecl_sum.h vendored
View File

@ -173,6 +173,8 @@ typedef struct ecl_sum_struct ecl_sum_type;
void ecl_sum_fwrite( const ecl_sum_type * ecl_sum );
void ecl_sum_fwrite_smspec( const ecl_sum_type * ecl_sum );
smspec_node_type * ecl_sum_add_var( ecl_sum_type * ecl_sum , const char * keyword , const char * wgname , int num , const char * unit , float default_value);
smspec_node_type * ecl_sum_add_blank_var( ecl_sum_type * ecl_sum , float default_value);
void ecl_sum_init_var( ecl_sum_type * ecl_sum , smspec_node_type * smspec_node , const char * keyword , const char * wgname , int num , const char * unit);
ecl_sum_tstep_type * ecl_sum_add_tstep( ecl_sum_type * ecl_sum , int report_step , double sim_days);
void ecl_sum_update_wgname( ecl_sum_type * ecl_sum , smspec_node_type * node , const char * wgname );

1
ThirdParty/Ert/include/matrix.h vendored
View File

@ -131,6 +131,7 @@ typedef struct matrix_struct matrix_type;
double matrix_trace(const matrix_type *matrix);
double matrix_diag_std(const matrix_type * Sk,double mean);
double matrix_det3( const matrix_type * A);
double matrix_det4( const matrix_type * A);
#ifdef HAVE_ISFINITE
bool matrix_is_finite(const matrix_type * matrix);

3
ThirdParty/Ert/include/path_fmt.h vendored
View File

@ -27,8 +27,6 @@ extern "C" {
typedef struct path_fmt_struct path_fmt_type;
path_fmt_type * path_fmt_safe_cast(const void * arg);
path_fmt_type * path_fmt_alloc_directory_fmt(const char * );
path_fmt_type * path_fmt_alloc_path_fmt(const char * );
path_fmt_type * path_fmt_copyc(const path_fmt_type *);
@ -36,6 +34,7 @@ path_fmt_type * path_fmt_scanf_alloc(const char * , int , const node_ctype * ,
char * path_fmt_alloc_path(const path_fmt_type * , bool , ...);
char * path_fmt_alloc_file(const path_fmt_type * , bool , ...);
void path_fmt_free(path_fmt_type * );
void path_fmt_free__( void * arg );
const char * path_fmt_get_fmt(const path_fmt_type * );
void path_fmt_reset_fmt(path_fmt_type * , const char * );
void path_fmt_make_path(const path_fmt_type * );

16
ThirdParty/Ert/include/smspec_node.h vendored
View File

@ -68,6 +68,15 @@ typedef enum {ECL_SMSPEC_INVALID_VAR = 0 ,
char * smspec_alloc_local_completion_key( const char * join_string, const char * keyword , const char * lgr_name , const char * wgname , int i , int j , int k);
bool smspec_node_init( smspec_node_type * smspec_node,
ecl_smspec_var_type var_type ,
const char * wgname ,
const char * keyword ,
const char * unit ,
const char * key_join_string ,
const int grid_dims[3] ,
int num);
smspec_node_type * smspec_node_alloc( ecl_smspec_var_type var_type ,
const char * wgname ,
@ -87,6 +96,7 @@ typedef enum {ECL_SMSPEC_INVALID_VAR = 0 ,
int param_index,
float default_value);
smspec_node_type * smspec_node_alloc_new(int params_index, float default_value);
void smspec_node_free( smspec_node_type * index );
void smspec_node_free__(void * arg);
@ -100,12 +110,16 @@ typedef enum {ECL_SMSPEC_INVALID_VAR = 0 ,
void smspec_node_update_wgname( smspec_node_type * index , const char * wgname , const char * key_join_string);
const char * smspec_node_get_keyword( const smspec_node_type * smspec_node);
const char * smspec_node_get_unit( const smspec_node_type * smspec_node);
void smspec_node_set_unit( smspec_node_type * smspec_node , const char * unit );
bool smspec_node_is_rate( const smspec_node_type * smspec_node );
bool smspec_node_is_total( const smspec_node_type * smspec_node );
bool smspec_node_need_nums( const smspec_node_type * smspec_node );
float smspec_node_get_default_value( const smspec_node_type * smspec_node );
void smspec_node_fprintf( const smspec_node_type * smspec_node , FILE * stream);
void smspec_node_set_default( smspec_node_type * smspec_node , float default_value);
float smspec_node_get_default( const smspec_node_type * smspec_node);
#ifdef __cplusplus
}
#endif

4
ThirdParty/Ert/include/thread_pool.h vendored
View File

@ -18,8 +18,8 @@
#ifndef __THREAD_POOL_H__
#define __THREAD_POOL_H__
#ifdef HAVE_PTHREAD
#define HAVE_THREAD_POOL
#ifdef WITH_PTHREAD
#define WITH_THREAD_POOL
#include "thread_pool_posix.h"
#endif

2
ThirdParty/Ert/include/util.h vendored
View File

@ -405,7 +405,7 @@ const char * util_enum_iget( int index , int size , const util_enum_element_type
/*****************************************************************/
/* Conditional section below here */
#ifdef HAVE_ZLIB
#ifdef WITH_ZLIB
void util_compress_buffer(const void * , int , void * , unsigned long * );
int util_fread_sizeof_compressed(FILE * stream);
void util_fread_compressed(void * , FILE * );

4
ThirdParty/Ert/include/vector.h vendored
View File

@ -23,6 +23,7 @@
extern "C" {
#endif
#include <node_data.h>
#include <type_macros.h>
typedef void ( vector_func_type ) (void * , void *);
typedef int ( vector_cmp_ftype) (const void * , const void *);
@ -30,8 +31,8 @@ typedef int ( vector_cmp_ftype) (const void * , const void *);
typedef struct vector_struct vector_type;
vector_type * vector_alloc_new();
void vector_grow_NULL( vector_type * vector , int new_size );
vector_type * vector_alloc_NULL_initialized( int size );
int vector_append_ref( vector_type * , const void *);
@ -77,6 +78,7 @@ vector_type * vector_alloc_copy(const vector_type * src , bool deep_copy);
void vector_iset_buffer(vector_type * vector , int index , const void * buffer, int buffer_size);
UTIL_IS_INSTANCE_HEADER( vector );
#ifdef __cplusplus
}

BIN
ThirdParty/Ert/lib/libecl.a vendored
View File

Binary file not shown.

BIN
ThirdParty/Ert/lib/libert_util.a vendored
View File

Binary file not shown.

BIN
ThirdParty/Ert/lib/libgeometry.a vendored
View File

Binary file not shown.

BIN
ThirdParty/Ert/lib/libwell.a vendored
View File

Binary file not shown.