mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Renamed misleading adfi -> fi.
Some classes and a program were renamed since they were not fully implicit solvers despite their names indicating it.
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
#include "config.h"
|
||||
#endif // HAVE_CONFIG_H
|
||||
|
||||
#include <opm/autodiff/SimulatorIncompTwophaseAdfi.hpp>
|
||||
#include <opm/autodiff/SimulatorIncompTwophaseAd.hpp>
|
||||
#include <opm/core/utility/parameters/ParameterGroup.hpp>
|
||||
#include <opm/core/utility/ErrorMacros.hpp>
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
namespace Opm
|
||||
{
|
||||
|
||||
class SimulatorIncompTwophaseAdfi::Impl
|
||||
class SimulatorIncompTwophaseAd::Impl
|
||||
{
|
||||
public:
|
||||
Impl(const parameter::ParameterGroup& param,
|
||||
@@ -109,7 +109,7 @@ namespace Opm
|
||||
|
||||
|
||||
|
||||
SimulatorIncompTwophaseAdfi::SimulatorIncompTwophaseAdfi(const parameter::ParameterGroup& param,
|
||||
SimulatorIncompTwophaseAd::SimulatorIncompTwophaseAd(const parameter::ParameterGroup& param,
|
||||
const UnstructuredGrid& grid,
|
||||
const IncompPropertiesInterface& props,
|
||||
const RockCompressibility* rock_comp_props,
|
||||
@@ -126,7 +126,7 @@ namespace Opm
|
||||
|
||||
|
||||
|
||||
SimulatorReport SimulatorIncompTwophaseAdfi::run(SimulatorTimer& timer,
|
||||
SimulatorReport SimulatorIncompTwophaseAd::run(SimulatorTimer& timer,
|
||||
TwophaseState& state,
|
||||
WellState& well_state)
|
||||
{
|
||||
@@ -310,7 +310,7 @@ namespace Opm
|
||||
|
||||
|
||||
|
||||
SimulatorIncompTwophaseAdfi::Impl::Impl(const parameter::ParameterGroup& param,
|
||||
SimulatorIncompTwophaseAd::Impl::Impl(const parameter::ParameterGroup& param,
|
||||
const UnstructuredGrid& grid,
|
||||
const IncompPropertiesInterface& props,
|
||||
const RockCompressibility* rock_comp_props,
|
||||
@@ -409,7 +409,7 @@ namespace Opm
|
||||
|
||||
|
||||
|
||||
SimulatorReport SimulatorIncompTwophaseAdfi::Impl::run(SimulatorTimer& timer,
|
||||
SimulatorReport SimulatorIncompTwophaseAd::Impl::run(SimulatorTimer& timer,
|
||||
TwophaseState& state,
|
||||
WellState& well_state)
|
||||
{
|
||||
@@ -17,8 +17,8 @@
|
||||
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef OPM_SIMULATORINCOMPTWOPHASEADFI_HEADER_INCLUDED
|
||||
#define OPM_SIMULATORINCOMPTWOPHASEADFI_HEADER_INCLUDED
|
||||
#ifndef OPM_SIMULATORINCOMPTWOPHASEAD_HEADER_INCLUDED
|
||||
#define OPM_SIMULATORINCOMPTWOPHASEAD_HEADER_INCLUDED
|
||||
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <vector>
|
||||
@@ -40,7 +40,7 @@ namespace Opm
|
||||
struct SimulatorReport;
|
||||
|
||||
/// Class collecting all necessary components for a two-phase simulation.
|
||||
class SimulatorIncompTwophaseAdfi
|
||||
class SimulatorIncompTwophaseAd
|
||||
{
|
||||
public:
|
||||
/// Initialise from parameters and objects to observe.
|
||||
@@ -67,14 +67,14 @@ namespace Opm
|
||||
/// \param[in] bcs boundary conditions, treat as all noflow if null
|
||||
/// \param[in] linsolver linear solver
|
||||
/// \param[in] gravity if non-null, gravity vector
|
||||
SimulatorIncompTwophaseAdfi(const parameter::ParameterGroup& param,
|
||||
const UnstructuredGrid& grid,
|
||||
const IncompPropertiesInterface& props,
|
||||
const RockCompressibility* rock_comp_props,
|
||||
WellsManager& wells_manager,
|
||||
const std::vector<double>& src,
|
||||
const FlowBoundaryConditions* bcs,
|
||||
LinearSolverInterface& linsolver,
|
||||
SimulatorIncompTwophaseAd(const parameter::ParameterGroup& param,
|
||||
const UnstructuredGrid& grid,
|
||||
const IncompPropertiesInterface& props,
|
||||
const RockCompressibility* rock_comp_props,
|
||||
WellsManager& wells_manager,
|
||||
const std::vector<double>& src,
|
||||
const FlowBoundaryConditions* bcs,
|
||||
LinearSolverInterface& linsolver,
|
||||
const double* gravity);
|
||||
|
||||
/// Run the simulation.
|
||||
@@ -96,4 +96,4 @@ namespace Opm
|
||||
|
||||
} // namespace Opm
|
||||
|
||||
#endif // OPM_SIMULATORINCOMPTWOPHASEADFI_HEADER_INCLUDED
|
||||
#endif // OPM_SIMULATORINCOMPTWOPHASEAD_HEADER_INCLUDED
|
||||
Reference in New Issue
Block a user