Merge pull request #13722 from cxp484/master

FDS Build: Allow ifx for GitHUB actions.

Author: cxp484

.github/workflows/windows.yml

@@ -85,6 +85,7 @@ jobs:
       run: |
         call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" --config="oneapi_config.txt"
         cd Build\impi_intel_win_db
+        set INTEL_IFORT=ifx
         call make_fds.bat
         fds_impi_intel_win_db.exe
     - name: build fds release

Build/Scripts/setup_intel_compilers.bat

@@ -8,7 +8,6 @@ IF  X%SETVARS_COMPLETED% == X1 GOTO intel_envexist
 
   echo Defining Intel compiler environment
   call "%ONEAPIDIR%\setvars" intel64
-  set INTEL_IFORT=ifort
 
   IF  X%SETVARS_COMPLETED% == X1 GOTO intel_envexist