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

Merge v4.3.1 into next #1999

Merged
merged 122 commits into from
Mar 30, 2020
Merged

Merge v4.3.1 into next #1999

merged 122 commits into from
Mar 30, 2020

Conversation

ZedThree
Copy link
Member

I deliberately excluded the language translation files as there were a ton of conflicts. Probably easier to do that separately.

AdamD94 and others added 30 commits November 11, 2019 10:06
Use lastX() check instead of firstX() when initialising rgn_outer_x
…uter-x

Fix typo in initialisation of rgn_outer_x
Setting this up can be a bit fiddly, but is unfortunately
largely out of our control.
Add some documentation on setting locales
Setting OMPI_MCA_rmaps_base_oversubscribe=yes is required
for openmpi 3 to ignore oversubscription. In case of the
tests we don't care about performance, so always setting
this shouldn't be an issue.
This value gets dereferenced by python, but without knowing it's true
type. Thus a SIGBUS is thrown on some architectures, namely arm. This
can be avoided by copying it to a larger type first, e.g. long, that
is sufficiently aligned, and thus can be safely dereferenced by
python.
This improves the current situation, as before it could happen that
building failed, because the .a was not yet created. Now it waits for
it to be created. Switching to atomic mv rather then to create it
inplace, ensures that if the file is seen, it is valid.
This does not address the case when the .a is recreated, and the
dependend file is checked before whether the .a has changed.
Ensures that, if several instances try to download mpark.variant,
only one can succeed with the atomic mkdir, and thus only one
instance tries to download. The oters are waiting for the lock
directory to vanish, and then resume with building.
set OMPI_MCA_rmaps_base_oversubscribe=yes for tests
Bugfix: $MPIRUN should include -np
Loosen tolerance for other arches
Python will, without this patch, in some cases delete the option
that was used. Thus we need to save a copy, so that while the Mesh
stays around, so does the Option that was used to create it, and
thus option is not GC. Otherwise segfaults or worse happens.
Helps provenance tracking of simulations.
REVISION is the git hash of BOUT++. This may not be available, for
example if BOUT++ was compiled from a source tarball.
If the Datafile is not enabled, return immediately from setAttribute()
as it will be an error to try to write an attribute to a non-existent
file.
Since #ifdef check added in setRunStartInfo(), need to add the
same #ifdef check in the unit test
TEST(BoutInitialiseFunctions, SetRunStartInfo).
Try to prevent race condition while building.
Add BOUT_REVISION (git hash of compiled version) to dump files
Should be valid starting next week, when bout++ reaches stable.
`bould-dep` already works as now, and should stay up to date.
Should be released, rather than release.
Ensures restart files always contain valid data, and data in existing
restart files is not lost if a simulation crashes before the
modelMonitor is first called.
Writing a time-evolving variable twice can corrupt data files, so if the
same variable is added twice with the same name, just skip adding the
second time.
If variable is added to Datafile twice, do not write twice
Fix loss of restart files caused by crash during initialisation
ZedThree and others added 23 commits March 25, 2020 16:17
Minor Travis fixes and job names (master)
* master:
  Fix unused argument warning in examples/make-script
  Fix examples/make-script for make < 4.2
  Travis: Update pinned pip packages
  Remove unused VERSIONS file
  Travis: Add names for jobs
  Travis: Specify OS
  Travis: Make aliases a private key
  Travis: Rename deprecated key
  Travis: Removed deprecated 'sudo' key
  Check for g++ not gcc
  conditionally add -Og for non-gcc
  Remove -Og from debug flags
  Update German translation
  Update translation files
Don't want to include files in build or cache directories
* master: (81 commits)
  Update release date
  Update summary of changes
  Update changelog for 4.3.1
  Add release checklist item to update translation files
  Only update translations from BOUT++ source files
  Bump version to 4.3.1
  Update generated CITATION.bib
  Bump version and DOI in CITATION.cff
  Add Fabio Riva to list of authors
  Fix unused argument warning in examples/make-script
  Fix examples/make-script for make < 4.2
  Travis: Update pinned pip packages
  Remove unused VERSIONS file
  Travis: Add names for jobs
  Travis: Specify OS
  Travis: Make aliases a private key
  Travis: Rename deprecated key
  Travis: Removed deprecated 'sudo' key
  Check for g++ not gcc
  conditionally add -Og for non-gcc
  ...
@ZedThree ZedThree added this to the BOUT-5.0 milestone Mar 27, 2020
@dschwoerer
Copy link
Contributor

I deliberately excluded the language translation files as there were a ton of conflicts. Probably easier to do that separately.

Fine with me. I don't think there was a lot of work in there, should be easier to do from scratch ...
Also I guess it's very difficult to work with a foreign language ...

@ZedThree ZedThree merged commit 33c151c into next Mar 30, 2020
@ZedThree ZedThree deleted the next-merge-v4.3.1 branch March 30, 2020 09:48
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

5 participants