Skip to content

Commit 1053e39

Browse files
committed
Seems to work
1 parent f6d82fd commit 1053e39

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

meson.build

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if meson.get_compiler('fortran').get_id() == 'gcc'
66
# Allow argument mismatch, otherwise (newer, probably >= 10) gfortran throws
77
# Error: Type mismatch in argument ‘ifac’ at (1); passed REAL(8) to INTEGER(4)
88
add_global_arguments('-fallow-argument-mismatch',
9-
language: ['fortran'])
9+
language: ['fortran'])
1010
endif
1111

1212
py = import('python')
@@ -17,10 +17,10 @@ f2py_module_c = f'@[email protected]'
1717
f2py_wrapper_f = f'@[email protected]'
1818
f2py_dep = custom_target(
1919
'f2py wrappers',
20-
input: ['src/fftlog.pyf', 'src/fftlog.f'],
20+
input: 'src/fftlog.pyf',
2121
output: [f2py_module_c, f2py_wrapper_f],
2222
command: [py3, '-m', 'numpy.f2py', '@INPUT@',
23-
'--build-dir', '@OUTDIR@', '-m', '_fftlog'],
23+
'--build-dir', '@OUTDIR@', ],
2424
)
2525

2626
incdir_numpy = run_command(py3,
@@ -40,15 +40,16 @@ py3.extension_module('_fftlog',
4040
'src/drfftb.f',
4141
'src/drfftf.f',
4242
'src/drffti.f',
43-
'src/fftlog.f'],
43+
'src/fftlog.f',
44+
],
4445
link_language: 'fortran',
4546
include_directories: inc_np,
4647
install : true,
4748
subdir: 'fftlog',
4849
)
4950

5051
py3.install_sources([
51-
'src/__init__.py',
52+
'src/__init__.py',
5253
],
5354
pure: false,
5455
subdir: 'fftlog',

src/fftlog.pyf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ python module _fftlog ! in
1919
real*8 intent(in) :: dlnr
2020
real*8 optional, intent(in, out) :: kr=1
2121
integer optional, intent(in) :: kropt=1
22-
real*8 dimension(2*n+3*(n/2)+19), intent(hide, out) :: wsave
23-
logical intent(hide, out) :: ok
22+
real*8 dimension(2*n+3*(n/2)+19), intent(out) :: wsave
23+
logical intent(out) :: ok
2424
end subroutine fhti
2525
subroutine fftl(n,a,rk,dir,wsave) ! in :fftlog:src/fftlog.f
2626
integer, optional, intent(hide), depend(a) :: n=len(a)

0 commit comments

Comments
 (0)