From aa4f68cb4c1d277237f2a32e30132acf2bc39430 Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@cranfield.ac.uk>
Date: Mon, 13 Mar 2006 14:47:03 +0000
Subject: [PATCH] *** empty log message ***

---
 Make.inc.nagf95 | 58 ------------------------------------
 Make.inc.pgf90  | 78 ++++++++++++++++++++++++++++++++++---------------
 2 files changed, 54 insertions(+), 82 deletions(-)
 delete mode 100644 Make.inc.nagf95

diff --git a/Make.inc.nagf95 b/Make.inc.nagf95
deleted file mode 100644
index 04c2d066..00000000
--- a/Make.inc.nagf95
+++ /dev/null
@@ -1,58 +0,0 @@
-# Using GNU gfortran (from GCC 3.5.0) 
-.mod=.mod
-.SUFFIXES: .f90 $(.mod)
-F90=/opt/nag/bin/f95
-FC=/opt/nag/bin/f95
-F77=$(FC)
-F90COPT=-O3 -mismatch
-FCOPT=-O3 -dusty
-CC=gcc
-CCOPT=-O3 
-F90LINK=$(HOME)/mpich-nag/bin/mpif90
-FLINK=$(HOME)/mpich-nag/bin/mpif77
-MPF90=$(F90LINK) -mismatch
-MPCC=$(HOME)/mpich-nag/bin/mpicc
-#
-#
-BLAS=-lblasnag -L$(HOME)/LIB
-BLACS=-lmpiblacs-nag -L$(HOME)/LIB
-#
-CDEFINES=-DAdd_  -DHave_SLU_ 
-SLUDIR=$(HOME)/SuperLU_3.0
-SLUINC=-I$(SLUDIR) 
-SLU=-lslu_lx_nag -L$(SLUDIR)
-
-AR=ar -cur
-RANLIB=ranlib
-
-TYPEMODS =  typesp$(.mod) typedesc$(.mod) typeprec$(.mod) realloc$(.mod)
-CONSTMODS = tools_const$(.mod)
-BLASMODS  = $(TYPEMODS) f90psblas$(.mod) f90comm$(.mod)
-METHDMODS = f90methd$(.mod)
-TOOLSMODS = $(CONSTMODS) psimod$(.mod) f90tools$(.mod) f90serial$(.mod) string$(.mod)
-PRECMODS  = f90prec$(.mod)
-F90MODS= $(BLASMODS) $(PRECMODS) $(METHDMODS) $(TOOLSMODS) f90sparse$(.mod)
-
-MODS=$(LIBDIR)/tools_const$(.mod) $(LIBDIR)/typesp$(.mod) $(LIBDIR)/realloc$(.mod) \
-  $(LIBDIR)/typedesc$(.mod)  $(LIBDIR)/typeprec$(.mod) $(LIBDIR)/parts.f90 \
-  $(LIBDIR)/f90serial$(.mod) $(LIBDIR)/f90comm$(.mod) $(LIBDIR)/string$(.mod)
-
-
-
-# Under Linux/gmake there is a rule interpreting .mod as Modula source! 
-$(.mod).o:
-	
-.f.o:
-	$(FC) $(FCOPT) $(INCDIRS)  -c $<
-.c.o:
-	$(CC) $(CCOPT) $(INCDIRS) $(CDEFINES) -c $<
-.f$(.mod):
-	$(F90) $(FCOPT) $(INCDIRS) -c $<
-.f90$(.mod):
-	$(F90) $(F90COPT) $(INCDIRS) -c $<
-.f90.o:
-	$(F90) $(F90COPT) $(INCDIRS) -c $<
-
-
-
-
diff --git a/Make.inc.pgf90 b/Make.inc.pgf90
index f008e348..7c4121c3 100644
--- a/Make.inc.pgf90
+++ b/Make.inc.pgf90
@@ -1,6 +1,11 @@
-# Using PGI Fortran compilers
 .mod=.mod
+.fh=.fh
 .SUFFIXES: .f90 $(.mod)
+
+
+#######################  Section 1 #######################
+#  Define your compilers and compiler flags here         #
+##########################################################
 F90=pgf90
 FC=pgf90
 F77=$(FC)
@@ -8,32 +13,59 @@ F90COPT=-fast -g77libs
 FCOPT=-fast -g77libs 
 CC=gcc
 CCOPT=-O2 -g -ggdb -pg
-F90LINK=/usr/local/mpich-pgi/bin/mpif90
-FLINK=/usr/local/mpich-pgi/bin/mpif77
-MPF90=/usr/local/mpich-pgi/bin/mpif90
-MPCC=/usr/local/mpich-pgi/bin/mpicc
-#
-#
-BLAS=-lblas -L$(HOME)/LIB
-BLACS=-lmpiblacspgi -L$(HOME)/LIB
-
-#
-CDEFINES=-DAdd_
+
+#######################  Section 2 #######################
+#  Define your linker and linker flags here              #
+##########################################################
+F90LINK=/usr/local/mpich-pgi/bin/mpif90 
+FLINK=/usr/local/mpich-pgi/mpif77 
+MPF90=/usr/local/mpich-pgi/bin/mpif90 
+MPCC=/usr/local/mpich-pgi/bin/mpicc 
+
+#######################  Section 3 #######################
+#  Specify paths to libraries                            #
+##########################################################
+BLAS=-lblas-pgi -L$(HOME)/LIB
+BLACS=-lmpiblacs-pgi -L$(HOME)/LIB
+
+
+#######################  Section 4 #######################
+#  Other useful tools&defines                            #
+##########################################################
+#SLUDIR=/usr/local/SuperLU_3.0
+#SLU=-lslu_lx_gfort -L$(SLUDIR)
+#SLUDEF=-DHave_SLU_ -I$(SLUDIR)
+
+#UMFDIR=$(HOME)/LIB/Umfpack_gcc41
+#UMF=-lumfpack -lamd -L$(UMFDIR)
+#UMFDEF=-DHave_UMF_ -I$(UMFDIR)
+
+#  Add -DLargeFptr for 64-bit addresses
+CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF)
+
 AR=ar -cur
 RANLIB=ranlib
 
-TYPEMODS =  typesp$(.mod) typedesc$(.mod) typeprec$(.mod) realloc$(.mod)
-CONSTMODS = tools_const$(.mod)
-BLASMODS  = $(TYPEMODS) f90psblas$(.mod)
-METHDMODS = f90methd$(.mod)
-TOOLSMODS = $(CONSTMODS) psimod$(.mod) f90tools$(.mod) 
-PRECMODS  = f90prec$(.mod)
-F90MODS= $(BLASMODS) $(PRECMODS) $(METHDMODS) $(TOOLSMODS) f90sparse$(.mod)
 
-MODS=$(LIBDIR)/tools_const$(.mod) $(LIBDIR)/typesp$(.mod) $(LIBDIR)/realloc$(.mod) \
-  $(LIBDIR)/typedesc$(.mod)  $(LIBDIR)/typeprec$(.mod) $(LIBDIR)/parts.f90
 
+#######################  Section 5 #######################
+#  Do not edit this                                      #
+##########################################################
+LIBDIR = lib
+LIBNAME = libpsblas.a
 
+TYPEMODS =  psb_spmat_type$(.mod) psb_descriptor_type$(.mod) psb_prec_type$(.mod) psb_realloc_mod$(.mod)
+CONSTMODS = psb_const_mod$(.mod)
+BLASMODS  = $(TYPEMODS) psb_psblas_mod$(.mod) psb_comm_mod$(.mod)
+METHDMODS = psb_methd_mod$(.mod)
+TOOLSMODS = $(CONSTMODS) psi_mod$(.mod) psb_tools_mod$(.mod) psb_serial_mod$(.mod)
+PRECMODS  = psb_prec_mod$(.mod)
+ERRORMODS = psb_error_mod$(.mod)
+F90MODS= $(BLASMODS) $(PRECMODS) $(METHDMODS) $(TOOLSMODS) $(ERRORMODS) string$(.mod)
+
+MODS=$(LIBDIR)/psb_const_mod$(.mod) $(LIBDIR)/psb_spmat_type$(.mod) $(LIBDIR)/psb_realloc_mod$(.mod) \
+  $(LIBDIR)/psb_descriptor_type$(.mod)  $(LIBDIR)/psb_prec_type$(.mod) $(LIBDIR)/parts.fh \
+  $(LIBDIR)/psb_serial_mod$(.mod) $(LIBDIR)/psb_comm_mod$(.mod) $(LIBDIR)/psb_error_mod$(.mod)
 
 # Under Linux/gmake there is a rule interpreting .mod as Modula source! 
 $(.mod).o:
@@ -43,12 +75,10 @@ $(.mod).o:
 .c.o:
 	$(CC) $(CCOPT) $(INCDIRS) $(CDEFINES) -c $<
 .f$(.mod):
-	$(F90) $(FCOPT) $(INCDIRS) -c $< 
+	$(F90) $(FCOPT) $(INCDIRS) -c $<
 .f90$(.mod):
 	$(F90) $(F90COPT) $(INCDIRS) -c $<
 .f90.o:
 	$(F90) $(F90COPT) $(INCDIRS) -c $<
 
 
-
-