OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-20 11:48:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

move ebos/eclsolutioncontainers.[hh|cc] to opm/simulators/flow

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

4
CMakeLists_files.cmake
View File

@ -28,7 +28,6 @@ list (APPEND MAIN_SOURCE_FILES
ebos/eclgenericthresholdpressure.cc
ebos/eclgenerictracermodel.cc
ebos/eclgenericvanguard.cc
ebos/eclsolutioncontainers.cc
ebos/ecltransmissibility.cc
ebos/equil/equilibrationhelpers.cc
ebos/equil/initstateequil.cc
@ -55,6 +54,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/simulators/flow/RegionPhasePVAverage.cpp
opm/simulators/flow/SimulatorReportBanners.cpp
opm/simulators/flow/SimulatorSerializer.cpp
opm/simulators/flow/SolutionContainers.cpp
opm/simulators/flow/ValidationFunctions.cpp
opm/simulators/linalg/ExtractParallelGridInformationToISTL.cpp
opm/simulators/linalg/FlexibleSolver1.cpp
@ -425,7 +425,6 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/eclnewtonmethod.hh
ebos/eclproblem.hh
ebos/eclproblem_properties.hh
ebos/eclsolutioncontainers.hh
ebos/eclthresholdpressure.hh
ebos/ecltracermodel.hh
ebos/ecltransmissibility.hh
@ -469,6 +468,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/SimulatorFullyImplicitBlackoil.hpp
opm/simulators/flow/SimulatorReportBanners.hpp
opm/simulators/flow/SimulatorSerializer.hpp
opm/simulators/flow/SolutionContainers.hpp
opm/simulators/flow/SubDomain.hpp
opm/simulators/flow/ValidationFunctions.hpp
opm/core/props/BlackoilPhases.hpp

4
ebos/eclgenericproblem.hh
View File

@ -23,17 +23,17 @@
/*!
* \file
*
* \copydoc Opm::EclProblem
* \copydoc Opm::FlowProblem
*/
#ifndef EWOMS_GENERIC_ECL_PROBLEM_HH
#define EWOMS_GENERIC_ECL_PROBLEM_HH
#include <ebos/eclsolutioncontainers.hh>
#include <opm/material/common/UniformXTabulated2DFunction.hpp>
#include <opm/material/common/Tabulated1DFunction.hpp>
#include <opm/simulators/flow/MixingRateControls.hpp>
#include <opm/simulators/flow/SolutionContainers.hpp>
#include <array>
#include <cstddef>

4
ebos/eclgenericproblem_impl.hh
View File

@ -27,14 +27,14 @@
#include <dune/common/parametertree.hh>
#include <ebos/eclsolutioncontainers.hh>
#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/input/eclipse/EclipseState/Tables/OverburdTable.hpp>
#include <opm/input/eclipse/EclipseState/Tables/RockwnodTable.hpp>
#include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/simulators/flow/SolutionContainers.hpp>
#include <boost/date_time.hpp>
#include <fmt/format.h>

4
ebos/eclsolutioncontainers.cc → opm/simulators/flow/SolutionContainers.cpp
View File

@ -23,10 +23,10 @@
/*!
* \file
*
* \copydoc Opm::EclProblem
* \copydoc Opm::FlowProblem
*/
#include <config.h>
#include <ebos/eclsolutioncontainers.hh>
#include <opm/simulators/flow/SolutionContainers.hpp>
namespace Opm {

8
ebos/eclsolutioncontainers.hh → opm/simulators/flow/SolutionContainers.hpp
View File

@ -23,10 +23,10 @@
/*!
* \file
*
* \copydoc Opm::EclProblem
* \copydoc Opm::FlowProblem
*/
#ifndef ECL_SOLUTION_CONTAINERS_HH
#define ECL_SOLUTION_CONTAINERS_HH
#ifndef OPM_SOLUTION_CONTAINERS_HPP
#define OPM_SOLUTION_CONTAINERS_HPP
#include <vector>
@ -81,4 +81,4 @@ struct MICPSolutionContainer {
} // namespace Opm
#endif
#endif // OPM_SOLUTION_CONTAINERS_HPP