diff --git a/CHANGES b/CHANGES index 89cf253f7..a5633f0f1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ arpack-ng - 3.9.0 +[ Tom Payerle ] +* Change the continuation line format for stat.h, debug.h + [ John Doe ] * Avoid calling [c|z]dotc for better portability on macOS diff --git a/CMakeLists.txt b/CMakeLists.txt index d4113ac6f..c7902a472 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -788,12 +788,14 @@ if(ICB) endif() install(FILES debug.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack) +install(FILES debugF90.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack) if(ICB) install(FILES ICB/debug_c.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack) install(FILES ICB/debug_c.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack) endif() install(FILES stat.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack) +install(FILES statF90.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack) if(ICB) install(FILES ICB/stat_c.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack) install(FILES ICB/stat_c.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack) diff --git a/ICB/debug_icb.F90 b/ICB/debug_icb.F90 index 521971655..66321178b 100644 --- a/ICB/debug_icb.F90 +++ b/ICB/debug_icb.F90 @@ -12,7 +12,7 @@ subroutine debug_c(logfil_c, ndigit_c, mgetv0_c, integer(kind=i_int), value, intent(in) :: msaupd_c, msaup2_c, msaitr_c, mseigt_c, msapps_c, msgets_c, mseupd_c integer(kind=i_int), value, intent(in) :: mnaupd_c, mnaup2_c, mnaitr_c, mneigh_c, mnapps_c, mngets_c, mneupd_c integer(kind=i_int), value, intent(in) :: mcaupd_c, mcaup2_c, mcaitr_c, mceigh_c, mcapps_c, mcgets_c, mceupd_c - include 'debug.h' + include 'debugF90.h' logfil = logfil_c ndigit = ndigit_c mgetv0 = mgetv0_c diff --git a/ICB/stat_icb.F90 b/ICB/stat_icb.F90 index 62435f71b..f057b4c09 100644 --- a/ICB/stat_icb.F90 +++ b/ICB/stat_icb.F90 @@ -32,7 +32,7 @@ subroutine stat_c( nopx_c, nbx_c, nrorth_c, nitref_c, nrstrt_c, tnaupd_c, tnaup2_c, tnaitr_c, tneigh_c, tngets_c, tnapps_c, tnconv_c,& tcaupd_c, tcaup2_c, tcaitr_c, tceigh_c, tcgets_c, tcapps_c, tcconv_c,& tmvopx_c, tmvbx_c, tgetv0_c, titref_c, trvec_c - include 'stat.h' + include 'statF90.h' nopx_c = nopx nbx_c = nbx nrorth_c = nrorth diff --git a/Makefile.am b/Makefile.am index f71acd655..0610dea2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 pkgincludedir = $(includedir)/arpack -pkginclude_HEADERS = debug.h stat.h arpackdef.h +pkginclude_HEADERS = debug.h stat.h debugF90.h statF90.h arpackdef.h AM_DISTCHECK_CONFIGURE_FLAGS = if MPI diff --git a/debug.h b/debug.h index c49357d9b..a8821c39a 100644 --- a/debug.h +++ b/debug.h @@ -5,12 +5,12 @@ ! %---------------------------------% ! | See debug.doc for documentation | ! %---------------------------------% - integer logfil, ndigit, mgetv0, & - msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd,& - mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd,& - mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd - common /debug/ & - logfil, ndigit, mgetv0, & - msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd,& - mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd,& - mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd + integer logfil, ndigit, mgetv0, + & msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd, + & mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd, + & mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd + common /debug/ + & logfil, ndigit, mgetv0, + & msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd, + & mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd, + & mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd diff --git a/debugF90.h b/debugF90.h new file mode 100644 index 000000000..c49357d9b --- /dev/null +++ b/debugF90.h @@ -0,0 +1,16 @@ +! +!\SCCS Information: @(#) +! FILE: debug.h SID: 2.3 DATE OF SID: 11/16/95 RELEASE: 2 +! +! %---------------------------------% +! | See debug.doc for documentation | +! %---------------------------------% + integer logfil, ndigit, mgetv0, & + msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd,& + mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd,& + mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd + common /debug/ & + logfil, ndigit, mgetv0, & + msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd,& + mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd,& + mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd diff --git a/stat.h b/stat.h index 586b6c644..017400d5c 100644 --- a/stat.h +++ b/stat.h @@ -9,13 +9,13 @@ save t0, t1, t2, t3, t4, t5 ! integer nopx, nbx, nrorth, nitref, nrstrt - real tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv,& - tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv,& - tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv,& - tmvopx, tmvbx, tgetv0, titref, trvec - common /timing/ & - nopx, nbx, nrorth, nitref, nrstrt, & - tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv,& - tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv,& - tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv,& - tmvopx, tmvbx, tgetv0, titref, trvec + real tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv, + & tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv, + & tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv, + & tmvopx, tmvbx, tgetv0, titref, trvec + common /timing/ + & nopx, nbx, nrorth, nitref, nrstrt, + & tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv, + & tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv, + & tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv, + & tmvopx, tmvbx, tgetv0, titref, trvec diff --git a/statF90.h b/statF90.h new file mode 100644 index 000000000..586b6c644 --- /dev/null +++ b/statF90.h @@ -0,0 +1,21 @@ +! %--------------------------------% +! | See stat.doc for documentation | +! %--------------------------------% +! +!\SCCS Information: @(#) +! FILE: stat.h SID: 2.2 DATE OF SID: 11/16/95 RELEASE: 2 +! + real t0, t1, t2, t3, t4, t5 + save t0, t1, t2, t3, t4, t5 +! + integer nopx, nbx, nrorth, nitref, nrstrt + real tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv,& + tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv,& + tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv,& + tmvopx, tmvbx, tgetv0, titref, trvec + common /timing/ & + nopx, nbx, nrorth, nitref, nrstrt, & + tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv,& + tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv,& + tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv,& + tmvopx, tmvbx, tgetv0, titref, trvec