Merge pull request #13783 from gforney/master

change linux and windows fds2ascii build targets and linux test_mpi build target to use ifx

Utilities/fds2ascii/Makefile

@@ -49,7 +49,7 @@ no_target:
 	$(FC) -c $(FFLAGS) $(FILTERF) $<
 
 intel_win : FFLAGS    = -O2 /nologo /fpscomp:general $(GITINFO)
-intel_win : FC        = ifort
+intel_win : FC        = ifx
 intel_win : exe       = fds2ascii_intel_win.exe
 intel_win : $(objwin)
 	$(FC) -o $(bin)/$(exe) $(objwin)
@@ -67,7 +67,7 @@ gnu_osx : $(obj)
 	$(FC) -o $(bin)/$(exe) $(obj)
 
 intel_linux : FFLAGS    = -O2 -m64 $(GITINFO)
-intel_linux : FC        = ifort
+intel_linux : FC        = ifx
 intel_linux : exe       = fds2ascii_intel_linux
 intel_linux : $(obj)
 	$(FC) -o $(bin)/$(exe) $(obj)

Utilities/test_mpi/makefile

@@ -44,14 +44,17 @@ impi_intel_win: MPILIB = "$(I_MPI_RELEASE_ROOT)\impi.lib"
 impi_intel_win: MPIINCLUDE = "$(IMPI_INCLUDE)"
 impi_intel_win: FFLAGS = /Qipo /O2 /I$(MPIINCLUDE) -fc=ifort
 impi_intel_win: FCOMPL = mpiifort
+#compilation crashes when using the following two lines instead of above two lines
+#impi_intel_win: FFLAGS = /Qipo /O2 /I$(MPIINCLUDE) -fc=ifx
+#impi_intel_win: FCOMPL = mpiifx
 impi_intel_win: obj = test_mpi
 impi_intel_win: setup_win $(objwin_mpi)
 	$(FCOMPL) -o $(obj) $(FFLAGS) /F1000000000 $(objwin_mpi) $(MPILIB)
 
 # Linux
 
 impi_intel_linux: FFLAGS = -m64 -O2 -traceback -no-wrap-margin
-impi_intel_linux: FCOMPL = mpiifort
+impi_intel_linux: FCOMPL = mpiifx
 impi_intel_linux: obj = test_mpi
 impi_intel_linux: $(obj_mpi)
 	$(FCOMPL) -o $(obj) $(FFLAGS) $(obj_mpi)