Skip to content

Commit 38eae3c

Browse files
authored
Merge pull request #1996 from boutproject/v4.3.1-rc
Release V4.3.1
2 parents fa19fed + bcf01ad commit 38eae3c

File tree

11 files changed

+90
-21
lines changed

11 files changed

+90
-21
lines changed

CHANGELOG.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,52 @@
11
# Change Log
22

3+
## [v4.3.1](https://github.com/boutproject/BOUT-dev/tree/v4.3.1) (2020-03-27)
4+
5+
[Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v4.3.0...v4.3.1)
6+
7+
**Merged pull requests:**
8+
9+
- Fix examples/make-script [\#1995](https://github.com/boutproject/BOUT-dev/pull/1995) ([ZedThree](https://github.com/ZedThree))
10+
- Travis: Update pinned pip packages [\#1994](https://github.com/boutproject/BOUT-dev/pull/1994) ([ZedThree](https://github.com/ZedThree))
11+
- Remove unused VERSIONS file [\#1993](https://github.com/boutproject/BOUT-dev/pull/1993) ([ZedThree](https://github.com/ZedThree))
12+
- Minor Travis fixes and job names (master) [\#1990](https://github.com/boutproject/BOUT-dev/pull/1990) ([ZedThree](https://github.com/ZedThree))
13+
- conditionally add -Og for non-gcc [\#1987](https://github.com/boutproject/BOUT-dev/pull/1987) ([dschwoerer](https://github.com/dschwoerer))
14+
- fix test-laplace-petsc3d [\#1985](https://github.com/boutproject/BOUT-dev/pull/1985) ([dschwoerer](https://github.com/dschwoerer))
15+
- Use '==' to compare to literals in Python [\#1980](https://github.com/boutproject/BOUT-dev/pull/1980) ([ZedThree](https://github.com/ZedThree))
16+
- Read staggered J and Bxy from grid if present (master) [\#1975](https://github.com/boutproject/BOUT-dev/pull/1975) ([johnomotani](https://github.com/johnomotani))
17+
- Remove reference to deleted test in documentation [\#1973](https://github.com/boutproject/BOUT-dev/pull/1973) ([ZedThree](https://github.com/ZedThree))
18+
- Remove -Og from debug flags [\#1972](https://github.com/boutproject/BOUT-dev/pull/1972) ([ZedThree](https://github.com/ZedThree))
19+
- Fix documented requirements [\#1971](https://github.com/boutproject/BOUT-dev/pull/1971) ([ZedThree](https://github.com/ZedThree))
20+
- Compat make.config for make 4.3 [\#1970](https://github.com/boutproject/BOUT-dev/pull/1970) ([dschwoerer](https://github.com/dschwoerer))
21+
- Install make.config with header files [\#1969](https://github.com/boutproject/BOUT-dev/pull/1969) ([dschwoerer](https://github.com/dschwoerer))
22+
- Translations 4.3.1 [\#1968](https://github.com/boutproject/BOUT-dev/pull/1968) ([dschwoerer](https://github.com/dschwoerer))
23+
- Fix collect when given similar name [\#1966](https://github.com/boutproject/BOUT-dev/pull/1966) ([bendudson](https://github.com/bendudson))
24+
- Fix deprecated initialisation and boundary options [\#1956](https://github.com/boutproject/BOUT-dev/pull/1956) ([ZedThree](https://github.com/ZedThree))
25+
- make README.md readabile [\#1953](https://github.com/boutproject/BOUT-dev/pull/1953) ([dschwoerer](https://github.com/dschwoerer))
26+
- Fix lapd\_drift input files [\#1950](https://github.com/boutproject/BOUT-dev/pull/1950) ([bendudson](https://github.com/bendudson))
27+
- Remove FieldData::setBoundary [\#1949](https://github.com/boutproject/BOUT-dev/pull/1949) ([bendudson](https://github.com/bendudson))
28+
- Fixes for staggering in lapd-drift example (master) [\#1928](https://github.com/boutproject/BOUT-dev/pull/1928) ([johnomotani](https://github.com/johnomotani))
29+
- Fix segfaults from PvodeSolver (master) [\#1927](https://github.com/boutproject/BOUT-dev/pull/1927) ([johnomotani](https://github.com/johnomotani))
30+
- pkg-config petsc (master) [\#1913](https://github.com/boutproject/BOUT-dev/pull/1913) ([dschwoerer](https://github.com/dschwoerer))
31+
- Fix hypnotoad [\#1911](https://github.com/boutproject/BOUT-dev/pull/1911) ([johnomotani](https://github.com/johnomotani))
32+
- complete instructions for archlinux [\#1892](https://github.com/boutproject/BOUT-dev/pull/1892) ([dschwoerer](https://github.com/dschwoerer))
33+
- Petsc interface generalisation [\#1889](https://github.com/boutproject/BOUT-dev/pull/1889) ([cmacmackin](https://github.com/cmacmackin))
34+
- fix citation [\#1888](https://github.com/boutproject/BOUT-dev/pull/1888) ([dschwoerer](https://github.com/dschwoerer))
35+
- If variable is added to Datafile twice, do not write twice [\#1876](https://github.com/boutproject/BOUT-dev/pull/1876) ([johnomotani](https://github.com/johnomotani))
36+
- Fix loss of restart files caused by crash during initialisation [\#1875](https://github.com/boutproject/BOUT-dev/pull/1875) ([johnomotani](https://github.com/johnomotani))
37+
- Do not include if is released [\#1871](https://github.com/boutproject/BOUT-dev/pull/1871) ([dschwoerer](https://github.com/dschwoerer))
38+
- Easier instructions for Fedora [\#1870](https://github.com/boutproject/BOUT-dev/pull/1870) ([dschwoerer](https://github.com/dschwoerer))
39+
- Basic lock for mpark.variant [\#1869](https://github.com/boutproject/BOUT-dev/pull/1869) ([dschwoerer](https://github.com/dschwoerer))
40+
- Add BOUT\_REVISION (git hash of compiled version) to dump files [\#1867](https://github.com/boutproject/BOUT-dev/pull/1867) ([johnomotani](https://github.com/johnomotani))
41+
- Mesh requires Option to stay around. [\#1860](https://github.com/boutproject/BOUT-dev/pull/1860) ([dschwoerer](https://github.com/dschwoerer))
42+
- Try to prevent race condition while building. [\#1856](https://github.com/boutproject/BOUT-dev/pull/1856) ([dschwoerer](https://github.com/dschwoerer))
43+
- Address needs to be aligned [\#1855](https://github.com/boutproject/BOUT-dev/pull/1855) ([dschwoerer](https://github.com/dschwoerer))
44+
- set OMPI\_MCA\_rmaps\_base\_oversubscribe=yes for tests [\#1854](https://github.com/boutproject/BOUT-dev/pull/1854) ([dschwoerer](https://github.com/dschwoerer))
45+
- Loosen tolerance for other arches [\#1853](https://github.com/boutproject/BOUT-dev/pull/1853) ([dschwoerer](https://github.com/dschwoerer))
46+
- Bugfix: $MPIRUN should include -np [\#1851](https://github.com/boutproject/BOUT-dev/pull/1851) ([dschwoerer](https://github.com/dschwoerer))
47+
- Add some documentation on setting locales [\#1845](https://github.com/boutproject/BOUT-dev/pull/1845) ([bendudson](https://github.com/bendudson))
48+
- Fix typo in initialisation of rgn\_outer\_x [\#1838](https://github.com/boutproject/BOUT-dev/pull/1838) ([ZedThree](https://github.com/ZedThree))
49+
350
## [v4.3.0](https://github.com/boutproject/BOUT-dev/tree/v4.3.0) (2019-10-24)
451
[Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v4.2.3...v4.3.0)
552

CITATION.bib

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@misc{BOUTv4-3-0,
1+
@misc{BOUTv4-3-1,
22
author = {
33
Benjamin Daniel Dudson and
44
Peter Alec Hill and
@@ -36,6 +36,7 @@ @misc{BOUTv4-3-0
3636
Olivier Izacard and
3737
Pengwei Xi and
3838
Peter Naylor and
39+
Fabio Riva and
3940
Sanat Tiwari and
4041
Sean Farley and
4142
Simon Myers and
@@ -48,7 +49,7 @@ @misc{BOUTv4-3-0
4849
title = {{BOUT++}},
4950
month = {10},
5051
year = {2019},
51-
doi = {10.5281/zenodo.3518905},
52+
doi = {10.5281/zenodo.3727089},
5253
url = {https://github.com/boutproject/BOUT-dev}
5354
}
5455

CITATION.cff

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ authors:
126126
- family-names: Naylor
127127
given-names: Peter
128128

129+
- family-names: Riva
130+
given-names: Fabio
131+
orcid: https://orcid.org/0000-0002-0264-442X
132+
affiliation: Culham Centre for Fusion Energy
133+
129134
- family-names: Tiwari
130135
given-names: Sanat
131136

@@ -149,11 +154,11 @@ authors:
149154

150155
- family-names: Wang
151156
given-names: Zhanhui
152-
version: 4.3.0
153-
date-released: 2019-10-25
157+
version: 4.3.1
158+
date-released: 2020-03-27
154159
repository-code: https://github.com/boutproject/BOUT-dev
155160
url: http://boutproject.github.io/
156-
doi: 10.5281/zenodo.3518905
161+
doi: 10.5281/zenodo.3727089
157162
license: 'LGPL-3.0-or-later'
158163
references:
159164
- type: article

change_summary.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@
33
This is a slightly more readable, and therefore incomplete, summary of
44
the changes from the full [changelog](CHANGELOG.md)
55

6+
4.3.1 is a bugfix release, with a few minor fixes to library code,
7+
notably:
8+
- Fix the creation of the `RGN_OUTER_X` region
9+
- Several small bugs in the Python API
10+
- Preserve restart files if there's a crash during initialisation
11+
- Fix some segfaults in the PvodeSolver
12+
- Fix some issues with Hypnotoad (see
13+
[\#1783](https://github.com/boutproject/BOUT-dev/pull/1783)
14+
([friva000](https://github.com/friva000)))
15+
16+
Other changes are mostly housekeeping changes for the BOUT++ project.
17+
618
4.3.0 is a big feature release:
719
- `Field`s are now "tagged" with their "y-direction": that is, whether
820
they are in field-aligned space or not. This allows us to perform

configure

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for BOUT++ 4.3.0.
3+
# Generated by GNU Autoconf 2.69 for BOUT++ 4.3.1.
44
#
55
# Report bugs to <bd512@york.ac.uk>.
66
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
580580
# Identity of this package.
581581
PACKAGE_NAME='BOUT++'
582582
PACKAGE_TARNAME='bout--'
583-
PACKAGE_VERSION='4.3.0'
584-
PACKAGE_STRING='BOUT++ 4.3.0'
583+
PACKAGE_VERSION='4.3.1'
584+
PACKAGE_STRING='BOUT++ 4.3.1'
585585
PACKAGE_BUGREPORT='bd512@york.ac.uk'
586586
PACKAGE_URL=''
587587

@@ -1392,7 +1392,7 @@ if test "$ac_init_help" = "long"; then
13921392
# Omit some internal or obsolete options to make the list less imposing.
13931393
# This message is too long to be a string in the A/UX 3.1 sh.
13941394
cat <<_ACEOF
1395-
\`configure' configures BOUT++ 4.3.0 to adapt to many kinds of systems.
1395+
\`configure' configures BOUT++ 4.3.1 to adapt to many kinds of systems.
13961396

13971397
Usage: $0 [OPTION]... [VAR=VALUE]...
13981398

@@ -1457,7 +1457,7 @@ fi
14571457

14581458
if test -n "$ac_init_help"; then
14591459
case $ac_init_help in
1460-
short | recursive ) echo "Configuration of BOUT++ 4.3.0:";;
1460+
short | recursive ) echo "Configuration of BOUT++ 4.3.1:";;
14611461
esac
14621462
cat <<\_ACEOF
14631463

@@ -1601,7 +1601,7 @@ fi
16011601
test -n "$ac_init_help" && exit $ac_status
16021602
if $ac_init_version; then
16031603
cat <<\_ACEOF
1604-
BOUT++ configure 4.3.0
1604+
BOUT++ configure 4.3.1
16051605
generated by GNU Autoconf 2.69
16061606

16071607
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2182,7 +2182,7 @@ cat >config.log <<_ACEOF
21822182
This file contains any messages produced by compilers while
21832183
running configure, to aid debugging if configure makes a mistake.
21842184

2185-
It was created by BOUT++ $as_me 4.3.0, which was
2185+
It was created by BOUT++ $as_me 4.3.1, which was
21862186
generated by GNU Autoconf 2.69. Invocation command line was
21872187

21882188
$ $0 $@
@@ -15365,7 +15365,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1536515365
# report actual input values of CONFIG_FILES etc. instead of their
1536615366
# values after options handling.
1536715367
ac_log="
15368-
This file was extended by BOUT++ $as_me 4.3.0, which was
15368+
This file was extended by BOUT++ $as_me 4.3.1, which was
1536915369
generated by GNU Autoconf 2.69. Invocation command line was
1537015370

1537115371
CONFIG_FILES = $CONFIG_FILES
@@ -15422,7 +15422,7 @@ _ACEOF
1542215422
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1542315423
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1542415424
ac_cs_version="\\
15425-
BOUT++ config.status 4.3.0
15425+
BOUT++ config.status 4.3.1
1542615426
configured by $0, generated by GNU Autoconf 2.69,
1542715427
with options \\"\$ac_cs_config\\"
1542815428

@@ -16734,7 +16734,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1673416734
# report actual input values of CONFIG_FILES etc. instead of their
1673516735
# values after options handling.
1673616736
ac_log="
16737-
This file was extended by BOUT++ $as_me 4.3.0, which was
16737+
This file was extended by BOUT++ $as_me 4.3.1, which was
1673816738
generated by GNU Autoconf 2.69. Invocation command line was
1673916739

1674016740
CONFIG_FILES = $CONFIG_FILES
@@ -16791,7 +16791,7 @@ _ACEOF
1679116791
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1679216792
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1679316793
ac_cs_version="\\
16794-
BOUT++ config.status 4.3.0
16794+
BOUT++ config.status 4.3.1
1679516795
configured by $0, generated by GNU Autoconf 2.69,
1679616796
with options \\"\$ac_cs_config\\"
1679716797

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#
3333

3434
AC_PREREQ([2.69])
35-
AC_INIT([BOUT++],[4.3.0],[bd512@york.ac.uk])
35+
AC_INIT([BOUT++],[4.3.1],[bd512@york.ac.uk])
3636
AC_CONFIG_AUX_DIR([build-aux])
3737
AC_CONFIG_MACRO_DIR([m4])
3838

locale/makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ locale: $(MO_FILES)
1212

1313
# Create the template file, combining all source files
1414
libbout.pot: FORCE
15-
xgettext --keyword=_ --language=c++ --add-comments --sort-output -o $@ `find ../ -name "[^.#]*.[ch]xx"`
15+
xgettext --keyword=_ --language=c++ --add-comments --sort-output -o $@ `find ../src ../include ../tests ../examples -name "[^.#]*.[ch]xx"`
1616

1717
# Update a .po file
1818
# If it doesn't exist then create; if it exists then update

manual/RELEASE_HOWTO.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ releases
2323

2424
Before merging PR:
2525

26+
- [ ] Update locale translation files
27+
- `make -C locale update-all`
28+
- Be aware that this *will* update the timestamps and *possibly*
29+
reorder file paths in the .po and .pot files
2630
- [ ] Update [`CHANGELOG.md`][changelog]:
2731
- Install [`github_changelog_generator`][gcg]
2832
- Make sure it is at least v1.15!

manual/doxygen/Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = BOUT++
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 4.3.0
41+
PROJECT_NUMBER = 4.3.1
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

manual/doxygen/Doxyfile_readthedocs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = BOUT++
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 4.3.0
41+
PROJECT_NUMBER = 4.3.1
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

0 commit comments

Comments
 (0)