Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Sundials 5.0.0 & and update submodule version #780

Merged
merged 2 commits into from
Jan 2, 2020

Conversation

speth
Copy link
Member

@speth speth commented Dec 20, 2019

  • There is a clear use-case for this code change
  • The commit message has a short title & references relevant issues
  • Build passes (scons build & scons test) and unit tests address code coverage

System installations of Sundials 5.0.0 work without any internal changes to Cantera. Some changes to the build system are required to use it from the git submodule, which is also updated here to point to the official LLNL repository.

Tested on Windows and Linux to not require any changes within Cantera
Switch to the official Sundials repository now that it's on GitHub
@speth speth merged commit 1c59df4 into Cantera:master Jan 2, 2020
@bryanwweber
Copy link
Member

With this change merged, I had to perform the following steps to update my local master branch. I'm not sure if this is totally necessary, but it worked for me. A simple git pull upstream master resulted in

Fetching submodule ext/sundials
error: Server does not allow request for unadvertised object 38aa03b990e616db52acd053730c31fcc3eb91f9

This was because the ext/sundials submodule didn't automatically update the remote. Running git pull upstream master again pulled in the changes to all the files in Cantera, and then git submodule update --recursive resulted in the same error message. So I had to

cd ext/sundials
git remote set-url origin https://github.com/LLNL/sundials
cd ../..
git submodule update --recursive

and then everything was up-to-date. Just recording this here so we can either give advice in the release notes or respond to issues on the UG.

@speth speth deleted the sundials-5.0.0 branch January 8, 2020 21:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants