OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-23 01:36:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-05 19:22:15 +01:00
parent 8d667301cc
commit ddb7c65f97
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -431,7 +431,6 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/ecltracermodel.hh ebos/ecltracermodel.hh
ebos/ecltransmissibility.hh ebos/ecltransmissibility.hh
ebos/ecltransmissibility_impl.hh ebos/ecltransmissibility_impl.hh
ebos/eclwriter.hh
ebos/vtkecltracermodule.hh ebos/vtkecltracermodule.hh
opm/simulators/flow/ActionHandler.hpp opm/simulators/flow/ActionHandler.hpp
opm/simulators/flow/AluGridCartesianIndexMapper.hpp opm/simulators/flow/AluGridCartesianIndexMapper.hpp
@ -448,6 +447,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/DummyGradientCalculator.hpp opm/simulators/flow/DummyGradientCalculator.hpp
opm/simulators/flow/EclGenericWriter.hpp opm/simulators/flow/EclGenericWriter.hpp
opm/simulators/flow/EclGenericWriter_impl.hpp opm/simulators/flow/EclGenericWriter_impl.hpp
opm/simulators/flow/EclWriter.hpp
opm/simulators/flow/ExtraConvergenceOutputThread.hpp opm/simulators/flow/ExtraConvergenceOutputThread.hpp
opm/simulators/flow/FemCpGridCompat.hpp opm/simulators/flow/FemCpGridCompat.hpp
opm/simulators/flow/FIBlackoilModel.hpp opm/simulators/flow/FIBlackoilModel.hpp

2
ebos/eclproblem.hh
View File

@ -42,7 +42,6 @@
#include <ebos/eclproblem_properties.hh> #include <ebos/eclproblem_properties.hh>
#include <ebos/eclthresholdpressure.hh> #include <ebos/eclthresholdpressure.hh>
#include <ebos/ecltransmissibility.hh> #include <ebos/ecltransmissibility.hh>
#include <ebos/eclwriter.hh>
#if HAVE_DAMARIS #if HAVE_DAMARIS
#include <ebos/damariswriter.hh> #include <ebos/damariswriter.hh>
#endif #endif
@ -81,6 +80,7 @@
#include <opm/simulators/flow/ActionHandler.hpp> #include <opm/simulators/flow/ActionHandler.hpp>
#include <opm/simulators/flow/BaseAquiferModel.hpp> #include <opm/simulators/flow/BaseAquiferModel.hpp>
#include <opm/simulators/flow/DummyGradientCalculator.hpp> #include <opm/simulators/flow/DummyGradientCalculator.hpp>
#include <opm/simulators/flow/EclWriter.hpp>
#include <opm/simulators/flow/FIBlackoilModel.hpp> #include <opm/simulators/flow/FIBlackoilModel.hpp>
#include <opm/simulators/flow/OutputBlackoilModule.hpp> #include <opm/simulators/flow/OutputBlackoilModule.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp> #include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>

3
ebos/eclproblem_properties.hh
View File

@ -31,7 +31,7 @@
#include <ebos/eclcpgridvanguard.hh> #include <ebos/eclcpgridvanguard.hh>
#include <ebos/eclfluxmodule.hh> #include <ebos/eclfluxmodule.hh>
#include <ebos/eclnewtonmethod.hh> #include <ebos/eclnewtonmethod.hh>
#include <ebos/eclwriter.hh>
#if HAVE_DAMARIS #if HAVE_DAMARIS
#include <ebos/damariswriter.hh> #include <ebos/damariswriter.hh>
#endif #endif
@ -47,6 +47,7 @@
#include <opm/simulators/flow/BaseAquiferModel.hpp> #include <opm/simulators/flow/BaseAquiferModel.hpp>
#include <opm/simulators/flow/DummyGradientCalculator.hpp> #include <opm/simulators/flow/DummyGradientCalculator.hpp>
#include <opm/simulators/flow/EclWriter.hpp>
#include <opm/simulators/flow/FIBlackoilModel.hpp> #include <opm/simulators/flow/FIBlackoilModel.hpp>
#include <opm/simulators/flow/OutputBlackoilModule.hpp> #include <opm/simulators/flow/OutputBlackoilModule.hpp>

6
ebos/eclwriter.hh → opm/simulators/flow/EclWriter.hpp
View File

@ -25,8 +25,8 @@
* *
* \copydoc Opm::EclWriter * \copydoc Opm::EclWriter
*/ */
#ifndef EWOMS_ECL_WRITER_HH #ifndef OPM_ECL_WRITER_HPP
#define EWOMS_ECL_WRITER_HH #define OPM_ECL_WRITER_HPP
#include <dune/grid/common/partitionset.hh> #include <dune/grid/common/partitionset.hh>
@ -709,4 +709,4 @@ private:
} // namespace Opm } // namespace Opm
#endif #endif // OPM_ECL_WRITER_HPP

2
opm/simulators/flow/FIBlackoilModel.hpp
View File

@ -33,6 +33,8 @@
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
#include <stdexcept> #include <stdexcept>
namespace Opm namespace Opm