ebos/damaris_properties.hh: move to opm/simulators/flow

CMakeLists_files.cmake

@@ -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

ebos/damariswriter.hh

@@ -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>

opm/simulators/flow/DamarisProperties.hpp

@@ -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

opm/simulators/utils/DamarisKeywords.hpp

@@ -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>