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

ebos/damariswriter: move to opm/simulators/flow

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-02 11:10:08 +01:00
parent 76ccaf45ef
commit 9facaaf816
5 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CMakeLists_files.cmake
View File

@ -152,12 +152,13 @@ list (APPEND MAIN_SOURCE_FILES
if (Damaris_FOUND AND MPI_FOUND AND USE_DAMARIS_LIB) if (Damaris_FOUND AND MPI_FOUND AND USE_DAMARIS_LIB)
list (APPEND MAIN_SOURCE_FILES opm/simulators/utils/DamarisOutputModule.cpp list (APPEND MAIN_SOURCE_FILES
opm/simulators/utils/DamarisKeywords.cpp opm/simulators/flow/DamarisWriter.cpp
opm/simulators/utils/initDamarisXmlFile.cpp opm/simulators/utils/DamarisKeywords.cpp
ebos/damariswriter.cc opm/simulators/utils/DamarisOutputModule.cpp
opm/simulators/utils/DamarisVar.cpp opm/simulators/utils/DamarisVar.cpp
opm/simulators/utils/GridDataOutput.cpp opm/simulators/utils/GridDataOutput.cpp
opm/simulators/utils/initDamarisXmlFile.cpp
) )
endif() endif()
if(CUDA_FOUND) if(CUDA_FOUND)
@ -636,13 +637,14 @@ list (APPEND PUBLIC_HEADER_FILES
) )
if (Damaris_FOUND AND MPI_FOUND AND USE_DAMARIS_LIB) if (Damaris_FOUND AND MPI_FOUND AND USE_DAMARIS_LIB)
list (APPEND PUBLIC_HEADER_FILES opm/simulators/utils/DamarisOutputModule.hpp list (APPEND PUBLIC_HEADER_FILES
opm/simulators/utils/DamarisKeywords.hpp opm/simulators/utils/DamarisKeywords.hpp
opm/simulators/flow/DamarisProperties.hpp opm/simulators/utils/DamarisOutputModule.hpp
ebos/damariswriter.hh opm/simulators/flow/DamarisProperties.hpp
opm/simulators/utils/DamarisVar.hpp opm/simulators/flow/DamarisWriter.hpp
opm/simulators/utils/GridDataOutput.hpp opm/simulators/utils/DamarisVar.hpp
opm/simulators/utils/GridDataOutput_impl.hpp opm/simulators/utils/GridDataOutput.hpp
opm/simulators/utils/GridDataOutput_impl.hpp
) )
endif() endif()

7
ebos/eclproblem.hh
View File

@ -38,9 +38,6 @@
#include <ebos/eclnewtonmethod.hh> #include <ebos/eclnewtonmethod.hh>
#include <ebos/eclproblem_properties.hh> #include <ebos/eclproblem_properties.hh>
#include <ebos/ecltransmissibility.hh> #include <ebos/ecltransmissibility.hh>
#if HAVE_DAMARIS
#include <ebos/damariswriter.hh>
#endif
#include <opm/common/utility/TimeService.hpp> #include <opm/common/utility/TimeService.hpp>
@ -92,6 +89,10 @@
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
#if HAVE_DAMARIS
#include <opm/simulators/flow/DamarisWriter.hpp>
#endif
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include <set> #include <set>

8
ebos/eclproblem_properties.hh
View File

@ -30,10 +30,6 @@
#include <ebos/eclnewtonmethod.hh> #include <ebos/eclnewtonmethod.hh>
#if HAVE_DAMARIS
#include <ebos/damariswriter.hh>
#endif
#include <opm/input/eclipse/Parser/ParserKeywords/E.hpp> #include <opm/input/eclipse/Parser/ParserKeywords/E.hpp>
#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp> #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
@ -51,6 +47,10 @@
#include <opm/simulators/flow/OutputBlackoilModule.hpp> #include <opm/simulators/flow/OutputBlackoilModule.hpp>
#include <opm/simulators/flow/VtkTracerModule.hpp> #include <opm/simulators/flow/VtkTracerModule.hpp>
#if HAVE_DAMARIS
#include <opm/simulators/flow/DamarisWriter.hpp>
#endif
#include <tuple> #include <tuple>
namespace Opm { namespace Opm {

2
ebos/damariswriter.cc → opm/simulators/flow/DamarisWriter.cpp
View File

@ -25,7 +25,7 @@
*/ */
#include <config.h> #include <config.h>
#include <ebos/damariswriter.hh> #include <opm/simulators/flow/DamarisWriter.hpp>
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>

6
ebos/damariswriter.hh → opm/simulators/flow/DamarisWriter.hpp
View File

@ -28,8 +28,8 @@
* *
* \copydoc Opm::DamarisWriter * \copydoc Opm::DamarisWriter
*/ */
#ifndef EWOMS_DAMARIS_WRITER_HH #ifndef OPM_DAMARIS_WRITER_HPP
#define EWOMS_DAMARIS_WRITER_HH #define OPM_DAMARIS_WRITER_HPP
#include <dune/grid/common/partitionset.hh> #include <dune/grid/common/partitionset.hh>
@ -415,4 +415,4 @@ private:
} // namespace Opm } // namespace Opm
#endif #endif // OPM_DAMARIS_WRITER_HPP