research/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added support for gcc-8.1

Browse source
This commit is contained in:
Henry Weller 2018-05-08 21:15:51 +01:00
parent 0183d1d9e8
commit bfe333ff64
9 changed files with 32 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
etc/config.csh/settings
View file

@ -2,7 +2,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -216,7 +216,7 @@ endif
switch ("$WM_COMPILER_TYPE") switch ("$WM_COMPILER_TYPE")
case OpenFOAM: case OpenFOAM:
case ThirdParty: case ThirdParty:
# Default versions of GMP, MPFR and MPC, overide as necessary # Default versions of GMP, MPFR and MPC, override as necessary
set gmp_version=gmp-5.1.2 set gmp_version=gmp-5.1.2
set mpfr_version=mpfr-3.1.2 set mpfr_version=mpfr-3.1.2
set mpc_version=mpc-1.0.1 set mpc_version=mpc-1.0.1
@ -240,6 +240,9 @@ case ThirdParty:
case Gcc61: case Gcc61:
set gcc_version=gcc-6.1.0 set gcc_version=gcc-6.1.0
breaksw breaksw
case Gcc81:
set gcc_version=gcc-8.1.0
breaksw
case Clang: case Clang:
# Using clang - not gcc # Using clang - not gcc
setenv WM_CC 'clang' setenv WM_CC 'clang'

5
etc/config.sh/compiler
View file

@ -2,7 +2,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -57,6 +57,9 @@ OpenFOAM | ThirdParty)
Gcc61) Gcc61)
gcc_version=gcc-6.1.0 gcc_version=gcc-6.1.0
;; ;;
Gcc81)
gcc_version=gcc-8.1.0
;;
Clang) Clang)
# Using clang - not gcc # Using clang - not gcc
export WM_CC='clang' export WM_CC='clang'

4
src/OpenFOAM/containers/Lists/List/ListI.H
View file

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -28,7 +28,7 @@ License
template<class T> template<class T>
inline void Foam::List<T>::alloc() inline void Foam::List<T>::alloc()
{ {
if (this->size_) if (this->size_ > 0)
{ {
this->v_ = new T[this->size_]; this->v_ = new T[this->size_];
} }

8
src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
View file

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -369,7 +369,7 @@ inline void Foam::PackedList<nBits>::iteratorBase::operator=
const unsigned int val const unsigned int val
) )
{ {
// Lazy evaluation - increase size on assigment // Lazy evaluation - increase size on assignment
if (index_ >= list_->size_) if (index_ >= list_->size_)
{ {
list_->resize(index_ + 1); list_->resize(index_ + 1);
@ -546,8 +546,6 @@ inline void Foam::PackedList<nBits>::const_iterator::operator=
{ {
this->index_ = this->list_->size_; this->index_ = this->list_->size_;
} }
return *this;
} }
@ -1003,7 +1001,7 @@ inline bool Foam::PackedList<nBits>::set
} }
else if (i >= size_) else if (i >= size_)
{ {
// Lazy evaluation - increase size on assigment // Lazy evaluation - increase size on assignment
resize(i + 1); resize(i + 1);
} }

6
src/OpenFOAM/db/typeInfo/typeInfo.H
View file

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -88,7 +88,7 @@ inline To& dynamicCast(From& r)
{ {
return dynamic_cast<To&>(r); return dynamic_cast<To&>(r);
} }
catch (std::bad_cast) catch (const std::bad_cast&)
{ {
FatalErrorInFunction FatalErrorInFunction
<< "Attempt to cast type " << typeid(r).name() << "Attempt to cast type " << typeid(r).name()
@ -109,7 +109,7 @@ inline To& refCast(From& r)
{ {
return dynamic_cast<To&>(r); return dynamic_cast<To&>(r);
} }
catch (std::bad_cast) catch (const std::bad_cast&)
{ {
FatalErrorInFunction FatalErrorInFunction
<< "Attempt to cast type " << r.type() << "Attempt to cast type " << r.type()

6
src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
View file

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -159,9 +159,6 @@ public:
//- Construct from Istream //- Construct from Istream
VectorSpace(Istream&); VectorSpace(Istream&);
//- Construct as copy
inline VectorSpace(const VectorSpace<Form, Cmpt, Ncmpts>&);
//- Construct as copy of a VectorSpace with the same size //- Construct as copy of a VectorSpace with the same size
template<class Form2, class Cmpt2> template<class Form2, class Cmpt2>
inline explicit VectorSpace(const VectorSpace<Form2, Cmpt2, Ncmpts>&); inline explicit VectorSpace(const VectorSpace<Form2, Cmpt2, Ncmpts>&);
@ -190,7 +187,6 @@ public:
inline const Cmpt& operator[](const direction) const; inline const Cmpt& operator[](const direction) const;
inline Cmpt& operator[](const direction); inline Cmpt& operator[](const direction);
inline void operator=(const VectorSpace<Form, Cmpt, Ncmpts>&);
inline void operator+=(const VectorSpace<Form, Cmpt, Ncmpts>&); inline void operator+=(const VectorSpace<Form, Cmpt, Ncmpts>&);
inline void operator-=(const VectorSpace<Form, Cmpt, Ncmpts>&); inline void operator-=(const VectorSpace<Form, Cmpt, Ncmpts>&);

33
src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
View file

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -48,16 +48,6 @@ inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace(const Foam::zero)
} }
template<class Form, class Cmpt, direction Ncmpts>
inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace
(
const VectorSpace<Form, Cmpt, Ncmpts>& vs
)
{
VectorSpaceOps<Ncmpts,0>::eqOp(*this, vs, eqOp<Cmpt>());
}
template<class Form, class Cmpt, direction Ncmpts> template<class Form, class Cmpt, direction Ncmpts>
template<class Form2, class Cmpt2> template<class Form2, class Cmpt2>
inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace inline VectorSpace<Form, Cmpt, Ncmpts>::VectorSpace
@ -285,16 +275,6 @@ ConstBlock<SubVector, BStart>::operator()
} }
template<class Form, class Cmpt, direction Ncmpts>
inline void VectorSpace<Form, Cmpt, Ncmpts>::operator=
(
const VectorSpace<Form, Cmpt, Ncmpts>& vs
)
{
VectorSpaceOps<Ncmpts,0>::eqOp(*this, vs, eqOp<Cmpt>());
}
template<class Form, class Cmpt, direction Ncmpts> template<class Form, class Cmpt, direction Ncmpts>
inline void VectorSpace<Form, Cmpt, Ncmpts>::operator+= inline void VectorSpace<Form, Cmpt, Ncmpts>::operator+=
( (
@ -428,6 +408,17 @@ inline scalar mag
} }
template<class Form, class Cmpt, direction Ncmpts>
inline VectorSpace<Form, Cmpt, Ncmpts> normalised
(
const VectorSpace<Form, Cmpt, Ncmpts>& vs
)
{
const scalar magVs = mag(vs);
return magVs > 0 ? vs/magVs : Zero;
}
template<class Form, class Cmpt, direction Ncmpts> template<class Form, class Cmpt, direction Ncmpts>
inline VectorSpace<Form, Cmpt, Ncmpts> cmptMultiply inline VectorSpace<Form, Cmpt, Ncmpts> cmptMultiply
( (

3
src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.H
View file

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -242,7 +242,6 @@ public:
// Access // Access
inline word& name();
inline const word& name() const; inline const word& name() const;
// - Access to basic components of the reaction // - Access to basic components of the reaction

9
src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
View file

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -32,13 +32,6 @@ namespace Foam
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class ReactionThermo>
inline word& Reaction<ReactionThermo>::name()
{
return name_;
}
template<class ReactionThermo> template<class ReactionThermo>
inline const word& Reaction<ReactionThermo>::name() const inline const word& Reaction<ReactionThermo>::name() const
{ {