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

Renamed misleading adfi -> fi.

Browse Source 
Some classes and a program were renamed since they were not fully implicit
solvers despite their names indicating it.
This commit is contained in:
Atgeirr Flø Rasmussen
2013-09-19 14:52:39 +02:00
parent 0aa96af329
commit 9337a6227b
4 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists_files.cmake
View File

@@ -32,7 +32,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/autodiff/ImpesTPFAAD.cpp opm/autodiff/ImpesTPFAAD.cpp
opm/autodiff/SimulatorCompressibleAd.cpp opm/autodiff/SimulatorCompressibleAd.cpp
opm/autodiff/SimulatorFullyImplicitBlackoil.cpp opm/autodiff/SimulatorFullyImplicitBlackoil.cpp
opm/autodiff/SimulatorIncompTwophaseAdfi.cpp opm/autodiff/SimulatorIncompTwophaseAd.cpp
opm/autodiff/TransportSolverTwophaseAd.cpp opm/autodiff/TransportSolverTwophaseAd.cpp
opm/autodiff/BlackoilPropsAdFromDeck.cpp opm/autodiff/BlackoilPropsAdFromDeck.cpp
) )
@@ -57,7 +57,7 @@ list (APPEND EXAMPLE_SOURCE_FILES
examples/find_zero.cpp examples/find_zero.cpp
examples/sim_fibo_ad.cpp examples/sim_fibo_ad.cpp
examples/sim_2p_comp_ad.cpp examples/sim_2p_comp_ad.cpp
examples/sim_2p_incomp_adfi.cpp examples/sim_2p_incomp_ad.cpp
examples/sim_simple.cpp examples/sim_simple.cpp
examples/test_impestpfa_ad.cpp examples/test_impestpfa_ad.cpp
examples/test_implicit_ad.cpp examples/test_implicit_ad.cpp
@@ -66,7 +66,7 @@ list (APPEND EXAMPLE_SOURCE_FILES
# programs listed here will not only be compiled, but also marked for # programs listed here will not only be compiled, but also marked for
# installation # installation
list (APPEND PROGRAM_SOURCE_FILES list (APPEND PROGRAM_SOURCE_FILES
examples/sim_2p_incomp_adfi.cpp examples/sim_2p_incomp_ad.cpp
examples/sim_fibo_ad.cpp examples/sim_fibo_ad.cpp
) )
@@ -84,6 +84,6 @@ list (APPEND PUBLIC_HEADER_FILES
opm/autodiff/FullyImplicitBlackoilSolver.hpp opm/autodiff/FullyImplicitBlackoilSolver.hpp
opm/autodiff/SimulatorCompressibleAd.hpp opm/autodiff/SimulatorCompressibleAd.hpp
opm/autodiff/SimulatorFullyImplicitBlackoil.hpp opm/autodiff/SimulatorFullyImplicitBlackoil.hpp
opm/autodiff/SimulatorIncompTwophaseAdfi.hpp opm/autodiff/SimulatorIncompTwophaseAd.hpp
opm/autodiff/TransportSolverTwophaseAd.hpp opm/autodiff/TransportSolverTwophaseAd.hpp
) )

38
examples/sim_2p_incomp_adfi.cpp → examples/sim_2p_incomp_ad.cpp
View File

@@ -44,7 +44,7 @@
#include <opm/core/simulator/TwophaseState.hpp> #include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/simulator/WellState.hpp> #include <opm/core/simulator/WellState.hpp>
#include <opm/autodiff/SimulatorIncompTwophaseAdfi.hpp> #include <opm/autodiff/SimulatorIncompTwophaseAd.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
@@ -216,15 +216,15 @@ try
if (!use_deck) { if (!use_deck) {
// Simple simulation without a deck. // Simple simulation without a deck.
WellsManager wells; // no wells. WellsManager wells; // no wells.
SimulatorIncompTwophaseAdfi simulator(param, SimulatorIncompTwophaseAd simulator(param,
*grid->c_grid(), *grid->c_grid(),
*props, *props,
rock_comp->isActive() ? rock_comp.get() : 0, rock_comp->isActive() ? rock_comp.get() : 0,
wells, wells,
src, src,
bcs.c_bcs(), bcs.c_bcs(),
linsolver, linsolver,
grav); grav);
SimulatorTimer simtimer; SimulatorTimer simtimer;
simtimer.init(param); simtimer.init(param);
warnIfUnusedParams(param); warnIfUnusedParams(param);
@@ -271,15 +271,15 @@ try
} }
// Create and run simulator. // Create and run simulator.
SimulatorIncompTwophaseAdfi simulator(param, SimulatorIncompTwophaseAd simulator(param,
*grid->c_grid(), *grid->c_grid(),
*props, *props,
rock_comp->isActive() ? rock_comp.get() : 0, rock_comp->isActive() ? rock_comp.get() : 0,
wells, wells,
src, src,
bcs.c_bcs(), bcs.c_bcs(),
linsolver, linsolver,
grav); grav);
if (epoch == 0) { if (epoch == 0) {
warnIfUnusedParams(param); warnIfUnusedParams(param);
} }

12
opm/autodiff/SimulatorIncompTwophaseAdfi.cpp → opm/autodiff/SimulatorIncompTwophaseAd.cpp
View File

@@ -22,7 +22,7 @@
#include "config.h" #include "config.h"
#endif // HAVE_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/parameters/ParameterGroup.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
@@ -60,7 +60,7 @@
namespace Opm namespace Opm
{ {
class SimulatorIncompTwophaseAdfi::Impl class SimulatorIncompTwophaseAd::Impl
{ {
public: public:
Impl(const parameter::ParameterGroup& param, 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 UnstructuredGrid& grid,
const IncompPropertiesInterface& props, const IncompPropertiesInterface& props,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,
@@ -126,7 +126,7 @@ namespace Opm
SimulatorReport SimulatorIncompTwophaseAdfi::run(SimulatorTimer& timer, SimulatorReport SimulatorIncompTwophaseAd::run(SimulatorTimer& timer,
TwophaseState& state, TwophaseState& state,
WellState& well_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 UnstructuredGrid& grid,
const IncompPropertiesInterface& props, const IncompPropertiesInterface& props,
const RockCompressibility* rock_comp_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, TwophaseState& state,
WellState& well_state) WellState& well_state)
{ {

24
opm/autodiff/SimulatorIncompTwophaseAdfi.hpp → opm/autodiff/SimulatorIncompTwophaseAd.hpp
View File

@@ -17,8 +17,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef OPM_SIMULATORINCOMPTWOPHASEADFI_HEADER_INCLUDED #ifndef OPM_SIMULATORINCOMPTWOPHASEAD_HEADER_INCLUDED
#define OPM_SIMULATORINCOMPTWOPHASEADFI_HEADER_INCLUDED #define OPM_SIMULATORINCOMPTWOPHASEAD_HEADER_INCLUDED
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <vector> #include <vector>
@@ -40,7 +40,7 @@ namespace Opm
struct SimulatorReport; struct SimulatorReport;
/// Class collecting all necessary components for a two-phase simulation. /// Class collecting all necessary components for a two-phase simulation.
class SimulatorIncompTwophaseAdfi class SimulatorIncompTwophaseAd
{ {
public: public:
/// Initialise from parameters and objects to observe. /// 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] bcs boundary conditions, treat as all noflow if null
/// \param[in] linsolver linear solver /// \param[in] linsolver linear solver
/// \param[in] gravity if non-null, gravity vector /// \param[in] gravity if non-null, gravity vector
SimulatorIncompTwophaseAdfi(const parameter::ParameterGroup& param, SimulatorIncompTwophaseAd(const parameter::ParameterGroup& param,
const UnstructuredGrid& grid, const UnstructuredGrid& grid,
const IncompPropertiesInterface& props, const IncompPropertiesInterface& props,
const RockCompressibility* rock_comp_props, const RockCompressibility* rock_comp_props,
WellsManager& wells_manager, WellsManager& wells_manager,
const std::vector<double>& src, const std::vector<double>& src,
const FlowBoundaryConditions* bcs, const FlowBoundaryConditions* bcs,
LinearSolverInterface& linsolver, LinearSolverInterface& linsolver,
const double* gravity); const double* gravity);
/// Run the simulation. /// Run the simulation.
@@ -96,4 +96,4 @@ namespace Opm
} // namespace Opm } // namespace Opm
#endif // OPM_SIMULATORINCOMPTWOPHASEADFI_HEADER_INCLUDED #endif // OPM_SIMULATORINCOMPTWOPHASEAD_HEADER_INCLUDED