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

Merge branch 'master' into feature/FieldConvertEquiOutput

parents f7ba77fb e37607aa
......@@ -36,10 +36,6 @@ RESET_VAR_IF_CHANGED( ACML_SEARCH_PATHS ACML_USE_SHARED_LIBRARIES)
SET(ACML_BASE_SEARCH_PATHS "/opt/acml" "C:\\AMD\\acml" "C:\\Program Files\\AMD\\acml")
SET(ACML_SEARCH_PATHS "")
# The various supported versions. When new versions come out this will need
# to be updated to allow automatic detection.
SET(ACML_VERSIONS 4.2.0 4.1.0 4.0.0 3.5.0 3.6.0 3.6.1)
SET(MP_COMPILER_VERSIONS gfortran64_mp gfortran64_mp_int64 pgi32_mp ifort32_mp)
SET(COMPILER_VERSIONS gfortran64 gfortran64_int64 pgi32 ifort32)
......@@ -52,17 +48,19 @@ ELSE( ACML_USE_OPENMP_LIBRARIES )
ENDIF( ACML_USE_OPENMP_LIBRARIES )
FOREACH(path_iter ${ACML_BASE_SEARCH_PATHS})
FOREACH(version_iter ${ACML_VERSIONS})
FILE( GLOB install_path ${path_iter}*/ACML-EULA.txt )
IF (install_path)
LIST( GET install_path 0 install_path)
GET_FILENAME_COMPONENT( install_path ${install_path} PATH)
FOREACH(compiler_iter ${COMPILER_VERSION_TO_USE})
LIST(APPEND ACML_SEARCH_PATHS ${path_iter}${version_iter}/${compiler_iter}/include)
LIST(APPEND ACML_SEARCH_PATHS
${install_path}/${compiler_iter}/include)
ENDFOREACH(compiler_iter ${COMPILER_VERSION_TO_USE})
ENDFOREACH(version_iter ${ACML_VERSIONS})
ENDIF (install_path)
ENDFOREACH(path_iter ${ACML_BASE_SEARCH_PATHS})
#MESSAGE(${ACML_SEARCH_PATHS})
FIND_PATH(ACML_INCLUDE_PATH acml.h ${ACML_SEARCH_PATHS} )
SET(ACML_LIB_PATH ${ACML_INCLUDE_PATH}/../lib)
#MESSAGE(${ACML_LIB_PATH})
IF( ACML_USE_SHARED_LIBRARIES )
IF( ACML_USE_OPENMP_LIBRARIES )
......@@ -100,5 +98,6 @@ ELSE(ACML_FOUND)
ENDIF (ACML_FIND_REQUIRED)
ENDIF (ACML_FOUND)
MARK_AS_ADVANCED(ACML ACML_INCLUDE_PATH ACML_SEARCH_PATHS
ACML_USE_OPENMP_LIBRARIES ACML_USE_SHARED_LIBRARIES)
......@@ -95,7 +95,7 @@ IF (THIRDPARTY_BUILD_BOOST)
IF (APPLE)
EXTERNALPROJECT_ADD_STEP(boost patch-install-path
COMMAND sed -i ".bak" "s|-install_name \"|&${TPDIST}/lib/|" ${TPSRC}/boost/tools/build/v2/tools/darwin.jam
COMMAND sed -i ".bak" "s|-install_name \"|&${TPDIST}/lib/|" ${TPBUILD}/boost/tools/build/v2/tools/darwin.jam
DEPENDERS build
DEPENDEES download)
ENDIF (APPLE)
......
......@@ -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,13 +129,23 @@ 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)
ADD_NEKTAR_TEST(Helmholtz3D_HDG_Hex_AllBCs_par2)
IF (NEKTAR_USE_SCOTCH)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_iter_ml_scotch_par3)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_iter_ml_scotch_par3)
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)
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 1D CG with P=8, periodic BCs</description>
<executable>Helmholtz1D</executable>
<parameters>Helmholtz1D_P8_periodic.xml</parameters>
<parameters>--use-metis Helmholtz1D_P8_periodic.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz1D_P8_periodic.xml</file>
......
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 2D CG with P=7, all BCs, iterative ML, par(3)</description>
<executable>Helmholtz2D</executable>
<parameters>-I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<parameters>--use-metis -I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
......
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 2D CG with P=7, all BCs, iterative sc, par(3)</description>
<executable>Helmholtz2D</executable>
<parameters>-I GlobalSysSoln=IterativeStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<parameters>--use-metis -I GlobalSysSoln=IterativeStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
......
<?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>
......@@ -2,7 +2,7 @@
<test>
<description>HDG Helmholtz 2D CG with P=7</description>
<executable>HDGHelmholtz2D</executable>
<parameters>Helmholtz2D_P7_AllBCs.xml</parameters>
<parameters>--use-metis Helmholtz2D_P7_AllBCs.xml</parameters>
<processes>2</processes>
<files>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
......
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 3D CG, hexes, mixed BCs, iterative ML</description>
<executable>Helmholtz3D</executable>
<parameters>-I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<parameters>--use-metis -I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz3D_Hex_AllBCs_P6.xml</file>
......
<?xml version="1.0" encoding="utf-8"?>
<test>
<description>Helmholtz 3D CG, hexes, mixed BCs, iterative ML, Scotch</description>
<executable>Helmholtz3D</executable>
<parameters>--use-scotch -I GlobalSysSoln=IterativeMultiLevelStaticCond 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>
<?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>
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 3D CG, hexes, mixed BCs, iterative ML</description>
<executable>Helmholtz3D</executable>
<parameters>-I GlobalSysSoln=XxtStaticCond Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<parameters>--use-metis -I GlobalSysSoln=XxtStaticCond Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz3D_Hex_AllBCs_P6.xml</file>
......
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 3D CG, prisms, Neumann BCs, iterative ML, Par(3)</description>
<executable>Helmholtz3D</executable>
<parameters>Helmholtz3D_Prism.xml</parameters>
<parameters>--use-metis Helmholtz3D_Prism.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz3D_Prism.xml</file>
......
<?xml version="1.0" encoding="utf-8"?>
<test>
<description>Helmholtz 3D CG, prisms, Neumann BCs, iterative ML, Par(3), Scotch</description>
<executable>Helmholtz3D</executable>
<parameters>--use-scotch Helmholtz3D_Prism.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz3D_Prism.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-9">0.000198493</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-9">0.000969191</value>
</metric>
</metrics>
</test>
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 3D CG for Tet iterative SL static global par(3)</description>
<executable>Helmholtz3D</executable>
<parameters>Helmholtz3D_Tet_iter_global.xml</parameters>
<parameters>--use-metis Helmholtz3D_Tet_iter_global.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">Helmholtz3D_Tet_iter_global.xml</file>
......
......@@ -2,7 +2,7 @@
<test>
<description>Helmholtz 3D HDG, hexes, mixed BCs, par(2)</description>
<executable>HDGHelmholtz3D</executable>
<parameters>Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<parameters>--use-metis Helmholtz3D_Hex_AllBCs_P6.xml</parameters>
<processes>2</processes>
<files>
<file description="Session File">Helmholtz3D_Hex_AllBCs_P6.xml</file>
......
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