Skip to content

Commit

Permalink
Move all MPI test files from .f to .F90: they should now be compiled by
Browse files Browse the repository at this point in the history
gfortran instead of f77.

gfortran should be able to handle #ifdef (that f77 can't handle).
  • Loading branch information
fghoussen committed Jul 11, 2022
1 parent 7ecb7f7 commit 8fa2687
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -585,14 +585,14 @@ if (EXAMPLES)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/PARPACK/EXAMPLES/MPI/)

set(pexamples_STAT_SRCS
pcndrv1.f
pdndrv1.f
pdndrv3.f
pdsdrv1.f
psndrv1.f
psndrv3.f
pssdrv1.f
pzndrv1.f)
pcndrv1.F90
pdndrv1.F90
pdndrv3.F90
pdsdrv1.F90
psndrv1.F90
psndrv3.F90
pssdrv1.F90
pzndrv1.F90)

pexamples(pexamples_STAT_SRCS)
endif()
Expand Down Expand Up @@ -652,7 +652,7 @@ add_test(bug_142_gen_tst ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/bug_142_gen)
if(MPI)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/PARPACK/TESTS/MPI)

add_executable(issue46 PARPACK/TESTS/MPI/issue46.f)
add_executable(issue46 PARPACK/TESTS/MPI/issue46.F90)
target_link_libraries(issue46 parpack arpack BLAS::BLAS LAPACK::LAPACK ${EXTRA_LDFLAGS})
if (HAVE_MPI_ICB)
target_compile_definitions(issue46 PRIVATE HAVE_MPI_ICB=1)
Expand Down
16 changes: 8 additions & 8 deletions PARPACK/EXAMPLES/MPI/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ TESTS = $(check_PROGRAMS)
EXTRA_DIST = debug.h stat.h README.CALLING-PARPACK-FROM-C-OR-CPP

# Simple nonsymmetric problem using single precision
psndrv1_SOURCES = psndrv1.f
psndrv3_SOURCES = psndrv3.f
psndrv1_SOURCES = psndrv1.F90
psndrv3_SOURCES = psndrv3.F90

# Simple nonsymmetric problem using double precision
pdndrv1_SOURCES = pdndrv1.f
pdndrv3_SOURCES = pdndrv3.f
pdndrv1_SOURCES = pdndrv1.F90
pdndrv3_SOURCES = pdndrv3.F90

# Simple symmetric problem using single precision
pssdrv1_SOURCES = pssdrv1.f
pssdrv1_SOURCES = pssdrv1.F90

# Simple symmetric problem using double precision
pdsdrv1_SOURCES = pdsdrv1.f
pdsdrv1_SOURCES = pdsdrv1.F90

# Complex problem using single complex
pcndrv1_SOURCES = pcndrv1.f
pcndrv1_SOURCES = pcndrv1.F90

# Complex problem using double complex
pzndrv1_SOURCES = pzndrv1.f
pzndrv1_SOURCES = pzndrv1.F90
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion PARPACK/TESTS/MPI/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ endif

EXTRA_DIST = debug.h stat.h

issue46_SOURCES= issue46.f
issue46_SOURCES= issue46.F90

if ICB
icb_parpack_c_SOURCES = icb_parpack_c.c
Expand Down
File renamed without changes.

0 comments on commit 8fa2687

Please sign in to comment.