OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Simplified code following further review

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-10-24 14:13:19 +02:00
parent 7bbe505d39
commit 7e5d358fa1
3 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ThirdParty/Ert/lib/ecl/ecl_coarse_cell.cpp
Vendored
+3 -10
View File
@@ -287,16 +287,9 @@ const int * ecl_coarse_cell_get_box_ptr( const ecl_coarse_cell_type * coarse_cel
/*****************************************************************/ /*****************************************************************/
void ecl_coarse_cell_reset_active_index(ecl_coarse_cell_type * coarse_cell, int active_value) { void ecl_coarse_cell_reset_active_index(ecl_coarse_cell_type * coarse_cell) {
if (active_value & CELL_ACTIVE_MATRIX) coarse_cell->active_index = -1;
{ coarse_cell->active_fracture_index = -1;
coarse_cell->active_index = -1;
}
if (active_value & CELL_ACTIVE_FRACTURE)
{
coarse_cell->active_fracture_index = -1;
}
} }
void ecl_coarse_cell_update_index( ecl_coarse_cell_type * coarse_cell , int global_index , int * active_index , int * active_fracture_index , int active_value) { void ecl_coarse_cell_update_index( ecl_coarse_cell_type * coarse_cell , int global_index , int * active_index , int * active_fracture_index , int active_value) {
ThirdParty/Ert/lib/ecl/ecl_grid.cpp
Vendored
+4 -18
View File
@@ -1875,26 +1875,12 @@ static void ecl_grid_set_active_index(ecl_grid_type * ecl_grid) {
} else { } else {
/* --- More involved path in the case of coarsening groups. --- */ /* --- More involved path in the case of coarsening groups. --- */
/* 1: Reset cell active_index across the entire grid. /* 1: Reset the coarse cell active_indices.
In the involved path ecl_coarse_cell_update_index() only updates In the involved path ecl_coarse_cell_update_index() only updates
the coarse cells' active_index if it is -1. */ the coarse cells' active_index if it is -1. */
for (global_index = 0; global_index < ecl_grid->size; global_index++) { for (int coarse_index = 0; coarse_index < vector_get_size(ecl_grid->coarse_cells); coarse_index++) {
ecl_cell_type * cell = ecl_grid_get_cell(ecl_grid, global_index); ecl_coarse_cell_type * coarse_cell = (ecl_coarse_cell_type*)vector_iget_const(ecl_grid->coarse_cells, coarse_index);
if (cell->coarse_group == COARSE_GROUP_NONE) ecl_coarse_cell_reset_active_index(coarse_cell);
{
if (cell->active & CELL_ACTIVE_MATRIX)
{
cell->active_index[MATRIX_INDEX] = -1;
}
if (cell->active & CELL_ACTIVE_FRACTURE)
{
cell->active_index[FRACTURE_INDEX] = -1;
}
} else {
ecl_coarse_cell_type * coarse_cell = ecl_grid_iget_coarse_group(ecl_grid, cell->coarse_group);
ecl_coarse_cell_reset_active_index(coarse_cell, cell->active);
}
} }
/* 2: Go through all the cells and set the active index. In the /* 2: Go through all the cells and set the active index. In the
ThirdParty/Ert/lib/include/ert/ecl/ecl_coarse_cell.hpp
Vendored
+1 -1
View File
@@ -51,7 +51,7 @@ int ecl_coarse_cell_iget_cell_index(ecl_coarse_cell_type * coarse_cell,
const int * ecl_coarse_cell_get_index_ptr(ecl_coarse_cell_type * coarse_cell); const int * ecl_coarse_cell_get_index_ptr(ecl_coarse_cell_type * coarse_cell);
const int_vector_type * ecl_coarse_cell_get_index_vector(ecl_coarse_cell_type * coarse_cell); const int_vector_type * ecl_coarse_cell_get_index_vector(ecl_coarse_cell_type * coarse_cell);
void ecl_coarse_cell_reset_active_index(ecl_coarse_cell_type * coarse_cell, int active_value); void ecl_coarse_cell_reset_active_index(ecl_coarse_cell_type * coarse_cell);
void ecl_coarse_cell_update_index(ecl_coarse_cell_type * coarse_cell, void ecl_coarse_cell_update_index(ecl_coarse_cell_type * coarse_cell,
int global_index, int global_index,
int * active_index, int * active_index,