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/damaris_properties.hh: move to opm/simulators/flow

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-02 11:10:08 +01:00
parent 1362143e48
commit 76ccaf45ef
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -638,7 +638,7 @@ list (APPEND PUBLIC_HEADER_FILES
if (Damaris_FOUND AND MPI_FOUND AND USE_DAMARIS_LIB)
list (APPEND PUBLIC_HEADER_FILES opm/simulators/utils/DamarisOutputModule.hpp
opm/simulators/utils/DamarisKeywords.hpp
ebos/damaris_properties.hh
opm/simulators/flow/DamarisProperties.hpp
ebos/damariswriter.hh
opm/simulators/utils/DamarisVar.hpp
opm/simulators/utils/GridDataOutput.hpp

2
ebos/damariswriter.hh
View File

@ -33,11 +33,11 @@
#include <dune/grid/common/partitionset.hh>
#include <ebos/damaris_properties.hh>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/simulators/flow/countGlobalCells.hpp>
#include <opm/simulators/flow/DamarisProperties.hpp>
#include <opm/simulators/flow/EclGenericWriter.hpp>
#include <opm/simulators/flow/FlowBaseVanguard.hpp>
#include <opm/simulators/flow/OutputBlackoilModule.hpp>

6
ebos/damaris_properties.hh → opm/simulators/flow/DamarisProperties.hpp
View File

@ -28,8 +28,8 @@
*
* \copydoc Opm::DamarisWriter
*/
#ifndef EWOMS_DAMARIS_PROPERTIES_HH
#define EWOMS_DAMARIS_PROPERTIES_HH
#ifndef OPM_DAMARIS_PROPERTIES_HPP
#define OPM_DAMARIS_PROPERTIES_HPP
#include <opm/models/utils/parametersystem.hh>
@ -90,4 +90,4 @@ struct DamarisDaskFile {
} // namespace Opm::Properties
#endif
#endif // OPM_DAMARIS_PROPERTIES_HPP

3
opm/simulators/utils/DamarisKeywords.hpp
View File

@ -20,10 +20,9 @@
#ifndef OPM_DAMARISKEYWORDS_HEADER_INCLUDED
#define OPM_DAMARISKEYWORDS_HEADER_INCLUDED
#include <opm/simulators/flow/DamarisProperties.hpp>
#include <opm/simulators/utils/ParallelCommunication.hpp>
#include <ebos/damaris_properties.hh>
#include <map>
#include <string>