OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-22 17:26:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #604 from atgeirr/minor-fixes

Browse Source 
Fix minor initialization and overriding bugs.
This commit is contained in:
Atgeirr Flø Rasmussen 2016-03-04 11:21:09 +01:00
commit f7f18c70bb
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -178,7 +178,8 @@ namespace detail {
, residual_ ( { std::vector<ADB>(fluid.numPhases(), ADB::null()),
ADB::null(),
ADB::null(),
{ 1.1169, 1.0031, 0.0031 }} ) // the default magic numbers
{ 1.1169, 1.0031, 0.0031 }, // the default magic numbers
false } )
, terminal_output_ (terminal_output)
, material_name_{ "Water", "Oil", "Gas" }
, current_relaxation_(1.0)

2
opm/polymer/IncompTpfaPolymer.cpp
View File

@ -116,7 +116,7 @@ namespace Opm
/// Compute per-solve dynamic properties.
void IncompTpfaPolymer::computePerSolveDynamicData(const double /*dt*/,
const PolymerState& state,
const SimulatorState& state,
const WellState& /*well_state*/)
{
// Computed here:

2
opm/polymer/IncompTpfaPolymer.hpp
View File

@ -96,7 +96,7 @@ namespace Opm
private:
virtual void computePerSolveDynamicData(const double dt,
const PolymerState& state,
const SimulatorState& state,
const WellState& well_state);
private:
// ------ Data that will remain unmodified after construction. ------