OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update to match changes in opm-autodiff.

Browse Source 
BlackoilModelBase now requires an EclipseState constructor argument.
Also silenced two minor warnings.
This commit is contained in:
Atgeirr Flø Rasmussen
2015-07-10 12:57:30 +02:00
parent 8f46134861
commit 834d607d57
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp
View File

@@ -80,6 +80,7 @@ namespace Opm {
const PolymerPropsAd& polymer_props_ad,
const Wells* wells,
const NewtonIterationBlackoilInterface& linsolver,
EclipseStateConstPtr eclipse_state,
const bool has_disgas,
const bool has_vapoil,
const bool has_polymer,

7
opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp
View File

@@ -82,6 +82,7 @@ namespace Opm {
const PolymerPropsAd& polymer_props_ad,
const Wells* wells,
const NewtonIterationBlackoilInterface& linsolver,
EclipseStateConstPtr eclipse_state,
const bool has_disgas,
const bool has_vapoil,
const bool has_polymer,
@@ -91,7 +92,7 @@ namespace Opm {
const std::vector<double>& wells_perf_length,
const std::vector<double>& wells_bore_diameter,
const bool terminal_output)
: Base(param, grid, fluid, geo, rock_comp_props, wells, linsolver,
: Base(param, grid, fluid, geo, rock_comp_props, wells, linsolver, eclipse_state,
has_disgas, has_vapoil, terminal_output),
polymer_props_ad_(polymer_props_ad),
has_polymer_(has_polymer),
@@ -806,7 +807,7 @@ namespace Opm {
std::vector<double> internal_face_areas;
internal_face_areas.resize(internal_faces.size());
for (size_t i = 0; i < internal_faces.size(); ++i) {
for (int i = 0; i < internal_faces.size(); ++i) {
internal_face_areas[i] = grid_.face_areas[internal_faces[i]];
}
@@ -835,7 +836,7 @@ namespace Opm {
std::vector<double> perm;
perm.resize(transi.size());
for (size_t i = 0; i < transi.size(); ++i) {
for (int i = 0; i < transi.size(); ++i) {
perm[i] = transi[i] / internal_faces[i];
}

1
opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp
View File

@@ -76,6 +76,7 @@ namespace Opm
polymer_props_,
wells,
BaseType::solver_,
BaseType::eclipse_state_,
BaseType::has_disgas_,
BaseType::has_vapoil_,
has_polymer_,