From 45b1d7ed87d107473f960717ffe1e5716364fa28 Mon Sep 17 00:00:00 2001 From: PeterMeisrimelModelon <92585725+PeterMeisrimelModelon@users.noreply.github.com> Date: Fri, 17 May 2024 16:10:07 +0200 Subject: [PATCH] Using std=legacy as default fortran flag (#97) --- .github/workflows/build.yml | 2 +- CHANGELOG | 2 ++ doc/sphinx/source/changelog.rst | 5 +++++ doc/sphinx/source/conf.py | 4 ++-- setup.py | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c216f33..58086d34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,6 +41,6 @@ jobs: make -j4 sudo make install - name: Build - run: python3 setup.py install --user --sundials-home=/usr --blas-home=/usr/lib/x86_64-linux-gnu/ --lapack-home=/usr/lib/x86_64-linux-gnu/ --superlu-home=/usr --extra-fortran-compile-flags="-fallow-argument-mismatch" + run: python3 setup.py install --user --sundials-home=/usr --blas-home=/usr/lib/x86_64-linux-gnu/ --lapack-home=/usr/lib/x86_64-linux-gnu/ --superlu-home=/usr - name: Test run: python3 -m nose --verbose tests/* tests/solvers/* diff --git a/CHANGELOG b/CHANGELOG index 5820950e..3234cfd9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ --- Assimulo-3.5.1 --- * Fixed build with sundials 7.x + * Added "std=legacy" as default fortran compile flag. + This addresses compilation issues commonly experienced with more modern Fortran standards. --- Assimulo-3.5.0 --- * Changed "numpy.float" to equivalent "numpy.float64" due to DeprecationWarnings in numpy >= 1.20. diff --git a/doc/sphinx/source/changelog.rst b/doc/sphinx/source/changelog.rst index b7cb809e..69d0a098 100644 --- a/doc/sphinx/source/changelog.rst +++ b/doc/sphinx/source/changelog.rst @@ -3,6 +3,11 @@ Changelog ========== +--- Assimulo-3.5.1 --- + * Fixed build with sundials 7.x + * Added "std=legacy" as default fortran compile flag. + This addresses compilation issues commonly experienced with more modern Fortran standards. + --- Assimulo-3.5.0 --- * Changed "numpy.float" to equivalent "numpy.float64" due to DeprecationWarnings in numpy >= 1.20. * Improved examples with sparse jacobians by omitting the zeros in the jacobians. diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index fefc2c2d..935334e6 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -50,9 +50,9 @@ # built documents. # # The short X.Y version. -version = '3.5.0' +version = '3.5.1' # The full version, including alpha/beta/rc tags. -release = '3.5.0' +release = '3.5.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index e0648791..3a317fbf 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ def remove_prefix(name, prefix): parser.add_argument("--prefix",default=None,type=str,help='Path to destination directory') parser.add_argument("--extra-fortran-link-flags", help='Extra Fortran link flags (a list enclosed in " ")', default='') parser.add_argument("--extra-fortran-link-files", help='Extra Fortran link files (a list enclosed in " ")', default='') -parser.add_argument("--extra-fortran-compile-flags", help='Extra Fortran compile flags (a list enclosed in " ")', default='') +parser.add_argument("--extra-fortran-compile-flags", help='Extra Fortran compile flags (a list enclosed in " ")', default='--std=legacy') parser.add_argument("--version", help='Package version number', default='Default') args = parser.parse_known_args() @@ -669,7 +669,7 @@ def fortran_extensionlists(self): NAME = "Assimulo" AUTHOR = u"C. Winther (Andersson), C. Führer, J. Åkesson, M. Gäfvert" AUTHOR_EMAIL = "christian.winther@modelon.com" -VERSION = "3.5.0-dev" if version_number_arg == "Default" else version_number_arg +VERSION = "3.5.1.dev0" if version_number_arg == "Default" else version_number_arg LICENSE = "LGPL" URL = "http://www.jmodelica.org/assimulo" DOWNLOAD_URL = "http://www.jmodelica.org/assimulo"