Commit b30792c5 authored by mattijs's avatar mattijs
Browse files

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-2.0.0/

parents 5ee41c79 84bdcedb
......@@ -236,8 +236,8 @@ case ThirdParty:
# using clang - not gcc
setenv WM_CC 'clang'
setenv WM_CXX 'clang++'
#set clang_version=llvm-2.8
set clang_version=llvm-svn
set clang_version=llvm-2.9
#set clang_version=llvm-svn
breaksw
default:
echo
......
......@@ -253,8 +253,8 @@ OpenFOAM | ThirdParty)
# using clang - not gcc
export WM_CC='clang'
export WM_CXX='clang++'
#clang_version=llvm-2.8
clang_version=llvm-svn
clang_version=llvm-2.9
#clang_version=llvm-svn
;;
*)
echo
......
......@@ -435,8 +435,7 @@ Ostream& operator<<(Ostream&, const token::compound&);
#define defineCompoundTypeName(Type, Name) \
typedef token::Compound<Type> tokenCompound##Name##_; \
defineTemplateTypeNameAndDebugWithName(tokenCompound##Name##_, #Type, 0);
defineTemplateTypeNameAndDebugWithName(token::Compound<Type>, #Type, 0);
#define addCompoundToRunTimeSelectionTable(Type, Name) \
token::compound::addIstreamConstructorToTable<token::Compound<Type> > \
......
......@@ -573,8 +573,10 @@ Foam::label Foam::cyclicPolyPatch::getConsistentRotationFace
{
// Determine a face furthest away from the axis
const scalarField magRadSqr =
magSqr((faceCentres - rotationCentre_) ^ rotationAxis_);
const scalarField magRadSqr
(
magSqr((faceCentres - rotationCentre_) ^ rotationAxis_)
);
label rotFace = findMax(magRadSqr);
......
......@@ -32,24 +32,36 @@ namespace Foam
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
#ifndef __clang__
template<>
#endif
const word triSurfaceLabelField::typeName("triSurfaceLabelField");
#ifndef __clang__
template<>
#endif
const word triSurfaceScalarField::typeName("triSurfaceScalarField");
#ifndef __clang__
template<>
#endif
const word triSurfaceVectorField::typeName("triSurfaceVectorField");
#ifndef __clang__
template<>
#endif
const word triSurfaceSphericalTensorField::typeName
("triSurfaceSphericalTensorField");
#ifndef __clang__
template<>
#endif
const word triSurfaceSymmTensorField::typeName
("triSurfaceSymmTensorField");
#ifndef __clang__
template<>
#endif
const word triSurfaceTensorField::typeName("triSurfaceTensorField");
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment