-
Notifications
You must be signed in to change notification settings - Fork 90
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
Merge v4.4.0 release into next #2396
Merged
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
_very_ difficult to reproduce, probably rounding error
This is consistent with the existing Makefile approach and removes the need for EXECUTABLE_NAME
Previously changed test in fab7328 to not copy+sed input file, forgot that the input file in data/ wasn't in repo
Argument must be representable as `unsigned char`, so must `static_cast` argument
Workaround for name resolution bug in MSVC
This is a BSD extension in GNU's libc
Also conditionally include strings.h
Also make sure to catch them by const-ref
Allows storing `FieldPerp` in `Options`
Also check that y-indices match in operator==
`FieldPerp::getGlobalIndex` calls `Mesh::hasBndrylowery` which calls `MPI_Allreduce` and `Mesh::getXcomm`. These fixes were already in `next` when the `OptionsNetCDF` test with `FieldPerp` was added there
Adding an adaptive, arbitrary order, Adams-Bashforth solver (v4.4)
Add Mesh::getRegion<T> for use in generic code (v4.4)
Add ability to use FieldPerp in Options (v.4.4)
Release V4.4.0
* master: (449 commits) Update change summary Update changelog Bump DOI and release date for v4.4.0 CMake: Bump version Initialise MPI for tests and fix FakeMesh Normalise location in Field constructor Fix FieldPerp equality unit tests (didn't set y-index) Fix error message in Options::as<FieldPerp> Add ability to read/write FieldPerp to OptionsNetCDF Add FieldPerp to Options::ValueType variant Add Options::hasAttribute to check for existence of attribute Fix range-based for loops in tests copying element Add FieldPerp::getGlobalindex/setIndexFromGlobal Add FieldPerp constructor from Array<BoutReal> Add toString, operator<<, operator==, typeName for FieldPerp Add `const` suggested by clang-tidy Fix typo in PETSc options docs Make bout-squashoutput a symlink to boutdata version Don't run pytest on GHA: all tested modules are now separate repos Bump boutdata/boututils for v4.4 ...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
clang-tidy made some suggestions
johnomotani
previously approved these changes
Aug 9, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
[skip ci] Co-authored-by: johnomotani <john.omotani@ukaea.uk>
johnomotani
previously approved these changes
Aug 23, 2021
dschwoerer
requested changes
Aug 23, 2021
We don't install the included file, thus not being present shouldn't be an error
dschwoerer
approved these changes
Aug 25, 2021
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.
To fix the conflicts, I basically just took all changes from
next
, leaving only a few changes that are just in v4.4.0.