OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-07-07 04:53:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-02 10:46:44 +01:00
parent d69ba021a9
commit d738ad2740
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists_files.cmake
View File

@ -414,7 +414,6 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/eclbaseaquifermodel.hh
ebos/eclbasevanguard.hh
ebos/eclcpgridvanguard.hh
ebos/ecldummygradientcalculator.hh
ebos/eclequilinitializer.hh
ebos/eclfluxmodule.hh
ebos/eclgenericcpgridvanguard.hh
@ -444,27 +443,28 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/femcpgridcompat.hh
ebos/vtkecltracermodule.hh
opm/simulators/flow/ActionHandler.hpp
opm/simulators/flow/countGlobalCells.hpp
opm/simulators/flow/priVarsPacking.hpp
opm/simulators/flow/Banners.hpp
opm/simulators/flow/BlackoilModel.hpp
opm/simulators/flow/BlackoilModelNldd.hpp
opm/simulators/flow/BlackoilModelParameters.hpp
opm/simulators/flow/Banners.hpp
opm/simulators/flow/ConvergenceOutputConfiguration.hpp
opm/simulators/flow/countGlobalCells.hpp
opm/simulators/flow/DummyGradientCalculator.hpp
opm/simulators/flow/ExtraConvergenceOutputThread.hpp
opm/simulators/flow/FlowMain.hpp
opm/simulators/flow/InterRegFlows.hpp
opm/simulators/flow/KeywordValidation.hpp
opm/simulators/flow/LogOutputHelper.hpp
opm/simulators/flow/Main.hpp
opm/simulators/flow/NonlinearSolver.hpp
opm/simulators/flow/partitionCells.hpp
opm/simulators/flow/priVarsPacking.hpp
opm/simulators/flow/RSTConv.hpp
opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
opm/simulators/flow/SimulatorReportBanners.hpp
opm/simulators/flow/SimulatorSerializer.hpp
opm/simulators/flow/KeywordValidation.hpp
opm/simulators/flow/LogOutputHelper.hpp
opm/simulators/flow/ValidationFunctions.hpp
opm/simulators/flow/partitionCells.hpp
opm/simulators/flow/SubDomain.hpp
opm/simulators/flow/ValidationFunctions.hpp
opm/core/props/BlackoilPhases.hpp
opm/core/props/phaseUsageFromDeck.hpp
opm/core/props/satfunc/RelpermDiagnostics.hpp

2
ebos/eclproblem.hh
View File

@ -36,7 +36,6 @@
#include <ebos/eclbaseaquifermodel.hh>
#include <ebos/eclcpgridvanguard.hh>
#include <ebos/ecldummygradientcalculator.hh>
#include <ebos/eclequilinitializer.hh>
#include <ebos/eclfluxmodule.hh>
#include <ebos/eclgenericproblem.hh>
@ -83,6 +82,7 @@
#include <opm/output/eclipse/EclipseIO.hpp>
#include <opm/simulators/flow/ActionHandler.hpp>
#include <opm/simulators/flow/DummyGradientCalculator.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
#include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>

5
ebos/eclproblem_properties.hh
View File

@ -30,7 +30,6 @@
#include <ebos/eclbaseaquifermodel.hh>
#include <ebos/eclcpgridvanguard.hh>
#include <ebos/ecldummygradientcalculator.hh>
#include <ebos/eclfluxmodule.hh>
#include <ebos/eclnewtonmethod.hh>
#include <ebos/ecloutputblackoilmodule.hh>
@ -49,6 +48,8 @@
#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
#include <opm/models/utils/propertysystem.hh>
#include <opm/simulators/flow/DummyGradientCalculator.hpp>
#include <tuple>
namespace Opm {
@ -516,7 +517,7 @@ struct FluxModule<TypeTag, TTag::EclBaseProblem> {
// Use the dummy gradient calculator in order not to do unnecessary work.
template<class TypeTag>
struct GradientCalculator<TypeTag, TTag::EclBaseProblem> {
using type = EclDummyGradientCalculator<TypeTag>;
using type = DummyGradientCalculator<TypeTag>;
};
// Use a custom Newton-Raphson method class for ebos in order to attain more

22
ebos/ecldummygradientcalculator.hh → opm/simulators/flow/DummyGradientCalculator.hpp
View File

@ -23,10 +23,10 @@
/*!
* \file
*
* \copydoc Opm::EclDummyGradientCalculator
* \copydoc Opm::DummyGradientCalculator
*/
#ifndef EWOMS_ECL_DUMMY_GRADIENT_CALCULATOR_HH
#define EWOMS_ECL_DUMMY_GRADIENT_CALCULATOR_HH
#ifndef OPM_DUMMY_GRADIENT_CALCULATOR_HPP
#define OPM_DUMMY_GRADIENT_CALCULATOR_HPP
#include <dune/common/fvector.hh>
@ -36,17 +36,17 @@
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
* \ingroup BlackOilSimulator
*
* \brief This is a "dummy" gradient calculator which does not do anything.
*
* The ECL blackoil simulator does not need any gradients: Volume fluxes are calculated
* The blackoil simulator does not need any gradients: Volume fluxes are calculated
* via pressure differences instead of pressure gradients (i.e., transmissibilities
* instead of permeabilities), and an energy equation and molecular diffusion are not
* supported.
*/
template<class TypeTag>
class EclDummyGradientCalculator
class DummyGradientCalculator
{
using GridView = GetPropType<TypeTag, Properties::GridView>;
using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@ -69,7 +69,7 @@ public:
unsigned,
const QuantityCallback&) const
{
throw std::logic_error("Generic values are not supported by the ECL black-oil simulator");
throw std::logic_error("Generic values are not supported by the black-oil simulator");
}
template <class QuantityCallback>
@ -78,7 +78,7 @@ public:
unsigned,
const QuantityCallback&) const
{
throw std::logic_error("Generic gradients are not supported by the ECL black-oil simulator");
throw std::logic_error("Generic gradients are not supported by the black-oil simulator");
}
template <class QuantityCallback>
@ -86,7 +86,7 @@ public:
unsigned,
const QuantityCallback&)
{
throw std::logic_error("Generic boundary values are not supported by the ECL black-oil simulator");
throw std::logic_error("Generic boundary values are not supported by the black-oil simulator");
}
template <class QuantityCallback>
@ -95,9 +95,9 @@ public:
unsigned,
const QuantityCallback&) const
{
throw std::logic_error("Generic boundary gradients are not supported by the ECL black-oil simulator");
throw std::logic_error("Generic boundary gradients are not supported by the black-oil simulator");
}
};
} // namespace Opm
#endif
#endif // OPM_DUMMY_GRADIENT_CALCULATOR_HPP