Merge branch 'master' into ticket/91-remove_ref_cnt_from_beginning_of_array

CHANGELOG.md

@@ -14,7 +14,7 @@ v5.0.0
   functionality in FUNCTIONs defined for forcings (!759)
 - Add patch to tinyxml to fix size_t vs int bug (!820)
 - Add ARPACK thirdparty build capabilities (!828)
-- Added native support for csv files in addititon to pts (!760 !835)
+- Added native support for csv files in addititon to pts (!760, !835, !906)
 - Utilize LAPACK_DIR env variable to find the native blas/lapack install (!827)
 - Remove StdExpansion use from MultiRegion (use Expansions instead). (!831)
 - Move steady state check and CFL output from solvers to SolverUtils (!832)
@@ -22,7 +22,7 @@ v5.0.0
 - Simplify RawType typedefs (!840)
 - Remove unused files from BasicUtils (!841)
 - Remove checks for old boost versions which are no longer supported (!841)
-- Refactor ParseUtils to be more consistent (!843, !896)
+- Refactor ParseUtils to be more consistent (!843, !896, !908)
 - Added support for using the distance to a specific region (e.g. outlet) in the
   function definitions for the Absorption Forcing (!769)
 - Improve performance of DisContField2D::v_ExtractTracePhys (!824)
@@ -34,8 +34,12 @@ v5.0.0
 - Fix mac OSX on buildbots (!876)
 - Fix error from (!826) (!876)
 - Fix minor bug in ARPACK thirdparty build cmake (!874)
-- Switch MeshGraph to use factory pattern and add HDF5 geometry support (!900)
-
+- Remove requirement for modmetis, switch to SCOTCH by default (!899)
+- Switch MeshGraph to use factory pattern and add HDF5 geometry support
+  (!900, !904)
+- Fix bug in MeshPartition.cpp which caused incorrect array access when
+  WeightPartitions was used in parallel (!923)
+	
 **NekMesh**:
 - Add feature to read basic 2D geo files as CAD (!731)
 - Add periodic boundary condition meshing in 2D (!733)
@@ -60,6 +64,10 @@ v5.0.0
 - Skip CFI groups of bodies and non-numbered nodes (!891)
 - Add ability to space out 2D BL nodes to better fit local target Delta (!890)
 - Fix automatic peralign call in 2D periodic meshing (!888)
+- Fix BL splitting call from MCF (!910)
+- Support CFI combined lines (!917)
+- Order nodes in Gmsh output (!912)
+- Fix manifold face curvature nodes (!913)
 
 **FieldConvert**:
 - Add input module for Semtex field files (!777)
@@ -78,13 +86,15 @@ v5.0.0
 - Replace steady-state check based on difference of norms by check based on
   norm of the difference, to be consistent with the compressible solver (!832)
 - Updated SVV to allow for the DGKernel extension (!851)
+- Pre-calculate Time invariant portion of Womersley Solution (!814)
 
 **CompressibleFlowSolver**
 - Add 3D regression tests (!567)
 - Introduce forcing for quasi-1D Euler simulations (!771)
-- Allow performing axi-symmetric Euler simulations (!771)
+- Allow performing axi-symmetric Euler and NS simulations (!771, !866)
 - Add ability to use an exponential filtering for stabilization with
   seg, quad and hex elements (!771, !862)
+- Introduce equations of state to account for real gas effects (!880)
 
 **APESolver:**
 - Added two new boundary conditions to the APE system: RiemannInvariantBC
@@ -105,6 +115,8 @@ v4.4.2
 - Fix calculation of BLPoints (!892)
 - Fix deadlock in DiffusionLDG (!885)
 - Fix uninitialised coefficients in DirectFull solver (!898)
+- Updated PETSc to 3.7.7 (!916)
+- Fix typcase to an integer which set Lz < 1 to zero when postprocess hdf5 output (!9922)
 
 **NekMesh**
 - Fix missing periodic boundary meshing and boundary layer mesh adjustment
@@ -114,6 +126,7 @@ v4.4.2
 **Documentation**:
 - Fix sign of the viscous term in the velocity correction scheme equations in
   the user guide (!856)
+- Fixed anonymous clone URL (!909)
 
 **FieldConvert**
 - Allow passing input name with trailing separator (!879)

CMakeLists.txt

@@ -56,8 +56,6 @@ ENABLE_TESTING()
 
 # Use the CMake 2.4 policy for CMake 2.6
 IF(COMMAND cmake_policy)
-    CMAKE_POLICY(SET CMP0003 OLD)
-
     # Silence warnings when using generator expressions in
     # TARGET_LINK_LIBRARIES.
     IF(POLICY CMP0022)
@@ -356,17 +354,21 @@ INSTALL(FILES ${CMAKE_BINARY_DIR}/Nektar++Config.cmake
     COMPONENT dev)
 
 # Install ThirdParty headers to subdirectory of ${NEKTAR_INCLUDE_DIR}
-INSTALL(DIRECTORY ${TPDIST}/include/
-    DESTINATION ${NEKTAR_INCLUDE_DIR}/ThirdParty
-    COMPONENT dev
-)
+IF (EXISTS ${TPDIST}/include)
+    INSTALL(DIRECTORY ${TPDIST}/include/
+        DESTINATION ${NEKTAR_INCLUDE_DIR}/ThirdParty
+        COMPONENT dev
+        )
+ENDIF()
 
 # Install ThirdParty libraries into ${NEKTAR_LIB_DIR}. These are shipped with
 # the LibUtilities library.
-INSTALL(DIRECTORY ${TPDIST}/lib/
-    DESTINATION ${NEKTAR_LIB_DIR}
-    COMPONENT libutilities
-)
+IF (EXISTS ${TPDIST}/lib)
+    INSTALL(DIRECTORY ${TPDIST}/lib/
+        DESTINATION ${NEKTAR_LIB_DIR}
+        COMPONENT libutilities
+        )
+ENDIF()
 
 ADD_SUBDIRECTORY(docs)
 

cmake/Nektar++Config.cmake.in

@@ -77,6 +77,13 @@ IF( NEKTAR_USE_SCOTCH )
         ${NEKTAR++_TP_INCLUDE_DIRS} ${SCOTCH_INCLUDE_DIRS})
 ENDIF( NEKTAR_USE_SCOTCH )
 
+SET(NEKTAR_USE_METIS "@NEKTAR_USE_METIS@")
+IF( NEKTAR_USE_METIS )
+    SET(METIS_INCLUDE_DIRS "@METIS_CONFIG_INCLUDE_DIR@")
+    SET(NEKTAR++_TP_INCLUDE_DIRS
+        ${NEKTAR++_TP_INCLUDE_DIRS} ${METIS_INCLUDE_DIRS})
+ENDIF( NEKTAR_USE_METIS )
+
 SET(NEKTAR_USE_FFTW "@NEKTAR_USE_FFTW@")
 IF( NEKTAR_USE_FFTW )
     SET(FFTW_INCLUDE_DIR "@FFTW_INCLUDE_DIR@")

cmake/ThirdPartyMPI.cmake

@@ -68,18 +68,14 @@ IF( NEKTAR_USE_MPI )
                 -DCMAKE_INSTALL_PREFIX:PATH=${TPDIST}
                 ${TPSRC}/gsmpi-1.2.1
         )
-        SET(GSMPI_LIBRARY gsmpi CACHE FILEPATH
-            "GSMPI path" FORCE)
+        THIRDPARTY_LIBRARY(GSMPI_LIBRARY STATIC gsmpi DESCRIPTION "GSMPI Library")
+        THIRDPARTY_LIBRARY(XXT_LIBRARY STATIC xxt DESCRIPTION "XXT Library")
         MARK_AS_ADVANCED(GSMPI_LIBRARY)
-        SET(XXT_LIBRARY xxt CACHE FILEPATH
-            "XXT path" FORCE)
         MARK_AS_ADVANCED(XXT_LIBRARY)
-        MESSAGE(STATUS "Build GSMPI: ${TPDIST}/lib/lib${GSMPI_LIBRARY}.a")
-        MESSAGE(STATUS "Build XXT: ${TPDIST}/lib/lib${XXT_LIBRARY}.a")
+        MESSAGE(STATUS "Build GSMPI: ${GSMPI_LIBRARY}")
+        MESSAGE(STATUS "Build XXT: ${XXT_LIBRARY}")
     ELSE (THIRDPARTY_BUILD_GSMPI)
-        ADD_CUSTOM_TARGET(gsmpi-1.2.1 ALL)
-        INCLUDE (FindGSMPI)
-        INCLUDE (FindXXT)
+        MESSAGE(FATAL_ERROR "Must build GSMPI and XXT")
     ENDIF (THIRDPARTY_BUILD_GSMPI)
 ENDIF( NEKTAR_USE_MPI )
 

cmake/ThirdPartyMetis.cmake

@@ -8,40 +8,65 @@
 
 INCLUDE(ExternalProject)
 
-EXTERNALPROJECT_ADD(
-    modmetis-5.1.0
-    PREFIX ${TPSRC}
-    URL ${TPURL}/modmetis-5.1.0_2.tar.bz2
-    URL_MD5 "8a1f1afd39b46a4477c1ea15464cdf89"
-    STAMP_DIR ${TPBUILD}/stamp
-    DOWNLOAD_DIR ${TPSRC}
-    SOURCE_DIR ${TPSRC}/modmetis-5.1.0
-    BINARY_DIR ${TPBUILD}/modmetis-5.1.0
-    TMP_DIR ${TPBUILD}/modmetis-5.1.0-tmp
-    INSTALL_DIR ${TPDIST}
-    CONFIGURE_COMMAND ${CMAKE_COMMAND}
-        -G ${CMAKE_GENERATOR}
-        -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-        -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-        -DCMAKE_INSTALL_PREFIX:PATH=${TPDIST}
-        -DCMAKE_C_FLAGS:STRING=-fPIC\ -w
-        -DGKLIB_PATH:PATH=${TPSRC}/modmetis-5.1.0/GKlib
-        ${TPSRC}/modmetis-5.1.0
-    )
-
-IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    # Clang 7.3 has a lovely bug that needs to be patched in order for it to
-    # compile.
-    IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "7.3")
-        EXTERNALPROJECT_ADD_STEP(modmetis-5.1.0 patch-install-path
-            COMMAND sed -i ".bak" "s|#define MAX_JBUFS 128|#define MAX_JBUFS 24|" ${TPSRC}/modmetis-5.1.0/GKlib/error.c
-            DEPENDERS build
-            DEPENDEES download)
-    ENDIF()
-ENDIF()
+OPTION(NEKTAR_USE_METIS
+    "Use Metis library for performing mesh partitioning." OFF)
+
+IF (NEKTAR_USE_METIS)
+    FIND_LIBRARY(METIS_LIBRARY NAMES metis PATHS ${MACPORTS_PREFIX}/lib)
+    FIND_PATH   (METIS_INCLUDE_DIR metis.h PATHS ${MACPORTS_PREFIX}/include)
+
+    IF (METIS_LIBRARY AND METIS_INCLUDE_DIR)
+        SET(BUILD_METIS OFF)
+    ELSE()
+        SET(BUILD_METIS ON)
+    ENDIF ()
+
+    CMAKE_DEPENDENT_OPTION(THIRDPARTY_BUILD_METIS
+        "Build Metis library from ThirdParty" ${BUILD_METIS}
+        "NEKTAR_USE_METIS" OFF)
 
-THIRDPARTY_LIBRARY(METIS_LIB STATIC metis DESCRIPTION "Metis library")
-MARK_AS_ADVANCED(METIS_LIB)
-MESSAGE(STATUS "Build Metis: ${METIS_LIB}")
+    IF (THIRDPARTY_BUILD_METIS)
+        EXTERNALPROJECT_ADD(
+            metis-5.1.0
+            PREFIX ${TPSRC}
+            URL ${TPURL}/metis-5.1.0.tar.gz
+            URL_MD5 "5465e67079419a69e0116de24fce58fe"
+            STAMP_DIR ${TPBUILD}/stamp
+            DOWNLOAD_DIR ${TPSRC}
+            SOURCE_DIR ${TPSRC}/metis-5.1.0
+            BINARY_DIR ${TPBUILD}/metis-5.1.0
+            TMP_DIR ${TPBUILD}/metis-5.1.0-tmp
+            INSTALL_DIR ${TPDIST}
+            CONFIGURE_COMMAND ${CMAKE_COMMAND}
+                -G ${CMAKE_GENERATOR}
+                -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+                -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
+                -DCMAKE_INSTALL_PREFIX:PATH=${TPDIST}
+                -DCMAKE_C_FLAGS:STRING=-fPIC\ -w
+                -DGKLIB_PATH:PATH=${TPSRC}/metis-5.1.0/GKlib
+                ${TPSRC}/metis-5.1.0
+            )
 
-INCLUDE_DIRECTORIES(${TPDIST}/include)
+        IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
\ No newline at end of file
+            # Clang 7.3 has a lovely bug that needs to be patched in order for it to
+            # compile.
+            IF (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "7.3")
+                EXTERNALPROJECT_ADD_STEP(metis-5.1.0 patch-install-path
+                    COMMAND sed -i ".bak" "s|#define MAX_JBUFS 128|#define MAX_JBUFS 24|" ${TPSRC}/metis-5.1.0/GKlib/error.c
+                    DEPENDERS build
+                    DEPENDEES download)
+            ENDIF()
+        ENDIF()
+
+        THIRDPARTY_LIBRARY(METIS_LIB STATIC metis DESCRIPTION "Metis library")
+        MARK_AS_ADVANCED(METIS_LIB)
+        MESSAGE(STATUS "Build Metis: ${METIS_LIB}")
+        SET(METIS_CONFIG_INCLUDE_DIR ${TPINC})
+
+        INCLUDE_DIRECTORIES(${TPDIST}/include)
+    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()

cmake/ThirdPartyPETSc.cmake

@@ -76,23 +76,22 @@ IF (NEKTAR_USE_PETSC)
         ENDIF()
 
         EXTERNALPROJECT_ADD(
-            petsc-3.7.2
+            petsc-3.7.7
             DEPENDS ${PETSC_DEPS}
             PREFIX ${TPSRC}
             STAMP_DIR ${TPBUILD}/stamp
             DOWNLOAD_DIR ${TPSRC}
-            SOURCE_DIR ${TPBUILD}/petsc-3.7.2
-            TMP_DIR ${TPBUILD}/petsc-3.7.2-tmp
+            SOURCE_DIR ${TPBUILD}/petsc-3.7.7
+            TMP_DIR ${TPBUILD}/petsc-3.7.7-tmp
             INSTALL_DIR ${TPDIST}
-            BINARY_DIR ${TPBUILD}/petsc-3.7.2
-            URL http://www.nektar.info/thirdparty/petsc-lite-3.7.2.tar.gz
-            URL_MD5 "26c2ff8eaaa9e49aea063f839f5daa7e"
+            BINARY_DIR ${TPBUILD}/petsc-3.7.7
+            URL ${TPURL}/petsc-lite-3.7.7.tar.gz
+            URL_MD5 "7b476e38cfab4cddb26f73e5ef23538e"
             CONFIGURE_COMMAND
                 OMPI_FC=${CMAKE_Fortran_COMPILER}
                 OMPI_CC=${CMAKE_C_COMPILER}
                 OMPI_CXX=${CMAKE_CXX_COMPILER}
                 ${PYTHON_EXECUTABLE} ./configure
-                ./configure
                 --with-fc=${PETSC_Fortran_COMPILER}
                 --with-cc=${PETSC_C_COMPILER}
                 --with-cxx=${PETSC_CXX_COMPILER}
@@ -121,7 +120,7 @@ IF (NEKTAR_USE_PETSC)
         ENDIF (NOT PETSC_FOUND)
         SET(PETSC_CONFIG_INCLUDE_DIR ${PETSC_INCLUDES})
         INCLUDE_DIRECTORIES(${PETSC_INCLUDES})
-        ADD_CUSTOM_TARGET(petsc-3.7.2 ALL)
+        ADD_CUSTOM_TARGET(petsc-3.7.7 ALL)
     ENDIF (THIRDPARTY_BUILD_PETSC)
 
     ADD_DEFINITIONS(-DNEKTAR_USING_PETSC)

cmake/ThirdPartyScotch.cmake

@@ -8,14 +8,14 @@
 
 IF (NOT WIN32)
     OPTION(NEKTAR_USE_SCOTCH
-        "Use Scotch library for performing mesh partitioning." OFF)
+        "Use Scotch library for performing mesh partitioning." ON)
 ENDIF(NOT WIN32)
 
 IF (NEKTAR_USE_SCOTCH)
     # First search for system TinyXML installs. Hint /opt/local for MacPorts.
-    FIND_LIBRARY(SCOTCH_LIBRARY    NAMES scotch PATHS /opt/local/lib)
-    FIND_LIBRARY(SCOTCHERR_LIBRARY NAMES scotcherr PATHS /opt/local/lib)
-    FIND_PATH   (SCOTCH_INCLUDE_DIR scotch.h PATHS /opt/local/include)
+    FIND_LIBRARY(SCOTCH_LIBRARY    NAMES scotch PATHS ${MACPORTS_PREFIX}/lib)
+    FIND_LIBRARY(SCOTCHERR_LIBRARY NAMES scotcherr PATHS ${MACPORTS_PREFIX}/lib)
+    FIND_PATH   (SCOTCH_INCLUDE_DIR scotch.h PATHS ${MACPORTS_PREFIX}/include)
 
     IF (SCOTCH_LIBRARY AND SCOTCHERR_LIBRARY AND SCOTCH_INCLUDE_DIR)
         SET(BUILD_SCOTCH OFF)
@@ -27,6 +27,8 @@ IF (NEKTAR_USE_SCOTCH)
         "Build Scotch library from ThirdParty" ${BUILD_SCOTCH}
         "NEKTAR_USE_SCOTCH" OFF)
 
+    ADD_DEFINITIONS(-DNEKTAR_USE_SCOTCH)
+
     IF (THIRDPARTY_BUILD_SCOTCH)
         UNSET(FLEX CACHE)
         FIND_PROGRAM(FLEX flex)
@@ -38,7 +40,7 @@ IF (NEKTAR_USE_SCOTCH)
 
         # Note that scotch is compiled in the source-tree, so we unpack the
         # source code in the ThirdParty builds directory.
-        SET(SCOTCH_SRC ${TPBUILD}/scotch-6.0.0/src)
+        SET(SCOTCH_SRC ${TPBUILD}/scotch-6.0.4/src)
 
         IF (APPLE)
             SET(SCOTCH_MAKE Makefile.inc.i686_mac_darwin8)
@@ -57,15 +59,15 @@ IF (NEKTAR_USE_SCOTCH)
 
         INCLUDE(ExternalProject)
         EXTERNALPROJECT_ADD(
-            scotch-6.0.0
+            scotch-6.0.4
             PREFIX ${TPSRC}
-            URL ${TPURL}/scotch_6.0.0.tar.gz
-            URL_MD5 "ba117428c0a6cd97d0c93e8b872bb3fe"
+            URL ${TPURL}/scotch_6.0.4.tar.gz
+            URL_MD5 "d58b825eb95e1db77efe8c6ff42d329f"
             STAMP_DIR ${TPBUILD}/stamp
             DOWNLOAD_DIR ${TPSRC}
-            SOURCE_DIR ${TPBUILD}/scotch-6.0.0
-            BINARY_DIR ${TPBUILD}/scotch-6.0.0
-            TMP_DIR ${TPBUILD}/scotch-6.0.0-tmp
+            SOURCE_DIR ${TPBUILD}/scotch-6.0.4
+            BINARY_DIR ${TPBUILD}/scotch-6.0.4
+            TMP_DIR ${TPBUILD}/scotch-6.0.4-tmp
             INSTALL_DIR ${TPDIST}
             CONFIGURE_COMMAND rm -f ${SCOTCH_SRC}/Makefile.inc
                 COMMAND ln -s
@@ -88,7 +90,7 @@ IF (NEKTAR_USE_SCOTCH)
         MESSAGE(STATUS "Build Scotch: ${SCOTCH_LIBRARY}")
         SET(SCOTCH_CONFIG_INCLUDE_DIR ${TPINC})
     ELSE (THIRDPARTY_BUILD_SCOTCH)
-        ADD_CUSTOM_TARGET(scotch-6.0.0 ALL)
+        ADD_CUSTOM_TARGET(scotch-6.0.4 ALL)
         MESSAGE(STATUS "Found Scotch: ${SCOTCH_LIBRARY}")
         SET(SCOTCH_CONFIG_INCLUDE_DIR ${SCOTCH_INCLUDE_DIR})
     ENDIF (THIRDPARTY_BUILD_SCOTCH)

developer-guide @ b1461b45

-Subproject commit e128cfaffbbd37c734a667cdc2a07b6f06291615
+Subproject commit b1461b45abb08c48397fe6d046249703c4f8f160

docs/user-guide/command-line/command-line.tex

@@ -57,9 +57,10 @@ high-memory node, prior to being executed on a multi-node cluster.
 
 \lstinline[style=BashInputStyle]{--use-metis}\\
 \hangindent=1.5cm
-Forces the use of METIS for mesh partitioning. If \nekpp{} is compiled with
-Scotch support, the default is to use Scotch.
+Forces the use of METIS for mesh partitioning. Requires the
+\inltt{NEKTAR\_USE\_METIS} option to be set.
 
 \lstinline[style=BashInputStyle]{--use-scotch}\\
 \hangindent=1.5cm
-Forces the use of Scotch for mesh partitioning.
+Forces the use of Scotch for mesh partitioning. If \nekpp{} is compiled with
+METIS support, the default is to use METIS.

docs/user-guide/installation/source.tex

@@ -24,7 +24,7 @@ There are two ways to obtain the source code for \nekpp:
 	public repository. Use this initially if you would like to try using
 	Nektar++ or make local changes to the code.
     \begin{lstlisting}[style=BashInputStyle]
-        git clone http://gitlab.nektar.info/clone/nektar/nektar.git nektar++
+        git clone https://gitlab.nektar.info/nektar/nektar.git nektar++
     \end{lstlisting}
 	\item Using authenticated access. This will allow you to directly contribute
 	back into the code.
@@ -49,7 +49,7 @@ be downloaded and compiled for use with Nektar++ \emph{automatically} (but not
 installed system-wide).
 
 \begin{center}
-\begin{tabular}{lccccl}
+\begin{tabularx}{\linewidth}{lccccX}
 \toprule
         &      & \multicolumn{3}{c}{Installation} & \\ \cmidrule(r){3-5}
 Package & Req. & Sys. & User & Auto.              & Note \\
@@ -65,7 +65,10 @@ LAPACK          & \cmark & \cmark & \cmark &        & \\
 Boost $>=1.52$   & \cmark & \cmark & \cmark & \cmark & Compile
 with iostreams
 \\
-ModMETIS        & \cmark &        &        & \cmark & \\
+Scotch          &        & \cmark & \cmark & \cmark & Required
+for multi-level static condensation, highly recommended\\
+METIS           &        & \cmark & \cmark & \cmark &
+Alternative mesh partitioning\\
 FFTW $>3.0$     &        & \cmark & \cmark & \cmark & For
 high-performance FFTs\\
 ARPACK $>2.0$   &        & \cmark & \cmark &        & For
@@ -78,12 +81,10 @@ HDF5            &        & \cmark & \cmark & \cmark & For
 large-scale parallel I/O (requires CMake >3.1)\\
 PETSc           &        &        & \cmark & \cmark &
 Alternative linear solvers\\
-Scotch          &        & \cmark & \cmark & \cmark &
-Alternative mesh partitioning\\
 VTK $>5.8$      &        & \cmark & \cmark &        & Visualisation
 utilities\\
 \bottomrule
-\end{tabular}
+\end{tabularx}
 \end{center}
 
 \begin{warningbox}
@@ -208,7 +209,7 @@ system-wide).
 \end{notebox}
 
 \begin{center}
-\begin{tabular}{lccccl}
+\begin{tabularx}{\linewidth}{lccccX}
 \toprule
         &      & \multicolumn{3}{c}{Installation} & \\ \cmidrule(r){3-5}
 Package & Req. & MacPorts & User & Auto.          & Note \\
@@ -223,7 +224,10 @@ Xcode \\
 Boost $>=1.52$   & \cmark & \texttt{boost}   & \cmark & \cmark & Compile
 with iostreams \\
 TinyXML         & \cmark & \texttt{tinyxml} & \cmark & \cmark & \\
-ModMETIS        & \cmark &                  &        & \cmark & \\
+Scotch          &        & \texttt{scotch}  & \cmark & \cmark & Required
+for multi-level static condensation, highly recommended\\
+METIS           &        & \texttt{metis}   & \cmark & \cmark &
+Alternative mesh partitioning\\
 FFTW $>3.0$     &        & \texttt{fftw-3}  & \cmark & \cmark & For
 high-performance FFTs\\
 ARPACK $>2.0$   &        & \texttt{arpack}  & \cmark &        & For
@@ -236,12 +240,10 @@ HDF5            &        & \cmark & \cmark & \cmark & For
 large-scale parallel I/O (requires CMake >3.1)\\
 PETSc           &        & \texttt{petsc}   & \cmark & \cmark &
 Alternative linear solvers\\
-Scotch          &        & \texttt{scotch}  & \cmark & \cmark &
-Alternative mesh partitioning\\
 VTK $>5.8$      &        & \texttt{vtk}     & \cmark &        &
 Visualisation utilities\\
 \bottomrule
-\end{tabular}
+\end{tabularx}
 \end{center}
 
 \newsavebox\installationOSXMacPortsTip
@@ -364,7 +366,7 @@ additional build packages. These can either be installed by the user, or
 automatically in the build process.
 
 \begin{center}
-\begin{tabular}{lcccl}
+\begin{tabularx}{\linewidth}{lcccX}
 \toprule
                   &        & \multicolumn{2}{c}{Installation} & \\ \cmidrule(r){3-4}
 Package           & Req.   & User   & Auto.        & Note \\
@@ -374,9 +376,8 @@ CMake $\geq 3.0$  & \cmark & \cmark &              & \\
 BLAS              & \cmark & \cmark & \cmark       & \\
 LAPACK            & \cmark & \cmark & \cmark       & \\
 Boost $\geq 1.55$ & \cmark & \cmark & \cmark       & Compile with iostreams\\
-ModMETIS          & \cmark & \cmark & \cmark       & \\
 \bottomrule
-\end{tabular}
+\end{tabularx}
 \end{center}
 
 \subsubsection{Detailed instructions}
@@ -583,6 +584,12 @@ can be selected using the following options:
     that \nekpp be built with MPI support with \inlsh{NEKTAR\_USE\_MPI} enabled
     and that HDF5 is compiled with MPI support.
 
+    \item \inlsh{NEKTAR\_USE\_METIS}
+
+    Build \nekpp with support for the METIS graph partitioning library. This
+    provides both an alternative mesh partitioning algorithm to SCOTCH for
+    parallel simulations.
+
     \item \inlsh{NEKTAR\_USE\_MKL}