Skip to content

Replace FFTW with fortnum fft_c2c and drop the FFTW dependency (4/5) #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krystophny wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Replace FFTW with fortnum fft_c2c and drop the FFTW dependency (4/5) #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dae6879
Replace GSL Bessel I_n with fortnum bessel_in_array
krystophny Jun 14, 2026
8f3e113
Fetch fortnum over https so CI can clone the public repo
krystophny Jun 14, 2026
54232cd
Pin fortnum to the v0.1.0 release tag
krystophny Jun 14, 2026
5925544
Replace GSL quadrature and Levin sum in hyper1F1 with fortnum
krystophny Jun 14, 2026
b9da627
Replace GSL fixed-rule quadrature and error handler with fortnum
krystophny Jun 14, 2026
83ac593
Replace FFTW with fortnum fft_c2c and drop the FFTW dependency
krystophny Jun 14, 2026
317d312
Re-pin fortnum to current main after upstream history rewrite
krystophny Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,17 @@ endif()
include(Util)
find_or_fetch(libneo)

### fortnum: numerical core replacing the former GSL routines. libneo may pull
### fortnum in transitively, so guard against declaring the target twice.
include(FetchContent)
if(NOT TARGET fortnum)
FetchContent_Declare(fortnum
GIT_REPOSITORY https://github.com/lazy-fortran/fortnum.git
GIT_TAG 92de6e949a772cfffc73bb5295fe5e2b056b9c18
)
FetchContent_MakeAvailable(fortnum)
endif()

### Project source files
# SuiteSparse
set(SUITESPARSE_SRC_FILES
Expand All @@ -117,7 +128,6 @@ set_source_files_properties(src/external/umf4_f77zwrapper.c PROPERTIES COMPILE_F
set(COMMON_FORTRAN_SRC_FILES
src/external/netlib_mod.f90
src/external/d1mach.f
src/fftw3.f90
src/field_line_integration_for_SYNCH.f90
src/magdata_in_symfluxcoord.f90
src/points_2d.f90
Expand Down Expand Up @@ -152,7 +162,7 @@ if(WITH_MFEM)
)
endif()
set_source_files_properties(src/mephit_run.c ${MEPHIT_C_SRC_FILES} ${MEPHIT_CPP_SRC_FILES}
PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DREAL=double -I${TRIANGLE_INCLUDE_DIR} -I${SUITESPARSE_INCLUDE_DIRS} -L${TRIANGLE_LIB_DIR}")
PROPERTIES COMPILE_FLAGS "${CMAKE_C_FLAGS} -DREAL=double -I${TRIANGLE_INCLUDE_DIR} -I${SUITESPARSE_INCLUDE_DIRS} -I${fortnum_SOURCE_DIR}/include -L${TRIANGLE_LIB_DIR}")


### Define library
Expand All @@ -176,9 +186,9 @@ set(MEPHIT_LIBS
hdf5::hdf5_fortran
hdf5::hdf5_hl_fortran
GSL::gsl
fortnum
BLAS::BLAS
LAPACK::LAPACK
${FFTW_LIBRARIES}
${triangle_lib}
LIBNEO::magfie
LIBNEO::neo
Expand Down
Loading
Loading