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

Merge branch 'master' into scalapack

Conflicts:
	library/Demos/MultiRegions/CMakeLists.txt
	library/LibUtilities/BasicUtils/SessionReader.cpp
parents 78a07fd6 5780c07a
......@@ -91,11 +91,9 @@ ENDFOREACH(dir ${dir_list})
ADD_NEKTAR_TEST(Helmholtz1D_CG_P8)
ADD_NEKTAR_TEST(Helmholtz1D_CG_P8_RBC)
ADD_NEKTAR_TEST(Helmholtz1D_HDG_P8)
ADD_NEKTAR_TEST(Helmholtz1D_HDG_P8_RBC)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Nodes)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_AllBCs_mlsc)
......@@ -108,17 +106,18 @@ ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_curved_quad)
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(Helmholtz3D_CG_Hex_AllBCs)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_iter_ml)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Tet)
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(LinearAdvDiffReact2D_P7_Modes)
ADD_NEKTAR_TEST(Helmholtz3D_Hex_CG)
ADD_NEKTAR_TEST(Helmholtz3D_Hex_MixedBCs_CG)
ADD_NEKTAR_TEST(Helmholtz3D_Hex_MixedBCs_Iter_ML_CG)
ADD_NEKTAR_TEST(Helmholtz3D_Tet_CG)
ADD_NEKTAR_TEST(Helmholtz3D_Prism_CG)
ADD_NEKTAR_TEST(Helmholtz3D_Prism_Iter_ML_CG)
ADD_NEKTAR_TEST(Helmholtz3D_Prism_deformed_CG)
ADD_NEKTAR_TEST(Helmholtz3D_Homo1D_CG)
ADD_NEKTAR_TEST(Helmholtz3D_Homo1D_HDG)
ADD_NEKTAR_TEST(Deriv3D_Homo1D)
ADD_NEKTAR_TEST(Deriv3D_Homo2D)
......@@ -127,6 +126,6 @@ IF (NEKTAR_USE_MPI)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_AllBCs_xxt_sc)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_AllBCs_iter_sc_par3)
ADD_NEKTAR_TEST(Helmholtz2D_CG_P7_Modes_AllBCs_iter_ml_par3)
ADD_NEKTAR_TEST(Helmholtz3D_Hex_MixedBCs_Iter_ML_Par3_CG)
ADD_NEKTAR_TEST(Helmholtz3D_Prism_Iter_ML_Par3_CG)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Hex_AllBCs_iter_ml_par3)
ADD_NEKTAR_TEST(Helmholtz3D_CG_Prism_iter_ml_par3)
ENDIF (NEKTAR_USE_MPI)
......@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
// Backward Transform Solution to get solved values at
Exp->BwdTrans(Exp->GetCoeffs(), Exp->UpdatePhys());
//----------------------------------------------
Timing("Backard Transform ..");
Timing("Backward Transform ..");
//-----------------------------------------------
// Write solution to file
......
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 2D CG with P=7</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_7modes.xml</parameters>
<parameters>Helmholtz2D_P7.xml</parameters>
<files>
<file description="Session File">helmholtz2D_7modes.xml</file>
<file description="Session File">Helmholtz2D_P7.xml</file>
</files>
<metrics>
......
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 2D CG with P=7, direct full</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_7modes_AllBCs.xml</parameters>
<parameters>-I GlobalSysSoln=DirectFull Helmholtz2D_P7_AllBCs.xml</parameters>
<files>
<file description="Session File">helmholtz2D_7modes_AllBCs.xml</file>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
</files>
<metrics>
......
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 2D CG with P=7, all BCs, iterative ML</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_7modes_AllBCs_iter_ml.xml</parameters>
<parameters>-I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<files>
<file description="Session File">helmholtz2D_7modes_AllBCs_iter_ml.xml</file>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
</files>
<metrics>
......
......@@ -2,10 +2,10 @@
<test>
<description>Helmholtz 2D CG with P=7, all BCs, iterative ML, par(3)</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_7modes_AllBCs_iter_ml.xml</parameters>
<parameters>-I GlobalSysSoln=IterativeMultiLevelStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">helmholtz2D_7modes_AllBCs_iter_ml.xml</file>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
</files>
<metrics>
......
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 2D CG with P=7, all BCs, iterative sc</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_7modes_AllBCs_iter_sc.xml</parameters>
<parameters>-I GlobalSysSoln=IterativeStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<files>
<file description="Session File">helmholtz2D_7modes_AllBCs_iter_sc.xml</file>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
</files>
<metrics>
......
......@@ -2,10 +2,10 @@
<test>
<description>Helmholtz 2D CG with P=7, all BCs, iterative sc, par(3)</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_7modes_AllBCs_iter_sc.xml</parameters>
<parameters>-I GlobalSysSoln=IterativeStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<processes>3</processes>
<files>
<file description="Session File">helmholtz2D_7modes_AllBCs_iter_sc.xml</file>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
</files>
<metrics>
......
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 2D CG with P=7, direct multi-level</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_7modes_AllBCs_mlsc.xml</parameters>
<parameters>-I GlobalSysSoln=DirectMultiLevelStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<files>
<file description="Session File">helmholtz2D_7modes_AllBCs_mlsc.xml</file>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
</files>
<metrics>
......
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 2D CG with P=7, direct sc</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_7modes_AllBCs_sc.xml</parameters>
<parameters>-I GlobalSysSoln=DirectStaticCond Helmholtz2D_P7_AllBCs.xml</parameters>
<files>
<file description="Session File">helmholtz2D_7modes_AllBCs_sc.xml</file>
<file description="Session File">Helmholtz2D_P7_AllBCs.xml</file>
</files>
<metrics>
......
<?xml version="1.0" encoding="utf-8"?>
<test>
<description>Helmholtz 2D CG with P=7</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_7modes.xml</parameters>
<files>
<file description="Session File">helmholtz2D_7modes.xml</file>
</files>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-7">0.00888036</value>
</metric>
<metric type="Linf" id="2">
<value tolerance="1e-6">0.0101781</value>
</metric>
</metrics>
</test>
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 2D CG with P=7</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_curved_quad.xml</parameters>
<parameters>Helmholtz2D_CG_P7_Modes_curved_quad.xml</parameters>
<files>
<file description="Session File">helmholtz2D_curved_quad.xml</file>
<file description="Session File">Helmholtz2D_CG_P7_Modes_curved_quad.xml</file>
</files>
<metrics>
......
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 2D CG with P=7</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_curved_tri.xml</parameters>
<parameters>Helmholtz2D_CG_P7_Modes_curved_tri.xml</parameters>
<files>
<file description="Session File">helmholtz2D_curved_tri.xml</file>
<file description="Session File">Helmholtz2D_CG_P7_Modes_curved_tri.xml</file>
</files>
<metrics>
......
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 2D CG with P=7</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_7nodes.xml</parameters>
<parameters>Helmholtz2D_CG_P7_Nodes.xml</parameters>
<files>
<file description="Session File">helmholtz2D_7nodes.xml</file>
<file description="Session File">Helmholtz2D_CG_P7_Nodes.xml</file>
</files>
<metrics>
......
......@@ -2,9 +2,9 @@
<test>
<description>Helmholtz 2D CG with P=9</description>
<executable>Helmholtz2D</executable>
<parameters>helmholtz2D_9modes_varcoeff.xml</parameters>
<parameters>Helmholtz2D_CG_P9_Modes_varcoeff.xml</parameters>
<files>
<file description="Session File">helmholtz2D_9modes_varcoeff.xml</file>
<file description="Session File">Helmholtz2D_CG_P9_Modes_varcoeff.xml</file>
</files>
<metrics>
......
......@@ -2,9 +2,9 @@
<test>
<description>HDG Helmholtz 2D CG with P=7</description>
<executable>HDGHelmholtz2D</executable>
<parameters>helmholtz2D_7modes.xml</parameters>
<parameters>Helmholtz2D_P7.xml</parameters>
<files>
<file description="Session File">helmholtz2D_7modes.xml</file>
<file description="Session File">Helmholtz2D_P7.xml</file>
</files>
<metrics>
......
Supports Markdown
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