diff options
| author | Rémi Lacroix <remi.lacroix@idris.fr> | 2021-03-23 19:34:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 11:34:30 -0700 |
| commit | 3d0adf3a8a5a7c140280e5f110aa6f1800cf466a (patch) | |
| tree | 0783d398cbc16edcb89f8e9430c386585aa653a7 /var | |
| parent | 4d02439820394a7530ede8286b9796acf0e7694e (diff) | |
| download | spack-3d0adf3a8a5a7c140280e5f110aa6f1800cf466a.tar.gz spack-3d0adf3a8a5a7c140280e5f110aa6f1800cf466a.tar.bz2 spack-3d0adf3a8a5a7c140280e5f110aa6f1800cf466a.tar.xz spack-3d0adf3a8a5a7c140280e5f110aa6f1800cf466a.zip | |
OpenFOAM-org: Fix compilation of version 2.4.0. (#22472)
Fix "isnan" errors when compiling version 2.4.0 with recent compilers.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/openfoam-org/isnan.patch | 31 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/openfoam-org/package.py | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/openfoam-org/isnan.patch b/var/spack/repos/builtin/packages/openfoam-org/isnan.patch new file mode 100644 index 0000000000..b84876c5a7 --- /dev/null +++ b/var/spack/repos/builtin/packages/openfoam-org/isnan.patch @@ -0,0 +1,31 @@ +--- a/src/conversion/ensight/part/ensightPart.C 2021-01-07 15:37:26.650557806 +0100 ++++ b/src/conversion/ensight/part/ensightPart.C 2021-01-07 15:38:04.148140312 +0100 +@@ -51,7 +51,7 @@ + { + const label id = idList[i]; + +- if (id >= field.size() || isnan(field[id])) ++ if (id >= field.size() || std::isnan(field[id])) + { + return false; + } +--- a/src/conversion/ensight/part/ensightPartIO.C 2021-01-07 15:37:26.650557806 +0100 ++++ b/src/conversion/ensight/part/ensightPartIO.C 2021-01-07 15:38:38.580675503 +0100 +@@ -63,7 +63,7 @@ + { + forAll(idList, i) + { +- if (idList[i] >= field.size() || isnan(field[idList[i]])) ++ if (idList[i] >= field.size() || std::isnan(field[idList[i]])) + { + os.writeUndef(); + } +@@ -80,7 +80,7 @@ + // no idList => perNode + forAll(field, i) + { +- if (isnan(field[i])) ++ if (std::isnan(field[i])) + { + os.writeUndef(); + } diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index b398812f3c..c6d756ddbd 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -110,6 +110,7 @@ class OpenfoamOrg(Package): patch('41-etc.patch', when='@4.1') patch('41-site.patch', when='@4.1:') patch('240-etc.patch', when='@2.4.0') + patch('isnan.patch', when='@:2.4.0') # The openfoam architecture, compiler information etc _foam_arch = None |