Commit 7724fd29 authored by Dave Moxey's avatar Dave Moxey
Browse files

Merge branch 'master' into feature/cli-options

parents 6629471c b00fe04a
......@@ -17,51 +17,51 @@ SET(TimingCGHelmSolve2DSource TimingCGHelmSolve2D.cpp)
ADD_NEKTAR_EXECUTABLE(TimingCGHelmSolve2D timing TimingCGHelmSolve2DSource)
TARGET_LINK_LIBRARIES(TimingCGHelmSolve2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(TimingCGHelmSolve2D)
SET_TARGET_PROPERTIES(TimingCGHelmSolve2D PROPERTIES COMPILE_FLAGS -DBASE_PATH="\\"${CMAKE_SOURCE_DIR}\\"")
SET_TARGET_PROPERTIES(TimingCGHelmSolve2D PROPERTIES COMPILE_FLAGS -DBASE_PATH="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Scripts/do_TimingCGHelmSolve2D
${CMAKE_CURRENT_BINARY_DIR}/do_TimingCGHelmSolve2D COPYONLY)
${CMAKE_BINARY_DIR}/dist/bin/do_TimingCGHelmSolve2D COPYONLY)
SET(TimingHDGHelmSolve2DSource TimingHDGHelmSolve2D.cpp)
ADD_NEKTAR_EXECUTABLE(TimingHDGHelmSolve2D timing TimingHDGHelmSolve2DSource)
TARGET_LINK_LIBRARIES(TimingHDGHelmSolve2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(TimingHDGHelmSolve2D)
SET_TARGET_PROPERTIES(TimingHDGHelmSolve2D PROPERTIES COMPILE_FLAGS -DBASE_PATH="\\"${CMAKE_SOURCE_DIR}\\"")
SET_TARGET_PROPERTIES(TimingHDGHelmSolve2D PROPERTIES COMPILE_FLAGS -DBASE_PATH="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Scripts/do_TimingHDGHelmSolve2D
${CMAKE_CURRENT_BINARY_DIR}/do_TimingHDGHelmSolve2D COPYONLY)
${CMAKE_BINARY_DIR}/dist/bin/do_TimingHDGHelmSolve2D COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Scripts/do_TimingHelmSolve2D
${CMAKE_CURRENT_BINARY_DIR}/do_TimingHelmSolve2D COPYONLY)
${CMAKE_BINARY_DIR}/dist/bin/do_TimingHelmSolve2D COPYONLY)
SET(TimingGeneralMatrixOp2DSource TimingGeneralMatrixOp2D.cpp)
ADD_NEKTAR_EXECUTABLE(TimingGeneralMatrixOp2D
timing TimingGeneralMatrixOp2DSource)
TARGET_LINK_LIBRARIES(TimingGeneralMatrixOp2D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(TimingGeneralMatrixOp2D)
SET_TARGET_PROPERTIES(TimingGeneralMatrixOp2D PROPERTIES COMPILE_FLAGS -DBASE_PATH="\\"${CMAKE_SOURCE_DIR}\\"")
SET_TARGET_PROPERTIES(TimingGeneralMatrixOp2D PROPERTIES COMPILE_FLAGS -DBASE_PATH="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Scripts/do_TimingGeneralMatrixOp2D
${CMAKE_CURRENT_BINARY_DIR}/do_TimingGeneralMatrixOp2D COPYONLY)
${CMAKE_BINARY_DIR}/dist/bin/do_TimingGeneralMatrixOp2D COPYONLY)
SET(TimingGeneralMatrixOp3DSource TimingGeneralMatrixOp3D.cpp)
ADD_NEKTAR_EXECUTABLE(TimingGeneralMatrixOp3D
timing TimingGeneralMatrixOp3DSource)
TARGET_LINK_LIBRARIES(TimingGeneralMatrixOp3D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(TimingGeneralMatrixOp3D)
SET_TARGET_PROPERTIES(TimingGeneralMatrixOp3D PROPERTIES COMPILE_FLAGS -DBASE_PATH="\\"${CMAKE_SOURCE_DIR}\\"")
SET_TARGET_PROPERTIES(TimingGeneralMatrixOp3D PROPERTIES COMPILE_FLAGS -DBASE_PATH="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Scripts/do_TimingGeneralMatrixOp3D
${CMAKE_CURRENT_BINARY_DIR}/do_TimingGeneralMatrixOp3D COPYONLY)
${CMAKE_BINARY_DIR}/dist/bin/do_TimingGeneralMatrixOp3D COPYONLY)
SET(TimingCGGeneralMatrixOp3DSource TimingCGGeneralMatrixOp3D.cpp)
ADD_NEKTAR_EXECUTABLE(TimingCGGeneralMatrixOp3D
timing TimingCGGeneralMatrixOp3DSource)
TARGET_LINK_LIBRARIES(TimingCGGeneralMatrixOp3D ${LinkLibraries})
SET_LAPACK_LINK_LIBRARIES(TimingCGGeneralMatrixOp3D)
SET_TARGET_PROPERTIES(TimingCGGeneralMatrixOp3D PROPERTIES COMPILE_FLAGS -DBASE_PATH="\\"${CMAKE_SOURCE_DIR}\\"")
SET_TARGET_PROPERTIES(TimingCGGeneralMatrixOp3D PROPERTIES COMPILE_FLAGS -DBASE_PATH="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Scripts/do_TimingCGGeneralMatrixOp3D
${CMAKE_CURRENT_BINARY_DIR}/do_TimingCGGeneralMatrixOp3D COPYONLY)
${CMAKE_BINARY_DIR}/dist/bin/do_TimingCGGeneralMatrixOp3D COPYONLY)
......@@ -21,13 +21,14 @@
</REGION>
</BOUNDARYCONDITIONS>
<FORCING>
<F VAR="u" VALUE="-(Lambda + 3*w*w*PI*PI)*sin(w*PI*x)*sin(w*PI*y)* sin(w*PI*z)" />
</FORCING>
<FUNCTION NAME="Forcing">
<E VAR="u" VALUE="-(Lambda + 3*w*w*PI*PI)*sin(w*PI*x)*sin(w*PI*y)* sin(w*PI*z)" />
</FUNCTION>
<FUNCTION NAME="ExactSolution">
<E VAR="u" VALUE="sin(w*PI*x)*sin(w*PI*y)*sin(w*PI*z)" />
</FUNCTION>
<EXACTSOLUTION>
<F VAR="u" VALUE="sin(w*PI*x)*sin(w*PI*y)*sin(w*PI*z)" />
</EXACTSOLUTION>
</CONDITIONS>
</NEKTAR>
......@@ -34,14 +34,15 @@
<D VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
</REGION>
</BOUNDARYCONDITIONS>
<FORCING>
<F VAR="u" VALUE="-(Lambda + 2*PI*PI)*sin(PI*x)*sin(PI*y)" />
</FORCING>
<EXACTSOLUTION>
<F VAR ="u" VALUE="sin(PI*x)*sin(PI*y)" />
</EXACTSOLUTION>
<FUNCTION NAME="Forcing">
<E VAR="u" VALUE="-(Lambda + 2*PI*PI)*sin(PI*x)*sin(PI*y)" />
</FUNCTION>
<FUNCTION NAME="ExactSolution">
<E VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
</FUNCTION>
</CONDITIONS>
</NEKTAR>
......@@ -34,14 +34,14 @@
<N VAR="u" VALUE="-PI*cos(PI*x)*sin(PI*y)" />
</REGION>
</BOUNDARYCONDITIONS>
<FORCING>
<F VAR="u" VALUE="-(Lambda + 2*PI*PI)*sin(PI*x)*sin(PI*y)" />
</FORCING>
<EXACTSOLUTION>
<F VAR ="u" VALUE="sin(PI*x)*sin(PI*y)" />
</EXACTSOLUTION>
<FUNCTION NAME="Forcing">
<E VAR="u" VALUE="-(Lambda + 2*PI*PI)*sin(PI*x)*sin(PI*y)" />
</FUNCTION>
<FUNCTION NAME="ExactSolution">
<E VAR="u" VALUE="sin(PI*x)*sin(PI*y)" />
</FUNCTION>
</CONDITIONS>
</NEKTAR>
......@@ -136,7 +136,6 @@ int main(int argc, char *argv[])
boost::filesystem::path MeshFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Geometry") /
boost::filesystem::path(MeshFileDirectory.str()) /
......@@ -144,21 +143,18 @@ int main(int argc, char *argv[])
vFilenames.push_back(PortablePath(MeshFilePath));
boost::filesystem::path BCfilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Conditions") /
boost::filesystem::path(BCfileName.str());
vFilenames.push_back(PortablePath(BCfilePath));
boost::filesystem::path ExpansionsFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Expansions") /
boost::filesystem::path(ExpansionsFileName.str());
vFilenames.push_back(PortablePath(ExpansionsFilePath));
boost::filesystem::path GlobOptFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Optimisation") /
boost::filesystem::path(GlobOptFileName.str());
......
......@@ -120,7 +120,6 @@ int main(int argc, char *argv[])
boost::filesystem::path MeshFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Geometry") /
boost::filesystem::path(MeshFileDirectory.str()) /
......@@ -128,21 +127,18 @@ int main(int argc, char *argv[])
vFilenames.push_back(PortablePath(MeshFilePath));
boost::filesystem::path BCfilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Conditions") /
boost::filesystem::path(BCfileName.str());
vFilenames.push_back(PortablePath(BCfilePath));
boost::filesystem::path ExpansionsFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Expansions") /
boost::filesystem::path(ExpansionsFileName.str());
vFilenames.push_back(PortablePath(ExpansionsFilePath));
boost::filesystem::path GlobOptFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Optimisation") /
boost::filesystem::path(GlobOptFileName.str());
......
......@@ -131,7 +131,6 @@ int main(int argc, char *argv[])
boost::filesystem::path MeshFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Geometry") /
boost::filesystem::path(MeshFileDirectory.str()) /
......@@ -139,21 +138,18 @@ int main(int argc, char *argv[])
vFilenames.push_back(PortablePath(MeshFilePath));
boost::filesystem::path BCfilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Conditions") /
boost::filesystem::path(BCfileName.str());
vFilenames.push_back(PortablePath(BCfilePath));
boost::filesystem::path ExpansionsFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Expansions") /
boost::filesystem::path(ExpansionsFileName.str());
vFilenames.push_back(PortablePath(ExpansionsFilePath));
boost::filesystem::path GlobOptFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Optimisation") /
boost::filesystem::path(GlobOptFileName.str());
......
......@@ -130,7 +130,6 @@ int main(int argc, char *argv[])
boost::filesystem::path MeshFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Geometry") /
boost::filesystem::path(MeshFileDirectory.str()) /
......@@ -138,21 +137,18 @@ int main(int argc, char *argv[])
vFilenames.push_back(PortablePath(MeshFilePath));
boost::filesystem::path BCfilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Conditions") /
boost::filesystem::path(BCfileName.str());
vFilenames.push_back(PortablePath(BCfilePath));
boost::filesystem::path ExpansionsFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Expansions") /
boost::filesystem::path(ExpansionsFileName.str());
vFilenames.push_back(PortablePath(ExpansionsFilePath));
boost::filesystem::path GlobOptFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Optimisation") /
boost::filesystem::path(GlobOptFileName.str());
......
......@@ -120,7 +120,6 @@ int main(int argc, char *argv[])
boost::filesystem::path MeshFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Geometry") /
boost::filesystem::path(MeshFileDirectory.str()) /
......@@ -128,21 +127,18 @@ int main(int argc, char *argv[])
vFilenames.push_back(PortablePath(MeshFilePath));
boost::filesystem::path BCfilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Conditions") /
boost::filesystem::path(BCfileName.str());
vFilenames.push_back(PortablePath(BCfilePath));
boost::filesystem::path ExpansionsFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Expansions") /
boost::filesystem::path(ExpansionsFileName.str());
vFilenames.push_back(PortablePath(ExpansionsFilePath));
boost::filesystem::path GlobOptFilePath = basePath /
boost::filesystem::path("Timings") /
boost::filesystem::path("InputFiles") /
boost::filesystem::path("Optimisation") /
boost::filesystem::path(GlobOptFileName.str());
......
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