Merge pull request #13657 from rmcdermo/master

Build: remove script to set INTEL_IFORT by argument, simplifies build…

Author: rmcdermo

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   

Build/Scripts/set_intel_compiler.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

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

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

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

Build/impi_intel_linux_openmp/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
 

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