OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 02:00:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

move ebos/eclgenericwriter[_impl].[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 e7094558ef
commit 8d667301cc
8 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists_files.cmake
View File

@ -28,7 +28,6 @@ list (APPEND MAIN_SOURCE_FILES
ebos/eclgenericthresholdpressure.cc
ebos/eclgenerictracermodel.cc
ebos/eclgenericvanguard.cc
ebos/eclgenericwriter.cc
ebos/eclmixingratecontrols.cc
ebos/eclsolutioncontainers.cc
ebos/ecltransmissibility.cc
@ -42,6 +41,7 @@ list (APPEND MAIN_SOURCE_FILES
opm/simulators/flow/Banners.cpp
opm/simulators/flow/CollectDataOnIORank.cpp
opm/simulators/flow/ConvergenceOutputConfiguration.cpp
opm/simulators/flow/EclGenericWriter.cpp
opm/simulators/flow/ExtraConvergenceOutputThread.cpp
opm/simulators/flow/FlowUtils.cpp
opm/simulators/flow/GenericOutputBlackoilModule.cpp
@ -422,8 +422,6 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/eclgenerictracermodel.hh
ebos/eclgenerictracermodel_impl.hh
ebos/eclgenericvanguard.hh
ebos/eclgenericwriter.hh
ebos/eclgenericwriter_impl.hh
ebos/eclmixingratecontrols.hh
ebos/eclnewtonmethod.hh
ebos/eclproblem.hh
@ -448,6 +446,8 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/ConvergenceOutputConfiguration.hpp
opm/simulators/flow/countGlobalCells.hpp
opm/simulators/flow/DummyGradientCalculator.hpp
opm/simulators/flow/EclGenericWriter.hpp
opm/simulators/flow/EclGenericWriter_impl.hpp
opm/simulators/flow/ExtraConvergenceOutputThread.hpp
opm/simulators/flow/FemCpGridCompat.hpp
opm/simulators/flow/FIBlackoilModel.hpp

2
ebos/damariswriter.hh
View File

@ -35,11 +35,11 @@
#include <ebos/damaris_properties.hh>
#include <ebos/eclbasevanguard.hh>
#include <ebos/eclgenericwriter.hh>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/simulators/flow/countGlobalCells.hpp>
#include <opm/simulators/flow/EclGenericWriter.hpp>
#include <opm/simulators/flow/OutputBlackoilModule.hpp>
#include <opm/simulators/utils/DamarisVar.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>

6
ebos/eclwriter.hh
View File

@ -31,7 +31,8 @@
#include <dune/grid/common/partitionset.hh>
#include <ebos/eclbasevanguard.hh>
#include <ebos/eclgenericwriter.hh>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>
@ -41,9 +42,8 @@
#include <opm/simulators/flow/CollectDataOnIORank.hpp>
#include <opm/simulators/flow/countGlobalCells.hpp>
#include <opm/simulators/flow/EclGenericWriter.hpp>
#include <opm/simulators/flow/OutputBlackoilModule.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
#include <opm/simulators/utils/ParallelRestart.hpp>
#include <opm/simulators/timestepping/SimulatorTimer.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
#include <opm/simulators/utils/ParallelRestart.hpp>

2
flow/flow_blackoil_alugrid.cpp
View File

@ -30,11 +30,11 @@
#include <ebos/eclgenericproblem_impl.hh>
#include <ebos/eclgenericthresholdpressure_impl.hh>
#include <ebos/eclgenerictracermodel_impl.hh>
#include <ebos/eclgenericwriter_impl.hh>
#include <ebos/ecltransmissibility_impl.hh>
#include <ebos/equil/initstateequil_impl.hh>
#include <opm/simulators/flow/AluGridVanguard.hpp>
#include <opm/simulators/flow/CollectDataOnIORank_impl.hpp>
#include <opm/simulators/flow/EclGenericWriter_impl.hpp>
#include <opm/simulators/utils/GridDataOutput_impl.hpp>
namespace Opm {

2
flow/flow_blackoil_polyhedralgrid.cpp
View File

@ -31,9 +31,9 @@
#include <ebos/eclgenericthresholdpressure_impl.hh>
#include <ebos/eclgenerictracermodel_impl.hh>
#include <ebos/ecltransmissibility_impl.hh>
#include <ebos/eclgenericwriter_impl.hh>
#include <ebos/equil/initstateequil_impl.hh>
#include <opm/simulators/flow/CollectDataOnIORank_impl.hpp>
#include <opm/simulators/flow/EclGenericWriter_impl.hpp>
#include <opm/simulators/utils/GridDataOutput_impl.hpp>
namespace Opm {

3
ebos/eclgenericwriter.cc → opm/simulators/flow/EclGenericWriter.cpp
View File

@ -27,8 +27,7 @@
#include <opm/grid/CpGrid.hpp>
#include <opm/grid/cpgrid/GridHelpers.hpp>
#include <ebos/eclgenericwriter.hh>
#include <ebos/eclgenericwriter_impl.hh>
#include <opm/simulators/flow/EclGenericWriter_impl.hpp>
#if HAVE_DUNE_FEM
#include <dune/fem/gridpart/adaptiveleafgridpart.hh>

6
ebos/eclgenericwriter.hh → opm/simulators/flow/EclGenericWriter.hpp
View File

@ -25,8 +25,8 @@
*
* \copydoc Opm::EclWriter
*/
#ifndef EWOMS_ECL_GENERIC_WRITER_HH
#define EWOMS_ECL_GENERIC_WRITER_HH
#ifndef OPM_ECL_GENERIC_WRITER_HPP
#define OPM_ECL_GENERIC_WRITER_HPP
#include <ebos/ecltransmissibility.hh>
@ -174,4 +174,4 @@ private:
} // namespace Opm
#endif
#endif // OPM_ECL_GENERIC_WRITER_HPP

12
ebos/eclgenericwriter_impl.hh → opm/simulators/flow/EclGenericWriter_impl.hpp
View File

@ -20,10 +20,8 @@
module for the precise wording of the license and the list of
copyright holders.
*/
#ifndef EWOMS_ECL_GENERIC_WRITER_IMPL_HH
#define EWOMS_ECL_GENERIC_WRITER_IMPL_HH
#include <ebos/eclgenericwriter.hh>
#ifndef OPM_ECL_GENERIC_WRITER_IMPL_HPP
#define OPM_ECL_GENERIC_WRITER_IMPL_HPP
#include <dune/grid/common/mcmgmapper.hh>
@ -44,6 +42,8 @@
#include <opm/output/eclipse/RestartValue.hpp>
#include <opm/output/eclipse/Summary.hpp>
#include <opm/simulators/flow/EclGenericWriter.hpp>
#if HAVE_MPI
#include <opm/simulators/utils/MPISerializer.hpp>
#endif
@ -674,6 +674,6 @@ globalTrans() const
return *globalTrans_;
}
} // namespace Opm
#endif
#endif // OPM_ECL_GENERIC_WRITER_IMPL_HPP