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

Intel icpc compiler: made a few random changes to keep the Intel compiler happy

Browse Source
This commit is contained in:
Henry
2011-03-31 11:56:33 +01:00
parent 3c2c3650d4
commit b8839a7ba6
7 changed files with 8 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
View File

@ -287,7 +287,7 @@ Foam::Xfer<Foam::labelList> Foam::PackedBoolList::used() const
// * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * * //
Foam::PackedBoolList&
Foam::PackedBoolList::operator=(const UList<bool>& lst)
Foam::PackedBoolList::operator=(const Foam::UList<bool>& lst)
{
this->setSize(lst.size());

2
src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
View File

@ -115,7 +115,7 @@ public:
inline PackedBoolList(const Xfer<PackedList<1> >&);
//- Construct from a list of bools
explicit inline PackedBoolList(const UList<bool>&);
explicit inline PackedBoolList(const Foam::UList<bool>&);
//- Construct from a list of labels
// using the labels as indices to indicate which bits are set

2
src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
View File

@ -73,7 +73,7 @@ inline Foam::PackedBoolList::PackedBoolList(const Xfer<PackedList<1> >& lst)
{}
inline Foam::PackedBoolList::PackedBoolList(const UList<bool>& lst)
inline Foam::PackedBoolList::PackedBoolList(const Foam::UList<bool>& lst)
:
PackedList<1>()
{

21
src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H
View File

@ -47,9 +47,6 @@ SourceFiles
namespace Foam
{
class Istream;
class Ostream;
// Forward declaration of friend functions and operators
template<class T, class BaseType> class CompactIOField;
@ -58,6 +55,7 @@ template<class T, class BaseType> Istream& operator>>
Istream&,
CompactIOField<T, BaseType>&
);
template<class T, class BaseType> Ostream& operator<<
(
Ostream&,
@ -122,23 +120,6 @@ public:
void operator=(const CompactIOField<T, BaseType>&);
void operator=(const Field<T>&);
// IOstream operators
//- Read Field from Istream, discarding contents of existing Field.
friend Istream& operator>> <T, BaseType>
(
Istream&,
CompactIOField<T, BaseType>&
);
// Write Field to Ostream.
friend Ostream& operator<< <T, BaseType>
(
Ostream&,
const CompactIOField<T, BaseType>&
);
};

6
src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C
View File

@ -124,16 +124,14 @@ Foam::IOdictionary::IOdictionary(const IOobject& io)
regIOobject(io)
{
// Temporary warning
if (io.readOpt() == IOobject::MUST_READ)
if (debug && io.readOpt() == IOobject::MUST_READ)
{
WarningIn("IOdictionary::IOdictionary(const IOobject&)")
//FatalErrorIn("IOdictionary::IOdictionary(const IOobject&)")
<< "Dictionary " << name()
<< " constructed with IOobject::MUST_READ"
" instead of IOobject::MUST_READ_IF_MODIFIED." << nl
<< "Use MUST_READ_IF_MODIFIED if you need automatic rereading."
<< endl;
//<< abort(FatalError);
}
// Everyone check or just master
@ -182,7 +180,7 @@ Foam::IOdictionary::IOdictionary(const IOobject& io, const dictionary& dict)
regIOobject(io)
{
// Temporary warning
if (io.readOpt() == IOobject::MUST_READ)
if (debug && io.readOpt() == IOobject::MUST_READ)
{
WarningIn
(

18
src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
View File

@ -55,6 +55,7 @@ Ostream& operator<<
Ostream&,
const DynamicField<T, SizeInc, SizeMult, SizeDiv>&
);
template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
Istream& operator>>
(
@ -234,23 +235,6 @@ public:
//- Assignment from UList
inline void operator=(const UList<T>&);
// IOstream operators
// Write DynamicField to Ostream.
friend Ostream& operator<< <T, SizeInc, SizeMult, SizeDiv>
(
Ostream&,
const DynamicField<T, SizeInc, SizeMult, SizeDiv>&
);
//- Read from Istream, discarding contents of existing DynamicField.
friend Istream& operator>> <T, SizeInc, SizeMult, SizeDiv>
(
Istream&,
DynamicField<T, SizeInc, SizeMult, SizeDiv>&
);
};

2
src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
View File

@ -282,7 +282,7 @@ Foam::label Foam::ptscotchDecomp::decomposeZeroDomains
<<
(
cWeights.size()
? scalarField::subField(cWeights, nCells, startCell)
? static_cast<const scalarField&>(scalarField::subField(cWeights, nCells, startCell))
: scalarField(0)
);