From ec9c704deff4e6e8d6d4f258b24a30a1cc7e08c9 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Wed, 10 Jan 2024 14:15:00 +0100
Subject: [PATCH] cosmetics and header cleanups in damaris classes

---
 ebos/damariswriter.hh                        |  8 +++----
 opm/simulators/utils/DamarisKeywords.cpp     | 14 +++++++++----
 opm/simulators/utils/DamarisOutputModule.cpp | 17 +++++++--------
 opm/simulators/utils/DamarisOutputModule.hpp | 22 +++++++-------------
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/ebos/damariswriter.hh b/ebos/damariswriter.hh
index 98752aa68..28bc5cfa7 100644
--- a/ebos/damariswriter.hh
+++ b/ebos/damariswriter.hh
@@ -70,10 +70,10 @@ namespace Opm {
  
 template <class TypeTag>
 class DamarisWriter : public EclGenericWriter<GetPropType<TypeTag, Properties::Grid>,
-                                          GetPropType<TypeTag, Properties::EquilGrid>,
-                                          GetPropType<TypeTag, Properties::GridView>,
-                                          GetPropType<TypeTag, Properties::ElementMapper>,
-                                          GetPropType<TypeTag, Properties::Scalar>>
+                                              GetPropType<TypeTag, Properties::EquilGrid>,
+                                              GetPropType<TypeTag, Properties::GridView>,
+                                              GetPropType<TypeTag, Properties::ElementMapper>,
+                                              GetPropType<TypeTag, Properties::Scalar>>
 {
     using Simulator = GetPropType<TypeTag, Properties::Simulator>;
     using GridView = GetPropType<TypeTag, Properties::GridView>;
diff --git a/opm/simulators/utils/DamarisKeywords.cpp b/opm/simulators/utils/DamarisKeywords.cpp
index 5cc990627..4d92629e4 100644
--- a/opm/simulators/utils/DamarisKeywords.cpp
+++ b/opm/simulators/utils/DamarisKeywords.cpp
@@ -19,15 +19,21 @@
 */
 
 #include <config.h>
+#include <opm/simulators/utils/DamarisKeywords.hpp>
+
+#include <opm/common/ErrorMacros.hpp>
+#include <opm/common/OpmLog/OpmLog.hpp>
 
 #include <Damaris.h>
-#include <opm/simulators/utils/DamarisKeywords.hpp>
 #include <damaris/env/Environment.hpp>
 
-#include <string>
+#include <fmt/format.h>
+
+#include <fstream>
 #include <map>
 #include <random>
-#include <fstream>
+#include <stdexcept>
+#include <string>
 
 
 /**
@@ -263,4 +269,4 @@ DamarisSettings::getKeywords([[maybe_unused]] const Parallel::Communication& com
     return damaris_keywords;
 }
 
-} // namespace Opm::DamarisOutput
\ No newline at end of file
+} // namespace Opm::DamarisOutput
diff --git a/opm/simulators/utils/DamarisOutputModule.cpp b/opm/simulators/utils/DamarisOutputModule.cpp
index bafda99fb..20e8eea0c 100644
--- a/opm/simulators/utils/DamarisOutputModule.cpp
+++ b/opm/simulators/utils/DamarisOutputModule.cpp
@@ -18,20 +18,19 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
+#include <opm/simulators/utils/DamarisOutputModule.hpp>
+
+#include <opm/common/OpmLog/OpmLog.hpp>
+#include <opm/simulators/utils/DamarisKeywords.hpp>
+#include <opm/simulators/utils/ParallelCommunication.hpp>
 
 #define XSD_CXX11_TEMPLATE_ALIAS 1
 
-#include <config.h>
-
+#include <Damaris.h>
 #include <damaris/model/ModifyModel.hpp>
-#include <opm/simulators/utils/DamarisKeywords.hpp>
-#include <opm/simulators/utils/DamarisOutputModule.hpp>
-#include <opm/simulators/utils/ParallelCommunication.hpp>
-#include <opm/common/OpmLog/OpmLog.hpp>
-
 #include <fmt/format.h>
 
-
 namespace Opm::DamarisOutput
 {
 
@@ -42,7 +41,7 @@ std::string initDamarisXmlFile(); // Defined in initDamarisXMLFile.cpp, to avoid
  * by  filling in the XML file and storing it in the chosen directory
  */
 void
-initializeDamaris(const MPI_Comm comm, const int mpiRank, const std::map<std::string, std::string>& find_replace_map )
+initializeDamaris(const Parallel::Communication comm, const int mpiRank, const std::map<std::string, std::string>& find_replace_map )
 {
     int dam_err;
 
diff --git a/opm/simulators/utils/DamarisOutputModule.hpp b/opm/simulators/utils/DamarisOutputModule.hpp
index 178afc03f..94c2cd66b 100644
--- a/opm/simulators/utils/DamarisOutputModule.hpp
+++ b/opm/simulators/utils/DamarisOutputModule.hpp
@@ -20,17 +20,11 @@
 #ifndef DAMARIS_OUTPUT_MODULE_HPP
 #define DAMARIS_OUTPUT_MODULE_HPP
 
-#include <opm/common/OpmLog/OpmLog.hpp>
-
-#include <limits>
-#include <stdexcept>
-#include <string>
-
-#include <fmt/format.h>
-
-#include <Damaris.h>
 #include <opm/simulators/utils/ParallelCommunication.hpp>
 
+#include <map>
+#include <string>
+
 /*
     Below is the XML file for Damaris that is supported by Damaris.
 
@@ -38,11 +32,10 @@
     Keywords.
 */
 
+namespace Opm::DamarisOutput {
 
-namespace Opm::DamarisOutput
-{
- // Initialize an XML file
- std::string initDamarisXmlFile();
+// Initialize an XML file
+std::string initDamarisXmlFile();
  
 /**
 *   Initialize Damaris by either:
@@ -50,7 +43,8 @@ namespace Opm::DamarisOutput
 *  2/ Reading a file specified by the environment variable FLOW_DAMARIS_XML_FILE 
 *  
 */
- void initializeDamaris(const MPI_Comm comm, const int mpiRank, const std::map<std::string, std::string>& find_replace_map );
+void initializeDamaris(const Parallel::Communication comm, const int mpiRank,
+                       const std::map<std::string, std::string>& find_replace_map);
 
 } // namespace Opm::DamarisOutput