diff --git a/Build/makefile b/Build/makefile index fc40fa7b62f..4abd2f3955e 100644 --- a/Build/makefile +++ b/Build/makefile @@ -13,7 +13,7 @@ VPATH = ../Source # set compiler type -I_IFORT=ifort +I_IFORT=ifx ifdef INTEL_IFORT I_IFORT=$(INTEL_IFORT) endif @@ -241,14 +241,14 @@ impi_intel_win_openmp_db : setup_win $(objwin_mpi) impi_intel_linux : FFLAGS = -m64 -fc=$(I_IFORT) -O2 -ipo -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) -DUSE_IFPORT -diag-disable=10448 impi_intel_linux : LFLAGSMKL = $(LFLAGSMKL_INTEL) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS) -impi_intel_linux : FCOMPL = mpiifort +impi_intel_linux : FCOMPL = mpiifx impi_intel_linux : obj = fds_impi_intel_linux impi_intel_linux : setup $(obj_mpi) $(FCOMPL) $(FFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL) impi_intel_linux_openmp : FFLAGS = -m64 -fc=$(I_IFORT) -O2 -ipo -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) -DUSE_IFPORT -diag-disable=10448_INTEL impi_intel_linux_openmp : LFLAGSMKL = $(LFLAGSMKL_INTEL_OPENMP) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS) -impi_intel_linux_openmp : FCOMPL = mpiifort +impi_intel_linux_openmp : FCOMPL = mpiifx impi_intel_linux_openmp : FOPENMPFLAGS = -qopenmp impi_intel_linux_openmp : obj = fds_impi_intel_linux_openmp impi_intel_linux_openmp : setup $(obj_mpi) @@ -256,14 +256,14 @@ impi_intel_linux_openmp : setup $(obj_mpi) impi_intel_linux_db : FFLAGS = -m64 -fc=$(I_IFORT) -check all -warn all -diag-error=remark,warn,error -O0 -g -traceback -fpe0 -nofltconsistency -stand:f18 -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) -DUSE_IFPORT -diag-disable=10448_INTEL impi_intel_linux_db : LFLAGSMKL = $(LFLAGSMKL_INTEL) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS) -impi_intel_linux_db : FCOMPL = mpiifort +impi_intel_linux_db : FCOMPL = mpiifx impi_intel_linux_db : obj = fds_impi_intel_linux_db impi_intel_linux_db : setup $(obj_mpi) $(FCOMPL) $(FFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL) impi_intel_linux_openmp_db : FFLAGS = -m64 -fc=$(I_IFORT) -check all -warn all -diag-error=remark,warn,error -O0 -g -traceback -fpe0 -nofltconsistency -stand:f18 -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) -DUSE_IFPORT -diag-disable=10448 impi_intel_linux_openmp_db : LFLAGSMKL = $(LFLAGSMKL_INTEL_OPENMP) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS) -impi_intel_linux_openmp_db : FCOMPL = mpiifort +impi_intel_linux_openmp_db : FCOMPL = mpiifx impi_intel_linux_openmp_db : FOPENMPFLAGS = -qopenmp impi_intel_linux_openmp_db : obj = fds_impi_intel_linux_openmp_db impi_intel_linux_openmp_db : setup $(obj_mpi) @@ -271,14 +271,14 @@ impi_intel_linux_openmp_db : setup $(obj_mpi) impi_intel_linux_dv : FFLAGS = -m64 -fc=$(I_IFORT) -warn unused -O1 -g -traceback -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) -DUSE_IFPORT -diag-disable=10448 impi_intel_linux_dv : LFLAGSMKL = $(LFLAGSMKL_INTEL) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS) -impi_intel_linux_dv : FCOMPL = mpiifort +impi_intel_linux_dv : FCOMPL = mpiifx impi_intel_linux_dv : obj = fds_impi_intel_linux_dv impi_intel_linux_dv : setup $(obj_mpi) $(FCOMPL) $(FFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL) impi_intel_linux_openmp_dv : FFLAGS = -m64 -fc=$(I_IFORT) -warn unused -O1 -g -traceback -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) $(FFLAGS_HYPRE) $(FFLAGS_SUNDIALS) -DUSE_IFPORT -diag-disable=10448 impi_intel_linux_openmp_dv : LFLAGSMKL = $(LFLAGSMKL_INTEL_OPENMP) $(LFLAGS_HYPRE) $(LFLAGS_SUNDIALS) -impi_intel_linux_openmp_dv : FCOMPL = mpiifort +impi_intel_linux_openmp_dv : FCOMPL = mpiifx impi_intel_linux_openmp_dv : FOPENMPFLAGS = -qopenmp impi_intel_linux_openmp_dv : obj = fds_impi_intel_linux_openmp_dv impi_intel_linux_openmp_dv : setup $(obj_mpi)