From c1425149cf7356bc3260d2eb5086e25ab0686a61 Mon Sep 17 00:00:00 2001 From: Randy McDermott Date: Wed, 30 Oct 2024 15:11:15 -0400 Subject: [PATCH] Build: remove script to set INTEL_IFORT by argument, simplifies build scripts --- Build/Scripts/build_thirdparty_libs.sh | 6 ------ Build/Scripts/set_intel_compiler.sh | 16 ---------------- Build/impi_intel_linux/make_fds.sh | 3 +-- Build/impi_intel_linux_db/make_fds.sh | 3 +-- Build/impi_intel_linux_dv/make_fds.sh | 3 +-- Build/impi_intel_linux_openmp/make_fds.sh | 3 +-- Build/impi_intel_linux_openmp_db/make_fds.sh | 3 +-- Build/impi_intel_linux_openmp_dv/make_fds.sh | 3 +-- 8 files changed, 6 insertions(+), 34 deletions(-) delete mode 100755 Build/Scripts/set_intel_compiler.sh diff --git a/Build/Scripts/build_thirdparty_libs.sh b/Build/Scripts/build_thirdparty_libs.sh index a5f3f78c949..a279dddcdb4 100755 --- a/Build/Scripts/build_thirdparty_libs.sh +++ b/Build/Scripts/build_thirdparty_libs.sh @@ -55,9 +55,3 @@ source ../Scripts/HYPRE/build_hypre.sh confmake.sh $clean_hypre ## build sundials source ../Scripts/SUNDIALS/build_sundials.sh confmake.sh $clean_sundials - -# Use ARG and the options -#echo "ARG is: $ARG" -if [ "$SOURCE_INTEL_IFORT" -eq 1 ]; then - source ../Scripts/set_intel_compiler.sh $ARG -fi diff --git a/Build/Scripts/set_intel_compiler.sh b/Build/Scripts/set_intel_compiler.sh deleted file mode 100755 index 38ab4a603e5..00000000000 --- a/Build/Scripts/set_intel_compiler.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -ARG=$1 - -if [ "$ARG" == "" ]; then -# fortran type not specified on command line -# use INTEL_IFORT defined in .bashrc if it exists or -# ifort if it does not exist - if [ "$INTEL_IFORT" == "" ]; then - export INTEL_IFORT=ifort - fi -else -# fortran type was specified on command line -# use it even if INTEL_IFORT was defined in .bashrc -# ifort if it does not - export INTEL_IFORT=$ARG -fi diff --git a/Build/impi_intel_linux/make_fds.sh b/Build/impi_intel_linux/make_fds.sh index 85cb4e002a8..8013c473584 100755 --- a/Build/impi_intel_linux/make_fds.sh +++ b/Build/impi_intel_linux/make_fds.sh @@ -5,9 +5,8 @@ target=${dir##*/} # Compile third-party libraries export FDS_BUILD_TARGET=$target -export SOURCE_INTEL_IFORT=1 source ../Scripts/build_thirdparty_libs.sh "$@" # Build fds -echo Building $target with Intel MPI and $INTEL_IFORT +echo Building $target make -j4 VPATH="../../Source" -f ../makefile $target diff --git a/Build/impi_intel_linux_db/make_fds.sh b/Build/impi_intel_linux_db/make_fds.sh index 85cb4e002a8..8013c473584 100755 --- a/Build/impi_intel_linux_db/make_fds.sh +++ b/Build/impi_intel_linux_db/make_fds.sh @@ -5,9 +5,8 @@ target=${dir##*/} # Compile third-party libraries export FDS_BUILD_TARGET=$target -export SOURCE_INTEL_IFORT=1 source ../Scripts/build_thirdparty_libs.sh "$@" # Build fds -echo Building $target with Intel MPI and $INTEL_IFORT +echo Building $target make -j4 VPATH="../../Source" -f ../makefile $target diff --git a/Build/impi_intel_linux_dv/make_fds.sh b/Build/impi_intel_linux_dv/make_fds.sh index 85cb4e002a8..8013c473584 100755 --- a/Build/impi_intel_linux_dv/make_fds.sh +++ b/Build/impi_intel_linux_dv/make_fds.sh @@ -5,9 +5,8 @@ target=${dir##*/} # Compile third-party libraries export FDS_BUILD_TARGET=$target -export SOURCE_INTEL_IFORT=1 source ../Scripts/build_thirdparty_libs.sh "$@" # Build fds -echo Building $target with Intel MPI and $INTEL_IFORT +echo Building $target make -j4 VPATH="../../Source" -f ../makefile $target diff --git a/Build/impi_intel_linux_openmp/make_fds.sh b/Build/impi_intel_linux_openmp/make_fds.sh index 85cb4e002a8..8013c473584 100755 --- a/Build/impi_intel_linux_openmp/make_fds.sh +++ b/Build/impi_intel_linux_openmp/make_fds.sh @@ -5,9 +5,8 @@ target=${dir##*/} # Compile third-party libraries export FDS_BUILD_TARGET=$target -export SOURCE_INTEL_IFORT=1 source ../Scripts/build_thirdparty_libs.sh "$@" # Build fds -echo Building $target with Intel MPI and $INTEL_IFORT +echo Building $target make -j4 VPATH="../../Source" -f ../makefile $target diff --git a/Build/impi_intel_linux_openmp_db/make_fds.sh b/Build/impi_intel_linux_openmp_db/make_fds.sh index 02899312b4c..4ae4f412a5f 100755 --- a/Build/impi_intel_linux_openmp_db/make_fds.sh +++ b/Build/impi_intel_linux_openmp_db/make_fds.sh @@ -5,10 +5,9 @@ target=${dir##*/} # Compile third-party libraries export FDS_BUILD_TARGET=$target -export SOURCE_INTEL_IFORT=1 source ../Scripts/build_thirdparty_libs.sh "$@" # Build fds -echo Building $target with Intel MPI and $INTEL_IFORT +echo Building $target make -j4 VPATH="../../Source" -f ../makefile $target diff --git a/Build/impi_intel_linux_openmp_dv/make_fds.sh b/Build/impi_intel_linux_openmp_dv/make_fds.sh index 02899312b4c..4ae4f412a5f 100755 --- a/Build/impi_intel_linux_openmp_dv/make_fds.sh +++ b/Build/impi_intel_linux_openmp_dv/make_fds.sh @@ -5,10 +5,9 @@ target=${dir##*/} # Compile third-party libraries export FDS_BUILD_TARGET=$target -export SOURCE_INTEL_IFORT=1 source ../Scripts/build_thirdparty_libs.sh "$@" # Build fds -echo Building $target with Intel MPI and $INTEL_IFORT +echo Building $target make -j4 VPATH="../../Source" -f ../makefile $target