Commit 233f5e25 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Merge branch 'master' into feature/filename-variables

parents 320136d9 e37607aa
......@@ -24,27 +24,28 @@ IF (NEKTAR_USE_PETSC)
ENDIF (NEKTAR_USE_MPI)
EXTERNALPROJECT_ADD(
petsc-3.5.1
petsc-3.5.2
PREFIX ${TPSRC}
STAMP_DIR ${TPBUILD}/stamp
DOWNLOAD_DIR ${TPSRC}
SOURCE_DIR ${TPBUILD}/petsc-3.5.1
TMP_DIR ${TPBUILD}/petsc-3.5.1-tmp
SOURCE_DIR ${TPBUILD}/petsc-3.5.2
TMP_DIR ${TPBUILD}/petsc-3.5.2-tmp
INSTALL_DIR ${TPDIST}
BINARY_DIR ${TPBUILD}/petsc-3.5.1
URL http://www.nektar.info/thirdparty/petsc-lite-3.5.1.tar.gz
URL_MD5 "539b3bdb627407b7e4e9e830fd5ccf43"
BINARY_DIR ${TPBUILD}/petsc-3.5.2
URL http://www.nektar.info/thirdparty/petsc-lite-3.5.2.tar.gz
URL_MD5 "d707336a98d7cb31d843804d020edc94"
CONFIGURE_COMMAND ./configure
--with-cc=${PETSC_C_COMPILER}
--with-cxx=${PETSC_CXX_COMPILER}
--with-shared-libraries=0
--with-pic=1
--with-x=0
--with-ssl=0
--prefix=${TPDIST}
--with-petsc-arch=c-opt
--with-fc=0
${PETSC_NO_MPI}
)
BUILD_COMMAND MAKEFLAGS= make)
INCLUDE_DIRECTORIES(${TPDIST}/include)
SET(PETSC_LIBRARIES "${TPDIST}/lib/libpetsc.a")
......@@ -57,6 +58,7 @@ IF (NEKTAR_USE_PETSC)
MESSAGE(STATUS "Found PETSc: ${PETSC_LIBRARIES}")
ENDIF (NOT PETSC_FOUND)
INCLUDE_DIRECTORIES(${PETSC_INCLUDES})
ADD_CUSTOM_TARGET(petsc-3.5.2 ALL)
ENDIF (THIRDPARTY_BUILD_PETSC)
ENDIF( NEKTAR_USE_PETSC )
......
......@@ -112,6 +112,13 @@ ADD_NEKTAR_TEST(LinearAdvDiffReact2D_P7_Modes)
ADD_NEKTAR_TEST(Deriv3D_Homo1D)
ADD_NEKTAR_TEST(Deriv3D_Homo2D)
# PETSc solver tests
IF (NEKTAR_USE_PETSC)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_AllBCs_petsc_full)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_AllBCs_petsc_ml)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_AllBCs_petsc_sc)
ENDIF (NEKTAR_USE_PETSC)
IF (NEKTAR_USE_MPI)
ADD_NEKTAR_TEST(Helmholtz1D_CG_P8_periodic_par3)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_AllBCs_xxt_full)
......@@ -122,11 +129,10 @@ IF (NEKTAR_USE_MPI)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_iter_ml_par3)
ADD_NEKTAR_TEST_LENGTHY(Helmholtz3D_CG_Hex_AllBCs_xxt_sc_par3)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P14_xxt_per)
#
# 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)
# 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_LENGTHY(Helmholtz2D_HDG_P7_Modes_AllBCs_par2)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Prism_par2)
......@@ -138,4 +144,8 @@ IF (NEKTAR_USE_MPI)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Hex_AllBCs_scotch_par2)
ENDIF (NEKTAR_USE_SCOTCH)
IF (NEKTAR_USE_PETSC)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_AllBCs_petsc_sc_par3)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_petsc_sc_par3)
ENDIF (NEKTAR_USE_PETSC)
ENDIF (NEKTAR_USE_MPI)
<?xml version="1.0" encoding="utf-8" ?>
<test>
<description>Helmholtz 2D CG with P=7, PETSc full</description>
<executable>Helmholtz2D</executable>
<parameters>-I GlobalSysSoln=PETScFull Helmholtz2D_P7_AllBCs.xml</parameters>
<files>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.047035</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-12">0.0959695</value>
</metric>
</metrics>
</test>
<?xml version="1.0" encoding="utf-8" ?>
<test>
<description>Helmholtz 2D CG with P=7, all BCs, PETSc ML</description>
<executable>Helmholtz2D</executable>
<parameters>-I GlobalSysSoln=PETScMultiLevelStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<files>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.00888037</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-12">0.0101781</value>
</metric>
</metrics>
</test>
<?xml version="1.0" encoding="utf-8" ?>
<test>
<description>Helmholtz 2D CG with P=7, all BCs, PETSc sc</description>
<executable>Helmholtz2D</executable>
<parameters>-I GlobalSysSoln=PETScStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<files>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.00888037</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-12">0.0101781</value>
</metric>
</metrics>
</test>
<?xml version="1.0" encoding="utf-8" ?>
<test>
<description>Helmholtz 2D CG with P=7, all BCs, PETSc sc, par(3)</description>
<executable>Helmholtz2D</executable>
<parameters>--use-metis -I GlobalSysSoln=PETScStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.00888037</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-12">0.0101781</value>
</metric>
</metrics>
</test>
<?xml version="1.0" encoding="utf-8" ?>
<test>
<description>Helmholtz 3D CG, hexes, mixed BCs, PETSc sc, par(3)</description>
<executable>Helmholtz3D</executable>
<parameters>--use-metis -I GlobalSysSoln=PETScStaticCond Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz3D_Hex_AllBCs_P6.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.000416575</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-12">0.000871589</value>
</metric>
</metrics>
</test>
......@@ -142,6 +142,7 @@ ENDIF( NEKTAR_USE_MPI )
IF( NEKTAR_USE_PETSC )
TARGET_LINK_LIBRARIES(MultiRegions LINK_PRIVATE ${PETSC_LIBRARIES})
ADD_DEPENDENCIES(MultiRegions petsc-3.5.2)
ENDIF( NEKTAR_USE_PETSC )
INSTALL(DIRECTORY ./ DESTINATION ${NEKTAR_INCLUDE_DIR}/MultiRegions COMPONENT dev FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
......
......@@ -146,6 +146,7 @@ namespace Nektar
}
m_index = 0;
v_Update(pFields, time);
}
......
......@@ -96,5 +96,8 @@ IF( NEKTAR_SOLVER_INCNAVIERSTOKES )
ADD_NEKTAR_TEST(Tet_channel_m8_par)
ADD_NEKTAR_TEST_LENGTHY(Tet_channel_m8_iter_ml_par)
ADD_NEKTAR_TEST_LENGTHY(bfs_tg_par)
IF (NEKTAR_USE_PETSC)
ADD_NEKTAR_TEST_LENGTHY(Tet_channel_m8_petsc_sc_par)
ENDIF (NEKTAR_USE_PETSC)
ENDIF (NEKTAR_USE_MPI)
ENDIF( NEKTAR_SOLVER_INCNAVIERSTOKES )
<?xml version="1.0" encoding="utf-8" ?>
<test>
<description>3D channel flow, Tet elements, PETSc sc, par(3), P=8</description>
<executable>IncNavierStokesSolver</executable>
<parameters>--use-metis -I GlobalSysSoln=PETScStaticCond Tet_channel_m8_par.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Tet_channel_m8_par.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value variable="u" tolerance="1e-12">8.62254e-15</value>
<value variable="v" tolerance="1e-12">7.34883e-15</value>
<value variable="w" tolerance="1e-12">3.03011e-14</value>
<value variable="p" tolerance="1e-8">4.64664e-13</value>
</metric>
<metric type="Linf" id="2">
<value variable="u" tolerance="1e-12">3.70349e-14</value>
<value variable="v" tolerance="1e-12">2.65691e-14</value>
<value variable="w" tolerance="1e-12">1.05027e-13</value>
<value variable="p" tolerance="1e-8">1.40776e-12</value>
</metric>
</metrics>
</test>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment