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

change the name of computeSegmentDensitiesAndCompVolumeDt

Browse Source 
to computeSegmentFluidProperties to include calculation of more fluid mixture in the segments.
This commit is contained in:
Kai Bao 2015-10-16 13:02:48 +02:00
parent 8bde14d7ce
commit 3b3ac203d9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/BlackoilMultiSegmentModel.hpp
View File

@ -279,7 +279,7 @@ namespace Opm {
// Calculate the density of the mixture in the segments // Calculate the density of the mixture in the segments
// And the surface volume of the components in the segments by dt // And the surface volume of the components in the segments by dt
void void
computeSegmentDensitiesAndCompVolumeDt(const SolutionState& state); computeSegmentFluidProperties(const SolutionState& state);
void void
computeSegmentPressuresDelta(const SolutionState& state); computeSegmentPressuresDelta(const SolutionState& state);

6
opm/autodiff/BlackoilMultiSegmentModel_impl.hpp
View File

@ -509,7 +509,7 @@ namespace Opm {
// Compute initial accumulation contributions // Compute initial accumulation contributions
// and well connection pressures. // and well connection pressures.
asImpl().computeAccum(state0, 0); asImpl().computeAccum(state0, 0);
asImpl().computeSegmentDensitiesAndCompVolumeDt(state0); asImpl().computeSegmentFluidProperties(state0);
const int np = numPhases(); const int np = numPhases();
assert(np == int(segment_comp_surf_volume_initial_.size())); assert(np == int(segment_comp_surf_volume_initial_.size()));
for (int phase = 0; phase < np; ++phase) { for (int phase = 0; phase < np; ++phase) {
@ -536,7 +536,7 @@ namespace Opm {
return; return;
} }
asImpl().computeSegmentDensitiesAndCompVolumeDt(state); asImpl().computeSegmentFluidProperties(state);
asImpl().computeSegmentPressuresDelta(state); asImpl().computeSegmentPressuresDelta(state);
std::vector<ADB> mob_perfcells; std::vector<ADB> mob_perfcells;
@ -1667,7 +1667,7 @@ namespace Opm {
template <class Grid> template <class Grid>
void void
BlackoilMultiSegmentModel<Grid>::computeSegmentDensitiesAndCompVolumeDt(const SolutionState& state) BlackoilMultiSegmentModel<Grid>::computeSegmentFluidProperties(const SolutionState& state)
{ {
const int nw = wellsMultiSegment().size(); const int nw = wellsMultiSegment().size();
const int nseg_total = state.segp.size(); const int nseg_total = state.segp.size();