move ebos/eclproblem.hh to opm/simulators/flow

This commit is contained in:
Arne Morten Kvarving
2024-02-05 19:22:15 +01:00
parent 6f5d53b20b
commit fb7c4f6fd2
10 changed files with 29 additions and 31 deletions

View File

@@ -26,8 +26,6 @@
#include <fmt/format.h>
#include <ebos/eclproblem.hh>
#include <opm/common/ErrorMacros.hpp>
#include <opm/common/Exceptions.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>
@@ -42,6 +40,7 @@
#include <opm/simulators/flow/BlackoilModelNldd.hpp>
#include <opm/simulators/flow/BlackoilModelParameters.hpp>
#include <opm/simulators/flow/countGlobalCells.hpp>
#include <opm/simulators/flow/FlowProblem.hpp>
#include <opm/simulators/flow/NonlinearSolver.hpp>
#include <opm/simulators/flow/RSTConv.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>

View File

@@ -263,7 +263,7 @@ public:
/*!
* \brief Direct indexed access to the porosity.
*
* For the EclProblem, this method is identical to referencePorosity(). The intensive
* For the FlowProblem, this method is identical to referencePorosity(). The intensive
* quantities object may apply various multipliers (e.g. ones which model rock
* compressibility and water induced rock compaction) to it which depend on the
* current physical conditions.
@@ -303,7 +303,7 @@ protected:
/*!
* \brief Returns true if an eWoms restart file should be written to disk.
*
* The EclProblem does not write any restart files using the ad-hoc format, only ones
* The FlowProblem does not write any restart files using the ad-hoc format, only ones
* using the ECL format.
*/
bool shouldWriteRestartFile() const

File diff suppressed because it is too large Load Diff

View File

@@ -55,7 +55,7 @@
namespace Opm {
template <class TypeTag>
class EclProblem;
class FlowProblem;
}
namespace Opm::Properties {
@@ -141,7 +141,7 @@ struct ExplicitRockCompaction {
// Set the problem property
template<class TypeTag>
struct Problem<TypeTag, TTag::FlowBaseProblem> {
using type = EclProblem<TypeTag>;
using type = FlowProblem<TypeTag>;
};
template<class TypeTag>

View File

@@ -24,7 +24,6 @@
#ifndef OPM_BLACKOILWELLMODEL_HEADER_INCLUDED
#define OPM_BLACKOILWELLMODEL_HEADER_INCLUDED
#include <ebos/eclproblem.hh>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <cassert>
@@ -44,6 +43,7 @@
#include <opm/input/eclipse/Schedule/Well/WellTestState.hpp>
#include <opm/simulators/flow/countGlobalCells.hpp>
#include <opm/simulators/flow/FlowProblem.hpp>
#include <opm/simulators/flow/SubDomain.hpp>
#include <opm/simulators/wells/BlackoilWellModelGeneric.hpp>