Commit a32e0311 authored by Dave Moxey's avatar Dave Moxey

Add documentation to NektarCommon.cmake and remove ADD_NEKTAR_TEST_LENGTHY in...

Add documentation to NektarCommon.cmake and remove ADD_NEKTAR_TEST_LENGTHY in deference to a LENGTHY option to ADD_NEKTAR_TEST
parent cfa4ebea
##
## NektarCommon.cmake
##
## Frequently used Nektar++ CMake configuration macros and functions
##
#
# CONSTRUCT_DEBIAN_DEPS(depends outvar)
#
# This macro converts a list of component names to a string containing the
# Debian package dependencies for use by the CPack DEB generator, and stores
# this in an output variable. It assumes that packages will be named
# nektar++-<component>.
#
# Arguments:
# - `depends`: List of packages.
# - `outvar`: Name of output variable.
#
MACRO(CONSTRUCT_DEBIAN_DEPS depends outvar)
SET(${outvar} "")
FOREACH (pkg ${depends})
STRING(TOLOWER ${pkg} pkg_lower)
SET(${outvar} "${DEB_DEPS}, nektar++-${pkg_lower} (>= ${NEKTAR_VERSION})")
......@@ -7,27 +26,68 @@ MACRO(CONSTRUCT_DEBIAN_DEPS depends outvar)
# Remove starting ", "
STRING(SUBSTRING ${${outvar}} 2 -1 ${outvar})
UNSET(pkg)
UNSET(pkg_lower)
ENDMACRO()
#
# FINALISE_CPACK_COMPONENT(name DESCRIPTION <description>)
#
# Finalises the variables needed for a component in order to be packaged by
# CPack. This should be called once all executables and libraries have been
# added to the component. This routine will:
#
# - setup the component's name and description
# - compile a unique list of dependencies
# - construct a Debian dependency string using CONSTRUCT_DEBIAN_DEPS to be used
# in the resulting `.deb` file.
#
# Arguments:
# - `name`: component name.
# - `DESCRIPTION`: a brief summary of the package, which is used to describe
# the package when it is generated
#
MACRO(FINALISE_CPACK_COMPONENT name)
# Don't both doing anything if we aren't building packages.
IF (NEKTAR_BUILD_PACKAGES)
CMAKE_PARSE_ARGUMENTS(COMP "" "DESCRIPTION" "" ${ARGN})
# Component names are stored as upper ase in the CPack variable names.
STRING(TOUPPER ${name} COMPVAR)
# Set the component name to `nektar++-<name>`
SET(CPACK_COMPONENT_${COMPVAR}_DISPLAY_NAME nektar++-${name}
CACHE INTERNAL "")
SET(CPACK_COMPONENT_${COMPVAR}_DESCRIPTION ${COMP_DESCRIPTION} CACHE INTERNAL "")
# Remove any duplicates from the existing CPack component dependencies
# which are set by NEKTAR_ADD_EXECUTABLE and NEKTAR_ADD_LIBRARY
SET(tmp ${CPACK_COMPONENT_${COMPVAR}_DEPENDS})
LIST(REMOVE_DUPLICATES tmp)
SET(CPACK_COMPONENT_${COMPVAR}_DEPENDS ${tmp} CACHE INTERNAL "")
# Construct list of Debian dependencies
CONSTRUCT_DEBIAN_DEPS(${CPACK_COMPONENT_${COMPVAR}_DEPENDS} "tmp")
SET(CPACK_DEBIAN_${COMPVAR}_PACKAGE_DEPENDS ${tmp} CACHE INTERNAL "")
ENDIF()
ENDMACRO()
#
# THIRDPARTY_LIBRARY(varname DESCRIPTION <description> [STATIC|SHARED])
#
# Updates a variable containing the name of a third-party shared or static
# library to point to an absolute path defining its location instead of adding
# `-llibname` to the linker flags. This avoids the issue of e.g. linking against
# an outdated system zlib installation.
#
# Arguments:
# - `varname`: variable name containing the third-party library name. On
# output will be altered to update the correct path.
# - `DESCRIPTION`: a brief description of the variable (used in the SET
# command).
# - `SHARED`: if the library will be built as a shared library
# - `STATIC`: if the library will be built as a static library
#
MACRO(THIRDPARTY_LIBRARY varname)
CMAKE_PARSE_ARGUMENTS(TPLIB "" "DESCRIPTION" "STATIC;SHARED" ${ARGN})
......@@ -45,8 +105,29 @@ MACRO(THIRDPARTY_LIBRARY varname)
SET(${varname} ${tmplist} CACHE FILEPATH ${TPLIB_DESCRIPTION} FORCE)
UNSET(tmplist)
UNSET(LIBTYPE)
UNSET(TPLIBS)
UNSET(lib)
ENDMACRO()
#
# SET_COMMON_PROPERTIES(target)
#
# Sets properties that are common to either library or executable targets. This
# includes:
#
# - Name suffixes: -g for debug, -ms for minsize, -rg for release w/debug.
# - Disable some MSVC compiler warnings
# - Add -pg flag if NEKTAR_ENABLE_PROFILE is switched on and we're using gcc
# - Add compiler definitions and appropriate warning levels to gcc-like
# compilers (e.g. clang)
# - Define versions for the target
# - Make sure that -fPIC is enabled for library code if building shared
# libraries.
#
# Arguments:
# - `target`: target name
#
MACRO(SET_COMMON_PROPERTIES name)
SET_TARGET_PROPERTIES(${name} PROPERTIES DEBUG_POSTFIX -g)
SET_TARGET_PROPERTIES(${name} PROPERTIES MINSIZEREL_POSTFIX -ms)
......@@ -118,6 +199,18 @@ MACRO(SET_COMMON_PROPERTIES name)
ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
ENDMACRO(SET_COMMON_PROPERTIES name)
#
# ADD_NEKTAR_EXECUTABLE(name COMPONENT <component> [DEPENDS dep1 ...] [SOURCES src1 ...])
#
# Adds a new executable to a component with the supplied component dependencies
# and sources files.
#
# Arguments:
# - `name`: target name to construct
# - `COMPONENT`: component name in which this target will live (e.g. demos)
# - `DEPENDS`: a list of components on which this target depends on
# - `SOURCES`: a list of source files for this target
#
MACRO(ADD_NEKTAR_EXECUTABLE name)
CMAKE_PARSE_ARGUMENTS(NEKEXE "" "COMPONENT" "DEPENDS;SOURCES" ${ARGN})
ADD_EXECUTABLE(${name} ${NEKEXE_SOURCES})
......@@ -148,6 +241,26 @@ MACRO(ADD_NEKTAR_EXECUTABLE name)
SET(CPACK_COMPONENT_${NEKEXE_COMPVAR}_DEPENDS ${tmp} CACHE INTERNAL "")
ENDMACRO()
#
# ADD_NEKTAR_LIBRARY(name
# DESCRIPTION <description>
# DEPENDS dep1 dep2 ...
# SOURCES src1 src2 ...
# HEADERS head1 head2 ...)
#
# Adds a new library to a component with the supplied component dependencies and
# sources files. A new component will be set up automatically with a lower-case
# name: e.g. if the supplied library name is `LibUtilities` the corresponding
# component is `libutilities`.
#
# Arguments:
# - `name`: target name to construct
# - `DESCRIPTION`: a description of the library
# - `DEPENDS`: a list of components on which this target depends on
# - `SOURCES`: a list of source files for this target
# - `HEADERS`: a list of header files for this target. These will be
# automatically put into a `dev` package.
#
MACRO(ADD_NEKTAR_LIBRARY name)
CMAKE_PARSE_ARGUMENTS(NEKLIB "" "DESCRIPTION" "DEPENDS;SOURCES;HEADERS" ${ARGN})
......@@ -197,20 +310,25 @@ MACRO(ADD_NEKTAR_LIBRARY name)
ENDIF()
ENDMACRO()
# Adds a test with a given name.
# The Test Definition File should be in a subdirectory called Tests relative
# to the CMakeLists.txt file calling this macros. The test file should be called
# NAME.tst, where NAME is given as a parameter to this macro.
#
# ADD_NEKTAR_TEST(name [LENGTHY])
#
# Adds a test with a given name. The Test Definition File should be in a
# subdirectory called Tests relative to the CMakeLists.txt file calling this
# macros. The test file should be called NAME.tst, where NAME is given as a
# parameter to this macro. If the LENGTHY flag is given, the test will only be
# run if `NEKTAR_TEST_ALL` is enabled.
#
# Arguments:
# - `name`: name of the test file
# - `LENGTHY`: denotes a test that requires extended runtime.
#
MACRO(ADD_NEKTAR_TEST name)
GET_FILENAME_COMPONENT(dir ${CMAKE_CURRENT_SOURCE_DIR} NAME)
ADD_TEST(NAME ${dir}_${name}
COMMAND Tester ${CMAKE_CURRENT_SOURCE_DIR}/Tests/${name}.tst)
ENDMACRO(ADD_NEKTAR_TEST)
CMAKE_PARSE_ARGUMENTS(NEKTEST "LENGTHY" "" "" ${ARGN})
MACRO(ADD_NEKTAR_TEST_LENGTHY name)
IF (NEKTAR_TEST_ALL)
IF (NOT NEKTEST_LENGTHY OR NEKTAR_TEST_ALL)
GET_FILENAME_COMPONENT(dir ${CMAKE_CURRENT_SOURCE_DIR} NAME)
ADD_TEST(NAME ${dir}_${name}
COMMAND Tester ${CMAKE_CURRENT_SOURCE_DIR}/Tests/${name}.tst)
ENDIF(NEKTAR_TEST_ALL)
ENDMACRO(ADD_NEKTAR_TEST_LENGTHY)
COMMAND Tester ${CMAKE_CURRENT_SOURCE_DIR}/Tests/${name}.tst)
ENDIF()
ENDMACRO(ADD_NEKTAR_TEST)
......@@ -59,7 +59,7 @@ ADD_NEKTAR_TEST(Helmholtz2D_HDG_P7_Modes_AllBCs)
ADD_NEKTAR_TEST(Helmholtz2D_CG_varP_Modes)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_CG_Hex)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex LENGTHY)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_Heterogeneous)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_iter_ml)
......@@ -71,9 +71,9 @@ ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_Deformed)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Pyr)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Pyr_Deformed)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Homo1D)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_HDG_Homo1D)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Homo1D LENGTHY)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Prism)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_HDG_Hex_AllBCs)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Hex_AllBCs LENGTHY)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Tet)
ADD_NEKTAR_TEST(LinearAdvDiffReact2D_P7_Modes)
......@@ -97,7 +97,7 @@ IF (NEKTAR_USE_MPI)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_xxt_ml)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_iter_ml_par3)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_iter_ml_par3)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_CG_Hex_AllBCs_xxt_sc_par3)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_xxt_sc_par3 LENGTHY)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P14_xxt_per)
ADD_NEKTAR_TEST(Helmholtz2D_CG_varP_Modes_par)
......@@ -105,7 +105,7 @@ IF (NEKTAR_USE_MPI)
# To be resolved in a separate branch.
# ADD_NEKTAR_TEST(Helmholtz3D_CG_Tet_iter_global_par3)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz2D_HDG_P7_Modes_AllBCs_par2)
ADD_NEKTAR_TEST(Helmholtz2D_HDG_P7_Modes_AllBCs_par2 LENGTHY)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Prism_par2)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Hex_AllBCs_par2)
......
......@@ -22,6 +22,7 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
set(CPACK_RPM_PACKAGE_LICENSE "MIT")
set(CPACK_RPM_PACKAGE_DEBUG 0)
set(CPACK_RPM_COMPONENT_INSTALL ON)
# Set up generator-specific logic (i.e. that may change the above depending on
# generator) using additional CPack configuration file.
......@@ -29,6 +30,9 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/NektarCPackConfig.cmake.in
${CMAKE_BINARY_DIR}/NektarCPackConfig.cmake @ONLY)
set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_BINARY_DIR}/NektarCPackConfig.cmake)
# Finally, include the CPack module
include(CPack)
# This lovely block of code is designed to patch up our executables ready for OS
# X deployment. The strategy is to create a piece of INSTALL code that will
# patch up each executable and copy any libraries that we depend on, so that
......@@ -53,9 +57,6 @@ set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_BINARY_DIR}/NektarCPackConfig.cmake)
# All of this makes an entirely self-contained version of Nektar++ that can be
# extracted anywhere on the system and still retain its dependencies.
# Finally, include the CPack module
include(CPack)
if(APPLE)
install(CODE "
include(GetPrerequisites)
......
......@@ -22,117 +22,117 @@ IF( NEKTAR_SOLVER_ADR )
FINALISE_CPACK_COMPONENT(adrsolver DESCRIPTION "Nektar++ ADRSolver")
# 1D discontinuous advection (weak DG/flux reconstruction)
ADD_NEKTAR_TEST_LENGTHY(Advection1D_FRDG_GLL_LAGRANGE_SEM)
ADD_NEKTAR_TEST (Advection1D_FRDG_GAUSS_LAGRANGE)
ADD_NEKTAR_TEST (Advection1D_FRDG_GLL_LAGRANGE)
ADD_NEKTAR_TEST (Advection1D_FRDG_MODIFIED)
ADD_NEKTAR_TEST_LENGTHY(Advection1D_FRSD_GLL_LAGRANGE_SEM)
ADD_NEKTAR_TEST_LENGTHY(Advection1D_FRSD_GLL_LAGRANGE)
ADD_NEKTAR_TEST_LENGTHY(Advection1D_FRSD_MODIFIED)
ADD_NEKTAR_TEST_LENGTHY(Advection1D_FRHU_GLL_LAGRANGE_SEM)
ADD_NEKTAR_TEST_LENGTHY(Advection1D_FRHU_GLL_LAGRANGE)
ADD_NEKTAR_TEST_LENGTHY(Advection1D_FRHU_MODIFIED)
ADD_NEKTAR_TEST (Advection1D_WeakDG_GLL_LAGRANGE)
ADD_NEKTAR_TEST (Advection1D_WeakDG_GAUSS_LAGRANGE)
ADD_NEKTAR_TEST (Advection1D_WeakDG_MODIFIED)
ADD_NEKTAR_TEST(Advection1D_FRDG_GLL_LAGRANGE_SEM LENGTHY)
ADD_NEKTAR_TEST(Advection1D_FRDG_GAUSS_LAGRANGE)
ADD_NEKTAR_TEST(Advection1D_FRDG_GLL_LAGRANGE)
ADD_NEKTAR_TEST(Advection1D_FRDG_MODIFIED)
ADD_NEKTAR_TEST(Advection1D_FRSD_GLL_LAGRANGE_SEM LENGTHY)
ADD_NEKTAR_TEST(Advection1D_FRSD_GLL_LAGRANGE LENGTHY)
ADD_NEKTAR_TEST(Advection1D_FRSD_MODIFIED LENGTHY)
ADD_NEKTAR_TEST(Advection1D_FRHU_GLL_LAGRANGE_SEM LENGTHY)
ADD_NEKTAR_TEST(Advection1D_FRHU_GLL_LAGRANGE LENGTHY)
ADD_NEKTAR_TEST(Advection1D_FRHU_MODIFIED LENGTHY)
ADD_NEKTAR_TEST(Advection1D_WeakDG_GLL_LAGRANGE)
ADD_NEKTAR_TEST(Advection1D_WeakDG_GAUSS_LAGRANGE)
ADD_NEKTAR_TEST(Advection1D_WeakDG_MODIFIED)
# 2D discontinuous advection (weak DG/flux reconstruction)
ADD_NEKTAR_TEST (Advection2D_dirichlet_deformed_GLL_LAGRANGE_10x10)
ADD_NEKTAR_TEST (Advection2D_dirichlet_deformed_GAUSS_LAGRANGE_10x10)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_dirichlet_deformed_GLL_LAGRANGE_SEM_10x10)
ADD_NEKTAR_TEST (Advection2D_dirichlet_deformed_MODIFIED_10x10)
ADD_NEKTAR_TEST (Advection2D_dirichlet_regular_GLL_LAGRANGE_10x10)
ADD_NEKTAR_TEST (Advection2D_dirichlet_regular_GAUSS_LAGRANGE_10x10)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_dirichlet_regular_GLL_LAGRANGE_SEM_10x10)
ADD_NEKTAR_TEST (Advection2D_dirichlet_regular_MODIFIED_10x10)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_ISO_deformed_GLL_LAGRANGE_3x3)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_ISO_deformed_GAUSS_LAGRANGE_3x3)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_ISO_deformed_GLL_LAGRANGE_SEM_3x3)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_ISO_deformed_MODIFIED_3x3)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_ISO_regular_GLL_LAGRANGE_3x3)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_ISO_regular_GAUSS_LAGRANGE_3x3)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_ISO_regular_GLL_LAGRANGE_SEM_3x3)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_ISO_regular_MODIFIED_3x3)
ADD_NEKTAR_TEST (Advection2D_periodic_deformed_GLL_LAGRANGE_2x2)
ADD_NEKTAR_TEST (Advection2D_periodic_deformed_GAUSS_LAGRANGE_2x2)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_2x2)
ADD_NEKTAR_TEST (Advection2D_periodic_deformed_MODIFIED_2x2)
ADD_NEKTAR_TEST (Advection2D_periodic_regular_GLL_LAGRANGE_2x2)
ADD_NEKTAR_TEST (Advection2D_periodic_regular_GAUSS_LAGRANGE_2x2)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_periodic_regular_GLL_LAGRANGE_SEM_2x2)
ADD_NEKTAR_TEST (Advection2D_periodic_regular_MODIFIED_2x2)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_periodic_deformed_GLL_LAGRANGE_10x10)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_10x10)
ADD_NEKTAR_TEST_LENGTHY(Advection2D_periodic_deformed_MODIFIED_10x10)
ADD_NEKTAR_TEST (Advection_m12_DG_periodic)
ADD_NEKTAR_TEST (Advection2D_m12_DG_quad_VarP)
ADD_NEKTAR_TEST (Advection2D_m12_DG_tri_VarP)
ADD_NEKTAR_TEST (Advection2D_ISO_regular_SSPRK2)
ADD_NEKTAR_TEST (Advection2D_ISO_regular_SSPRK3)
ADD_NEKTAR_TEST(Advection2D_dirichlet_deformed_GLL_LAGRANGE_10x10)
ADD_NEKTAR_TEST(Advection2D_dirichlet_deformed_GAUSS_LAGRANGE_10x10)
ADD_NEKTAR_TEST(Advection2D_dirichlet_deformed_GLL_LAGRANGE_SEM_10x10 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_dirichlet_deformed_MODIFIED_10x10)
ADD_NEKTAR_TEST(Advection2D_dirichlet_regular_GLL_LAGRANGE_10x10)
ADD_NEKTAR_TEST(Advection2D_dirichlet_regular_GAUSS_LAGRANGE_10x10)
ADD_NEKTAR_TEST(Advection2D_dirichlet_regular_GLL_LAGRANGE_SEM_10x10 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_dirichlet_regular_MODIFIED_10x10)
ADD_NEKTAR_TEST(Advection2D_ISO_deformed_GLL_LAGRANGE_3x3 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_ISO_deformed_GAUSS_LAGRANGE_3x3 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_ISO_deformed_GLL_LAGRANGE_SEM_3x3 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_ISO_deformed_MODIFIED_3x3 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_ISO_regular_GLL_LAGRANGE_3x3 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_ISO_regular_GAUSS_LAGRANGE_3x3 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_ISO_regular_GLL_LAGRANGE_SEM_3x3 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_ISO_regular_MODIFIED_3x3 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_periodic_deformed_GLL_LAGRANGE_2x2)
ADD_NEKTAR_TEST(Advection2D_periodic_deformed_GAUSS_LAGRANGE_2x2)
ADD_NEKTAR_TEST(Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_2x2 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_periodic_deformed_MODIFIED_2x2)
ADD_NEKTAR_TEST(Advection2D_periodic_regular_GLL_LAGRANGE_2x2)
ADD_NEKTAR_TEST(Advection2D_periodic_regular_GAUSS_LAGRANGE_2x2)
ADD_NEKTAR_TEST(Advection2D_periodic_regular_GLL_LAGRANGE_SEM_2x2 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_periodic_regular_MODIFIED_2x2)
ADD_NEKTAR_TEST(Advection2D_periodic_deformed_GLL_LAGRANGE_10x10 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_10x10 LENGTHY)
ADD_NEKTAR_TEST(Advection2D_periodic_deformed_MODIFIED_10x10 LENGTHY)
ADD_NEKTAR_TEST(Advection_m12_DG_periodic)
ADD_NEKTAR_TEST(Advection2D_m12_DG_quad_VarP)
ADD_NEKTAR_TEST(Advection2D_m12_DG_tri_VarP)
ADD_NEKTAR_TEST(Advection2D_ISO_regular_SSPRK2)
ADD_NEKTAR_TEST(Advection2D_ISO_regular_SSPRK3)
# 2D continuous advection (non-conservative)
ADD_NEKTAR_TEST (Advection_m12_Order1)
ADD_NEKTAR_TEST (Advection_m12_Order2)
ADD_NEKTAR_TEST (Advection_m14_Order4)
ADD_NEKTAR_TEST(Advection_m12_Order1)
ADD_NEKTAR_TEST(Advection_m12_Order2)
ADD_NEKTAR_TEST(Advection_m14_Order4)
# 2D advection diffusion (Imex DG)
ADD_NEKTAR_TEST (UnsteadyAdvectionDiffusion_2D_ImexDG)
ADD_NEKTAR_TEST(UnsteadyAdvectionDiffusion_2D_ImexDG)
# 3D discontinous advection
ADD_NEKTAR_TEST_LENGTHY(Advection3D_m12_DG_hex_periodic_nodal)
ADD_NEKTAR_TEST (Advection3D_m12_DG_hex_nodal)
ADD_NEKTAR_TEST (Advection3D_m12_DG_hex_periodic)
ADD_NEKTAR_TEST (Advection3D_m12_DG_hex)
ADD_NEKTAR_TEST (Advection3D_m12_DG_hex_VarP)
ADD_NEKTAR_TEST (Advection3D_m12_DG_prism)
ADD_NEKTAR_TEST (Advection3D_m12_DG_prism_VarP)
ADD_NEKTAR_TEST (Advection3D_m12_DG_tet)
ADD_NEKTAR_TEST (Advection3D_m12_DG_tet_VarP)
ADD_NEKTAR_TEST(Advection3D_m12_DG_hex_periodic_nodal LENGTHY)
ADD_NEKTAR_TEST(Advection3D_m12_DG_hex_nodal)
ADD_NEKTAR_TEST(Advection3D_m12_DG_hex_periodic)
ADD_NEKTAR_TEST(Advection3D_m12_DG_hex)
ADD_NEKTAR_TEST(Advection3D_m12_DG_hex_VarP)
ADD_NEKTAR_TEST(Advection3D_m12_DG_prism)
ADD_NEKTAR_TEST(Advection3D_m12_DG_prism_VarP)
ADD_NEKTAR_TEST(Advection3D_m12_DG_tet)
ADD_NEKTAR_TEST(Advection3D_m12_DG_tet_VarP)
# 1D inviscid Burger (DG/FR)
ADD_NEKTAR_TEST_LENGTHY(InviscidBurger1D_FRDG_GLL_LAGRANGE_SEM)
ADD_NEKTAR_TEST (InviscidBurger1D_FRDG_GAUSS_LAGRANGE)
ADD_NEKTAR_TEST (InviscidBurger1D_FRDG_GLL_LAGRANGE)
ADD_NEKTAR_TEST (InviscidBurger1D_FRDG_MODIFIED)
ADD_NEKTAR_TEST_LENGTHY(InviscidBurger1D_FRSD_GLL_LAGRANGE_SEM)
ADD_NEKTAR_TEST_LENGTHY(InviscidBurger1D_FRSD_GLL_LAGRANGE)
ADD_NEKTAR_TEST_LENGTHY(InviscidBurger1D_FRSD_MODIFIED)
ADD_NEKTAR_TEST_LENGTHY(InviscidBurger1D_FRHU_GLL_LAGRANGE_SEM)
ADD_NEKTAR_TEST_LENGTHY(InviscidBurger1D_FRHU_GLL_LAGRANGE)
ADD_NEKTAR_TEST_LENGTHY(InviscidBurger1D_FRHU_MODIFIED)
ADD_NEKTAR_TEST (InviscidBurger1D_WeakDG_GLL_LAGRANGE)
ADD_NEKTAR_TEST (InviscidBurger1D_WeakDG_GAUSS_LAGRANGE)
ADD_NEKTAR_TEST (InviscidBurger1D_WeakDG_MODIFIED)
ADD_NEKTAR_TEST(InviscidBurger1D_FRDG_GLL_LAGRANGE_SEM LENGTHY)
ADD_NEKTAR_TEST(InviscidBurger1D_FRDG_GAUSS_LAGRANGE)
ADD_NEKTAR_TEST(InviscidBurger1D_FRDG_GLL_LAGRANGE)
ADD_NEKTAR_TEST(InviscidBurger1D_FRDG_MODIFIED)
ADD_NEKTAR_TEST(InviscidBurger1D_FRSD_GLL_LAGRANGE_SEM LENGTHY)
ADD_NEKTAR_TEST(InviscidBurger1D_FRSD_GLL_LAGRANGE LENGTHY)
ADD_NEKTAR_TEST(InviscidBurger1D_FRSD_MODIFIED LENGTHY)
ADD_NEKTAR_TEST(InviscidBurger1D_FRHU_GLL_LAGRANGE_SEM LENGTHY)
ADD_NEKTAR_TEST(InviscidBurger1D_FRHU_GLL_LAGRANGE LENGTHY)
ADD_NEKTAR_TEST(InviscidBurger1D_FRHU_MODIFIED LENGTHY)
ADD_NEKTAR_TEST(InviscidBurger1D_WeakDG_GLL_LAGRANGE)
ADD_NEKTAR_TEST(InviscidBurger1D_WeakDG_GAUSS_LAGRANGE)
ADD_NEKTAR_TEST(InviscidBurger1D_WeakDG_MODIFIED)
# 1D explicit diffusion (LDG/LFR)
ADD_NEKTAR_TEST (ExDiffusion_1D_LDG)
ADD_NEKTAR_TEST (ExDiffusion_1D_LDG_GAUSS)
ADD_NEKTAR_TEST (ExDiffusion_1D_LFRDG_GAUSS)
ADD_NEKTAR_TEST_LENGTHY(ExDiffusion_1D_LFRSD_GAUSS)
ADD_NEKTAR_TEST_LENGTHY(ExDiffusion_1D_LFRHU_GAUSS)
ADD_NEKTAR_TEST (ExDiffusion_1D_LFRDG)
ADD_NEKTAR_TEST (ExDiffusion_1D_LFRHU)
ADD_NEKTAR_TEST_LENGTHY(ExDiffusion_1D_LFRSD)
ADD_NEKTAR_TEST(ExDiffusion_1D_LDG)
ADD_NEKTAR_TEST(ExDiffusion_1D_LDG_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_1D_LFRDG_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_1D_LFRSD_GAUSS LENGTHY)
ADD_NEKTAR_TEST(ExDiffusion_1D_LFRHU_GAUSS LENGTHY)
ADD_NEKTAR_TEST(ExDiffusion_1D_LFRDG)
ADD_NEKTAR_TEST(ExDiffusion_1D_LFRHU)
ADD_NEKTAR_TEST(ExDiffusion_1D_LFRSD LENGTHY)
# 2D explicit diffusion (LDG/LFR)
ADD_NEKTAR_TEST (ExDiffusion_2D_LDG_hybrid_m3)
ADD_NEKTAR_TEST_LENGTHY(ExDiffusion_2D_LDG_hybrid_m8)
ADD_NEKTAR_TEST (ExDiffusion_2D_LDG_regular_Neumann)
ADD_NEKTAR_TEST (ExDiffusion_2D_LDG_regular_Neumann_GAUSS)
ADD_NEKTAR_TEST (ExDiffusion_2D_LFRDG_regular_Neumann)
ADD_NEKTAR_TEST (ExDiffusion_2D_LFRDG_regular_Neumann_GAUSS)
ADD_NEKTAR_TEST_LENGTHY(ExDiffusion_2D_LFRSD_regular_Neumann)
ADD_NEKTAR_TEST_LENGTHY(ExDiffusion_2D_LFRSD_regular_Neumann_GAUSS)
ADD_NEKTAR_TEST_LENGTHY(ExDiffusion_2D_LFRHU_regular_Neumann)
ADD_NEKTAR_TEST_LENGTHY(ExDiffusion_2D_LFRHU_regular_Neumann_GAUSS)
ADD_NEKTAR_TEST (ExDiffusion_2D_LDG_deformed)
ADD_NEKTAR_TEST (ExDiffusion_2D_LDG_deformed_GAUSS)
ADD_NEKTAR_TEST (ExDiffusion_2D_LFRDG_deformed)
ADD_NEKTAR_TEST (ExDiffusion_2D_LFRDG_deformed_GAUSS)
ADD_NEKTAR_TEST_LENGTHY(ExDiffusion_2D_LFRHU_deformed)
ADD_NEKTAR_TEST_LENGTHY(ExDiffusion_2D_LFRHU_deformed_GAUSS)
ADD_NEKTAR_TEST_LENGTHY(ExDiffusion_2D_LFRSD_deformed)
ADD_NEKTAR_TEST_LENGTHY(ExDiffusion_2D_LFRSD_deformed_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_2D_LDG_hybrid_m3)
ADD_NEKTAR_TEST(ExDiffusion_2D_LDG_hybrid_m8 LENGTHY)
ADD_NEKTAR_TEST(ExDiffusion_2D_LDG_regular_Neumann)
ADD_NEKTAR_TEST(ExDiffusion_2D_LDG_regular_Neumann_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRDG_regular_Neumann)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRDG_regular_Neumann_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRSD_regular_Neumann LENGTHY)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRSD_regular_Neumann_GAUSS LENGTHY)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRHU_regular_Neumann LENGTHY)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRHU_regular_Neumann_GAUSS LENGTHY)
ADD_NEKTAR_TEST(ExDiffusion_2D_LDG_deformed)
ADD_NEKTAR_TEST(ExDiffusion_2D_LDG_deformed_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRDG_deformed)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRDG_deformed_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRHU_deformed LENGTHY)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRHU_deformed_GAUSS LENGTHY)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRSD_deformed LENGTHY)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRSD_deformed_GAUSS LENGTHY)
# C^0 projection
ADD_NEKTAR_TEST(Projection2D)
......@@ -168,8 +168,8 @@ IF( NEKTAR_SOLVER_ADR )
ADD_NEKTAR_TEST(Helmholtz3D_nodal_HexDeformed)
ADD_NEKTAR_TEST(Helmholtz_3DHomo1D_MVM)
ADD_NEKTAR_TEST(Helmholtz_3DHomo2D_MVM)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_modal)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_nodal)
ADD_NEKTAR_TEST(Helmholtz3D_modal LENGTHY)
ADD_NEKTAR_TEST(Helmholtz3D_nodal LENGTHY)
ADD_NEKTAR_TEST(Helmholtz3D_CubePeriodic)
ADD_NEKTAR_TEST(Helmholtz3D_Cube_BndFile)
ADD_NEKTAR_TEST(Helmholtz3D_CubePeriodic_RotateFace)
......@@ -184,7 +184,6 @@ IF( NEKTAR_SOLVER_ADR )
ADD_NEKTAR_TEST(SVV_Prism)
ADD_NEKTAR_TEST(SVV_Tet)
IF (NEKTAR_USE_FFTW)
ADD_NEKTAR_TEST(Helmholtz_3DHomo1D_FFT)
ADD_NEKTAR_TEST(Helmholtz_3DHomo2D_FFT)
......@@ -205,14 +204,14 @@ IF( NEKTAR_SOLVER_ADR )
ENDIF (NEKTAR_USE_FFTW)
IF (NEKTAR_USE_MPI)
ADD_NEKTAR_TEST_LENGTHY(Advection3D_m12_DG_hex_par)
ADD_NEKTAR_TEST_LENGTHY(Advection3D_m12_DG_prism_par)
ADD_NEKTAR_TEST_LENGTHY(Advection3D_m12_DG_tet_par)
ADD_NEKTAR_TEST_LENGTHY(Advection3D_m12_DG_hex_VarP_par)
ADD_NEKTAR_TEST_LENGTHY(Advection3D_m12_DG_tet_VarP_par)
ADD_NEKTAR_TEST_LENGTHY(Advection3D_m12_DG_prism_VarP_par)
ADD_NEKTAR_TEST(Advection3D_m12_DG_hex_par LENGTHY)
ADD_NEKTAR_TEST(Advection3D_m12_DG_prism_par LENGTHY)
ADD_NEKTAR_TEST(Advection3D_m12_DG_tet_par LENGTHY)
ADD_NEKTAR_TEST(Advection3D_m12_DG_hex_VarP_par LENGTHY)
ADD_NEKTAR_TEST(Advection3D_m12_DG_tet_VarP_par LENGTHY)
ADD_NEKTAR_TEST(Advection3D_m12_DG_prism_VarP_par LENGTHY)
ADD_NEKTAR_TEST(Advection3D_m12_DG_hex_periodic_par)
ADD_NEKTAR_TEST_LENGTHY(ImDiffusion_Quad_Periodic_m7_par)
ADD_NEKTAR_TEST(ImDiffusion_Quad_Periodic_m7_par LENGTHY)
ADD_NEKTAR_TEST(ImDiffusion_Hex_Periodic_m5_par)
ADD_NEKTAR_TEST(Helmholtz3D_CubePeriodic_par)
ADD_NEKTAR_TEST(Helmholtz3D_CubeDirichlet_par)
......
......@@ -22,7 +22,7 @@ IF( NEKTAR_SOLVER_APE )
ADD_NEKTAR_TEST(APE_2DPulseInterp_WeakDG_MODIFIED)
ADD_NEKTAR_TEST(APE_2DPulseWall_WeakDG_MODIFIED)
ADD_NEKTAR_TEST(APE_2DVariableC_WeakDG_MODIFIED)
ADD_NEKTAR_TEST_LENGTHY(APE_3DPulse_WeakDG_MODIFIED)
ADD_NEKTAR_TEST_LENGTHY(APE_3DPulseWall_WeakDG_MODIFIED)
ADD_NEKTAR_TEST(APE_3DPulse_WeakDG_MODIFIED LENGTHY)
ADD_NEKTAR_TEST(APE_3DPulseWall_WeakDG_MODIFIED LENGTHY)
ENDIF( NEKTAR_SOLVER_APE )
......@@ -46,58 +46,58 @@ IF( NEKTAR_SOLVER_COMPRESSIBLE_FLOW )
SUBDIRS(Utilities)
FINALISE_CPACK_COMPONENT(compressibleflowsolver DESCRIPTION "Nektar++ Compressible Flow Solver")
ADD_NEKTAR_TEST (CylinderSubsonic_FRDG_SEM)
ADD_NEKTAR_TEST (CylinderSubsonic_FRDG_GAUSS)
ADD_NEKTAR_TEST_LENGTHY(CylinderSubsonic_FRHU_SEM)
ADD_NEKTAR_TEST (CylinderSubsonicMix)
ADD_NEKTAR_TEST (CylinderSubsonic_P3)
ADD_NEKTAR_TEST_LENGTHY(CylinderSubsonic_P8)
ADD_NEKTAR_TEST (Euler1D)
ADD_NEKTAR_TEST (IsentropicVortex16_P3)
ADD_NEKTAR_TEST (IsentropicVortex_FRDG_SEM)
ADD_NEKTAR_TEST_LENGTHY(IsentropicVortex_FRSD_SEM)
ADD_NEKTAR_TEST_LENGTHY(IsentropicVortex_FRHU_SEM)
ADD_NEKTAR_TEST_LENGTHY(IsentropicVortex16_P8)
ADD_NEKTAR_TEST_LENGTHY(IsentropicVortex16_P3_GAUSS)
ADD_NEKTAR_TEST_LENGTHY(IsentropicVortex16_P8_GAUSS)
ADD_NEKTAR_TEST (IsentropicVortex_WeakDG_HexDeformed)
ADD_NEKTAR_TEST (RinglebFlow_P3)
ADD_NEKTAR_TEST_LENGTHY(RinglebFlow_P8)
#ADD_NEKTAR_TEST (Couette_WeakDG_LDG_MODIFIED)
ADD_NEKTAR_TEST (Couette_WeakDG_LDG_SEM)
ADD_NEKTAR_TEST (Couette_WeakDG_LDG_SEM_VariableMu)
#ADD_NEKTAR_TEST (Couette_WeakDG_LDG_GAUSS)
#ADD_NEKTAR_TEST (Couette_FRDG_LFRDG_GAUSS)
ADD_NEKTAR_TEST_LENGTHY(Couette_FRDG_LDG_GAUSS)
ADD_NEKTAR_TEST_LENGTHY(Couette_FRHU_LDG_SEM)
ADD_NEKTAR_TEST (Couette_WeakDG_LFRHU_SEM)
ADD_NEKTAR_TEST_LENGTHY(Couette_FRHU_LFRHU_SEM)
ADD_NEKTAR_TEST (Couette_WeakDG_LDG_adiabatic)
ADD_NEKTAR_TEST(CylinderSubsonic_FRDG_SEM)
ADD_NEKTAR_TEST(CylinderSubsonic_FRDG_GAUSS)
ADD_NEKTAR_TEST(CylinderSubsonic_FRHU_SEM LENGTHY)
ADD_NEKTAR_TEST(CylinderSubsonicMix)
ADD_NEKTAR_TEST(CylinderSubsonic_P3)
ADD_NEKTAR_TEST(CylinderSubsonic_P8 LENGTHY)
ADD_NEKTAR_TEST(Euler1D)
ADD_NEKTAR_TEST(IsentropicVortex16_P3)
ADD_NEKTAR_TEST(IsentropicVortex_FRDG_SEM)
ADD_NEKTAR_TEST(IsentropicVortex_FRSD_SEM LENGTHY)
ADD_NEKTAR_TEST(IsentropicVortex_FRHU_SEM LENGTHY)
ADD_NEKTAR_TEST(IsentropicVortex16_P8 LENGTHY)
ADD_NEKTAR_TEST(IsentropicVortex16_P3_GAUSS LENGTHY)
ADD_NEKTAR_TEST(IsentropicVortex16_P8_GAUSS LENGTHY)
ADD_NEKTAR_TEST(IsentropicVortex_WeakDG_HexDeformed)
ADD_NEKTAR_TEST(RinglebFlow_P3)
ADD_NEKTAR_TEST(RinglebFlow_P8 LENGTHY)
#ADD_NEKTAR_TEST(Couette_WeakDG_LDG_MODIFIED)
ADD_NEKTAR_TEST(Couette_WeakDG_LDG_SEM)
ADD_NEKTAR_TEST(Couette_WeakDG_LDG_SEM_VariableMu)
#ADD_NEKTAR_TEST(Couette_WeakDG_LDG_GAUSS)
#ADD_NEKTAR_TEST(Couette_FRDG_LFRDG_GAUSS)
ADD_NEKTAR_TEST(Couette_FRDG_LDG_GAUSS LENGTHY)
ADD_NEKTAR_TEST(Couette_FRHU_LDG_SEM LENGTHY)
ADD_NEKTAR_TEST(Couette_WeakDG_LFRHU_SEM)
ADD_NEKTAR_TEST(Couette_FRHU_LFRHU_SEM LENGTHY)
ADD_NEKTAR_TEST(Couette_WeakDG_LDG_adiabatic)
# disabled as fails on 32-bit linux -- cc
#ADD_NEKTAR_TEST (Couette_FRDG_LFRDG_adiabatic)
#ADD_NEKTAR_TEST(Couette_FRDG_LFRDG_adiabatic)
# disabled as fails on 32-bit linux -- cc
#ADD_NEKTAR_TEST_LENGTHY(CylinderSubsonic_NS_WeakDG_LDG_SEM)
ADD_NEKTAR_TEST_LENGTHY(CylinderSubsonic_NS_WeakDG_LDG_GAUSS)
ADD_NEKTAR_TEST_LENGTHY(CylinderSubsonic_NS_FRDG_LFRDG_GAUSS)
ADD_NEKTAR_TEST (CylinderSubsonic_NS_WeakDG_LDG_SEM_VariableMu)
ADD_NEKTAR_TEST (Couette_WeakDG_LDG_SEM_3DHOMO1D_MVM)
ADD_NEKTAR_TEST (CylinderSubsonic_NS_WeakDG_LDG_SEM_3DHomo1D_MVM)
ADD_NEKTAR_TEST (Couette_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_MVM)
ADD_NEKTAR_TEST (CylinderSubsonic_NS_FRDG_LFRDG_GLL_LAGRANGE_3DHOMO1D_MVM)
ADD_NEKTAR_TEST (Couette_FRHU_LFRHU_SEM_3DHOMO1D_MVM)
ADD_NEKTAR_TEST (CylinderSubsonic_NS_FRHU_LFRHU_SEM_3DHOMO1D_MVM)
ADD_NEKTAR_TEST (Couette_FRSD_LFRSD_MODIFIED_3DHOMO1D_MVM)
ADD_NEKTAR_TEST (CylinderSubsonic_NS_FRSD_LFRSD_MODIFIED_3DHOMO1D_MVM)
#ADD_NEKTAR_TEST(CylinderSubsonic_NS_WeakDG_LDG_SEM LENGTHY)
ADD_NEKTAR_TEST(CylinderSubsonic_NS_WeakDG_LDG_GAUSS LENGTHY)
ADD_NEKTAR_TEST(CylinderSubsonic_NS_FRDG_LFRDG_GAUSS LENGTHY)
ADD_NEKTAR_TEST(CylinderSubsonic_NS_WeakDG_LDG_SEM_VariableMu)
ADD_NEKTAR_TEST(Couette_WeakDG_LDG_SEM_3DHOMO1D_MVM)
ADD_NEKTAR_TEST(CylinderSubsonic_NS_WeakDG_LDG_SEM_3DHomo1D_MVM)