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

BlackoilModelEbos: rename to BlackoilModel

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-01-31 14:14:50 +01:00
parent 80d32b105b
commit e13c77ae95
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -437,7 +437,7 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/vtkecltracermodule.hh ebos/vtkecltracermodule.hh
opm/simulators/flow/countGlobalCells.hpp opm/simulators/flow/countGlobalCells.hpp
opm/simulators/flow/priVarsPacking.hpp opm/simulators/flow/priVarsPacking.hpp
opm/simulators/flow/BlackoilModelEbos.hpp opm/simulators/flow/BlackoilModel.hpp
opm/simulators/flow/BlackoilModelNldd.hpp opm/simulators/flow/BlackoilModelNldd.hpp
opm/simulators/flow/BlackoilModelParameters.hpp opm/simulators/flow/BlackoilModelParameters.hpp
opm/simulators/flow/Banners.hpp opm/simulators/flow/Banners.hpp

22
opm/simulators/flow/BlackoilModelEbos.hpp → opm/simulators/flow/BlackoilModel.hpp
View File

@ -21,8 +21,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_BLACKOILMODELEBOS_HEADER_INCLUDED #ifndef OPM_BLACKOILMODEL_HEADER_INCLUDED
#define OPM_BLACKOILMODELEBOS_HEADER_INCLUDED #define OPM_BLACKOILMODEL_HEADER_INCLUDED
#include <fmt/format.h> #include <fmt/format.h>
@ -161,7 +161,7 @@ namespace Opm {
/// uses an industry-standard TPFA discretization with per-phase /// uses an industry-standard TPFA discretization with per-phase
/// upwind weighting of mobilities. /// upwind weighting of mobilities.
template <class TypeTag> template <class TypeTag>
class BlackoilModelEbos class BlackoilModel
{ {
public: public:
// --------- Types and enums --------- // --------- Types and enums ---------
@ -225,10 +225,10 @@ namespace Opm {
/// \param[in] linsolver linear solver /// \param[in] linsolver linear solver
/// \param[in] eclState eclipse state /// \param[in] eclState eclipse state
/// \param[in] terminal_output request output to cout/cerr /// \param[in] terminal_output request output to cout/cerr
BlackoilModelEbos(Simulator& ebosSimulator, BlackoilModel(Simulator& ebosSimulator,
const ModelParameters& param, const ModelParameters& param,
BlackoilWellModel<TypeTag>& well_model, BlackoilWellModel<TypeTag>& well_model,
const bool terminal_output) const bool terminal_output)
: ebosSimulator_(ebosSimulator) : ebosSimulator_(ebosSimulator)
, grid_(ebosSimulator_.vanguard().grid()) , grid_(ebosSimulator_.vanguard().grid())
, phaseUsage_(phaseUsageFromDeck(eclState())) , phaseUsage_(phaseUsageFromDeck(eclState()))
@ -818,7 +818,7 @@ namespace Opm {
B_avg, R_sum, maxCoeff, maxCoeffCell); B_avg, R_sum, maxCoeff, maxCoeffCell);
} }
OPM_END_PARALLEL_TRY_CATCH("BlackoilModelEbos::localConvergenceData() failed: ", grid_.comm()); OPM_END_PARALLEL_TRY_CATCH("BlackoilModel::localConvergenceData() failed: ", grid_.comm());
// compute local average in terms of global number of elements // compute local average in terms of global number of elements
const int bSize = B_avg.size(); const int bSize = B_avg.size();
@ -872,7 +872,7 @@ namespace Opm {
} }
} }
OPM_END_PARALLEL_TRY_CATCH("BlackoilModelEbos::ComputeCnvError() failed: ", grid_.comm()); OPM_END_PARALLEL_TRY_CATCH("BlackoilModel::ComputeCnvError() failed: ", grid_.comm());
return grid_.comm().sum(errorPV); return grid_.comm().sum(errorPV);
} }
@ -881,7 +881,7 @@ namespace Opm {
void updateTUNING(const Tuning& tuning) { void updateTUNING(const Tuning& tuning) {
param_.tolerance_mb_ = tuning.XXXMBE; param_.tolerance_mb_ = tuning.XXXMBE;
if ( terminal_output_ ) { if ( terminal_output_ ) {
OpmLog::debug(fmt::format("Setting BlackoilModelEbos mass balance limit (XXXMBE) to {:.2e}", tuning.XXXMBE)); OpmLog::debug(fmt::format("Setting BlackoilModel mass balance limit (XXXMBE) to {:.2e}", tuning.XXXMBE));
} }
} }
@ -1285,4 +1285,4 @@ namespace Opm {
}; };
} // namespace Opm } // namespace Opm
#endif // OPM_BLACKOILMODELBASE_IMPL_HEADER_INCLUDED #endif // OPM_BLACKOILMODEL_HEADER_INCLUDED

10
opm/simulators/flow/BlackoilModelNldd.hpp
View File

@ -71,7 +71,7 @@
namespace Opm { namespace Opm {
template<class TypeTag> class BlackoilModelEbos; template<class TypeTag> class BlackoilModel;
/// A NLDD implementation for three-phase black oil. /// A NLDD implementation for three-phase black oil.
template <class TypeTag> template <class TypeTag>
@ -85,10 +85,10 @@ public:
using Scalar = GetPropType<TypeTag, Properties::Scalar>; using Scalar = GetPropType<TypeTag, Properties::Scalar>;
using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>; using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
using BVector = typename BlackoilModelEbos<TypeTag>::BVector; using BVector = typename BlackoilModel<TypeTag>::BVector;
using Domain = SubDomain<Grid>; using Domain = SubDomain<Grid>;
using ISTLSolverType = ISTLSolverEbos<TypeTag>; using ISTLSolverType = ISTLSolverEbos<TypeTag>;
using Mat = typename BlackoilModelEbos<TypeTag>::Mat; using Mat = typename BlackoilModel<TypeTag>::Mat;
static constexpr int numEq = Indices::numEq; static constexpr int numEq = Indices::numEq;
@ -96,7 +96,7 @@ public:
//! \param model BlackOil model to solve for //! \param model BlackOil model to solve for
//! \param param param Model parameters //! \param param param Model parameters
//! \param compNames Names of the solution components //! \param compNames Names of the solution components
BlackoilModelNldd(BlackoilModelEbos<TypeTag>& model) BlackoilModelNldd(BlackoilModel<TypeTag>& model)
: model_(model), rank_(model_.ebosSimulator().vanguard().grid().comm().rank()) : model_(model), rank_(model_.ebosSimulator().vanguard().grid().comm().rank())
{ {
// Create partitions. // Create partitions.
@ -958,7 +958,7 @@ private:
return p; return p;
} }
BlackoilModelEbos<TypeTag>& model_; //!< Reference to model BlackoilModel<TypeTag>& model_; //!< Reference to model
std::vector<Domain> domains_; //!< Vector of subdomains std::vector<Domain> domains_; //!< Vector of subdomains
std::vector<std::unique_ptr<Mat>> domain_matrices_; //!< Vector of matrix operator for each subdomain std::vector<std::unique_ptr<Mat>> domain_matrices_; //!< Vector of matrix operator for each subdomain
std::vector<ISTLSolverType> domain_linsolvers_; //!< Vector of linear solvers for each domain std::vector<ISTLSolverType> domain_linsolvers_; //!< Vector of linear solvers for each domain

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

@ -25,7 +25,7 @@
#include <fmt/format.h> #include <fmt/format.h>
#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp> #include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
#include <opm/simulators/flow/BlackoilModelEbos.hpp> #include <opm/simulators/flow/BlackoilModel.hpp>
#include <opm/simulators/flow/BlackoilModelParameters.hpp> #include <opm/simulators/flow/BlackoilModelParameters.hpp>
#include <opm/simulators/flow/ConvergenceOutputConfiguration.hpp> #include <opm/simulators/flow/ConvergenceOutputConfiguration.hpp>
#include <opm/simulators/flow/ExtraConvergenceOutputThread.hpp> #include <opm/simulators/flow/ExtraConvergenceOutputThread.hpp>
@ -170,7 +170,7 @@ public:
typedef BlackOilPolymerModule<TypeTag> PolymerModule; typedef BlackOilPolymerModule<TypeTag> PolymerModule;
typedef BlackOilMICPModule<TypeTag> MICPModule; typedef BlackOilMICPModule<TypeTag> MICPModule;
typedef BlackoilModelEbos<TypeTag> Model; using Model = BlackoilModel<TypeTag>;
typedef NonlinearSolverEbos<TypeTag, Model> Solver; typedef NonlinearSolverEbos<TypeTag, Model> Solver;
typedef typename Model::ModelParameters ModelParameters; typedef typename Model::ModelParameters ModelParameters;
typedef typename Solver::SolverParameters SolverParameters; typedef typename Solver::SolverParameters SolverParameters;

2
tests/test_glift1.cpp
View File

@ -35,7 +35,7 @@
#include <opm/input/eclipse/Schedule/Schedule.hpp> #include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/Schedule/Well/Well.hpp> #include <opm/input/eclipse/Schedule/Well/Well.hpp>
#include <opm/simulators/utils/DeferredLogger.hpp> #include <opm/simulators/utils/DeferredLogger.hpp>
#include <opm/simulators/flow/BlackoilModelEbos.hpp> #include <opm/simulators/flow/BlackoilModel.hpp>
#include <opm/simulators/wells/BlackoilWellModel.hpp> #include <opm/simulators/wells/BlackoilWellModel.hpp>
#include <opm/simulators/wells/StandardWell.hpp> #include <opm/simulators/wells/StandardWell.hpp>
#include <opm/simulators/wells/GasLiftSingleWell.hpp> #include <opm/simulators/wells/GasLiftSingleWell.hpp>

2
tests/test_wellmodel.cpp
View File

@ -44,7 +44,7 @@
#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp> #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
#include <opm/grid/GridHelpers.hpp> #include <opm/grid/GridHelpers.hpp>
#include <opm/simulators/flow/FlowMainEbos.hpp> #include <opm/simulators/flow/FlowMainEbos.hpp>
#include <opm/simulators/flow/BlackoilModelEbos.hpp> #include <opm/simulators/flow/BlackoilModel.hpp>
#include <ebos/eclproblem.hh> #include <ebos/eclproblem.hh>
#include <opm/models/utils/start.hh> #include <opm/models/utils/start.hh>