Minor revision, mostly whitespace cleanup and comments.

This commit is contained in:
Atgeirr Flø Rasmussen
2012-08-27 09:48:06 +02:00
parent dd83eaedc8
commit 0a8ac1ddb5
4 changed files with 13 additions and 13 deletions

View File

@@ -504,7 +504,7 @@ namespace Opm
cq.phasemobf = &face_phasemob_[0]; cq.phasemobf = &face_phasemob_[0];
cq.voldiscr = &cell_voldisc_[0]; cq.voldiscr = &cell_voldisc_[0];
int was_adjusted = 0; int was_adjusted = 0;
if (rock_comp_props_ == NULL || !rock_comp_props_->isActive()) { if (! (rock_comp_props_ && rock_comp_props_->isActive())) {
was_adjusted = was_adjusted =
cfs_tpfa_res_assemble(gg, dt, &forces, z, &cq, &trans_[0], cfs_tpfa_res_assemble(gg, dt, &forces, z, &cq, &trans_[0],
&face_gravcap_[0], cell_press, well_bhp, &face_gravcap_[0], cell_press, well_bhp,

View File

@@ -96,7 +96,7 @@ namespace Opm
props_.viscosity(props_.numCells(), pressure, NULL, &allcells_[0], &visc_[0], NULL); props_.viscosity(props_.numCells(), pressure, NULL, &allcells_[0], &visc_[0], NULL);
props_.matrix(props_.numCells(), pressure, NULL, &allcells_[0], &A_[0], NULL); props_.matrix(props_.numCells(), pressure, NULL, &allcells_[0], &A_[0], NULL);
// Check non-miscibility requirement (only done for first cell). // Check immiscibility requirement (only done for first cell).
if (A_[1] != 0.0 || A_[2] != 0.0) { if (A_[1] != 0.0 || A_[2] != 0.0) {
THROW("TransportModelCompressibleTwophase requires a property object without miscibility."); THROW("TransportModelCompressibleTwophase requires a property object without miscibility.");
} }

View File

@@ -76,7 +76,7 @@ namespace Opm
std::vector<double>& saturation); std::vector<double>& saturation);
//// Return the number of iterations used by the reordering solver. //// Return the number of iterations used by the reordering solver.
//// \param[out] vector of iteration per cell //// \return vector of iteration per cell
const std::vector<int>& getReorderIterations() const; const std::vector<int>& getReorderIterations() const;
private: private: