Merge pull request #2499 from boutproject/v4.4.2-rc

v4.4.2 release

CHANGELOG.md

@@ -17,6 +17,18 @@
 
   See [\#2154](https://github.com/boutproject/BOUT-dev/pull/2154).
 
+## [v4.4.2](https://github.com/boutproject/BOUT-dev/tree/v4.4.2) (2021-12-15)
+
+[Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v4.4.1...v4.4.2)
+
+**Merged pull requests:**
+
+- CMake: option to ignore a conda environment; fix for PVODE [\#2494](https://github.com/boutproject/BOUT-dev/pull/2494) ([johnomotani](https://github.com/users/johnomotani))
+- CMake fixes for netCDF [\#2493](https://github.com/boutproject/BOUT-dev/pull/2493) ([johnomotani](https://github.com/users/johnomotani))
+- Fix bug in PetscLib that broke no-PETSc builds [\#2492](https://github.com/boutproject/BOUT-dev/pull/2492) ([johnomotani](https://github.com/users/johnomotani))
+- Remove tests depending on UB [\#2491](https://github.com/boutproject/BOUT-dev/pull/2491) ([j-b-o](https://github.com/users/j-b-o))
+- Make cmake submodule update work with older versions of git [\#2490](https://github.com/boutproject/BOUT-dev/pull/2490) ([johnomotani](https://github.com/users/johnomotani))
+
 ## [v4.4.1](https://github.com/boutproject/BOUT-dev/tree/v4.4.1) (2021-12-15)
 
 [Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v4.4.0...v4.4.1)

CITATION.cff

@@ -164,11 +164,11 @@ authors:
   - family-names: James
     given-names: Toby
 
-version: 4.4.1
-date-released: 2022-01-13
+version: 4.4.2
+date-released: 2022-03-03
 repository-code: https://github.com/boutproject/BOUT-dev
 url: http://boutproject.github.io/
-doi: 10.5281/zenodo.5776785
+doi: 10.5281/zenodo.6325664
 license: 'LGPL-3.0-or-later'
 references:
   - type: article

CMakeLists.txt

@@ -8,7 +8,7 @@ endif()
 
 # CMake currently doesn't support proper semver
 # Set the version here, strip the prerelease identifier to use in `project`
-set(BOUT_FULL_VERSION 4.4.1)
+set(BOUT_FULL_VERSION 4.4.2)
 string(REGEX REPLACE "^([0-9]+\.[0-9]+\.[0-9]+)-.*" "\\1" BOUT_CMAKE_ACCEPTABLE_VERSION ${BOUT_FULL_VERSION})
 
 project(BOUT++

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for BOUT++ 4.4.1.
+# Generated by GNU Autoconf 2.69 for BOUT++ 4.4.2.
 #
 # Report bugs to <[email protected]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='BOUT++'
 PACKAGE_TARNAME='bout--'
-PACKAGE_VERSION='4.4.1'
-PACKAGE_STRING='BOUT++ 4.4.1'
+PACKAGE_VERSION='4.4.2'
+PACKAGE_STRING='BOUT++ 4.4.2'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1401,7 +1401,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.4.1 to adapt to many kinds of systems.
+\`configure' configures BOUT++ 4.4.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1466,7 +1466,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of BOUT++ 4.4.1:";;
+     short | recursive ) echo "Configuration of BOUT++ 4.4.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1614,7 +1614,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-BOUT++ configure 4.4.1
+BOUT++ configure 4.4.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2195,7 +2195,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.4.1, which was
+It was created by BOUT++ $as_me 4.4.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -16254,7 +16254,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.4.1, which was
+This file was extended by BOUT++ $as_me 4.4.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16311,7 +16311,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.4.1
+BOUT++ config.status 4.4.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -17628,7 +17628,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.4.1, which was
+This file was extended by BOUT++ $as_me 4.4.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17685,7 +17685,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.4.1
+BOUT++ config.status 4.4.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -32,7 +32,7 @@
 #
 
 AC_PREREQ([2.69])
-AC_INIT([BOUT++],[4.4.1],[[email protected]])
+AC_INIT([BOUT++],[4.4.2],[[email protected]])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 

locale/de/libbout.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: BOUT++ 4.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-13 14:14+0000\n"
+"POT-Creation-Date: 2022-02-15 16:11+0000\n"
 "PO-Revision-Date: 2020-03-19 12:42+0000\n"
 "Last-Translator: David <[email protected]>\n"
 "Language-Team: German\n"
@@ -276,7 +276,7 @@ msgstr ""
 "  -v, --verbose\t\tWortreicherer Ausgabe\n"
 "  -q, --quiet\t\tNur wichtigere Ausgaben anzeigen\n"
 
-#: ../src/solver/solver.cxx:509
+#: ../src/solver/solver.cxx:510
 #, c-format
 msgid ""
 "\n"
@@ -285,7 +285,7 @@ msgstr ""
 "\n"
 "Simulation beendet um %s\n"
 
-#: ../src/solver/solver.cxx:474
+#: ../src/solver/solver.cxx:475
 #, c-format
 msgid ""
 "\n"
@@ -322,7 +322,7 @@ msgstr ""
 msgid ") overwritten with:"
 msgstr ") überschrieben mit:"
 
-#: ../tests/unit/src/test_bout++.cxx:294
+#: ../tests/unit/src/test_bout++.cxx:293
 msgid "4 of 8"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "Command line"
 msgstr "Befehlszeile"
 
-#: ../src/bout++.cxx:389 ../tests/unit/src/test_bout++.cxx:300
+#: ../src/bout++.cxx:389 ../tests/unit/src/test_bout++.cxx:299
 msgid "Compile-time options:\n"
 msgstr "Kompiliert mit:\n"
 
-#: ../tests/unit/src/test_bout++.cxx:304
+#: ../tests/unit/src/test_bout++.cxx:303
 msgid "Compiled with flags"
 msgstr "Wurde mit folgenden Optionen kompiliert"
 
@@ -414,7 +414,7 @@ msgstr ""
 "Der Befehl 'bout-log-color' konnte nicht ausgeführt werden. Stellen Sie "
 "sicher, dass er sich in $PATH befindet.\n"
 
-#: ../src/solver/solver.cxx:669
+#: ../src/solver/solver.cxx:668
 #, c-format
 msgid "Couldn't add Monitor: %g is not a multiple of %g!"
 msgstr ""
@@ -452,7 +452,7 @@ msgstr "Der Datenordner \"%s\" existiert nicht oder ist nicht lesbar\n"
 msgid "DataDir \"%s\" is not a directory\n"
 msgstr "\"%s\" soll als Datenordner verwendet werden, ist jedoch kein Ordner\n"
 
-#: ../src/solver/solver.cxx:587
+#: ../src/solver/solver.cxx:588
 msgid "ERROR: Solver is already initialised\n"
 msgstr "FEHLER: Der Integrator ist bereits initialisiert.\n"
 
@@ -470,7 +470,7 @@ msgstr "Es wurde ein Fehler beim Schreiben der Einstellungsdatei gefunden"
 msgid "Error: nx must be greater than 2 times MXG (2 * %d)"
 msgstr "Fehler: nx muss größer als 2 mal MXG sein (2 * %d)"
 
-#: ../src/solver/solver.cxx:454
+#: ../src/solver/solver.cxx:455
 msgid "Failed to initialise solver-> Aborting\n"
 msgstr ""
 "Der Integrator konnte nicht initialisiert werden. Der Prozess wird "
@@ -481,7 +481,7 @@ msgstr ""
 msgid "Finding value for NXPE (ideal = %f)\n"
 msgstr "Suche NXPE Wert (optimal = %f)\n"
 
-#: ../src/solver/solver.cxx:589
+#: ../src/solver/solver.cxx:426
 msgid "Initialising solver\n"
 msgstr "Integrator wird initialisiert\n"
 
@@ -516,11 +516,11 @@ msgstr "Das Gitter muss ny enthalten"
 msgid "Missing integer array %s\n"
 msgstr "Ganzzahlen-Array '%s' nicht gesetzt\n"
 
-#: ../src/solver/solver.cxx:773
+#: ../src/solver/solver.cxx:772
 msgid "Monitor signalled to quit"
 msgstr "Der Monitor signaliserte die Beendigung"
 
-#: ../src/solver/solver.cxx:780
+#: ../src/solver/solver.cxx:779
 msgid "Monitor signalled to quit\n"
 msgstr "Beendigung durch Monitor\n"
 
@@ -605,20 +605,20 @@ msgstr "Perp Region '%s' hinzugefügt"
 msgid "Revision: %s\n"
 msgstr "Revision: %s\n"
 
-#: ../src/solver/solver.cxx:510
+#: ../src/solver/solver.cxx:511
 msgid "Run time : "
 msgstr "Dauer: "
 
 #. / Run the solver
-#: ../src/solver/solver.cxx:467
+#: ../src/solver/solver.cxx:468
 msgid ""
 "Running simulation\n"
 "\n"
 msgstr ""
 "Simulation wird gestartet\n"
 "\n"
 
-#: ../tests/unit/src/test_bout++.cxx:301
+#: ../tests/unit/src/test_bout++.cxx:300
 msgid "Signal"
 msgstr ""
 
@@ -641,18 +641,18 @@ msgstr ""
 "Komm    I/O   Integrator\n"
 "\n"
 
-#: ../src/solver/solver.cxx:449
+#: ../src/solver/solver.cxx:450
 #, c-format
 msgid "Solver running for %d outputs with monitor timestep of %e\n"
 msgstr ""
 "Integriere mit einem `Monitor`-Zeitschritt von %2$e für %1$d Aufrufe.\n"
 
-#: ../src/solver/solver.cxx:445
+#: ../src/solver/solver.cxx:446
 #, c-format
 msgid "Solver running for %d outputs with output timestep of %e\n"
 msgstr "Integriere %d Zeitschritte von je %e\n"
 
-#: ../src/solver/solver.cxx:684
+#: ../src/solver/solver.cxx:683
 #, c-format
 msgid ""
 "Solver::addMonitor: Cannot reduce timestep (from %g to %g) after init is "
@@ -661,7 +661,7 @@ msgstr ""
 "Der Integrator kann den Zeitschritt nicht von %g auf %g reduzieren, nachdem "
 "er initialisiert wurde!"
 
-#: ../src/solver/solver.cxx:1132
+#: ../src/solver/solver.cxx:1131
 #, c-format
 msgid ""
 "Time derivative at wrong location - Field is at %s, derivative is at %s for "
@@ -670,7 +670,7 @@ msgstr ""
 "Die zeitliche Ableitung ist an der falschen Stelle. Das Feld '%3$s' ist an "
 "Position %1$s, während die Ableitung an Position %2$s ist.\n"
 
-#: ../src/solver/solver.cxx:1354
+#: ../src/solver/solver.cxx:1353
 #, c-format
 msgid "Time derivative for variable '%s' not set"
 msgstr "Zeitliche Ableitung für Variable '%s' nicht gesetzt"
@@ -722,7 +722,7 @@ msgstr "Benutzung: %s -f <Logdatei>\n"
 msgid "Usage is %s -o <settings filename>\n"
 msgstr "Benutzung: %s -f <Einstellungsdatei>\n"
 
-#: ../tests/unit/src/test_bout++.cxx:30 ../tests/unit/src/test_bout++.cxx:44
+#: ../tests/unit/src/test_bout++.cxx:29 ../tests/unit/src/test_bout++.cxx:43
 msgid "Usage:"
 msgstr ""
 
@@ -738,7 +738,7 @@ msgstr ""
 "[VAR=WERT]\n"
 
 #. restart file should be written by physics model
-#: ../src/solver/solver.cxx:795
+#: ../src/solver/solver.cxx:794
 msgid "User signalled to quit. Returning\n"
 msgstr "Beendigung durch Benutzer.\n"
 
@@ -773,7 +773,7 @@ msgstr "Wert der Option %s ist keine Boolescher Wert"
 msgid "Value for option %s is not an integer"
 msgstr "Wert der Option %s ist keine Ganzzahl"
 
-#: ../src/solver/solver.cxx:1091 ../src/solver/solver.cxx:1095
+#: ../src/solver/solver.cxx:1090 ../src/solver/solver.cxx:1094
 #, c-format
 msgid "Variable '%s' not initialised"
 msgstr "Variable '%s' ist nicht initialisiert"