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

changed: move EclActionHandler to opm/simulators/flow

Browse Source 
no opm-models usage
This commit is contained in:
Arne Morten Kvarving 2023-08-15 12:10:01 +02:00
parent 0960494aeb
commit dd1359bcf0
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists_files.cmake
View File

@ -24,7 +24,6 @@
# find opm -name '*.c*' -printf '\t%p\n' | sort # find opm -name '*.c*' -printf '\t%p\n' | sort
list (APPEND MAIN_SOURCE_FILES list (APPEND MAIN_SOURCE_FILES
ebos/collecttoiorank.cc ebos/collecttoiorank.cc
ebos/eclactionhandler.cc
ebos/eclgenericcpgridvanguard.cc ebos/eclgenericcpgridvanguard.cc
ebos/eclgenericoutputblackoilmodule.cc ebos/eclgenericoutputblackoilmodule.cc
ebos/eclgenericproblem.cc ebos/eclgenericproblem.cc
@ -45,6 +44,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/simulators/flow/Banners.cpp opm/simulators/flow/Banners.cpp
opm/simulators/flow/countGlobalCells.cpp opm/simulators/flow/countGlobalCells.cpp
opm/simulators/flow/ConvergenceOutputConfiguration.cpp opm/simulators/flow/ConvergenceOutputConfiguration.cpp
opm/simulators/flow/EclActionHandler.cpp
opm/simulators/flow/ExtraConvergenceOutputThread.cpp opm/simulators/flow/ExtraConvergenceOutputThread.cpp
opm/simulators/flow/FlowMainEbos.cpp opm/simulators/flow/FlowMainEbos.cpp
opm/simulators/flow/KeywordValidation.cpp opm/simulators/flow/KeywordValidation.cpp
@ -380,7 +380,6 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/collecttoiorank.hh ebos/collecttoiorank.hh
ebos/collecttoiorank_impl.hh ebos/collecttoiorank_impl.hh
ebos/ebos.hh ebos/ebos.hh
ebos/eclactionhandler.hh
ebos/eclalugridvanguard.hh ebos/eclalugridvanguard.hh
ebos/eclbaseaquifermodel.hh ebos/eclbaseaquifermodel.hh
ebos/eclbasevanguard.hh ebos/eclbasevanguard.hh
@ -422,6 +421,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/BlackoilModelParametersEbos.hpp opm/simulators/flow/BlackoilModelParametersEbos.hpp
opm/simulators/flow/Banners.hpp opm/simulators/flow/Banners.hpp
opm/simulators/flow/ConvergenceOutputConfiguration.hpp opm/simulators/flow/ConvergenceOutputConfiguration.hpp
opm/simulators/flow/EclActionHandler.hpp
opm/simulators/flow/ExtraConvergenceOutputThread.hpp opm/simulators/flow/ExtraConvergenceOutputThread.hpp
opm/simulators/flow/FlowMainEbos.hpp opm/simulators/flow/FlowMainEbos.hpp
opm/simulators/flow/Main.hpp opm/simulators/flow/Main.hpp

2
ebos/eclproblem.hh
View File

@ -32,7 +32,6 @@
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh> #include <dune/common/fmatrix.hh>
#include <ebos/eclactionhandler.hh>
#include <ebos/eclbaseaquifermodel.hh> #include <ebos/eclbaseaquifermodel.hh>
#include <ebos/eclcpgridvanguard.hh> #include <ebos/eclcpgridvanguard.hh>
#include <ebos/ecldummygradientcalculator.hh> #include <ebos/ecldummygradientcalculator.hh>
@ -78,6 +77,7 @@
#include <opm/output/eclipse/EclipseIO.hpp> #include <opm/output/eclipse/EclipseIO.hpp>
#include <opm/simulators/flow/EclActionHandler.hpp>
#include <opm/simulators/timestepping/SimulatorReport.hpp> #include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp> #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
#include <opm/simulators/utils/ParallelSerialization.hpp> #include <opm/simulators/utils/ParallelSerialization.hpp>

3
ebos/eclactionhandler.cc → opm/simulators/flow/EclActionHandler.cpp
View File

@ -22,8 +22,7 @@
*/ */
#include <config.h> #include <config.h>
#include <opm/simulators/flow/EclActionHandler.hpp>
#include <ebos/eclactionhandler.hh>
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/utility/TimeService.hpp> #include <opm/common/utility/TimeService.hpp>

14
ebos/eclactionhandler.hh → opm/simulators/flow/EclActionHandler.hpp
View File

@ -21,8 +21,8 @@
copyright holders. copyright holders.
*/ */
#ifndef ECL_ACTION_HANDLER_HH #ifndef ECL_ACTION_HANDLER_HPP
#define ECL_ACTION_HANDLER_HH #define ECL_ACTION_HANDLER_HPP
#include <opm/simulators/utils/ParallelCommunication.hpp> #include <opm/simulators/utils/ParallelCommunication.hpp>
@ -69,10 +69,10 @@ public:
private: private:
/* /*
This function is run after applyAction has been completed in the Schedule This function is run after applyAction has been completed in the Schedule
implementation. The sim_update argument should have members & flags for implementation. The sim_update argument should have members & flags for
the simulator properties which need to be updated. This functionality is the simulator properties which need to be updated. This functionality is
probably not complete. probably not complete.
*/ */
void applySimulatorUpdate(int report_step, void applySimulatorUpdate(int report_step,
const SimulatorUpdate& sim_update, const SimulatorUpdate& sim_update,
@ -94,4 +94,4 @@ private:
} // namespace Opm } // namespace Opm
#endif #endif // ECL_ACTION_HANDLER_HPP