From 47cc4ba384cbfe25c011e2c516aeb7082acb52d6 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Tue, 15 Feb 2022 16:11:48 +0000 Subject: [PATCH 1/6] Update localisation files --- locale/de/libbout.po | 46 ++++++++++++++++++++--------------------- locale/es/libbout.po | 46 ++++++++++++++++++++--------------------- locale/fr/libbout.po | 46 ++++++++++++++++++++--------------------- locale/libbout.pot | 46 ++++++++++++++++++++--------------------- locale/zh_CN/libbout.po | 46 ++++++++++++++++++++--------------------- locale/zh_TW/libbout.po | 46 ++++++++++++++++++++--------------------- 6 files changed, 138 insertions(+), 138 deletions(-) diff --git a/locale/de/libbout.po b/locale/de/libbout.po index 22f0a40be8..a93b6eaa08 100644 --- a/locale/de/libbout.po +++ b/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 \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,12 +605,12 @@ 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" @@ -618,7 +618,7 @@ 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 \n" msgid "Usage is %s -o \n" msgstr "Benutzung: %s -f \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" diff --git a/locale/es/libbout.po b/locale/es/libbout.po index e04ce27614..9446b77917 100644 --- a/locale/es/libbout.po +++ b/locale/es/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: 2019-02-11 12:46+0900\n" "Last-Translator: Marta \n" "Language-Team: Spanish\n" @@ -273,7 +273,7 @@ msgstr "" " -v, --verbose\t\tAumentar verbosidad\n" " -q, --quiet\t\tDisminuir verbosidad\n" -#: ../src/solver/solver.cxx:509 +#: ../src/solver/solver.cxx:510 #, c-format msgid "" "\n" @@ -282,7 +282,7 @@ msgstr "" "\n" "Ejecución finalizada en : %s\n" -#: ../src/solver/solver.cxx:474 +#: ../src/solver/solver.cxx:475 #, c-format msgid "" "\n" @@ -319,7 +319,7 @@ msgstr "" msgid ") overwritten with:" msgstr "" -#: ../tests/unit/src/test_bout++.cxx:294 +#: ../tests/unit/src/test_bout++.cxx:293 msgid "4 of 8" msgstr "" @@ -363,11 +363,11 @@ msgstr "" msgid "Command line" msgstr "Línea de comandos" -#: ../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 "Opciones de tiempo de compilación:\n" -#: ../tests/unit/src/test_bout++.cxx:304 +#: ../tests/unit/src/test_bout++.cxx:303 #, fuzzy msgid "Compiled with flags" msgstr "\tCompilado con las opciones `flags` : %s\n" @@ -411,7 +411,7 @@ msgstr "" "No se pudo ejecutar bout-log-color. Asegúrese de que se encuentre en su " "PATH\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 "No se pudo añadir el Monitor: %g no és multiplo de %g!" @@ -447,7 +447,7 @@ msgstr "DataDir \"%s\" no existe o no es accessible\n" msgid "DataDir \"%s\" is not a directory\n" msgstr "DataDir \"%s\" no es un directorio\n" -#: ../src/solver/solver.cxx:587 +#: ../src/solver/solver.cxx:588 msgid "ERROR: Solver is already initialised\n" msgstr "ERROR: el Solver ya se encuentra inicializado\n" @@ -465,7 +465,7 @@ msgstr "Error durante el paso de opciones" msgid "Error: nx must be greater than 2 times MXG (2 * %d)" msgstr "Error: nx debe ser mayor que 2 veces MXG (2 * %d)" -#: ../src/solver/solver.cxx:454 +#: ../src/solver/solver.cxx:455 msgid "Failed to initialise solver-> Aborting\n" msgstr "Fallo en inicializar el solver-> Abortando\n" @@ -474,7 +474,7 @@ msgstr "Fallo en inicializar el solver-> Abortando\n" msgid "Finding value for NXPE (ideal = %f)\n" msgstr "Encontrando valor para NXPE (ideal = %f)\n" -#: ../src/solver/solver.cxx:589 +#: ../src/solver/solver.cxx:426 msgid "Initialising solver\n" msgstr "Initializando el solver\n" @@ -509,11 +509,11 @@ msgstr "La malla `mesh` debe contener ny" msgid "Missing integer array %s\n" msgstr "Fala la matriz entera %s\n" -#: ../src/solver/solver.cxx:773 +#: ../src/solver/solver.cxx:772 msgid "Monitor signalled to quit" msgstr "Monitor indicó salir" -#: ../src/solver/solver.cxx:780 +#: ../src/solver/solver.cxx:779 msgid "Monitor signalled to quit\n" msgstr "Monitor indicó salir\n" @@ -598,12 +598,12 @@ msgstr "Región Perp registrada %s" msgid "Revision: %s\n" msgstr "Revisión: %s\n" -#: ../src/solver/solver.cxx:510 +#: ../src/solver/solver.cxx:511 msgid "Run time : " msgstr "Tiempo de ejecución : " #. / Run the solver -#: ../src/solver/solver.cxx:467 +#: ../src/solver/solver.cxx:468 msgid "" "Running simulation\n" "\n" @@ -611,7 +611,7 @@ msgstr "" "Ejecutando simulación\n" "\n" -#: ../tests/unit/src/test_bout++.cxx:301 +#: ../tests/unit/src/test_bout++.cxx:300 msgid "Signal" msgstr "" @@ -634,19 +634,19 @@ msgstr "" "Com I/O SOLVER\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 "" "Solver corriendo para %d outputs con intervalos de tiempo de monitor de %e\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 "" "Solver corriendo para %d outputs con intervalos de tiempo de output de %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 " @@ -655,7 +655,7 @@ msgstr "" "Solver::addMonitor: No se puedo reducir el intervalo de tiempo (de %g a %g) " "después de que init fuera llamado!" -#: ../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 " @@ -664,7 +664,7 @@ msgstr "" "Derivada del tiempo en lugar erróneo - El field se encuentra en %s, la " "derivada se encuentra en %s para el field '%s'\n" -#: ../src/solver/solver.cxx:1354 +#: ../src/solver/solver.cxx:1353 #, c-format msgid "Time derivative for variable '%s' not set" msgstr "Derivada del tiempo para la variable '%s' no fijada" @@ -716,7 +716,7 @@ msgstr "Correcto uso es %s -l \n" msgid "Usage is %s -o \n" msgstr "Correcto uso es %s -o \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 "" @@ -732,7 +732,7 @@ msgstr "" "[VAR=VALUE]\n" #. restart file should be written by physics model -#: ../src/solver/solver.cxx:795 +#: ../src/solver/solver.cxx:794 #, fuzzy msgid "User signalled to quit. Returning\n" msgstr "Monitor indicó salir\n" @@ -768,7 +768,7 @@ msgstr "Valor para la opción %s = %e no es un entero" msgid "Value for option %s is not an integer" msgstr "Valor para la opción %s = %e no es un entero" -#: ../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' sin inicializar" diff --git a/locale/fr/libbout.po b/locale/fr/libbout.po index f4b653bd0c..c30538238e 100644 --- a/locale/fr/libbout.po +++ b/locale/fr/libbout.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: BOUT++ 4.2.0\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: 2018-10-21 22:46+0100\n" "Last-Translator: \n" "Language-Team: French\n" @@ -246,7 +246,7 @@ msgid "" " -q, --quiet\t\tDecrease verbosity\n" msgstr "" -#: ../src/solver/solver.cxx:509 +#: ../src/solver/solver.cxx:510 #, c-format msgid "" "\n" @@ -255,7 +255,7 @@ msgstr "" "\n" "L'exécution se termine à %s\n" -#: ../src/solver/solver.cxx:474 +#: ../src/solver/solver.cxx:475 #, fuzzy, c-format msgid "" "\n" @@ -284,7 +284,7 @@ msgstr "" msgid ") overwritten with:" msgstr "" -#: ../tests/unit/src/test_bout++.cxx:294 +#: ../tests/unit/src/test_bout++.cxx:293 msgid "4 of 8" msgstr "" @@ -327,11 +327,11 @@ msgstr "" msgid "Command line" msgstr "" -#: ../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 "" -#: ../tests/unit/src/test_bout++.cxx:304 +#: ../tests/unit/src/test_bout++.cxx:303 msgid "Compiled with flags" msgstr "" @@ -370,7 +370,7 @@ msgstr "" msgid "Could not run bout-log-color. Make sure it is in your PATH\n" msgstr "" -#: ../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 "" @@ -406,7 +406,7 @@ msgstr "Le répertoire de données \"%s\" n'existe pas ou n'est pas accessible\n msgid "DataDir \"%s\" is not a directory\n" msgstr "\"%s\" n'est pas un répertoire\n" -#: ../src/solver/solver.cxx:587 +#: ../src/solver/solver.cxx:588 msgid "ERROR: Solver is already initialised\n" msgstr "" @@ -424,7 +424,7 @@ msgstr "" msgid "Error: nx must be greater than 2 times MXG (2 * %d)" msgstr "" -#: ../src/solver/solver.cxx:454 +#: ../src/solver/solver.cxx:455 msgid "Failed to initialise solver-> Aborting\n" msgstr "Échec d'initialisation du solutionneur -> Abandonner\n" @@ -433,7 +433,7 @@ msgstr "Échec d'initialisation du solutionneur -> Abandonner\n" msgid "Finding value for NXPE (ideal = %f)\n" msgstr "" -#: ../src/solver/solver.cxx:589 +#: ../src/solver/solver.cxx:426 msgid "Initialising solver\n" msgstr "" @@ -465,11 +465,11 @@ msgstr "" msgid "Missing integer array %s\n" msgstr "" -#: ../src/solver/solver.cxx:773 +#: ../src/solver/solver.cxx:772 msgid "Monitor signalled to quit" msgstr "" -#: ../src/solver/solver.cxx:780 +#: ../src/solver/solver.cxx:779 msgid "Monitor signalled to quit\n" msgstr "" @@ -548,12 +548,12 @@ msgstr "" msgid "Revision: %s\n" msgstr "" -#: ../src/solver/solver.cxx:510 +#: ../src/solver/solver.cxx:511 msgid "Run time : " msgstr "Temps d'exécution : " #. / Run the solver -#: ../src/solver/solver.cxx:467 +#: ../src/solver/solver.cxx:468 msgid "" "Running simulation\n" "\n" @@ -561,7 +561,7 @@ msgstr "" "L'exécution commence\n" "\n" -#: ../tests/unit/src/test_bout++.cxx:301 +#: ../tests/unit/src/test_bout++.cxx:300 msgid "Signal" msgstr "" @@ -578,32 +578,32 @@ msgid "" "\n" msgstr "" -#: ../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 "" "Le solveur fonctionne pour %d sorties avec un temps de moniteur de %e\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 "Le solveur fonctionne pour %d sorties avec un pas de sortie de %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 " "called!" msgstr "" -#: ../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 " "field '%s'\n" msgstr "" -#: ../src/solver/solver.cxx:1354 +#: ../src/solver/solver.cxx:1353 #, c-format msgid "Time derivative for variable '%s' not set" msgstr "" @@ -653,7 +653,7 @@ msgstr "" msgid "Usage is %s -o \n" msgstr "" -#: ../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 "" @@ -667,7 +667,7 @@ msgid "" msgstr "" #. 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 "" @@ -702,7 +702,7 @@ msgstr "" msgid "Value for option %s is not an integer" msgstr "" -#: ../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 "" diff --git a/locale/libbout.pot b/locale/libbout.pot index cd2c279c7d..585f36ea7a 100644 --- a/locale/libbout.pot +++ b/locale/libbout.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -244,14 +244,14 @@ msgid "" " -q, --quiet\t\tDecrease verbosity\n" msgstr "" -#: ../src/solver/solver.cxx:509 +#: ../src/solver/solver.cxx:510 #, c-format msgid "" "\n" "Run finished at : %s\n" msgstr "" -#: ../src/solver/solver.cxx:474 +#: ../src/solver/solver.cxx:475 #, c-format msgid "" "\n" @@ -278,7 +278,7 @@ msgstr "" msgid ") overwritten with:" msgstr "" -#: ../tests/unit/src/test_bout++.cxx:294 +#: ../tests/unit/src/test_bout++.cxx:293 msgid "4 of 8" msgstr "" @@ -319,11 +319,11 @@ msgstr "" msgid "Command line" msgstr "" -#: ../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 "" -#: ../tests/unit/src/test_bout++.cxx:304 +#: ../tests/unit/src/test_bout++.cxx:303 msgid "Compiled with flags" msgstr "" @@ -362,7 +362,7 @@ msgstr "" msgid "Could not run bout-log-color. Make sure it is in your PATH\n" msgstr "" -#: ../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 "" @@ -398,7 +398,7 @@ msgstr "" msgid "DataDir \"%s\" is not a directory\n" msgstr "" -#: ../src/solver/solver.cxx:587 +#: ../src/solver/solver.cxx:588 msgid "ERROR: Solver is already initialised\n" msgstr "" @@ -416,7 +416,7 @@ msgstr "" msgid "Error: nx must be greater than 2 times MXG (2 * %d)" msgstr "" -#: ../src/solver/solver.cxx:454 +#: ../src/solver/solver.cxx:455 msgid "Failed to initialise solver-> Aborting\n" msgstr "" @@ -425,7 +425,7 @@ msgstr "" msgid "Finding value for NXPE (ideal = %f)\n" msgstr "" -#: ../src/solver/solver.cxx:589 +#: ../src/solver/solver.cxx:426 msgid "Initialising solver\n" msgstr "" @@ -457,11 +457,11 @@ msgstr "" msgid "Missing integer array %s\n" msgstr "" -#: ../src/solver/solver.cxx:773 +#: ../src/solver/solver.cxx:772 msgid "Monitor signalled to quit" msgstr "" -#: ../src/solver/solver.cxx:780 +#: ../src/solver/solver.cxx:779 msgid "Monitor signalled to quit\n" msgstr "" @@ -540,18 +540,18 @@ msgstr "" msgid "Revision: %s\n" msgstr "" -#: ../src/solver/solver.cxx:510 +#: ../src/solver/solver.cxx:511 msgid "Run time : " msgstr "" #. / Run the solver -#: ../src/solver/solver.cxx:467 +#: ../src/solver/solver.cxx:468 msgid "" "Running simulation\n" "\n" msgstr "" -#: ../tests/unit/src/test_bout++.cxx:301 +#: ../tests/unit/src/test_bout++.cxx:300 msgid "Signal" msgstr "" @@ -568,31 +568,31 @@ msgid "" "\n" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 " "called!" msgstr "" -#: ../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 " "field '%s'\n" msgstr "" -#: ../src/solver/solver.cxx:1354 +#: ../src/solver/solver.cxx:1353 #, c-format msgid "Time derivative for variable '%s' not set" msgstr "" @@ -642,7 +642,7 @@ msgstr "" msgid "Usage is %s -o \n" msgstr "" -#: ../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 "" @@ -656,7 +656,7 @@ msgid "" msgstr "" #. 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 "" @@ -691,7 +691,7 @@ msgstr "" msgid "Value for option %s is not an integer" msgstr "" -#: ../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 "" diff --git a/locale/zh_CN/libbout.po b/locale/zh_CN/libbout.po index 9fb07f41d7..d6c84a2443 100644 --- a/locale/zh_CN/libbout.po +++ b/locale/zh_CN/libbout.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: BOUT++ 4.2.0\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: 2018-10-22 22:56+0100\n" "Last-Translator: \n" "Language-Team: Chinese (simplified)\n" @@ -246,7 +246,7 @@ msgid "" " -q, --quiet\t\tDecrease verbosity\n" msgstr "" -#: ../src/solver/solver.cxx:509 +#: ../src/solver/solver.cxx:510 #, c-format msgid "" "\n" @@ -255,7 +255,7 @@ msgstr "" "\n" "计算结束于 %s\n" -#: ../src/solver/solver.cxx:474 +#: ../src/solver/solver.cxx:475 #, c-format msgid "" "\n" @@ -284,7 +284,7 @@ msgstr "" msgid ") overwritten with:" msgstr "" -#: ../tests/unit/src/test_bout++.cxx:294 +#: ../tests/unit/src/test_bout++.cxx:293 msgid "4 of 8" msgstr "" @@ -327,11 +327,11 @@ msgstr "" msgid "Command line" msgstr "" -#: ../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 "" -#: ../tests/unit/src/test_bout++.cxx:304 +#: ../tests/unit/src/test_bout++.cxx:303 msgid "Compiled with flags" msgstr "" @@ -370,7 +370,7 @@ msgstr "" msgid "Could not run bout-log-color. Make sure it is in your PATH\n" msgstr "" -#: ../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 "" @@ -406,7 +406,7 @@ msgstr "\"%s\" 不存在或不可访问\n" msgid "DataDir \"%s\" is not a directory\n" msgstr "\"%s\" 不是目录\n" -#: ../src/solver/solver.cxx:587 +#: ../src/solver/solver.cxx:588 msgid "ERROR: Solver is already initialised\n" msgstr "" @@ -424,7 +424,7 @@ msgstr "" msgid "Error: nx must be greater than 2 times MXG (2 * %d)" msgstr "" -#: ../src/solver/solver.cxx:454 +#: ../src/solver/solver.cxx:455 msgid "Failed to initialise solver-> Aborting\n" msgstr "" @@ -433,7 +433,7 @@ msgstr "" msgid "Finding value for NXPE (ideal = %f)\n" msgstr "" -#: ../src/solver/solver.cxx:589 +#: ../src/solver/solver.cxx:426 msgid "Initialising solver\n" msgstr "" @@ -465,11 +465,11 @@ msgstr "" msgid "Missing integer array %s\n" msgstr "" -#: ../src/solver/solver.cxx:773 +#: ../src/solver/solver.cxx:772 msgid "Monitor signalled to quit" msgstr "" -#: ../src/solver/solver.cxx:780 +#: ../src/solver/solver.cxx:779 msgid "Monitor signalled to quit\n" msgstr "" @@ -548,12 +548,12 @@ msgstr "" msgid "Revision: %s\n" msgstr "" -#: ../src/solver/solver.cxx:510 +#: ../src/solver/solver.cxx:511 msgid "Run time : " msgstr "计算时间" #. / Run the solver -#: ../src/solver/solver.cxx:467 +#: ../src/solver/solver.cxx:468 msgid "" "Running simulation\n" "\n" @@ -561,7 +561,7 @@ msgstr "" "模拟\n" "\n" -#: ../tests/unit/src/test_bout++.cxx:301 +#: ../tests/unit/src/test_bout++.cxx:300 msgid "Signal" msgstr "" @@ -578,31 +578,31 @@ msgid "" "\n" msgstr "" -#: ../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 "" -#: ../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 "" -#: ../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 " "called!" msgstr "" -#: ../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 " "field '%s'\n" msgstr "" -#: ../src/solver/solver.cxx:1354 +#: ../src/solver/solver.cxx:1353 #, c-format msgid "Time derivative for variable '%s' not set" msgstr "" @@ -652,7 +652,7 @@ msgstr "" msgid "Usage is %s -o \n" msgstr "" -#: ../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 "" @@ -666,7 +666,7 @@ msgid "" msgstr "" #. 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 "" @@ -701,7 +701,7 @@ msgstr "" msgid "Value for option %s is not an integer" msgstr "" -#: ../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 "" diff --git a/locale/zh_TW/libbout.po b/locale/zh_TW/libbout.po index 14ab2d6864..2177fefb60 100644 --- a/locale/zh_TW/libbout.po +++ b/locale/zh_TW/libbout.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: BOUT++ 4.2.0\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: 2018-10-22 22:56+0100\n" "Last-Translator: \n" "Language-Team: Chinese (traditional)\n" @@ -245,7 +245,7 @@ msgid "" " -q, --quiet\t\tDecrease verbosity\n" msgstr "" -#: ../src/solver/solver.cxx:509 +#: ../src/solver/solver.cxx:510 #, c-format msgid "" "\n" @@ -254,7 +254,7 @@ msgstr "" "\n" "计算结束于 %s\n" -#: ../src/solver/solver.cxx:474 +#: ../src/solver/solver.cxx:475 #, c-format msgid "" "\n" @@ -283,7 +283,7 @@ msgstr "" msgid ") overwritten with:" msgstr "" -#: ../tests/unit/src/test_bout++.cxx:294 +#: ../tests/unit/src/test_bout++.cxx:293 msgid "4 of 8" msgstr "" @@ -326,11 +326,11 @@ msgstr "" msgid "Command line" msgstr "" -#: ../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 "編譯選項:\n" -#: ../tests/unit/src/test_bout++.cxx:304 +#: ../tests/unit/src/test_bout++.cxx:303 #, fuzzy msgid "Compiled with flags" msgstr "\t用設置編譯: %s\n" @@ -370,7 +370,7 @@ msgstr "無法打開輸出文件 '%s'\n" msgid "Could not run bout-log-color. Make sure it is in your PATH\n" msgstr "" -#: ../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 "" @@ -406,7 +406,7 @@ msgstr "\"%s\" 不存在或不可訪問\n" msgid "DataDir \"%s\" is not a directory\n" msgstr "\"%s\" 不是目錄\n" -#: ../src/solver/solver.cxx:587 +#: ../src/solver/solver.cxx:588 msgid "ERROR: Solver is already initialised\n" msgstr "" @@ -424,7 +424,7 @@ msgstr "" msgid "Error: nx must be greater than 2 times MXG (2 * %d)" msgstr "" -#: ../src/solver/solver.cxx:454 +#: ../src/solver/solver.cxx:455 msgid "Failed to initialise solver-> Aborting\n" msgstr "" @@ -433,7 +433,7 @@ msgstr "" msgid "Finding value for NXPE (ideal = %f)\n" msgstr "" -#: ../src/solver/solver.cxx:589 +#: ../src/solver/solver.cxx:426 msgid "Initialising solver\n" msgstr "初始化求解器\n" @@ -465,11 +465,11 @@ msgstr "" msgid "Missing integer array %s\n" msgstr "" -#: ../src/solver/solver.cxx:773 +#: ../src/solver/solver.cxx:772 msgid "Monitor signalled to quit" msgstr "" -#: ../src/solver/solver.cxx:780 +#: ../src/solver/solver.cxx:779 msgid "Monitor signalled to quit\n" msgstr "" @@ -548,12 +548,12 @@ msgstr "" msgid "Revision: %s\n" msgstr "版: %s\n" -#: ../src/solver/solver.cxx:510 +#: ../src/solver/solver.cxx:511 msgid "Run time : " msgstr "計算時間" #. / Run the solver -#: ../src/solver/solver.cxx:467 +#: ../src/solver/solver.cxx:468 msgid "" "Running simulation\n" "\n" @@ -561,7 +561,7 @@ msgstr "" "模擬\n" "\n" -#: ../tests/unit/src/test_bout++.cxx:301 +#: ../tests/unit/src/test_bout++.cxx:300 msgid "Signal" msgstr "" @@ -584,31 +584,31 @@ msgstr "" "通訊 輸入輸出 時間整合\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 "" -#: ../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 "" -#: ../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 " "called!" msgstr "" -#: ../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 " "field '%s'\n" msgstr "" -#: ../src/solver/solver.cxx:1354 +#: ../src/solver/solver.cxx:1353 #, c-format msgid "Time derivative for variable '%s' not set" msgstr "" @@ -658,7 +658,7 @@ msgstr "" msgid "Usage is %s -o \n" msgstr "" -#: ../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 "" @@ -672,7 +672,7 @@ msgid "" msgstr "" #. 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 "" @@ -707,7 +707,7 @@ msgstr "" msgid "Value for option %s is not an integer" msgstr "\"%s\" 不是目錄\n" -#: ../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 "" From b0dcde27e46d5b7172c5876a2c02bf6158f4895c Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Tue, 15 Feb 2022 16:13:19 +0000 Subject: [PATCH 2/6] CI: Bump scipy/numpy versions --- .pip_install_for_travis.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pip_install_for_travis.sh b/.pip_install_for_travis.sh index 50468b41de..7a0f274b4b 100755 --- a/.pip_install_for_travis.sh +++ b/.pip_install_for_travis.sh @@ -3,8 +3,8 @@ set -e export PATH=${HOME}/.local/bin:${PATH} -pip3 install --user --upgrade pip~=20.0 setuptools~=46.1 -pip3 install --user --upgrade scipy~=1.4 numpy~=1.18 +pip3 install --user --upgrade pip>=20.0 setuptools>=46.1 +pip3 install --user --upgrade scipy~=1.7 numpy~=1.21 for package in $@ do if test $package == "cython" From bc5136c2dbf124b2472209250f8581c029cfd4d3 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Tue, 15 Feb 2022 16:28:44 +0000 Subject: [PATCH 3/6] Bump version to 4.4.2 --- CITATION.cff | 2 +- CMakeLists.txt | 2 +- configure | 22 +++++++++++----------- configure.ac | 2 +- manual/doxygen/Doxyfile | 2 +- manual/doxygen/Doxyfile_readthedocs | 2 +- manual/sphinx/conf.py | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index afe80ccc80..f790c1d68c 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -164,7 +164,7 @@ authors: - family-names: James given-names: Toby -version: 4.4.1 +version: 4.4.2 date-released: 2022-01-13 repository-code: https://github.com/boutproject/BOUT-dev url: http://boutproject.github.io/ diff --git a/CMakeLists.txt b/CMakeLists.txt index c0c766beeb..ccb3a0d230 100644 --- a/CMakeLists.txt +++ b/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++ diff --git a/configure b/configure index e3b593a507..71f9f8efb2 100755 --- a/configure +++ b/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 . # @@ -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='bd512@york.ac.uk' 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\\" diff --git a/configure.ac b/configure.ac index fbc9e6cb70..5ccd94bda8 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ # AC_PREREQ([2.69]) -AC_INIT([BOUT++],[4.4.1],[bd512@york.ac.uk]) +AC_INIT([BOUT++],[4.4.2],[bd512@york.ac.uk]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/manual/doxygen/Doxyfile b/manual/doxygen/Doxyfile index 23ea2d1690..cf8831693c 100644 --- a/manual/doxygen/Doxyfile +++ b/manual/doxygen/Doxyfile @@ -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.4.1 +PROJECT_NUMBER = 4.4.2 # 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 diff --git a/manual/doxygen/Doxyfile_readthedocs b/manual/doxygen/Doxyfile_readthedocs index 3f33656054..a431d961af 100644 --- a/manual/doxygen/Doxyfile_readthedocs +++ b/manual/doxygen/Doxyfile_readthedocs @@ -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.4.1 +PROJECT_NUMBER = 4.4.2 # 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 diff --git a/manual/sphinx/conf.py b/manual/sphinx/conf.py index 4285aaac10..8ddb00fd95 100755 --- a/manual/sphinx/conf.py +++ b/manual/sphinx/conf.py @@ -134,7 +134,7 @@ def __getattr__(cls, name): # The short X.Y version. version = '4.4' # The full version, including alpha/beta/rc tags. -release = '4.4.1' +release = '4.4.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 00df129e5470eba101be554647b59c2f1606fd1f Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Tue, 15 Feb 2022 16:48:58 +0000 Subject: [PATCH 4/6] Update changelog for 4.4.2 --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82815038c6..9262355047 100644 --- a/CHANGELOG.md +++ b/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) From c409fe3c9bda22a12a3fd079cb2a9c5980f535b1 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Wed, 16 Feb 2022 11:50:24 +0000 Subject: [PATCH 5/6] Revert "CI: Bump scipy/numpy versions" This reverts commit b0dcde27e46d5b7172c5876a2c02bf6158f4895c. --- .pip_install_for_travis.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pip_install_for_travis.sh b/.pip_install_for_travis.sh index 7a0f274b4b..50468b41de 100755 --- a/.pip_install_for_travis.sh +++ b/.pip_install_for_travis.sh @@ -3,8 +3,8 @@ set -e export PATH=${HOME}/.local/bin:${PATH} -pip3 install --user --upgrade pip>=20.0 setuptools>=46.1 -pip3 install --user --upgrade scipy~=1.7 numpy~=1.21 +pip3 install --user --upgrade pip~=20.0 setuptools~=46.1 +pip3 install --user --upgrade scipy~=1.4 numpy~=1.18 for package in $@ do if test $package == "cython" From 2ceae42be4a287ce5822ba2483e48298aa464997 Mon Sep 17 00:00:00 2001 From: Peter Hill Date: Thu, 3 Mar 2022 15:06:43 +0000 Subject: [PATCH 6/6] Bump DOI for 4.4.2 --- CITATION.cff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index f790c1d68c..774617626a 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -165,10 +165,10 @@ authors: given-names: Toby version: 4.4.2 -date-released: 2022-01-13 +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