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

Variable renaming.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2010-12-06 15:11:47 +01:00
parent d1a390a136
commit c7b180de7b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dune/porsol/blackoil/BlackoilFluid.hpp
View File

@ -91,14 +91,14 @@ namespace Opm
template <class Grid> template <class Grid>
void compute(const Grid& grid, void compute(const Grid& grid,
const BlackoilFluid& fluid, const BlackoilFluid& fluid,
const std::vector<PhaseVec>& phase_pressure, const std::vector<PhaseVec>& cell_pressure,
const std::vector<PhaseVec>& phase_pressure_face, const std::vector<PhaseVec>& face_pressure,
const std::vector<CompVec>& z, const std::vector<CompVec>& z,
const CompVec& bdy_z) const CompVec& bdy_z)
{ {
int num_cells = z.size(); int num_cells = z.size();
ASSERT(num_cells == grid.numCells()); ASSERT(num_cells == grid.numCells());
int num_faces = phase_pressure_face.size(); int num_faces = face_pressure.size();
ASSERT(num_faces == grid.numFaces()); ASSERT(num_faces == grid.numFaces());
const int np = numPhases; const int np = numPhases;
const int nc = numComponents; const int nc = numComponents;
@ -116,7 +116,7 @@ namespace Opm
PhaseVec mob; PhaseVec mob;
BOOST_STATIC_ASSERT(np == 3); BOOST_STATIC_ASSERT(np == 3);
for (int cell = 0; cell < num_cells; ++cell) { for (int cell = 0; cell < num_cells; ++cell) {
FluidStateBlackoil state = fluid.computeState(phase_pressure[cell], z[cell]); FluidStateBlackoil state = fluid.computeState(cell_pressure[cell], z[cell]);
totcompr[cell] = state.total_compressibility_; totcompr[cell] = state.total_compressibility_;
totphasevol[cell] = state.total_phase_volume_; totphasevol[cell] = state.total_phase_volume_;
saturation[cell] = state.saturation_; saturation[cell] = state.saturation_;
@ -141,7 +141,7 @@ namespace Opm
int num = 0; int num = 0;
for (int j = 0; j < 2; ++j) { for (int j = 0; j < 2; ++j) {
if (c[j] >= 0) { if (c[j] >= 0) {
phase_p[j] = phase_pressure[c[j]]; phase_p[j] = cell_pressure[c[j]];
z_face += z[c[j]]; z_face += z[c[j]];
++num; ++num;
} else { } else {
@ -164,7 +164,7 @@ namespace Opm
phasemobf[np*face + phase] = phasemobc[c[upwind]][phase]; phasemobf[np*face + phase] = phasemobc[c[upwind]][phase];
} }
} }
FluidStateBlackoil face_state = fluid.computeState(phase_pressure_face[face], z_face); FluidStateBlackoil face_state = fluid.computeState(face_pressure[face], z_face);
std::copy(face_state.phase_to_comp_, face_state.phase_to_comp_ + nc*np, &faceA[face*nc*np]); std::copy(face_state.phase_to_comp_, face_state.phase_to_comp_ + nc*np, &faceA[face*nc*np]);
} }