diff --git a/run_with_mpi_wrappers.sh b/run_with_mpi_wrappers.sh index f53ce73..8f02cdc 100755 --- a/run_with_mpi_wrappers.sh +++ b/run_with_mpi_wrappers.sh @@ -32,8 +32,8 @@ echo -e "${YELLOW}Using C compiler: ${RESET}${GREEN}$CC${RESET}" echo -e "${YELLOW}Using Fortran compiler: ${RESET}${GREEN}$FC${RESET}" echo "" -echo -e "${BLUE}Compiling src/mpi_wrapper.c with $CC...${RESET}" -$CC -I$CONDA_PREFIX/include -c src/mpi_wrapper.c +echo -e "${BLUE}Compiling src/mpi_constants.c with $CC...${RESET}" +$CC -I$CONDA_PREFIX/include -c src/mpi_constants.c echo -e "${BLUE}Compiling src/mpi_c_bindings.f90 with $FC...${RESET}" $FC -c src/mpi_c_bindings.f90 @@ -45,7 +45,7 @@ echo -e "${BLUE}Compiling $TEST_FILE with $FC...${RESET}" $FC -c "$TEST_FILE" echo -e "${CYAN}Linking objects to create executable: ${BOLD}${EXECUTABLE}${RESET}" -$FC mpi_wrapper.o mpi_c_bindings.o mpi.o "$TEST_OBJ" -o "$EXECUTABLE" -L$CONDA_PREFIX/lib -lmpi -Wl,-rpath,$CONDA_PREFIX/lib +$FC mpi_constants.o mpi_c_bindings.o mpi.o "$TEST_OBJ" -o "$EXECUTABLE" -L$CONDA_PREFIX/lib -lmpi -Wl,-rpath,$CONDA_PREFIX/lib echo -e "${BOLD}${GREEN}Running:${RESET} ${YELLOW}mpiexec $MPI_ARGS ./$EXECUTABLE${RESET}" mpiexec $MPI_ARGS ./"$EXECUTABLE" diff --git a/src/mpi_wrapper.c b/src/mpi_constants.c similarity index 100% rename from src/mpi_wrapper.c rename to src/mpi_constants.c diff --git a/tests/pot3d/build_and_run_gfortran.sh b/tests/pot3d/build_and_run_gfortran.sh index 34871f4..92c8411 100755 --- a/tests/pot3d/build_and_run_gfortran.sh +++ b/tests/pot3d/build_and_run_gfortran.sh @@ -7,12 +7,12 @@ else fi cd src -$CC -I$CONDA_PREFIX/include -c ../../../src/mpi_wrapper.c +$CC -I$CONDA_PREFIX/include -c ../../../src/mpi_constants.c $FC -c ../../../src/mpi_c_bindings.f90 $FC -c ../../../src/mpi.f90 $FC -c psi_io.f90 $FC -c -cpp pot3d.F90 -$FC mpi_wrapper.o mpi_c_bindings.o mpi.o psi_io.o pot3d.o -o pot3d -L$CONDA_PREFIX/lib -lmpi -Wl,-rpath,$CONDA_PREFIX/lib +$FC mpi_constants.o mpi_c_bindings.o mpi.o psi_io.o pot3d.o -o pot3d -L$CONDA_PREFIX/lib -lmpi -Wl,-rpath,$CONDA_PREFIX/lib cp pot3d ../bin/ cd .. diff --git a/tests/pot3d/build_and_run_lfortran.sh b/tests/pot3d/build_and_run_lfortran.sh index 48acaab..dd29124 100755 --- a/tests/pot3d/build_and_run_lfortran.sh +++ b/tests/pot3d/build_and_run_lfortran.sh @@ -7,12 +7,12 @@ else fi cd src -$CC -I$CONDA_PREFIX/include -c ../../../src/mpi_wrapper.c +$CC -I$CONDA_PREFIX/include -c ../../../src/mpi_constants.c $FC -c ../../../src/mpi_c_bindings.f90 $FC -c ../../../src/mpi.f90 $FC -c psi_io.f90 --no-style-warnings --no-warnings $FC -c --cpp --implicit-interface pot3d.F90 --no-style-warnings --no-warnings -$FC mpi_wrapper.o mpi_c_bindings.o mpi.o psi_io.o pot3d.o -o pot3d -L$CONDA_PREFIX/lib -lmpi -Wl,-rpath,$CONDA_PREFIX/lib +$FC mpi_constants.o mpi_c_bindings.o mpi.o psi_io.o pot3d.o -o pot3d -L$CONDA_PREFIX/lib -lmpi -Wl,-rpath,$CONDA_PREFIX/lib cp pot3d ../bin/ cd .. diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 7e7feec..1e8f4ea 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -75,7 +75,7 @@ else fi if [ $USE_WRAPPERS -eq 1 ]; then - $CC -I"$CONDA_PREFIX/include" -c ../src/mpi_wrapper.c + $CC -I"$CONDA_PREFIX/include" -c ../src/mpi_constants.c $FC $FC_FLAGS -c ../src/mpi_c_bindings.f90 $FC $FC_FLAGS -c ../src/mpi.f90 fi @@ -94,7 +94,7 @@ for file in "${TEST_FILES[@]}"; do $FC -c "$file" if [ $USE_WRAPPERS -eq 1 ]; then - $FC mpi_wrapper.o mpi_c_bindings.o mpi.o "$filename.o" \ + $FC mpi_constants.o mpi_c_bindings.o mpi.o "$filename.o" \ -o "$filename" -L"$CONDA_PREFIX/lib" -lmpi -Wl,-rpath,"$CONDA_PREFIX/lib" else $FC "$filename.o" -o "$filename"