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

Add whitespaces and comments to beautify the code

Browse Source
This commit is contained in:
Tor Harald Sandve 2016-02-17 10:43:01 +01:00
parent b02589316f
commit fd219dd544
4 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/AutoDiffBlock.hpp
View File

@ -626,7 +626,7 @@ namespace Opm
* @brief Computes the value of base raised to the power of exp elementwise
*
* @param base The AD forward block
* @param exp array of exponent
* @param exp array of exponents
* @return The value of base raised to the power of exp elementwise
*/
template <typename Scalar>

9
opm/autodiff/SolventPropsAdFromDeck.cpp
View File

@ -44,7 +44,7 @@ SolventPropsAdFromDeck::SolventPropsAdFromDeck(DeckConstPtr deck,
// retrieve the cell specific PVT table index from the deck
// and using the grid...
extractPvtTableIndex(cellPvtRegionIdx_, eclState, number_of_cells, global_cell);
extractTableIndex("SATNUM", cellSatNumRegionIdx_, eclState, number_of_cells, global_cell);
extractTableIndex("SATNUM", eclState, number_of_cells, global_cell, cellSatNumRegionIdx_);
// surface densities
if (deck->hasKeyword("SDENSITY")) {
@ -124,7 +124,7 @@ SolventPropsAdFromDeck::SolventPropsAdFromDeck(DeckConstPtr deck,
// retrieve the cell specific Misc table index from the deck
// and using the grid...
extractTableIndex("MISCNUM", cellMiscRegionIdx_, eclState, number_of_cells, global_cell);
extractTableIndex("MISCNUM", eclState, number_of_cells, global_cell, cellMiscRegionIdx_);
// misicible hydrocabon relative permeability wrt water
const TableContainer& sof2Tables = tables->getSof2Tables();
@ -422,11 +422,10 @@ V SolventPropsAdFromDeck::mixingParameterDensity(const Cells& cells) const {
}
void SolventPropsAdFromDeck::extractTableIndex(const std::string& keyword,
std::vector<int> &tableIdx,
Opm::EclipseStateConstPtr eclState,
size_t numCompressed,
const int *compressedToCartesianCellIdx) const
{
const int* compressedToCartesianCellIdx,
std::vector<int>& tableIdx) const {
//Get the Region data
const std::vector<int>& regionData = eclState->getIntGridProperty(keyword)->getData();
// Convert this into an array of compressed cells

6
opm/autodiff/SolventPropsAdFromDeck.hpp
View File

@ -153,15 +153,15 @@ private:
/// Helper function to create an array containing the
/// table index of for each compressed cell from an Eclipse deck.
/// \param[in] keyword eclKeyword specifying region (SATNUM etc. )
/// \param[in/out] tableIdx table index for each compressed cell
/// \param[in] eclState eclState from opm-parser
/// \param[in] numCompressed number of compressed cells
/// \param[in] compressedToCartesianCellIdx cartesianCellIdx for each cell in the grid
/// \param[out] tableIdx table index for each compressed cell
void extractTableIndex(const std::string& keyword,
std::vector<int> &tableIdx,
Opm::EclipseStateConstPtr eclState,
size_t numCompressed,
const int *compressedToCartesianCellIdx) const;
const int* compressedToCartesianCellIdx,
std::vector<int>& tableIdx) const;
// The PVT region which is to be used for each cell
std::vector<int> cellPvtRegionIdx_;