Merge pull request #810 from xylar/update-to-1.4.0-alpha.1

Update to 1.4.0-alpha.1
MPAS-Dev · May 8, 2024 · 8f9a9c4 · 8f9a9c4
2 parents 9b3e621 + 3faf88d
commit 8f9a9c4
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 391 deletions.
diff --git a/compass/version.py b/compass/version.py
@@ -1 +1 @@
-__version__ = '1.3.0-alpha.3'
+__version__ = '1.4.0-alpha.1'
diff --git a/conda/bootstrap.py b/conda/bootstrap.py
@@ -465,6 +465,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')
+    metis = config.get('deploy', 'metis')
     moab = config.get('deploy', 'moab')
     petsc = config.get('deploy', 'petsc')
     scorpio = config.get('deploy', 'scorpio')
@@ -501,6 +502,9 @@ def build_spack_env(config, update_spack, machine, compiler, mpi,  # noqa: C901
         include_e3sm_lapack = False
     else:
         include_e3sm_lapack = True
+    if metis != 'None':
+        specs.append(
+            f'"metis@{metis}+int64+real64"')
     if moab != 'None':
         specs.append(
             f'"moab@{moab}+mpi+hdf5+netcdf+pnetcdf+metis+parmetis+tempest"')

diff --git a/conda/compass_env/spec-file.template b/conda/compass_env/spec-file.template
@@ -6,7 +6,7 @@ python>=3.8
 cartopy
 cartopy_offlinedata
 cmocean
-esmf=8.6.0={{ mpi_prefix }}_*
+esmf=8.6.1={{ mpi_prefix }}_*
 ffmpeg
 geometric_features=1.3.0
 git
@@ -16,7 +16,7 @@ ipython
 jupyter
 lxml
 {% if include_mache %}
-mache=1.22.0
+mache=1.23.0
 {% endif %}
 matplotlib-base
 metis

diff --git a/conda/configure_compass_env.py b/conda/configure_compass_env.py
@@ -100,7 +100,7 @@ def main():
     if local_mache:
         mache = ''
     else:
-        mache = '"mache=1.22.0"'
+        mache = '"mache=1.23.0"'
 
     setup_install_env(env_name, activate_base, args.use_local, logger,
                       args.recreate, conda_base, mache)

diff --git a/conda/default.cfg b/conda/default.cfg
@@ -23,14 +23,15 @@ mpi = nompi
 albany = compass-2024-03-13
 # cmake newer than 3.23.0 needed for Trilinos
 cmake = 3.23.0:
-esmf = 8.6.0
+esmf = 8.6.1
 hdf5 = 1.14.3
 lapack = 3.9.1
+metis = 5.1.0
 moab = 5.5.1
 netcdf_c = 4.9.2
 netcdf_fortran = 4.6.0
 petsc = 3.19.1
 pnetcdf = 1.12.3
-scorpio = 1.6.0
+scorpio = 1.6.3
 # parallelio = 2.6.2
 parallelio = None
diff --git a/conda/recipe/conda_build_config.yaml b/conda/recipe/conda_build_config.yaml
diff --git a/conda/recipe/meta.yaml b/conda/recipe/meta.yaml
diff --git a/conda/scorpio/ci/linux_mpi_mpich.yaml b/conda/scorpio/ci/linux_mpi_mpich.yaml
diff --git a/conda/scorpio/ci/linux_mpi_openmpi.yaml b/conda/scorpio/ci/linux_mpi_openmpi.yaml
diff --git a/conda/scorpio/ci/osx_mpi_mpich.yaml b/conda/scorpio/ci/osx_mpi_mpich.yaml
diff --git a/conda/scorpio/ci/osx_mpi_openmpi.yaml b/conda/scorpio/ci/osx_mpi_openmpi.yaml
diff --git a/conda/scorpio/recipe/COPYRIGHT b/conda/scorpio/recipe/COPYRIGHT
diff --git a/conda/scorpio/recipe/build.sh b/conda/scorpio/recipe/build.sh
diff --git a/conda/scorpio/recipe/conda_build_config.yaml b/conda/scorpio/recipe/conda_build_config.yaml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = '1.3.0-alpha.3'
		__version__ = '1.4.0-alpha.1'