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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Bård Skaflestad
2012-10-02 19:30:31 +02:00
parent b314f4ed3a 69f8d98f8f
commit e169273b50
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opm/simulators/SimulatorCompressibleTwophase.cpp
View File

@@ -196,6 +196,7 @@ namespace Opm
if (!file) { if (!file) {
THROW("Failed to open " << fname.str()); THROW("Failed to open " << fname.str());
} }
file.precision(15);
const std::vector<double>& d = *(it->second); const std::vector<double>& d = *(it->second);
std::copy(d.begin(), d.end(), std::ostream_iterator<double>(file, "\n")); std::copy(d.begin(), d.end(), std::ostream_iterator<double>(file, "\n"));
} }
@@ -434,9 +435,8 @@ namespace Opm
computePorevolume(grid_, props_.porosity(), *rock_comp_, state.pressure(), porevol); computePorevolume(grid_, props_.porosity(), *rock_comp_, state.pressure(), porevol);
} }
// Process transport sources (to include bdy terms and well flows). // Process transport sources from well flows.
Opm::computeTransportSource(grid_, src_, state.faceflux(), 1.0, Opm::computeTransportSource(props_, wells_, well_state, transport_src);
wells_, well_state.perfRates(), transport_src);
// Solve transport. // Solve transport.
transport_timer.start(); transport_timer.start();
@@ -449,9 +449,7 @@ namespace Opm
tsolver_.solve(&state.faceflux()[0], &state.pressure()[0], tsolver_.solve(&state.faceflux()[0], &state.pressure()[0],
&initial_porevol[0], &porevol[0], &transport_src[0], stepsize, &initial_porevol[0], &porevol[0], &transport_src[0], stepsize,
state.saturation(), state.surfacevol()); state.saturation(), state.surfacevol());
Opm::computeInjectedProduced(props_, Opm::computeInjectedProduced(props_, state, transport_src, stepsize, injected, produced);
state.pressure(), state.surfacevol(), state.saturation(),
transport_src, stepsize, injected, produced);
if (gravity_ != 0 && use_segregation_split_) { if (gravity_ != 0 && use_segregation_split_) {
tsolver_.solveGravity(columns_, stepsize, state.saturation(), state.surfacevol()); tsolver_.solveGravity(columns_, stepsize, state.saturation(), state.surfacevol());
} }

1
opm/simulators/SimulatorIncompTwophase.cpp
View File

@@ -244,6 +244,7 @@ namespace Opm
if (!file) { if (!file) {
THROW("Failed to open " << fname.str()); THROW("Failed to open " << fname.str());
} }
file.precision(15);
const std::vector<double>& d = *(it->second); const std::vector<double>& d = *(it->second);
std::copy(d.begin(), d.end(), std::ostream_iterator<double>(file, "\n")); std::copy(d.begin(), d.end(), std::ostream_iterator<double>(file, "\n"));
} }