Merged changes from svn dev version.

This commit is contained in:
Salvatore Filippone
2017-10-02 12:04:14 +01:00
parent 13d6f8c8a7
commit bbba6a670e
47 changed files with 814 additions and 138 deletions
+2 -1
View File
@@ -1,5 +1,6 @@
BASEDIR=../..
INCDIR=$(BASEDIR)/include/
MODDIR=$(INSTALLDIR)/modules/
include $(INCDIR)/Make.inc.psblas
#
# Libraries used
@@ -8,7 +9,7 @@ LIBDIR=$(BASEDIR)/lib/
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
LDLIBS=$(PSBLDLIBS)
FINCLUDES=$(FMFLAG)$(INCDIR) $(FMFLAG).
FINCLUDES=$(FMFLAG)$(MODDIR) $(FMFLAG).
ZH2MOBJS=zhb2mm.o
DH2MOBJS=dhb2mm.o