Skip to content

Commit

Permalink
Merge pull request #1512 from boutproject/v4.2.1-rc
Browse files Browse the repository at this point in the history
v4.2.1 Release
  • Loading branch information
ZedThree authored Jan 23, 2019
2 parents 450f4d1 + cc0da4a commit 281909b
Show file tree
Hide file tree
Showing 10 changed files with 86 additions and 45 deletions.
28 changes: 26 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,28 @@
# Change Log
# Changelog

## [v4.2.1](https://github.com/boutproject/BOUT-dev/tree/v4.2.1) (2019-01-23)

[Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v4.2.0...v4.2.1)

**Merged pull requests:**

- Fix MAYBE_UNUSED for some compilers [\#1520](https://github.com/boutproject/BOUT-dev/pull/1520) ([ZedThree](https://github.com/ZedThree))
- Try to provide some thread safety to msg_stack [\#1517](https://github.com/boutproject/BOUT-dev/pull/1517) ([d7919](https://github.com/d7919))
- Fix listing available derivative methods [\#1515](https://github.com/boutproject/BOUT-dev/pull/1515) ([ZedThree](https://github.com/ZedThree))
- Initialize Coordinates objects in BoutMesh::load() [\#1509](https://github.com/boutproject/BOUT-dev/pull/1509) ([johnomotani](https://github.com/johnomotani))
- Use localmesh for d2x and d2y, and interpolate them to location [\#1496](https://github.com/boutproject/BOUT-dev/pull/1496) ([johnomotani](https://github.com/johnomotani))
- Hypnotoad fixes [\#1487](https://github.com/boutproject/BOUT-dev/pull/1487) ([bendudson](https://github.com/bendudson))
- Silence remaining warnings on master [\#1485](https://github.com/boutproject/BOUT-dev/pull/1485) ([ZedThree](https://github.com/ZedThree))
- Documentation for making releases [\#1482](https://github.com/boutproject/BOUT-dev/pull/1482) ([ZedThree](https://github.com/ZedThree))
- Silence gcc warning about unrecognised option Wno-cast-function-type [\#1480](https://github.com/boutproject/BOUT-dev/pull/1480) ([ZedThree](https://github.com/ZedThree))
- Fix bugs in boututils.calculus.deriv2D [\#1479](https://github.com/boutproject/BOUT-dev/pull/1479) ([bendudson](https://github.com/bendudson))
- Fix failure of collect() with integer slice argument [\#1421](https://github.com/boutproject/BOUT-dev/pull/1421) ([johnomotani](https://github.com/johnomotani))
- Fix setCoefs in InvertPar [\#1398](https://github.com/boutproject/BOUT-dev/pull/1398) ([arkabokshi](https://github.com/arkabokshi))
- Support BoutOutputs caching option in boutcore \*.fromBoutOutputs [\#1397](https://github.com/boutproject/BOUT-dev/pull/1397) ([johnomotani](https://github.com/johnomotani))
- Hypnotoad: fix unstable integration method used to calculate zShift [\#1387](https://github.com/boutproject/BOUT-dev/pull/1387) ([johnomotani](https://github.com/johnomotani))
- Check for nullptr in NcFormat::get/setAttribute [\#1374](https://github.com/boutproject/BOUT-dev/pull/1374) ([johnomotani](https://github.com/johnomotani))
- Set location in LaplaceCyclic::solve() and DC() [\#1368](https://github.com/boutproject/BOUT-dev/pull/1368) ([johnomotani](https://github.com/johnomotani))
- Changing README example to use cross rather than ^ [\#1357](https://github.com/boutproject/BOUT-dev/pull/1357) ([dschwoerer](https://github.com/dschwoerer))

## [v4.2.0](https://github.com/boutproject/BOUT-dev/tree/v4.2.0) (2018-10-16)
[Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v1.0...v4.2.0)
Expand Down Expand Up @@ -1015,4 +1039,4 @@
## [v1.0](https://github.com/boutproject/BOUT-dev/tree/v1.0) (2011-08-26)


\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
9 changes: 6 additions & 3 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ authors:
- family-names: Allen
given-names: Andrew

- family-names: Bokshi
given-names: Arka

- family-names: Shanahan
given-names: Brendan

Expand Down Expand Up @@ -139,11 +142,11 @@ authors:

- family-names: Wang
given-names: Zhanhui
version: 4.2.0
date-released: 2018-10-16
version: 4.2.1
date-released: 2019-01-23
repository-code: https://github.com/boutproject/BOUT-dev
url: http://boutproject.github.io/
doi: 10.5281/zenodo.1464133
doi: 10.5281/zenodo.2530733
license: 'LGPL-3.0-or-later'
references:
- type: article
Expand Down
22 changes: 11 additions & 11 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for BOUT++ 4.2.0.
# Generated by GNU Autoconf 2.69 for BOUT++ 4.2.1.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='BOUT++'
PACKAGE_TARNAME='bout--'
PACKAGE_VERSION='4.2.0'
PACKAGE_STRING='BOUT++ 4.2.0'
PACKAGE_VERSION='4.2.1'
PACKAGE_STRING='BOUT++ 4.2.1'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1359,7 +1359,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures BOUT++ 4.2.0 to adapt to many kinds of systems.
\`configure' configures BOUT++ 4.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1421,7 +1421,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of BOUT++ 4.2.0:";;
short | recursive ) echo "Configuration of BOUT++ 4.2.1:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1550,7 +1550,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
BOUT++ configure 4.2.0
BOUT++ configure 4.2.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2131,7 +2131,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by BOUT++ $as_me 4.2.0, which was
It was created by BOUT++ $as_me 4.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -12787,7 +12787,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by BOUT++ $as_me 4.2.0, which was
This file was extended by BOUT++ $as_me 4.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -12840,7 +12840,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
BOUT++ config.status 4.2.0
BOUT++ config.status 4.2.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down Expand Up @@ -14015,7 +14015,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by BOUT++ $as_me 4.2.0, which was
This file was extended by BOUT++ $as_me 4.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -14068,7 +14068,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
BOUT++ config.status 4.2.0
BOUT++ config.status 4.2.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#

AC_PREREQ([2.69])
AC_INIT([BOUT++],[4.2.0],[[email protected]])
AC_INIT([BOUT++],[4.2.1],[[email protected]])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])

Expand Down
7 changes: 5 additions & 2 deletions include/unused.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,13 @@
#if __has_cpp_attribute(maybe_unused)
# define MAYBE_UNUSED(x) [[maybe_unused]] x
#endif
#elif defined(__GNUC__)
# define MAYBE_UNUSED(x) x __attribute__((unused))
#endif
#ifndef MAYBE_UNUSED
#if defined(__GNUC__)
# define MAYBE_UNUSED(x) [[gnu::unused]] x
#else
# define MAYBE_UNUSED(x) x
#endif
#endif

#endif //__UNUSED_H__
2 changes: 1 addition & 1 deletion manual/doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = BOUT++
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 4.2.0
PROJECT_NUMBER = 4.2.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion manual/doxygen/Doxyfile_readthedocs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = BOUT++
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 4.2.0
PROJECT_NUMBER = 4.2.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion manual/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def __getattr__(cls, name):
# The short X.Y version.
version = '4.2'
# The full version, including alpha/beta/rc tags.
release = '4.2.0'
release = '4.2.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
5 changes: 4 additions & 1 deletion src/mesh/index_derivs.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,10 @@ DiffLookup lookupFunc(DiffLookup *table, const std::string & label){
// No exact match, so throw
std::string avail{};
for (int i = 0; DiffNameTable[i].method != DIFF_DEFAULT; ++i) {
avail += DiffNameTable[i].label;
if (!isImplemented(table, DiffNameTable[i].method)) {
continue;
}
avail += DiffNameTable[i].label + std::string(": ") + DiffNameTable[i].name;
avail += "\n";
}
throw BoutException("Unknown option %s.\nAvailable options are:\n%s", label.c_str(),
Expand Down
52 changes: 30 additions & 22 deletions src/sys/msg_stack.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,33 @@
*
**************************************************************************/

#include "bout/openmpwrap.hxx"
#include <cstdarg>
#include <msg_stack.hxx>
#include <output.hxx>
#include <stdarg.h>
#include <string>

#if CHECK > 1
int MsgStack::push(const char *s, ...) {
va_list ap; // List of arguments
BOUT_OMP(critical(MsgStack_push)) {
if (s != nullptr) {
va_start(ap, s);
vsnprintf(buffer, MSG_MAX_SIZE, s, ap);
va_end(ap);
} else {
buffer[0] = '\0';
}

if (s != nullptr) {
va_start(ap, s);
vsnprintf(buffer, MSG_MAX_SIZE, s, ap);
va_end(ap);
} else {
buffer[0] = '\0';
}

if (position >= stack.size()) {
stack.emplace_back(buffer);
} else {
stack[position] = buffer;
}
if (position >= stack.size()) {
stack.emplace_back(buffer);
} else {
stack[position] = buffer;
}

return position++;
position++;
};
return position - 1;
}

int MsgStack::setPoint() {
Expand All @@ -58,25 +61,30 @@ int MsgStack::setPoint() {
void MsgStack::pop() {
if (position <= 0)
return;
BOUT_OMP(atomic)
--position;
}

void MsgStack::pop(int id) {
if (id < 0)
id = 0;

if (id > static_cast<int>(position))
return;

position = id;
BOUT_OMP(critical(MsgStack_pop)) {
if (id <= static_cast<int>(position))
position = id;
};
}

void MsgStack::clear() {
stack.clear();
position = 0;
BOUT_OMP(single) {
stack.clear();
position = 0;
}
}

void MsgStack::dump() { output << this->getDump(); }
void MsgStack::dump() {
BOUT_OMP(single) { output << this->getDump(); }
}

std::string MsgStack::getDump() {
std::string res = "====== Back trace ======\n";
Expand Down

0 comments on commit 281909b

Please sign in to comment.