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

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

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-05 19:22:15 +01:00
parent 7b49bcb09e
commit 15339fe02f
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -414,7 +414,6 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/eclgenericproblem_impl.hh
ebos/eclnewtonmethod.hh
ebos/eclproblem.hh
ebos/eclproblem_properties.hh
opm/simulators/flow/ActionHandler.hpp
opm/simulators/flow/AluGridCartesianIndexMapper.hpp
opm/simulators/flow/AluGridVanguard.hpp
@ -439,6 +438,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/FlowBaseVanguard.hpp
opm/simulators/flow/FlowGenericVanguard.hpp
opm/simulators/flow/FlowMain.hpp
opm/simulators/flow/FlowProblemProperties.hpp
opm/simulators/flow/FlowUtils.hpp
opm/simulators/flow/FlowsData.hpp
opm/simulators/flow/FlowThresholdPressure.hpp

2
ebos/eclproblem.hh
View File

@ -36,7 +36,6 @@
#include <ebos/eclgenericproblem.hh>
#include <ebos/eclnewtonmethod.hh>
#include <ebos/eclproblem_properties.hh>
#include <opm/common/utility/TimeService.hpp>
@ -74,6 +73,7 @@
#include <opm/simulators/flow/EclWriter.hpp>
#include <opm/simulators/flow/EquilInitializer.hpp>
#include <opm/simulators/flow/FIBlackoilModel.hpp>
#include <opm/simulators/flow/FlowProblemProperties.hpp>
#include <opm/simulators/flow/FlowThresholdPressure.hpp>
#include <opm/simulators/flow/NewTranFluxModule.hpp>
#include <opm/simulators/flow/OutputBlackoilModule.hpp>

12
ebos/eclproblem_properties.hh → opm/simulators/flow/FlowProblemProperties.hpp
View File

@ -23,10 +23,10 @@
/*!
* \file
*
* \copydoc Opm::EclProblem
* \copydoc Opm::FlowProblem
*/
#ifndef ECL_PROBLEM_PROPERTIES_HH
#define ECL_PROBLEM_PROPERTIES_HH
#ifndef OPM_FLOW_PROBLEM_PROPERTIES_HPP
#define OPM_FLOW_PROBLEM_PROPERTIES_HPP
#include <ebos/eclnewtonmethod.hh>
@ -155,7 +155,7 @@ struct SpatialDiscretizationSplice<TypeTag, TTag::FlowBaseProblem> {
using type = TTag::EcfvDiscretization;
};
//! for ebos, use automatic differentiation to linearize the system of PDEs
// use automatic differentiation to linearize the system of PDEs
template<class TypeTag>
struct LocalLinearizerSplice<TypeTag, TTag::FlowBaseProblem> {
using type = TTag::AutoDiffLocalLinearizer;
@ -225,7 +225,7 @@ public:
using type = typename EclThermalLawManager::ThermalConductionLaw;
};
// ebos can use a slightly faster stencil class because it does not need the normals and
// use a slightly faster stencil class because it does not need the normals and
// the integration points of intersections
template<class TypeTag>
struct Stencil<TypeTag, TTag::FlowBaseProblem>
@ -600,4 +600,4 @@ struct ExplicitRockCompaction<TypeTag, TTag::FlowBaseProblem> {
} // namespace Opm::Properties
#endif // ECL_PROBLEM_PROPERTIES_HH
#endif // OPM_FLOW_PROBLEM_PROPERTIES_HPP

3
tests/TestTypeTag.hpp
View File

@ -28,11 +28,10 @@
#ifndef OPM_TEST_TYPETAG_HPP
#define OPM_TEST_TYPETAG_HPP
#include <ebos/eclproblem_properties.hh>
#include <opm/models/utils/start.hh>
#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
#include <opm/simulators/flow/FlowProblemProperties.hpp>
#include <opm/simulators/linalg/ISTLSolver.hpp>
#include <opm/simulators/timestepping/EclTimeSteppingParams.hpp>
#include <opm/simulators/wells/BlackoilWellModel.hpp>