diff --git a/base/internals/psi_desc_index.F90 b/base/internals/psi_desc_index.F90 index fac62937..25442aeb 100644 --- a/base/internals/psi_desc_index.F90 +++ b/base/internals/psi_desc_index.F90 @@ -133,7 +133,7 @@ subroutine psi_desc_index(desc,index_in,dep_list,& nrcv = iszs if ((iszs /= idxs).or.(iszr /= idxr)) then - write(0,*) 'strange results???', iszs,idxs,iszr,idxr + write(0,*) 'strange results?', iszs,idxs,iszr,idxr end if if (debug) then write(0,*) me,'computed sizes ',iszr,iszs diff --git a/base/tools/psb_dcdovr.F90 b/base/tools/psb_dcdovr.F90 index b6d542e2..35741f82 100644 --- a/base/tools/psb_dcdovr.F90 +++ b/base/tools/psb_dcdovr.F90 @@ -610,7 +610,7 @@ Subroutine psb_dcdovr(a,desc_a,novr,desc_ov,info, extype) if (debug) write(0,*) me,' CDOVRBLD: Added into t_halo_in from recv',& &proc_id,n_col,idx else if (desc_ov%glob_to_loc(idx) < 0) Then - if (debug) write(0,*) me,'Wrong input to cdovrbld??',& + if (debug) write(0,*) me,'Wrong input to cdovrbld?',& &idx,desc_ov%glob_to_loc(idx) End If End Do diff --git a/base/tools/psb_zcdovr.F90 b/base/tools/psb_zcdovr.F90 index 82a65537..d692878e 100644 --- a/base/tools/psb_zcdovr.F90 +++ b/base/tools/psb_zcdovr.F90 @@ -608,7 +608,7 @@ Subroutine psb_zcdovr(a,desc_a,novr,desc_ov,info, extype) if (debug) write(0,*) me,' CDOVRBLD: Added into t_halo_in from recv',& &proc_id,n_col,idx else if (desc_ov%glob_to_loc(idx) < 0) Then - if (debug) write(0,*) me,'Wrong input to cdovrbld??',& + if (debug) write(0,*) me,'Wrong input to cdovrbld?',& &idx,desc_ov%glob_to_loc(idx) End If End Do diff --git a/test/fileread/Makefile b/test/fileread/Makefile index f36dd3ba..2156f752 100644 --- a/test/fileread/Makefile +++ b/test/fileread/Makefile @@ -1,36 +1,36 @@ -include ../../Make.inc -# -# Libraries used -# -LIBDIR=../../lib/ -PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base - -FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). - -DFOBJS=getp.o df_sample.o -ZFOBJS=getp.o zf_sample.o - -EXEDIR=./runs - -all: df_sample zf_sample - - -df_sample: $(DFOBJS) - $(F90LINK) $(DFOBJS) -o df_sample $(PSBLAS_LIB) $(LDLIBS) - /bin/mv df_sample $(EXEDIR) -zf_sample: $(ZFOBJS) - $(F90LINK) $(ZFOBJS) -o zf_sample $(PSBLAS_LIB) $(LDLIBS) - /bin/mv zf_sample $(EXEDIR) - -.f90.o: - $(MPF90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $< - -clean: - /bin/rm -f $(DFOBJS) $(ZFOBJS) \ - *$(.mod) $(EXEDIR)/df_sample $(EXEDIR)/zf_sample - -lib: - (cd ../../; make library) -verycleanlib: - (cd ../../; make veryclean) - +include ../../Make.inc +# +# Libraries used +# +LIBDIR=../../lib/ +PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base + +FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). + +DFOBJS=getp.o df_sample.o +ZFOBJS=getp.o zf_sample.o + +EXEDIR=./runs + +all: df_sample zf_sample + + +df_sample: $(DFOBJS) + $(F90LINK) $(DFOBJS) -o df_sample $(PSBLAS_LIB) $(LDLIBS) + /bin/mv df_sample $(EXEDIR) +zf_sample: $(ZFOBJS) + $(F90LINK) $(ZFOBJS) -o zf_sample $(PSBLAS_LIB) $(LDLIBS) + /bin/mv zf_sample $(EXEDIR) + +.f90.o: + $(MPF90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $< + +clean: + /bin/rm -f $(DFOBJS) $(ZFOBJS) \ + *$(.mod) $(EXEDIR)/df_sample $(EXEDIR)/zf_sample + +lib: + (cd ../../; make library) +verycleanlib: + (cd ../../; make veryclean) + diff --git a/test/util/Makefile b/test/util/Makefile index 9e766647..912560aa 100644 --- a/test/util/Makefile +++ b/test/util/Makefile @@ -1,42 +1,42 @@ -include ../../Make.inc -# -# Libraries used -# -LIBDIR=../../lib/ -PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_base - -# -# We are using the public domain tool METIS from U. Minnesota. To get it -# check URL http://www.cs.umn.edu:~karypis -# -FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). - -ZH2MOBJS=zhb2mm.o -DH2MOBJS=dhb2mm.o -DM2HOBJS=dmm2hb.o -ZM2HOBJS=zmm2hb.o -MMHBOBJS=$(ZH2MOBJS) $(DH2MOBJS) $(DM2HOBJS) $(ZM2HOBJS) - - -all: dhb2mm zhb2mm dmm2hb zmm2hb - -dhb2mm: $(DH2MOBJS) - $(MPF90) -o dhb2mm $(DH2MOBJS) $(PSBLAS_LIB) $(LDLIBS) -dmm2hb: $(DM2HOBJS) - $(MPF90) -o dmm2hb $(DM2HOBJS) $(PSBLAS_LIB) $(LDLIBS) -zhb2mm: $(ZH2MOBJS) - $(MPF90) -o zhb2mm $(ZH2MOBJS) $(PSBLAS_LIB) $(LDLIBS) -zmm2hb: $(ZM2HOBJS) - $(MPF90) -o zmm2hb $(ZM2HOBJS) $(PSBLAS_LIB) $(LDLIBS) - -.f90.o: - $(MPF90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $< - -clean: - /bin/rm -f $(MMHBOBJS) dhb2mm zhb2mm dmm2hb zmm2hb - -lib: - (cd ../../; make library) -verycleanlib: - (cd ../../; make veryclean) - +include ../../Make.inc +# +# Libraries used +# +LIBDIR=../../lib/ +PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_base + +# +# We are using the public domain tool METIS from U. Minnesota. To get it +# check URL http://www.cs.umn.edu:~karypis +# +FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG). + +ZH2MOBJS=zhb2mm.o +DH2MOBJS=dhb2mm.o +DM2HOBJS=dmm2hb.o +ZM2HOBJS=zmm2hb.o +MMHBOBJS=$(ZH2MOBJS) $(DH2MOBJS) $(DM2HOBJS) $(ZM2HOBJS) + + +all: dhb2mm zhb2mm dmm2hb zmm2hb + +dhb2mm: $(DH2MOBJS) + $(MPF90) -o dhb2mm $(DH2MOBJS) $(PSBLAS_LIB) $(LDLIBS) +dmm2hb: $(DM2HOBJS) + $(MPF90) -o dmm2hb $(DM2HOBJS) $(PSBLAS_LIB) $(LDLIBS) +zhb2mm: $(ZH2MOBJS) + $(MPF90) -o zhb2mm $(ZH2MOBJS) $(PSBLAS_LIB) $(LDLIBS) +zmm2hb: $(ZM2HOBJS) + $(MPF90) -o zmm2hb $(ZM2HOBJS) $(PSBLAS_LIB) $(LDLIBS) + +.f90.o: + $(MPF90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $< + +clean: + /bin/rm -f $(MMHBOBJS) dhb2mm zhb2mm dmm2hb zmm2hb + +lib: + (cd ../../; make library) +verycleanlib: + (cd ../../; make veryclean) +