changed: move damaris command line properties to separate file

to avoid pulling in the whole writer in DamarisKeywords.hpp

CMakeLists_files.cmake

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

ebos/damaris_properties.hh

@@ -0,0 +1,93 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*
+  Copyright 2022 SINTEF Digital, Mathematics and Cybernetics.
+  Copyright 2023 Inria, Bretagne–Atlantique Research Center
+  
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
+*/
+/*!
+ * \file
+ *
+ * \copydoc Opm::DamarisWriter
+ */
+#ifndef EWOMS_DAMARIS_PROPERTIES_HH
+#define EWOMS_DAMARIS_PROPERTIES_HH
+
+#include <opm/models/utils/parametersystem.hh>
+
+namespace Opm::Properties {
+
+template<class TypeTag, class MyTypeTag>
+struct EnableDamarisOutput {
+    using type = UndefinedProperty;
+};
+template<class TypeTag, class MyTypeTag>
+struct DamarisOutputHdfCollective {
+    using type = UndefinedProperty;
+};
+template<class TypeTag, class MyTypeTag>
+struct DamarisSaveMeshToHdf {
+    using type = UndefinedProperty;
+};
+template<class TypeTag, class MyTypeTag>
+struct DamarisSaveToHdf {
+    using type = UndefinedProperty;
+};
+template<class TypeTag, class MyTypeTag>
+struct DamarisPythonScript {
+    using type = UndefinedProperty;
+};
+template<class TypeTag, class MyTypeTag>
+struct DamarisPythonParaviewScript {
+    using type = UndefinedProperty;
+};
+template<class TypeTag, class MyTypeTag>
+struct DamarisSimName {
+    using type = UndefinedProperty;
+};
+template<class TypeTag, class MyTypeTag>
+struct DamarisDedicatedCores {
+    using type = UndefinedProperty;
+};
+template<class TypeTag, class MyTypeTag>
+struct DamarisDedicatedNodes {
+    using type = UndefinedProperty;
+};
+template<class TypeTag, class MyTypeTag>
+struct DamarisSharedMemoryName {
+    using type = UndefinedProperty;
+};
+template<class TypeTag, class MyTypeTag>
+struct DamarisSharedMemorySizeBytes {
+    using type = UndefinedProperty;
+};
+template<class TypeTag, class MyTypeTag>
+struct DamarisLogLevel {
+    using type = UndefinedProperty;
+};
+template<class TypeTag, class MyTypeTag>
+struct DamarisDaskFile {
+    using type = UndefinedProperty;
+};
+
+} // namespace Opm::Properties
+
+#endif

ebos/damariswriter.hh

@@ -33,89 +33,26 @@
 
 #include <dune/grid/common/partitionset.hh>
 
-#include <ebos/collecttoiorank.hh>
+#include <ebos/damaris_properties.hh>
 #include <ebos/eclbasevanguard.hh>
 #include <ebos/eclgenericwriter.hh>
 #include <ebos/ecloutputblackoilmodule.hh>
 
-#include <opm/input/eclipse/Units/UnitSystem.hpp>
-
-#include <opm/output/eclipse/RestartValue.hpp>
-
-#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
-#include <opm/simulators/utils/ParallelRestart.hpp>
-#include <opm/simulators/flow/countGlobalCells.hpp>
-
 #include <opm/common/OpmLog/OpmLog.hpp>
 
-#include <limits>
-#include <stdexcept>
-#include <string>
-#include <memory>
-
-#include <omp.h>
+#include <opm/simulators/flow/countGlobalCells.hpp>
+#include <opm/simulators/utils/DamarisVar.hpp>
+#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
+#include <opm/simulators/utils/GridDataOutput.hpp>
 
 #include <fmt/format.h>
 
 #include <Damaris.h>
-#include <opm/simulators/utils/GridDataOutput.hpp>
-#include <opm/simulators/utils/DamarisVar.hpp>
 
-namespace Opm::Properties {
-
-template<class TypeTag, class MyTypeTag>
-struct EnableDamarisOutput {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct DamarisOutputHdfCollective {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct DamarisSaveMeshToHdf {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct DamarisSaveToHdf {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct DamarisPythonScript {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct DamarisPythonParaviewScript {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct DamarisSimName {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct DamarisDedicatedCores {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct DamarisDedicatedNodes {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct DamarisSharedMemoryName {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct DamarisSharedMemorySizeBytes {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct DamarisLogLevel {
-    using type = UndefinedProperty;
-};
-template<class TypeTag, class MyTypeTag>
-struct DamarisDaskFile {
-    using type = UndefinedProperty;
-};
-} // namespace Opm::Properties
+#include <limits>
+#include <memory>
+#include <stdexcept>
+#include <string>
 
 namespace Opm {
 

opm/simulators/utils/DamarisKeywords.hpp

@@ -20,12 +20,12 @@
 #ifndef OPM_DAMARISKEYWORDS_HEADER_INCLUDED
 #define OPM_DAMARISKEYWORDS_HEADER_INCLUDED
 
-#include <string>
-#include <map>
-
 #include <opm/simulators/utils/ParallelCommunication.hpp>
 
-#include <ebos/damariswriter.hh>
+#include <ebos/damaris_properties.hh>
+
+#include <map>
+#include <string>
 
 /*
     Below is the std::map with the keywords that are supported by Damaris.
@@ -34,7 +34,6 @@
     be changed. We only allow changing FileMode together with output directory
 */
 
-
 namespace Opm::DamarisOutput
 {
     
@@ -107,4 +106,4 @@ getDamarisKeywords(const Parallel::Communication& comm, const std::string& Outpu
 } // namespace Opm::DamarisOutput
 
 
-#endif
+#endif