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

Ert: Updated to 9a2492633ab037b83952c5b643a7ba06851481b1 that fixes MSVC10 compile issues

Browse Source
This commit is contained in:
Jacob Støren 2013-12-09 16:33:26 +01:00
parent a0404333ab
commit 76d32d1a73
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ThirdParty/Ert/devel/libecl/src/ecl_nnc_export.c vendored
View File

@ -37,7 +37,7 @@ static void ecl_nnc_export__( const ecl_grid_type * grid , int lgr_index1 , con
int nnc_index = *nnc_offset; int nnc_index = *nnc_offset;
int lgr_nr1 = ecl_grid_get_lgr_nr( grid ); int lgr_nr1 = ecl_grid_get_lgr_nr( grid );
int global_index1; int global_index1;
ecl_grid_type * global_grid = ecl_grid_get_global_grid( grid ); const ecl_grid_type * global_grid = ecl_grid_get_global_grid( grid );
if (!global_grid) if (!global_grid)
global_grid = grid; global_grid = grid;
@ -54,11 +54,12 @@ static void ecl_nnc_export__( const ecl_grid_type * grid , int lgr_index1 , con
int lgr_nr2 = nnc_vector_get_lgr_nr( nnc_vector ); int lgr_nr2 = nnc_vector_get_lgr_nr( nnc_vector );
const ecl_kw_type * tran_kw = ecl_nnc_export_get_tranx_kw(global_grid , init_file , lgr_nr1 , lgr_nr2 ); const ecl_kw_type * tran_kw = ecl_nnc_export_get_tranx_kw(global_grid , init_file , lgr_nr1 , lgr_nr2 );
int index2; int index2;
ecl_nnc_type nnc;
nnc.grid_nr1 = lgr_nr1;
nnc.grid_nr2 = lgr_nr2;
nnc.global_index1 = global_index1;
ecl_nnc_type nnc = {.grid_nr1 = lgr_nr1 ,
.grid_nr2 = lgr_nr2 ,
.global_index1 = global_index1 };
for (index2 = 0; index2 < nnc_vector_get_size( nnc_vector ); index2++) { for (index2 = 0; index2 < nnc_vector_get_size( nnc_vector ); index2++) {
nnc.global_index2 = int_vector_iget( grid2_index_list , index2 ); nnc.global_index2 = int_vector_iget( grid2_index_list , index2 );
nnc.trans = ecl_kw_iget_as_double( tran_kw , int_vector_iget( nnc_index_list , index2)); nnc.trans = ecl_kw_iget_as_double( tran_kw , int_vector_iget( nnc_index_list , index2));

8
ThirdParty/Ert/devel/libecl/src/nnc_info.c vendored
View File

@ -148,9 +148,11 @@ void nnc_info_fprintf(const nnc_info_type * nnc_info , FILE * stream) {
int lgr_index = int_vector_iget( nnc_info->lgr_index_map , lgr_nr ); int lgr_index = int_vector_iget( nnc_info->lgr_index_map , lgr_nr );
if (lgr_index >= 0) { if (lgr_index >= 0) {
printf(" %02d -> %02d => ",lgr_nr , lgr_index); printf(" %02d -> %02d => ",lgr_nr , lgr_index);
const int_vector_type * index_list = nnc_info_iget_grid_index_list( nnc_info , lgr_index ); {
int_vector_fprintf( index_list , stream , " " , "%d"); const int_vector_type * index_list = nnc_info_iget_grid_index_list( nnc_info , lgr_index );
printf("\n"); int_vector_fprintf( index_list , stream , " " , "%d");
printf("\n");
}
} }
} }
} }