diff --git a/AM5/am5-compile/compile.yaml b/AM5/am5-compile/compile.yaml index ebc8673..52e8cdf 100644 --- a/AM5/am5-compile/compile.yaml +++ b/AM5/am5-compile/compile.yaml @@ -6,7 +6,7 @@ compile: - component: "FMS" repo: "https://github.com/NOAA-GFDL/FMS.git" branch: "2024.02" - cppdefs: "-DHAVE_GETTID -DINTERNAL_FILE_NML -Duse_libMPI -Duse_netCDF" + cppdefs: "-DINTERNAL_FILE_NML -Duse_libMPI -Duse_netCDF" otherFlags: *FMSincludes - component: "GRTCODE" repo: "https://github.com/NOAA-GFDL/GRTCODE.git" diff --git a/AM5/am5-compile/platforms.yaml b/AM5/am5-compile/platforms.yaml index 5ea39ba..834200f 100644 --- a/AM5/am5-compile/platforms.yaml +++ b/AM5/am5-compile/platforms.yaml @@ -1,4 +1,19 @@ platforms: + - name: amd.inteloneapi + compiler: intel + modules: [ oneapi/2024.2,compiler/2024.2.0,mpi,netcdf/4.9.2,hdf5/1.14.5,libyaml/0.2.5] + fc: mpiifx + cc: mpiicx + mkTemplate: /home/Lauren.Chilutti/mkmf/templates/amd-intel-oneapi.mk + modelRoot: ${HOME}/fremake_canopy/test + - name: ncrc5.intel + compiler: intel + modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"] + modules: [ !join [*INTEL, "/2022.2.1"],"fre/bronx-20",cray-hdf5/1.12.2.3, cray-netcdf/4.9.0.3] + fc: ftn + cc: cc + mkTemplate: !join ["/ncrc/home2/fms/local/opt/fre-commands/bronx-20/site/ncrc5/", *INTEL, ".mk"] + modelRoot: ${HOME}/fremake_canopy/test - name: ncrc5.intel23 compiler: intel modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"] diff --git a/SHiELD/SHiELD-compile/platforms.yaml b/SHiELD/SHiELD-compile/platforms.yaml index 60d1aad..834200f 100644 --- a/SHiELD/SHiELD-compile/platforms.yaml +++ b/SHiELD/SHiELD-compile/platforms.yaml @@ -1,4 +1,11 @@ platforms: + - name: amd.inteloneapi + compiler: intel + modules: [ oneapi/2024.2,compiler/2024.2.0,mpi,netcdf/4.9.2,hdf5/1.14.5,libyaml/0.2.5] + fc: mpiifx + cc: mpiicx + mkTemplate: /home/Lauren.Chilutti/mkmf/templates/amd-intel-oneapi.mk + modelRoot: ${HOME}/fremake_canopy/test - name: ncrc5.intel compiler: intel modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"] @@ -10,10 +17,10 @@ platforms: - name: ncrc5.intel23 compiler: intel modulesInit: [" module use -a /ncrc/home2/fms/local/modulefiles \n","source $MODULESHOME/init/sh \n"] - modules: [!join [*INTEL, "/2023.1.0"],"fre/bronx-20",cray-hdf5/1.12.2.3, cray-netcdf/4.9.0.3] + modules: [!join [*INTEL, "/2023.2.0"], cray-hdf5/1.12.2.11, cray-netcdf/4.9.0.9] fc: ftn cc: cc - mkTemplate: !join ["/ncrc/home2/fms/local/opt/fre-commands/bronx-20/site/ncrc5/", *INTEL, ".mk"] + mkTemplate: !join ["/ncrc/home2/fms/local/opt/fre-commands/bronx-22/site/ncrc5/", *INTEL, ".mk"] modelRoot: ${HOME}/fremake_canopy/test - name: hpcme.2023 compiler: intel