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

Merge branch 'master' into cvm

Browse Source
This commit is contained in:
graham
2009-06-23 16:18:49 +01:00
parent 6aab448b9d 4b88d16033
commit 9d7e795414
71 changed files with 110 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/foamTemplates/sourceTemplate/foamTemplateTemplate.H
View File

@ -129,16 +129,10 @@ public:
// IOstream Operators
friend Istream& operator>>
#ifndef __CINT__
<TemplateArgument>
#endif
friend Istream& operator>> <TemplateArgument>
(Istream&, ClassName<TemplateArgument>&);
friend Ostream& operator<<
#ifndef __CINT__
<TemplateArgument>
#endif
friend Ostream& operator<< <TemplateArgument>
(Ostream&, const ClassName<TemplateArgument>&);
};

51
etc/apps/cint/bashrc
View File

@ -1,51 +0,0 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# cint/bashrc
#
# Description
# Setup file for cint
# Sourced from OpenFOAM-*/etc/bashrc
#
#------------------------------------------------------------------------------
for CINTSYSDIR in \
$HOME/pub/CINT/cint7 \
$WM_THIRD_PARTY_DIR/cint-svn/platforms/$WM_OPTIONS \
;
do
if [ -r $CINTSYSDIR ]
then
export CINTSYSDIR
export PATH=$PATH:$CINTSYSDIR/bin
export MANPATH=$MANPATH:$CINTSYSDIR/doc
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CINTSYSDIR/lib
break
fi
done
[ -r "$CINTSYSDIR" ] || unset CINTSYSDIR
# -----------------------------------------------------------------------------

34
etc/apps/cint/cshrc
View File

@ -1,34 +0,0 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
# \\/ M anipulation |
#-------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# OpenFOAM is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2 of the License, or (at your
# option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# Script
# cint/cshrc
#
# Description
# Setup file for cint
# Sourced from OpenFOAM-*/etc/cshrc
#
#------------------------------------------------------------------------------
# -----------------------------------------------------------------------------

1
etc/bashrc
View File

@ -244,7 +244,6 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.sh
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc
_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
_foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
_foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
# Clean environment paths again. Only remove duplicates

1
etc/cshrc
View File

@ -241,7 +241,6 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.csh
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc
_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
# _foamSource $WM_PROJECT_DIR/etc/apps/ensight/cshrc
# _foamSource $WM_PROJECT_DIR/etc/apps/cint/cshrc
# Clean environment paths again. Only remove duplicates

4
src/OpenFOAM/Make/files
View File

@ -60,10 +60,6 @@ $(sha1)/SHA1Digest.C
primitives/random/Random.C
functions = primitives/functions
$(functions)/Polynomial/makePolynomialsOrder7.C
containers/HashTables/HashTable/HashTableName.C
containers/HashTables/StaticHashTable/StaticHashTableName.C
containers/Lists/SortableList/ParSortableListName.C

10
src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
View File

@ -122,19 +122,13 @@ public:
// IOstream Operators
friend Istream& operator>>
#ifndef __CINT__
<T, Key, Hash>
#endif
friend Istream& operator>> <T, Key, Hash>
(
Istream&,
HashPtrTable<T, Key, Hash>&
);
friend Ostream& operator<<
#ifndef __CINT__
<T, Key, Hash>
#endif
friend Ostream& operator<< <T, Key, Hash>
(
Ostream&,
const HashPtrTable<T, Key, Hash>&

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

@ -417,19 +417,13 @@ public:
// IOstream Operator
friend Istream& operator>>
#ifndef __CINT__
<T, Key, Hash>
#endif
friend Istream& operator>> <T, Key, Hash>
(
Istream&,
HashTable<T, Key, Hash>&
);
friend Ostream& operator<<
#ifndef __CINT__
<T, Key, Hash>
#endif
friend Ostream& operator<< <T, Key, Hash>
(
Ostream&,
const HashTable<T, Key, Hash>&

5
src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
View File

@ -428,20 +428,19 @@ inline bool Foam::HashTable<T, Key, Hash>::const_iterator::operator!=
template<class T, class Key, class Hash>
inline const T&
inline const T&
Foam::HashTable<T, Key, Hash>::const_iterator::operator*() const
{
return elmtPtr_->obj_;
}
#ifndef __CINT__
template<class T, class Key, class Hash>
inline const T&
Foam::HashTable<T, Key, Hash>::const_iterator::operator()() const
{
return elmtPtr_->obj_;
}
#endif
template<class T, class Key, class Hash>
inline

5
src/OpenFOAM/containers/LinkedLists/accessTypes/ILList/ILList.H
View File

@ -152,10 +152,7 @@ public:
// Istream operator
//- Read List from Istream, discarding contents of existing List.
friend Istream& operator>>
#ifndef __CINT__
<LListBase, T>
#endif
friend Istream& operator>> <LListBase, T>
(
Istream&,
ILList<LListBase, T>&

10
src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
View File

@ -327,19 +327,13 @@ public:
// IOstream operators
friend Istream& operator>>
#ifndef __CINT__
<LListBase, T>
#endif
friend Istream& operator>> <LListBase, T>
(
Istream&,
LList<LListBase, T>&
);
friend Ostream& operator<<
#ifndef __CINT__
<LListBase, T>
#endif
friend Ostream& operator<< <LListBase, T>
(
Ostream&,
const LList<LListBase, T>&

10
src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
View File

@ -260,19 +260,13 @@ public:
// IOstream operators
friend Istream& operator>>
#ifndef __CINT__
<LListBase, T>
#endif
friend Istream& operator>> <LListBase, T>
(
Istream&,
LPtrList<LListBase, T>&
);
friend Ostream& operator<<
#ifndef __CINT__
<LListBase, T>
#endif
friend Ostream& operator<< <LListBase, T>
(
Ostream&,
const LPtrList<LListBase, T>&

5
src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
View File

@ -277,10 +277,7 @@ public:
// Ostream operator
friend Ostream& operator<<
#ifndef __CINT__
<LListBase, T>
#endif
friend Ostream& operator<< <LListBase, T>
(
Ostream&,
const UILList<LListBase, T>&

10
src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
View File

@ -210,20 +210,14 @@ public:
// IOstream operators
// Write DynamicList to Ostream.
friend Ostream& operator<<
#ifndef __CINT__
<T, SizeInc, SizeMult, SizeDiv>
#endif
friend Ostream& operator<< <T, SizeInc, SizeMult, SizeDiv>
(
Ostream&,
const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
);
//- Read from Istream, discarding contents of existing DynamicList.
friend Istream& operator>>
#ifndef __CINT__
<T, SizeInc, SizeMult, SizeDiv>
#endif
friend Istream& operator>> <T, SizeInc, SizeMult, SizeDiv>
(
Istream&,
DynamicList<T, SizeInc, SizeMult, SizeDiv>&

10
src/OpenFOAM/containers/Lists/FixedList/FixedList.H
View File

@ -331,17 +331,11 @@ public:
// IOstream operators
//- Read List from Istream, discarding contents of existing List.
friend Istream& operator>>
#ifndef __CINT__
<T, Size>
#endif
friend Istream& operator>> <T, Size>
(Istream&, FixedList<T, Size>&);
// Write FixedList to Ostream.
friend Ostream& operator<<
#ifndef __CINT__
<T, Size>
#endif
friend Ostream& operator<< <T, Size>
(
Ostream&,
const FixedList<T, Size>&

2
src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
View File

@ -398,7 +398,6 @@ inline bool Foam::FixedList<T, Size>::empty() const
}
#ifndef __CINT__
template<class T, unsigned Size>
template<class HashT>
inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator()
@ -426,6 +425,5 @@ inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator()
}
}
#endif // __CINT__
// ************************************************************************* //

5
src/OpenFOAM/containers/Lists/List/List.H
View File

@ -233,10 +233,7 @@ public:
// Istream operator
//- Read List from Istream, discarding contents of existing List.
friend Istream& operator>>
#ifndef __CINT__
<T>
#endif
friend Istream& operator>> <T>
(Istream&, List<T>&);
};

12
src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
View File

@ -97,16 +97,16 @@ public:
//- Assignment of all entries to the given value
inline void operator=(const T&);
// Ostream operator
//- Write UIndirectList to Ostream
// Binary output is currently still a bit of a problem
friend Ostream& operator<<
#ifndef __CINT__
<T>
#endif
(Ostream&, const UIndirectList<T>&);
friend Ostream& operator<< <T>
(
Ostream&,
const UIndirectList<T>&
);
};

10
src/OpenFOAM/containers/Lists/UList/UList.H
View File

@ -313,11 +313,11 @@ public:
// Ostream operator
// Write UList to Ostream.
friend Ostream& operator<<
#ifndef __CINT__
<T>
#endif
(Ostream&, const UList<T>&);
friend Ostream& operator<< <T>
(
Ostream&,
const UList<T>&
);
};
// Reverse the first n elements of the list

3
src/OpenFOAM/db/IOobject/IOobject.H
View File

@ -83,8 +83,6 @@ class objectRegistry;
Class IOobject Declaration
\*---------------------------------------------------------------------------*/
#include "CintDefs.H"
class IOobject
{
@ -395,7 +393,6 @@ public:
void operator=(const IOobject&);
};
#include "CintUndefs.H"
#if defined (__GNUC__)
template<>

2
src/OpenFOAM/db/IOstreams/Fstreams/OFstream.H
View File

@ -148,9 +148,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Global predefined null output stream
#ifndef __CINT__
extern OFstream Snull;
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/OpenFOAM/db/IOstreams/IOstreams/IOstream.H
View File

@ -74,8 +74,6 @@ namespace Foam
Class IOstream Declaration
\*---------------------------------------------------------------------------*/
#include "CintDefs.H"
class IOstream
{
@ -193,9 +191,7 @@ public:
//- Ostream operator
#ifndef __MAKECINT__
friend Ostream& operator<<(Ostream& os, const versionNumber& vn);
#endif
};
@ -421,7 +417,7 @@ public:
}
//- Return compression of given compression name
static compressionType compressionEnum(const word&);
static compressionType compressionEnum(const word&);
//- Return the stream compression
compressionType compression() const
@ -545,7 +541,6 @@ public:
}
};
#include "CintUndefs.H"
Ostream& operator<<(Ostream& os, const IOstream::streamFormat& sf);
Ostream& operator<<(Ostream& os, const IOstream::versionNumber& vn);
@ -554,7 +549,6 @@ Ostream& operator<<(Ostream& os, const IOstream::versionNumber& vn);
// --------------------------------------------------------------------
// ------ Manipulators (not taking arguments)
// --------------------------------------------------------------------
#ifndef __CINT__
typedef IOstream& (*IOstreamManip)(IOstream&);
@ -595,8 +589,6 @@ inline IOstream& scientific(IOstream& io)
return io;
}
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

9
src/OpenFOAM/db/IOstreams/IOstreams/InfoProxy.H
View File

@ -52,19 +52,14 @@ class InfoProxy
{
public:
#ifndef __MAKECINT__
const T& t_;
#endif
InfoProxy(const T& t)
:
t_(t)
{}
friend Ostream& operator<<
#ifndef __CINT__
<T>
#endif
friend Ostream& operator<< <T>
(Ostream&, const InfoProxy<T>&);
};

3
src/OpenFOAM/db/IOstreams/IOstreams/Istream.H
View File

@ -152,7 +152,6 @@ public:
// --------------------------------------------------------------------
// ------ Manipulators (not taking arguments)
// --------------------------------------------------------------------
#ifndef __CINT__
typedef Istream& (*IstreamManip)(Istream&);
@ -169,8 +168,6 @@ inline Istream& operator>>(Istream& is, IOstreamManip f)
return is;
}
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

11
src/OpenFOAM/db/IOstreams/IOstreams/Ostream.H
View File

@ -70,6 +70,7 @@ protected:
//- Current indent level
unsigned short indentLevel_;
public:
// Constructors
@ -87,10 +88,9 @@ public:
{}
// Destructor
virtual ~Ostream()
{}
//- Destructor
virtual ~Ostream()
{}
// Member functions
@ -199,7 +199,6 @@ public:
// --------------------------------------------------------------------
// ------ Manipulators (not taking arguments)
// --------------------------------------------------------------------
#ifndef __CINT__
typedef Ostream& (*OstreamManip)(Ostream&);
@ -254,8 +253,6 @@ inline Ostream& endl(Ostream& os)
return os;
}
#endif
// Useful aliases for tab and newline characters
static const char tab = '\t';

2
src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
View File

@ -151,9 +151,7 @@ public:
// Ostream Operator
#ifndef __CINT__
friend Ostream& operator<<(Ostream&, const commsStruct&);
#endif
};

2
src/OpenFOAM/db/IOstreams/Sstreams/ISstream.H
View File

@ -58,9 +58,7 @@ class ISstream
// Private data
fileName name_;
#ifndef __CINT__
istream& is_;
#endif
// Private member functions

2
src/OpenFOAM/db/IOstreams/Sstreams/OSstream.H
View File

@ -58,9 +58,7 @@ class OSstream
// Private data
fileName name_;
#ifndef __CINT__
ostream& os_;
#endif
// Private Member Functions

24
src/OpenFOAM/db/IOstreams/Tstreams/ITstream.H
View File

@ -98,6 +98,12 @@ public:
}
// Destructor
virtual ~ITstream()
{}
// Member functions
// Inquiry
@ -142,31 +148,31 @@ public:
// Read functions
//- Return next token from stream
Istream& read(token&);
virtual Istream& read(token&);
//- Read a character
Istream& read(char&);
virtual Istream& read(char&);
//- Read a word
Istream& read(word&);
virtual Istream& read(word&);
// Read a string (including enclosing double-quotes)
Istream& read(string&);
virtual Istream& read(string&);
//- Read a label
Istream& read(label&);
virtual Istream& read(label&);
//- Read a floatScalar
Istream& read(floatScalar&);
virtual Istream& read(floatScalar&);
//- Read a doubleScalar
Istream& read(doubleScalar&);
virtual Istream& read(doubleScalar&);
//- Read binary block
Istream& read(char*, std::streamsize);
virtual Istream& read(char*, std::streamsize);
//- Rewind and return the stream so that it may be read again
Istream& rewind();
virtual Istream& rewind();
// Edit

5
src/OpenFOAM/db/IOstreams/token/token.H
View File

@ -66,8 +66,6 @@ Ostream& operator<<(Ostream&, const token&);
Class token Declaration
\*---------------------------------------------------------------------------*/
#include "CintDefs.H"
class token
{
@ -206,9 +204,7 @@ public:
// IOstream Operators
#ifndef __MAKECINT__
friend Ostream& operator<<(Ostream&, const compound&);
#endif
};
@ -431,7 +427,6 @@ public:
friend ostream& operator<<(ostream&, const InfoProxy<token>&);
};
#include "CintUndefs.H"
Ostream& operator<<(Ostream&, const token::punctuationToken&);
ostream& operator<<(ostream&, const token::punctuationToken&);

2
src/OpenFOAM/db/dictionary/functionEntries/includeEntry/includeEntry.H
View File

@ -80,7 +80,7 @@ class includeEntry
public:
//- Runtime type information
TypeName("include");
ClassName("include");
// Member Functions

3
src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
View File

@ -96,7 +96,7 @@ class inputModeEntry
public:
//- Runtime type information
TypeName("inputMode");
ClassName("inputMode");
// Member Functions
@ -118,7 +118,6 @@ public:
//- Return true if the inputMode is %error
static bool error();
};

2
src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
View File

@ -74,7 +74,7 @@ class removeEntry
public:
//- Runtime type information
TypeName("remove");
ClassName("remove");
// Member Functions

9
src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H
View File

@ -66,9 +66,6 @@ class primitiveEntry
public entry,
public ITstream
{
public:
// Private member functions
//- Append the given token to this entry
@ -93,9 +90,6 @@ public:
Istream&
);
//- Read tokens from the given stream
bool read(const dictionary&, Istream&);
//- Read the complete entry from the given stream
void readEntry(const dictionary&, Istream&);
@ -169,6 +163,9 @@ public:
// calling this function generates a FatalError
dictionary& dict();
//- Read tokens from the given stream
bool read(const dictionary&, Istream&);
// Write
void write(Ostream&) const;

5
src/OpenFOAM/db/error/error.H
View File

@ -150,12 +150,9 @@ public:
//- Convert to Ostream
// Prints basic message and then returns Ostream for further info.
#ifndef __CINT__
operator OSstream&();
#endif
//- Explicitly convert to Ostream for << operations
// needed in cint
OSstream& operator()()
{
return operator OSstream&();
@ -311,9 +308,7 @@ extern IOerror FatalIOError;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifndef __CINT__
#include "errorManip.H"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
src/OpenFOAM/db/error/messageStream.H
View File

@ -182,12 +182,9 @@ public:
);
//- Convert to Ostream for << operations
#ifndef __CINT__
operator OSstream&();
#endif
//- Explicitly convert to Ostream for << operations
// needed in cint
OSstream& operator()()
{
return operator OSstream&();

10
src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
View File

@ -174,16 +174,10 @@ public:
// IOstream operators
friend Istream& operator>>
#ifndef __CINT__
<Type>
#endif
friend Istream& operator>> <Type>
(Istream&, dimensioned<Type>&);
friend Ostream& operator<<
#ifndef __CINT__
<Type>
#endif
friend Ostream& operator<< <Type>
(Ostream&, const dimensioned<Type>&);
};

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

@ -62,12 +62,10 @@ Istream& operator>>(Istream&, DynamicField<Type>&);
Class DynamicField Declaration
\*---------------------------------------------------------------------------*/
#include "CintDefs.H"
template<class Type>
class DynamicField
:
public Field<Type> //private Field<Type>
public Field<Type>
{
// Private data
@ -185,26 +183,16 @@ public:
// IOstream operators
friend Ostream& operator<<
#ifndef __CINT__
<Type>
#endif
friend Ostream& operator<< <Type>
(Ostream&, const DynamicField<Type>&);
friend Ostream& operator<<
#ifndef __CINT__
<Type>
#endif
friend Ostream& operator<< <Type>
(Ostream&, const tmp<DynamicField<Type> >&);
friend Istream& operator>>
#ifndef __CINT__
<Type>
#endif
friend Istream& operator>> <Type>
(Istream&, DynamicField<Type>&);
};
#include "CintUndefs.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

15
src/OpenFOAM/fields/Fields/Field/Field.H
View File

@ -75,8 +75,6 @@ class dictionary;
Class Field Declaration
\*---------------------------------------------------------------------------*/
#include "CintDefs.H"
template<class Type>
class Field
:
@ -198,13 +196,11 @@ public:
//- Return a pointer to a new calculatedFvPatchFieldField created on
// freestore without setting patchField values
#ifndef __CINT__
template<class Type2>
static tmp<Field<Type> > NewCalculatedType(const Field<Type2>& f)
{
return tmp<Field<Type> >(new Field<Type>(f.size()));
}
#endif
// Member Functions
@ -343,20 +339,13 @@ public:
// IOstream operators
friend Ostream& operator<<
#ifndef __CINT__
<Type>
#endif
friend Ostream& operator<< <Type>
(Ostream&, const Field<Type>&);
friend Ostream& operator<<
#ifndef __CINT__
<Type>
#endif
friend Ostream& operator<< <Type>
(Ostream&, const tmp<Field<Type> >&);
};
#include "CintUndefs.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

6
src/OpenFOAM/include/CintDefs.H
View File

@ -1,6 +0,0 @@
#ifdef __CINT__
# define tmp Foam::tmp
# define UList Foam::UList
# define List Foam::List
# define InfoProxy Foam::InfoProxy
#endif

6
src/OpenFOAM/include/CintUndefs.H
View File

@ -1,6 +0,0 @@
#ifdef __CINT__
# undef tmp
# undef UList
# undef List
# undef InfoProxy
#endif

10
src/OpenFOAM/meshes/primitiveShapes/line/line.H
View File

@ -124,19 +124,13 @@ public:
// Ostream operator
friend Istream& operator>>
#ifndef __CINT__
<Point, PointRef>
#endif
friend Istream& operator>> <Point, PointRef>
(
Istream&,
line&
);
friend Ostream& operator<<
#ifndef __CINT__
<Point, PointRef>
#endif
friend Ostream& operator<< <Point, PointRef>
(
Ostream&,
const line&

7
src/OpenFOAM/meshes/primitiveShapes/objectHit/PointHit.H
View File

@ -184,10 +184,7 @@ public:
// Ostream operator
friend Ostream& operator<<
#ifndef __CINT__
<Point>
#endif
friend Ostream& operator<< <Point>
(
Ostream& os,
const PointHit<Point>& b
@ -202,7 +199,7 @@ inline Ostream& operator<<(Ostream& os, const PointHit<Point>& b)
<< b.rawPoint() << token::SPACE
<< b.distance() << token::SPACE
<< b.eligibleMiss();
return os;
}

4
src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
View File

@ -181,7 +181,7 @@ inline Cmpt det(const SphericalTensor<Cmpt>& st)
template <class Cmpt>
inline SphericalTensor<Cmpt> inv(const SphericalTensor<Cmpt>& st)
{
return SphericalTensor<Cmpt>(1.0/st.ii());
return SphericalTensor<Cmpt>(1.0/st.ii());
}
@ -202,7 +202,6 @@ public:
};
#ifndef __CINT__
template<class Cmpt>
class innerProduct<SphericalTensor<Cmpt>, SphericalTensor<Cmpt> >
{
@ -227,7 +226,6 @@ public:
typedef Vector<Cmpt> type;
};
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
View File

@ -520,7 +520,6 @@ public:
typedef SymmTensor<Cmpt> type;
};
#ifndef __CINT__
template<class Cmpt>
class innerProduct<SymmTensor<Cmpt>, SymmTensor<Cmpt> >
{
@ -529,7 +528,6 @@ public:
typedef SymmTensor<Cmpt> type;
};
template<class Cmpt>
class innerProduct<SymmTensor<Cmpt>, Vector<Cmpt> >
{
@ -578,7 +576,7 @@ public:
typedef SymmTensor<Cmpt> type;
};
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

5
src/OpenFOAM/primitives/Tensor/TensorI.H
View File

@ -647,7 +647,6 @@ operator&&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
return(t1.xx()*st2.ii() + t1.yy()*st2.ii() + t1.zz()*st2.ii());
}
#ifndef __CINT__
template<class Cmpt>
class typeOfSum<SphericalTensor<Cmpt>, Tensor<Cmpt> >
{
@ -679,7 +678,7 @@ public:
typedef Tensor<Cmpt> type;
};
#endif
// * * * * * * * * * * Mixed Tensor SymmTensor Operators * * * * * * * * * * //
@ -806,7 +805,6 @@ operator&&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
);
}
#ifndef __CINT__
template<class Cmpt>
class typeOfSum<SymmTensor<Cmpt>, Tensor<Cmpt> >
{
@ -839,7 +837,6 @@ public:
typedef Tensor<Cmpt> type;
};
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

20
src/OpenFOAM/primitives/Tuple2/Tuple2.H
View File

@ -139,19 +139,13 @@ public:
// Friend Operators
friend bool operator==
#ifndef __CINT__
<Type1, Type2>
#endif
friend bool operator== <Type1, Type2>
(
const Tuple2<Type1, Type2>& a,
const Tuple2<Type1, Type2>& b
);
friend bool operator!=
#ifndef __CINT__
<Type1, Type2>
#endif
friend bool operator!= <Type1, Type2>
(
const Tuple2<Type1, Type2>& a,
const Tuple2<Type1, Type2>& b
@ -161,20 +155,14 @@ public:
// IOstream operators
//- Read Tuple2 from Istream, discarding contents of existing Tuple2.
friend Istream& operator>>
#ifndef __CINT__
<Type1, Type2>
#endif
friend Istream& operator>> <Type1, Type2>
(
Istream& is,
Tuple2<Type1, Type2>& t2
);
// Write Tuple2 to Ostream.
friend Ostream& operator<<
#ifndef __CINT__
<Type1, Type2>
#endif
friend Ostream& operator<< <Type1, Type2>
(
Ostream& os,
const Tuple2<Type1, Type2>& t2

10
src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
View File

@ -136,19 +136,13 @@ public:
// IOstream Operators
friend Istream& operator>>
#ifndef __CINT__
<Form, Cmpt, nCmpt>
#endif
friend Istream& operator>> <Form, Cmpt, nCmpt>
(
Istream&,
VectorSpace<Form, Cmpt, nCmpt>&
);
friend Ostream& operator<<
#ifndef __CINT__
<Form, Cmpt, nCmpt>
#endif
friend Ostream& operator<< <Form, Cmpt, nCmpt>
(
Ostream&,
const VectorSpace<Form, Cmpt, nCmpt>&

4
src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
View File

@ -263,7 +263,6 @@ inline const Cmpt& component
// Powers of a Form
// Equivalent to outer-products between the Form and itself
#ifndef __CINT__
// Form^0 = 1.0
template<class Form, class Cmpt, int nCmpt>
inline typename powProduct<Form, 0>::type pow
@ -300,7 +299,7 @@ inline typename powProduct<Form, 2>::type pow
{
return sqr(static_cast<const Form&>(v));
}
#endif
template<class Form, class Cmpt, int nCmpt>
inline scalar magSqr
@ -515,7 +514,6 @@ inline Form operator+
return v;
}
template<class Form, class Cmpt, int nCmpt>
inline Form operator-
(

48
src/OpenFOAM/primitives/VectorSpace/products.H
View File

@ -61,8 +61,6 @@ public:
};
#ifndef __CINT__
template<class arg1, class arg2>
class outerProduct
{
@ -121,52 +119,6 @@ public:
>::type type;
};
#else
template<class arg1, class arg2>
class outerProduct
{
public:
typedef arg1 type;
};
template<class arg1, class arg2>
class crossProduct
{
public:
typedef arg1 type;
};
template<class arg1, class arg2>
class innerProduct
{
public:
typedef arg1 type;
};
template<class arg1, class arg2>
class scalarProduct
{
public:
typedef typename pTraits<arg1>::cmptType type;
};
template<class arg1, int arg2>
class powProduct
{
public:
typedef arg1 type;
};
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

29
src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C
View File

@ -69,16 +69,6 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
}
template<int PolySize>
Foam::Polynomial<PolySize>::Polynomial(const Polynomial<PolySize>& poly)
:
VectorSpace<Polynomial<PolySize>, scalar, PolySize>(poly),
name_(poly.name_),
logActive_(poly.logActive_),
logCoeff_(poly.logCoeff_)
{}
template<int PolySize>
Foam::Polynomial<PolySize>::Polynomial
(
@ -93,13 +83,6 @@ Foam::Polynomial<PolySize>::Polynomial
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template<int PolySize>
Foam::Polynomial<PolySize>::~Polynomial()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<int PolySize>
@ -210,16 +193,4 @@ Foam::Polynomial<PolySize>::integrateMinus1(const scalar intConstant)
}
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<int PolySize>
void Foam::Polynomial<PolySize>::operator=(const Polynomial<PolySize>& poly)
{
name_ = poly.name_;
VectorSpace<Polynomial<PolySize>, scalar, PolySize>::operator=(poly);
logActive_ = poly.logActive_;
logCoeff_ = poly.logCoeff_;
}
// ************************************************************************* //

29
src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H
View File

@ -52,7 +52,6 @@ SourceFiles
#include "scalar.H"
#include "Ostream.H"
#include "VectorSpace.H"
#include "Vector.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -81,8 +80,6 @@ class Polynomial
:
public VectorSpace<Polynomial<PolySize>, scalar, PolySize>
{
private:
// Private data
//- Polynomial name
@ -101,9 +98,6 @@ public:
typedef Polynomial<PolySize+1> intPolyType;
//- Run-time type information
TypeName("Polynomial")
// Constructors
@ -113,17 +107,10 @@ public:
//- Construct from name and Istream
Polynomial(const word& name, Istream& is);
//- Copy constructor
Polynomial(const Polynomial& poly);
//- Copy constructor with name
Polynomial(const word& name, const Polynomial& poly);
//- Destructor
~Polynomial();
// Member Functions
// Access
@ -155,11 +142,6 @@ public:
scalar integrateLimits(const scalar x1, const scalar x2) const;
// Member operators
void operator=(const Polynomial& poly);
//- Ostream Operator
friend Ostream& operator<< <PolySize>
(
@ -175,17 +157,6 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makePolynomial(PolySize) \
\
defineTemplateTypeNameAndDebugWithName \
( \
Polynomial<PolySize>, \
"Polynomial<"#PolySize">", \
0 \
)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
# include "Polynomial.C"
# include "PolynomialIO.C"

51
src/OpenFOAM/primitives/functions/Polynomial/makePolynomialsOrder7.C
View File

@ -1,51 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
\*---------------------------------------------------------------------------*/
#include "Polynomial.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
namespace Foam
{
makePolynomial(2);
makePolynomial(3);
makePolynomial(4);
makePolynomial(5);
makePolynomial(6);
makePolynomial(7);
makePolynomial(8);
// explicitly define max order + 1 to define the integrated form
defineTemplateTypeNameAndDebugWithName
(
Polynomial<9>,
"Polynomial<9>",
0
);
}
// ************************************************************************* //

7
src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
View File

@ -162,6 +162,13 @@ void Foam::FreeStream<CloudType>::inflow()
scalar mass = cloud.constProps(typeId).mass();
if (min(boundaryT[patchI]) < SMALL)
{
FatalErrorIn ("Foam::FreeStream<CloudType>::inflow()")
<< "Zero boundary temperature detected, check boundaryT condition." << nl
<< nl << abort(FatalError);
}
scalarField mostProbableSpeed
(
cloud.maxwellianMostProbableSpeed

12
src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
View File

@ -105,6 +105,7 @@ private:
// - schedule
mutable autoPtr<mapDistribute> mapPtr_;
// Private Member Functions
//- Collect single list of samples and originating processor+face.
@ -162,7 +163,7 @@ private:
public:
//- Runtime type information
ClassName("directMappedPatchBase");
TypeName("directMappedPatchBase");
// Constructors
@ -177,15 +178,14 @@ public:
directMappedPatchBase(const polyPatch&, const directMappedPatchBase&);
// Destructor
~directMappedPatchBase();
void clearOut();
//- Destructor
virtual ~directMappedPatchBase();
// Member functions
void clearOut();
//- What to sample
const sampleMode& mode() const
{

5
src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
View File

@ -151,9 +151,8 @@ public:
}
// Destructor
~directMappedPolyPatch();
//- Destructor
virtual ~directMappedPolyPatch();
// Member functions

5
src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
View File

@ -158,9 +158,8 @@ public:
}
// Destructor
~directMappedWallPolyPatch();
//- Destructor
virtual ~directMappedWallPolyPatch();
// Member functions

1
src/thermophysicalModels/specie/Make/files
View File

@ -8,7 +8,6 @@ $(atomicWeights)/atomicWeights.C
$(specie)/specie.C
$(speciesTable)/speciesTable.C
$(equationOfState)/perfectGas/perfectGas.C
$(equationOfState)/icoPolynomial/makeIcoPolynomials.C
$(reactions)/makeChemkinReactions.C
$(reactions)/makeReactionThermoReactions.C
$(reactions)/makeLangmuirHinshelwoodReactions.C

2
src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H
View File

@ -105,8 +105,6 @@ class icoPolynomial
public:
TypeName("icoPolynomial")
// Constructors
//- Construct from components

44
src/thermophysicalModels/specie/equationOfState/icoPolynomial/makeIcoPolynomials.C
View File

@ -1,44 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2008-2009 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
\*---------------------------------------------------------------------------*/
#include "icoPolynomial.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeIcoPolynomial(1)
makeIcoPolynomial(2)
makeIcoPolynomial(3)
makeIcoPolynomial(4)
makeIcoPolynomial(5)
makeIcoPolynomial(6)
makeIcoPolynomial(7)
makeIcoPolynomial(8)
}
// ************************************************************************* //

426
tutorials/heatTransfer/buoyantPisoFoam/hotRoom/0/T
View File

@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
location "0";
object T;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -21,425 +20,22 @@ internalField uniform 300;
boundaryField
{
floor
{
type fixedValue;
value nonuniform List<scalar>
400
(
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
600
600
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
600
600
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
300
)
;
}
ceiling
floor
{
type fixedValue;
value uniform 300;
}
fixedWalls
ceiling
{
type fixedValue;
value uniform 300;
}
fixedWalls
{
type zeroGradient;
}
}
// ************************************************************************* //

12
wmake/rules/General/cint
View File

@ -1,12 +0,0 @@
.SUFFIXES: .ldf
ifeq ($(origin WM_SCHEDULER), undefined)
EVAL_LDF = eval
else
EVAL_LDF = $(WM_SCHEDULER)
endif
ldftoo = $(EVAL_LDF) m4 $$SOURCE \> $*.H \; cint -n$*.C -N$(*F) -p -c-1 -A -I${CINTSYSDIR}/inc -I${WM_PROJECT_DIR}/src/OpenFOAM/lnInclude -D__MAKECINT__ -DG__MAKECINT -DG__SHAREDLIB -DG__OSFDLL -DG__ANSI -DG__ERRORCALLBACK -DG__SIGNEDCHAR -DG__NEWSTDHEADER -DG__CINT_VER6 -DG__NATIVELONGLONG -DG__P2FCAST -DG__STD_EXCEPTION -DG__HAVE_CONFIG -DG__NOMAKEINFO -DDP -D__restrict__= -Y0 -DNoInline $*.H \; $(CC) $(c++FLAGS) -c $*.C -o $@
.ldf.dep:
$(MAKE_DEP)

1
wmake/rules/SiCortex64Gcc/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
include $(GENERAL_RULES)/cint

3
wmake/rules/SunOS64Gcc/general
View File

@ -1,11 +1,10 @@
CPP = /lib/cpp $(GFLAGS)
LD = ld -64
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
include $(GENERAL_RULES)/cint

2
wmake/rules/linux64Gcc/c++
View File

@ -1,6 +1,6 @@
.SUFFIXES: .C .cxx .cc .cpp
c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
c++WARN = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast -Wnon-virtual-dtor
CC = g++ -m64

1
wmake/rules/linux64Gcc/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
include $(GENERAL_RULES)/cint

1
wmake/rules/linux64Gcc42/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
include $(GENERAL_RULES)/cint

1
wmake/rules/linux64Gcc43/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
include $(GENERAL_RULES)/cint

1
wmake/rules/linuxGcc/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
include $(GENERAL_RULES)/cint

1
wmake/rules/linuxGcc43/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
include $(GENERAL_RULES)/cint

1
wmake/rules/linuxPPC64Gcc/general
View File

@ -8,4 +8,3 @@ include $(GENERAL_RULES)/standard
include $(RULES)/X
include $(RULES)/c
include $(RULES)/c++
include $(GENERAL_RULES)/cint