OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-11 21:45:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5147 from akva2/nonlinearsolver_drop_ebos

Browse Source 
NonlinearSolverEbos: rename to NonlinearSolver
This commit is contained in:
Bård Skaflestad 2024-02-01 16:49:26 +01:00 committed by GitHub
commit a6054e729f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists_files.cmake
View File

@ -49,7 +49,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/simulators/flow/KeywordValidation.cpp
opm/simulators/flow/LogOutputHelper.cpp
opm/simulators/flow/Main.cpp
opm/simulators/flow/NonlinearSolverEbos.cpp
opm/simulators/flow/NonlinearSolver.cpp
opm/simulators/flow/RSTConv.cpp
opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.cpp
opm/simulators/flow/SimulatorSerializer.cpp
@ -451,7 +451,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/ExtraConvergenceOutputThread.hpp
opm/simulators/flow/FlowMainEbos.hpp
opm/simulators/flow/Main.hpp
opm/simulators/flow/NonlinearSolverEbos.hpp
opm/simulators/flow/NonlinearSolver.hpp
opm/simulators/flow/RSTConv.hpp
opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
opm/simulators/flow/SimulatorSerializer.hpp

2
opm/simulators/flow/BlackoilModel.hpp
View File

@ -42,7 +42,7 @@
#include <opm/simulators/flow/BlackoilModelNldd.hpp>
#include <opm/simulators/flow/BlackoilModelParameters.hpp>
#include <opm/simulators/flow/countGlobalCells.hpp>
#include <opm/simulators/flow/NonlinearSolverEbos.hpp>
#include <opm/simulators/flow/NonlinearSolver.hpp>
#include <opm/simulators/flow/RSTConv.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp>
#include <opm/simulators/timestepping/ConvergenceReport.hpp>

2
opm/simulators/flow/NonlinearSolverEbos.cpp → opm/simulators/flow/NonlinearSolver.cpp
View File

@ -18,7 +18,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <config.h>
#include <opm/simulators/flow/NonlinearSolverEbos.hpp>
#include <opm/simulators/flow/NonlinearSolver.hpp>
#include <dune/common/fvector.hh>
#include <dune/istl/bvector.hh>

10
opm/simulators/flow/NonlinearSolverEbos.hpp → opm/simulators/flow/NonlinearSolver.hpp
View File

@ -18,8 +18,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef OPM_NON_LINEAR_SOLVER_EBOS_HPP
#define OPM_NON_LINEAR_SOLVER_EBOS_HPP
#ifndef OPM_NON_LINEAR_SOLVER_HPP
#define OPM_NON_LINEAR_SOLVER_HPP
#include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/common/ErrorMacros.hpp>
@ -106,7 +106,7 @@ void stabilizeNonlinearUpdate(BVector& dx, BVector& dxOld,
/// A nonlinear solver class suitable for general fully-implicit models,
/// as well as pressure, transport and sequential models.
template <class TypeTag, class PhysicalModel>
class NonlinearSolverEbos
class NonlinearSolver
{
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@ -175,7 +175,7 @@ void stabilizeNonlinearUpdate(BVector& dx, BVector& dxOld,
///
/// \param[in] param parameters controlling nonlinear process
/// \param[in, out] model physical simulation model.
NonlinearSolverEbos(const SolverParameters& param,
NonlinearSolver(const SolverParameters& param,
std::unique_ptr<PhysicalModel> model)
: param_(param)
, model_(std::move(model))
@ -351,4 +351,4 @@ void stabilizeNonlinearUpdate(BVector& dx, BVector& dxOld,
} // namespace Opm
#endif // OPM_NON_LINEAR_SOLVER_EBOS_HPP
#endif // OPM_NON_LINEAR_SOLVER_HPP

4
opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -29,7 +29,7 @@
#include <opm/simulators/flow/BlackoilModelParameters.hpp>
#include <opm/simulators/flow/ConvergenceOutputConfiguration.hpp>
#include <opm/simulators/flow/ExtraConvergenceOutputThread.hpp>
#include <opm/simulators/flow/NonlinearSolverEbos.hpp>
#include <opm/simulators/flow/NonlinearSolver.hpp>
#include <opm/simulators/flow/SimulatorSerializer.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeSteppingEbos.hpp>
#include <opm/simulators/timestepping/ConvergenceReport.hpp>
@ -171,7 +171,7 @@ public:
typedef BlackOilMICPModule<TypeTag> MICPModule;
using Model = BlackoilModel<TypeTag>;
typedef NonlinearSolverEbos<TypeTag, Model> Solver;
using Solver = NonlinearSolver<TypeTag, Model>;
typedef typename Model::ModelParameters ModelParameters;
typedef typename Solver::SolverParameters SolverParameters;
typedef BlackoilWellModel<TypeTag> WellModel;