diff --git a/SHiELD/SHiELD-compile/SHiELD.yaml b/SHiELD/SHiELD-compile/SHiELD.yaml index dc680d7..5df6de6 100644 --- a/SHiELD/SHiELD-compile/SHiELD.yaml +++ b/SHiELD/SHiELD-compile/SHiELD.yaml @@ -4,11 +4,13 @@ fre_properties: - &FRE_STEM !join [SHiELD/, *SHiELD_VERSION] - &fv3_release main - &phy_release main - - &fms_release "2023.02" + - &fms_release "2025.01" - &drivers_release main - - &coupler_release "2023.02" + - &coupler_release "2025.01" - &FMSincludes "-IFMS/fms2_io/include -IFMS/include -IFMS/mpp/include" - &momIncludes "-Imom6/MOM6-examples/src/MOM6/pkg/CVMix-src/include" + - &containerLIBS ["bacio","sp","w3emc","w3nco"] + - &baremetalLIBS ["-L/gpfs/f5/gfdl_f/world-shared/Lauren.Chilutti/nceplibs/intel -lbacio -lsp_d -lw3emc_d -lw3nco_d"] - &INTEL "intel-classic" # compile information diff --git a/SHiELD/SHiELD-compile/compile.yaml b/SHiELD/SHiELD-compile/compile.yaml index aefd1fc..73e3e69 100644 --- a/SHiELD/SHiELD-compile/compile.yaml +++ b/SHiELD/SHiELD-compile/compile.yaml @@ -1,7 +1,7 @@ compile: - experiment: shield_nh - container_addlibs: ["bacio","sp","w3emc","w3nco"] - baremetal_addlibs: ["-L/autofs/ncrc-svm1_proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/intel/2023.1.0/bacio-2.4.1-wrykbu2/lib -lbacio_4", "-L/autofs/ncrc-svm1_proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/intel/2023.1.0/bacio-2.4.1-wrykbu2/lib -lbacio_8", "-L/autofs/ncrc-svm1_proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/intel/2023.1.0/sp-2.5.0-7bumbmx/lib64 -lsp_d", "-L/autofs/ncrc-svm1_proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/intel/2023.1.0/w3emc-2.10.0-zmuykep/lib64 -lw3emc_d", "-L/autofs/ncrc-svm1_proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/intel/2023.1.0/w3nco-2.4.1-76qm6h2/lib -lw3nco_d"] + experiment: shield + container_addlibs: *containerLIBS + baremetal_linkerflags: *baremetalLIBS src: - component: "FMS" repo: "https://github.com/NOAA-GFDL/FMS.git" @@ -14,13 +14,13 @@ compile: paths: [SHiELD_physics/gsmphys, SHiELD_physics/GFS_layer, SHiELD_physics/IPD_layer] - cppdefs: "-Duse_libMPI -Duse_netCDF -DHAVE_SCHED_GETAFFINITY -DSPMD -Duse_LARGEFILE -DGFS_PHYS -DUSE_GFSL63 -DNEW_TAUCTMAX -DNEMS_GSM -DINTERNAL_FILE_NML -DMOIST_CAPPA -DUSE_COND" + cppdefs: "-Duse_libMPI -Duse_netCDF -DHAVE_SCHED_GETAFFINITY -DSPMD -Duse_LARGEFILE -DGFS_PHYS -DUSE_GFSL63 -DNEW_TAUCTMAX -DNEMS_GSM -DINTERNAL_FILE_NML" otherFlags: *FMSincludes - component: "fv3" requires: ["FMS", "SHiELD_physics"] repo: ["https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere.git", "https://github.com/NOAA-GFDL/atmos_drivers.git"] - cppdefs: "-Duse_libMPI -Duse_netCDF -DHAVE_SCHED_GETAFFINITY -DSPMD -Duse_LARGEFILE -DGFS_PHYS -DUSE_GFSL63 -DNEW_TAUCTMAX -DNEMS_GSM -DINTERNAL_FILE_NML -DMOIST_CAPPA -DUSE_COND" + cppdefs: "-Duse_libMPI -Duse_netCDF -DHAVE_SCHED_GETAFFINITY -DSPMD -Duse_LARGEFILE -DGFS_PHYS -DUSE_GFSL63 -DNEW_TAUCTMAX -DNEMS_GSM -DINTERNAL_FILE_NML" branch: [*fv3_release, *drivers_release] paths: [SHiELD_physics/FV3GFS/, fv3/atmos_drivers/SHiELD/atmos_model.F90, @@ -32,7 +32,7 @@ compile: - component: "FMScoupler" requires: ["FMS", "SHiELD_physics", "fv3"] repo: "https://github.com/NOAA-GFDL/FMScoupler.git" - cppdefs: "-Duse_libMPI -Duse_netCDF -DHAVE_SCHED_GETAFFINITY -DSPMD -Duse_LARGEFILE -DGFS_PHYS -DUSE_GFSL63 -DNEW_TAUCTMAX -DNEMS_GSM -DINTERNAL_FILE_NML -DMOIST_CAPPA -DUSE_COND" + cppdefs: "-Duse_libMPI -Duse_netCDF -DHAVE_SCHED_GETAFFINITY -DSPMD -Duse_LARGEFILE -DGFS_PHYS -DUSE_GFSL63 -DNEW_TAUCTMAX -DNEMS_GSM -DINTERNAL_FILE_NML" branch: *coupler_release paths: ["FMScoupler/SHiELD/coupler_main.F90"] otherFlags: *FMSincludes diff --git a/platforms.yaml b/platforms.yaml index c62468c..dcb4f90 100644 --- a/platforms.yaml +++ b/platforms.yaml @@ -29,6 +29,17 @@ platforms: mkTemplate: "/apps/mkmf/templates/hpcme-intel24.mk" container2step: True container2base: "docker-archive:/gpfs/f5/gfdl_f/world-shared/frecontainers/hpc-me_intel2024.2rte.tar" + - name: hpcme.intel25 + compiler: intel + RUNenv: [". /opt/spack/share/spack/setup-env.sh", "cd /opt/spack-environment/", "spack --verbose env activate ."] + modelRoot: /apps + container: True + containerBuild: "podman" + containerRun: "apptainer" + containerBase: "gitlab.gfdl.noaa.gov:5050/fre/hpc-me/base-ubuntu24.04-intel:2025" + mkTemplate: "/apps/mkmf/templates/hpcme-intel25-oneapi.mk" + container2step: True + container2base: "gitlab.gfdl.noaa.gov:5050/fre/hpc-me/base-ubuntu24.04-intel:2025rte" - 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]