From a8ee048f8f7d2c97532cefd19e216629aa539591 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 10 Apr 2017 11:40:50 +0000 Subject: [PATCH 1/4] psblas3: . base/modules/psb_const_mod.F90 prec/psb_c_bjacprec.f90 prec/psb_c_diagprec.f90 prec/psb_c_nullprec.f90 prec/psb_s_bjacprec.f90 prec/psb_s_diagprec.f90 prec/psb_s_nullprec.f90 prec/psb_z_bjacprec.f90 prec/psb_z_diagprec.f90 prec/psb_z_nullprec.f90 Further changes merged from fixprec branch. --- base/modules/psb_const_mod.F90 | 4 ++-- prec/psb_c_bjacprec.f90 | 1 + prec/psb_c_diagprec.f90 | 2 ++ prec/psb_c_nullprec.f90 | 2 ++ prec/psb_s_bjacprec.f90 | 1 + prec/psb_s_diagprec.f90 | 2 ++ prec/psb_s_nullprec.f90 | 2 ++ prec/psb_z_bjacprec.f90 | 1 + prec/psb_z_diagprec.f90 | 2 ++ prec/psb_z_nullprec.f90 | 2 ++ 10 files changed, 17 insertions(+), 2 deletions(-) diff --git a/base/modules/psb_const_mod.F90 b/base/modules/psb_const_mod.F90 index bcf602cc..45b5087a 100644 --- a/base/modules/psb_const_mod.F90 +++ b/base/modules/psb_const_mod.F90 @@ -89,9 +89,9 @@ module psb_const_mod ! ! Version ! - character(len=*), parameter :: psb_version_string_ = "3.4.0" + character(len=*), parameter :: psb_version_string_ = "3.5.0" integer(psb_ipk_), parameter :: psb_version_major_ = 3 - integer(psb_ipk_), parameter :: psb_version_minor_ = 4 + integer(psb_ipk_), parameter :: psb_version_minor_ = 5 integer(psb_ipk_), parameter :: psb_patchlevel_ = 0 ! diff --git a/prec/psb_c_bjacprec.f90 b/prec/psb_c_bjacprec.f90 index ceb60c61..dab99641 100644 --- a/prec/psb_c_bjacprec.f90 +++ b/prec/psb_c_bjacprec.f90 @@ -134,6 +134,7 @@ module psb_c_bjacprec contains subroutine psb_c_bjac_precdescr(prec,iout,root) + use psb_penv_mod use psb_penv_mod use psb_error_mod implicit none diff --git a/prec/psb_c_diagprec.f90 b/prec/psb_c_diagprec.f90 index a8267070..3326ccf1 100644 --- a/prec/psb_c_diagprec.f90 +++ b/prec/psb_c_diagprec.f90 @@ -161,6 +161,8 @@ contains subroutine psb_c_diag_precdescr(prec,iout,root) + use psb_penv_mod + use psb_error_mod use psb_penv_mod use psb_error_mod Implicit None diff --git a/prec/psb_c_nullprec.f90 b/prec/psb_c_nullprec.f90 index 5304bff1..9d6f2508 100644 --- a/prec/psb_c_nullprec.f90 +++ b/prec/psb_c_nullprec.f90 @@ -159,6 +159,8 @@ contains subroutine psb_c_null_precdescr(prec,iout,root) use psb_penv_mod use psb_error_mod + use psb_penv_mod + use psb_error_mod Implicit None diff --git a/prec/psb_s_bjacprec.f90 b/prec/psb_s_bjacprec.f90 index e8ec9b86..cc06ee5b 100644 --- a/prec/psb_s_bjacprec.f90 +++ b/prec/psb_s_bjacprec.f90 @@ -134,6 +134,7 @@ module psb_s_bjacprec contains subroutine psb_s_bjac_precdescr(prec,iout,root) + use psb_penv_mod use psb_penv_mod use psb_error_mod implicit none diff --git a/prec/psb_s_diagprec.f90 b/prec/psb_s_diagprec.f90 index cf7c5991..4b1b6f58 100644 --- a/prec/psb_s_diagprec.f90 +++ b/prec/psb_s_diagprec.f90 @@ -161,6 +161,8 @@ contains subroutine psb_s_diag_precdescr(prec,iout,root) + use psb_penv_mod + use psb_error_mod use psb_penv_mod use psb_error_mod Implicit None diff --git a/prec/psb_s_nullprec.f90 b/prec/psb_s_nullprec.f90 index 8247573d..8ebdf7a4 100644 --- a/prec/psb_s_nullprec.f90 +++ b/prec/psb_s_nullprec.f90 @@ -159,6 +159,8 @@ contains subroutine psb_s_null_precdescr(prec,iout,root) use psb_penv_mod use psb_error_mod + use psb_penv_mod + use psb_error_mod Implicit None diff --git a/prec/psb_z_bjacprec.f90 b/prec/psb_z_bjacprec.f90 index 2c63b002..26196b5c 100644 --- a/prec/psb_z_bjacprec.f90 +++ b/prec/psb_z_bjacprec.f90 @@ -134,6 +134,7 @@ module psb_z_bjacprec contains subroutine psb_z_bjac_precdescr(prec,iout,root) + use psb_penv_mod use psb_penv_mod use psb_error_mod implicit none diff --git a/prec/psb_z_diagprec.f90 b/prec/psb_z_diagprec.f90 index 7ddc168a..65d07651 100644 --- a/prec/psb_z_diagprec.f90 +++ b/prec/psb_z_diagprec.f90 @@ -161,6 +161,8 @@ contains subroutine psb_z_diag_precdescr(prec,iout,root) + use psb_penv_mod + use psb_error_mod use psb_penv_mod use psb_error_mod Implicit None diff --git a/prec/psb_z_nullprec.f90 b/prec/psb_z_nullprec.f90 index d8c4f0ab..9a62b8e7 100644 --- a/prec/psb_z_nullprec.f90 +++ b/prec/psb_z_nullprec.f90 @@ -159,6 +159,8 @@ contains subroutine psb_z_null_precdescr(prec,iout,root) use psb_penv_mod use psb_error_mod + use psb_penv_mod + use psb_error_mod Implicit None From ccb6df31845301126089d6d9bbedd0e35cac4b45 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 10 Apr 2017 11:48:12 +0000 Subject: [PATCH 2/4] psblas3: Changelog --- Changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Changelog b/Changelog index 00de9033..43bf162f 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,13 @@ Changelog. A lot less detailed than usual, at least for past history. +2017/04/09: Remove all remaining .F files, and remove configure checks for + F77. + Define version 3.5.0 +2017/04/08: All PREC methods now invoked through preconditioner object. +2017/04/05: make ISO_C_BINDING and MOVE_ALLOC mandatory prereq. +2017/03/20: Changes for GPU codes: added buffers to MAPs, reduce number of + malloc/free, added new maybe_free_buffers method on vector. +2017/02/12: New stopping criterion, soimplified mat_dist 2017/02/06: Fixes for --enable-long-integers and for RPM build. 2016/07/14: Fix matrix print with renumbering. 2016/06/18: New thresholds for quicksort From 98c2763c860308bc230b1fd0fb821fb1fe53cfcc Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 10 Apr 2017 12:20:51 +0000 Subject: [PATCH 3/4] Summary: Fix comm/internals makefile for MPFC --- base/comm/internals/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/comm/internals/Makefile b/base/comm/internals/Makefile index 3ad38a1c..c6a7155b 100644 --- a/base/comm/internals/Makefile +++ b/base/comm/internals/Makefile @@ -23,7 +23,7 @@ lib: mpfobjs $(FOBJS) $(MPFOBJS) $(FOBJS) $(FBOJS2): $(MODDIR)/psi_mod.o mpfobjs: - (make $(MPFOBJS) F90="$(MPF90)" FC="$(MPF90)" FCOPT="$(F90COPT)") + (make $(MPFOBJS) FC="$(MPFC)" ) clean: /bin/rm -f $(MPFOBJS) $(FOBJS) $(COBJS) $(FOBJS2) $(MPFOBJS2) *$(.mod) From 1c63adb4e35b6d07367ac466d97d433f80aecc87 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 10 Apr 2017 13:31:15 +0000 Subject: [PATCH 4/4] psblas3 changelog update --- Changelog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 43bf162f..522791b1 100644 --- a/Changelog +++ b/Changelog @@ -1,8 +1,7 @@ Changelog. A lot less detailed than usual, at least for past history. 2017/04/09: Remove all remaining .F files, and remove configure checks for - F77. - Define version 3.5.0 + F77. Define version 3.5.0 2017/04/08: All PREC methods now invoked through preconditioner object. 2017/04/05: make ISO_C_BINDING and MOVE_ALLOC mandatory prereq. 2017/03/20: Changes for GPU codes: added buffers to MAPs, reduce number of