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

Merge pull request #5152 from akva2/simulatorfullyimplicit_janitoring

Browse Source 
SimulatorFullyImplicitBlackoil.hpp: Some janitoring
This commit is contained in:
Bård Skaflestad
2024-02-06 10:08:05 +01:00
committed by GitHub
parent 675f11f186 e0c114c1d2
commit 97bef564da
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
View File

@@ -22,7 +22,11 @@
#ifndef OPM_SIMULATOR_FULLY_IMPLICIT_BLACKOIL_HEADER_INCLUDED
#define OPM_SIMULATOR_FULLY_IMPLICIT_BLACKOIL_HEADER_INCLUDED
#include <fmt/format.h>
#include <opm/common/ErrorMacros.hpp>
#include <opm/input/eclipse/Units/UnitSystem.hpp>
#include <opm/grid/utility/StopWatch.hpp>
#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
#include <opm/simulators/flow/BlackoilModel.hpp>
@@ -37,14 +41,13 @@
#include <opm/simulators/utils/moduleVersion.hpp>
#include <opm/simulators/wells/WellState.hpp>
#include <opm/grid/utility/StopWatch.hpp>
#if HAVE_HDF5
#include <opm/simulators/utils/HDF5Serializer.hpp>
#endif
#include <opm/input/eclipse/Units/UnitSystem.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <boost/date_time/gregorian/gregorian.hpp>
#include <fmt/format.h>
#include <cstddef>
#include <filesystem>
#include <memory>
#include <optional>
@@ -54,10 +57,6 @@
#include <utility>
#include <vector>
#if HAVE_HDF5
#include <opm/simulators/utils/HDF5Serializer.hpp>
#endif
namespace Opm::Properties {
template<class TypeTag, class MyTypeTag>
@@ -163,15 +162,14 @@ public:
using AquiferModel = GetPropType<TypeTag, Properties::EclAquiferModel>;
using TimeStepper = AdaptiveTimeStepping<TypeTag>;
typedef BlackOilPolymerModule<TypeTag> PolymerModule;
typedef BlackOilMICPModule<TypeTag> MICPModule;
using PolymerModule = BlackOilPolymerModule<TypeTag>;
using MICPModule = BlackOilMICPModule<TypeTag>;
using Model = BlackoilModel<TypeTag>;
using Solver = NonlinearSolver<TypeTag, Model>;
typedef typename Model::ModelParameters ModelParameters;
typedef typename Solver::SolverParameters SolverParameters;
typedef BlackoilWellModel<TypeTag> WellModel;
using ModelParameters = typename Model::ModelParameters;
using SolverParameters = typename Solver::SolverParameters;
using WellModel = BlackoilWellModel<TypeTag>;
/// Initialise from parameters and objects to observe.
/// \param[in] param parameters, this class accepts the following: