Minimum cmake for trilinos

.pre-commit-config.yaml

@@ -9,6 +9,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
+        exclude: conda
 
   # Can run individually with `pre-commit run isort --all-files`
   - repo: https://github.com/PyCQA/isort

compass/version.py

@@ -1 +1 @@
-__version__ = '1.2.0-alpha.4'
+__version__ = '1.2.0-alpha.5'

conda/bootstrap.py

@@ -386,6 +386,7 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, spack_env,
                     spack_base, spack_template_path, env_vars, tmpdir, logger):
 
     albany = config.get('deploy', 'albany')
+    cmake = config.get('deploy', 'cmake')
     esmf = config.get('deploy', 'esmf')
     lapack = config.get('deploy', 'lapack')
     petsc = config.get('deploy', 'petsc')
@@ -395,34 +396,38 @@ def build_spack_env(config, update_spack, machine, compiler, mpi, spack_env,
 
     specs = list()
 
+    if cmake != 'None':
+        specs.append(f'cmake "@{cmake}"')
+
     e3sm_hdf5_netcdf = config.getboolean('deploy', 'use_e3sm_hdf5_netcdf')
     if not e3sm_hdf5_netcdf:
         hdf5 = config.get('deploy', 'hdf5')
         netcdf_c = config.get('deploy', 'netcdf_c')
         netcdf_fortran = config.get('deploy', 'netcdf_fortran')
         pnetcdf = config.get('deploy', 'pnetcdf')
         specs.extend([
-            f'hdf5@{hdf5}+cxx+fortran+hl+mpi+shared',
-            f'netcdf-c@{netcdf_c}+mpi~parallel-netcdf',
-            f'netcdf-fortran@{netcdf_fortran}',
-            f'parallel-netcdf@{pnetcdf}+cxx+fortran'])
+            f'hdf5 "@{hdf5}+cxx+fortran+hl+mpi+shared"',
+            f'netcdf-c "@{netcdf_c}+mpi~parallel-netcdf"',
+            f'netcdf-fortran "@{netcdf_fortran}"',
+            f'parallel-netcdf "@{pnetcdf}+cxx+fortran"'])
 
     if esmf != 'None':
-        specs.append(f'esmf@{esmf}+mpi+netcdf~pio+pnetcdf')
+        specs.append(f'esmf "@{esmf}+mpi+netcdf~pio+pnetcdf"')
     if lapack != 'None':
-        specs.append(f'netlib-lapack@{lapack}')
+        specs.append(f'netlib-lapack "@{lapack}"')
         include_e3sm_lapack = False
     else:
         include_e3sm_lapack = True
     if petsc != 'None':
-        specs.append(f'petsc@{petsc}+mpi+batch')
+        specs.append(f'petsc "@{petsc}+mpi+batch"')
 
     if scorpio != 'None':
         specs.append(
-            f'scorpio@{scorpio}+pnetcdf~timing+internal-timing~tools+malloc')
+            f'scorpio '
+            f'"@{scorpio}+pnetcdf~timing+internal-timing~tools+malloc"')
 
     if albany != 'None':
-        specs.append(f'albany@{albany}+mpas')
+        specs.append(f'albany "@{albany}+mpas"')
 
     yaml_template = f'{spack_template_path}/{machine}_{compiler}_{mpi}.yaml'
     if not os.path.exists(yaml_template):

conda/compass_env/spec-file.template

@@ -16,7 +16,7 @@ jigsawpy=0.3.3
 jupyter
 lxml
 {% if include_mache %}
-mache=1.10.0
+mache=1.13.0
 {% endif %}
 matplotlib-base
 metis

conda/configure_compass_env.py

@@ -98,7 +98,7 @@ def main():
     if local_mache:
         mache = ''
     else:
-        mache = '"mache=1.10.0"'
+        mache = '"mache=1.13.0"'
 
     setup_install_env(env_name, activate_base, args.use_local, logger,
                       args.recreate, conda_base, mache)

conda/default.cfg

@@ -21,6 +21,8 @@ mpi = nompi
 
 # the version of various packages to include if using spack
 albany = develop
+# cmake newer than 3.23.0 needed for Trilinos
+cmake = 3.23.0:
 esmf = 8.2.0
 hdf5 = 1.12.1
 lapack = 3.9.1

conda/recipe/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "compass" %}
-{% set version = "1.2.0alpha.4" %}
+{% set version = "1.2.0alpha.5" %}
 {% set build = 0 %}
 
 {% if mpi == "nompi" %}
@@ -52,7 +52,7 @@ requirements:
     - jigsawpy 0.3.3
     - jupyter
     - lxml
-    - mache 1.10.0
+    - mache 1.13.0
     - matplotlib-base
     - metis
     - mpas_tools 0.17.0