ebos/damariswriter: move to opm/simulators/flow

CMakeLists_files.cmake

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

ebos/eclproblem.hh

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

ebos/eclproblem_properties.hh

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

opm/simulators/flow/DamarisWriter.cpp

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

opm/simulators/flow/DamarisWriter.hpp

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