diff --git a/deploy/bootstrap.py b/deploy/bootstrap.py index 61d0c837a..f52473c2a 100755 --- a/deploy/bootstrap.py +++ b/deploy/bootstrap.py @@ -563,11 +563,13 @@ def _build_conda_env(options, activate_base): mpi_prefix=mpi_prefix, include_mache=not local_mache) - for package in ['esmf', 'geometric_features', 'mache', 'metis', 'moab', + for package in ['esmf', 'geometric_features', 'mache', 'metis', 'mpas_tools', 'netcdf_c', 'netcdf_fortran', 'otps', 'parallelio', 'pnetcdf']: replacements[package] = config.get('deploy', package) + replacements['moab'] = config.get('deploy', 'conda_moab') + spec_file = template.render(**replacements) spec_filename = f'spec-file-{conda_mpi}.txt' @@ -868,7 +870,7 @@ def _build_spack_libs_env(options, compiler, mpi, env_vars): # noqa: C901 cmake = config.get('deploy', 'cmake') lapack = config.get('deploy', 'lapack') metis = config.get('deploy', 'metis') - moab = config.get('deploy', 'moab') + moab = config.get('deploy', 'spack_moab') parmetis = config.get('deploy', 'parmetis') petsc = config.get('deploy', 'petsc') scorpio = config.get('deploy', 'scorpio') diff --git a/deploy/default.cfg b/deploy/default.cfg index 3adc5646b..7a6f474dc 100644 --- a/deploy/default.cfg +++ b/deploy/default.cfg @@ -22,6 +22,7 @@ mpi = nompi # versions of conda packages geometric_features = 1.5.0 mache = 1.26.0 +conda_moab = 5.5.1 mpas_tools = 0.35.0 otps = 2021.10 parallelio = 2.6.3 @@ -29,7 +30,6 @@ parallelio = 2.6.3 # versions of conda or spack packages (depending on machine type) esmf = 8.7.0 metis = 5.1.0 -moab = master netcdf_c = 4.9.2 netcdf_fortran = 4.6.1 pnetcdf = 1.13.0 @@ -40,6 +40,7 @@ albany = developcompass-2024-03-13 cmake = 3.23.0: hdf5 = 1.14.3 lapack = 3.9.1 +spack_moab = master parmetis = 4.0.3 petsc = 3.19.1 scorpio = 1.6.5