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

Outerloop suggestions - resolve merge conflicts #2525

Merged
merged 57 commits into from
May 16, 2022

Conversation

dschwoerer
Copy link
Contributor

No description provided.

ZedThree and others added 30 commits February 11, 2022 13:40
CI is skipped automatically, and the tag causes CI to then be skipped
on merge commits that include the commit message
Already covered by other builds
Add setting `diagnose_failures` to control whether detailed
diagnostics are printed every time a SNES solve fails to
converge. Useful for debugging, but excessively noisy for routine
use.

Also differentiate outputs by calling `output_info`, `output_warn`
etc. as appropriate. This provides another level of control on output
verbosity.

Applied Clang format.
Make beuler/snes solver quieter by default
Use the pypi version instead
Co-authored-by: johnomotani <john.omotani@ukaea.uk>
* If NLS is now requested, it fails if not found
* It is only added as a dependency, if found
* Default is to only use if present
dschwoerer and others added 26 commits March 1, 2022 00:25
use git submodule for cloning on RTD
Co-authored-by: Peter Hill <peter.hill@york.ac.uk>
older version not tested, but should still work
I have newer python versions installed for testing, but they dont have all
the libraries installed, thus bout++ always fails. If a new enough cmake is
present we should find the one that appears first in PATH, rather then the
most recent one. It is easy to change PATH to ensure the correct python is found.
ensure zoidberg is installed for documentation
Check the bout++Config.cmake file is working
Adds a header for common backports shared between the different
SUNDIALS solvers such that the main code only needs to differentiate
between SUNDIALS pre/post 3.0.0
Various fixes and updates for CI
Add backports and shims for SUNDIALS 6
* next: (27 commits)
  Also avoid warning from CMP0127
  ensure zoidberg is installed for documentation
  Using python based on version is a pain.
  Add comments
  Update filename for cmake
  Ensure all files get formatted
  Add bout++Config.cmake check to CI
  Fix NLS detection
  use git submodule for cloning on RTD
  CI: Cancel previous workflows on same branch
  CI: Apply clang-format changes immediately
  CI: Only run clang-tidy on changes to C++ files
  CI: Turn off Python for clang-tidy
  CI: Better fix for clang-format?
  CI: Fix clang-tidy-review version
  CI: Fix for actions/checkout not fetching other branches
  CI: Tweak some build names
  CI: Make CMake build use release flags
  CI: Remove unneeded HDF5 flag from build
  CI: Remove OpenMP build
  ...
@bendudson
Copy link
Contributor

Thanks @dschwoerer ! This is really helpful

@bendudson bendudson merged commit c6c4907 into outerloop-suggestions May 16, 2022
@bendudson bendudson deleted the outerloop-suggestions-bd branch May 16, 2022 23:58
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.

None yet

3 participants