From 27b8314521bf527dba13d1947e1663c05ce799ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Fri, 12 Oct 2012 09:21:52 +0200 Subject: [PATCH] Rename function argument and variable. rock_comp -> rock_comp_props --- .../SimulatorCompressibleTwophase.cpp | 22 ++++++++--------- .../SimulatorCompressibleTwophase.hpp | 4 ++-- .../simulator/SimulatorIncompTwophase.cpp | 24 +++++++++---------- .../simulator/SimulatorIncompTwophase.hpp | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/opm/core/simulator/SimulatorCompressibleTwophase.cpp b/opm/core/simulator/SimulatorCompressibleTwophase.cpp index e921db87..8b8e8736 100644 --- a/opm/core/simulator/SimulatorCompressibleTwophase.cpp +++ b/opm/core/simulator/SimulatorCompressibleTwophase.cpp @@ -65,7 +65,7 @@ namespace Opm Impl(const parameter::ParameterGroup& param, const UnstructuredGrid& grid, const BlackoilPropertiesInterface& props, - const RockCompressibility* rock_comp, + const RockCompressibility* rock_comp_props, WellsManager& wells_manager, const std::vector& src, const FlowBoundaryConditions* bcs, @@ -93,7 +93,7 @@ namespace Opm // Observed objects. const UnstructuredGrid& grid_; const BlackoilPropertiesInterface& props_; - const RockCompressibility* rock_comp_; + const RockCompressibility* rock_comp_props_; WellsManager& wells_manager_; const Wells* wells_; const std::vector& src_; @@ -114,14 +114,14 @@ namespace Opm SimulatorCompressibleTwophase::SimulatorCompressibleTwophase(const parameter::ParameterGroup& param, const UnstructuredGrid& grid, const BlackoilPropertiesInterface& props, - const RockCompressibility* rock_comp, + const RockCompressibility* rock_comp_props, WellsManager& wells_manager, const std::vector& src, const FlowBoundaryConditions* bcs, LinearSolverInterface& linsolver, const double* gravity) { - pimpl_.reset(new Impl(param, grid, props, rock_comp, wells_manager, src, bcs, linsolver, gravity)); + pimpl_.reset(new Impl(param, grid, props, rock_comp_props, wells_manager, src, bcs, linsolver, gravity)); } @@ -234,7 +234,7 @@ namespace Opm SimulatorCompressibleTwophase::Impl::Impl(const parameter::ParameterGroup& param, const UnstructuredGrid& grid, const BlackoilPropertiesInterface& props, - const RockCompressibility* rock_comp, + const RockCompressibility* rock_comp_props, WellsManager& wells_manager, const std::vector& src, const FlowBoundaryConditions* bcs, @@ -242,13 +242,13 @@ namespace Opm const double* gravity) : grid_(grid), props_(props), - rock_comp_(rock_comp), + rock_comp_props_(rock_comp_props), wells_manager_(wells_manager), wells_(wells_manager.c_wells()), src_(src), bcs_(bcs), gravity_(gravity), - psolver_(grid, props, rock_comp, linsolver, + psolver_(grid, props, rock_comp_props, linsolver, param.getDefault("nl_pressure_residual_tolerance", 0.0), param.getDefault("nl_pressure_change_tolerance", 1.0), param.getDefault("nl_pressure_maxiter", 10), @@ -304,8 +304,8 @@ namespace Opm // Initialisation. std::vector porevol; - if (rock_comp_ && rock_comp_->isActive()) { - computePorevolume(grid_, props_.porosity(), *rock_comp_, state.pressure(), porevol); + if (rock_comp_props_ && rock_comp_props_->isActive()) { + computePorevolume(grid_, props_.porosity(), *rock_comp_props_, state.pressure(), porevol); } else { computePorevolume(grid_, props_.porosity(), porevol); } @@ -426,9 +426,9 @@ namespace Opm } while (!well_control_passed); // Update pore volumes if rock is compressible. - if (rock_comp_ && rock_comp_->isActive()) { + if (rock_comp_props_ && rock_comp_props_->isActive()) { initial_porevol = porevol; - computePorevolume(grid_, props_.porosity(), *rock_comp_, state.pressure(), porevol); + computePorevolume(grid_, props_.porosity(), *rock_comp_props_, state.pressure(), porevol); } // Process transport sources from well flows. diff --git a/opm/core/simulator/SimulatorCompressibleTwophase.hpp b/opm/core/simulator/SimulatorCompressibleTwophase.hpp index d38d74b2..944230e5 100644 --- a/opm/core/simulator/SimulatorCompressibleTwophase.hpp +++ b/opm/core/simulator/SimulatorCompressibleTwophase.hpp @@ -61,7 +61,7 @@ namespace Opm /// /// \param[in] grid grid data structure /// \param[in] props fluid and rock properties - /// \param[in] rock_comp if non-null, rock compressibility properties + /// \param[in] rock_comp_props if non-null, rock compressibility properties /// \param[in] well_manager well manager, may manage no (null) wells /// \param[in] src source terms /// \param[in] bcs boundary conditions, treat as all noflow if null @@ -70,7 +70,7 @@ namespace Opm SimulatorCompressibleTwophase(const parameter::ParameterGroup& param, const UnstructuredGrid& grid, const BlackoilPropertiesInterface& props, - const RockCompressibility* rock_comp, + const RockCompressibility* rock_comp_props, WellsManager& wells_manager, const std::vector& src, const FlowBoundaryConditions* bcs, diff --git a/opm/core/simulator/SimulatorIncompTwophase.cpp b/opm/core/simulator/SimulatorIncompTwophase.cpp index 911c64ce..28e18a45 100644 --- a/opm/core/simulator/SimulatorIncompTwophase.cpp +++ b/opm/core/simulator/SimulatorIncompTwophase.cpp @@ -64,7 +64,7 @@ namespace Opm Impl(const parameter::ParameterGroup& param, const UnstructuredGrid& grid, const IncompPropertiesInterface& props, - const RockCompressibility* rock_comp, + const RockCompressibility* rock_comp_props, WellsManager& wells_manager, const std::vector& src, const FlowBoundaryConditions* bcs, @@ -91,7 +91,7 @@ namespace Opm // Observed objects. const UnstructuredGrid& grid_; const IncompPropertiesInterface& props_; - const RockCompressibility* rock_comp_; + const RockCompressibility* rock_comp_props_; WellsManager& wells_manager_; const Wells* wells_; const std::vector& src_; @@ -111,14 +111,14 @@ namespace Opm SimulatorIncompTwophase::SimulatorIncompTwophase(const parameter::ParameterGroup& param, const UnstructuredGrid& grid, const IncompPropertiesInterface& props, - const RockCompressibility* rock_comp, + const RockCompressibility* rock_comp_props, WellsManager& wells_manager, const std::vector& src, const FlowBoundaryConditions* bcs, LinearSolverInterface& linsolver, const double* gravity) { - pimpl_.reset(new Impl(param, grid, props, rock_comp, wells_manager, src, bcs, linsolver, gravity)); + pimpl_.reset(new Impl(param, grid, props, rock_comp_props, wells_manager, src, bcs, linsolver, gravity)); } @@ -312,7 +312,7 @@ namespace Opm SimulatorIncompTwophase::Impl::Impl(const parameter::ParameterGroup& param, const UnstructuredGrid& grid, const IncompPropertiesInterface& props, - const RockCompressibility* rock_comp, + const RockCompressibility* rock_comp_props, WellsManager& wells_manager, const std::vector& src, const FlowBoundaryConditions* bcs, @@ -320,12 +320,12 @@ namespace Opm const double* gravity) : grid_(grid), props_(props), - rock_comp_(rock_comp), + rock_comp_props_(rock_comp_props), wells_manager_(wells_manager), wells_(wells_manager.c_wells()), src_(src), bcs_(bcs), - psolver_(grid, props, rock_comp, linsolver, + psolver_(grid, props, rock_comp_props, linsolver, param.getDefault("nl_pressure_residual_tolerance", 0.0), param.getDefault("nl_pressure_change_tolerance", 1.0), param.getDefault("nl_pressure_maxiter", 10), @@ -381,8 +381,8 @@ namespace Opm // Initialisation. std::vector porevol; - if (rock_comp_ && rock_comp_->isActive()) { - computePorevolume(grid_, props_.porosity(), *rock_comp_, state.pressure(), porevol); + if (rock_comp_props_ && rock_comp_props_->isActive()) { + computePorevolume(grid_, props_.porosity(), *rock_comp_props_, state.pressure(), porevol); } else { computePorevolume(grid_, props_.porosity(), porevol); } @@ -451,7 +451,7 @@ namespace Opm // there are no pressure conditions (bcs or wells). // It is deemed sufficient for now to renormalize // using geometric volume instead of pore volume. - if ((rock_comp_ == NULL || !rock_comp_->isActive()) + if ((rock_comp_props_ == NULL || !rock_comp_props_->isActive()) && allNeumannBCs(bcs_) && allRateWells(wells_)) { // Compute average pressures of previous and last // step, and total volume. @@ -504,9 +504,9 @@ namespace Opm } while (!well_control_passed); // Update pore volumes if rock is compressible. - if (rock_comp_ && rock_comp_->isActive()) { + if (rock_comp_props_ && rock_comp_props_->isActive()) { initial_porevol = porevol; - computePorevolume(grid_, props_.porosity(), *rock_comp_, state.pressure(), porevol); + computePorevolume(grid_, props_.porosity(), *rock_comp_props_, state.pressure(), porevol); } // Process transport sources (to include bdy terms and well flows). diff --git a/opm/core/simulator/SimulatorIncompTwophase.hpp b/opm/core/simulator/SimulatorIncompTwophase.hpp index 10c46ff0..64030d68 100644 --- a/opm/core/simulator/SimulatorIncompTwophase.hpp +++ b/opm/core/simulator/SimulatorIncompTwophase.hpp @@ -61,7 +61,7 @@ namespace Opm /// /// \param[in] grid grid data structure /// \param[in] props fluid and rock properties - /// \param[in] rock_comp if non-null, rock compressibility properties + /// \param[in] rock_comp_props if non-null, rock compressibility properties /// \param[in] well_manager well manager, may manage no (null) wells /// \param[in] src source terms /// \param[in] bcs boundary conditions, treat as all noflow if null @@ -70,7 +70,7 @@ namespace Opm SimulatorIncompTwophase(const parameter::ParameterGroup& param, const UnstructuredGrid& grid, const IncompPropertiesInterface& props, - const RockCompressibility* rock_comp, + const RockCompressibility* rock_comp_props, WellsManager& wells_manager, const std::vector& src, const FlowBoundaryConditions* bcs,