Removed all references to includes directory.

1998-09-14 21:30:13 +00:00 · 1998-09-14 21:30:13 +00:00 · 454bf6d74f
commit 454bf6d74f
parent 11c523275a
22 changed files with 27 additions and 24 deletions
--- a/PETScMat_linear_solvers/pilut/PETScMatPilutSolver.h
+++ b/PETScMat_linear_solvers/pilut/PETScMatPilutSolver.h
@ -15,7 +15,7 @@
 #ifndef hypre_PETSC_MAT_PILUT_SOLVER_HEADER
 #define hypre_PETSC_MAT_PILUT_SOLVER_HEADER

-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 #include "../../utilities/memory.h"
 #ifdef HYPRE_DEBUG
 #include <gmalloc.h>
@ -27,7 +27,7 @@
 #include "mat.h"
 #include "vec.h"

-#include "../../includes/HYPRE.h"
+#include "../../HYPRE.h"

 /*--------------------------------------------------------------------------
 * hypre_PETScMatPilutSolver
--- a/PETScMat_ls/pilut/PETScMatPilutSolver.h
+++ b/PETScMat_ls/pilut/PETScMatPilutSolver.h
@ -15,7 +15,7 @@
 #ifndef hypre_PETSC_MAT_PILUT_SOLVER_HEADER
 #define hypre_PETSC_MAT_PILUT_SOLVER_HEADER

-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 #include "../../utilities/memory.h"
 #ifdef HYPRE_DEBUG
 #include <gmalloc.h>
@ -27,7 +27,7 @@
 #include "mat.h"
 #include "vec.h"

-#include "../../includes/HYPRE.h"
+#include "../../HYPRE.h"

 /*--------------------------------------------------------------------------
 * hypre_PETScMatPilutSolver
--- a/PETSc_linear_solvers/Block_Preconditioned/makefile
+++ b/PETSc_linear_solvers/Block_Preconditioned/makefile
@ -27,7 +27,7 @@
            -I/usr/local/include -I/home/casc/include
  ILU_INC = -I../../seq_linear_solvers/ilut
  IC_INC = -I../../seq_linear_solvers/ict
-  LIN_SOLVE_INC = -I../../includes
+  LIN_SOLVE_INC = -I../.. -I../../utilities

  INC = $(PETSC_INC) $(PETSC_PRIV_INC) $(MPI_INC) $($(LOCAL_SOLVER)_INC) \
        $(LIN_SOLVE_INC) -I/home/casc/include
--- a/PETSc_linear_solvers/ParILUT/PETScSolverParILUT.h
+++ b/PETSc_linear_solvers/ParILUT/PETScSolverParILUT.h
@ -15,7 +15,7 @@
 #ifndef hypre_PETScSolverParILUT_HEADER
 #define hypre_PETScSolverParILUT_HEADER

-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 #include "../../utilities/memory.h"
 #ifdef HYPRE_DEBUG
 #include <gmalloc.h>
--- a/PETSc_ls/Block_Preconditioned/makefile
+++ b/PETSc_ls/Block_Preconditioned/makefile
@ -27,7 +27,7 @@
            -I/usr/local/include -I/home/casc/include
  ILU_INC = -I../../seq_linear_solvers/ilut
  IC_INC = -I../../seq_linear_solvers/ict
-  LIN_SOLVE_INC = -I../../includes
+  LIN_SOLVE_INC = -I../.. -I../../utilities

  INC = $(PETSC_INC) $(PETSC_PRIV_INC) $(MPI_INC) $($(LOCAL_SOLVER)_INC) \
        $(LIN_SOLVE_INC) -I/home/casc/include
--- a/PETSc_ls/ParILUT/PETScSolverParILUT.h
+++ b/PETSc_ls/ParILUT/PETScSolverParILUT.h
@ -15,7 +15,7 @@
 #ifndef hypre_PETScSolverParILUT_HEADER
 #define hypre_PETScSolverParILUT_HEADER

-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 #include "../../utilities/memory.h"
 #ifdef HYPRE_DEBUG
 #include <gmalloc.h>
--- a/bmakes/base.alpha.andy
+++ b/bmakes/base.alpha.andy
@ -31,7 +31,8 @@ CFLAGS =\
 ${PETSC_CFLAGS}\
 ${ISIS_FLAGS}\
 -I/usr/local/include\
- -I${HYPRE_DIR}/includes\
+ -I${HYPRE_DIR}\
+ -I${HYPRE_DIR}/utilities\
 -DPETSC_AVAILABLE\
 -DISIS_AVAILABLE\
 -DHYPRE_MEMORY_CHECK\
--- a/bmakes/base.solaris.andy
+++ b/bmakes/base.solaris.andy
@ -34,7 +34,8 @@ CFLAGS =\
 ${ISIS_FLAGS}\
 -I/usr/local/include\
 -I/home/casc/include\
- -I${HYPRE_DIR}/includes\
+ -I${HYPRE_DIR}\
+ -I${HYPRE_DIR}/utilities\
 -DPETSC_AVAILABLE\
 -DISIS_AVAILABLE\
 -DHYPRE_MEMORY_CHECK\
--- a/distributed_linear_solvers/pilut/DistributedMatrixPilutSolver.h
+++ b/distributed_linear_solvers/pilut/DistributedMatrixPilutSolver.h
@ -3,7 +3,7 @@
 #define _DISTRIBUTED_MATRIX_PILUT_SOLVER_HEADER


-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 #include "../../utilities/memory.h"
 #ifdef HYPRE_DEBUG
 #include <gmalloc.h>
--- a/distributed_linear_solvers/pilut/Makefile
+++ b/distributed_linear_solvers/pilut/Makefile
@ -25,7 +25,7 @@ MPIRUN       = mpirun -np 4
 #PETSc; not used here, but used by objects called from here 
 PETSC_INCLUDES = -I${PETSC_DIR}/include
 # General
-HYPRE_INCLUDES = -I../../includes -I/home/casc/include
+HYPRE_INCLUDES = -I../.. -I../../utilities -I/home/casc/include
 INCLUDES = $(HYPRE_INCLUDES) $(MPI_INCLUDES) $(PETSC_INCLUDES)
 LIBDIR   = $(MPI_LIBDIR)
 LIBS     = -L. -lHYPREpilut -lm $(MPI_LIBS) $(OTHER_LIBS)
--- a/distributed_linear_solvers/pilut/Makefile.alpha
+++ b/distributed_linear_solvers/pilut/Makefile.alpha
@ -29,7 +29,7 @@ MPIRUN       = mpirun -np 4
 #PETSc; not used here, but used by objects called from here 
 PETSC_INCLUDES = -I${PETSC_DIR}/include
 # General
-HYPRE_INCLUDES = -I../../includes -I/home/casc/include
+HYPRE_INCLUDES = -I../.. -I../../utilities -I/home/casc/include
 INCLUDES = $(HYPRE_INCLUDES) $(MPI_INCLUDES) $(PETSC_INCLUDES)
 LIBDIR   = $(MPI_LIBDIR)
 LIBS     = -L. -lHYPREpilut -lm $(MPI_LIBS) $(OTHER_LIBS)
--- a/distributed_linear_solvers/pilut/macros.h
+++ b/distributed_linear_solvers/pilut/macros.h
@ -1,7 +1,7 @@
 #ifndef MACROS_H
 #define MACROS_H

-#include "../../includes/general.h"
+#include "../../utilities/general.h"

 /*
 * macros.h
--- a/distributed_ls/pilut/DistributedMatrixPilutSolver.h
+++ b/distributed_ls/pilut/DistributedMatrixPilutSolver.h
@ -3,7 +3,7 @@
 #define _DISTRIBUTED_MATRIX_PILUT_SOLVER_HEADER


-#include "../../includes/general.h"
+#include "../../utilities/general.h"
 #include "../../utilities/memory.h"
 #ifdef HYPRE_DEBUG
 #include <gmalloc.h>
--- a/distributed_ls/pilut/Makefile
+++ b/distributed_ls/pilut/Makefile
@ -25,7 +25,7 @@ MPIRUN       = mpirun -np 4
 #PETSc; not used here, but used by objects called from here 
 PETSC_INCLUDES = -I${PETSC_DIR}/include
 # General
-HYPRE_INCLUDES = -I../../includes -I/home/casc/include
+HYPRE_INCLUDES = -I../.. -I../../utilities -I/home/casc/include
 INCLUDES = $(HYPRE_INCLUDES) $(MPI_INCLUDES) $(PETSC_INCLUDES)
 LIBDIR   = $(MPI_LIBDIR)
 LIBS     = -L. -lHYPREpilut -lm $(MPI_LIBS) $(OTHER_LIBS)
--- a/distributed_ls/pilut/Makefile.alpha
+++ b/distributed_ls/pilut/Makefile.alpha
@ -29,7 +29,7 @@ MPIRUN       = mpirun -np 4
 #PETSc; not used here, but used by objects called from here 
 PETSC_INCLUDES = -I${PETSC_DIR}/include
 # General
-HYPRE_INCLUDES = -I../../includes -I/home/casc/include
+HYPRE_INCLUDES = -I../.. -I../../utilities -I/home/casc/include
 INCLUDES = $(HYPRE_INCLUDES) $(MPI_INCLUDES) $(PETSC_INCLUDES)
 LIBDIR   = $(MPI_LIBDIR)
 LIBS     = -L. -lHYPREpilut -lm $(MPI_LIBS) $(OTHER_LIBS)
--- a/distributed_ls/pilut/macros.h
+++ b/distributed_ls/pilut/macros.h
@ -1,7 +1,7 @@
 #ifndef MACROS_H
 #define MACROS_H

-#include "../../includes/general.h"
+#include "../../utilities/general.h"

 /*
 * macros.h
--- a/distributed_matrix/Makefile.alpha
+++ b/distributed_matrix/Makefile.alpha
@ -47,7 +47,8 @@ CFLAGS =\
 ${SEQ_SOLVER_FLAGS}\
 -I/usr/local/include\
 -I/home/casc/include\
- -I../includes\
+ -I..\
+ -I../utilities\
 -DHYPRE_MEMORY_CHECK\
 -DHYPRE_DEBUG\
 -I/g/g90/chow/ale3d/isis/include\
--- a/distributed_matrix/distributed_matrix.h
+++ b/distributed_matrix/distributed_matrix.h
@ -15,7 +15,7 @@
 #ifndef hypre_DISTRIBUTED_MATRIX_HEADER
 #define hypre_DISTRIBUTED_MATRIX_HEADER

-#include "../includes/general.h"
+#include "../utilities/general.h"
 #include "../utilities/memory.h"

 #include "mpi.h"
--- a/seq_linear_solvers/ict/makefile
+++ b/seq_linear_solvers/ict/makefile
@ -3,7 +3,7 @@ OBJS=cg_driver.o ict_driver.o \

 HEADERS = ic_data.h ict_facsol_f.h

-INC = -I.. -I/home/casc/include -I../../includes
+INC = -I.. -I/home/casc/include -I../.. -I../../utilities

 SPARSKIT_DIR = ../dsparskit
 LIB = -L$(SPARSKIT_DIR) -ldsparskit
--- a/seq_linear_solvers/ilut/makefile
+++ b/seq_linear_solvers/ilut/makefile
@ -3,7 +3,7 @@ OBJS=gmres_driver.o ilut_driver.o ilu_setup.o ilu_Initialize.o \

 HEADERS = ilu_data.h ilut_facsol_f.h

-INC = -I.. -I/home/casc/include -I../../includes
+INC = -I.. -I/home/casc/include -I../.. -I../../utilities

 SPARSKIT_DIR = ../dsparskit
 LIB = -L$(SPARSKIT_DIR) -ldsparskit
--- a/seq_ls/ict/makefile
+++ b/seq_ls/ict/makefile
@ -3,7 +3,7 @@ OBJS=cg_driver.o ict_driver.o \

 HEADERS = ic_data.h ict_facsol_f.h

-INC = -I.. -I/home/casc/include -I../../includes
+INC = -I.. -I/home/casc/include -I../.. -I../../utilities

 SPARSKIT_DIR = ../dsparskit
 LIB = -L$(SPARSKIT_DIR) -ldsparskit
--- a/seq_ls/ilut/makefile
+++ b/seq_ls/ilut/makefile
@ -3,7 +3,7 @@ OBJS=gmres_driver.o ilut_driver.o ilu_setup.o ilu_Initialize.o \

 HEADERS = ilu_data.h ilut_facsol_f.h

-INC = -I.. -I/home/casc/include -I../../includes
+INC = -I.. -I/home/casc/include -I../.. -I../../utilities

 SPARSKIT_DIR = ../dsparskit
 LIB = -L$(SPARSKIT_DIR) -ldsparskit