Skip to content

Commit

Permalink
Make tests MPI
Browse files Browse the repository at this point in the history 
Change some of the longer test to use MPI. All the tests pass

Use cmake ../ -DMPIMAX to set the default number of processor in those tests. Not the same as ctest -jX.

Test project /home/ddong/Codes/PHiLiP_temp/PHiLiP/build_release
      Start  1: 1D_numerical_flux_conservation
 1/39 Test  #1: 1D_numerical_flux_conservation ..................................   Passed    0.26 sec
      Start  2: 2D_numerical_flux_conservation
 2/39 Test  #2: 2D_numerical_flux_conservation ..................................   Passed    0.22 sec
      Start  3: 3D_numerical_flux_conservation
 3/39 Test  #3: 3D_numerical_flux_conservation ..................................   Passed    0.27 sec
      Start  4: 1D_jacobian_matrix_regression
 4/39 Test  #4: 1D_jacobian_matrix_regression ...................................   Passed    0.69 sec
      Start  5: 2D_jacobian_matrix_regression
 5/39 Test  #5: 2D_jacobian_matrix_regression ...................................   Passed    0.74 sec
      Start  6: 3D_jacobian_matrix_regression
 6/39 Test  #6: 3D_jacobian_matrix_regression ...................................   Passed    3.27 sec
      Start  7: 1D_euler_convert_primitive_conservative
 7/39 Test  #7: 1D_euler_convert_primitive_conservative .........................   Passed    0.19 sec
      Start  8: 2D_euler_convert_primitive_conservative
 8/39 Test  #8: 2D_euler_convert_primitive_conservative .........................   Passed    0.22 sec
      Start  9: 3D_euler_convert_primitive_conservative
 9/39 Test  #9: 3D_euler_convert_primitive_conservative .........................   Passed    0.57 sec
      Start 10: 1D_euler_manufactured_solution_source
10/39 Test #10: 1D_euler_manufactured_solution_source ...........................   Passed    0.27 sec
      Start 11: 2D_euler_manufactured_solution_source
11/39 Test #11: 2D_euler_manufactured_solution_source ...........................   Passed    0.24 sec
      Start 12: 3D_euler_manufactured_solution_source
12/39 Test #12: 3D_euler_manufactured_solution_source ...........................   Passed    0.61 sec
      Start 13: 1D_euler_convective_jacobian
13/39 Test #13: 1D_euler_convective_jacobian ....................................   Passed    0.20 sec
      Start 14: 2D_euler_convective_jacobian
14/39 Test #14: 2D_euler_convective_jacobian ....................................   Passed    0.24 sec
      Start 15: 3D_euler_convective_jacobian
15/39 Test #15: 3D_euler_convective_jacobian ....................................   Passed    1.04 sec
      Start 16: 1D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION
16/39 Test #16: 1D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION .....................   Passed    0.79 sec
      Start 17: 2D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION
17/39 Test #17: 2D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION .....................   Passed    7.34 sec
      Start 18: MPI_2D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION
18/39 Test #18: MPI_2D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION .................   Passed    3.57 sec
      Start 19: MPI_3D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION
19/39 Test #19: MPI_3D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION .................   Passed    7.67 sec
      Start 20: 1D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION_STRONG
20/39 Test #20: 1D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION_STRONG ..............   Passed    0.82 sec
      Start 21: 2D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION_STRONG
21/39 Test #21: 2D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION_STRONG ..............   Passed   10.93 sec
      Start 22: MPI_3D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION_STRONG
22/39 Test #22: MPI_3D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION_STRONG ..........   Passed   37.31 sec
      Start 23: 1D_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION
23/39 Test #23: 1D_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION .....................   Passed    0.80 sec
      Start 24: 2D_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION
24/39 Test #24: 2D_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION .....................   Passed    2.56 sec
      Start 25: MPI_3D_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION
25/39 Test #25: MPI_3D_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION .................   Passed   21.02 sec
      Start 26: 1D_CONVECTION_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION
26/39 Test #26: 1D_CONVECTION_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION ..........   Passed    0.91 sec
      Start 27: 2D_CONVECTION_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION
27/39 Test #27: 2D_CONVECTION_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION ..........   Passed    2.62 sec
      Start 28: MPI_3D_CONVECTION_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION
28/39 Test #28: MPI_3D_CONVECTION_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION ......   Passed   19.84 sec
      Start 29: 1D_ADVECTION_VECTOR_VALUED_IMPLICIT_MANUFACTURED_SOLUTION
29/39 Test #29: 1D_ADVECTION_VECTOR_VALUED_IMPLICIT_MANUFACTURED_SOLUTION .......   Passed    0.83 sec
      Start 30: 2D_ADVECTION_VECTOR_VALUED_IMPLICIT_MANUFACTURED_SOLUTION
30/39 Test #30: 2D_ADVECTION_VECTOR_VALUED_IMPLICIT_MANUFACTURED_SOLUTION .......   Passed   12.23 sec
      Start 31: MPI_3D_ADVECTION_VECTOR_VALUED_IMPLICIT_MANUFACTURED_SOLUTION
31/39 Test #31: MPI_3D_ADVECTION_VECTOR_VALUED_IMPLICIT_MANUFACTURED_SOLUTION ...   Passed   12.63 sec
      Start 32: 1D_BURGERS_INVISCID_IMPLICIT_MANUFACTURED_SOLUTION
32/39 Test #32: 1D_BURGERS_INVISCID_IMPLICIT_MANUFACTURED_SOLUTION ..............   Passed    0.84 sec
      Start 33: 1D_EULER_LAXFRIEDRICHS_MANUFACTURED_SOLUTION
33/39 Test #33: 1D_EULER_LAXFRIEDRICHS_MANUFACTURED_SOLUTION ....................   Passed    1.64 sec
      Start 34: 2D_EULER_LAXFRIEDRICHS_MANUFACTURED_SOLUTION
34/39 Test #34: 2D_EULER_LAXFRIEDRICHS_MANUFACTURED_SOLUTION ....................   Passed   38.39 sec
      Start 35: MPI_2D_EULER_LAXFRIEDRICHS_MANUFACTURED_SOLUTION
35/39 Test #35: MPI_2D_EULER_LAXFRIEDRICHS_MANUFACTURED_SOLUTION ................   Passed   15.22 sec
      Start 36: 1D_EULER_ROE_MANUFACTURED_SOLUTION
36/39 Test #36: 1D_EULER_ROE_MANUFACTURED_SOLUTION ..............................   Passed    1.69 sec
      Start 37: MPI_2D_EULER_ROE_MANUFACTURED_SOLUTION
37/39 Test #37: MPI_2D_EULER_ROE_MANUFACTURED_SOLUTION ..........................   Passed   10.56 sec
      Start 38: MPI_2D_EULER_INTEGRATION_CYLINDER
38/39 Test #38: MPI_2D_EULER_INTEGRATION_CYLINDER ...............................   Passed  120.18 sec
      Start 39: MPI_2D_EULER_INTEGRATION_GAUSSIAN_BUMP
39/39 Test #39: MPI_2D_EULER_INTEGRATION_GAUSSIAN_BUMP ..........................   Passed  312.47 sec

100% tests passed, 0 tests failed out of 39

Total Test time (real) = 652.82 sec
  • Loading branch information
@dougshidong
dougshidong committed Aug 20, 2019
1 parent 10b9fca commit 74c8cc1
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 65 deletions.
66 changes: 41 additions & 25 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,16 @@ set(CMAKE_CXX_STANDARD 17)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")

#set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og -g")

#set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/build_${BUILD_DIM}D)
set(MPIMAX 4 CACHE STRING "Default number of processors used in ctest mpirun -np MPIMAX. Not the same as ctest -jX")

set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/lib)
#set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/lib)
#set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og -g")

set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set(CLEAN_UP_FILES ./bin/* ./CMakeCache.txt)

# Find deal.ii library
find_package(deal.II 9.0.0 QUIET
#HINTS ${deal.II_DIR} ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}
find_package(deal.II 9.1.1 QUIET
HINTS ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}
)
IF(NOT ${deal.II_FOUND})
Expand All @@ -30,9 +26,24 @@ IF(NOT ${deal.II_FOUND})
"or set an environment variable \"DEAL_II_DIR\" that contains this path."
)
ENDIF()
DEAL_II_INITIALIZE_CACHED_VARIABLES()

option(USE_LD_GOLD "Use GNU gold linker" ON)
# Make sure deal.II has the proper external dependencies
IF(NOT ${DEAL_II_WITH_MPI})
message(FATAL_ERROR "\n" "*** deal.II needs to be configured with -DDEAL_II_WITH_MPI=ON ***\n\n")
ENDIF()
IF(NOT ${DEAL_II_WITH_TRILINOS})
message(FATAL_ERROR "\n" "*** deal.II needs to be configured with -DDEAL_II_WITH_TRILINOS=ON ***\n\n")
ENDIF()
IF(NOT ${DEAL_II_WITH_P4EST})
message(FATAL_ERROR "\n" "*** deal.II needs to be configured with -DDEAL_II_WITH_P4EST=ON ***\n\n")
ENDIF()
IF(NOT ${DEAL_II_WITH_METIS})
message(FATAL_ERROR "\n" "*** deal.II needs to be configured with -DDEAL_II_WITH_METIS=ON ***\n\n")
ENDIF()

# Use ld.gold for faster linking
option(USE_LD_GOLD "Use GNU gold linker" ON)
if(USE_LD_GOLD AND "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version OUTPUT_VARIABLE stdout ERROR_QUIET)
if("${stdout}" MATCHES "GNU gold")
Expand All @@ -43,21 +54,20 @@ if(USE_LD_GOLD AND "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
endif()
endif()

DEAL_II_INITIALIZE_CACHED_VARIABLES()

add_custom_target(1D COMMAND ${CMAKE_COMMAND} -E echo "Makes all 1D executables, including tests. Allows ctest -R 1D")
add_custom_target(2D COMMAND ${CMAKE_COMMAND} -E echo "l 2D executables, including tests. Allows ctest -R 2D")
add_custom_target(3D COMMAND ${CMAKE_COMMAND} -E echo "l 3D executables, including tests. Allows ctest -R 3D")
add_custom_target(2D COMMAND ${CMAKE_COMMAND} -E echo "Makes all 2D executables, including tests. Allows ctest -R 2D")
add_custom_target(3D COMMAND ${CMAKE_COMMAND} -E echo "Makes all 3D executables, including tests. Allows ctest -R 3D")
SET(_dimension_targets "#
# make 1D - to build all 1D executables, including tests, allow 'ctest -R 1D'
# make 2D - to build all 2D executables, including tests, allow 'ctest -R 1D'
# make 3D - to build all 3D executables, including tests, allow 'ctest -R 1D' ")
# make 2D - to build all 2D executables, including tests, allow 'ctest -R 2D'
# make 3D - to build all 3D executables, including tests, allow 'ctest -R 3D' ")
SET(_philip_targets "#
# make PHiLiP_1D - to build main program in 1D
# make PHiLiP_2D - to build main program in 2D
# make PHiLiP_3D - to build main program in 3D ")
# make PHiLiP_1D - to build main program (wihtout tests) in 1D
# make PHiLiP_2D - to build main program (wihtout tests) in 2D
# make PHiLiP_3D - to build main program (wihtout tests) in 3D ")
add_custom_target(unit_tests)

# Source code
include_directories(src)
add_subdirectory(src)

Expand All @@ -71,17 +81,17 @@ add_subdirectory(doc)
##########
# Add a few commands to make life easier

#include(ProcessorCount)
#ProcessorCount(NPROC)

# Define custom targets to easily switch the build type:
#set(CMAKE_BUILD_TYPE Release)
#set(CMAKE_BUILD_TYPE Debug)
ADD_CUSTOM_TARGET(debug
add_custom_target(debug
COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Debug ${CMAKE_SOURCE_DIR}
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target all
COMMENT "Switch CMAKE_BUILD_TYPE to Debug"
)

ADD_CUSTOM_TARGET(release
add_custom_target(release
COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Release ${CMAKE_SOURCE_DIR}
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target all
COMMENT "Switch CMAKE_BUILD_TYPE to Release"
Expand Down Expand Up @@ -120,12 +130,10 @@ ${_switch_targets}
# use too many processors, as you will run out of RAM. If you have (m) GB of
# available memory, you can use around (m-1) processor without having to use the swap.
#
# Have a nice day!
#
###\")"
)

ADD_CUSTOM_TARGET(info
add_custom_target(info
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/print_usage.cmake
)

Expand All @@ -139,3 +147,11 @@ ADD_CUSTOM_TARGET(info
INCLUDE(${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/print_usage.cmake)
MESSAGE(STATUS "Run make info to print a detailed help message")

MESSAGE(STATUS "
###
#
# Using MPIMAX = ${MPIMAX}, which sets the default values used by ctest for the MPI runs.
# Can use cmake ../ -DMPIMAX=XX to change this default value.
#
###
")
15 changes: 11 additions & 4 deletions tests/advection_implicit/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,17 @@ add_test(
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)

configure_file(2d_advection_implicit.prm 2d_advection_implicit.prm COPYONLY)
add_test(
NAME MPI_2D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION
COMMAND mpirun -np ${MPIMAX} ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_advection_implicit.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)

configure_file(3d_advection_implicit.prm 3d_advection_implicit.prm COPYONLY)
add_test(
NAME 3D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_3D -i ${CMAKE_CURRENT_BINARY_DIR}/3d_advection_implicit.prm
NAME MPI_3D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION
COMMAND mpirun -np ${MPIMAX} ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_3D -i ${CMAKE_CURRENT_BINARY_DIR}/3d_advection_implicit.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)

Expand All @@ -38,7 +45,7 @@ add_test(

configure_file(3d_advection_implicit_strong.prm 3d_advection_implicit_strong.prm COPYONLY)
add_test(
NAME 3D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION_STRONG
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_3D -i ${CMAKE_CURRENT_BINARY_DIR}/3d_advection_implicit_strong.prm
NAME MPI_3D_ADVECTION_IMPLICIT_MANUFACTURED_SOLUTION_STRONG
COMMAND mpirun -np ${MPIMAX} ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_3D -i ${CMAKE_CURRENT_BINARY_DIR}/3d_advection_implicit_strong.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)
4 changes: 2 additions & 2 deletions tests/advection_vector_implicit/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ add_test(

configure_file(3d_advection_vector_implicit.prm 3d_advection_vector_implicit.prm COPYONLY)
add_test(
NAME 3D_ADVECTION_VECTOR_VALUED_IMPLICIT_MANUFACTURED_SOLUTION
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_3D -i ${CMAKE_CURRENT_BINARY_DIR}/3d_advection_vector_implicit.prm
NAME MPI_3D_ADVECTION_VECTOR_VALUED_IMPLICIT_MANUFACTURED_SOLUTION
COMMAND mpirun -np ${MPIMAX} ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_3D -i ${CMAKE_CURRENT_BINARY_DIR}/3d_advection_vector_implicit.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)
4 changes: 2 additions & 2 deletions tests/convection_diffusion_implicit/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ add_test(

configure_file(3d_convection_diffusion_implicit.prm 3d_convection_diffusion_implicit.prm COPYONLY)
add_test(
NAME 3D_CONVECTION_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_3D -i ${CMAKE_CURRENT_BINARY_DIR}/3d_convection_diffusion_implicit.prm
NAME MPI_3D_CONVECTION_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION
COMMAND mpirun -np ${MPIMAX} ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_3D -i ${CMAKE_CURRENT_BINARY_DIR}/3d_convection_diffusion_implicit.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)
4 changes: 2 additions & 2 deletions tests/diffusion_implicit/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ add_test(
)
configure_file(3d_diffusion_implicit.prm 3d_diffusion_implicit.prm COPYONLY)
add_test(
NAME 3D_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_3D -i ${CMAKE_CURRENT_BINARY_DIR}/3d_diffusion_implicit.prm
NAME MPI_3D_DIFFUSION_IMPLICIT_MANUFACTURED_SOLUTION
COMMAND mpirun -np ${MPIMAX} ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_3D -i ${CMAKE_CURRENT_BINARY_DIR}/3d_diffusion_implicit.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)
71 changes: 41 additions & 30 deletions tests/euler_integration/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,75 @@
set(TEST_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})

configure_file(2d_euler_vortex.prm 2d_euler_vortex.prm COPYONLY)
add_test(
NAME 2D_EULER_INTEGRATION_VORTEX
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_vortex.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)
# Manufactured solutions
set(TEST_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})

configure_file(2d_euler_cylinder.prm 2d_euler_cylinder.prm COPYONLY)
configure_file(1d_euler_laxfriedrichs_manufactured.prm 1d_euler_laxfriedrichs_manufactured.prm COPYONLY)
add_test(
NAME 2D_EULER_INTEGRATION_CYLINDER
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_cylinder.prm
NAME 1D_EULER_LAXFRIEDRICHS_MANUFACTURED_SOLUTION
COMMAND mpirun -np 1 ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_1D -i ${CMAKE_CURRENT_BINARY_DIR}/1d_euler_laxfriedrichs_manufactured.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)

configure_file(2d_euler_entropy_waves.prm 2d_euler_entropy_waves.prm COPYONLY)
configure_file(2d_euler_laxfriedrichs_manufactured.prm 2d_euler_laxfriedrichs_manufactured.prm COPYONLY)
add_test(
NAME 2D_EULER_INTEGRATION_ENTROPY_WAVES
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_entropy_waves.prm
NAME 2D_EULER_LAXFRIEDRICHS_MANUFACTURED_SOLUTION
COMMAND mpirun -np 1 ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_laxfriedrichs_manufactured.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)

configure_file(2d_euler_gaussian_bump.prm 2d_euler_gaussian_bump.prm COPYONLY)
configure_file(2d_euler_laxfriedrichs_manufactured.prm 2d_euler_laxfriedrichs_manufactured.prm COPYONLY)
add_test(
NAME 2D_EULER_INTEGRATION_GAUSSIAN_BUMP
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_gaussian_bump.prm
NAME MPI_2D_EULER_LAXFRIEDRICHS_MANUFACTURED_SOLUTION
COMMAND mpirun -np ${MPIMAX} ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_laxfriedrichs_manufactured.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)

# Manufactured solutions
set(TEST_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})

configure_file(1d_euler_laxfriedrichs_manufactured.prm 1d_euler_laxfriedrichs_manufactured.prm COPYONLY)
configure_file(1d_euler_roe_manufactured.prm 1d_euler_roe_manufactured.prm COPYONLY)
add_test(
NAME 1D_EULER_LAXFRIEDRICHS_MANUFACTURED_SOLUTION
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_1D -i ${CMAKE_CURRENT_BINARY_DIR}/1d_euler_laxfriedrichs_manufactured.prm
NAME 1D_EULER_ROE_MANUFACTURED_SOLUTION
COMMAND mpirun -np 1 ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_1D -i ${CMAKE_CURRENT_BINARY_DIR}/1d_euler_roe_manufactured.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)

configure_file(2d_euler_laxfriedrichs_manufactured.prm 2d_euler_laxfriedrichs_manufactured.prm COPYONLY)
configure_file(2d_euler_roe_manufactured.prm 2d_euler_roe_manufactured.prm COPYONLY)
add_test(
NAME 2D_EULER_LAXFRIEDRICHS_MANUFACTURED_SOLUTION
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_laxfriedrichs_manufactured.prm
NAME MPI_2D_EULER_ROE_MANUFACTURED_SOLUTION
COMMAND mpirun -np ${MPIMAX} ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_roe_manufactured.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)

configure_file(1d_euler_roe_manufactured.prm 1d_euler_roe_manufactured.prm COPYONLY)
# Exact solutions

configure_file(2d_euler_cylinder.prm 2d_euler_cylinder.prm COPYONLY)
add_test(
NAME 1D_EULER_ROE_MANUFACTURED_SOLUTION
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_1D -i ${CMAKE_CURRENT_BINARY_DIR}/1d_euler_roe_manufactured.prm
NAME MPI_2D_EULER_INTEGRATION_CYLINDER
COMMAND mpirun -np ${MPIMAX} ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_cylinder.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)

configure_file(2d_euler_roe_manufactured.prm 2d_euler_roe_manufactured.prm COPYONLY)
configure_file(2d_euler_gaussian_bump.prm 2d_euler_gaussian_bump.prm COPYONLY)
add_test(
NAME 2D_EULER_ROE_MANUFACTURED_SOLUTION
COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_roe_manufactured.prm
NAME MPI_2D_EULER_INTEGRATION_GAUSSIAN_BUMP
COMMAND mpirun -np ${MPIMAX} ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_gaussian_bump.prm
WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
)

# Vortex test case takes wayyy too much time. It works, so uncomment below if you want to wait.
# configure_file(2d_euler_vortex.prm 2d_euler_vortex.prm COPYONLY)
# add_test(
# NAME 2D_EULER_INTEGRATION_VORTEX
# COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_vortex.prm
# WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
# )


#configure_file(2d_euler_entropy_waves.prm 2d_euler_entropy_waves.prm COPYONLY)
#add_test(
# NAME 2D_EULER_INTEGRATION_ENTROPY_WAVES
# COMMAND ${EXECUTABLE_OUTPUT_PATH}/PHiLiP_2D -i ${CMAKE_CURRENT_BINARY_DIR}/2d_euler_entropy_waves.prm
# WORKING_DIRECTORY ${TEST_OUTPUT_DIR}
#)

#configure_file(3d_euler_laxfriedrichs_manufactured.prm 3d_euler_laxfriedrichs_manufactured.prm COPYONLY)
#add_test(
# NAME 3D_EULER_LAXFRIEDRICHS_MANUFACTURED_SOLUTION
Expand Down

0 comments on commit 74c8cc1

Please sign in to comment.