From dc91d81b1c4980b769b7a693ad7519a4540f5ae8 Mon Sep 17 00:00:00 2001
From: chantrait <teddy.chantrait@cea.fr>
Date: Thu, 1 Feb 2024 16:38:38 +0100
Subject: [PATCH] fixup! merge with develop

---
 CMakeLists.txt                                  | 1 +
 src/language/modules/SchemeModule.cpp           | 3 ++-
 src/scheme/AcousticSolver.hpp                   | 1 +
 src/scheme/CMakeLists.txt                       | 2 +-
 src/scheme/FixedBoundaryConditionDescriptor.hpp | 2 ++
 src/scheme/HyperelasticSolver.hpp               | 2 ++
 src/scheme/IBoundaryConditionDescriptor.hpp     | 1 +
 src/utils/CMakeLists.txt                        | 3 ---
 8 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce2baa886..b05ae8ed7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -244,6 +244,7 @@ else()
   if (PUGS_ENABLE_COSTO MATCHES "^ON$")
     message(FATAL_ERROR "Could not find Costo!")
   endif()
+endif()
 # search for HDF5
 
 set(PUGS_ENABLE_HDF5 AUTO CACHE STRING
diff --git a/src/language/modules/SchemeModule.cpp b/src/language/modules/SchemeModule.cpp
index 1c06883aa..ffbb51b4b 100644
--- a/src/language/modules/SchemeModule.cpp
+++ b/src/language/modules/SchemeModule.cpp
@@ -9,7 +9,6 @@
 #include <language/utils/BinaryOperatorProcessorBuilder.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
 #include <language/utils/TypeDescriptor.hpp>
-#include <memory>
 #include <mesh/Connectivity.hpp>
 #include <mesh/IBoundaryDescriptor.hpp>
 #include <mesh/IZoneDescriptor.hpp>
@@ -50,6 +49,8 @@
 #include <utils/CouplingData.hpp>
 #include <utils/Socket.hpp>
 
+#include <memory>
+
 SchemeModule::SchemeModule()
 {
   this->_addTypeDescriptor(ast_node_data_type_from<std::shared_ptr<const DiscreteFunctionVariant>>);
diff --git a/src/scheme/AcousticSolver.hpp b/src/scheme/AcousticSolver.hpp
index 2c5bc8efa..80e5fbe72 100644
--- a/src/scheme/AcousticSolver.hpp
+++ b/src/scheme/AcousticSolver.hpp
@@ -1,5 +1,6 @@
 #ifndef ACOUSTIC_SOLVER_HPP
 #define ACOUSTIC_SOLVER_HPP
+
 #include <memory>
 #include <tuple>
 #include <vector>
diff --git a/src/scheme/CMakeLists.txt b/src/scheme/CMakeLists.txt
index 4fc6730e4..194e33be9 100644
--- a/src/scheme/CMakeLists.txt
+++ b/src/scheme/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library(
   DiscreteFunctionVectorInterpoler.cpp
   ScalarDiamondScheme.cpp
   VectorDiamondScheme.cpp
-  FluxingAdvectionSolver.cpp)
+  FluxingAdvectionSolver.cpp
 )
 
 target_link_libraries(
diff --git a/src/scheme/FixedBoundaryConditionDescriptor.hpp b/src/scheme/FixedBoundaryConditionDescriptor.hpp
index 995c9483c..b69648e38 100644
--- a/src/scheme/FixedBoundaryConditionDescriptor.hpp
+++ b/src/scheme/FixedBoundaryConditionDescriptor.hpp
@@ -1,5 +1,6 @@
 #ifndef FIXED_BOUNDARY_CONDITION_DESCRIPTOR_HPP
 #define FIXED_BOUNDARY_CONDITION_DESCRIPTOR_HPP
+
 #include <language/utils/FunctionSymbolId.hpp>
 #include <mesh/IBoundaryDescriptor.hpp>
 #include <scheme/IBoundaryConditionDescriptor.hpp>
@@ -42,4 +43,5 @@ class FixedBoundaryConditionDescriptor : public IBoundaryConditionDescriptor
 
   ~FixedBoundaryConditionDescriptor() = default;
 };
+
 #endif   // FIXED_BOUNDARY_CONDITION_DESCRIPTOR_HPP
diff --git a/src/scheme/HyperelasticSolver.hpp b/src/scheme/HyperelasticSolver.hpp
index 0454998cf..f82cbe361 100644
--- a/src/scheme/HyperelasticSolver.hpp
+++ b/src/scheme/HyperelasticSolver.hpp
@@ -1,5 +1,6 @@
 #ifndef HYPERELASTIC_SOLVER_HPP
 #define HYPERELASTIC_SOLVER_HPP
+
 #include <memory>
 #include <tuple>
 #include <vector>
@@ -85,4 +86,5 @@ class HyperelasticSolverHandler
 
   HyperelasticSolverHandler(const std::shared_ptr<const IMesh>& mesh);
 };
+
 #endif   // HYPERELASTIC_SOLVER_HPP
diff --git a/src/scheme/IBoundaryConditionDescriptor.hpp b/src/scheme/IBoundaryConditionDescriptor.hpp
index 97a87f3f1..1eec63e9a 100644
--- a/src/scheme/IBoundaryConditionDescriptor.hpp
+++ b/src/scheme/IBoundaryConditionDescriptor.hpp
@@ -43,4 +43,5 @@ class IBoundaryConditionDescriptor
 
   virtual ~IBoundaryConditionDescriptor() = default;
 };
+
 #endif   // I_BOUNDARY_CONDITION_DESCRIPTOR_HPP
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
index 41cdebb6e..6a94b6c7e 100644
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -28,11 +28,8 @@ target_link_libraries(
   PugsUtils
   ${PETSC_LIBRARIES}
   ${SLEPC_LIBRARIES}
-<<<<<<< HEAD
   ${Costo_LIBRARIES}
-=======
   ${HIGHFIVE_TARGET}
->>>>>>> develop
 )
 
 # --------------- get git revision info ---------------
-- 
GitLab