Added new cyclic reduction files to the CMakeLists.txt file.

Added an autotest cleanup script (cleantest.sh) and fixed some 'make distclean' problems.
This commit is contained in:
Rob Falgout 2015-09-14 08:49:33 -07:00
parent e65ea50db5
commit 95489b822f
5 changed files with 55 additions and 3 deletions

50
AUTOTEST/cleantest.sh Executable file
View File

@ -0,0 +1,50 @@
#!/bin/sh
#BHEADER**********************************************************************
# Copyright (c) 2015, Lawrence Livermore National Security, LLC.
# Produced at the Lawrence Livermore National Laboratory.
# This file is part of HYPRE. See file COPYRIGHT for details.
#
# HYPRE is free software; you can redistribute it and/or modify it under the
# terms of the GNU Lesser General Public License (as published by the Free
# Software Foundation) version 2.1 dated February 1999.
#
# $Revision$
#EHEADER**********************************************************************
# Echo usage information
case $1 in
-h|-help)
cat <<EOF
$0 [-h|-help] [{testname}]
where: {testname} is the name of an autotest test (or multiple tests)
-h|-help prints this usage information and exits
This script removes the '.???' files and directories (e.g., .err and .dir)
for the specified tests. If no test is specified, the '.err' files in the
current directory determine the test names to use.
Example usage: $0 machine-tux
EOF
exit
;;
esac
if [ "x$1" = "x" ]
then
for i in *.err
do
testname=`basename $i .err`
rm -fr $testname.???
done
else
while [ "$*" ]
do
testname=$1
rm -fr $testname.???
shift
done
fi

View File

@ -550,6 +550,7 @@ list (APPEND HYPRE_SOURCES
struct_ls/coarsen.c
struct_ls/cyclic_reduction.c
struct_ls/F90_HYPRE_struct_bicgstab.c
struct_ls/F90_HYPRE_struct_cycred.c
struct_ls/F90_HYPRE_struct_gmres.c
struct_ls/F90_HYPRE_struct_hybrid.c
struct_ls/F90_HYPRE_struct_int.c
@ -561,6 +562,7 @@ list (APPEND HYPRE_SOURCES
struct_ls/general.c
struct_ls/hybrid.c
struct_ls/HYPRE_struct_bicgstab.c
struct_ls/HYPRE_struct_cycred.c
struct_ls/HYPRE_struct_hybrid.c
struct_ls/HYPRE_struct_int.c
struct_ls/HYPRE_struct_jacobi.c

View File

@ -195,7 +195,7 @@ clean:
distclean:
@ \
rm -Rf hypre; \
for i in ${HYPRE_DIRS} ${HYPRE_EXTRA_DIRS} ${HYPRE_BABEL_DIRS} ${HYPRE_EXAMPLE_DIRS}; \
for i in ${HYPRE_DIRS} ${HYPRE_EXTRA_DIRS} ${HYPRE_BABEL_DIRS} ${HYPRE_EXAMPLE_DIRS} examples/docs; \
do \
if [ -d $$i ]; \
then \

View File

@ -153,7 +153,7 @@ distclean: clean
rm -f TEST_sstruct/*.err*
rm -f TEST_struct/*.out*
rm -f TEST_struct/*.err*
rm -f ex1 ex2 ex3 ex4 ex5 ex5b ex5b77 ex6 ex7 ex8 ex9
rm -f ex1 ex2 ex3 ex4 ex5 ex5big ex5b ex5b77 ex6 ex7 ex8 ex9 ex15big ex18comp
##################################################################
# Rules

View File

@ -129,4 +129,4 @@ fi
# remove temporary files
#=============================================================================
# rm -f ${TNAME}.testdata*
rm -f ${TNAME}.testdata*