diff --git a/CHANGELOG.md b/CHANGELOG.md index 21c912df52..82815038c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,26 @@ See [\#2154](https://github.com/boutproject/BOUT-dev/pull/2154). +## [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) + +**Merged pull requests:** + +- Back-port beuler/snes improvements to master [\#2459](https://github.com/boutproject/BOUT-dev/pull/2459) ([bendudson](https://github.com/users/bendudson)) +- Update "Running BOUT++" documentation [\#2475](https://github.com/boutproject/BOUT-dev/pull/2475) ([ZedThree](https://github.com/users/ZedThree)) +- Raise more descriptive error if converting Option fails [\#2474](https://github.com/boutproject/BOUT-dev/pull/2474) ([ZedThree](https://github.com/users/ZedThree)) +- Print correct CMake build directory in configure message [\#2473](https://github.com/boutproject/BOUT-dev/pull/2473) ([ZedThree](https://github.com/users/ZedThree)) +- CMake: Fix using the build directory directly [\#2464](https://github.com/boutproject/BOUT-dev/pull/2464) ([ZedThree](https://github.com/users/ZedThree)) +- Add `bout::utils::` prefix to `visit` [\#2463](https://github.com/boutproject/BOUT-dev/pull/2463) ([ZedThree](https://github.com/users/ZedThree)) +- Fix SUNDIALS download git tag [\#2462](https://github.com/boutproject/BOUT-dev/pull/2462) ([ZedThree](https://github.com/users/ZedThree)) +- Fix permission of shared objects [\#2433](https://github.com/boutproject/BOUT-dev/pull/2433) ([dschwoerer](https://github.com/users/dschwoerer)) +- Fix BOUT_OVERRIDE_DEFAULT_OPTION() [\#2417](https://github.com/boutproject/BOUT-dev/pull/2417) ([johnomotani](https://github.com/users/johnomotani)) +- Ensure MPI is initialised before writing [\#2409](https://github.com/boutproject/BOUT-dev/pull/2409) ([dschwoerer](https://github.com/users/dschwoerer)) +- Remove `` include from uuid (v4.4.1) [\#2407](https://github.com/boutproject/BOUT-dev/pull/2407) ([ZedThree](https://github.com/users/ZedThree)) +- Fix make install [\#2401](https://github.com/boutproject/BOUT-dev/pull/2401) ([dschwoerer](https://github.com/users/dschwoerer)) +- Fix soname [\#2400](https://github.com/boutproject/BOUT-dev/pull/2400) ([dschwoerer](https://github.com/users/dschwoerer)) + ## [v4.4.0](https://github.com/boutproject/BOUT-dev/tree/v4.4.0) (2021-07-30) [Full Changelog](https://github.com/boutproject/BOUT-dev/compare/v4.3.3...v4.4.4) diff --git a/CITATION.cff b/CITATION.cff index 46ec1ad324..afe80ccc80 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -56,7 +56,7 @@ authors: - family-names: Grinaker given-names: Eric - - family-names: Breyiannia + - family-names: Breyiannis given-names: George - family-names: Muhammed @@ -164,11 +164,11 @@ authors: - family-names: James given-names: Toby -version: 4.4.0 -date-released: 2020-08-06 +version: 4.4.1 +date-released: 2022-01-13 repository-code: https://github.com/boutproject/BOUT-dev url: http://boutproject.github.io/ -doi: 10.5281/zenodo.5167527 +doi: 10.5281/zenodo.5776785 license: 'LGPL-3.0-or-later' references: - type: article diff --git a/CMakeLists.txt b/CMakeLists.txt index 33e887d4cb..ece8615b09 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.0) +set(BOUT_FULL_VERSION 4.4.1) string(REGEX REPLACE "^([0-9]+\.[0-9]+\.[0-9]+)-.*" "\\1" BOUT_CMAKE_ACCEPTABLE_VERSION ${BOUT_FULL_VERSION}) project(BOUT++ diff --git a/change_summary.md b/change_summary.md index 49c439761b..af6c63620c 100644 --- a/change_summary.md +++ b/change_summary.md @@ -3,6 +3,13 @@ This is a slightly more readable, and therefore incomplete, summary of the changes from the full [changelog](CHANGELOG.md) +4.4.1 is a bugfix release: +- Fixed some issues building BOUT++ on MacOS +- Fixed some issues when installing +- Fixed some issues when downloading SUNDIALS and netCDF C++ +- Fixed some out of date documentation +- Some improvements/fixes to the `beuler/snes` solver + 4.4.0 is a feature release. The main new features are: - The CMake support has been expanded, and will replace the autotools build system in the next major release. See [the CMake installation diff --git a/configure b/configure index 225f6428a7..e3b593a507 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.0. +# Generated by GNU Autoconf 2.69 for BOUT++ 4.4.1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='BOUT++' PACKAGE_TARNAME='bout--' -PACKAGE_VERSION='4.4.0' -PACKAGE_STRING='BOUT++ 4.4.0' +PACKAGE_VERSION='4.4.1' +PACKAGE_STRING='BOUT++ 4.4.1' 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.0 to adapt to many kinds of systems. +\`configure' configures BOUT++ 4.4.1 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.0:";; + short | recursive ) echo "Configuration of BOUT++ 4.4.1:";; 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.0 +BOUT++ configure 4.4.1 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.0, which was +It was created by BOUT++ $as_me 4.4.1, 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.0, which was +This file was extended by BOUT++ $as_me 4.4.1, 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.0 +BOUT++ config.status 4.4.1 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.0, which was +This file was extended by BOUT++ $as_me 4.4.1, 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.0 +BOUT++ config.status 4.4.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 0628181656..fbc9e6cb70 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ # AC_PREREQ([2.69]) -AC_INIT([BOUT++],[4.4.0],[bd512@york.ac.uk]) +AC_INIT([BOUT++],[4.4.1],[bd512@york.ac.uk]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/locale/de/libbout.po b/locale/de/libbout.po index b5507ba828..22f0a40be8 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-07-28 14:25+0200\n" +"POT-Creation-Date: 2021-12-13 14:14+0000\n" "PO-Revision-Date: 2020-03-19 12:42+0000\n" "Last-Translator: David \n" "Language-Team: German\n" @@ -96,22 +96,22 @@ msgstr "\t -> ny/NYPE (%d/%d = %d) muss >= MYG (%d) sein\n" msgid "\tCandidate value: %d\n" msgstr "\tzu überprüfender Wert: %d\n" -#: ../src/bout++.cxx:379 +#: ../src/bout++.cxx:394 msgid "\tChecking disabled\n" msgstr "\tChecks sind deaktiviert\n" -#: ../src/bout++.cxx:377 +#: ../src/bout++.cxx:392 #, c-format msgid "\tChecking enabled, level %d\n" msgstr "\tChecks der Stufe %d sind aktiviert\n" -#: ../src/bout++.cxx:425 +#: ../src/bout++.cxx:440 msgid "\tCommand line options for this run : " msgstr "\tKommandozeilenoptionen für diese Ausführung: " #. The stringify is needed here as BOUT_FLAGS_STRING may already contain quoted strings #. which could cause problems (e.g. terminate strings). -#: ../src/bout++.cxx:421 +#: ../src/bout++.cxx:436 #, c-format msgid "\tCompiled with flags : %s\n" msgstr "\tWurde kompiliert mit den Optionen : %s\n" @@ -174,25 +174,25 @@ msgstr "" msgid "\tMultiple '=' in command-line argument '%s'\n" msgstr "\t'=' darf nicht mehrfach vorkommen: '%s'\n" -#: ../src/bout++.cxx:408 +#: ../src/bout++.cxx:423 msgid "\tOpenMP parallelisation disabled\n" msgstr "\tOpenMP Parallelisierung ist deaktiviert\n" -#: ../src/bout++.cxx:405 +#: ../src/bout++.cxx:420 #, c-format msgid "\tOpenMP parallelisation enabled, using %d threads\n" msgstr "\tOpenMP Parallelisierung mit %d Threads ist aktiviert\n" #. Mark the option as used #. Option not found -#: ../src/sys/options.cxx:195 ../src/sys/options.cxx:250 -#: ../src/sys/options.cxx:292 ../src/sys/options.cxx:331 -#: ../include/options.hxx:406 ../include/options.hxx:438 -#: ../include/options.hxx:460 ../include/options.hxx:658 +#: ../src/sys/options.cxx:202 ../src/sys/options.cxx:271 +#: ../src/sys/options.cxx:305 ../src/sys/options.cxx:344 +#: ../include/options.hxx:412 ../include/options.hxx:444 +#: ../include/options.hxx:466 ../include/options.hxx:664 msgid "\tOption " msgstr "\tOption " -#: ../src/sys/options.cxx:321 +#: ../src/sys/options.cxx:334 #, c-format msgid "\tOption '%s': Boolean expected. Got '%s'\n" msgstr "\tOption '%s': Boolscherwert erwartet, '%s' gefunden\n" @@ -202,11 +202,11 @@ msgstr "\tOption '%s': Boolscherwert erwartet, '%s' gefunden\n" msgid "\tOptions file '%s' not found\n" msgstr "\tDie Optionendatei '%s' konnte nicht gefunden werden\n" -#: ../src/bout++.cxx:401 +#: ../src/bout++.cxx:416 msgid "\tParallel NetCDF support disabled\n" msgstr "\tParallele-NetCDF Unterstützung ist deaktiviert\n" -#: ../src/bout++.cxx:399 +#: ../src/bout++.cxx:414 msgid "\tParallel NetCDF support enabled\n" msgstr "\tParllele-NetCDF Unterstützung ist aktiviert\n" @@ -222,11 +222,11 @@ msgstr "\tKontravariantevektoren werden gelesen " msgid "\tReading covariant vector " msgstr "\tKovariantevektoren werden gelesen " -#: ../src/bout++.cxx:385 +#: ../src/bout++.cxx:400 msgid "\tSignal handling disabled\n" msgstr "\tSignalverarbeitung ist deaktiviert\n" -#: ../src/bout++.cxx:383 +#: ../src/bout++.cxx:398 msgid "\tSignal handling enabled\n" msgstr "\tSignalverarbeitung ist aktiviert\n" @@ -239,15 +239,15 @@ msgstr "" msgid "\tdone\n" msgstr "\tfertig\n" -#: ../src/bout++.cxx:394 +#: ../src/bout++.cxx:409 msgid "\tnetCDF support disabled\n" msgstr "\tNetCDF Unterstützung ist deaktiviert\n" -#: ../src/bout++.cxx:389 +#: ../src/bout++.cxx:404 msgid "\tnetCDF support enabled\n" msgstr "\tNetCDF Unterstützung ist aktiviert\n" -#: ../src/bout++.cxx:392 +#: ../src/bout++.cxx:407 msgid "\tnetCDF4 support enabled\n" msgstr "\tNetCDF4 Unterstützung ist aktiviert\n" @@ -257,7 +257,7 @@ msgid "" "\tSplit Runge-Kutta-Legendre and SSP-RK3 solver\n" msgstr "" -#: ../src/bout++.cxx:229 +#: ../src/bout++.cxx:244 msgid "" "\n" " -d \tLook in for input/output files\n" @@ -294,11 +294,11 @@ msgstr "" "\n" "Simulation gestartet um %s\n" -#: ../src/bout++.cxx:237 +#: ../src/bout++.cxx:252 msgid " -c, --color\t\tColor output using bout-log-color\n" msgstr " -c, --color\t\tFarbliche Ausgabe mit bout-log-color\n" -#: ../src/bout++.cxx:240 +#: ../src/bout++.cxx:255 #, c-format msgid "" " -h, --help\t\tThis message\n" @@ -318,7 +318,7 @@ msgstr "" "Weitere Eingabeparameter sind in dem Manual und dem Quellcode (z.B. %s.cxx) " "des Physikmoduls definiert.\n" -#: ../include/options.hxx:661 +#: ../include/options.hxx:667 msgid ") overwritten with:" msgstr ") überschrieben mit:" @@ -326,16 +326,16 @@ msgstr ") überschrieben mit:" msgid "4 of 8" msgstr "" -#: ../src/sys/options.cxx:476 +#: ../src/sys/options.cxx:571 msgid "All options used\n" msgstr "Alle genutzten Optionen\n" -#: ../src/bout++.cxx:357 +#: ../src/bout++.cxx:372 #, c-format msgid "BOUT++ version %s\n" msgstr "BOUT++ Version %s\n" -#: ../src/bout++.cxx:112 +#: ../src/bout++.cxx:125 msgid "Bad command line arguments:\n" msgstr "Fehlerhafte Kommandozeilen Optionen:\n" @@ -350,11 +350,11 @@ msgstr "" "%d Punkte in der X-Richtung können nicht gleichmässig zwischen %d Prozessen " "verteilt werden\n" -#: ../src/bout++.cxx:697 +#: ../src/bout++.cxx:712 msgid "Check if a file exists, and exit if it does." msgstr "" -#: ../src/bout++.cxx:364 +#: ../src/bout++.cxx:379 #, c-format msgid "" "Code compiled on %s at %s\n" @@ -367,7 +367,7 @@ msgstr "" msgid "Command line" msgstr "Befehlszeile" -#: ../src/bout++.cxx:374 ../tests/unit/src/test_bout++.cxx:300 +#: ../src/bout++.cxx:389 ../tests/unit/src/test_bout++.cxx:300 msgid "Compile-time options:\n" msgstr "Kompiliert mit:\n" @@ -379,7 +379,7 @@ msgstr "Wurde mit folgenden Optionen kompiliert" msgid "Constructing default regions" msgstr "Standardregionen werden erstellt" -#: ../src/bout++.cxx:349 +#: ../src/bout++.cxx:364 #, c-format msgid "Could not create PID file %s" msgstr "Die Ausgabedatei '%s' konnte nicht erstellt werden" @@ -391,7 +391,7 @@ msgstr "" "Es konnte keine gültige Anzahl an Prozessoren in X Richtung gefunden werden " "(NXPE). Versuche es mit einer anderen Zahl an Prozessoren." -#: ../src/bout++.cxx:483 +#: ../src/bout++.cxx:498 #, c-format msgid "Could not open %s/%s.%d for writing" msgstr "" @@ -408,7 +408,7 @@ msgid "Could not read integer array '%s'\n" msgstr "Der Ganzzahlen-Array '%s' konnte nicht gelesen werden\n" #. Failed . Probably not important enough to stop the simulation -#: ../src/bout++.cxx:463 +#: ../src/bout++.cxx:478 msgid "Could not run bout-log-color. Make sure it is in your PATH\n" msgstr "" "Der Befehl 'bout-log-color' konnte nicht ausgeführt werden. Stellen Sie " @@ -436,23 +436,18 @@ msgstr "Die Region '%s' ist nicht in regionMap3D" msgid "Couldn't find region %s in regionMapPerp" msgstr "Die Region '%s' ist nicht in regionMapPerp" -#: ../src/sys/options.cxx:280 -#, c-format -msgid "Couldn't get BoutReal from option %s = '%s'" -msgstr "" -"Die Option %s = '%s' konnte nicht als Gleitkommazahl interpretiert werden." - -#: ../src/sys/options.cxx:228 -#, c-format -msgid "Couldn't get integer from option %s = '%s'" +#. Convert any exceptions to something a bit more useful +#: ../src/sys/options.cxx:227 +#, fuzzy, c-format +msgid "Couldn't get %s from option %s = '%s': %s" msgstr "Die Option %s = '%s' konnte nicht als ganze Zahl interpretiert werden." -#: ../src/bout++.cxx:337 +#: ../src/bout++.cxx:352 #, c-format msgid "DataDir \"%s\" does not exist or is not accessible\n" msgstr "Der Datenordner \"%s\" existiert nicht oder ist nicht lesbar\n" -#: ../src/bout++.cxx:334 +#: ../src/bout++.cxx:349 #, c-format msgid "DataDir \"%s\" is not a directory\n" msgstr "\"%s\" soll als Datenordner verwendet werden, ist jedoch kein Ordner\n" @@ -461,12 +456,12 @@ msgstr "\"%s\" soll als Datenordner verwendet werden, ist jedoch kein Ordner\n" msgid "ERROR: Solver is already initialised\n" msgstr "FEHLER: Der Integrator ist bereits initialisiert.\n" -#: ../src/bout++.cxx:166 +#: ../src/bout++.cxx:179 #, c-format msgid "Error encountered during initialisation: %s\n" msgstr "Es wurde ein Fehler während der Initialisierung gefunden: %s\n" -#: ../src/bout++.cxx:593 +#: ../src/bout++.cxx:608 msgid "Error whilst writing settings" msgstr "Es wurde ein Fehler beim Schreiben der Einstellungsdatei gefunden" @@ -490,7 +485,7 @@ msgstr "Suche NXPE Wert (optimal = %f)\n" msgid "Initialising solver\n" msgstr "Integrator wird initialisiert\n" -#: ../src/bout++.cxx:323 +#: ../src/bout++.cxx:338 msgid "" "Input and output file for settings must be different.\n" "Provide -o to avoid this issue.\n" @@ -529,7 +524,7 @@ msgstr "Der Monitor signaliserte die Beendigung" msgid "Monitor signalled to quit\n" msgstr "Beendigung durch Monitor\n" -#: ../src/bout++.cxx:701 +#: ../src/bout++.cxx:716 msgid "Name of file whose existence triggers a stop" msgstr "" @@ -550,13 +545,13 @@ msgstr "" "Anzahl an Prozessoren (%d) nicht teilbar durch Anzahl in y Richtung (%d)\n" #. Less than 2 time-steps left -#: ../src/bout++.cxx:745 +#: ../src/bout++.cxx:760 #, c-format msgid "Only %e seconds (%.2f steps) left. Quitting\n" msgstr "Nur noch %e Sekunden (%.2f Schritte) verfügbar. Abbruch\n" -#: ../src/sys/options.cxx:187 ../src/sys/options.cxx:207 -#: ../src/sys/options.cxx:262 ../src/sys/options.cxx:304 +#: ../src/sys/options.cxx:194 ../src/sys/options.cxx:235 +#: ../src/sys/options.cxx:283 ../src/sys/options.cxx:317 #, c-format msgid "Option %s has no value" msgstr "Der Option '%s' wurde kein Wert zugewiesen" @@ -572,7 +567,7 @@ msgstr "Die Option '%s' ist keine Gruppierung" msgid "Option %s:%s does not exist" msgstr "Die Option %s:%s exisitiert nicht" -#: ../include/options.hxx:666 +#: ../include/options.hxx:672 #, c-format msgid "" "Options: Setting a value from same source (%s) to new value '%s' - old value " @@ -581,7 +576,7 @@ msgstr "" "Optionen: Der Wert %3$s wird mit dem Wert %2$s gleichen Ursprungs (%1$s) " "überschrieben." -#: ../src/bout++.cxx:368 +#: ../src/bout++.cxx:383 #, c-format msgid "" "Processor number: %d of %d\n" @@ -605,7 +600,7 @@ msgstr "3D Region '%s' hinzugefügt" msgid "Registered region Perp %s" msgstr "Perp Region '%s' hinzugefügt" -#: ../src/bout++.cxx:359 +#: ../src/bout++.cxx:374 #, c-format msgid "Revision: %s\n" msgstr "Revision: %s\n" @@ -627,7 +622,7 @@ msgstr "" msgid "Signal" msgstr "" -#: ../src/bout++.cxx:715 +#: ../src/bout++.cxx:730 msgid "" "Sim Time | RHS evals | Wall Time | Calc Inv Comm I/O SOLVER\n" "\n" @@ -636,7 +631,7 @@ msgstr "" "Integrator\n" "\n" -#: ../src/bout++.cxx:718 +#: ../src/bout++.cxx:733 msgid "" "Sim Time | RHS_e evals | RHS_I evals | Wall Time | Calc Inv " "Comm I/O SOLVER\n" @@ -703,26 +698,26 @@ msgstr "" "Unbekannte Paralleltransformation\n" "Gültige Optionen sind 'identity', 'shifted', 'fci'" -#: ../src/sys/options.cxx:478 +#: ../src/sys/options.cxx:573 msgid "Unused options:\n" msgstr "Ungenutzte Optionen:\n" -#: ../src/bout++.cxx:261 +#: ../src/bout++.cxx:276 #, c-format msgid "Usage is %s -d \n" msgstr "Benutzung: %s -d \n" -#: ../src/bout++.cxx:272 +#: ../src/bout++.cxx:287 #, c-format msgid "Usage is %s -f \n" msgstr "Benutzung: %s -f \n" -#: ../src/bout++.cxx:293 +#: ../src/bout++.cxx:308 #, c-format msgid "Usage is %s -l \n" msgstr "Benutzung: %s -f \n" -#: ../src/bout++.cxx:283 +#: ../src/bout++.cxx:298 #, c-format msgid "Usage is %s -o \n" msgstr "Benutzung: %s -f \n" @@ -733,7 +728,7 @@ msgstr "" #. Print help message -- note this will be displayed once per processor as we've not #. started MPI yet. -#: ../src/bout++.cxx:225 +#: ../src/bout++.cxx:240 #, c-format msgid "" "Usage: %s [-d ] [-f ] [restart [append]] " @@ -747,33 +742,33 @@ msgstr "" msgid "User signalled to quit. Returning\n" msgstr "Beendigung durch Benutzer.\n" -#: ../src/sys/options.cxx:243 +#: ../src/sys/options.cxx:264 #, c-format msgid "Value for option %s = %e is not an integer" msgstr "Wert der Option %s = %e ist keine Ganzzahl" -#: ../src/sys/options.cxx:285 +#: ../src/sys/options.cxx:298 #, c-format msgid "Value for option %s cannot be converted to a BoutReal" msgstr "Wert der Option %s ist keine Flieskommazahl" -#: ../src/sys/options.cxx:452 +#: ../src/sys/options.cxx:465 #, c-format msgid "Value for option %s cannot be converted to a Field2D" msgstr "Wert der Option %s ist keine Field2D" -#: ../src/sys/options.cxx:402 +#: ../src/sys/options.cxx:415 ../src/sys/options.cxx:547 #, c-format msgid "Value for option %s cannot be converted to a Field3D" msgstr "Wert der Option %s ist keine Field3D" -#: ../src/sys/options.cxx:325 +#: ../src/sys/options.cxx:338 #, c-format msgid "Value for option %s cannot be converted to a bool" msgstr "Wert der Option %s ist keine Boolescher Wert" #. Another type which can't be converted -#: ../src/sys/options.cxx:234 +#: ../src/sys/options.cxx:255 #, c-format msgid "Value for option %s is not an integer" msgstr "Wert der Option %s ist keine Ganzzahl" @@ -812,7 +807,7 @@ msgid "" "option extrapolate_y=false to disable this.\n" msgstr "" -#: ../src/bout++.cxx:692 +#: ../src/bout++.cxx:707 msgid "Wall time limit in hours. By default (< 0), no limit" msgstr "" @@ -830,6 +825,11 @@ msgstr "Vorgabe" msgid "nx must be greater than 2*MXG" msgstr "nx muss größer als 2*MXG sein" +#, c-format +#~ msgid "Couldn't get BoutReal from option %s = '%s'" +#~ msgstr "" +#~ "Die Option %s = '%s' konnte nicht als Gleitkommazahl interpretiert werden." + #~ msgid "" #~ "\tOption %s = %s (%s) overwritten with:\n" #~ "\t\t%s = %s (%s)\n" diff --git a/locale/es/libbout.po b/locale/es/libbout.po index ee6dedd10b..e04ce27614 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-07-28 14:25+0200\n" +"POT-Creation-Date: 2021-12-13 14:14+0000\n" "PO-Revision-Date: 2019-02-11 12:46+0900\n" "Last-Translator: Marta \n" "Language-Team: Spanish\n" @@ -94,22 +94,22 @@ msgstr "\t -> ny/NYPE (%d/%d = %d) debe ser >= MYG (%d)\n" msgid "\tCandidate value: %d\n" msgstr "\tValor candidato: %d\n" -#: ../src/bout++.cxx:379 +#: ../src/bout++.cxx:394 msgid "\tChecking disabled\n" msgstr "\tComprobación desactivada\n" -#: ../src/bout++.cxx:377 +#: ../src/bout++.cxx:392 #, c-format msgid "\tChecking enabled, level %d\n" msgstr "\tComprobación activada, nivel %d\n" -#: ../src/bout++.cxx:425 +#: ../src/bout++.cxx:440 msgid "\tCommand line options for this run : " msgstr "\tParámetros de línea de comandos para esta ejecución :" #. The stringify is needed here as BOUT_FLAGS_STRING may already contain quoted strings #. which could cause problems (e.g. terminate strings). -#: ../src/bout++.cxx:421 +#: ../src/bout++.cxx:436 #, c-format msgid "\tCompiled with flags : %s\n" msgstr "\tCompilado con las opciones `flags` : %s\n" @@ -171,25 +171,25 @@ msgstr "" msgid "\tMultiple '=' in command-line argument '%s'\n" msgstr "\tMutilples '=' en el argumento de la línea de comandos '%s'\n" -#: ../src/bout++.cxx:408 +#: ../src/bout++.cxx:423 msgid "\tOpenMP parallelisation disabled\n" msgstr "\tParalelización en OpenMP desactivada\n" -#: ../src/bout++.cxx:405 +#: ../src/bout++.cxx:420 #, c-format msgid "\tOpenMP parallelisation enabled, using %d threads\n" msgstr "\tParalelización en OpenMP activada, usando %d procesos (`threads`)\n" #. Mark the option as used #. Option not found -#: ../src/sys/options.cxx:195 ../src/sys/options.cxx:250 -#: ../src/sys/options.cxx:292 ../src/sys/options.cxx:331 -#: ../include/options.hxx:406 ../include/options.hxx:438 -#: ../include/options.hxx:460 ../include/options.hxx:658 +#: ../src/sys/options.cxx:202 ../src/sys/options.cxx:271 +#: ../src/sys/options.cxx:305 ../src/sys/options.cxx:344 +#: ../include/options.hxx:412 ../include/options.hxx:444 +#: ../include/options.hxx:466 ../include/options.hxx:664 msgid "\tOption " msgstr "\tOpción " -#: ../src/sys/options.cxx:321 +#: ../src/sys/options.cxx:334 #, c-format msgid "\tOption '%s': Boolean expected. Got '%s'\n" msgstr "\tOpción '%s': valor Booleano esperado. Se obtuvo '%s'\n" @@ -199,11 +199,11 @@ msgstr "\tOpción '%s': valor Booleano esperado. Se obtuvo '%s'\n" msgid "\tOptions file '%s' not found\n" msgstr "\tOpciones de archivo '%s' no encontrados\n" -#: ../src/bout++.cxx:401 +#: ../src/bout++.cxx:416 msgid "\tParallel NetCDF support disabled\n" msgstr "\tSoporte para NetCDF paralelo desactivado\n" -#: ../src/bout++.cxx:399 +#: ../src/bout++.cxx:414 msgid "\tParallel NetCDF support enabled\n" msgstr "\tSoporte para NetCDF paralelo activado\n" @@ -219,11 +219,11 @@ msgstr "\tLeyendo vector contravariante " msgid "\tReading covariant vector " msgstr "\tLeyendo vector covariante " -#: ../src/bout++.cxx:385 +#: ../src/bout++.cxx:400 msgid "\tSignal handling disabled\n" msgstr "\tGestión de señal desactivada\n" -#: ../src/bout++.cxx:383 +#: ../src/bout++.cxx:398 msgid "\tSignal handling enabled\n" msgstr "\tGestión de señal activada\n" @@ -236,15 +236,15 @@ msgstr "" msgid "\tdone\n" msgstr "\tlisto\n" -#: ../src/bout++.cxx:394 +#: ../src/bout++.cxx:409 msgid "\tnetCDF support disabled\n" msgstr "\tSoporte netCDF desactivado\n" -#: ../src/bout++.cxx:389 +#: ../src/bout++.cxx:404 msgid "\tnetCDF support enabled\n" msgstr "\tSoporte netCDF activado\n" -#: ../src/bout++.cxx:392 +#: ../src/bout++.cxx:407 msgid "\tnetCDF4 support enabled\n" msgstr "\tSoporte netCDF4 activado\n" @@ -254,7 +254,7 @@ msgid "" "\tSplit Runge-Kutta-Legendre and SSP-RK3 solver\n" msgstr "" -#: ../src/bout++.cxx:229 +#: ../src/bout++.cxx:244 msgid "" "\n" " -d \tLook in for input/output files\n" @@ -291,11 +291,11 @@ msgstr "" "\n" "Ejecución iniciada en : %s\n" -#: ../src/bout++.cxx:237 +#: ../src/bout++.cxx:252 msgid " -c, --color\t\tColor output using bout-log-color\n" msgstr " -c, --color\t\tSalida de color usando bout-log-color\n" -#: ../src/bout++.cxx:240 +#: ../src/bout++.cxx:255 #, c-format msgid "" " -h, --help\t\tThis message\n" @@ -315,7 +315,7 @@ msgstr "" "Para todos los possibles parámetros input, vea el manual de usuario y/o el " "modelo físico fuente (ej. %s.cxx)\n" -#: ../include/options.hxx:661 +#: ../include/options.hxx:667 msgid ") overwritten with:" msgstr "" @@ -323,16 +323,16 @@ msgstr "" msgid "4 of 8" msgstr "" -#: ../src/sys/options.cxx:476 +#: ../src/sys/options.cxx:571 msgid "All options used\n" msgstr "Usando todas las opciones\n" -#: ../src/bout++.cxx:357 +#: ../src/bout++.cxx:372 #, c-format msgid "BOUT++ version %s\n" msgstr "Versión de BOUT++ %s\n" -#: ../src/bout++.cxx:112 +#: ../src/bout++.cxx:125 #, fuzzy msgid "Bad command line arguments:\n" msgstr "\tMutilples '=' en el argumento de la línea de comandos '%s'\n" @@ -346,11 +346,11 @@ msgstr "Regiones frontera en este procesador: " msgid "Cannot split %d X points equally between %d processors\n" msgstr "No se pueden dividir %d X points entre %d procesadores por igual\n" -#: ../src/bout++.cxx:697 +#: ../src/bout++.cxx:712 msgid "Check if a file exists, and exit if it does." msgstr "" -#: ../src/bout++.cxx:364 +#: ../src/bout++.cxx:379 #, c-format msgid "" "Code compiled on %s at %s\n" @@ -363,7 +363,7 @@ msgstr "" msgid "Command line" msgstr "Línea de comandos" -#: ../src/bout++.cxx:374 ../tests/unit/src/test_bout++.cxx:300 +#: ../src/bout++.cxx:389 ../tests/unit/src/test_bout++.cxx:300 msgid "Compile-time options:\n" msgstr "Opciones de tiempo de compilación:\n" @@ -376,7 +376,7 @@ msgstr "\tCompilado con las opciones `flags` : %s\n" msgid "Constructing default regions" msgstr "Construyendo regiones por defecto" -#: ../src/bout++.cxx:349 +#: ../src/bout++.cxx:364 #, fuzzy, c-format msgid "Could not create PID file %s" msgstr "No se pudo abrir el archivo de salida `output` '%s'\n" @@ -388,7 +388,7 @@ msgstr "" "No se pudo encontrar un valor válido para NXPE. Intente usar un número " "diferente de procesadores." -#: ../src/bout++.cxx:483 +#: ../src/bout++.cxx:498 #, c-format msgid "Could not open %s/%s.%d for writing" msgstr "" @@ -405,7 +405,7 @@ msgid "Could not read integer array '%s'\n" msgstr "No se pudo leer la matriz de enteros '%s'\n" #. Failed . Probably not important enough to stop the simulation -#: ../src/bout++.cxx:463 +#: ../src/bout++.cxx:478 msgid "Could not run bout-log-color. Make sure it is in your PATH\n" msgstr "" "No se pudo ejecutar bout-log-color. Asegúrese de que se encuentre en su " @@ -431,22 +431,18 @@ msgstr "No se pudo encontrar la región %s en regionMap2D" msgid "Couldn't find region %s in regionMapPerp" msgstr "No se pudo encontrar la región %s en regionMapPerp" -#: ../src/sys/options.cxx:280 -#, c-format -msgid "Couldn't get BoutReal from option %s = '%s'" -msgstr "No se pudo recuperar BoutReal de la opción %s = '%s'" - -#: ../src/sys/options.cxx:228 -#, c-format -msgid "Couldn't get integer from option %s = '%s'" +#. Convert any exceptions to something a bit more useful +#: ../src/sys/options.cxx:227 +#, fuzzy, c-format +msgid "Couldn't get %s from option %s = '%s': %s" msgstr "No se pudo recuperar el entero de la opción %s = '%s'" -#: ../src/bout++.cxx:337 +#: ../src/bout++.cxx:352 #, c-format msgid "DataDir \"%s\" does not exist or is not accessible\n" msgstr "DataDir \"%s\" no existe o no es accessible\n" -#: ../src/bout++.cxx:334 +#: ../src/bout++.cxx:349 #, c-format msgid "DataDir \"%s\" is not a directory\n" msgstr "DataDir \"%s\" no es un directorio\n" @@ -455,12 +451,12 @@ msgstr "DataDir \"%s\" no es un directorio\n" msgid "ERROR: Solver is already initialised\n" msgstr "ERROR: el Solver ya se encuentra inicializado\n" -#: ../src/bout++.cxx:166 +#: ../src/bout++.cxx:179 #, c-format msgid "Error encountered during initialisation: %s\n" msgstr "Error encontrado durante la inicialización:%s\n" -#: ../src/bout++.cxx:593 +#: ../src/bout++.cxx:608 msgid "Error whilst writing settings" msgstr "Error durante el paso de opciones" @@ -482,7 +478,7 @@ msgstr "Encontrando valor para NXPE (ideal = %f)\n" msgid "Initialising solver\n" msgstr "Initializando el solver\n" -#: ../src/bout++.cxx:323 +#: ../src/bout++.cxx:338 msgid "" "Input and output file for settings must be different.\n" "Provide -o to avoid this issue.\n" @@ -521,7 +517,7 @@ msgstr "Monitor indicó salir" msgid "Monitor signalled to quit\n" msgstr "Monitor indicó salir\n" -#: ../src/bout++.cxx:701 +#: ../src/bout++.cxx:716 msgid "Name of file whose existence triggers a stop" msgstr "" @@ -542,13 +538,13 @@ msgstr "" "Número de procesadores (%d) no divisible para NPs en la dirección x (%d)\n" #. Less than 2 time-steps left -#: ../src/bout++.cxx:745 +#: ../src/bout++.cxx:760 #, fuzzy, c-format msgid "Only %e seconds (%.2f steps) left. Quitting\n" msgstr "Solo faltan %e segundos. Saliendo\n" -#: ../src/sys/options.cxx:187 ../src/sys/options.cxx:207 -#: ../src/sys/options.cxx:262 ../src/sys/options.cxx:304 +#: ../src/sys/options.cxx:194 ../src/sys/options.cxx:235 +#: ../src/sys/options.cxx:283 ../src/sys/options.cxx:317 #, c-format msgid "Option %s has no value" msgstr "Opción %s sin valor" @@ -564,7 +560,7 @@ msgstr "Opción %s no es una sección" msgid "Option %s:%s does not exist" msgstr "Opción %s:%s no existe" -#: ../include/options.hxx:666 +#: ../include/options.hxx:672 #, c-format msgid "" "Options: Setting a value from same source (%s) to new value '%s' - old value " @@ -573,7 +569,7 @@ msgstr "" "Opciones: Cambiando valor de la misma fuente (%s) al valor nuevo '%s' - " "valor anterior era '%s'." -#: ../src/bout++.cxx:368 +#: ../src/bout++.cxx:383 #, c-format msgid "" "Processor number: %d of %d\n" @@ -597,7 +593,7 @@ msgstr "Región 3D registrada %s" msgid "Registered region Perp %s" msgstr "Región Perp registrada %s" -#: ../src/bout++.cxx:359 +#: ../src/bout++.cxx:374 #, c-format msgid "Revision: %s\n" msgstr "Revisión: %s\n" @@ -619,7 +615,7 @@ msgstr "" msgid "Signal" msgstr "" -#: ../src/bout++.cxx:715 +#: ../src/bout++.cxx:730 msgid "" "Sim Time | RHS evals | Wall Time | Calc Inv Comm I/O SOLVER\n" "\n" @@ -628,7 +624,7 @@ msgstr "" "SOLVER\n" "\n" -#: ../src/bout++.cxx:718 +#: ../src/bout++.cxx:733 msgid "" "Sim Time | RHS_e evals | RHS_I evals | Wall Time | Calc Inv " "Comm I/O SOLVER\n" @@ -696,26 +692,26 @@ msgstr "" "Opción paralleltransform desconocida.\n" "Opciones válidas son 'identity', 'shifted', 'fci'" -#: ../src/sys/options.cxx:478 +#: ../src/sys/options.cxx:573 msgid "Unused options:\n" msgstr "Opciones sin usar:\n" -#: ../src/bout++.cxx:261 +#: ../src/bout++.cxx:276 #, c-format msgid "Usage is %s -d \n" msgstr "Correcto uso es %s -d \n" -#: ../src/bout++.cxx:272 +#: ../src/bout++.cxx:287 #, c-format msgid "Usage is %s -f \n" msgstr "Correcto uso es %s -f \n" -#: ../src/bout++.cxx:293 +#: ../src/bout++.cxx:308 #, c-format msgid "Usage is %s -l \n" msgstr "Correcto uso es %s -l \n" -#: ../src/bout++.cxx:283 +#: ../src/bout++.cxx:298 #, c-format msgid "Usage is %s -o \n" msgstr "Correcto uso es %s -o \n" @@ -726,7 +722,7 @@ msgstr "" #. Print help message -- note this will be displayed once per processor as we've not #. started MPI yet. -#: ../src/bout++.cxx:225 +#: ../src/bout++.cxx:240 #, c-format msgid "" "Usage: %s [-d ] [-f ] [restart [append]] " @@ -741,33 +737,33 @@ msgstr "" msgid "User signalled to quit. Returning\n" msgstr "Monitor indicó salir\n" -#: ../src/sys/options.cxx:243 +#: ../src/sys/options.cxx:264 #, c-format msgid "Value for option %s = %e is not an integer" msgstr "Valor para la opción %s = %e no es un entero" -#: ../src/sys/options.cxx:285 +#: ../src/sys/options.cxx:298 #, fuzzy, c-format msgid "Value for option %s cannot be converted to a BoutReal" msgstr "Valor para la opción %s = %e no es un entero" -#: ../src/sys/options.cxx:452 +#: ../src/sys/options.cxx:465 #, fuzzy, c-format msgid "Value for option %s cannot be converted to a Field2D" msgstr "Valor para la opción %s = %e no es un entero" -#: ../src/sys/options.cxx:402 +#: ../src/sys/options.cxx:415 ../src/sys/options.cxx:547 #, fuzzy, c-format msgid "Value for option %s cannot be converted to a Field3D" msgstr "Valor para la opción %s = %e no es un entero" -#: ../src/sys/options.cxx:325 +#: ../src/sys/options.cxx:338 #, fuzzy, c-format msgid "Value for option %s cannot be converted to a bool" msgstr "Valor para la opción %s = %e no es un entero" #. Another type which can't be converted -#: ../src/sys/options.cxx:234 +#: ../src/sys/options.cxx:255 #, fuzzy, c-format msgid "Value for option %s is not an integer" msgstr "Valor para la opción %s = %e no es un entero" @@ -806,7 +802,7 @@ msgid "" "option extrapolate_y=false to disable this.\n" msgstr "" -#: ../src/bout++.cxx:692 +#: ../src/bout++.cxx:707 msgid "Wall time limit in hours. By default (< 0), no limit" msgstr "" @@ -824,6 +820,10 @@ msgstr "por defecto" msgid "nx must be greater than 2*MXG" msgstr "nx debe ser mayor que 2*MXG" +#, c-format +#~ msgid "Couldn't get BoutReal from option %s = '%s'" +#~ msgstr "No se pudo recuperar BoutReal de la opción %s = '%s'" + #~ msgid "" #~ "\tOption %s = %s (%s) overwritten with:\n" #~ "\t\t%s = %s (%s)\n" diff --git a/locale/fr/libbout.po b/locale/fr/libbout.po index d461359c8b..f4b653bd0c 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-07-28 14:25+0200\n" +"POT-Creation-Date: 2021-12-13 14:14+0000\n" "PO-Revision-Date: 2018-10-21 22:46+0100\n" "Last-Translator: \n" "Language-Team: French\n" @@ -82,22 +82,22 @@ msgstr "" msgid "\tCandidate value: %d\n" msgstr "" -#: ../src/bout++.cxx:379 +#: ../src/bout++.cxx:394 msgid "\tChecking disabled\n" msgstr "\tVérification désactivée\n" -#: ../src/bout++.cxx:377 +#: ../src/bout++.cxx:392 #, c-format msgid "\tChecking enabled, level %d\n" msgstr "\tVérification activée, niveau %d\n" -#: ../src/bout++.cxx:425 +#: ../src/bout++.cxx:440 msgid "\tCommand line options for this run : " msgstr "" #. The stringify is needed here as BOUT_FLAGS_STRING may already contain quoted strings #. which could cause problems (e.g. terminate strings). -#: ../src/bout++.cxx:421 +#: ../src/bout++.cxx:436 #, fuzzy, c-format msgid "\tCompiled with flags : %s\n" msgstr "" @@ -152,25 +152,25 @@ msgstr "" msgid "\tMultiple '=' in command-line argument '%s'\n" msgstr "" -#: ../src/bout++.cxx:408 +#: ../src/bout++.cxx:423 msgid "\tOpenMP parallelisation disabled\n" msgstr "" -#: ../src/bout++.cxx:405 +#: ../src/bout++.cxx:420 #, c-format msgid "\tOpenMP parallelisation enabled, using %d threads\n" msgstr "" #. Mark the option as used #. Option not found -#: ../src/sys/options.cxx:195 ../src/sys/options.cxx:250 -#: ../src/sys/options.cxx:292 ../src/sys/options.cxx:331 -#: ../include/options.hxx:406 ../include/options.hxx:438 -#: ../include/options.hxx:460 ../include/options.hxx:658 +#: ../src/sys/options.cxx:202 ../src/sys/options.cxx:271 +#: ../src/sys/options.cxx:305 ../src/sys/options.cxx:344 +#: ../include/options.hxx:412 ../include/options.hxx:444 +#: ../include/options.hxx:466 ../include/options.hxx:664 msgid "\tOption " msgstr "" -#: ../src/sys/options.cxx:321 +#: ../src/sys/options.cxx:334 #, c-format msgid "\tOption '%s': Boolean expected. Got '%s'\n" msgstr "" @@ -180,11 +180,11 @@ msgstr "" msgid "\tOptions file '%s' not found\n" msgstr "" -#: ../src/bout++.cxx:401 +#: ../src/bout++.cxx:416 msgid "\tParallel NetCDF support disabled\n" msgstr "" -#: ../src/bout++.cxx:399 +#: ../src/bout++.cxx:414 msgid "\tParallel NetCDF support enabled\n" msgstr "" @@ -200,11 +200,11 @@ msgstr "" msgid "\tReading covariant vector " msgstr "" -#: ../src/bout++.cxx:385 +#: ../src/bout++.cxx:400 msgid "\tSignal handling disabled\n" msgstr "\tTraitement du signal désactivé\n" -#: ../src/bout++.cxx:383 +#: ../src/bout++.cxx:398 msgid "\tSignal handling enabled\n" msgstr "\tTraitement du signal activé\n" @@ -217,15 +217,15 @@ msgstr "" msgid "\tdone\n" msgstr "" -#: ../src/bout++.cxx:394 +#: ../src/bout++.cxx:409 msgid "\tnetCDF support disabled\n" msgstr "" -#: ../src/bout++.cxx:389 +#: ../src/bout++.cxx:404 msgid "\tnetCDF support enabled\n" msgstr "" -#: ../src/bout++.cxx:392 +#: ../src/bout++.cxx:407 msgid "\tnetCDF4 support enabled\n" msgstr "" @@ -235,7 +235,7 @@ msgid "" "\tSplit Runge-Kutta-Legendre and SSP-RK3 solver\n" msgstr "" -#: ../src/bout++.cxx:229 +#: ../src/bout++.cxx:244 msgid "" "\n" " -d \tLook in for input/output files\n" @@ -264,11 +264,11 @@ msgstr "" "\n" "L'exécution se termine à %s\n" -#: ../src/bout++.cxx:237 +#: ../src/bout++.cxx:252 msgid " -c, --color\t\tColor output using bout-log-color\n" msgstr "" -#: ../src/bout++.cxx:240 +#: ../src/bout++.cxx:255 #, c-format msgid "" " -h, --help\t\tThis message\n" @@ -280,7 +280,7 @@ msgid "" "model source (e.g. %s.cxx)\n" msgstr "" -#: ../include/options.hxx:661 +#: ../include/options.hxx:667 msgid ") overwritten with:" msgstr "" @@ -288,16 +288,16 @@ msgstr "" msgid "4 of 8" msgstr "" -#: ../src/sys/options.cxx:476 +#: ../src/sys/options.cxx:571 msgid "All options used\n" msgstr "" -#: ../src/bout++.cxx:357 +#: ../src/bout++.cxx:372 #, c-format msgid "BOUT++ version %s\n" msgstr "" -#: ../src/bout++.cxx:112 +#: ../src/bout++.cxx:125 msgid "Bad command line arguments:\n" msgstr "" @@ -310,11 +310,11 @@ msgstr "" msgid "Cannot split %d X points equally between %d processors\n" msgstr "" -#: ../src/bout++.cxx:697 +#: ../src/bout++.cxx:712 msgid "Check if a file exists, and exit if it does." msgstr "" -#: ../src/bout++.cxx:364 +#: ../src/bout++.cxx:379 #, c-format msgid "" "Code compiled on %s at %s\n" @@ -327,7 +327,7 @@ msgstr "" msgid "Command line" msgstr "" -#: ../src/bout++.cxx:374 ../tests/unit/src/test_bout++.cxx:300 +#: ../src/bout++.cxx:389 ../tests/unit/src/test_bout++.cxx:300 msgid "Compile-time options:\n" msgstr "" @@ -339,7 +339,7 @@ msgstr "" msgid "Constructing default regions" msgstr "" -#: ../src/bout++.cxx:349 +#: ../src/bout++.cxx:364 #, c-format msgid "Could not create PID file %s" msgstr "" @@ -349,7 +349,7 @@ msgid "" "Could not find a valid value for NXPE. Try a different number of processors." msgstr "" -#: ../src/bout++.cxx:483 +#: ../src/bout++.cxx:498 #, c-format msgid "Could not open %s/%s.%d for writing" msgstr "" @@ -366,7 +366,7 @@ msgid "Could not read integer array '%s'\n" msgstr "" #. Failed . Probably not important enough to stop the simulation -#: ../src/bout++.cxx:463 +#: ../src/bout++.cxx:478 msgid "Could not run bout-log-color. Make sure it is in your PATH\n" msgstr "" @@ -390,22 +390,18 @@ msgstr "" msgid "Couldn't find region %s in regionMapPerp" msgstr "" -#: ../src/sys/options.cxx:280 -#, c-format -msgid "Couldn't get BoutReal from option %s = '%s'" -msgstr "" - -#: ../src/sys/options.cxx:228 +#. Convert any exceptions to something a bit more useful +#: ../src/sys/options.cxx:227 #, c-format -msgid "Couldn't get integer from option %s = '%s'" +msgid "Couldn't get %s from option %s = '%s': %s" msgstr "" -#: ../src/bout++.cxx:337 +#: ../src/bout++.cxx:352 #, c-format msgid "DataDir \"%s\" does not exist or is not accessible\n" msgstr "Le répertoire de données \"%s\" n'existe pas ou n'est pas accessible\n" -#: ../src/bout++.cxx:334 +#: ../src/bout++.cxx:349 #, c-format msgid "DataDir \"%s\" is not a directory\n" msgstr "\"%s\" n'est pas un répertoire\n" @@ -414,12 +410,12 @@ msgstr "\"%s\" n'est pas un répertoire\n" msgid "ERROR: Solver is already initialised\n" msgstr "" -#: ../src/bout++.cxx:166 +#: ../src/bout++.cxx:179 #, c-format msgid "Error encountered during initialisation: %s\n" msgstr "Erreur rencontrée lors de l'initialisation : %s\n" -#: ../src/bout++.cxx:593 +#: ../src/bout++.cxx:608 msgid "Error whilst writing settings" msgstr "" @@ -441,7 +437,7 @@ msgstr "" msgid "Initialising solver\n" msgstr "" -#: ../src/bout++.cxx:323 +#: ../src/bout++.cxx:338 msgid "" "Input and output file for settings must be different.\n" "Provide -o to avoid this issue.\n" @@ -477,7 +473,7 @@ msgstr "" msgid "Monitor signalled to quit\n" msgstr "" -#: ../src/bout++.cxx:701 +#: ../src/bout++.cxx:716 msgid "Name of file whose existence triggers a stop" msgstr "" @@ -496,13 +492,13 @@ msgid "Number of processors (%d) not divisible by NPs in y direction (%d)\n" msgstr "" #. Less than 2 time-steps left -#: ../src/bout++.cxx:745 +#: ../src/bout++.cxx:760 #, c-format msgid "Only %e seconds (%.2f steps) left. Quitting\n" msgstr "" -#: ../src/sys/options.cxx:187 ../src/sys/options.cxx:207 -#: ../src/sys/options.cxx:262 ../src/sys/options.cxx:304 +#: ../src/sys/options.cxx:194 ../src/sys/options.cxx:235 +#: ../src/sys/options.cxx:283 ../src/sys/options.cxx:317 #, c-format msgid "Option %s has no value" msgstr "" @@ -518,14 +514,14 @@ msgstr "\"%s\" n'est pas un répertoire\n" msgid "Option %s:%s does not exist" msgstr "" -#: ../include/options.hxx:666 +#: ../include/options.hxx:672 #, c-format msgid "" "Options: Setting a value from same source (%s) to new value '%s' - old value " "was '%s'." msgstr "" -#: ../src/bout++.cxx:368 +#: ../src/bout++.cxx:383 #, c-format msgid "" "Processor number: %d of %d\n" @@ -547,7 +543,7 @@ msgstr "" msgid "Registered region Perp %s" msgstr "" -#: ../src/bout++.cxx:359 +#: ../src/bout++.cxx:374 #, c-format msgid "Revision: %s\n" msgstr "" @@ -569,13 +565,13 @@ msgstr "" msgid "Signal" msgstr "" -#: ../src/bout++.cxx:715 +#: ../src/bout++.cxx:730 msgid "" "Sim Time | RHS evals | Wall Time | Calc Inv Comm I/O SOLVER\n" "\n" msgstr "" -#: ../src/bout++.cxx:718 +#: ../src/bout++.cxx:733 msgid "" "Sim Time | RHS_e evals | RHS_I evals | Wall Time | Calc Inv " "Comm I/O SOLVER\n" @@ -633,26 +629,26 @@ msgid "" "Valid choices are 'identity', 'shifted', 'fci'" msgstr "" -#: ../src/sys/options.cxx:478 +#: ../src/sys/options.cxx:573 msgid "Unused options:\n" msgstr "" -#: ../src/bout++.cxx:261 +#: ../src/bout++.cxx:276 #, fuzzy, c-format msgid "Usage is %s -d \n" msgstr "\"%s\" n'est pas un répertoire\n" -#: ../src/bout++.cxx:272 +#: ../src/bout++.cxx:287 #, c-format msgid "Usage is %s -f \n" msgstr "" -#: ../src/bout++.cxx:293 +#: ../src/bout++.cxx:308 #, c-format msgid "Usage is %s -l \n" msgstr "" -#: ../src/bout++.cxx:283 +#: ../src/bout++.cxx:298 #, c-format msgid "Usage is %s -o \n" msgstr "" @@ -663,7 +659,7 @@ msgstr "" #. Print help message -- note this will be displayed once per processor as we've not #. started MPI yet. -#: ../src/bout++.cxx:225 +#: ../src/bout++.cxx:240 #, c-format msgid "" "Usage: %s [-d ] [-f ] [restart [append]] " @@ -675,33 +671,33 @@ msgstr "" msgid "User signalled to quit. Returning\n" msgstr "" -#: ../src/sys/options.cxx:243 +#: ../src/sys/options.cxx:264 #, c-format msgid "Value for option %s = %e is not an integer" msgstr "" -#: ../src/sys/options.cxx:285 +#: ../src/sys/options.cxx:298 #, c-format msgid "Value for option %s cannot be converted to a BoutReal" msgstr "" -#: ../src/sys/options.cxx:452 +#: ../src/sys/options.cxx:465 #, c-format msgid "Value for option %s cannot be converted to a Field2D" msgstr "" -#: ../src/sys/options.cxx:402 +#: ../src/sys/options.cxx:415 ../src/sys/options.cxx:547 #, c-format msgid "Value for option %s cannot be converted to a Field3D" msgstr "" -#: ../src/sys/options.cxx:325 +#: ../src/sys/options.cxx:338 #, c-format msgid "Value for option %s cannot be converted to a bool" msgstr "" #. Another type which can't be converted -#: ../src/sys/options.cxx:234 +#: ../src/sys/options.cxx:255 #, c-format msgid "Value for option %s is not an integer" msgstr "" @@ -738,7 +734,7 @@ msgid "" "option extrapolate_y=false to disable this.\n" msgstr "" -#: ../src/bout++.cxx:692 +#: ../src/bout++.cxx:707 msgid "Wall time limit in hours. By default (< 0), no limit" msgstr "" diff --git a/locale/libbout.pot b/locale/libbout.pot index 0cbd55fcd5..cd2c279c7d 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-07-28 14:25+0200\n" +"POT-Creation-Date: 2021-12-13 14:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -82,22 +82,22 @@ msgstr "" msgid "\tCandidate value: %d\n" msgstr "" -#: ../src/bout++.cxx:379 +#: ../src/bout++.cxx:394 msgid "\tChecking disabled\n" msgstr "" -#: ../src/bout++.cxx:377 +#: ../src/bout++.cxx:392 #, c-format msgid "\tChecking enabled, level %d\n" msgstr "" -#: ../src/bout++.cxx:425 +#: ../src/bout++.cxx:440 msgid "\tCommand line options for this run : " msgstr "" #. The stringify is needed here as BOUT_FLAGS_STRING may already contain quoted strings #. which could cause problems (e.g. terminate strings). -#: ../src/bout++.cxx:421 +#: ../src/bout++.cxx:436 #, c-format msgid "\tCompiled with flags : %s\n" msgstr "" @@ -150,25 +150,25 @@ msgstr "" msgid "\tMultiple '=' in command-line argument '%s'\n" msgstr "" -#: ../src/bout++.cxx:408 +#: ../src/bout++.cxx:423 msgid "\tOpenMP parallelisation disabled\n" msgstr "" -#: ../src/bout++.cxx:405 +#: ../src/bout++.cxx:420 #, c-format msgid "\tOpenMP parallelisation enabled, using %d threads\n" msgstr "" #. Mark the option as used #. Option not found -#: ../src/sys/options.cxx:195 ../src/sys/options.cxx:250 -#: ../src/sys/options.cxx:292 ../src/sys/options.cxx:331 -#: ../include/options.hxx:406 ../include/options.hxx:438 -#: ../include/options.hxx:460 ../include/options.hxx:658 +#: ../src/sys/options.cxx:202 ../src/sys/options.cxx:271 +#: ../src/sys/options.cxx:305 ../src/sys/options.cxx:344 +#: ../include/options.hxx:412 ../include/options.hxx:444 +#: ../include/options.hxx:466 ../include/options.hxx:664 msgid "\tOption " msgstr "" -#: ../src/sys/options.cxx:321 +#: ../src/sys/options.cxx:334 #, c-format msgid "\tOption '%s': Boolean expected. Got '%s'\n" msgstr "" @@ -178,11 +178,11 @@ msgstr "" msgid "\tOptions file '%s' not found\n" msgstr "" -#: ../src/bout++.cxx:401 +#: ../src/bout++.cxx:416 msgid "\tParallel NetCDF support disabled\n" msgstr "" -#: ../src/bout++.cxx:399 +#: ../src/bout++.cxx:414 msgid "\tParallel NetCDF support enabled\n" msgstr "" @@ -198,11 +198,11 @@ msgstr "" msgid "\tReading covariant vector " msgstr "" -#: ../src/bout++.cxx:385 +#: ../src/bout++.cxx:400 msgid "\tSignal handling disabled\n" msgstr "" -#: ../src/bout++.cxx:383 +#: ../src/bout++.cxx:398 msgid "\tSignal handling enabled\n" msgstr "" @@ -215,15 +215,15 @@ msgstr "" msgid "\tdone\n" msgstr "" -#: ../src/bout++.cxx:394 +#: ../src/bout++.cxx:409 msgid "\tnetCDF support disabled\n" msgstr "" -#: ../src/bout++.cxx:389 +#: ../src/bout++.cxx:404 msgid "\tnetCDF support enabled\n" msgstr "" -#: ../src/bout++.cxx:392 +#: ../src/bout++.cxx:407 msgid "\tnetCDF4 support enabled\n" msgstr "" @@ -233,7 +233,7 @@ msgid "" "\tSplit Runge-Kutta-Legendre and SSP-RK3 solver\n" msgstr "" -#: ../src/bout++.cxx:229 +#: ../src/bout++.cxx:244 msgid "" "\n" " -d \tLook in for input/output files\n" @@ -258,11 +258,11 @@ msgid "" "Run started at : %s\n" msgstr "" -#: ../src/bout++.cxx:237 +#: ../src/bout++.cxx:252 msgid " -c, --color\t\tColor output using bout-log-color\n" msgstr "" -#: ../src/bout++.cxx:240 +#: ../src/bout++.cxx:255 #, c-format msgid "" " -h, --help\t\tThis message\n" @@ -274,7 +274,7 @@ msgid "" "model source (e.g. %s.cxx)\n" msgstr "" -#: ../include/options.hxx:661 +#: ../include/options.hxx:667 msgid ") overwritten with:" msgstr "" @@ -282,16 +282,16 @@ msgstr "" msgid "4 of 8" msgstr "" -#: ../src/sys/options.cxx:476 +#: ../src/sys/options.cxx:571 msgid "All options used\n" msgstr "" -#: ../src/bout++.cxx:357 +#: ../src/bout++.cxx:372 #, c-format msgid "BOUT++ version %s\n" msgstr "" -#: ../src/bout++.cxx:112 +#: ../src/bout++.cxx:125 msgid "Bad command line arguments:\n" msgstr "" @@ -304,11 +304,11 @@ msgstr "" msgid "Cannot split %d X points equally between %d processors\n" msgstr "" -#: ../src/bout++.cxx:697 +#: ../src/bout++.cxx:712 msgid "Check if a file exists, and exit if it does." msgstr "" -#: ../src/bout++.cxx:364 +#: ../src/bout++.cxx:379 #, c-format msgid "" "Code compiled on %s at %s\n" @@ -319,7 +319,7 @@ msgstr "" msgid "Command line" msgstr "" -#: ../src/bout++.cxx:374 ../tests/unit/src/test_bout++.cxx:300 +#: ../src/bout++.cxx:389 ../tests/unit/src/test_bout++.cxx:300 msgid "Compile-time options:\n" msgstr "" @@ -331,7 +331,7 @@ msgstr "" msgid "Constructing default regions" msgstr "" -#: ../src/bout++.cxx:349 +#: ../src/bout++.cxx:364 #, c-format msgid "Could not create PID file %s" msgstr "" @@ -341,7 +341,7 @@ msgid "" "Could not find a valid value for NXPE. Try a different number of processors." msgstr "" -#: ../src/bout++.cxx:483 +#: ../src/bout++.cxx:498 #, c-format msgid "Could not open %s/%s.%d for writing" msgstr "" @@ -358,7 +358,7 @@ msgid "Could not read integer array '%s'\n" msgstr "" #. Failed . Probably not important enough to stop the simulation -#: ../src/bout++.cxx:463 +#: ../src/bout++.cxx:478 msgid "Could not run bout-log-color. Make sure it is in your PATH\n" msgstr "" @@ -382,22 +382,18 @@ msgstr "" msgid "Couldn't find region %s in regionMapPerp" msgstr "" -#: ../src/sys/options.cxx:280 -#, c-format -msgid "Couldn't get BoutReal from option %s = '%s'" -msgstr "" - -#: ../src/sys/options.cxx:228 +#. Convert any exceptions to something a bit more useful +#: ../src/sys/options.cxx:227 #, c-format -msgid "Couldn't get integer from option %s = '%s'" +msgid "Couldn't get %s from option %s = '%s': %s" msgstr "" -#: ../src/bout++.cxx:337 +#: ../src/bout++.cxx:352 #, c-format msgid "DataDir \"%s\" does not exist or is not accessible\n" msgstr "" -#: ../src/bout++.cxx:334 +#: ../src/bout++.cxx:349 #, c-format msgid "DataDir \"%s\" is not a directory\n" msgstr "" @@ -406,12 +402,12 @@ msgstr "" msgid "ERROR: Solver is already initialised\n" msgstr "" -#: ../src/bout++.cxx:166 +#: ../src/bout++.cxx:179 #, c-format msgid "Error encountered during initialisation: %s\n" msgstr "" -#: ../src/bout++.cxx:593 +#: ../src/bout++.cxx:608 msgid "Error whilst writing settings" msgstr "" @@ -433,7 +429,7 @@ msgstr "" msgid "Initialising solver\n" msgstr "" -#: ../src/bout++.cxx:323 +#: ../src/bout++.cxx:338 msgid "" "Input and output file for settings must be different.\n" "Provide -o to avoid this issue.\n" @@ -469,7 +465,7 @@ msgstr "" msgid "Monitor signalled to quit\n" msgstr "" -#: ../src/bout++.cxx:701 +#: ../src/bout++.cxx:716 msgid "Name of file whose existence triggers a stop" msgstr "" @@ -488,13 +484,13 @@ msgid "Number of processors (%d) not divisible by NPs in y direction (%d)\n" msgstr "" #. Less than 2 time-steps left -#: ../src/bout++.cxx:745 +#: ../src/bout++.cxx:760 #, c-format msgid "Only %e seconds (%.2f steps) left. Quitting\n" msgstr "" -#: ../src/sys/options.cxx:187 ../src/sys/options.cxx:207 -#: ../src/sys/options.cxx:262 ../src/sys/options.cxx:304 +#: ../src/sys/options.cxx:194 ../src/sys/options.cxx:235 +#: ../src/sys/options.cxx:283 ../src/sys/options.cxx:317 #, c-format msgid "Option %s has no value" msgstr "" @@ -510,14 +506,14 @@ msgstr "" msgid "Option %s:%s does not exist" msgstr "" -#: ../include/options.hxx:666 +#: ../include/options.hxx:672 #, c-format msgid "" "Options: Setting a value from same source (%s) to new value '%s' - old value " "was '%s'." msgstr "" -#: ../src/bout++.cxx:368 +#: ../src/bout++.cxx:383 #, c-format msgid "" "Processor number: %d of %d\n" @@ -539,7 +535,7 @@ msgstr "" msgid "Registered region Perp %s" msgstr "" -#: ../src/bout++.cxx:359 +#: ../src/bout++.cxx:374 #, c-format msgid "Revision: %s\n" msgstr "" @@ -559,13 +555,13 @@ msgstr "" msgid "Signal" msgstr "" -#: ../src/bout++.cxx:715 +#: ../src/bout++.cxx:730 msgid "" "Sim Time | RHS evals | Wall Time | Calc Inv Comm I/O SOLVER\n" "\n" msgstr "" -#: ../src/bout++.cxx:718 +#: ../src/bout++.cxx:733 msgid "" "Sim Time | RHS_e evals | RHS_I evals | Wall Time | Calc Inv " "Comm I/O SOLVER\n" @@ -622,26 +618,26 @@ msgid "" "Valid choices are 'identity', 'shifted', 'fci'" msgstr "" -#: ../src/sys/options.cxx:478 +#: ../src/sys/options.cxx:573 msgid "Unused options:\n" msgstr "" -#: ../src/bout++.cxx:261 +#: ../src/bout++.cxx:276 #, c-format msgid "Usage is %s -d \n" msgstr "" -#: ../src/bout++.cxx:272 +#: ../src/bout++.cxx:287 #, c-format msgid "Usage is %s -f \n" msgstr "" -#: ../src/bout++.cxx:293 +#: ../src/bout++.cxx:308 #, c-format msgid "Usage is %s -l \n" msgstr "" -#: ../src/bout++.cxx:283 +#: ../src/bout++.cxx:298 #, c-format msgid "Usage is %s -o \n" msgstr "" @@ -652,7 +648,7 @@ msgstr "" #. Print help message -- note this will be displayed once per processor as we've not #. started MPI yet. -#: ../src/bout++.cxx:225 +#: ../src/bout++.cxx:240 #, c-format msgid "" "Usage: %s [-d ] [-f ] [restart [append]] " @@ -664,33 +660,33 @@ msgstr "" msgid "User signalled to quit. Returning\n" msgstr "" -#: ../src/sys/options.cxx:243 +#: ../src/sys/options.cxx:264 #, c-format msgid "Value for option %s = %e is not an integer" msgstr "" -#: ../src/sys/options.cxx:285 +#: ../src/sys/options.cxx:298 #, c-format msgid "Value for option %s cannot be converted to a BoutReal" msgstr "" -#: ../src/sys/options.cxx:452 +#: ../src/sys/options.cxx:465 #, c-format msgid "Value for option %s cannot be converted to a Field2D" msgstr "" -#: ../src/sys/options.cxx:402 +#: ../src/sys/options.cxx:415 ../src/sys/options.cxx:547 #, c-format msgid "Value for option %s cannot be converted to a Field3D" msgstr "" -#: ../src/sys/options.cxx:325 +#: ../src/sys/options.cxx:338 #, c-format msgid "Value for option %s cannot be converted to a bool" msgstr "" #. Another type which can't be converted -#: ../src/sys/options.cxx:234 +#: ../src/sys/options.cxx:255 #, c-format msgid "Value for option %s is not an integer" msgstr "" @@ -727,7 +723,7 @@ msgid "" "option extrapolate_y=false to disable this.\n" msgstr "" -#: ../src/bout++.cxx:692 +#: ../src/bout++.cxx:707 msgid "Wall time limit in hours. By default (< 0), no limit" msgstr "" diff --git a/locale/zh_CN/libbout.po b/locale/zh_CN/libbout.po index f27021fad4..9fb07f41d7 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-07-28 14:25+0200\n" +"POT-Creation-Date: 2021-12-13 14:14+0000\n" "PO-Revision-Date: 2018-10-22 22:56+0100\n" "Last-Translator: \n" "Language-Team: Chinese (simplified)\n" @@ -81,22 +81,22 @@ msgstr "" msgid "\tCandidate value: %d\n" msgstr "" -#: ../src/bout++.cxx:379 +#: ../src/bout++.cxx:394 msgid "\tChecking disabled\n" msgstr "\t测试关掉\n" -#: ../src/bout++.cxx:377 +#: ../src/bout++.cxx:392 #, c-format msgid "\tChecking enabled, level %d\n" msgstr "\t测试打开,级别 %d\n" -#: ../src/bout++.cxx:425 +#: ../src/bout++.cxx:440 msgid "\tCommand line options for this run : " msgstr "" #. The stringify is needed here as BOUT_FLAGS_STRING may already contain quoted strings #. which could cause problems (e.g. terminate strings). -#: ../src/bout++.cxx:421 +#: ../src/bout++.cxx:436 #, fuzzy, c-format msgid "\tCompiled with flags : %s\n" msgstr "" @@ -151,25 +151,25 @@ msgstr "" msgid "\tMultiple '=' in command-line argument '%s'\n" msgstr "" -#: ../src/bout++.cxx:408 +#: ../src/bout++.cxx:423 msgid "\tOpenMP parallelisation disabled\n" msgstr "" -#: ../src/bout++.cxx:405 +#: ../src/bout++.cxx:420 #, c-format msgid "\tOpenMP parallelisation enabled, using %d threads\n" msgstr "" #. Mark the option as used #. Option not found -#: ../src/sys/options.cxx:195 ../src/sys/options.cxx:250 -#: ../src/sys/options.cxx:292 ../src/sys/options.cxx:331 -#: ../include/options.hxx:406 ../include/options.hxx:438 -#: ../include/options.hxx:460 ../include/options.hxx:658 +#: ../src/sys/options.cxx:202 ../src/sys/options.cxx:271 +#: ../src/sys/options.cxx:305 ../src/sys/options.cxx:344 +#: ../include/options.hxx:412 ../include/options.hxx:444 +#: ../include/options.hxx:466 ../include/options.hxx:664 msgid "\tOption " msgstr "\t选项 " -#: ../src/sys/options.cxx:321 +#: ../src/sys/options.cxx:334 #, c-format msgid "\tOption '%s': Boolean expected. Got '%s'\n" msgstr "" @@ -179,11 +179,11 @@ msgstr "" msgid "\tOptions file '%s' not found\n" msgstr "" -#: ../src/bout++.cxx:401 +#: ../src/bout++.cxx:416 msgid "\tParallel NetCDF support disabled\n" msgstr "" -#: ../src/bout++.cxx:399 +#: ../src/bout++.cxx:414 msgid "\tParallel NetCDF support enabled\n" msgstr "" @@ -199,12 +199,12 @@ msgstr "" msgid "\tReading covariant vector " msgstr "" -#: ../src/bout++.cxx:385 +#: ../src/bout++.cxx:400 #, fuzzy msgid "\tSignal handling disabled\n" msgstr "\t测试关掉\n" -#: ../src/bout++.cxx:383 +#: ../src/bout++.cxx:398 msgid "\tSignal handling enabled\n" msgstr "" @@ -217,15 +217,15 @@ msgstr "" msgid "\tdone\n" msgstr "" -#: ../src/bout++.cxx:394 +#: ../src/bout++.cxx:409 msgid "\tnetCDF support disabled\n" msgstr "" -#: ../src/bout++.cxx:389 +#: ../src/bout++.cxx:404 msgid "\tnetCDF support enabled\n" msgstr "" -#: ../src/bout++.cxx:392 +#: ../src/bout++.cxx:407 msgid "\tnetCDF4 support enabled\n" msgstr "" @@ -235,7 +235,7 @@ msgid "" "\tSplit Runge-Kutta-Legendre and SSP-RK3 solver\n" msgstr "" -#: ../src/bout++.cxx:229 +#: ../src/bout++.cxx:244 msgid "" "\n" " -d \tLook in for input/output files\n" @@ -264,11 +264,11 @@ msgstr "" "\n" "计算从 %s 开始\n" -#: ../src/bout++.cxx:237 +#: ../src/bout++.cxx:252 msgid " -c, --color\t\tColor output using bout-log-color\n" msgstr "" -#: ../src/bout++.cxx:240 +#: ../src/bout++.cxx:255 #, c-format msgid "" " -h, --help\t\tThis message\n" @@ -280,7 +280,7 @@ msgid "" "model source (e.g. %s.cxx)\n" msgstr "" -#: ../include/options.hxx:661 +#: ../include/options.hxx:667 msgid ") overwritten with:" msgstr "" @@ -288,16 +288,16 @@ msgstr "" msgid "4 of 8" msgstr "" -#: ../src/sys/options.cxx:476 +#: ../src/sys/options.cxx:571 msgid "All options used\n" msgstr "" -#: ../src/bout++.cxx:357 +#: ../src/bout++.cxx:372 #, c-format msgid "BOUT++ version %s\n" msgstr "" -#: ../src/bout++.cxx:112 +#: ../src/bout++.cxx:125 msgid "Bad command line arguments:\n" msgstr "" @@ -310,11 +310,11 @@ msgstr "" msgid "Cannot split %d X points equally between %d processors\n" msgstr "" -#: ../src/bout++.cxx:697 +#: ../src/bout++.cxx:712 msgid "Check if a file exists, and exit if it does." msgstr "" -#: ../src/bout++.cxx:364 +#: ../src/bout++.cxx:379 #, c-format msgid "" "Code compiled on %s at %s\n" @@ -327,7 +327,7 @@ msgstr "" msgid "Command line" msgstr "" -#: ../src/bout++.cxx:374 ../tests/unit/src/test_bout++.cxx:300 +#: ../src/bout++.cxx:389 ../tests/unit/src/test_bout++.cxx:300 msgid "Compile-time options:\n" msgstr "" @@ -339,7 +339,7 @@ msgstr "" msgid "Constructing default regions" msgstr "" -#: ../src/bout++.cxx:349 +#: ../src/bout++.cxx:364 #, c-format msgid "Could not create PID file %s" msgstr "" @@ -349,7 +349,7 @@ msgid "" "Could not find a valid value for NXPE. Try a different number of processors." msgstr "" -#: ../src/bout++.cxx:483 +#: ../src/bout++.cxx:498 #, c-format msgid "Could not open %s/%s.%d for writing" msgstr "" @@ -366,7 +366,7 @@ msgid "Could not read integer array '%s'\n" msgstr "" #. Failed . Probably not important enough to stop the simulation -#: ../src/bout++.cxx:463 +#: ../src/bout++.cxx:478 msgid "Could not run bout-log-color. Make sure it is in your PATH\n" msgstr "" @@ -390,22 +390,18 @@ msgstr "" msgid "Couldn't find region %s in regionMapPerp" msgstr "" -#: ../src/sys/options.cxx:280 -#, c-format -msgid "Couldn't get BoutReal from option %s = '%s'" -msgstr "" - -#: ../src/sys/options.cxx:228 +#. Convert any exceptions to something a bit more useful +#: ../src/sys/options.cxx:227 #, c-format -msgid "Couldn't get integer from option %s = '%s'" +msgid "Couldn't get %s from option %s = '%s': %s" msgstr "" -#: ../src/bout++.cxx:337 +#: ../src/bout++.cxx:352 #, c-format msgid "DataDir \"%s\" does not exist or is not accessible\n" msgstr "\"%s\" 不存在或不可访问\n" -#: ../src/bout++.cxx:334 +#: ../src/bout++.cxx:349 #, c-format msgid "DataDir \"%s\" is not a directory\n" msgstr "\"%s\" 不是目录\n" @@ -414,12 +410,12 @@ msgstr "\"%s\" 不是目录\n" msgid "ERROR: Solver is already initialised\n" msgstr "" -#: ../src/bout++.cxx:166 +#: ../src/bout++.cxx:179 #, c-format msgid "Error encountered during initialisation: %s\n" msgstr "启动时遇到错误 : %s\n" -#: ../src/bout++.cxx:593 +#: ../src/bout++.cxx:608 msgid "Error whilst writing settings" msgstr "" @@ -441,7 +437,7 @@ msgstr "" msgid "Initialising solver\n" msgstr "" -#: ../src/bout++.cxx:323 +#: ../src/bout++.cxx:338 msgid "" "Input and output file for settings must be different.\n" "Provide -o to avoid this issue.\n" @@ -477,7 +473,7 @@ msgstr "" msgid "Monitor signalled to quit\n" msgstr "" -#: ../src/bout++.cxx:701 +#: ../src/bout++.cxx:716 msgid "Name of file whose existence triggers a stop" msgstr "" @@ -496,13 +492,13 @@ msgid "Number of processors (%d) not divisible by NPs in y direction (%d)\n" msgstr "" #. Less than 2 time-steps left -#: ../src/bout++.cxx:745 +#: ../src/bout++.cxx:760 #, c-format msgid "Only %e seconds (%.2f steps) left. Quitting\n" msgstr "" -#: ../src/sys/options.cxx:187 ../src/sys/options.cxx:207 -#: ../src/sys/options.cxx:262 ../src/sys/options.cxx:304 +#: ../src/sys/options.cxx:194 ../src/sys/options.cxx:235 +#: ../src/sys/options.cxx:283 ../src/sys/options.cxx:317 #, c-format msgid "Option %s has no value" msgstr "" @@ -518,14 +514,14 @@ msgstr "\"%s\" 不是目录\n" msgid "Option %s:%s does not exist" msgstr "" -#: ../include/options.hxx:666 +#: ../include/options.hxx:672 #, c-format msgid "" "Options: Setting a value from same source (%s) to new value '%s' - old value " "was '%s'." msgstr "" -#: ../src/bout++.cxx:368 +#: ../src/bout++.cxx:383 #, c-format msgid "" "Processor number: %d of %d\n" @@ -547,7 +543,7 @@ msgstr "" msgid "Registered region Perp %s" msgstr "" -#: ../src/bout++.cxx:359 +#: ../src/bout++.cxx:374 #, c-format msgid "Revision: %s\n" msgstr "" @@ -569,13 +565,13 @@ msgstr "" msgid "Signal" msgstr "" -#: ../src/bout++.cxx:715 +#: ../src/bout++.cxx:730 msgid "" "Sim Time | RHS evals | Wall Time | Calc Inv Comm I/O SOLVER\n" "\n" msgstr "" -#: ../src/bout++.cxx:718 +#: ../src/bout++.cxx:733 msgid "" "Sim Time | RHS_e evals | RHS_I evals | Wall Time | Calc Inv " "Comm I/O SOLVER\n" @@ -632,26 +628,26 @@ msgid "" "Valid choices are 'identity', 'shifted', 'fci'" msgstr "" -#: ../src/sys/options.cxx:478 +#: ../src/sys/options.cxx:573 msgid "Unused options:\n" msgstr "" -#: ../src/bout++.cxx:261 +#: ../src/bout++.cxx:276 #, fuzzy, c-format msgid "Usage is %s -d \n" msgstr "\"%s\" 不是目录\n" -#: ../src/bout++.cxx:272 +#: ../src/bout++.cxx:287 #, c-format msgid "Usage is %s -f \n" msgstr "" -#: ../src/bout++.cxx:293 +#: ../src/bout++.cxx:308 #, c-format msgid "Usage is %s -l \n" msgstr "" -#: ../src/bout++.cxx:283 +#: ../src/bout++.cxx:298 #, c-format msgid "Usage is %s -o \n" msgstr "" @@ -662,7 +658,7 @@ msgstr "" #. Print help message -- note this will be displayed once per processor as we've not #. started MPI yet. -#: ../src/bout++.cxx:225 +#: ../src/bout++.cxx:240 #, c-format msgid "" "Usage: %s [-d ] [-f ] [restart [append]] " @@ -674,33 +670,33 @@ msgstr "" msgid "User signalled to quit. Returning\n" msgstr "" -#: ../src/sys/options.cxx:243 +#: ../src/sys/options.cxx:264 #, c-format msgid "Value for option %s = %e is not an integer" msgstr "" -#: ../src/sys/options.cxx:285 +#: ../src/sys/options.cxx:298 #, c-format msgid "Value for option %s cannot be converted to a BoutReal" msgstr "" -#: ../src/sys/options.cxx:452 +#: ../src/sys/options.cxx:465 #, c-format msgid "Value for option %s cannot be converted to a Field2D" msgstr "" -#: ../src/sys/options.cxx:402 +#: ../src/sys/options.cxx:415 ../src/sys/options.cxx:547 #, c-format msgid "Value for option %s cannot be converted to a Field3D" msgstr "" -#: ../src/sys/options.cxx:325 +#: ../src/sys/options.cxx:338 #, c-format msgid "Value for option %s cannot be converted to a bool" msgstr "" #. Another type which can't be converted -#: ../src/sys/options.cxx:234 +#: ../src/sys/options.cxx:255 #, c-format msgid "Value for option %s is not an integer" msgstr "" @@ -737,7 +733,7 @@ msgid "" "option extrapolate_y=false to disable this.\n" msgstr "" -#: ../src/bout++.cxx:692 +#: ../src/bout++.cxx:707 msgid "Wall time limit in hours. By default (< 0), no limit" msgstr "" diff --git a/locale/zh_TW/libbout.po b/locale/zh_TW/libbout.po index 8ab9ac0c28..14ab2d6864 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-07-28 14:25+0200\n" +"POT-Creation-Date: 2021-12-13 14:14+0000\n" "PO-Revision-Date: 2018-10-22 22:56+0100\n" "Last-Translator: \n" "Language-Team: Chinese (traditional)\n" @@ -81,22 +81,22 @@ msgstr "" msgid "\tCandidate value: %d\n" msgstr "\t候選人數目 %d\n" -#: ../src/bout++.cxx:379 +#: ../src/bout++.cxx:394 msgid "\tChecking disabled\n" msgstr "\t測試關掉\n" -#: ../src/bout++.cxx:377 +#: ../src/bout++.cxx:392 #, c-format msgid "\tChecking enabled, level %d\n" msgstr "\t測試打開,级别 %d\n" -#: ../src/bout++.cxx:425 +#: ../src/bout++.cxx:440 msgid "\tCommand line options for this run : " msgstr "" #. The stringify is needed here as BOUT_FLAGS_STRING may already contain quoted strings #. which could cause problems (e.g. terminate strings). -#: ../src/bout++.cxx:421 +#: ../src/bout++.cxx:436 #, c-format msgid "\tCompiled with flags : %s\n" msgstr "\t用設置編譯: %s\n" @@ -149,25 +149,25 @@ msgstr "" msgid "\tMultiple '=' in command-line argument '%s'\n" msgstr "" -#: ../src/bout++.cxx:408 +#: ../src/bout++.cxx:423 msgid "\tOpenMP parallelisation disabled\n" msgstr "\tOpenMP並行化已禁用\n" -#: ../src/bout++.cxx:405 +#: ../src/bout++.cxx:420 #, c-format msgid "\tOpenMP parallelisation enabled, using %d threads\n" msgstr "\t啟用OpenMP並行化。 使用%d個線程\n" #. Mark the option as used #. Option not found -#: ../src/sys/options.cxx:195 ../src/sys/options.cxx:250 -#: ../src/sys/options.cxx:292 ../src/sys/options.cxx:331 -#: ../include/options.hxx:406 ../include/options.hxx:438 -#: ../include/options.hxx:460 ../include/options.hxx:658 +#: ../src/sys/options.cxx:202 ../src/sys/options.cxx:271 +#: ../src/sys/options.cxx:305 ../src/sys/options.cxx:344 +#: ../include/options.hxx:412 ../include/options.hxx:444 +#: ../include/options.hxx:466 ../include/options.hxx:664 msgid "\tOption " msgstr "\t選項 " -#: ../src/sys/options.cxx:321 +#: ../src/sys/options.cxx:334 #, c-format msgid "\tOption '%s': Boolean expected. Got '%s'\n" msgstr "\t選項 '%s': 布爾預期. 拿到 '%s'\n" @@ -177,12 +177,12 @@ msgstr "\t選項 '%s': 布爾預期. 拿到 '%s'\n" msgid "\tOptions file '%s' not found\n" msgstr "\t找不到選項文件 '%s'\n" -#: ../src/bout++.cxx:401 +#: ../src/bout++.cxx:416 #, fuzzy msgid "\tParallel NetCDF support disabled\n" msgstr "\tOpenMP並行化已禁用\n" -#: ../src/bout++.cxx:399 +#: ../src/bout++.cxx:414 msgid "\tParallel NetCDF support enabled\n" msgstr "" @@ -198,12 +198,12 @@ msgstr "" msgid "\tReading covariant vector " msgstr "" -#: ../src/bout++.cxx:385 +#: ../src/bout++.cxx:400 #, fuzzy msgid "\tSignal handling disabled\n" msgstr "\t測試關掉\n" -#: ../src/bout++.cxx:383 +#: ../src/bout++.cxx:398 msgid "\tSignal handling enabled\n" msgstr "" @@ -216,15 +216,15 @@ msgstr "" msgid "\tdone\n" msgstr "\t完\n" -#: ../src/bout++.cxx:394 +#: ../src/bout++.cxx:409 msgid "\tnetCDF support disabled\n" msgstr "" -#: ../src/bout++.cxx:389 +#: ../src/bout++.cxx:404 msgid "\tnetCDF support enabled\n" msgstr "" -#: ../src/bout++.cxx:392 +#: ../src/bout++.cxx:407 msgid "\tnetCDF4 support enabled\n" msgstr "" @@ -234,7 +234,7 @@ msgid "" "\tSplit Runge-Kutta-Legendre and SSP-RK3 solver\n" msgstr "" -#: ../src/bout++.cxx:229 +#: ../src/bout++.cxx:244 msgid "" "\n" " -d \tLook in for input/output files\n" @@ -263,11 +263,11 @@ msgstr "" "\n" "计算从 %s 开始\n" -#: ../src/bout++.cxx:237 +#: ../src/bout++.cxx:252 msgid " -c, --color\t\tColor output using bout-log-color\n" msgstr "" -#: ../src/bout++.cxx:240 +#: ../src/bout++.cxx:255 #, c-format msgid "" " -h, --help\t\tThis message\n" @@ -279,7 +279,7 @@ msgid "" "model source (e.g. %s.cxx)\n" msgstr "" -#: ../include/options.hxx:661 +#: ../include/options.hxx:667 msgid ") overwritten with:" msgstr "" @@ -287,16 +287,16 @@ msgstr "" msgid "4 of 8" msgstr "" -#: ../src/sys/options.cxx:476 +#: ../src/sys/options.cxx:571 msgid "All options used\n" msgstr "" -#: ../src/bout++.cxx:357 +#: ../src/bout++.cxx:372 #, c-format msgid "BOUT++ version %s\n" msgstr "BOUT++ 版 %s\n" -#: ../src/bout++.cxx:112 +#: ../src/bout++.cxx:125 msgid "Bad command line arguments:\n" msgstr "" @@ -309,11 +309,11 @@ msgstr "" msgid "Cannot split %d X points equally between %d processors\n" msgstr "" -#: ../src/bout++.cxx:697 +#: ../src/bout++.cxx:712 msgid "Check if a file exists, and exit if it does." msgstr "" -#: ../src/bout++.cxx:364 +#: ../src/bout++.cxx:379 #, c-format msgid "" "Code compiled on %s at %s\n" @@ -326,7 +326,7 @@ msgstr "" msgid "Command line" msgstr "" -#: ../src/bout++.cxx:374 ../tests/unit/src/test_bout++.cxx:300 +#: ../src/bout++.cxx:389 ../tests/unit/src/test_bout++.cxx:300 msgid "Compile-time options:\n" msgstr "編譯選項:\n" @@ -339,7 +339,7 @@ msgstr "\t用設置編譯: %s\n" msgid "Constructing default regions" msgstr "" -#: ../src/bout++.cxx:349 +#: ../src/bout++.cxx:364 #, fuzzy, c-format msgid "Could not create PID file %s" msgstr "無法打開輸出文件 '%s'\n" @@ -349,7 +349,7 @@ msgid "" "Could not find a valid value for NXPE. Try a different number of processors." msgstr "無法找到NXPE的有效值。 嘗試不同數量的處理器。" -#: ../src/bout++.cxx:483 +#: ../src/bout++.cxx:498 #, c-format msgid "Could not open %s/%s.%d for writing" msgstr "" @@ -366,7 +366,7 @@ msgid "Could not read integer array '%s'\n" msgstr "無法打開輸出文件 '%s'\n" #. Failed . Probably not important enough to stop the simulation -#: ../src/bout++.cxx:463 +#: ../src/bout++.cxx:478 msgid "Could not run bout-log-color. Make sure it is in your PATH\n" msgstr "" @@ -390,22 +390,18 @@ msgstr "" msgid "Couldn't find region %s in regionMapPerp" msgstr "" -#: ../src/sys/options.cxx:280 -#, c-format -msgid "Couldn't get BoutReal from option %s = '%s'" -msgstr "" - -#: ../src/sys/options.cxx:228 +#. Convert any exceptions to something a bit more useful +#: ../src/sys/options.cxx:227 #, c-format -msgid "Couldn't get integer from option %s = '%s'" +msgid "Couldn't get %s from option %s = '%s': %s" msgstr "" -#: ../src/bout++.cxx:337 +#: ../src/bout++.cxx:352 #, c-format msgid "DataDir \"%s\" does not exist or is not accessible\n" msgstr "\"%s\" 不存在或不可訪問\n" -#: ../src/bout++.cxx:334 +#: ../src/bout++.cxx:349 #, c-format msgid "DataDir \"%s\" is not a directory\n" msgstr "\"%s\" 不是目錄\n" @@ -414,12 +410,12 @@ msgstr "\"%s\" 不是目錄\n" msgid "ERROR: Solver is already initialised\n" msgstr "" -#: ../src/bout++.cxx:166 +#: ../src/bout++.cxx:179 #, c-format msgid "Error encountered during initialisation: %s\n" msgstr "啟動時遇到錯誤 : %s\n" -#: ../src/bout++.cxx:593 +#: ../src/bout++.cxx:608 msgid "Error whilst writing settings" msgstr "" @@ -441,7 +437,7 @@ msgstr "" msgid "Initialising solver\n" msgstr "初始化求解器\n" -#: ../src/bout++.cxx:323 +#: ../src/bout++.cxx:338 msgid "" "Input and output file for settings must be different.\n" "Provide -o to avoid this issue.\n" @@ -477,7 +473,7 @@ msgstr "" msgid "Monitor signalled to quit\n" msgstr "" -#: ../src/bout++.cxx:701 +#: ../src/bout++.cxx:716 msgid "Name of file whose existence triggers a stop" msgstr "" @@ -496,13 +492,13 @@ msgid "Number of processors (%d) not divisible by NPs in y direction (%d)\n" msgstr "" #. Less than 2 time-steps left -#: ../src/bout++.cxx:745 +#: ../src/bout++.cxx:760 #, c-format msgid "Only %e seconds (%.2f steps) left. Quitting\n" msgstr "" -#: ../src/sys/options.cxx:187 ../src/sys/options.cxx:207 -#: ../src/sys/options.cxx:262 ../src/sys/options.cxx:304 +#: ../src/sys/options.cxx:194 ../src/sys/options.cxx:235 +#: ../src/sys/options.cxx:283 ../src/sys/options.cxx:317 #, fuzzy, c-format msgid "Option %s has no value" msgstr "\"%s\" 不是目錄\n" @@ -518,14 +514,14 @@ msgstr "\"%s\" 不是目錄\n" msgid "Option %s:%s does not exist" msgstr "選項%s:%s不存在" -#: ../include/options.hxx:666 +#: ../include/options.hxx:672 #, c-format msgid "" "Options: Setting a value from same source (%s) to new value '%s' - old value " "was '%s'." msgstr "" -#: ../src/bout++.cxx:368 +#: ../src/bout++.cxx:383 #, c-format msgid "" "Processor number: %d of %d\n" @@ -547,7 +543,7 @@ msgstr "" msgid "Registered region Perp %s" msgstr "" -#: ../src/bout++.cxx:359 +#: ../src/bout++.cxx:374 #, c-format msgid "Revision: %s\n" msgstr "版: %s\n" @@ -569,7 +565,7 @@ msgstr "" msgid "Signal" msgstr "" -#: ../src/bout++.cxx:715 +#: ../src/bout++.cxx:730 msgid "" "Sim Time | RHS evals | Wall Time | Calc Inv Comm I/O SOLVER\n" "\n" @@ -578,7 +574,7 @@ msgstr "" "間整合\n" "\n" -#: ../src/bout++.cxx:718 +#: ../src/bout++.cxx:733 msgid "" "Sim Time | RHS_e evals | RHS_I evals | Wall Time | Calc Inv " "Comm I/O SOLVER\n" @@ -638,26 +634,26 @@ msgid "" "Valid choices are 'identity', 'shifted', 'fci'" msgstr "" -#: ../src/sys/options.cxx:478 +#: ../src/sys/options.cxx:573 msgid "Unused options:\n" msgstr "" -#: ../src/bout++.cxx:261 +#: ../src/bout++.cxx:276 #, fuzzy, c-format msgid "Usage is %s -d \n" msgstr "\"%s\" 不是目錄\n" -#: ../src/bout++.cxx:272 +#: ../src/bout++.cxx:287 #, c-format msgid "Usage is %s -f \n" msgstr "" -#: ../src/bout++.cxx:293 +#: ../src/bout++.cxx:308 #, c-format msgid "Usage is %s -l \n" msgstr "" -#: ../src/bout++.cxx:283 +#: ../src/bout++.cxx:298 #, c-format msgid "Usage is %s -o \n" msgstr "" @@ -668,7 +664,7 @@ msgstr "" #. Print help message -- note this will be displayed once per processor as we've not #. started MPI yet. -#: ../src/bout++.cxx:225 +#: ../src/bout++.cxx:240 #, c-format msgid "" "Usage: %s [-d ] [-f ] [restart [append]] " @@ -680,33 +676,33 @@ msgstr "" msgid "User signalled to quit. Returning\n" msgstr "" -#: ../src/sys/options.cxx:243 +#: ../src/sys/options.cxx:264 #, c-format msgid "Value for option %s = %e is not an integer" msgstr "" -#: ../src/sys/options.cxx:285 +#: ../src/sys/options.cxx:298 #, c-format msgid "Value for option %s cannot be converted to a BoutReal" msgstr "" -#: ../src/sys/options.cxx:452 +#: ../src/sys/options.cxx:465 #, c-format msgid "Value for option %s cannot be converted to a Field2D" msgstr "" -#: ../src/sys/options.cxx:402 +#: ../src/sys/options.cxx:415 ../src/sys/options.cxx:547 #, c-format msgid "Value for option %s cannot be converted to a Field3D" msgstr "" -#: ../src/sys/options.cxx:325 +#: ../src/sys/options.cxx:338 #, c-format msgid "Value for option %s cannot be converted to a bool" msgstr "" #. Another type which can't be converted -#: ../src/sys/options.cxx:234 +#: ../src/sys/options.cxx:255 #, fuzzy, c-format msgid "Value for option %s is not an integer" msgstr "\"%s\" 不是目錄\n" @@ -743,7 +739,7 @@ msgid "" "option extrapolate_y=false to disable this.\n" msgstr "" -#: ../src/bout++.cxx:692 +#: ../src/bout++.cxx:707 msgid "Wall time limit in hours. By default (< 0), no limit" msgstr "" diff --git a/manual/doxygen/Doxyfile b/manual/doxygen/Doxyfile index f6384f177c..23ea2d1690 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.0 +PROJECT_NUMBER = 4.4.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 diff --git a/manual/doxygen/Doxyfile_readthedocs b/manual/doxygen/Doxyfile_readthedocs index 63e9797f4d..3f33656054 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.0 +PROJECT_NUMBER = 4.4.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 diff --git a/manual/sphinx/conf.py b/manual/sphinx/conf.py index adb1cb2fb1..4285aaac10 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.0' +release = '4.4.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/tests/integrated/test-bout-override-default-option/CMakeLists.txt b/tests/integrated/test-bout-override-default-option/CMakeLists.txt index 7c90faa24f..7c3d6390b0 100644 --- a/tests/integrated/test-bout-override-default-option/CMakeLists.txt +++ b/tests/integrated/test-bout-override-default-option/CMakeLists.txt @@ -1,4 +1,3 @@ bout_add_integrated_test(test-bout-override-default-option SOURCES test-bout-override-default-option.cxx - USE_RUNTEST )