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-09-03 13:27:50 +02:00
commit ca428559ab
4 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/core/pressure/CompressibleTpfa.hpp
View File

@ -90,14 +90,13 @@ namespace Opm
bool singularPressure() const; bool singularPressure() const;
private: private:
void computePerSolveDynamicData(const double dt, virtual void computePerSolveDynamicData(const double dt,
const BlackoilState& state, const BlackoilState& state,
const WellState& well_state); const WellState& well_state);
void computeWellPotentials(const BlackoilState& state);
void computePerIterationDynamicData(const double dt, void computePerIterationDynamicData(const double dt,
const BlackoilState& state, const BlackoilState& state,
const WellState& well_state); const WellState& well_state);
void computeCellDynamicData(const double dt, virtual void computeCellDynamicData(const double dt,
const BlackoilState& state, const BlackoilState& state,
const WellState& well_state); const WellState& well_state);
void computeFaceDynamicData(const double dt, void computeFaceDynamicData(const double dt,
@ -114,6 +113,8 @@ namespace Opm
double incrementNorm() const; double incrementNorm() const;
void computeResults(BlackoilState& state, void computeResults(BlackoilState& state,
WellState& well_state) const; WellState& well_state) const;
protected:
void computeWellPotentials(const BlackoilState& state);
// ------ Data that will remain unmodified after construction. ------ // ------ Data that will remain unmodified after construction. ------
const UnstructuredGrid& grid_; const UnstructuredGrid& grid_;

2
opm/core/transport/reorder/TransportModelCompressibleTwophase.cpp
View File

@ -124,7 +124,7 @@ namespace Opm
// //
// [[ incompressible was: r(s) = s - s0 + dt/pv*( influx + outflux*f(s) ) ]] // [[ incompressible was: r(s) = s - s0 + dt/pv*( influx + outflux*f(s) ) ]]
// //
// r(s) = s - B*z0 + dt/pv*( influx + outflux*f(s) ) // r(s) = s - B*z0 + s*(poro - poro0)/poro0 + dt/pv*( influx + outflux*f(s) )
// //
// @@@ What about the source term // @@@ What about the source term
// //

19
opm/core/utility/miscUtilities.cpp
View File

@ -70,6 +70,25 @@ namespace Opm
} }
} }
/// @brief Computes porosity of all cells in a grid, with rock compressibility effects.
/// @param[in] grid a grid
/// @param[in] porosity_standard array of grid.number_of_cells porosity values (at standard conditions)
/// @param[in] rock_comp rock compressibility properties
/// @param[in] pressure pressure by cell
/// @param[out] porosity porosity (at reservoir condition)
void computePorosity(const UnstructuredGrid& grid,
const double* porosity_standard,
const RockCompressibility& rock_comp,
const std::vector<double>& pressure,
std::vector<double>& porosity)
{
int num_cells = grid.number_of_cells;
porosity.resize(num_cells);
for (int i = 0; i < num_cells; ++i) {
porosity[i] = porosity_standard[i]*rock_comp.poroMult(pressure[i]);
}
}
/// @brief Computes total saturated volumes over all grid cells. /// @brief Computes total saturated volumes over all grid cells.
/// @param[in] pv the pore volume by cell. /// @param[in] pv the pore volume by cell.

13
opm/core/utility/miscUtilities.hpp
View File

@ -44,7 +44,7 @@ namespace Opm
/// @brief Computes pore volume of all cells in a grid, with rock compressibility effects. /// @brief Computes pore volume of all cells in a grid, with rock compressibility effects.
/// @param[in] grid a grid /// @param[in] grid a grid
/// @param[in] porosity array of grid.number_of_cells porosity values /// @param[in] porosity array of grid.number_of_cells porosity values (at reference pressure)
/// @param[in] rock_comp rock compressibility properties /// @param[in] rock_comp rock compressibility properties
/// @param[in] pressure pressure by cell /// @param[in] pressure pressure by cell
/// @param[out] porevol the pore volume by cell. /// @param[out] porevol the pore volume by cell.
@ -54,6 +54,17 @@ namespace Opm
const std::vector<double>& pressure, const std::vector<double>& pressure,
std::vector<double>& porevol); std::vector<double>& porevol);
/// @brief Computes porosity of all cells in a grid, with rock compressibility effects.
/// @param[in] grid a grid
/// @param[in] porosity_standard array of grid.number_of_cells porosity values (at reference presure)
/// @param[in] rock_comp rock compressibility properties
/// @param[in] pressure pressure by cell
/// @param[out] porosity porosity (at reservoir condition)
void computePorosity(const UnstructuredGrid& grid,
const double* porosity_standard,
const RockCompressibility& rock_comp,
const std::vector<double>& pressure,
std::vector<double>& porosity);
/// @brief Computes total saturated volumes over all grid cells. /// @brief Computes total saturated volumes over all grid cells.
/// @param[in] pv the pore volume by cell. /// @param[in] pv the pore volume by cell.