Commit 2e7bfcc5 authored by Ron Rahaman's avatar Ron Rahaman
Browse files

Nek config script appears to work for serial+parallel

parent 71342e14
......@@ -22,6 +22,9 @@ nek_debug_flags = @nek_debug_flags@
nek_opt_flags = @nek_opt_flags@
nek_real8_flags = @nek_real8_flags@
# == Switches ==================================================================
nek_ifmpi = @nek_ifmpi@
# == FORTRAN objects ===========================================================
nek_core_f_obj = drive.o drive1.o drive2.o \
plan4.o bdry.o coef.o conduct.o connect1.o connect2.o \
......@@ -87,9 +90,13 @@ $(jl_core_obj) $(jl_interp_obj) $(jl_cgs_obj): $(jl_prefix)%.o: %.c
$(CC) -c $(CPPFLAGS) $(CFLAGS) $(nek_opt_flags) $(nek_debug_flags) $< -o $@
mpiheader:
ifneq ($(findstring mpi_dummy.o, $(nek_mpi_obj)),)
cp @srcdir@/Nek5000/core/mpi_dummy.h @srcdir@/Nek5000/core/mpif.h
else
rm -rf @srcdir@/Nek5000/core/mpif.h
endif
clean:
rf -rf $(f_obj) $(c_obj) @srcdir@/Nek5000/core/mpif.h
rm -rf $(f_obj) $(c_obj) @srcdir@/Nek5000/core/mpif.h
.PHONY: mpiheader clean
......@@ -163,7 +163,7 @@ if test "$ac_cv_sizeof_int_p" -eq 8; then
fi
# See if 'underscore' is in mangling scheme.
if echo "foobar"| tr -d @<:@:blank:@:>@ | grep '\<underscore\>' > /dev/null ; then
if echo "$ac_cv_f77_mangling"| tr -d @<:@:blank:@:>@ | grep '\<underscore\>' > /dev/null ; then
AC_DEFINE([UNDERSCORE], 1, [If Fortran name-mangling scheme adds an underscore])
fi
......@@ -174,6 +174,7 @@ if test "x$mpi" = "xyes"; then
else
nek_mpi_obj="comm_mpi.o mpi_dummy.o"
fi
AC_SUBST([nek_mpi], [$mpi])
AC_SUBST([nek_mpi_obj])
# Always define jl_prefix
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment