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 EclInterRegFlows 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 0673fae595
commit 46aae8cda6
6 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

@ -31,7 +31,6 @@ list (APPEND MAIN_SOURCE_FILES
ebos/eclgenerictracermodel.cc ebos/eclgenerictracermodel.cc
ebos/eclgenericvanguard.cc ebos/eclgenericvanguard.cc
ebos/eclgenericwriter.cc ebos/eclgenericwriter.cc
ebos/eclinterregflows.cc
ebos/eclmixingratecontrols.cc ebos/eclmixingratecontrols.cc
ebos/eclsolutioncontainers.cc ebos/eclsolutioncontainers.cc
ebos/ecltransmissibility.cc ebos/ecltransmissibility.cc
@ -45,6 +44,7 @@ list (APPEND MAIN_SOURCE_FILES
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/EclActionHandler.cpp
opm/simulators/flow/EclInterRegFlows.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
@ -398,7 +398,6 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/eclgenericvanguard.hh ebos/eclgenericvanguard.hh
ebos/eclgenericwriter.hh ebos/eclgenericwriter.hh
ebos/eclgenericwriter_impl.hh ebos/eclgenericwriter_impl.hh
ebos/eclinterregflows.hh
ebos/eclmixingratecontrols.hh ebos/eclmixingratecontrols.hh
ebos/eclmpiserializer.hh ebos/eclmpiserializer.hh
ebos/eclnewtonmethod.hh ebos/eclnewtonmethod.hh
@ -422,6 +421,7 @@ list (APPEND PUBLIC_HEADER_FILES
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/EclActionHandler.hpp
opm/simulators/flow/EclInterRegFlows.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

4
ebos/collecttoiorank.hh
View File

@ -23,8 +23,6 @@
#ifndef EWOMS_COLLECT_TO_IO_RANK_HH #ifndef EWOMS_COLLECT_TO_IO_RANK_HH
#define EWOMS_COLLECT_TO_IO_RANK_HH #define EWOMS_COLLECT_TO_IO_RANK_HH
#include <ebos/eclinterregflows.hh>
#include <opm/input/eclipse/Schedule/Well/WellTestState.hpp> #include <opm/input/eclipse/Schedule/Well/WellTestState.hpp>
#include <opm/grid/common/p2pcommunicator.hh> #include <opm/grid/common/p2pcommunicator.hh>
@ -35,6 +33,8 @@
#include <opm/output/data/Solution.hpp> #include <opm/output/data/Solution.hpp>
#include <opm/output/data/Wells.hpp> #include <opm/output/data/Wells.hpp>
#include <opm/simulators/flow/EclInterRegFlows.hpp>
#include <array> #include <array>
#include <cstddef> #include <cstddef>
#include <map> #include <map>

3
ebos/eclgenericoutputblackoilmodule.hh
View File

@ -23,11 +23,10 @@
#ifndef EWOMS_ECL_GENERIC_OUTPUT_BLACK_OIL_MODULE_HH #ifndef EWOMS_ECL_GENERIC_OUTPUT_BLACK_OIL_MODULE_HH
#define EWOMS_ECL_GENERIC_OUTPUT_BLACK_OIL_MODULE_HH #define EWOMS_ECL_GENERIC_OUTPUT_BLACK_OIL_MODULE_HH
#include <ebos/eclinterregflows.hh>
#include <opm/output/data/Wells.hpp> #include <opm/output/data/Wells.hpp>
#include <opm/output/eclipse/Inplace.hpp> #include <opm/output/eclipse/Inplace.hpp>
#include <opm/simulators/flow/EclInterRegFlows.hpp>
#include <opm/simulators/flow/LogOutputHelper.hpp> #include <opm/simulators/flow/LogOutputHelper.hpp>
#include <opm/simulators/utils/ParallelCommunication.hpp> #include <opm/simulators/utils/ParallelCommunication.hpp>

2
ebos/eclinterregflows.cc → opm/simulators/flow/EclInterRegFlows.cpp
View File

@ -23,7 +23,7 @@
#include "config.h" #include "config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#include <ebos/eclinterregflows.hh> #include <opm/simulators/flow/EclInterRegFlows.hpp>
#include <algorithm> #include <algorithm>
#include <stdexcept> #include <stdexcept>

6
ebos/eclinterregflows.hh → opm/simulators/flow/EclInterRegFlows.hpp
View File

@ -19,8 +19,8 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef ECL_INTERREG_FLOWS_MODULE_HH #ifndef ECL_INTERREG_FLOWS_MODULE_HPP
#define ECL_INTERREG_FLOWS_MODULE_HH #define ECL_INTERREG_FLOWS_MODULE_HPP
#include <opm/output/data/InterRegFlowMap.hpp> #include <opm/output/data/InterRegFlowMap.hpp>
@ -380,4 +380,4 @@ namespace Opm {
}; };
} // namespace Opm } // namespace Opm
#endif // ECL_INTERREG_FLOWS_MODULE_HH #endif // ECL_INTERREG_FLOWS_MODULE_HPP

4
tests/test_eclinterregflows.cpp
View File

@ -32,12 +32,12 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <ebos/eclinterregflows.hh>
#include <opm/output/data/InterRegFlowMap.hpp> #include <opm/output/data/InterRegFlowMap.hpp>
#include <opm/grid/common/p2pcommunicator.hh> #include <opm/grid/common/p2pcommunicator.hh>
#include <opm/simulators/flow/EclInterRegFlows.hpp>
#include <cmath> #include <cmath>
#include <cstddef> #include <cstddef>
#include <functional> #include <functional>