Add support for the Intel ifx compiler

packages/cice4/package.py

@@ -97,6 +97,9 @@ def edit(self, spec, prefix):
 LDFLAGS    := $(FFLAGS) -v -static-intel 
 """
 
+        # Add support for the ifx compiler
+        config["oneapi"] = config["intel"]
+
         # Based on https://github.com/ACCESS-NRI/cice4/blob/access-esm1.5/bld/Macros.nci
         config["post"] = """
 MOD_SUFFIX := mod

packages/cice5/package.py

@@ -131,10 +131,10 @@
 FREEFLAGS  :=
 """
 
         config["gcc"] = f"""
 # TODO: removed -std=f2008 due to compiler errors
 FFLAGS = -Wall -fdefault-real-8 -fdefault-double-8 -ffpe-trap=invalid,zero,overflow -fallow-argument-mismatch
 """
 
         # module load intel-compiler/2019.5.281
         config["intel"] = f"""
@@ -150,6 +150,9 @@
 endif
 """
 
+        # Add support for the ifx compiler
+        config["oneapi"] = config["intel"]
+
         # Copied from bld/Macros.nci
         config["post"] = """
 MOD_SUFFIX := mod

packages/mom5/package.py

@@ -216,6 +216,9 @@ def edit(self, spec, prefix):
 LDFLAGS += $(LIBS)
 """
 
+        # Add support for the ifx compiler
+        config["oneapi"] = config["intel"]
+
         # Copied from bin/mkmf.template.t90
         config["post"] = """
 # you should never need to change any lines below.

packages/oasis3-mct/package.py

@@ -6,7 +6,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack.package import install, join_path, mkdirp
-from pprint import pprint
+# from pprint import pprint
 
 # https://spack.readthedocs.io/en/latest/build_systems/makefilepackage.html
 class Oasis3Mct(MakefilePackage):
@@ -242,19 +242,19 @@
 f           = $(F90)
 """
 
         config["gcc"] = f"""
 # Compiling and other commands
 MAKE        = make
 F90         = mpif90 -Wall -fallow-argument-mismatch
 CC          = gcc
 LD          = mpif90
 MCT_FCFLAGS =
 #
 # CPP keys and compiler options
 # 
 CPPDEF    = -Duse_netCDF -Duse_comm_$(CHAN) -D__VERBOSE -DTREAT_OVERLAY
 F90FLAGS_1  = 
 """
 
         # module load intel-compiler/2019.5.281
         config["intel"] = f"""
@@ -283,33 +283,36 @@
 endif
 """
 
+        # Add support for the ifx compiler
+        config["oneapi"] = config["intel"]
+
         config["post"] = f"""
 f90FLAGS_1  = $(F90FLAGS_1)
 FFLAGS_1    = $(F90FLAGS_1)
 fFLAGS_1    = $(F90FLAGS_1)
 CCFLAGS_1   = 
 LDFLAGS     = 
 #
 ###################
 #
 # Additional definitions that should not be changed
 #
 FLIBS		= ""
 # BINDIR        : directory for executables
 BINDIR          = $(ARCHDIR)/bin
 # LIBBUILD      : contains a directory for each library
 LIBBUILD        = $(ARCHDIR)/build/lib
 # INCPSMILE     : includes all *o and *mod for each library
 INCPSMILE       = -I$(LIBBUILD)/psmile.$(CHAN) -I$(LIBBUILD)/mct 
 
 F90FLAGS  = $(F90FLAGS_1) $(INCPSMILE) $(CPPDEF)
 f90FLAGS  = $(f90FLAGS_1) $(INCPSMILE) $(CPPDEF)
 FFLAGS    = $(FFLAGS_1) $(INCPSMILE) $(CPPDEF)
 fFLAGS    = $(fFLAGS_1) $(INCPSMILE) $(CPPDEF)
 CCFLAGS   = $(CCFLAGS_1) $(INCPSMILE) $(CPPDEF)
 #
 #############################################################################
 """
 
         with open(makeinc_path, "w") as makeinc:
             makeinc.write(