Merge v4.3.2 into next #2139
Merged
Merge v4.3.2 into next #2139
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
Previously a build would wait indefently if a previous download of
mpark.variant was interrupted. now a timeout is added.
Further, rather then using sub-shells `( ... )` where the exit status
$ex is lost, we use code-blocks `{ ... }` to receive the exit
status.
Prevent deadlock in downloading mpark
Make dz in boutcore a property
Update the staggered grids section of the manual (to master)
Simply have "/clang-format" as the first line in a comment to have clang-format automatically run over your PR!
Add clang-format bot command for pull requests
Add location checks to Div_par_K_Grad_par
- Change MZ from 33 to 32 - Set "StaggerGrids = true" in the [mesh] section - Remove unnecessary "NXPE = 2" - Remove "ShiftXderivs = false" which no longer has any effect
…lit-master Enable staggered versions of SplitFluxDerivativeType (master)
Grad2_par2(f) has contributions from both D2DY2(f) and DDY(f) when the metric component g_22 is not constant in the y-direction.
Previously in the tests with non-zero coefficients of z-derivative terms in InvertPar, the input only had y-variation, so the test did not test those terms.
Should not divide by dz because kwave is defined using zlength().
Apparently these are not the defaults any more.
Not sure why this is happening, possibly when dcoef is a multiple of acoef?
The ccoef=3 case seems to be inaccurate - possible ccoef is too large compared to bcoef=-1?? Replacing with a slightly smaller value or setting bcoef=0 lets the test pass.
Exercise the parts of the Grad2_par2 operator which correct for non-constant metric. Also corrections for factors of dz and zlength are now tested by ensuring that neither of them are 1.
Could simplify further with new options interface
If non_uniform is true (the default), D2DY2 includes a correction for varying dy. This fix makes Invpar inconsistent with this. Test updated to have varying dy, in addition to a varying g_22 metric.
Just spacing around for, if statements
Fixes a floating-point exception in InvertParCR caused by trying to solve in boundary cells.
…ar2-master Correct Grad2_par2 implementation in InvertParCR (master)
This ensures the include'd makefile.submodules is found, and thus make succeeds, as otherwise the flags aren't exported to bout-config, which among others breaks boutcore.
Customisable via an environment variable so we can make it shorter on Travis
Travis runs our script through another program to filter out any secret environment variables from the log, but this may lead to stdout getting truncated. Sleep a little bit to try and make sure it gets flushed so we can actually read any errors
Add configure option to use system mpark.variant
Fix reading/writing std::string attributes when using HDF5
Compiling all examples can take over 1000s
Make output nicer + add info about timeout'ed tests
Add timeout to tests
Rename death tests according to gtest recommendations
Bugfix release: v4.3.2
Links weren't specified using https so were linking to nonexistent pages on readthedocs.io.
Fix links to open-mpi.org and lam-mpi.org
Ignore more test data
* master: (67 commits) Fix links to open-mpi.org and lam-mpi.org Update citation files for v4.3.2 Update changelog and change summary for v4.3.2 Ignore more test data Travis: Fix typo in ctest command Increase timeout for all tests Make output nicer + add info about timeout'ed tests Travis: Make sure stdout gets flushed on build finish Kill tests that take longer than 10 minutes CMake: Timeout tests after 5 minutes on Travis set BOUT_TOP to ensure the include file is found Build first shared target, then python library Add support for multiple targets switch to python3 in boutcore Move submodules target to standalone file and add documentation Rename death tests according to gtest recommendations Fix reading/writing std::string attributes when using HDF5 [skip travis] Update breathe for readthedocs Fix Div_par when using more than one y guard cell [skip travis] Add `soname` to release checklist ...
Previous merge put it in wrong location
|
I had to manually merge the changes to |
timeout command in the wrong place when resolving conflicts in merge
bendudson
approved these changes
Nov 24, 2020
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.
There were a few changes to master that didn't make it into next