Fix a few issues with CMake dependencies

cmake/ThirdPartyMetis.cmake

@@ -64,9 +64,9 @@ IF (NEKTAR_USE_METIS)
         SET(METIS_CONFIG_INCLUDE_DIR ${TPINC})
 
         INCLUDE_DIRECTORIES(${TPDIST}/include)
-    ELSE (THIRDPARTY_BUILD_SCOTCH)
+    ELSE ()
         ADD_CUSTOM_TARGET(metis-5.1.0 ALL)
         MESSAGE(STATUS "Found Metis: ${METIS_LIBRARY}")
         SET(METIS_CONFIG_INCLUDE_DIR ${METIS_INCLUDE_DIR})
     ENDIF()
-ENDIF()
\ No newline at end of file
+ENDIF()

library/LibUtilities/CMakeLists.txt

@@ -32,6 +32,7 @@ SET(BasicUtilsHeaders
     ./BasicUtils/ThreadBoost.h
     ./BasicUtils/Vmath.hpp
     ./BasicUtils/VmathArray.hpp
+    ./BasicUtils/Metis.hpp
     ./BasicUtils/VtkUtil.hpp
 )
 

library/MultiRegions/SubStructuredGraph.cpp

@@ -987,7 +987,9 @@ namespace Nektar
                     }
                     else
                     {
-                        ASSERTL0(false, "Error in constructing Scotch graph for"
+                        // This should never be possible, but let's be pedantic
+                        // and check anyway.
+                        ASSERTL1(false, "Error in constructing Scotch graph for"
                                         " multi-level static condensation");
                     }
                 }
@@ -1028,7 +1030,7 @@ namespace Nektar
                 // and reorder the permutation from Scotch.
                 //
                 substructgraph = MemoryManager<BottomUpSubStructuredGraph>::
-                    AllocateSharedPtr(graphs[graphs.size()-1], nPartition, true);
+                    AllocateSharedPtr(graphs.back(), nPartition, true);
 
                 // Important: we cannot simply use the ordering given by Scotch
                 // as it does not order the different blocks as we would like

library/SpatialDomains/CMakeLists.txt

@@ -71,17 +71,17 @@ ADD_NEKTAR_LIBRARY(SpatialDomains
     DESCRIPTION "This library provides the mappings between reference regions and physical regions in the domain.")
 
 IF (NEKTAR_USE_METIS)
+    # Metis
+    TARGET_LINK_LIBRARIES(SpatialDomains LINK_PRIVATE ${METIS_LIB})
     ADD_DEPENDENCIES(SpatialDomains metis-5.1.0)
 ENDIF()
 
-# Metis
-TARGET_LINK_LIBRARIES(SpatialDomains LINK_PRIVATE ${METIS_LIB})
-
-IF( NEKTAR_USE_SCOTCH )
+IF (NEKTAR_USE_SCOTCH)
+    # Scotch
     TARGET_LINK_LIBRARIES(SpatialDomains LINK_PUBLIC
         ${SCOTCH_LIBRARY} ${SCOTCHERR_LIBRARY})
     ADD_DEPENDENCIES(SpatialDomains scotch-6.0.4)
-ENDIF ()
+ENDIF()
 
 INSTALL(DIRECTORY ./ DESTINATION ${NEKTAR_INCLUDE_DIR}/SpatialDomains
     COMPONENT dev FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")