From f350fc256f9fa8970843ccab522d4127347541be Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 14 Mar 2024 10:04:48 -0500 Subject: [PATCH] Add MOAB --- conda/bootstrap.py | 4 ++++ conda/compass_env/spec-file.template | 2 ++ conda/default.cfg | 1 + 3 files changed, 7 insertions(+) diff --git a/conda/bootstrap.py b/conda/bootstrap.py index 58cc1fd99d..fc62f39bd6 100755 --- a/conda/bootstrap.py +++ b/conda/bootstrap.py @@ -449,6 +449,7 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, # noqa: C901 cmake = config.get('deploy', 'cmake') esmf = config.get('deploy', 'esmf') lapack = config.get('deploy', 'lapack') + moab = config.get('deploy', 'moab') petsc = config.get('deploy', 'petsc') scorpio = config.get('deploy', 'scorpio') parallelio = config.get('deploy', 'parallelio') @@ -479,6 +480,9 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, # noqa: C901 include_e3sm_lapack = False else: include_e3sm_lapack = True + if moab != 'None': + specs.append( + f'"moab@{moab}+mpi+hdf5+netcdf+pnetcdf+metis+parmetis+tempest"') if petsc != 'None': specs.append(f'"petsc@{petsc}+mpi+batch"') diff --git a/conda/compass_env/spec-file.template b/conda/compass_env/spec-file.template index d39d1e29b6..90c20bf746 100644 --- a/conda/compass_env/spec-file.template +++ b/conda/compass_env/spec-file.template @@ -20,6 +20,8 @@ mache=1.20.0 {% endif %} matplotlib-base metis +moab >=5.5.1 +moab=*={{ mpi_prefix }}_tempest_* mpas_tools=0.31.0 nco netcdf4=*=nompi_* diff --git a/conda/default.cfg b/conda/default.cfg index 6ab7a528ea..0a410ac5d0 100644 --- a/conda/default.cfg +++ b/conda/default.cfg @@ -26,6 +26,7 @@ cmake = 3.23.0: esmf = 8.6.0 hdf5 = 1.14.3 lapack = 3.9.1 +moab = 5.5.1 netcdf_c = 4.9.2 netcdf_fortran = 4.6.0 petsc = 3.19.1