fixup! merge with develop

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

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>>);

src/scheme/AcousticSolver.hpp

 #ifndef ACOUSTIC_SOLVER_HPP
 #define ACOUSTIC_SOLVER_HPP
+
 #include <memory>
 #include <tuple>
 #include <vector>

src/scheme/CMakeLists.txt

@@ -11,7 +11,7 @@ add_library(
   DiscreteFunctionVectorInterpoler.cpp
   ScalarDiamondScheme.cpp
   VectorDiamondScheme.cpp
-  FluxingAdvectionSolver.cpp)
+  FluxingAdvectionSolver.cpp
 )
 
 target_link_libraries(

src/scheme/FixedBoundaryConditionDescriptor.hpp

 #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

src/scheme/HyperelasticSolver.hpp

 #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

src/scheme/IBoundaryConditionDescriptor.hpp

@@ -43,4 +43,5 @@ class IBoundaryConditionDescriptor
 
   virtual ~IBoundaryConditionDescriptor() = default;
 };
+
 #endif   // I_BOUNDARY_CONDITION_DESCRIPTOR_HPP

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