Skip to content

Commit 1f4c1e0

Browse files
payerlepayerle
authored
Change the continuation line format for stat.h, debug.h (#339)
Change the continuation line format for stat.h, debug.h AOCC flang compiler is complaining about the continuation lines in these two files. It does not complain about similar continuation lines in files (e.g. SRC/icbacn.F90), so I believe this is due to flang setting the Fortran dialect to something like F77 for most of the compilations, which cause problems with these *.h files. I cannot find a way to force flang Fortran dialect to accept the & at end of line continuation marker, so this patch changes the continuation lines in these two files (stat.h, debug.h) to use continuation marker in column 6. This should fix #300
1 parent a5155ee commit 1f4c1e0

File tree

9 files changed

+64
-22
lines changed

9 files changed

+64
-22
lines changed

‎CHANGES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
arpack-ng - 3.9.0
22

3+
[ Tom Payerle ]
4+
* Change the continuation line format for stat.h, debug.h
5+
36
[ John Doe ]
47
* Avoid calling [c|z]dotc for better portability on macOS
58

‎CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,12 +788,14 @@ if(ICB)
788788
endif()
789789

790790
install(FILES debug.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack)
791+
install(FILES debugF90.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack)
791792
if(ICB)
792793
install(FILES ICB/debug_c.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack)
793794
install(FILES ICB/debug_c.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack)
794795
endif()
795796

796797
install(FILES stat.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack)
798+
install(FILES statF90.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack)
797799
if(ICB)
798800
install(FILES ICB/stat_c.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack)
799801
install(FILES ICB/stat_c.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/arpack)

‎ICB/debug_icb.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ subroutine debug_c(logfil_c, ndigit_c, mgetv0_c,
1212
integer(kind=i_int), value, intent(in) :: msaupd_c, msaup2_c, msaitr_c, mseigt_c, msapps_c, msgets_c, mseupd_c
1313
integer(kind=i_int), value, intent(in) :: mnaupd_c, mnaup2_c, mnaitr_c, mneigh_c, mnapps_c, mngets_c, mneupd_c
1414
integer(kind=i_int), value, intent(in) :: mcaupd_c, mcaup2_c, mcaitr_c, mceigh_c, mcapps_c, mcgets_c, mceupd_c
15-
include 'debug.h'
15+
include 'debugF90.h'
1616
logfil = logfil_c
1717
ndigit = ndigit_c
1818
mgetv0 = mgetv0_c

‎ICB/stat_icb.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ subroutine stat_c( nopx_c, nbx_c, nrorth_c, nitref_c, nrstrt_c,
3232
tnaupd_c, tnaup2_c, tnaitr_c, tneigh_c, tngets_c, tnapps_c, tnconv_c,&
3333
tcaupd_c, tcaup2_c, tcaitr_c, tceigh_c, tcgets_c, tcapps_c, tcconv_c,&
3434
tmvopx_c, tmvbx_c, tgetv0_c, titref_c, trvec_c
35-
include 'stat.h'
35+
include 'statF90.h'
3636
nopx_c = nopx
3737
nbx_c = nbx
3838
nrorth_c = nrorth

‎Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ACLOCAL_AMFLAGS = -I m4
22

33
pkgincludedir = $(includedir)/arpack
4-
pkginclude_HEADERS = debug.h stat.h arpackdef.h
4+
pkginclude_HEADERS = debug.h stat.h debugF90.h statF90.h arpackdef.h
55

66
AM_DISTCHECK_CONFIGURE_FLAGS =
77
if MPI

‎debug.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
! %---------------------------------%
66
! | See debug.doc for documentation |
77
! %---------------------------------%
8-
integer logfil, ndigit, mgetv0, &
9-
msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd,&
10-
mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd,&
11-
mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd
12-
common /debug/ &
13-
logfil, ndigit, mgetv0, &
14-
msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd,&
15-
mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd,&
16-
mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd
8+
integer logfil, ndigit, mgetv0,
9+
& msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd,
10+
& mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd,
11+
& mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd
12+
common /debug/
13+
& logfil, ndigit, mgetv0,
14+
& msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd,
15+
& mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd,
16+
& mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd

‎debugF90.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
!
2+
!\SCCS Information: @(#)
3+
! FILE: debug.h SID: 2.3 DATE OF SID: 11/16/95 RELEASE: 2
4+
!
5+
! %---------------------------------%
6+
! | See debug.doc for documentation |
7+
! %---------------------------------%
8+
integer logfil, ndigit, mgetv0, &
9+
msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd,&
10+
mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd,&
11+
mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd
12+
common /debug/ &
13+
logfil, ndigit, mgetv0, &
14+
msaupd, msaup2, msaitr, mseigt, msapps, msgets, mseupd,&
15+
mnaupd, mnaup2, mnaitr, mneigh, mnapps, mngets, mneupd,&
16+
mcaupd, mcaup2, mcaitr, mceigh, mcapps, mcgets, mceupd

‎stat.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
save t0, t1, t2, t3, t4, t5
1010
!
1111
integer nopx, nbx, nrorth, nitref, nrstrt
12-
real tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv,&
13-
tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv,&
14-
tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv,&
15-
tmvopx, tmvbx, tgetv0, titref, trvec
16-
common /timing/ &
17-
nopx, nbx, nrorth, nitref, nrstrt, &
18-
tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv,&
19-
tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv,&
20-
tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv,&
21-
tmvopx, tmvbx, tgetv0, titref, trvec
12+
real tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv,
13+
& tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv,
14+
& tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv,
15+
& tmvopx, tmvbx, tgetv0, titref, trvec
16+
common /timing/
17+
& nopx, nbx, nrorth, nitref, nrstrt,
18+
& tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv,
19+
& tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv,
20+
& tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv,
21+
& tmvopx, tmvbx, tgetv0, titref, trvec

‎statF90.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
! %--------------------------------%
2+
! | See stat.doc for documentation |
3+
! %--------------------------------%
4+
!
5+
!\SCCS Information: @(#)
6+
! FILE: stat.h SID: 2.2 DATE OF SID: 11/16/95 RELEASE: 2
7+
!
8+
real t0, t1, t2, t3, t4, t5
9+
save t0, t1, t2, t3, t4, t5
10+
!
11+
integer nopx, nbx, nrorth, nitref, nrstrt
12+
real tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv,&
13+
tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv,&
14+
tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv,&
15+
tmvopx, tmvbx, tgetv0, titref, trvec
16+
common /timing/ &
17+
nopx, nbx, nrorth, nitref, nrstrt, &
18+
tsaupd, tsaup2, tsaitr, tseigt, tsgets, tsapps, tsconv,&
19+
tnaupd, tnaup2, tnaitr, tneigh, tngets, tnapps, tnconv,&
20+
tcaupd, tcaup2, tcaitr, tceigh, tcgets, tcapps, tcconv,&
21+
tmvopx, tmvbx, tgetv0, titref, trvec

0 commit comments

Comments
 (0)