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 #5193 from akva2/move_timestepping_params

Browse Source 
move ebos/ecltimesteppingparams.hh to opm/simulators/timestepping
This commit is contained in:
Markus Blatt 2024-02-23 10:13:24 +01:00 committed by GitHub
commit cc9d9bab41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -435,7 +435,6 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/eclproblem.hh ebos/eclproblem.hh
ebos/eclproblem_properties.hh ebos/eclproblem_properties.hh
ebos/eclsolutioncontainers.hh ebos/eclsolutioncontainers.hh
ebos/ecltimesteppingparams.hh
ebos/eclthresholdpressure.hh ebos/eclthresholdpressure.hh
ebos/ecltracermodel.hh ebos/ecltracermodel.hh
ebos/ecltransmissibility.hh ebos/ecltransmissibility.hh
@ -537,6 +536,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp
opm/simulators/timestepping/AdaptiveTimeStepping.hpp opm/simulators/timestepping/AdaptiveTimeStepping.hpp
opm/simulators/timestepping/ConvergenceReport.hpp opm/simulators/timestepping/ConvergenceReport.hpp
opm/simulators/timestepping/EclTimeSteppingParams.hpp
opm/simulators/timestepping/TimeStepControl.hpp opm/simulators/timestepping/TimeStepControl.hpp
opm/simulators/timestepping/TimeStepControlInterface.hpp opm/simulators/timestepping/TimeStepControlInterface.hpp
opm/simulators/timestepping/SimulatorTimer.hpp opm/simulators/timestepping/SimulatorTimer.hpp

2
ebos/ebos.hh
View File

@ -29,12 +29,12 @@
#define EBOS_HH #define EBOS_HH
#include <ebos/eclproblem.hh> #include <ebos/eclproblem.hh>
#include <ebos/ecltimesteppingparams.hh>
#include <opm/models/utils/start.hh> #include <opm/models/utils/start.hh>
#include <opm/simulators/aquifers/BlackoilAquiferModel.hpp> #include <opm/simulators/aquifers/BlackoilAquiferModel.hpp>
#include <opm/simulators/linalg/ISTLSolver.hpp> #include <opm/simulators/linalg/ISTLSolver.hpp>
#include <opm/simulators/timestepping/EclTimeSteppingParams.hpp>
#include <opm/simulators/wells/BlackoilWellModel.hpp> #include <opm/simulators/wells/BlackoilWellModel.hpp>
namespace Opm { namespace Opm {

3
opm/simulators/timestepping/AdaptiveTimeStepping.hpp
View File

@ -10,8 +10,6 @@
#include <dune/istl/ilu.hh> #include <dune/istl/ilu.hh>
#endif #endif
#include <ebos/ecltimesteppingparams.hh>
#include <opm/common/Exceptions.hpp> #include <opm/common/Exceptions.hpp>
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
@ -30,6 +28,7 @@
#include <opm/models/utils/propertysystem.hh> #include <opm/models/utils/propertysystem.hh>
#include <opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp> #include <opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp>
#include <opm/simulators/timestepping/EclTimeSteppingParams.hpp>
#include <opm/simulators/timestepping/SimulatorReport.hpp> #include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/simulators/timestepping/SimulatorTimer.hpp> #include <opm/simulators/timestepping/SimulatorTimer.hpp>
#include <opm/simulators/timestepping/TimeStepControl.hpp> #include <opm/simulators/timestepping/TimeStepControl.hpp>

8
ebos/ecltimesteppingparams.hh → opm/simulators/timestepping/EclTimeSteppingParams.hpp
View File

@ -20,10 +20,10 @@
module for the precise wording of the license and the list of module for the precise wording of the license and the list of
copyright holders. copyright holders.
*/ */
#ifndef ECL_TIMESTEPPING_PARAMS_HH #ifndef OPM_ECL_TIMESTEPPING_PARAMS_HPP
#define ECL_TIMESTEPPING_PARAMS_HH #define OPM_ECL_TIMESTEPPING_PARAMS_HPP
#include "opm/models/utils/basicproperties.hh" #include <opm/models/utils/basicproperties.hh>
#include <opm/models/utils/propertysystem.hh> #include <opm/models/utils/propertysystem.hh>
namespace Opm::Properties { namespace Opm::Properties {
@ -133,4 +133,4 @@ void registerEclTimeSteppingParameters()
} // namespace Opm } // namespace Opm
#endif // ECL_TIME_STEPPING_PARAMS_HH #endif // OPM_ECL_TIME_STEPPING_PARAMS_HPP