Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rmcdermo merged 1 commit into from
Oct 30, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Build/Scripts/build_thirdparty_libs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 0 additions & 16 deletions Build/Scripts/set_intel_compiler.sh
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions Build/impi_intel_linux/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions Build/impi_intel_linux_db/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions Build/impi_intel_linux_dv/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions Build/impi_intel_linux_openmp/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions Build/impi_intel_linux_openmp_db/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

3 changes: 1 addition & 2 deletions Build/impi_intel_linux_openmp_dv/make_fds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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