From 7ac0a72200f6d093322fd82a106a1e8acd76560c Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 13 Aug 2014 19:38:44 -0400 Subject: [PATCH] Fix restart for test_particle_restart (missed this when merging walshjon:band-samp). --- src/CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0025ba79e7..6db242a090 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -167,28 +167,28 @@ if(petsc) list(INSERT PETSC_PACKAGE_LIBS 0 ${PETSC_FLAPACK_LIB}) endif() - # If libdl wasn't found, search /usr/lib64 + # If libdl wasn't found, search /usr/lib64 if(PETSC_DL_LIB STREQUAL "PETSC_DL_LIB-NOTFOUND") find_library(PETSC_DL_LIB libdl.so /usr/lib64) list(REMOVE_ITEM PETSC_PACKAGE_LIBS PETSC_DL_LIB-NOTFOUND) list(INSERT PETSC_PACKAGE_LIBS 0 ${PETSC_DL_LIB}) endif() - # If libm wasn't found, search /usr/lib64 + # If libm wasn't found, search /usr/lib64 if(PETSC_M_LIB STREQUAL "PETSC_M_LIB-NOTFOUND") find_library(PETSC_M_LIB libm.so /usr/lib64) list(REMOVE_ITEM PETSC_PACKAGE_LIBS PETSC_M_LIB-NOTFOUND) list(INSERT PETSC_PACKAGE_LIBS 0 ${PETSC_M_LIB}) endif() - # If libpthread wasn't found, search /usr/lib64 + # If libpthread wasn't found, search /usr/lib64 if(PETSC_PTHREAD_LIB STREQUAL "PETSC_PTHREAD_LIB-NOTFOUND") find_library(PETSC_PTHREAD_LIB libpthread.so /usr/lib64) list(REMOVE_ITEM PETSC_PACKAGE_LIBS PETSC_PTHREAD_LIB-NOTFOUND) list(INSERT PETSC_PACKAGE_LIBS 0 ${PETSC_PTHREAD_LIB}) endif() - # If librt wasn't found, search /usr/lib64 + # If librt wasn't found, search /usr/lib64 if(PETSC_RT_LIB STREQUAL "PETSC_RT_LIB-NOTFOUND") find_library(PETSC_RT_LIB librt.so /usr/lib64) list(REMOVE_ITEM PETSC_PACKAGE_LIBS PETSC_RT_LIB-NOTFOUND) @@ -213,7 +213,7 @@ execute_process(COMMAND git rev-parse HEAD if(GIT_SHA1_SUCCESS EQUAL 0) add_definitions(-DGIT_SHA1="${GIT_SHA1}") endif() - + #=============================================================================== # FoX Fortran XML Library #=============================================================================== @@ -300,7 +300,7 @@ foreach(test ${TESTS}) # Get test information get_filename_component(TEST_NAME ${test} NAME) - get_filename_component(TEST_PATH ${test} PATH) + get_filename_component(TEST_PATH ${test} PATH) # Check for running standard tests (no valgrind, no gcov) if(NOT ${MEM_CHECK} AND NOT ${COVERAGE}) @@ -309,15 +309,15 @@ foreach(test ${TESTS}) if (${MPI_ENABLED}) # Preform a parallel test - add_test(NAME ${TEST_NAME} - WORKING_DIRECTORY ${TEST_PATH} + add_test(NAME ${TEST_NAME} + WORKING_DIRECTORY ${TEST_PATH} COMMAND ${PYTHON_EXECUTABLE} ${TEST_NAME} --exe $ --mpi_exec $ENV{MPI_DIR}/bin/mpiexec) else(${MPI_ENABLED}) # Perform a serial test - add_test(NAME ${TEST_NAME} + add_test(NAME ${TEST_NAME} WORKING_DIRECTORY ${TEST_PATH} COMMAND ${PYTHON_EXECUTABLE} ${TEST_NAME} --exe $) @@ -346,7 +346,7 @@ foreach(test ${TESTS}) elseif(${test} MATCHES "test_sourcepoint_restart") set(RESTART_FILE statepoint.07.h5 source.07.h5) elseif(${test} MATCHES "test_particle_restart") - set(RESTART_FILE particle_12_192.h5) + set(RESTART_FILE particle_12_885.h5) else(${test} MATCHES "test_statepoint_restart") message(FATAL_ERROR "Restart test ${test} not recognized") endif(${test} MATCHES "test_statepoint_restart") @@ -359,7 +359,7 @@ foreach(test ${TESTS}) elseif(${test} MATCHES "test_sourcepoint_restart") set(RESTART_FILE statepoint.07.binary source.07.binary) elseif(${test} MATCHES "test_particle_restart") - set(RESTART_FILE particle_12_192.binary) + set(RESTART_FILE particle_12_885.binary) else(${test} MATCHES "test_statepoint_restart") message(FATAL_ERROR "Restart test ${test} not recognized") endif(${test} MATCHES "test_statepoint_restart")