Nnc new data structure #80
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 6 commits
May 23, 2017 13:20
joakim-hove
reviewed
May 24, 2017
| @@ -29,7 +29,7 @@ extern "C" { | |||
|
|
|||
| typedef struct ecl_nnc_data_struct ecl_nnc_data_type; | |||
|
|
|||
| ecl_nnc_data_type * ecl_nnc_data_alloc_tran(ecl_nnc_geometry_type * nnc_geo, ecl_file_view_type * view_file); | |||
| ecl_nnc_data_type * ecl_nnc_data_alloc_tran(const ecl_grid_type * grid, ecl_nnc_geometry_type * nnc_geo, ecl_file_view_type * init_file); | |||
There was a problem hiding this comment.
The ecl_nnc_geometry_type * should be const ecl_nnc_geometry_type *.
joakim-hove
reviewed
May 24, 2017
libecl/src/ecl_nnc_data.c
Outdated
| int current_grid1 = -1; | ||
| int current_grid2 = -1; | ||
| ecl_kw_type * tran_kw = NULL; | ||
|
|
||
| for (int nnc_index = 0; nnc_index < data->size; nnc_index++) { | ||
| ecl_nnc_pair_type * pair = ecl_nnc_geometry_iget( nnc_geo, nnc_index ); |
joakim-hove
reviewed
May 24, 2017
| @@ -60,6 +61,20 @@ void test_alloc_file(char * filename) { | |||
| index = find_index( nnc_geo, 0, 0, 48365, 118191); | |||
| test_assert_double_equal(0.580284 , ecl_nnc_data_iget_value( nnc_geo_data, index) ); | |||
|
|
|||
| index = find_index( nnc_geo, 0, 19, 42830, 211); | |||
There was a problem hiding this comment.
These numerical values are handtuned to the input file: ???
|
Go here: https://github.com/Statoil/libecl/blob/master/libecl/tests/ecl_nnc_export.c#L236 and add a |
joakim-hove
approved these changes
May 24, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Can now read all TRANX_KW.