diff --git a/CMakeLists.txt b/CMakeLists.txt index ce2baa8869a8650ffb3ee19d4ebbce2a68474abf..b05ae8ed7d438f5eaabcb2e9df727328d24d10f6 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 1c06883aa9f16f25634ca6dfecb9d79150b8f910..ffbb51b4b560d1a4d2fc03c9fadb4a65618c66bc 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 2c5bc8efab6b1f34ab819cb14b8db4dcebbd5b68..80e5fbe726df35134a3aeb490a1b36658f875dca 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 4fc6730e462f0d2cad67d30f2db551819946dd5e..194e33be93280a9ae3de5f6e76583c2036035a77 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 995c9483c4f65ab1cfaeefd9f0a7505bbd73d217..b69648e38364f80ef34552f10f7de41ceebf8f57 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 0454998cf3650d91b432379db80bf4890b49e36c..f82cbe361051efc64a3e413d60c830febd62d907 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 97a87f3f1e3dcc0e5700a3b1d88af5105c85cb0d..1eec63e9a5737f495ef03e944f28e3fe9b5ec94f 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 41cdebb6eed2fbef3af6c2e906904c72b71a3a8d..6a94b6c7e97c1865802b806aaca2e369bff37197 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 ---------------