Merge release/1.5.1 into develop #866
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* adding instructions so that temporary environment variable gets set up correctly Co-authored-by: Dom Heinzeller <dom.heinzeller@icloud.com>
* Bumped bufr version to 12.0.1, change .gitconfig urls for testing * Updated spack submodule commit hash
release/1.5.1: bump bufr version to 12.0.1 (cherry-pick JCSDA#797 from develop)
…dd target 'haswell'
…ith the replacement qhull for tesselation and since it leads to compilation errors in ecmwf-atlas with Intel
…atlas_ci * Workaround for spack-stack-1.5.0 on Hera: use new noavx512 install, add target 'haswell' * Update default atlas version to 0.35.0 * Update build variants for ecmwf-atlas and ectrans * Remove deprecated variant cgal from ecmwf-atlas, since it conflicts with the replacement qhull for tesselation and since it leads to compilation errors in ecmwf-atlas with Intel * Revert .gitmodules and update submodule pointer for spack
…cho documentation Bugfix/container ectrans fftw derecho docs (JCSDA#821) * Comment out intel-oneapi-mkl in configs/containers/docker-ubuntu-intel-impi.yaml and fix wrong variant ~fftw for jedi-base-env in configs/containers/README.md * Fix incorrect variant name for mkl for package ectrans in configs/common/packages.yaml * Fix outdated instructions for Derecho in doc/source/PreConfiguredSites.rst * Update submodule pointer for spack
release/1.5.1: add nc-diag@1.1.2 (from develop)
…k151 Update fms default to 2023.02.01
* ESMF@8.5.0, MAPL@2.40.3 as defaults * update fms versions in unified-dev * Revert "update fms versions in unified-dev" This reverts commit a276e2b. * update fms ver in ufs wm metapackage * update fms ver in unified-dev * update gftl-shared default to 1.6.1 * pointer update * try adding py-pandas version for ubuntu CI failure * default py-pandas@1.5.3 * restore submodule pointer
….40.3 (JCSDA#842) * Update submodule pointer for spack
…cover, AWS ParallelCluster, S4 (JCSDA#853) * Update site config for Derecho * Update documentation for spack-stack-1.5.1 install on AWS ParallelCluster * Turn of ssl variant for Python for Derecho, Gaea C5, Narwhal * Add explicit variant external-xdr for hdf in configs/common/packages.yaml * Update doc/source/PreConfiguredSites.rst for Discover * Update documentation for spack-stack-1.5.1 on S4
* Update site configs for NOAA Parallel Works * Update casper site config and build documentation * Update container specs in configs/containers/README.md * Update Hercules site config (gnu@12, mvapich2@2.3.7) * Update doc/source/PreConfiguredSites.rst for casper, hera, gaea-c4, jet * Add fms@2023.03 in spack submodule, add to unified-dev and skylab-dev templates * Update configs/containers after tagging spack submodule as spack-stack-1.5.1 * Update documentation for AWS AMI release 1.5.1 * Update macOS section in doc/source/NewSiteConfigs.rst to match Linux section
…into feature/merge_rel151_into_dev
climbfuji
requested review from
ulmononian,
AlexanderRichert-NOAA,
srherbener,
RatkoVasic-NOAA and
natalie-perlin
ulmononian
approved these changes
Nov 8, 2023
RatkoVasic-NOAA
approved these changes
Nov 8, 2023
srherbener
approved these changes
Nov 8, 2023
This was referenced Nov 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Merge release/1.5.1 into develop. There were a few conflicts to resolve, but hopefully I got it all right.
Testing
Applications affected
n/a
Systems affected
Potentially all.
Dependencies
Issue(s) addressed
Resolves #861
Checklist