zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade Intel C++ compiler to icpc (ICC) 15.0.3 20150407

Browse Source 
This resolves a whole range of issues and work-arounds with earlier
releases.  This version of icpc is more or less compatible with the
latest gcc and clang compilers and only required one hack to avoid
warnings from PackedBoolList.H.
This commit is contained in:
Henry Weller
2015-07-17 16:50:40 +01:00
parent 69243fda22
commit 6b706cfa78
31 changed files with 55 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
View File

@ -370,7 +370,7 @@ public:
); );
//- Construct from hash table, element and hash index //- Construct from hash table, element and hash index
inline explicit iteratorBase inline iteratorBase
( (
const HashTable<T, Key, Hash>* curHashTable, const HashTable<T, Key, Hash>* curHashTable,
const hashedEntry* elmt, const hashedEntry* elmt,
@ -428,7 +428,7 @@ public:
); );
//- Construct from hash table, element and hash index //- Construct from hash table, element and hash index
inline explicit iterator inline iterator
( (
HashTable<T, Key, Hash>* curHashTable, HashTable<T, Key, Hash>* curHashTable,
hashedEntry* elmt, hashedEntry* elmt,
@ -483,7 +483,7 @@ public:
); );
//- Construct from hash table, element and hash index //- Construct from hash table, element and hash index
inline explicit const_iterator inline const_iterator
( (
const HashTable<T, Key, Hash>* curHashTable, const HashTable<T, Key, Hash>* curHashTable,
const hashedEntry* elmt, const hashedEntry* elmt,

2
src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
View File

@ -297,10 +297,8 @@ public:
{ {
friend class StaticHashTable; friend class StaticHashTable;
# ifndef __INTEL_COMPILER
template<class TRef2, class TableRef2> template<class TRef2, class TableRef2>
friend class Iterator; friend class Iterator;
# endif
// Private data // Private data

4
src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.C
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 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -44,7 +44,6 @@ Foam::ILList<LListBase, T>::ILList(const ILList<LListBase, T>& lst)
} }
#ifndef __INTEL_COMPILER
template<class LListBase, class T> template<class LListBase, class T>
template<class CloneArg> template<class CloneArg>
Foam::ILList<LListBase, T>::ILList Foam::ILList<LListBase, T>::ILList
@ -65,7 +64,6 @@ Foam::ILList<LListBase, T>::ILList
this->append(iter().clone(cloneArg).ptr()); this->append(iter().clone(cloneArg).ptr());
} }
} }
#endif
// * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * * //

22
src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.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 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -95,25 +95,7 @@ public:
//- Copy constructor with additional argument for clone //- Copy constructor with additional argument for clone
template<class CloneArg> template<class CloneArg>
ILList(const ILList<LListBase, T>& lst, const CloneArg& cloneArg) ILList(const ILList<LListBase, T>& lst, const CloneArg& cloneArg);
#ifdef __INTEL_COMPILER
:
UILList<LListBase, T>()
{
for
(
typename UILList<LListBase, T>::const_iterator iter =
lst.begin();
iter != lst.end();
++iter
)
{
append(iter().clone(cloneArg).ptr());
}
}
#else
;
#endif
//- Construct from Istream using given Istream constructor class //- Construct from Istream using given Istream constructor class
template<class INew> template<class INew>

4
src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.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 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -200,7 +200,7 @@ public:
inline PackedBoolList& operator=(const PackedList<1>&); inline PackedBoolList& operator=(const PackedList<1>&);
//- Assignment operator. //- Assignment operator.
PackedBoolList& operator=(const UList<bool>&); PackedBoolList& operator=(const Foam::UList<bool>&);
//- Assignment operator, //- Assignment operator,
// using the labels as indices to indicate which bits are set // using the labels as indices to indicate which bits are set

9
src/OpenFOAM/db/typeInfo/className.H
View File

@ -99,14 +99,6 @@ public: \
#define defineTypeName(Type) \ #define defineTypeName(Type) \
defineTypeNameWithName(Type, Type::typeName_()) defineTypeNameWithName(Type, Type::typeName_())
#ifdef __INTEL_COMPILER
//- Define the typeName as \a Name for template classes
# define defineTemplateTypeNameWithName(Type, Name) \
defineTypeNameWithName(Type, Name)
//- Define the typeName as \a Name for template sub-classes
# define defineTemplate2TypeNameWithName(Type, Name) \
defineTypeNameWithName(Type, Name)
#else
//- Define the typeName as \a Name for template classes //- Define the typeName as \a Name for template classes
# define defineTemplateTypeNameWithName(Type, Name) \ # define defineTemplateTypeNameWithName(Type, Name) \
template<> \ template<> \
@ -115,7 +107,6 @@ public: \
# define defineTemplate2TypeNameWithName(Type, Name) \ # define defineTemplate2TypeNameWithName(Type, Name) \
template<> \ template<> \
defineTypeNameWithName(Type, Name) defineTypeNameWithName(Type, Name)
#endif
//- Define the typeName for template classes, useful with typedefs //- Define the typeName for template classes, useful with typedefs
#define defineTemplateTypeName(Type) \ #define defineTemplateTypeName(Type) \

4
src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
View File

@ -158,7 +158,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
{} {}
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
template<class Type, class GeoMesh> template<class Type, class GeoMesh>
DimensionedField<Type, GeoMesh>::DimensionedField DimensionedField<Type, GeoMesh>::DimensionedField
( (
@ -251,7 +251,7 @@ DimensionedField<Type, GeoMesh>::DimensionedField
{} {}
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
template<class Type, class GeoMesh> template<class Type, class GeoMesh>
DimensionedField<Type, GeoMesh>::DimensionedField DimensionedField<Type, GeoMesh>::DimensionedField
( (

4
src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
View File

@ -169,7 +169,7 @@ public:
); );
//- Construct as copy of tmp<DimensionedField> deleting argument //- Construct as copy of tmp<DimensionedField> deleting argument
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
DimensionedField DimensionedField
( (
const tmp<DimensionedField<Type, GeoMesh> >& const tmp<DimensionedField<Type, GeoMesh> >&
@ -214,7 +214,7 @@ public:
); );
//- Construct as copy resetting name //- Construct as copy resetting name
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
DimensionedField DimensionedField
( (
const word& newName, const word& newName,

6
src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C
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 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -168,7 +168,7 @@ FieldField<Field, Type>::FieldField(const PtrList<Field<Type> >& tl)
// Construct as copy of tmp<FieldField> // Construct as copy of tmp<FieldField>
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
template<template<class> class Field, class Type> template<template<class> class Field, class Type>
FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type> >& tf) FieldField<Field, Type>::FieldField(const tmp<FieldField<Field, Type> >& tf)
: :
@ -197,7 +197,6 @@ tmp<FieldField<Field, Type> > FieldField<Field, Type>::clone() const
} }
#ifndef __INTEL_COMPILER
template<template<class> class Field, class Type> template<template<class> class Field, class Type>
template<class Type2> template<class Type2>
tmp<FieldField<Field, Type> > FieldField<Field, Type>::NewCalculatedType tmp<FieldField<Field, Type> > FieldField<Field, Type>::NewCalculatedType
@ -217,7 +216,6 @@ tmp<FieldField<Field, Type> > FieldField<Field, Type>::NewCalculatedType
return tmp<FieldField<Field, Type> >(nffPtr); return tmp<FieldField<Field, Type> >(nffPtr);
} }
#endif
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //

24
src/OpenFOAM/fields/FieldFields/FieldField/FieldField.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 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -108,9 +108,9 @@ public:
FieldField(const PtrList<Field<Type> >&); FieldField(const PtrList<Field<Type> >&);
//- Construct as copy of tmp<FieldField> //- Construct as copy of tmp<FieldField>
# ifdef ConstructFromTmp #ifndef NoConstructFromTmp
FieldField(const tmp<FieldField<Field, Type> >&); FieldField(const tmp<FieldField<Field, Type> >&);
# endif #endif
//- Construct from Istream //- Construct from Istream
FieldField(Istream&); FieldField(Istream&);
@ -124,24 +124,8 @@ public:
static tmp<FieldField<Field, Type> > NewCalculatedType static tmp<FieldField<Field, Type> > NewCalculatedType
( (
const FieldField<Field, Type2>& ff const FieldField<Field, Type2>& ff
) );
# ifdef __INTEL_COMPILER
{
FieldField<Field, Type>* nffPtr
(
new FieldField<Field, Type>(ff.size())
);
forAll(*nffPtr, i)
{
nffPtr->set(i, Field<Type>::NewCalculatedType(ff[i]).ptr());
}
return tmp<FieldField<Field, Type> >(nffPtr);
}
# else
;
# endif
// Member functions // Member functions

4
src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.C
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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -614,10 +614,8 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
UNARY_OPERATOR(Type, Type, -, negate) UNARY_OPERATOR(Type, Type, -, negate)
#ifndef __INTEL_COMPILER
BINARY_OPERATOR(Type, Type, scalar, *, multiply) BINARY_OPERATOR(Type, Type, scalar, *, multiply)
BINARY_OPERATOR(Type, scalar, Type, *, multiply) BINARY_OPERATOR(Type, scalar, Type, *, multiply)
#endif
BINARY_OPERATOR(Type, Type, scalar, /, divide) BINARY_OPERATOR(Type, Type, scalar, /, divide)
BINARY_TYPE_OPERATOR_SF(Type, scalar, Type, *, multiply) BINARY_TYPE_OPERATOR_SF(Type, scalar, Type, *, multiply)

4
src/OpenFOAM/fields/FieldFields/FieldField/FieldFieldFunctions.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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -253,10 +253,8 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
UNARY_OPERATOR(Type, Type, -, negate) UNARY_OPERATOR(Type, Type, -, negate)
#ifndef __INTEL_COMPILER
BINARY_OPERATOR(Type, Type, scalar, *, multiply) BINARY_OPERATOR(Type, Type, scalar, *, multiply)
BINARY_OPERATOR(Type, scalar, Type, *, multiply) BINARY_OPERATOR(Type, scalar, Type, *, multiply)
#endif
BINARY_OPERATOR(Type, Type, scalar, /, divide) BINARY_OPERATOR(Type, Type, scalar, /, divide)
BINARY_TYPE_OPERATOR_SF(Type, scalar, Type, *, multiply) BINARY_TYPE_OPERATOR_SF(Type, scalar, Type, *, multiply)

13
src/OpenFOAM/fields/Fields/Field/Field.C
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-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -222,15 +222,6 @@ Foam::Field<Type>::Field(const Xfer<Field<Type> >& f)
{} {}
#ifdef __INTEL_COMPILER
template<class Type>
Foam::Field<Type>::Field(const typename Field<Type>::subField& sf)
:
List<Type>(sf)
{}
#endif
template<class Type> template<class Type>
Foam::Field<Type>::Field(const UList<Type>& list) Foam::Field<Type>::Field(const UList<Type>& list)
: :
@ -239,7 +230,7 @@ Foam::Field<Type>::Field(const UList<Type>& list)
// Construct as copy of tmp<Field> // Construct as copy of tmp<Field>
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
template<class Type> template<class Type>
Foam::Field<Type>::Field(const tmp<Field<Type> >& tf) Foam::Field<Type>::Field(const tmp<Field<Type> >& tf)
: :

11
src/OpenFOAM/fields/Fields/Field/Field.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-2014 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -210,15 +210,10 @@ public:
//- Construct by transferring the Field contents //- Construct by transferring the Field contents
Field(const Xfer<Field<Type> >&); Field(const Xfer<Field<Type> >&);
#ifdef __INTEL_COMPILER
//- Construct as copy of subField
Field(const typename Field<Type>::subField&);
#endif
//- Construct as copy of tmp<Field> //- Construct as copy of tmp<Field>
# ifdef ConstructFromTmp #ifndef NoConstructFromTmp
Field(const tmp<Field<Type> >&); Field(const tmp<Field<Type> >&);
# endif #endif
//- Construct from Istream //- Construct from Istream
Field(Istream&); Field(Istream&);

6
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C
View File

@ -426,7 +426,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
} }
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
template<class Type, template<class> class PatchField, class GeoMesh> template<class Type, template<class> class PatchField, class GeoMesh>
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
( (
@ -488,7 +488,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
} }
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
template<class Type, template<class> class PatchField, class GeoMesh> template<class Type, template<class> class PatchField, class GeoMesh>
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
( (
@ -552,7 +552,7 @@ Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
} }
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
template<class Type, template<class> class PatchField, class GeoMesh> template<class Type, template<class> class PatchField, class GeoMesh>
Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField Foam::GeometricField<Type, PatchField, GeoMesh>::GeometricField
( (

6
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H
View File

@ -355,7 +355,7 @@ public:
); );
//- Construct as copy of tmp<GeometricField> deleting argument //- Construct as copy of tmp<GeometricField> deleting argument
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
GeometricField GeometricField
( (
const tmp<GeometricField<Type, PatchField, GeoMesh> >& const tmp<GeometricField<Type, PatchField, GeoMesh> >&
@ -370,7 +370,7 @@ public:
); );
//- Construct as copy of tmp<GeometricField> resetting IO parameters //- Construct as copy of tmp<GeometricField> resetting IO parameters
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
GeometricField GeometricField
( (
const IOobject&, const IOobject&,
@ -386,7 +386,7 @@ public:
); );
//- Construct as copy resetting name //- Construct as copy resetting name
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
GeometricField GeometricField
( (
const word& newName, const word& newName,

4
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C
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 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -557,10 +557,8 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
UNARY_OPERATOR(Type, Type, -, negate, transform) UNARY_OPERATOR(Type, Type, -, negate, transform)
#ifndef __INTEL_COMPILER
BINARY_OPERATOR(Type, Type, scalar, *, '*', multiply) BINARY_OPERATOR(Type, Type, scalar, *, '*', multiply)
BINARY_OPERATOR(Type, scalar, Type, *, '*', multiply) BINARY_OPERATOR(Type, scalar, Type, *, '*', multiply)
#endif
BINARY_OPERATOR(Type, Type, scalar, /, '|', divide) BINARY_OPERATOR(Type, Type, scalar, /, '|', divide)
BINARY_TYPE_OPERATOR_SF(Type, scalar, Type, *, '*', multiply) BINARY_TYPE_OPERATOR_SF(Type, scalar, Type, *, '*', multiply)

4
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.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 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -250,10 +250,8 @@ BINARY_TYPE_FUNCTION(Type, Type, Type, cmptDivide)
UNARY_OPERATOR(Type, Type, -, negate, transform) UNARY_OPERATOR(Type, Type, -, negate, transform)
#ifndef __INTEL_COMPILER
BINARY_OPERATOR(Type, Type, scalar, *, '*', multiply) BINARY_OPERATOR(Type, Type, scalar, *, '*', multiply)
BINARY_OPERATOR(Type, scalar, Type, *, '*', multiply) BINARY_OPERATOR(Type, scalar, Type, *, '*', multiply)
#endif
BINARY_OPERATOR(Type, Type, scalar, /, '|', divide) BINARY_OPERATOR(Type, Type, scalar, /, '|', divide)
BINARY_TYPE_OPERATOR_SF(Type, scalar, Type, *, '*', multiply) BINARY_TYPE_OPERATOR_SF(Type, scalar, Type, *, '*', multiply)

9
src/OpenFOAM/global/debug/defineDebugSwitch.H
View File

@ -114,14 +114,6 @@ public:
defineDebugSwitchWithName(Type, Type::typeName_(), DebugSwitch); \ defineDebugSwitchWithName(Type, Type::typeName_(), DebugSwitch); \
registerDebugSwitchWithName(Type, Type, Type::typeName_()) registerDebugSwitchWithName(Type, Type, Type::typeName_())
#ifdef __INTEL_COMPILER
//- Define the debug information for templates, lookup as \a Name
# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch) \
defineDebugSwitchWithName(Type, Name, DebugSwitch)
//- Define the debug information for templates sub-classes, lookup as \a Name
# define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch) \
defineDebugSwitchWithName(Type, Name, DebugSwitch)
#else
//- Define the debug information for templates, lookup as \a Name //- Define the debug information for templates, lookup as \a Name
# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch) \ # define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch) \
template<> \ template<> \
@ -132,7 +124,6 @@ public:
template<> \ template<> \
defineDebugSwitchWithName(Type, Name, DebugSwitch); \ defineDebugSwitchWithName(Type, Name, DebugSwitch); \
registerTemplateDebugSwitchWithName(Type, Name) registerTemplateDebugSwitchWithName(Type, Name)
#endif
//- Define the debug information for templates //- Define the debug information for templates
// Useful with typedefs // Useful with typedefs

4
src/OpenFOAM/memory/tmp/tmp.H
View File

@ -38,10 +38,6 @@ SourceFiles
#include "refCount.H" #include "refCount.H"
#include <cstddef> #include <cstddef>
#ifndef __INTEL_COMPILER
# define ConstructFromTmp
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam

7
src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.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-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -150,9 +150,8 @@ public:
} }
// Destructor //- Destructor
virtual ~processorCyclicFvPatchField();
~processorCyclicFvPatchField();
// Member functions // Member functions

4
src/finiteVolume/fields/fvsPatchFields/constraint/processor/processorFvsPatchField.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 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -131,7 +131,7 @@ public:
//- Destructor //- Destructor
~processorFvsPatchField(); virtual ~processorFvsPatchField();
// Member functions // Member functions

7
src/finiteVolume/fields/fvsPatchFields/constraint/processorCyclic/processorCyclicFvsPatchField.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 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -131,9 +131,8 @@ public:
} }
// Destructor //- Destructor
virtual ~processorCyclicFvsPatchField();
~processorCyclicFvsPatchField();
// Member functions // Member functions

2
src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
View File

@ -356,7 +356,7 @@ Foam::fvMatrix<Type>::fvMatrix(const fvMatrix<Type>& fvm)
} }
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
template<class Type> template<class Type>
Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type> >& tfvm) Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type> >& tfvm)
: :

2
src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
View File

@ -263,7 +263,7 @@ public:
fvMatrix(const fvMatrix<Type>&); fvMatrix(const fvMatrix<Type>&);
//- Construct as copy of tmp<fvMatrix<Type> > deleting argument //- Construct as copy of tmp<fvMatrix<Type> > deleting argument
#ifdef ConstructFromTmp #ifndef NoConstructFromTmp
fvMatrix(const tmp<fvMatrix<Type> >&); fvMatrix(const tmp<fvMatrix<Type> >&);
#endif #endif

4
src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCECCellToFaceStencilObject.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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -64,7 +64,7 @@ public:
// Constructors // Constructors
//- Construct from uncompacted face stencil //- Construct from uncompacted face stencil
explicit upwindCECCellToFaceStencilObject upwindCECCellToFaceStencilObject
( (
const fvMesh& mesh, const fvMesh& mesh,
const bool pureUpwind, const bool pureUpwind,

4
src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindCFCCellToFaceStencilObject.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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -64,7 +64,7 @@ public:
// Constructors // Constructors
//- Construct from uncompacted face stencil //- Construct from uncompacted face stencil
explicit upwindCFCCellToFaceStencilObject upwindCFCCellToFaceStencilObject
( (
const fvMesh& mesh, const fvMesh& mesh,
const bool pureUpwind, const bool pureUpwind,

4
src/finiteVolume/fvMesh/extendedStencil/cellToFace/MeshObjects/upwindFECCellToFaceStencilObject.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-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -64,7 +64,7 @@ public:
// Constructors // Constructors
//- Construct from uncompacted face stencil //- Construct from uncompacted face stencil
explicit upwindFECCellToFaceStencilObject upwindFECCellToFaceStencilObject
( (
const fvMesh& mesh, const fvMesh& mesh,
const bool pureUpwind, const bool pureUpwind,

3
wmake/rules/linux64Icc/c++
View File

@ -1,6 +1,7 @@
SUFFIXES += .C SUFFIXES += .C
c++WARN = -wd327,525,654,819,1125,1476,1505,1572 c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \
-diag-disable 2304
CC = icpc -std=c++0x -fp-trap=common -fp-model precise CC = icpc -std=c++0x -fp-trap=common -fp-model precise

3
wmake/rules/linuxIA64Icc/c++
View File

@ -1,6 +1,7 @@
SUFFIXES += .C SUFFIXES += .C
c++WARN = -wd327,525,654,819,1125,1476,1505,1572 c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \
-diag-disable 2304
CC = icpc CC = icpc

3
wmake/rules/linuxIcc/c++
View File

@ -1,6 +1,7 @@
SUFFIXES += .C SUFFIXES += .C
c++WARN = -wd327,525,654,819,1125,1476,1505,1572 c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \
-diag-disable 2304
CC = icpc -std=c++0x -fp-trap=common -fp-model precise CC = icpc -std=c++0x -fp-trap=common -fp-model precise