OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now computePorevolume() takes a porosity array instead of a property object.

Browse Source 
This is to make it compatible with blackoil properties.
An alternative would be to give [Incomp|Blackoil]PropertiesInterface a
common base class (RockInterface?) with the common rock-related methods.
This commit is contained in:
Atgeirr Flø Rasmussen
2012-05-14 21:47:10 +02:00
parent b33ce1ca1a
commit 67e3d38bec
5 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/wells_example.cpp
View File

@@ -92,9 +92,9 @@ int main(int argc, char** argv)
const int num_cells = grid.c_grid()->number_of_cells;
std::vector<double> porevol;
if (rock_comp.isActive()) {
computePorevolume(*grid.c_grid(), incomp_properties, rock_comp, state.pressure(), porevol);
computePorevolume(*grid.c_grid(), incomp_properties.porosity(), rock_comp, state.pressure(), porevol);
} else {
computePorevolume(*grid.c_grid(), incomp_properties, porevol);
computePorevolume(*grid.c_grid(), incomp_properties.porosity(), porevol);
}
if (rock_comp.isActive()) {
std::vector<double> initial_pressure = state.pressure();
@@ -116,7 +116,7 @@ int main(int argc, char** argv)
break;
}
}
computePorevolume(*grid.c_grid(), incomp_properties, rock_comp, state.pressure(), porevol);
computePorevolume(*grid.c_grid(), incomp_properties.porosity(), rock_comp, state.pressure(), porevol);
} else {
pressure_solver.solve(totmob, omega, src, wdp, bcs.c_bcs(), state.pressure(), state.faceflux(),
well_bhp, well_rate_per_cell);
@@ -152,7 +152,7 @@ int main(int argc, char** argv)
break;
}
}
computePorevolume(*grid.c_grid(), incomp_properties, rock_comp, state.pressure(), porevol);
computePorevolume(*grid.c_grid(), incomp_properties.porosity(), rock_comp, state.pressure(), porevol);
} else {
pressure_solver.solve(totmob, omega, src, wdp, bcs.c_bcs(), state.pressure(), state.faceflux(),
well_bhp, well_rate_per_cell);