Commit b9f0d3d9 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Merge branch 'fix/splitregressiontests' of /opt/gitlab/repositories/nektar

parents 87a75537 0550b848
......@@ -67,6 +67,8 @@ OPTION(NEKTAR_BUILD_UNIT_TESTS "Build unit tests." ON)
OPTION(NEKTAR_BUILD_TESTS "Build regression tests." ON)
OPTION(NEKTAR_BUILD_TIMINGS "Build benchmark timing codes." OFF)
OPTION(NEKTAR_TEST_ALL "Include full set of regression tests to this build." OFF)
# Build options
OPTION(NEKTAR_FULL_DEBUG "Enable Full Debugging." OFF)
MARK_AS_ADVANCED(NEKTAR_FULL_DEBUG)
......
......@@ -277,3 +277,11 @@ MACRO(ADD_NEKTAR_TEST name)
ADD_TEST(NAME ${dir}_${name}
COMMAND Tester ${CMAKE_CURRENT_SOURCE_DIR}/Tests/${name}.tst)
ENDMACRO(ADD_NEKTAR_TEST)
MACRO(ADD_NEKTAR_TEST_LENGTHY name)
IF (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)
......@@ -107,7 +107,7 @@ ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_curved_tri)
ADD_NEKTAR_TEST(Helmholtz2D_HDG_P7_Modes)
ADD_NEKTAR_TEST(Helmholtz2D_HDG_P7_Modes_AllBCs)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_CG_Hex)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_iter_ml)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_iter_sc_cont)
......@@ -116,9 +116,9 @@ ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_iter_ml)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_Deformed)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Homo1D)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Homo1D)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_HDG_Homo1D)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Prism)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Hex_AllBCs)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_HDG_Hex_AllBCs)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Tet)
ADD_NEKTAR_TEST(LinearAdvDiffReact2D_P7_Modes)
......@@ -132,14 +132,14 @@ IF (NEKTAR_USE_MPI)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_AllBCs_iter_ml_par3)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_iter_ml_par3)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_iter_ml_par3)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_xxt_sc_par3)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_CG_Hex_AllBCs_xxt_sc_par3)
#
# TODO: This test fails due to a bug with Dirichlet bnd conditions.
# To be resolved in a separate branch.
#
# ADD_NEKTAR_TEST(Helmholtz3D_CG_Tet_iter_global_par3)
ADD_NEKTAR_TEST(Helmholtz2D_HDG_P7_Modes_AllBCs_par2)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz2D_HDG_P7_Modes_AllBCs_par2)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Prism_par2)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Hex_AllBCs_par2)
ENDIF (NEKTAR_USE_MPI)
......@@ -18,100 +18,110 @@ IF( NEKTAR_SOLVER_ADR )
./EquationSystems/EigenValuesAdvection.cpp)
ADD_SOLVER_EXECUTABLE(ADRSolver solvers
${ADRSolverSource})
${ADRSolverSource})
ADD_NEKTAR_TEST(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(Advection1D_FRSD_GLL_LAGRANGE_SEM)
ADD_NEKTAR_TEST(Advection1D_FRSD_GLL_LAGRANGE)
ADD_NEKTAR_TEST(Advection1D_FRSD_MODIFIED)
ADD_NEKTAR_TEST(Advection1D_FRHU_GLL_LAGRANGE_SEM)
ADD_NEKTAR_TEST(Advection1D_FRHU_GLL_LAGRANGE)
ADD_NEKTAR_TEST(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(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(InviscidBurger1D_FRSD_GLL_LAGRANGE_SEM)
ADD_NEKTAR_TEST(InviscidBurger1D_FRSD_GLL_LAGRANGE)
ADD_NEKTAR_TEST(InviscidBurger1D_FRSD_MODIFIED)
ADD_NEKTAR_TEST(InviscidBurger1D_FRHU_GLL_LAGRANGE_SEM)
ADD_NEKTAR_TEST(InviscidBurger1D_FRHU_GLL_LAGRANGE)
ADD_NEKTAR_TEST(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(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)
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)
ADD_NEKTAR_TEST(Advection2D_dirichlet_regular_MODIFIED_10x10)
ADD_NEKTAR_TEST(Advection2D_ISO_deformed_GLL_LAGRANGE_3x3)
ADD_NEKTAR_TEST(Advection2D_ISO_deformed_GAUSS_LAGRANGE_3x3)
ADD_NEKTAR_TEST(Advection2D_ISO_deformed_GLL_LAGRANGE_SEM_3x3)
ADD_NEKTAR_TEST(Advection2D_ISO_deformed_MODIFIED_3x3)
ADD_NEKTAR_TEST(Advection2D_ISO_regular_GLL_LAGRANGE_3x3)
ADD_NEKTAR_TEST(Advection2D_ISO_regular_GAUSS_LAGRANGE_3x3)
ADD_NEKTAR_TEST(Advection2D_ISO_regular_GLL_LAGRANGE_SEM_3x3)
ADD_NEKTAR_TEST(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(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(Advection2D_periodic_regular_GLL_LAGRANGE_SEM_2x2)
ADD_NEKTAR_TEST(Advection2D_periodic_regular_MODIFIED_2x2)
ADD_NEKTAR_TEST(Advection2D_periodic_deformed_GLL_LAGRANGE_10x10)
ADD_NEKTAR_TEST(Advection2D_periodic_deformed_GLL_LAGRANGE_SEM_10x10)
ADD_NEKTAR_TEST(Advection2D_periodic_deformed_MODIFIED_10x10)
ADD_NEKTAR_TEST(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_prism)
ADD_NEKTAR_TEST(Advection3D_m12_DG_tet)
ADD_NEKTAR_TEST(Advection_m12_DG_Order1)
ADD_NEKTAR_TEST(Advection_m12_DG_Order2)
ADD_NEKTAR_TEST(Advection_m12_DG_periodic)
ADD_NEKTAR_TEST(Advection_m12_Order1)
ADD_NEKTAR_TEST(Advection_m12_Order2)
ADD_NEKTAR_TEST(Advection_m14_DG_Order4)
ADD_NEKTAR_TEST(Advection_m14_Order4)
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)
ADD_NEKTAR_TEST(ExDiffusion_1D_LFRHU_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_1D_LFRDG)
ADD_NEKTAR_TEST(ExDiffusion_1D_LFRHU)
ADD_NEKTAR_TEST(ExDiffusion_1D_LFRSD)
ADD_NEKTAR_TEST(ExDiffusion_2D_LDG_hybrid_m3)
ADD_NEKTAR_TEST(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_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRSD_regular_Neumann_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRHU_regular_Neumann_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRDG_regular_Neumann)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRHU_regular_Neumann)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRSD_regular_Neumann)
ADD_NEKTAR_TEST(ExDiffusion_2D_LDG_deformed)
ADD_NEKTAR_TEST(ExDiffusion_2D_LDG_deformed_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRDG_deformed_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRHU_deformed_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRSD_deformed_GAUSS)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRDG_deformed)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRHU_deformed)
ADD_NEKTAR_TEST(ExDiffusion_2D_LFRSD_deformed)
# 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)
# 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)
# 2D continuous advection (non-conservative)
ADD_NEKTAR_TEST (Advection_m12_Order1)
ADD_NEKTAR_TEST (Advection_m12_Order2)
ADD_NEKTAR_TEST (Advection_m14_Order4)
# 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_prism)
ADD_NEKTAR_TEST (Advection3D_m12_DG_tet)
# 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)
# 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)
# 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(Helmholtz1D_8modes_DG)
ADD_NEKTAR_TEST(Helmholtz1D_8modes)
......@@ -130,8 +140,8 @@ IF( NEKTAR_SOLVER_ADR )
ADD_NEKTAR_TEST(Helmholtz2D_nodal)
ADD_NEKTAR_TEST(Helmholtz_3DHomo1D_MVM)
ADD_NEKTAR_TEST(Helmholtz_3DHomo2D_MVM)
ADD_NEKTAR_TEST(Helmholtz3D_modal)
ADD_NEKTAR_TEST(Helmholtz3D_nodal)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_modal)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_nodal)
ADD_NEKTAR_TEST(ImDiffusion_m12)
ADD_NEKTAR_TEST(ImDiffusion_m6)
ADD_NEKTAR_TEST(ImDiffusion_VarCoeff)
......@@ -146,11 +156,11 @@ IF( NEKTAR_SOLVER_ADR )
ENDIF (NEKTAR_USE_FFTW)
IF (NEKTAR_USE_MPI)
ADD_NEKTAR_TEST(Advection3D_m12_DG_hex_par)
ADD_NEKTAR_TEST(Advection3D_m12_DG_prism_par)
ADD_NEKTAR_TEST(Advection3D_m12_DG_tet_par)
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(Advection3D_m12_DG_hex_periodic_par)
ADD_NEKTAR_TEST(ImDiffusion_Quad_Periodic_m7_par)
ADD_NEKTAR_TEST_LENGTHY(ImDiffusion_Quad_Periodic_m7_par)
ADD_NEKTAR_TEST(ImDiffusion_Hex_Periodic_m5_par)
ENDIF (NEKTAR_USE_MPI)
ENDIF( NEKTAR_SOLVER_ADR )
<?xml version="1.0" encoding="utf-8"?>
<test>
<description>2D unsteady DG advection, order 1, P=12</description>
<executable>ADRSolver</executable>
<parameters>Advection_m12_DG_Order1.xml</parameters>
<files>
<file description="Session File">Advection_m12_DG_Order1.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value variable="u" tolerance="1e-12">0.0118577</value>
</metric>
<metric type="Linf" id="2">
<value variable="u" tolerance="1e-12">0.0113757</value>
</metric>
</metrics>
</test>
<?xml version="1.0" encoding="utf-8"?>
<NEKTAR xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.nektar.info/schema/nektar.xsd">
<GEOMETRY DIM="2" SPACE="2">
<VERTEX>
<V ID="0"> -1.0 -1.0 0.0 </V>
<V ID="1"> 0.0 -1.0 0.0 </V>
<V ID="2"> 1.0 -1.0 0.0 </V>
<V ID="3"> -1.0 0.0 0.0 </V>
<V ID="4"> 0.0 0.0 0.0 </V>
<V ID="5"> 1.0 0.0 0.0 </V>
<V ID="6"> -1.0 1.0 0.0 </V>
<V ID="7"> 0.0 1.0 0.0 </V>
<V ID="8"> 1.0 1.0 0.0 </V>
</VERTEX>
<EDGE>
<E ID="0"> 0 1 </E>
<E ID="1"> 1 2 </E>
<E ID="2"> 0 3 </E>
<E ID="3"> 1 4 </E>
<E ID="4"> 2 5 </E>
<E ID="5"> 3 4 </E>
<E ID="6"> 4 5 </E>
<E ID="7"> 6 3 </E>
<E ID="8"> 4 7 </E>
<E ID="9"> 5 8 </E>
<E ID="10"> 6 7 </E>
<E ID="11"> 7 8 </E>
<E ID="12"> 0 4 </E>
<E ID="13"> 1 5 </E>
</EDGE>
<ELEMENT>
<T ID="0"> 0 3 12 </T>
<T ID="1"> 2 12 5 </T>
<T ID="2"> 1 4 13 </T>
<T ID="3"> 3 13 6 </T>
<Q ID="4"> 5 8 10 7 </Q>
<Q ID="5"> 8 6 9 11 </Q>
</ELEMENT>
<COMPOSITE>
<C ID="0"> T[0-3] </C>
<C ID="1"> Q[4-5] </C>
<C ID="2"> E[0,1,2,7] </C>
<C ID="3"> E[4,9,10,11] </C>
</COMPOSITE>
<DOMAIN> C[0-1] </DOMAIN>
</GEOMETRY>
<EXPANSIONS>
<E COMPOSITE="C[0]" NUMMODES="12" FIELDS="u" TYPE="MODIFIED" />
<E COMPOSITE="C[1]" NUMMODES="12" FIELDS="u" TYPE="MODIFIED" />
</EXPANSIONS>
<CONDITIONS>
<PARAMETERS>
<P> FinTime = 0.75 </P>
<P> NumSteps = 500 </P>
<P> TimeStep = FinTime/NumSteps </P>
<P> IO_CheckSteps = NumSteps </P>
<P> IO_InfoSteps = 1000 </P>
<P> advx = 1 </P>
<P> advy = 1 </P>
</PARAMETERS>
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyAdvection" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="TimeIntegrationMethod" VALUE="ForwardEuler" />
</SOLVERINFO>
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
<BOUNDARYREGIONS>
<B ID="0"> C[2] </B>
<B ID="1"> C[3] </B>
</BOUNDARYREGIONS>
<BOUNDARYCONDITIONS>
<REGION REF="0">
<D VAR="u" USERDEFINEDTYPE="TimeDependent"
VALUE="sin(PI*(x-advx*t))*cos(PI*(y-advy*t))" />
</REGION>
<REGION REF="1">
<N VAR="u" VALUE="0" />
</REGION>
</BOUNDARYCONDITIONS>
<FUNCTION NAME="AdvectionVelocity">
<E VAR="Vx" VALUE="1" />
<E VAR="Vy" VALUE="1" />
</FUNCTION>
<FUNCTION NAME="ExactSolution">
<E VAR="u" VALUE="sin(PI*(x-advx*t))*cos(PI*(y-advy*t))" />
</FUNCTION>
<FUNCTION NAME="InitialConditions">
<E VAR="u" VALUE="sin(PI*x)*cos(PI*y)" />
</FUNCTION>
</CONDITIONS>
</NEKTAR>
<?xml version="1.0" encoding="utf-8"?>
<test>
<description>2D unsteady DG advection, order 2, P=12</description>
<executable>ADRSolver</executable>
<parameters>Advection_m12_DG_Order2.xml</parameters>
<files>
<file description="Session File">Advection_m12_DG_Order2.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value variable="u" tolerance="1e-12">9.18608e-05</value>
</metric>
<metric type="Linf" id="2">
<value variable="u" tolerance="1e-12">9.63598e-05</value>
</metric>
</metrics>
</test>
<?xml version="1.0" encoding="utf-8"?>
<NEKTAR xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.nektar.info/schema/nektar.xsd">
<GEOMETRY DIM="2" SPACE="2">
<VERTEX>
<V ID="0"> -1.0 -1.0 0.0 </V>
<V ID="1"> 0.0 -1.0 0.0 </V>
<V ID="2"> 1.0 -1.0 0.0 </V>
<V ID="3"> -1.0 0.0 0.0 </V>
<V ID="4"> 0.0 0.0 0.0 </V>
<V ID="5"> 1.0 0.0 0.0 </V>
<V ID="6"> -1.0 1.0 0.0 </V>
<V ID="7"> 0.0 1.0 0.0 </V>
<V ID="8"> 1.0 1.0 0.0 </V>
</VERTEX>
<EDGE>
<E ID="0"> 0 1 </E>
<E ID="1"> 1 2 </E>
<E ID="2"> 0 3 </E>
<E ID="3"> 1 4 </E>
<E ID="4"> 2 5 </E>
<E ID="5"> 3 4 </E>
<E ID="6"> 4 5 </E>
<E ID="7"> 6 3 </E>
<E ID="8"> 4 7 </E>
<E ID="9"> 5 8 </E>
<E ID="10"> 6 7 </E>
<E ID="11"> 7 8 </E>
<E ID="12"> 0 4 </E>
<E ID="13"> 1 5 </E>
</EDGE>
<ELEMENT>
<T ID="0"> 0 3 12 </T>
<T ID="1"> 2 12 5 </T>
<T ID="2"> 1 4 13 </T>
<T ID="3"> 3 13 6 </T>
<Q ID="4"> 5 8 10 7 </Q>
<Q ID="5"> 8 6 9 11 </Q>
</ELEMENT>
<COMPOSITE>
<C ID="0"> T[0-3] </C>
<C ID="1"> Q[4-5] </C>
<C ID="2"> E[0,1,2,7] </C>
<C ID="3"> E[4,9,10,11] </C>
</COMPOSITE>
<DOMAIN> C[0-1] </DOMAIN>
</GEOMETRY>
<EXPANSIONS>
<E COMPOSITE="C[0]" NUMMODES="12" FIELDS="u" TYPE="MODIFIED" />
<E COMPOSITE="C[1]" NUMMODES="12" FIELDS="u" TYPE="MODIFIED" />
</EXPANSIONS>
<CONDITIONS>
<PARAMETERS>
<P> FinTime = 0.75 </P>
<P> NumSteps = 500 </P>
<P> TimeStep = FinTime/NumSteps </P>
<P> IO_CheckSteps = NumSteps </P>
<P> IO_InfoSteps = 1000 </P>
<P> advx = 1 </P>
<P> advy = 1 </P>
</PARAMETERS>
<SOLVERINFO>
<I PROPERTY="EQTYPE" VALUE="UnsteadyAdvection" />
<I PROPERTY="Projection" VALUE="DisContinuous" />
<I PROPERTY="AdvectionType" VALUE="WeakDG" />
<I PROPERTY="UpwindType" VALUE="Upwind" />
<I PROPERTY="TimeIntegrationMethod" VALUE="AdamsBashforthOrder2"/>
</SOLVERINFO>
<VARIABLES>
<V ID="0"> u </V>
</VARIABLES>
<BOUNDARYREGIONS>
<B ID="0"> C[2] </B>
<B ID="1"> C[3] </B>
</BOUNDARYREGIONS>
<BOUNDARYCONDITIONS>
<REGION REF="0">
<D VAR="u" USERDEFINEDTYPE="TimeDependent"
VALUE="sin(PI*(x-advx*t))*cos(PI*(y-advy*t))" />
</REGION>
<REGION REF="1">
<N VAR="u" VALUE="0" />
</REGION>
</BOUNDARYCONDITIONS>
<FUNCTION NAME="AdvectionVelocity">
<E VAR="Vx" VALUE="1" />
<E VAR="Vy" VALUE="1" />
</FUNCTION>
<FUNCTION NAME="ExactSolution">
<E VAR="u" VALUE="sin(PI*(x-advx*t))*cos(PI*(y-advy*t))" />
</FUNCTION>
<FUNCTION NAME="InitialConditions">
<E VAR="u" VALUE="sin(PI*x)*cos(PI*y)" />
</FUNCTION>
</CONDITIONS>
</NEKTAR>
<?xml version="1.0" encoding="utf-8"?>
<test>
<description>2D unsteady DG advection, order 4, P=14</description>
<executable>ADRSolver</executable>
<parameters>Advection_m14_DG_Order4.xml</parameters>
<files>
<file description="Session File">Advection_m14_DG_Order4.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value variable="u" tolerance="1e-12">3.88016e-09</value>
</metric>
<metric type="Linf" id="2">
<value variable="u" tolerance="1e-12">6.24598e-08</value>
</metric>
</metrics>
</test>
<?xml version="1.0" encoding="utf-8"?>
<NEKTAR xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.nektar.info/schema/nektar.xsd">
<GEOMETRY DIM="2" SPACE="2">
<VERTEX>
<V ID="0"> -1.0 -1.0 0.0 </V>
<V ID="1"> 0.0 -1.0 0.0 </V>
<V ID="2"> 1.0 -1.0 0.0 </V>
<V ID="3"> -1.0 0.0 0.0 </V>