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
Download Patch File Download Diff File Expand all files Collapse all files

6
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 * @brief Computes the value of base raised to the power of exp elementwise
* *
* @param base The AD forward block * @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 * @return The value of base raised to the power of exp elementwise
*/ */
template <typename Scalar> template <typename Scalar>
@@ -639,7 +639,7 @@ namespace Opm
assert(exp.size() == num_elem); assert(exp.size() == num_elem);
for (int i = 0; i < num_elem; ++i) { for (int i = 0; i < num_elem; ++i) {
val[i] = std::pow(base.value()[i], exp[i]); val[i] = std::pow(base.value()[i], exp[i]);
derivative[i] *= std::pow(base.value()[i],exp[i]-1.0); derivative[i] *= std::pow(base.value()[i], exp[i] - 1.0);
} }
const typename AutoDiffBlock<Scalar>::M derivative_diag(derivative.matrix().asDiagonal()); const typename AutoDiffBlock<Scalar>::M derivative_diag(derivative.matrix().asDiagonal());
@@ -664,7 +664,7 @@ namespace Opm
const double exp) const double exp)
{ {
const typename AutoDiffBlock<Scalar>::V val = base.value().pow(exp); const typename AutoDiffBlock<Scalar>::V val = base.value().pow(exp);
const typename AutoDiffBlock<Scalar>::V derivative = exp * base.value().pow(exp-1.0); const typename AutoDiffBlock<Scalar>::V derivative = exp * base.value().pow(exp - 1.0);
const typename AutoDiffBlock<Scalar>::M derivative_diag(derivative.matrix().asDiagonal()); const typename AutoDiffBlock<Scalar>::M derivative_diag(derivative.matrix().asDiagonal());
std::vector< typename AutoDiffBlock<Scalar>::M > jac (base.numBlocks()); std::vector< typename AutoDiffBlock<Scalar>::M > jac (base.numBlocks());

24
opm/autodiff/BlackoilSolventModel_impl.hpp
View File

@@ -816,9 +816,9 @@ namespace Opm {
Selector<double> zero_selectorSsg(ssg_eff.value(), Selector<double>::Zero); Selector<double> zero_selectorSsg(ssg_eff.value(), Selector<double>::Zero);
Selector<double> zero_selectorSn(sn_eff.value(), Selector<double>::Zero); Selector<double> zero_selectorSn(sn_eff.value(), Selector<double>::Zero);
const ADB mu_s_pow = pow(mu_s,0.25); const ADB mu_s_pow = pow(mu_s, 0.25);
const ADB mu_o_pow = pow(mu_o,0.25); const ADB mu_o_pow = pow(mu_o, 0.25);
const ADB mu_g_pow = pow(mu_g,0.25); const ADB mu_g_pow = pow(mu_g, 0.25);
const ADB mu_mos = zero_selectorSos.select(mu_o + mu_s, mu_o * mu_s / pow( ( (so_eff / sos_eff) * mu_s_pow) + ( (ss_eff / sos_eff) * mu_o_pow) , 4.0)); const ADB mu_mos = zero_selectorSos.select(mu_o + mu_s, mu_o * mu_s / pow( ( (so_eff / sos_eff) * mu_s_pow) + ( (ss_eff / sos_eff) * mu_o_pow) , 4.0));
const ADB mu_msg = zero_selectorSsg.select(mu_g + mu_s , mu_g * mu_s / pow( ( (sg_eff / ssg_eff) * mu_s_pow) + ( (ss_eff / ssg_eff) * mu_g_pow) , 4.0)); const ADB mu_msg = zero_selectorSsg.select(mu_g + mu_s , mu_g * mu_s / pow( ( (sg_eff / ssg_eff) * mu_s_pow) + ( (ss_eff / ssg_eff) * mu_g_pow) , 4.0));
@@ -828,9 +828,9 @@ namespace Opm {
const V mix_param_mu = solvent_props_.mixingParameterViscosity(cells_); const V mix_param_mu = solvent_props_.mixingParameterViscosity(cells_);
// Update viscosities // Update viscosities
viscosity[pu.phase_pos[ Oil ]] = pow(mu_o,ones - mix_param_mu) * pow(mu_mos,mix_param_mu); viscosity[pu.phase_pos[ Oil ]] = pow(mu_o,ones - mix_param_mu) * pow(mu_mos, mix_param_mu);
viscosity[pu.phase_pos[ Gas ]] = pow(mu_g,ones - mix_param_mu) * pow(mu_msg,mix_param_mu); viscosity[pu.phase_pos[ Gas ]] = pow(mu_g,ones - mix_param_mu) * pow(mu_msg, mix_param_mu);
viscosity[solvent_pos_] = pow(mu_s,ones - mix_param_mu) * pow(mu_m,mix_param_mu); viscosity[solvent_pos_] = pow(mu_s,ones - mix_param_mu) * pow(mu_m, mix_param_mu);
// Density // Density
ADB& rho_o = density[pu.phase_pos[ Oil ]]; ADB& rho_o = density[pu.phase_pos[ Oil ]];
@@ -842,9 +842,9 @@ namespace Opm {
// compute effective viscosities for density calculations. These have to // compute effective viscosities for density calculations. These have to
// be recomputed as a different mixing parameter may be used. // be recomputed as a different mixing parameter may be used.
const ADB mu_o_eff = pow(mu_o,ones - mix_param_rho) * pow(mu_mos,mix_param_rho); const ADB mu_o_eff = pow(mu_o,ones - mix_param_rho) * pow(mu_mos, mix_param_rho);
const ADB mu_g_eff = pow(mu_g,ones - mix_param_rho) * pow(mu_msg,mix_param_rho); const ADB mu_g_eff = pow(mu_g,ones - mix_param_rho) * pow(mu_msg, mix_param_rho);
const ADB mu_s_eff = pow(mu_s,ones - mix_param_rho) * pow(mu_m,mix_param_rho); const ADB mu_s_eff = pow(mu_s,ones - mix_param_rho) * pow(mu_m, mix_param_rho);
const ADB sog_eff = so_eff + sg_eff; const ADB sog_eff = so_eff + sg_eff;
const ADB sof = so_eff / sog_eff; const ADB sof = so_eff / sog_eff;
@@ -852,9 +852,9 @@ namespace Opm {
// Effective densities // Effective densities
const ADB mu_sog_pow = mu_s_pow * ( (sgf * mu_o_pow) + (sof * mu_g_pow) ); const ADB mu_sog_pow = mu_s_pow * ( (sgf * mu_o_pow) + (sof * mu_g_pow) );
const ADB mu_o_eff_pow = pow(mu_o_eff,0.25); const ADB mu_o_eff_pow = pow(mu_o_eff, 0.25);
const ADB mu_g_eff_pow = pow(mu_g_eff,0.25); const ADB mu_g_eff_pow = pow(mu_g_eff, 0.25);
const ADB mu_s_eff_pow = pow(mu_s_eff,0.25); const ADB mu_s_eff_pow = pow(mu_s_eff, 0.25);
const ADB sfraction_oe = (mu_o_pow * (mu_o_eff_pow - mu_s_pow)) / (mu_o_eff_pow * (mu_o_pow - mu_s_pow)); const ADB sfraction_oe = (mu_o_pow * (mu_o_eff_pow - mu_s_pow)) / (mu_o_eff_pow * (mu_o_pow - mu_s_pow));
const ADB sfraction_ge = (mu_g_pow * (mu_s_pow - mu_g_eff_pow)) / (mu_g_eff_pow * (mu_s_pow - mu_g_pow)); const ADB sfraction_ge = (mu_g_pow * (mu_s_pow - mu_g_eff_pow)) / (mu_g_eff_pow * (mu_s_pow - mu_g_pow));
const ADB sfraction_se = (mu_sog_pow - ( mu_o_pow * mu_g_pow * mu_s_pow / mu_s_eff_pow) ) / ( mu_sog_pow - (mu_o_pow * mu_g_pow)); const ADB sfraction_se = (mu_sog_pow - ( mu_o_pow * mu_g_pow * mu_s_pow / mu_s_eff_pow) ) / ( mu_sog_pow - (mu_o_pow * mu_g_pow));

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 // retrieve the cell specific PVT table index from the deck
// and using the grid... // and using the grid...
extractPvtTableIndex(cellPvtRegionIdx_, eclState, number_of_cells, global_cell); 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 // surface densities
if (deck->hasKeyword("SDENSITY")) { if (deck->hasKeyword("SDENSITY")) {
@@ -124,7 +124,7 @@ SolventPropsAdFromDeck::SolventPropsAdFromDeck(DeckConstPtr deck,
// retrieve the cell specific Misc table index from the deck // retrieve the cell specific Misc table index from the deck
// and using the grid... // 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 // misicible hydrocabon relative permeability wrt water
const TableContainer& sof2Tables = tables->getSof2Tables(); const TableContainer& sof2Tables = tables->getSof2Tables();
@@ -422,11 +422,10 @@ V SolventPropsAdFromDeck::mixingParameterDensity(const Cells& cells) const {
} }
void SolventPropsAdFromDeck::extractTableIndex(const std::string& keyword, void SolventPropsAdFromDeck::extractTableIndex(const std::string& keyword,
std::vector<int> &tableIdx,
Opm::EclipseStateConstPtr eclState, Opm::EclipseStateConstPtr eclState,
size_t numCompressed, size_t numCompressed,
const int *compressedToCartesianCellIdx) const const int* compressedToCartesianCellIdx,
{ std::vector<int>& tableIdx) const {
//Get the Region data //Get the Region data
const std::vector<int>& regionData = eclState->getIntGridProperty(keyword)->getData(); const std::vector<int>& regionData = eclState->getIntGridProperty(keyword)->getData();
// Convert this into an array of compressed cells // 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 /// Helper function to create an array containing the
/// table index of for each compressed cell from an Eclipse deck. /// table index of for each compressed cell from an Eclipse deck.
/// \param[in] keyword eclKeyword specifying region (SATNUM etc. ) /// \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] eclState eclState from opm-parser
/// \param[in] numCompressed number of compressed cells /// \param[in] numCompressed number of compressed cells
/// \param[in] compressedToCartesianCellIdx cartesianCellIdx for each cell in the grid /// \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, void extractTableIndex(const std::string& keyword,
std::vector<int> &tableIdx,
Opm::EclipseStateConstPtr eclState, Opm::EclipseStateConstPtr eclState,
size_t numCompressed, 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 // The PVT region which is to be used for each cell
std::vector<int> cellPvtRegionIdx_; std::vector<int> cellPvtRegionIdx_;