diff --git a/applications/test/router/Gather/Gather.C b/applications/test/router/Gather/Gather.C
index 24098b939e3b0df9f35ee0b0366d4bd08828f332..dd2035b6264ffb8eee4575b6fd53b65205562f2a 100644
--- a/applications/test/router/Gather/Gather.C
+++ b/applications/test/router/Gather/Gather.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -37,7 +37,7 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from component
-template <class T0>
+template<class T0>
Gather<T0>::Gather(const T0& localData, const bool redistribute)
:
List<T0>(0),
diff --git a/applications/test/router/Gather/Gather.H b/applications/test/router/Gather/Gather.H
index 337f7a690845fbfd20e18956d412fd491d61b778..678ad6c908b6557a35eba1062bbbf02d7b1b3cce 100644
--- a/applications/test/router/Gather/Gather.H
+++ b/applications/test/router/Gather/Gather.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -48,7 +48,7 @@ namespace Foam
Class Gather Declaration
\*---------------------------------------------------------------------------*/
-template <class T0>
+template<class T0>
class Gather
:
public GatherBase,
diff --git a/applications/test/router/Gather/GatherBase.C b/applications/test/router/Gather/GatherBase.C
index ecba2768b97bd9e3cd9ea012fbbf3e4d55449554..553e41a818a849cdcd14a5a983032de567f23457 100644
--- a/applications/test/router/Gather/GatherBase.C
+++ b/applications/test/router/Gather/GatherBase.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ namespace Foam
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Type GatherBase::flatten(const List<Type> lst)
{
label sum = 0;
@@ -60,7 +60,7 @@ Type GatherBase::flatten(const List<Type> lst)
}
-template <class DataType, class IndexType, class AddOp>
+template<class DataType, class IndexType, class AddOp>
IndexType GatherBase::offset
(
const List<DataType>& values,
diff --git a/applications/test/router/Gather/GatherBase.H b/applications/test/router/Gather/GatherBase.H
index 6a90aef845f9bf675c13d9fbf0b822ab0cdc9a8c..b77e897836f6a208567876179ed8466f66780649 100644
--- a/applications/test/router/Gather/GatherBase.H
+++ b/applications/test/router/Gather/GatherBase.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -53,12 +53,12 @@ public:
//- Flatten: appends all elements of list into one single list.
// Used to collapse 'Gathered' data.
- template <class T>
+ template<class T>
static T flatten(const List<T>);
//- Flatten and offset 'Gathered' indices (into value) so they
// remain valid with respect to values (after they have been flattened)
- template <class DataType, class IndexType, class AddOp>
+ template<class DataType, class IndexType, class AddOp>
static IndexType offset
(
const List<DataType>& values,
@@ -68,7 +68,7 @@ public:
};
-template <class T>
+template<class T>
class AddOp
{
diff --git a/applications/utilities/mesh/manipulation/createPatch/createPatch.C b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
index 9e89c8d4dfc67f57522ba2ac516db98ccfe480b3..b7a425506911ee9aaa41af2c94154f7eaf902733 100644
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -288,7 +288,7 @@ void separateList
// Synchronise points on both sides of coupled boundaries.
-template <class CombineOp>
+template<class CombineOp>
void syncPoints
(
const polyMesh& mesh,
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
index 091461d13c3bbcc54d4dfbe36f29290c84d73309..18f3deabf0db5e6e52e2d834cb03e3509a57a25e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -68,7 +68,7 @@ void ensightCloudField
ensightCaseFile.setf(ios_base::left);
ensightCaseFile
<< ("c" + fieldObject.name()).c_str()
- << (' ' + prepend + "***." + cloudName
+ << (' ' + prepend + "****." + cloudName
+ "." + fieldObject.name()).c_str()
<< nl;
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
index 3342435ad6e8c9bc0a2c4698ca384f629cffac34..0b07b7f2ebcc05bdb3f0e903875d5f681b9b4572 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -201,7 +201,7 @@ void writePatchField
<< pTraits<Type>::typeName
<< " per element: 1 "
<< setw(15) << pfName
- << (' ' + prepend + "***." + pfName).c_str()
+ << (' ' + prepend + "****." + pfName).c_str()
<< nl;
}
@@ -344,7 +344,7 @@ void ensightField
<< pTraits<Type>::typeName
<< " per element: 1 "
<< setw(15) << vf.name()
- << (' ' + prepend + "***." + vf.name()).c_str()
+ << (' ' + prepend + "****." + vf.name()).c_str()
<< nl;
}
@@ -558,7 +558,7 @@ void ensightPointField
<< pTraits<Type>::typeName
<< " per node: 1 "
<< setw(15) << pf.name()
- << (' ' + prepend + "***." + pf.name()).c_str()
+ << (' ' + prepend + "****." + pf.name()).c_str()
<< nl;
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 05db6c0d05b47bffad3db9925a501190a7645e94..a5bcbd9d85fe684ccb417e4c6b6c36efecc3355e 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -243,7 +243,7 @@ int main(int argc, char *argv[])
// test pre check variable if there is a moving mesh
if (meshMoving)
{
- geomFileName = prepend + "***";
+ geomFileName = prepend + "****";
}
ensightCaseFile
@@ -292,7 +292,7 @@ int main(int argc, char *argv[])
<< (
"measured: 1 "
+ prepend
- + "***."
+ + "****."
+ cloudIter.key()
).c_str()
<< nl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/itoa.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/itoa.C
index 2f8ce716565eb06929ecef9c7e09cedb40b72afd..0975da93d30f87fbacbfe7ab0bba0637a7d05cd0 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/itoa.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/itoa.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -35,7 +35,7 @@ namespace Foam
word itoa(const label n)
{
const label offset = '0';
- const label length = 3;
+ const label length = 4;
char val[length + 1];
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
index 2df564e0d0cec528601eaadda55eb3398f247dfd..2e661680fbb9197e50f1fb54e8a713d559c082e3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -207,7 +207,7 @@ void Foam::ensightLagrangianField
//- write generalized field components
-template <class Type>
+template<class Type>
void Foam::ensightVolField
(
const ensightParts& partsList,
diff --git a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/CGALPolyhedronRings.H b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/CGALPolyhedronRings.H
index 7aa4459e893d67b82107b05944ccfa6f406afb18..6d54cc70d47fcd55f6627727ad66ca2d4a4006af 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/CGALPolyhedronRings.H
+++ b/applications/utilities/surface/surfaceFeatureExtract/CGALPolyhedron/CGALPolyhedronRings.H
@@ -106,7 +106,7 @@ public:
////IMPLEMENTATION////////////////////////////////////////////////////
-template < class TPoly , class VertexPropertyMap>
+template< class TPoly , class VertexPropertyMap>
void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
push_neighbours_of(Vertex* start, int ith,
std::vector< Vertex* >& nextRing,
@@ -129,7 +129,7 @@ push_neighbours_of(Vertex* start, int ith,
}
-template <class TPoly, class VertexPropertyMap>
+template<class TPoly, class VertexPropertyMap>
void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
collect_ith_ring(int ith, std::vector< Vertex* >& currentRing,
std::vector< Vertex* >& nextRing,
@@ -146,7 +146,7 @@ collect_ith_ring(int ith, std::vector< Vertex* >& currentRing,
}
-template <class TPoly, class VertexPropertyMap>
+template<class TPoly, class VertexPropertyMap>
void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
reset_ring_indices(std::vector< Vertex* >& vces,
VertexPropertyMap& vpm)
@@ -161,7 +161,7 @@ reset_ring_indices(std::vector< Vertex* >& vces,
}
-template <class TPoly, class VertexPropertyMap>
+template<class TPoly, class VertexPropertyMap>
void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
collect_i_rings(Vertex* v,
int ring_i,
@@ -192,7 +192,7 @@ collect_i_rings(Vertex* v,
}
-template <class TPoly, class VertexPropertyMap>
+template<class TPoly, class VertexPropertyMap>
void T_PolyhedralSurf_rings <TPoly, VertexPropertyMap>::
collect_enough_rings(Vertex* v,
unsigned int min_nb,
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
index 01bd647b8acb1a2e2c0d80295169e7a71125532f..b18b2892cb8205db1ea80f0b522aa74aa8e3351e 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::scalar Foam::dynamicIndexedOctree<Type>::perturbTol_ = 10*SMALL;
@@ -38,7 +38,7 @@ Foam::scalar Foam::dynamicIndexedOctree<Type>::perturbTol_ = 10*SMALL;
// Does bb intersect a sphere around sample? Or is any corner point of bb
// closer than nearestDistSqr to sample.
-template <class Type>
+template<class Type>
bool Foam::dynamicIndexedOctree<Type>::overlaps
(
const point& p0,
@@ -82,7 +82,7 @@ bool Foam::dynamicIndexedOctree<Type>::overlaps
// Does bb intersect a sphere around sample? Or is any corner point of bb
// closer than nearestDistSqr to sample.
-template <class Type>
+template<class Type>
bool Foam::dynamicIndexedOctree<Type>::overlaps
(
const treeBoundBox& parentBb,
@@ -145,7 +145,7 @@ bool Foam::dynamicIndexedOctree<Type>::overlaps
//
// Split list of indices into 8 bins
-template <class Type>
+template<class Type>
void Foam::dynamicIndexedOctree<Type>::divide
(
const autoPtr<DynamicList<label> >& indices,
@@ -187,7 +187,7 @@ void Foam::dynamicIndexedOctree<Type>::divide
// Subdivide the (content) node.
-template <class Type>
+template<class Type>
typename Foam::dynamicIndexedOctree<Type>::node
Foam::dynamicIndexedOctree<Type>::divide
(
@@ -280,7 +280,7 @@ Foam::dynamicIndexedOctree<Type>::divide
}
-template <class Type>
+template<class Type>
void Foam::dynamicIndexedOctree<Type>::recursiveSubDivision
(
const treeBoundBox& subBb,
@@ -333,7 +333,7 @@ void Foam::dynamicIndexedOctree<Type>::recursiveSubDivision
// Pre-calculates wherever possible the volume status per node/subnode.
// Recurses to determine status of lowest level boxes. Level above is
// combination of octants below.
-template <class Type>
+template<class Type>
typename Foam::dynamicIndexedOctree<Type>::volumeType
Foam::dynamicIndexedOctree<Type>::calcVolumeType
(
@@ -391,7 +391,7 @@ Foam::dynamicIndexedOctree<Type>::calcVolumeType
}
-template <class Type>
+template<class Type>
typename Foam::dynamicIndexedOctree<Type>::volumeType
Foam::dynamicIndexedOctree<Type>::getVolumeType
(
@@ -467,7 +467,7 @@ Foam::dynamicIndexedOctree<Type>::getVolumeType
}
-template <class Type>
+template<class Type>
typename Foam::dynamicIndexedOctree<Type>::volumeType
Foam::dynamicIndexedOctree<Type>::getSide
(
@@ -492,7 +492,7 @@ Foam::dynamicIndexedOctree<Type>::getSide
//
// Find nearest point starting from nodeI
-template <class Type>
+template<class Type>
void Foam::dynamicIndexedOctree<Type>::findNearest
(
const label nodeI,
@@ -564,7 +564,7 @@ void Foam::dynamicIndexedOctree<Type>::findNearest
// Find nearest point to line.
-template <class Type>
+template<class Type>
void Foam::dynamicIndexedOctree<Type>::findNearest
(
const label nodeI,
@@ -630,7 +630,7 @@ void Foam::dynamicIndexedOctree<Type>::findNearest
}
-template <class Type>
+template<class Type>
Foam::treeBoundBox Foam::dynamicIndexedOctree<Type>::subBbox
(
const label parentNodeI,
@@ -656,7 +656,7 @@ Foam::treeBoundBox Foam::dynamicIndexedOctree<Type>::subBbox
// Takes a bb and a point on/close to the edge of the bb and pushes the point
// inside by a small fraction.
-template <class Type>
+template<class Type>
Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
(
const treeBoundBox& bb,
@@ -727,7 +727,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
// Takes a bb and a point on the edge of the bb and pushes the point
// outside by a small fraction.
-template <class Type>
+template<class Type>
Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
(
const treeBoundBox& bb,
@@ -840,7 +840,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPoint
// Guarantees that if pt is on a face it gets perturbed so it is away
// from the face edges.
// If pt is not on a face does nothing.
-template <class Type>
+template<class Type>
Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
(
const treeBoundBox& bb,
@@ -1000,7 +1000,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
//// Takes a bb and a point on the outside of the bb. Checks if on multiple
// faces
//// and if so perturbs point so it is only on one face.
-//template <class Type>
+//template<class Type>
//void Foam::dynamicIndexedOctree<Type>::checkMultipleFaces
//(
// const treeBoundBox& bb,
@@ -1196,7 +1196,7 @@ Foam::point Foam::dynamicIndexedOctree<Type>::pushPointIntoFace
// Get parent node and octant. Return false if top of tree reached.
-template <class Type>
+template<class Type>
bool Foam::dynamicIndexedOctree<Type>::walkToParent
(
const label nodeI,
@@ -1246,7 +1246,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToParent
// node and octant in this node and walks in the direction given by
// the facePointBits (combination of treeBoundBox::LEFTBIT, TOPBIT etc.)
// Returns false if edge of tree hit.
-template <class Type>
+template<class Type>
bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour
(
const point& facePoint,
@@ -1484,7 +1484,7 @@ bool Foam::dynamicIndexedOctree<Type>::walkToNeighbour
}
-template <class Type>
+template<class Type>
Foam::word Foam::dynamicIndexedOctree<Type>::faceString
(
const direction faceID
@@ -1536,7 +1536,7 @@ Foam::word Foam::dynamicIndexedOctree<Type>::faceString
// Else return a miss and the bounding box face hit:
// hitInfo.point = coordinate of intersection of ray with bounding box
// hitBits = posbits of point on bounding box
-template <class Type>
+template<class Type>
void Foam::dynamicIndexedOctree<Type>::traverseNode
(
const bool findAny,
@@ -1699,7 +1699,7 @@ void Foam::dynamicIndexedOctree<Type>::traverseNode
// Find first intersection
-template <class Type>
+template<class Type>
Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
(
const bool findAny,
@@ -1887,7 +1887,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
// Find first intersection
-template <class Type>
+template<class Type>
Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
(
const bool findAny,
@@ -1958,7 +1958,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
}
-template <class Type>
+template<class Type>
void Foam::dynamicIndexedOctree<Type>::findBox
(
const label nodeI,
@@ -2005,7 +2005,7 @@ void Foam::dynamicIndexedOctree<Type>::findBox
}
-template <class Type>
+template<class Type>
void Foam::dynamicIndexedOctree<Type>::findSphere
(
const label nodeI,
@@ -2053,8 +2053,8 @@ void Foam::dynamicIndexedOctree<Type>::findSphere
}
-template <class Type>
-template <class CompareOp>
+template<class Type>
+template<class CompareOp>
void Foam::dynamicIndexedOctree<Type>::findNear
(
const scalar nearDist,
@@ -2228,7 +2228,7 @@ void Foam::dynamicIndexedOctree<Type>::findNear
// Number of elements in node.
-template <class Type>
+template<class Type>
Foam::label Foam::dynamicIndexedOctree<Type>::countElements
(
const labelBits index
@@ -2261,7 +2261,7 @@ Foam::label Foam::dynamicIndexedOctree<Type>::countElements
}
-template <class Type>
+template<class Type>
void Foam::dynamicIndexedOctree<Type>::writeOBJ
(
const label nodeI,
@@ -2310,7 +2310,7 @@ void Foam::dynamicIndexedOctree<Type>::writeOBJ
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::dynamicIndexedOctree<Type>::dynamicIndexedOctree
(
const Type& shapes,
@@ -2347,14 +2347,14 @@ Foam::dynamicIndexedOctree<Type>::dynamicIndexedOctree
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::scalar& Foam::dynamicIndexedOctree<Type>::perturbTol()
{
return perturbTol_;
}
-template <class Type>
+template<class Type>
Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findNearest
(
const point& sample,
@@ -2382,7 +2382,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findNearest
}
-template <class Type>
+template<class Type>
Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findNearest
(
const linePointRef& ln,
@@ -2416,7 +2416,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findNearest
// Find nearest intersection
-template <class Type>
+template<class Type>
Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
(
const point& start,
@@ -2428,7 +2428,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLine
// Find nearest intersection
-template <class Type>
+template<class Type>
Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLineAny
(
const point& start,
@@ -2439,7 +2439,7 @@ Foam::pointIndexHit Foam::dynamicIndexedOctree<Type>::findLineAny
}
-template <class Type>
+template<class Type>
Foam::labelList Foam::dynamicIndexedOctree<Type>::findBox
(
const treeBoundBox& searchBox
@@ -2457,7 +2457,7 @@ Foam::labelList Foam::dynamicIndexedOctree<Type>::findBox
}
-template <class Type>
+template<class Type>
Foam::labelList Foam::dynamicIndexedOctree<Type>::findSphere
(
const point& centre,
@@ -2477,7 +2477,7 @@ Foam::labelList Foam::dynamicIndexedOctree<Type>::findSphere
// Find node (as parent+octant) containing point
-template <class Type>
+template<class Type>
Foam::labelBits Foam::dynamicIndexedOctree<Type>::findNode
(
const label nodeI,
@@ -2524,7 +2524,7 @@ Foam::labelBits Foam::dynamicIndexedOctree<Type>::findNode
}
-template <class Type>
+template<class Type>
Foam::label Foam::dynamicIndexedOctree<Type>::findInside
(
const point& sample
@@ -2556,7 +2556,7 @@ Foam::label Foam::dynamicIndexedOctree<Type>::findInside
}
-template <class Type>
+template<class Type>
const Foam::labelList& Foam::dynamicIndexedOctree<Type>::findIndices
(
const point& sample
@@ -2581,7 +2581,7 @@ const Foam::labelList& Foam::dynamicIndexedOctree<Type>::findIndices
// Determine type (inside/outside/mixed) per node.
-template <class Type>
+template<class Type>
typename Foam::dynamicIndexedOctree<Type>::volumeType
Foam::dynamicIndexedOctree<Type>::getVolumeType
(
@@ -2651,8 +2651,8 @@ Foam::dynamicIndexedOctree<Type>::getVolumeType
}
-template <class Type>
-template <class CompareOp>
+template<class Type>
+template<class CompareOp>
void Foam::dynamicIndexedOctree<Type>::findNear
(
const scalar nearDist,
@@ -2675,7 +2675,7 @@ void Foam::dynamicIndexedOctree<Type>::findNear
}
-template <class Type>
+template<class Type>
bool Foam::dynamicIndexedOctree<Type>::insert(label startIndex, label endIndex)
{
if (startIndex == endIndex)
@@ -2721,7 +2721,7 @@ bool Foam::dynamicIndexedOctree<Type>::insert(label startIndex, label endIndex)
}
-template <class Type>
+template<class Type>
bool Foam::dynamicIndexedOctree<Type>::insertIndex
(
const label nodIndex,
@@ -2798,7 +2798,7 @@ bool Foam::dynamicIndexedOctree<Type>::insertIndex
}
-template <class Type>
+template<class Type>
bool Foam::dynamicIndexedOctree<Type>::remove(const label index)
{
if (nodes_.empty())
@@ -2812,7 +2812,7 @@ bool Foam::dynamicIndexedOctree<Type>::remove(const label index)
}
-template <class Type>
+template<class Type>
Foam::label Foam::dynamicIndexedOctree<Type>::removeIndex
(
const label nodIndex,
@@ -2896,7 +2896,7 @@ Foam::label Foam::dynamicIndexedOctree<Type>::removeIndex
// Print contents of nodeI
-template <class Type>
+template<class Type>
void Foam::dynamicIndexedOctree<Type>::print
(
prefixOSstream& os,
@@ -2969,7 +2969,7 @@ void Foam::dynamicIndexedOctree<Type>::print
}
-template <class Type>
+template<class Type>
void Foam::dynamicIndexedOctree<Type>::writeTreeInfo() const
{
label nEntries = 0;
@@ -2996,7 +2996,7 @@ void Foam::dynamicIndexedOctree<Type>::writeTreeInfo() const
// Print contents of nodeI
-template <class Type>
+template<class Type>
bool Foam::dynamicIndexedOctree<Type>::write(Ostream& os) const
{
os << *this;
@@ -3005,7 +3005,7 @@ bool Foam::dynamicIndexedOctree<Type>::write(Ostream& os) const
}
-template <class Type>
+template<class Type>
Foam::Ostream&
Foam::operator<<(Ostream& os, const dynamicIndexedOctree<Type>& t)
{
diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
index 7309af83e1dfbeb4f84b0eeca5d9c57b933df44d..0bbf7a0e2ea76808020ba80aa74af13abb807eec 100644
--- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
+++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -74,7 +74,7 @@ TemplateName(dynamicIndexedOctree);
Class dynamicIndexedOctree Declaration
\*---------------------------------------------------------------------------*/
-template <class Type>
+template<class Type>
class dynamicIndexedOctree
:
public dynamicIndexedOctreeName
@@ -372,7 +372,7 @@ private:
) const;
- template <class CompareOp>
+ template<class CompareOp>
static void findNear
(
const scalar nearDist,
@@ -632,7 +632,7 @@ public:
//- Find near pairs and apply CompareOp to them.
// tree2 can be *this or different tree.
- template <class CompareOp>
+ template<class CompareOp>
void findNear
(
const scalar nearDist,
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
index df8fc2aec14ab378d81e1e8c16fbbe57bb8f5461..83ac739941284b74848944396492962e4d5f5964 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::scalar Foam::indexedOctree<Type>::perturbTol_ = 10*SMALL;
@@ -38,7 +38,7 @@ Foam::scalar Foam::indexedOctree<Type>::perturbTol_ = 10*SMALL;
// Does bb intersect a sphere around sample? Or is any corner point of bb
// closer than nearestDistSqr to sample.
-template <class Type>
+template<class Type>
bool Foam::indexedOctree<Type>::overlaps
(
const point& p0,
@@ -55,7 +55,7 @@ bool Foam::indexedOctree<Type>::overlaps
// Does bb intersect a sphere around sample? Or is any corner point of bb
// closer than nearestDistSqr to sample.
-template <class Type>
+template<class Type>
bool Foam::indexedOctree<Type>::overlaps
(
const treeBoundBox& parentBb,
@@ -118,7 +118,7 @@ bool Foam::indexedOctree<Type>::overlaps
//
// Split list of indices into 8 bins
-template <class Type>
+template<class Type>
void Foam::indexedOctree<Type>::divide
(
const labelList& indices,
@@ -161,7 +161,7 @@ void Foam::indexedOctree<Type>::divide
// Subdivide the (content) node.
-template <class Type>
+template<class Type>
typename Foam::indexedOctree<Type>::node
Foam::indexedOctree<Type>::divide
(
@@ -231,7 +231,7 @@ Foam::indexedOctree<Type>::divide
// Split any contents node with more than minSize elements.
-template <class Type>
+template<class Type>
void Foam::indexedOctree<Type>::splitNodes
(
const label minSize,
@@ -285,7 +285,7 @@ void Foam::indexedOctree<Type>::splitNodes
// Reorder contents to be in same order as nodes. Returns number of nodes on
// the compactLevel.
-template <class Type>
+template<class Type>
Foam::label Foam::indexedOctree<Type>::compactContents
(
DynamicList<node>& nodes,
@@ -355,7 +355,7 @@ Foam::label Foam::indexedOctree<Type>::compactContents
// Pre-calculates wherever possible the volume status per node/subnode.
// Recurses to determine status of lowest level boxes. Level above is
// combination of octants below.
-template <class Type>
+template<class Type>
typename Foam::indexedOctree<Type>::volumeType
Foam::indexedOctree<Type>::calcVolumeType
(
@@ -413,7 +413,7 @@ Foam::indexedOctree<Type>::calcVolumeType
}
-template <class Type>
+template<class Type>
typename Foam::indexedOctree<Type>::volumeType
Foam::indexedOctree<Type>::getVolumeType
(
@@ -489,7 +489,7 @@ Foam::indexedOctree<Type>::getVolumeType
}
-template <class Type>
+template<class Type>
typename Foam::indexedOctree<Type>::volumeType
Foam::indexedOctree<Type>::getSide
(
@@ -514,7 +514,7 @@ Foam::indexedOctree<Type>::getSide
//
-//template <class Type>
+//template<class Type>
//bool Foam::indexedOctree<Type>::findAnyOverlap
//(
// const label nodeI,
@@ -575,7 +575,7 @@ Foam::indexedOctree<Type>::getSide
// Find nearest point starting from nodeI
-template <class Type>
+template<class Type>
void Foam::indexedOctree<Type>::findNearest
(
const label nodeI,
@@ -647,7 +647,7 @@ void Foam::indexedOctree<Type>::findNearest
// Find nearest point to line.
-template <class Type>
+template<class Type>
void Foam::indexedOctree<Type>::findNearest
(
const label nodeI,
@@ -713,7 +713,7 @@ void Foam::indexedOctree<Type>::findNearest
}
-template <class Type>
+template<class Type>
Foam::treeBoundBox Foam::indexedOctree<Type>::subBbox
(
const label parentNodeI,
@@ -739,7 +739,7 @@ Foam::treeBoundBox Foam::indexedOctree<Type>::subBbox
// Takes a bb and a point on/close to the edge of the bb and pushes the point
// inside by a small fraction.
-template <class Type>
+template<class Type>
Foam::point Foam::indexedOctree<Type>::pushPoint
(
const treeBoundBox& bb,
@@ -810,7 +810,7 @@ Foam::point Foam::indexedOctree<Type>::pushPoint
// Takes a bb and a point on the edge of the bb and pushes the point
// outside by a small fraction.
-template <class Type>
+template<class Type>
Foam::point Foam::indexedOctree<Type>::pushPoint
(
const treeBoundBox& bb,
@@ -923,7 +923,7 @@ Foam::point Foam::indexedOctree<Type>::pushPoint
// Guarantees that if pt is on a face it gets perturbed so it is away
// from the face edges.
// If pt is not on a face does nothing.
-template <class Type>
+template<class Type>
Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
(
const treeBoundBox& bb,
@@ -1083,7 +1083,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
//// Takes a bb and a point on the outside of the bb. Checks if on multiple
// faces
//// and if so perturbs point so it is only on one face.
-//template <class Type>
+//template<class Type>
//void Foam::indexedOctree<Type>::checkMultipleFaces
//(
// const treeBoundBox& bb,
@@ -1279,7 +1279,7 @@ Foam::point Foam::indexedOctree<Type>::pushPointIntoFace
// Get parent node and octant. Return false if top of tree reached.
-template <class Type>
+template<class Type>
bool Foam::indexedOctree<Type>::walkToParent
(
const label nodeI,
@@ -1329,7 +1329,7 @@ bool Foam::indexedOctree<Type>::walkToParent
// node and octant in this node and walks in the direction given by
// the facePointBits (combination of treeBoundBox::LEFTBIT, TOPBIT etc.)
// Returns false if edge of tree hit.
-template <class Type>
+template<class Type>
bool Foam::indexedOctree<Type>::walkToNeighbour
(
const point& facePoint,
@@ -1567,7 +1567,7 @@ bool Foam::indexedOctree<Type>::walkToNeighbour
}
-template <class Type>
+template<class Type>
Foam::word Foam::indexedOctree<Type>::faceString
(
const direction faceID
@@ -1619,7 +1619,7 @@ Foam::word Foam::indexedOctree<Type>::faceString
// Else return a miss and the bounding box face hit:
// hitInfo.point = coordinate of intersection of ray with bounding box
// hitBits = posbits of point on bounding box
-template <class Type>
+template<class Type>
void Foam::indexedOctree<Type>::traverseNode
(
const bool findAny,
@@ -1781,7 +1781,7 @@ void Foam::indexedOctree<Type>::traverseNode
// Find first intersection
-template <class Type>
+template<class Type>
Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
(
const bool findAny,
@@ -1973,7 +1973,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
}
-//template <class Type>
+//template<class Type>
//bool Foam::indexedOctree<Type>::isLineInsideOrOutside
//(
// const label nodeI,
@@ -2006,7 +2006,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
// Find first intersection
-template <class Type>
+template<class Type>
Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
(
const bool findAny,
@@ -2077,7 +2077,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
}
-template <class Type>
+template<class Type>
void Foam::indexedOctree<Type>::findBox
(
const label nodeI,
@@ -2124,7 +2124,7 @@ void Foam::indexedOctree<Type>::findBox
}
-template <class Type>
+template<class Type>
void Foam::indexedOctree<Type>::findSphere
(
const label nodeI,
@@ -2172,8 +2172,8 @@ void Foam::indexedOctree<Type>::findSphere
}
-template <class Type>
-template <class CompareOp>
+template<class Type>
+template<class CompareOp>
void Foam::indexedOctree<Type>::findNear
(
const scalar nearDist,
@@ -2347,7 +2347,7 @@ void Foam::indexedOctree<Type>::findNear
// Number of elements in node.
-template <class Type>
+template<class Type>
Foam::label Foam::indexedOctree<Type>::countElements
(
const labelBits index
@@ -2380,7 +2380,7 @@ Foam::label Foam::indexedOctree<Type>::countElements
}
-template <class Type>
+template<class Type>
void Foam::indexedOctree<Type>::writeOBJ
(
const label nodeI,
@@ -2429,7 +2429,7 @@ void Foam::indexedOctree<Type>::writeOBJ
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::indexedOctree<Type>::indexedOctree(const Type& shapes)
:
shapes_(shapes),
@@ -2439,7 +2439,7 @@ Foam::indexedOctree<Type>::indexedOctree(const Type& shapes)
{}
-template <class Type>
+template<class Type>
Foam::indexedOctree<Type>::indexedOctree
(
const Type& shapes,
@@ -2454,7 +2454,7 @@ Foam::indexedOctree<Type>::indexedOctree
{}
-template <class Type>
+template<class Type>
Foam::indexedOctree<Type>::indexedOctree
(
const Type& shapes,
@@ -2606,7 +2606,7 @@ Foam::indexedOctree<Type>::indexedOctree
}
-template <class Type>
+template<class Type>
Foam::indexedOctree<Type>::indexedOctree
(
const Type& shapes,
@@ -2622,14 +2622,14 @@ Foam::indexedOctree<Type>::indexedOctree
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::scalar& Foam::indexedOctree<Type>::perturbTol()
{
return perturbTol_;
}
-//template <class Type>
+//template<class Type>
//bool Foam::indexedOctree<Type>::findAnyOverlap
//(
// const point& sample,
@@ -2650,7 +2650,7 @@ Foam::scalar& Foam::indexedOctree<Type>::perturbTol()
//}
-template <class Type>
+template<class Type>
Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
(
const point& sample,
@@ -2678,7 +2678,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
}
-template <class Type>
+template<class Type>
Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
(
const linePointRef& ln,
@@ -2708,7 +2708,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findNearest
// Find nearest intersection
-template <class Type>
+template<class Type>
Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
(
const point& start,
@@ -2720,7 +2720,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLine
// Find nearest intersection
-template <class Type>
+template<class Type>
Foam::pointIndexHit Foam::indexedOctree<Type>::findLineAny
(
const point& start,
@@ -2731,7 +2731,7 @@ Foam::pointIndexHit Foam::indexedOctree<Type>::findLineAny
}
-template <class Type>
+template<class Type>
Foam::labelList Foam::indexedOctree<Type>::findBox
(
const treeBoundBox& searchBox
@@ -2749,7 +2749,7 @@ Foam::labelList Foam::indexedOctree<Type>::findBox
}
-template <class Type>
+template<class Type>
Foam::labelList Foam::indexedOctree<Type>::findSphere
(
const point& centre,
@@ -2769,7 +2769,7 @@ Foam::labelList Foam::indexedOctree<Type>::findSphere
// Find node (as parent+octant) containing point
-template <class Type>
+template<class Type>
Foam::labelBits Foam::indexedOctree<Type>::findNode
(
const label nodeI,
@@ -2816,7 +2816,7 @@ Foam::labelBits Foam::indexedOctree<Type>::findNode
}
-template <class Type>
+template<class Type>
Foam::label Foam::indexedOctree<Type>::findInside(const point& sample) const
{
labelBits index = findNode(0, sample);
@@ -2845,7 +2845,7 @@ Foam::label Foam::indexedOctree<Type>::findInside(const point& sample) const
}
-template <class Type>
+template<class Type>
const Foam::labelList& Foam::indexedOctree<Type>::findIndices
(
const point& sample
@@ -2870,7 +2870,7 @@ const Foam::labelList& Foam::indexedOctree<Type>::findIndices
// Determine type (inside/outside/mixed) per node.
-template <class Type>
+template<class Type>
typename Foam::indexedOctree<Type>::volumeType
Foam::indexedOctree<Type>::getVolumeType
(
@@ -2940,8 +2940,8 @@ Foam::indexedOctree<Type>::getVolumeType
}
-template <class Type>
-template <class CompareOp>
+template<class Type>
+template<class CompareOp>
void Foam::indexedOctree<Type>::findNear
(
const scalar nearDist,
@@ -2965,7 +2965,7 @@ void Foam::indexedOctree<Type>::findNear
// Print contents of nodeI
-template <class Type>
+template<class Type>
void Foam::indexedOctree<Type>::print
(
prefixOSstream& os,
@@ -3039,7 +3039,7 @@ void Foam::indexedOctree<Type>::print
// Print contents of nodeI
-template <class Type>
+template<class Type>
bool Foam::indexedOctree<Type>::write(Ostream& os) const
{
os << *this;
@@ -3048,7 +3048,7 @@ bool Foam::indexedOctree<Type>::write(Ostream& os) const
}
-template <class Type>
+template<class Type>
Foam::Ostream& Foam::operator<<(Ostream& os, const indexedOctree<Type>& t)
{
return
diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
index e945d5d7663359a736bfb60ff9e58316538235c7..6a5c56ac7bb2d7f7900677668d274beeffba177e 100644
--- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
+++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -65,7 +65,7 @@ TemplateName(indexedOctree);
Class indexedOctree Declaration
\*---------------------------------------------------------------------------*/
-template <class Type>
+template<class Type>
class indexedOctree
:
public indexedOctreeName
@@ -354,7 +354,7 @@ private:
) const;
- template <class CompareOp>
+ template<class CompareOp>
static void findNear
(
const scalar nearDist,
@@ -640,7 +640,7 @@ public:
//- Find near pairs and apply CompareOp to them.
// tree2 can be *this or different tree.
- template <class CompareOp>
+ template<class CompareOp>
void findNear
(
const scalar nearDist,
diff --git a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
index 5afae8895fb10cac100b0cd1ac327d7a06ab83fa..89f0969826a8381b0e487911bad6401a2640f083 100644
--- a/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
+++ b/src/OpenFOAM/containers/Lists/Distribution/Distribution.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -583,7 +583,7 @@ void Foam::Distribution<Type>::operator=
// * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::Istream& Foam::operator>>
(
Istream& is,
@@ -621,7 +621,7 @@ Foam::Ostream& Foam::operator<<
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::Distribution<Type> Foam::operator+
(
const Distribution<Type>& d1,
diff --git a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C
index d83b4a9f3af4bb1f244f16d74b3f684392cc7fee..55c5eb9ce4df562c254f833996647c408a84e55f 100644
--- a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C
+++ b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ namespace Foam
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class AccessType, class T, class AccessOp>
+template<class AccessType, class T, class AccessOp>
AccessType ListListOps::combine(const List<T>& lst, AccessOp aop)
{
label sum = 0;
@@ -57,7 +57,7 @@ AccessType ListListOps::combine(const List<T>& lst, AccessOp aop)
}
-template <class T, class AccessOp>
+template<class T, class AccessOp>
labelList ListListOps::subSizes(const List<T>& lst, AccessOp aop)
{
labelList sizes(lst.size());
@@ -70,7 +70,7 @@ labelList ListListOps::subSizes(const List<T>& lst, AccessOp aop)
}
-template <class AccessType, class T, class AccessOp, class OffsetOp>
+template<class AccessType, class T, class AccessOp, class OffsetOp>
AccessType ListListOps::combineOffset
(
const List<T>& lst,
diff --git a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
index 05cef4a723bad9d8c03d0871d2cd9b9a2a30a05a..02afe8abf338bef11254f94a1b8b1aca816052b0 100644
--- a/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListListOps/ListListOps.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -94,7 +94,7 @@ namespace Foam
{
// Dummy access operator for ListListOps::combine()
-template <class T>
+template<class T>
class accessOp
{
public:
@@ -107,7 +107,7 @@ public:
// Offset operator for ListListOps::combineOffset()
-template <class T>
+template<class T>
class offsetOp
{
public:
@@ -126,15 +126,15 @@ namespace ListListOps
{
//- Combines sublists into one big list
- template <class AccessType, class T, class AccessOp>
+ template<class AccessType, class T, class AccessOp>
AccessType combine(const List<T>&, AccessOp aop = accessOp<T>());
//- Gets sizes of sublists
- template <class T, class AccessOp>
+ template<class T, class AccessOp>
labelList subSizes(const List<T>&, AccessOp aop = accessOp<T>());
//- Like combine but also offsets sublists based on passed sizes
- template <class AccessType, class T, class AccessOp, class OffsetOp>
+ template<class AccessType, class T, class AccessOp, class OffsetOp>
AccessType combineOffset
(
const List<T>&,
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index 8da376020d4c38e602582c47ab539562ec318fdb..f878a6f969deba67665afa3aab561d7a2426448f 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -255,23 +255,23 @@ public:
//- Reverse a list. First element becomes last element etc.
-template <class ListType>
+template<class ListType>
ListType reverseList(const ListType& list);
//- Inplace reversal of a list using Swap.
-template <class ListType>
+template<class ListType>
void inplaceReverseList(ListType& list);
//- Rotate a list by n places. If n is positive rotate clockwise/right/down.
// If n is negative rotate anti-clockwise/left/up.
-template <class ListType>
+template<class ListType>
ListType rotateList(const ListType& list, const label n);
//- Inplace reversal of a list using the Reversal Block Swapping algorithm.
-template <template <typename> class ListType, class DataType>
+template<template<typename> class ListType, class DataType>
void inplaceRotateList(ListType<DataType>& list, label n);
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index d55e3fd982abd8176162b66e40b72a118a8387c1..ab6f9bf511e90a28abee4852d5e1d0ee4a40a53e 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -706,7 +706,7 @@ void Foam::ListAppendEqOp<T>::operator()(List<T>& x, const List<T>& y) const
}
-template <class ListType>
+template<class ListType>
ListType Foam::reverseList(const ListType& list)
{
const label listSize = list.size();
@@ -723,7 +723,7 @@ ListType Foam::reverseList(const ListType& list)
}
-template <class ListType>
+template<class ListType>
void Foam::inplaceReverseList(ListType& list)
{
const label listSize = list.size();
@@ -740,7 +740,7 @@ void Foam::inplaceReverseList(ListType& list)
}
-template <class ListType>
+template<class ListType>
ListType Foam::rotateList(const ListType& list, const label n)
{
const label listSize = list.size();
@@ -763,7 +763,7 @@ ListType Foam::rotateList(const ListType& list, const label n)
}
-template <template <typename> class ListType, class DataType>
+template<template<typename> class ListType, class DataType>
void Foam::inplaceRotateList(ListType<DataType>& list, label n)
{
const label listSize = list.size();
diff --git a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C
index 64deb50c490eba4b5d636a919cf54dbbf04ca492..ef9e71ffc209a1cc79847df2d3d0fd8ad729fe9a 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C
+++ b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-template <class Type>
+template<class Type>
void Foam::ParSortableList<Type>::write
(
const List<Type>& elems,
@@ -49,7 +49,7 @@ void Foam::ParSortableList<Type>::write
// Copy src, starting at destI into dest.
-template <class Type>
+template<class Type>
void Foam::ParSortableList<Type>::copyInto
(
const List<Type>& values,
@@ -72,7 +72,7 @@ void Foam::ParSortableList<Type>::copyInto
}
-template <class Type>
+template<class Type>
void Foam::ParSortableList<Type>::getPivots
(
const List<Type>& elems,
@@ -92,7 +92,7 @@ void Foam::ParSortableList<Type>::getPivots
}
-template <class Type>
+template<class Type>
void Foam::ParSortableList<Type>::checkAndSend
(
List<Type>& values,
@@ -123,7 +123,7 @@ void Foam::ParSortableList<Type>::checkAndSend
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from List, sorting the elements
-template <class Type>
+template<class Type>
Foam::ParSortableList<Type>::ParSortableList(const UList<Type>& values)
:
List<Type>(values),
@@ -135,7 +135,7 @@ Foam::ParSortableList<Type>::ParSortableList(const UList<Type>& values)
// Construct given size. Sort later on.
-template <class Type>
+template<class Type>
Foam::ParSortableList<Type>::ParSortableList(const label size)
:
List<Type>(size),
@@ -147,7 +147,7 @@ Foam::ParSortableList<Type>::ParSortableList(const label size)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// Sort
-template <class Type>
+template<class Type>
void Foam::ParSortableList<Type>::sort()
{
//
diff --git a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H
index 67966e5004050bf44517564bd6f3705df15266b5..c528d94d86bcea09511212a4f9f7929d748a1473 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H
+++ b/src/OpenFOAM/containers/Lists/SortableList/ParSortableList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -66,7 +66,7 @@ TemplateName(ParSortableList);
Class ParSortableList Declaration
\*---------------------------------------------------------------------------*/
-template <class Type>
+template<class Type>
class ParSortableList
:
public ParSortableListName,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
index 9f39306ccce019c735a34c1a0d382816ce38e96e..c26e0d77e06e05503dddb06ba2bf699a52d8a2ca 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -92,7 +92,7 @@ public:
//- Gather data. Apply bop to combine Value
// from different processors
- template <class T, class BinaryOp>
+ template<class T, class BinaryOp>
static void gather
(
const List<commsStruct>& comms,
@@ -102,7 +102,7 @@ public:
);
//- Like above but switches between linear/tree communication
- template <class T, class BinaryOp>
+ template<class T, class BinaryOp>
static void gather
(
T& Value,
@@ -111,7 +111,7 @@ public:
);
//- Scatter data. Distribute without modification. Reverse of gather
- template <class T>
+ template<class T>
static void scatter
(
const List<commsStruct>& comms,
@@ -120,14 +120,14 @@ public:
);
//- Like above but switches between linear/tree communication
- template <class T>
+ template<class T>
static void scatter(T& Value, const int tag = Pstream::msgType());
// Combine variants. Inplace combine values from processors.
// (Uses construct from Istream instead of <<)
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void combineGather
(
const List<commsStruct>& comms,
@@ -137,7 +137,7 @@ public:
);
//- Like above but switches between linear/tree communication
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void combineGather
(
T& Value,
@@ -146,7 +146,7 @@ public:
);
//- Scatter data. Reverse of combineGather
- template <class T>
+ template<class T>
static void combineScatter
(
const List<commsStruct>& comms,
@@ -155,7 +155,7 @@ public:
);
//- Like above but switches between linear/tree communication
- template <class T>
+ template<class T>
static void combineScatter
(
T& Value,
@@ -164,7 +164,7 @@ public:
// Combine variants working on whole List at a time.
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void listCombineGather
(
const List<commsStruct>& comms,
@@ -174,7 +174,7 @@ public:
);
//- Like above but switches between linear/tree communication
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void listCombineGather
(
List<T>& Value,
@@ -183,7 +183,7 @@ public:
);
//- Scatter data. Reverse of combineGather
- template <class T>
+ template<class T>
static void listCombineScatter
(
const List<commsStruct>& comms,
@@ -192,7 +192,7 @@ public:
);
//- Like above but switches between linear/tree communication
- template <class T>
+ template<class T>
static void listCombineScatter
(
List<T>& Value,
@@ -202,7 +202,7 @@ public:
// Combine variants working on whole map at a time. Container needs to
// have iterators and find() defined.
- template <class Container, class CombineOp>
+ template<class Container, class CombineOp>
static void mapCombineGather
(
const List<commsStruct>& comms,
@@ -212,7 +212,7 @@ public:
);
//- Like above but switches between linear/tree communication
- template <class Container, class CombineOp>
+ template<class Container, class CombineOp>
static void mapCombineGather
(
Container& Values,
@@ -221,7 +221,7 @@ public:
);
//- Scatter data. Reverse of combineGather
- template <class Container>
+ template<class Container>
static void mapCombineScatter
(
const List<commsStruct>& comms,
@@ -230,7 +230,7 @@ public:
);
//- Like above but switches between linear/tree communication
- template <class Container>
+ template<class Container>
static void mapCombineScatter
(
Container& Values,
@@ -244,7 +244,7 @@ public:
// Values[UPstream::myProcNo()] is the data for the current processor.
//- Gather data but keep individual values separate
- template <class T>
+ template<class T>
static void gatherList
(
const List<commsStruct>& comms,
@@ -253,7 +253,7 @@ public:
);
//- Like above but switches between linear/tree communication
- template <class T>
+ template<class T>
static void gatherList
(
List<T>& Values,
@@ -261,7 +261,7 @@ public:
);
//- Scatter data. Reverse of gatherList
- template <class T>
+ template<class T>
static void scatterList
(
const List<commsStruct>& comms,
@@ -270,7 +270,7 @@ public:
);
//- Like above but switches between linear/tree communication
- template <class T>
+ template<class T>
static void scatterList
(
List<T>& Values,
@@ -284,7 +284,7 @@ public:
// sizes (not bytes). sizes[p0][p1] is what processor p0 has
// sent to p1. Continuous data only.
// If block=true will wait for all transfers to finish.
- template <class Container, class T>
+ template<class Container, class T>
static void exchange
(
const List<Container >&,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineReduceOps.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineReduceOps.H
index c657e0a140fcc8d19c5978f85b9184d8d252cf61..952ca399bda7e42025d0010623bc536906691a20 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineReduceOps.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamCombineReduceOps.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -47,7 +47,7 @@ namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-template <class T, class CombineOp>
+template<class T, class CombineOp>
void combineReduce
(
const List<UPstream::commsStruct>& comms,
@@ -61,7 +61,7 @@ void combineReduce
}
-template <class T, class CombineOp>
+template<class T, class CombineOp>
void combineReduce
(
T& Value,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
index 47c7c51acdd658e3fb223b2035dfd5b98ca68ae0..68269754ff07ac7cfe37c139edcefe6f69000016 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/PstreamReduceOps.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,7 +38,7 @@ namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Reduce operation with user specified communication schedule
-template <class T, class BinaryOp>
+template<class T, class BinaryOp>
void reduce
(
const List<UPstream::commsStruct>& comms,
@@ -53,7 +53,7 @@ void reduce
// Reduce using either linear or tree communication schedule
-template <class T, class BinaryOp>
+template<class T, class BinaryOp>
void reduce
(
T& Value,
@@ -73,7 +73,7 @@ void reduce
// Reduce using either linear or tree communication schedule
-template <class T, class BinaryOp>
+template<class T, class BinaryOp>
T returnReduce
(
const T& Value,
@@ -97,7 +97,7 @@ T returnReduce
// Reduce with sum of both value and count (for averaging)
-template <class T>
+template<class T>
void sumReduce
(
T& Value,
@@ -111,7 +111,7 @@ void sumReduce
// Non-blocking version of reduce. Sets request.
-template <class T, class BinaryOp>
+template<class T, class BinaryOp>
void reduce
(
T& Value,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C b/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
index fbe246f1eafecad46d51253f64e949c3aad52e63..3152cd242abe2f859d7d7865fda29e8527ea7dcd 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/combineGatherScatter.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -45,7 +45,7 @@ namespace Foam
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class T, class CombineOp>
+template<class T, class CombineOp>
void Pstream::combineGather
(
const List<UPstream::commsStruct>& comms,
@@ -129,7 +129,7 @@ void Pstream::combineGather
}
-template <class T, class CombineOp>
+template<class T, class CombineOp>
void Pstream::combineGather(T& Value, const CombineOp& cop, const int tag)
{
if (UPstream::nProcs() < UPstream::nProcsSimpleSum)
@@ -143,7 +143,7 @@ void Pstream::combineGather(T& Value, const CombineOp& cop, const int tag)
}
-template <class T>
+template<class T>
void Pstream::combineScatter
(
const List<UPstream::commsStruct>& comms,
@@ -214,7 +214,7 @@ void Pstream::combineScatter
}
-template <class T>
+template<class T>
void Pstream::combineScatter(T& Value, const int tag)
{
if (UPstream::nProcs() < UPstream::nProcsSimpleSum)
@@ -232,7 +232,7 @@ void Pstream::combineScatter(T& Value, const int tag)
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-template <class T, class CombineOp>
+template<class T, class CombineOp>
void Pstream::listCombineGather
(
const List<UPstream::commsStruct>& comms,
@@ -323,7 +323,7 @@ void Pstream::listCombineGather
}
-template <class T, class CombineOp>
+template<class T, class CombineOp>
void Pstream::listCombineGather
(
List<T>& Values,
@@ -342,7 +342,7 @@ void Pstream::listCombineGather
}
-template <class T>
+template<class T>
void Pstream::listCombineScatter
(
const List<UPstream::commsStruct>& comms,
@@ -413,7 +413,7 @@ void Pstream::listCombineScatter
}
-template <class T>
+template<class T>
void Pstream::listCombineScatter(List<T>& Values, const int tag)
{
if (UPstream::nProcs() < UPstream::nProcsSimpleSum)
@@ -433,7 +433,7 @@ void Pstream::listCombineScatter(List<T>& Values, const int tag)
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-template <class Container, class CombineOp>
+template<class Container, class CombineOp>
void Pstream::mapCombineGather
(
const List<UPstream::commsStruct>& comms,
@@ -499,7 +499,7 @@ void Pstream::mapCombineGather
}
-template <class Container, class CombineOp>
+template<class Container, class CombineOp>
void Pstream::mapCombineGather
(
Container& Values,
@@ -518,7 +518,7 @@ void Pstream::mapCombineGather
}
-template <class Container>
+template<class Container>
void Pstream::mapCombineScatter
(
const List<UPstream::commsStruct>& comms,
@@ -561,7 +561,7 @@ void Pstream::mapCombineScatter
}
-template <class Container>
+template<class Container>
void Pstream::mapCombineScatter(Container& Values, const int tag)
{
if (UPstream::nProcs() < UPstream::nProcsSimpleSum)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C b/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
index 48c166935a12b25f90c05148fadefbd5bd47e009..8c0cb4bbedc77c6e6a37fbcdfd5fe995e4523836 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/exchange.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,8 +38,8 @@ namespace Foam
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-//template <template<class> class ListType, class T>
-template <class Container, class T>
+//template<template<class> class ListType, class T>
+template<class Container, class T>
void Pstream::exchange
(
const List<Container>& sendBufs,
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
index 7065383d38c32e65c7cf9b6176e38fb125896609..33c7581f76070a8052e6ed5edf2083230b9388c3 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatter.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -42,7 +42,7 @@ namespace Foam
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class T, class BinaryOp>
+template<class T, class BinaryOp>
void Pstream::gather
(
const List<UPstream::commsStruct>& comms,
@@ -111,7 +111,7 @@ void Pstream::gather
}
-template <class T, class BinaryOp>
+template<class T, class BinaryOp>
void Pstream::gather(T& Value, const BinaryOp& bop, const int tag)
{
if (UPstream::nProcs() < UPstream::nProcsSimpleSum)
@@ -125,7 +125,7 @@ void Pstream::gather(T& Value, const BinaryOp& bop, const int tag)
}
-template <class T>
+template<class T>
void Pstream::scatter
(
const List<UPstream::commsStruct>& comms,
@@ -189,7 +189,7 @@ void Pstream::scatter
}
-template <class T>
+template<class T>
void Pstream::scatter(T& Value, const int tag)
{
if (UPstream::nProcs() < UPstream::nProcsSimpleSum)
diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
index b309ea7932106b4d52190f9265eeb28adacccb50..4e39bafda937ddc2f154d7e141cbfaca877ae306 100644
--- a/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
+++ b/src/OpenFOAM/db/IOstreams/Pstreams/gatherScatterList.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ namespace Foam
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class T>
+template<class T>
void Pstream::gatherList
(
const List<UPstream::commsStruct>& comms,
@@ -179,7 +179,7 @@ void Pstream::gatherList
}
-template <class T>
+template<class T>
void Pstream::gatherList(List<T>& Values, const int tag)
{
if (UPstream::nProcs() < UPstream::nProcsSimpleSum)
@@ -193,7 +193,7 @@ void Pstream::gatherList(List<T>& Values, const int tag)
}
-template <class T>
+template<class T>
void Pstream::scatterList
(
const List<UPstream::commsStruct>& comms,
@@ -307,7 +307,7 @@ void Pstream::scatterList
}
-template <class T>
+template<class T>
void Pstream::scatterList(List<T>& Values, const int tag)
{
if (UPstream::nProcs() < UPstream::nProcsSimpleSum)
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 73fea9fdd2c0b9cc4ce12b62223482cbfdc5c36b..b78fbed97a7d30f33d9a090006df708d66cd769a 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -34,7 +34,7 @@ namespace Foam
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
dimensioned<Type> dimensioned<Type>::lookupOrDefault
(
const word& name,
@@ -48,7 +48,7 @@ dimensioned<Type> dimensioned<Type>::lookupOrDefault
}
-template <class Type>
+template<class Type>
dimensioned<Type> dimensioned<Type>::lookupOrAddToDict
(
const word& name,
@@ -64,7 +64,7 @@ dimensioned<Type> dimensioned<Type>::lookupOrAddToDict
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
dimensioned<Type>::dimensioned
(
const word& name,
@@ -78,7 +78,7 @@ dimensioned<Type>::dimensioned
{}
-template <class Type>
+template<class Type>
dimensioned<Type>::dimensioned
(
const word& name,
@@ -91,7 +91,7 @@ dimensioned<Type>::dimensioned
{}
-template <class Type>
+template<class Type>
dimensioned<Type>::dimensioned
(
Istream& is
@@ -103,7 +103,7 @@ dimensioned<Type>::dimensioned
}
-template <class Type>
+template<class Type>
dimensioned<Type>::dimensioned
(
const word& name,
@@ -120,7 +120,7 @@ dimensioned<Type>::dimensioned
}
-template <class Type>
+template<class Type>
dimensioned<Type>::dimensioned
(
const word& name,
@@ -171,7 +171,7 @@ dimensioned<Type>::dimensioned
}
-template <class Type>
+template<class Type>
dimensioned<Type>::dimensioned
()
:
@@ -183,46 +183,46 @@ dimensioned<Type>::dimensioned
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
const word& dimensioned<Type>::name() const
{
return name_;
}
-template <class Type>
+template<class Type>
word& dimensioned<Type>::name()
{
return name_;
}
-template <class Type>
+template<class Type>
const dimensionSet& dimensioned<Type>::dimensions() const
{
return dimensions_;
}
-template <class Type>
+template<class Type>
dimensionSet& dimensioned<Type>::dimensions()
{
return dimensions_;
}
-template <class Type>
+template<class Type>
const Type& dimensioned<Type>::value() const
{
return value_;
}
-template <class Type>
+template<class Type>
Type& dimensioned<Type>::value()
{
return value_;
}
-template <class Type>
+template<class Type>
dimensioned<typename dimensioned<Type>::cmptType> dimensioned<Type>::component
(
const direction d
@@ -237,7 +237,7 @@ dimensioned<typename dimensioned<Type>::cmptType> dimensioned<Type>::component
}
-template <class Type>
+template<class Type>
void dimensioned<Type>::replace
(
const direction d,
@@ -249,14 +249,14 @@ void dimensioned<Type>::replace
}
-template <class Type>
+template<class Type>
bool dimensioned<Type>::readIfPresent(const dictionary& dict)
{
return dict.readIfPresent(name_, value_);
}
-template <class Type>
+template<class Type>
Foam::Istream& dimensioned<Type>::read(Istream& is, const dictionary& readSet)
{
// Read name
@@ -280,7 +280,7 @@ Foam::Istream& dimensioned<Type>::read(Istream& is, const dictionary& readSet)
}
-template <class Type>
+template<class Type>
Foam::Istream& dimensioned<Type>::read
(
Istream& is,
@@ -309,7 +309,7 @@ Foam::Istream& dimensioned<Type>::read
}
-template <class Type>
+template<class Type>
Foam::Istream& dimensioned<Type>::read(Istream& is)
{
// Read name
@@ -335,7 +335,7 @@ Foam::Istream& dimensioned<Type>::read(Istream& is)
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
dimensioned<typename dimensioned<Type>::cmptType> dimensioned<Type>::operator[]
(
const direction d
@@ -345,7 +345,7 @@ dimensioned<typename dimensioned<Type>::cmptType> dimensioned<Type>::operator[]
}
-template <class Type>
+template<class Type>
void dimensioned<Type>::operator+=
(
const dimensioned<Type>& dt
@@ -356,7 +356,7 @@ void dimensioned<Type>::operator+=
}
-template <class Type>
+template<class Type>
void dimensioned<Type>::operator-=
(
const dimensioned<Type>& dt
@@ -367,7 +367,7 @@ void dimensioned<Type>::operator-=
}
-template <class Type>
+template<class Type>
void dimensioned<Type>::operator*=
(
const scalar s
@@ -377,7 +377,7 @@ void dimensioned<Type>::operator*=
}
-template <class Type>
+template<class Type>
void dimensioned<Type>::operator/=
(
const scalar s
@@ -436,7 +436,7 @@ dimensioned<scalar> mag(const dimensioned<Type>& dt)
}
-template <class Type>
+template<class Type>
dimensioned<Type> max
(
const dimensioned<Type>& dt1,
@@ -459,7 +459,7 @@ dimensioned<Type> max
}
-template <class Type>
+template<class Type>
dimensioned<Type> min
(
const dimensioned<Type>& dt1,
@@ -484,7 +484,7 @@ dimensioned<Type> min
// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Istream& operator>>(Istream& is, dimensioned<Type>& dt)
{
token nextToken(is);
@@ -517,7 +517,7 @@ Istream& operator>>(Istream& is, dimensioned<Type>& dt)
}
-template <class Type>
+template<class Type>
Ostream& operator<<(Ostream& os, const dimensioned<Type>& dt)
{
// Write the name
@@ -541,7 +541,7 @@ Ostream& operator<<(Ostream& os, const dimensioned<Type>& dt)
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
bool operator>
(
const dimensioned<Type>& dt1,
@@ -552,7 +552,7 @@ bool operator>
}
-template <class Type>
+template<class Type>
bool operator<
(
const dimensioned<Type>& dt1,
@@ -563,7 +563,7 @@ bool operator<
}
-template <class Type>
+template<class Type>
dimensioned<Type> operator+
(
const dimensioned<Type>& dt1,
@@ -579,7 +579,7 @@ dimensioned<Type> operator+
}
-template <class Type>
+template<class Type>
dimensioned<Type> operator-(const dimensioned<Type>& dt)
{
return dimensioned<Type>
@@ -591,7 +591,7 @@ dimensioned<Type> operator-(const dimensioned<Type>& dt)
}
-template <class Type>
+template<class Type>
dimensioned<Type> operator-
(
const dimensioned<Type>& dt1,
@@ -607,7 +607,7 @@ dimensioned<Type> operator-
}
-template <class Type>
+template<class Type>
dimensioned<Type> operator*
(
const dimensioned<scalar>& ds,
@@ -623,7 +623,7 @@ dimensioned<Type> operator*
}
-template <class Type>
+template<class Type>
dimensioned<Type> operator/
(
const dimensioned<Type>& dt,
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 8f5108df0b12137b5db35d8450111d80193c5d3a..1c4a5c0d3c86a81612f8b8282085d3fc952f469e 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -61,7 +61,7 @@ class dictionary;
Class dimensioned Declaration
\*---------------------------------------------------------------------------*/
-template <class Type>
+template<class Type>
class dimensioned
{
// private data
diff --git a/src/OpenFOAM/fields/Fields/transformList/transformList.C b/src/OpenFOAM/fields/Fields/transformList/transformList.C
index af3c93d516a1500b75f39a16a0877d24499a4e70..f962d68990b60f417de2271f8ca4d57107da516a 100644
--- a/src/OpenFOAM/fields/Fields/transformList/transformList.C
+++ b/src/OpenFOAM/fields/Fields/transformList/transformList.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-template <class T>
+template<class T>
Foam::List<T> Foam::transform
(
const tensor& rotTensor,
@@ -45,7 +45,7 @@ Foam::List<T> Foam::transform
}
-template <class T>
+template<class T>
void Foam::transformList(const tensor& rotTensor, UList<T>& field)
{
forAll(field, i)
@@ -55,7 +55,7 @@ void Foam::transformList(const tensor& rotTensor, UList<T>& field)
}
-template <class T>
+template<class T>
void Foam::transformList(const tensorField& rotTensor, UList<T>& field)
{
if (rotTensor.size() == 1)
@@ -84,7 +84,7 @@ void Foam::transformList(const tensorField& rotTensor, UList<T>& field)
}
-template <class T>
+template<class T>
void Foam::transformList(const tensor& rotTensor, Map<T>& field)
{
forAllIter(typename Map<T>, field, iter)
@@ -94,7 +94,7 @@ void Foam::transformList(const tensor& rotTensor, Map<T>& field)
}
-template <class T>
+template<class T>
void Foam::transformList(const tensorField& rotTensor, Map<T>& field)
{
if (rotTensor.size() == 1)
@@ -116,7 +116,7 @@ void Foam::transformList(const tensorField& rotTensor, Map<T>& field)
}
-template <class T>
+template<class T>
void Foam::transformList(const tensor& rotTensor, EdgeMap<T>& field)
{
forAllIter(typename EdgeMap<T>, field, iter)
@@ -126,7 +126,7 @@ void Foam::transformList(const tensor& rotTensor, EdgeMap<T>& field)
}
-template <class T>
+template<class T>
void Foam::transformList(const tensorField& rotTensor, EdgeMap<T>& field)
{
if (rotTensor.size() == 1)
diff --git a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
index a836882bdf22cb37656673572b2e0dbee8cb6b34..8159b62c9e8bc50cfe82b3e828c364208635b767 100644
--- a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
+++ b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -26,7 +26,7 @@ License
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::label Foam::interpolationLookUpTable<Type>::index
(
const List<scalar>& indices,
@@ -70,7 +70,7 @@ Foam::label Foam::interpolationLookUpTable<Type>::index
}
-template <class Type>
+template<class Type>
Foam::label Foam::interpolationLookUpTable<Type>::index
(
const scalar indice
diff --git a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
index 4fdacbb94017faaf1a0a0e8611fecbd996e572b9..e150c64c6a0a55b447696014c4fde4425610be9b 100644
--- a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
+++ b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,7 +28,7 @@ License
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
void Foam::uniformInterpolationTable<Type>::checkTable() const
{
if (size() < 2)
@@ -44,7 +44,7 @@ void Foam::uniformInterpolationTable<Type>::checkTable() const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::uniformInterpolationTable<Type>::uniformInterpolationTable
(
const IOobject& io,
@@ -73,7 +73,7 @@ Foam::uniformInterpolationTable<Type>::uniformInterpolationTable
}
-template <class Type>
+template<class Type>
Foam::uniformInterpolationTable<Type>::uniformInterpolationTable
(
const word& tableName,
@@ -112,7 +112,7 @@ Foam::uniformInterpolationTable<Type>::uniformInterpolationTable
}
-template <class Type>
+template<class Type>
Foam::uniformInterpolationTable<Type>::uniformInterpolationTable
(
const uniformInterpolationTable& uit
@@ -131,14 +131,14 @@ Foam::uniformInterpolationTable<Type>::uniformInterpolationTable
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::uniformInterpolationTable<Type>::~uniformInterpolationTable()
{}
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Type Foam::uniformInterpolationTable<Type>::interpolate(scalar x) const
{
if (bound_)
@@ -186,7 +186,7 @@ Type Foam::uniformInterpolationTable<Type>::interpolate(scalar x) const
}
-template <class Type>
+template<class Type>
Type Foam::uniformInterpolationTable<Type>::interpolateLog10
(
scalar x
@@ -217,7 +217,7 @@ Type Foam::uniformInterpolationTable<Type>::interpolateLog10
}
-template <class Type>
+template<class Type>
void Foam::uniformInterpolationTable<Type>::write() const
{
IOdictionary dict(*this);
diff --git a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H
index 87c41609e0c6a92c16e1016619bb2417335a705a..680999cbc6d1ab10067955fc538f4009d8907d21 100644
--- a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H
+++ b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTable.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -67,7 +67,7 @@ namespace Foam
Class uniformInterpolationTable Declaration
\*---------------------------------------------------------------------------*/
-template <class Type>
+template<class Type>
class uniformInterpolationTable
:
public IOobject,
diff --git a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTableI.H b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTableI.H
index 90b19e8f97fd032885c6ca0795c6f97ec8ee1015..237dcede2f9577d8646abaf114f59d28c8f030c0 100644
--- a/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTableI.H
+++ b/src/OpenFOAM/interpolations/uniformInterpolationTable/uniformInterpolationTableI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,70 +23,70 @@ License
\*---------------------------------------------------------------------------*/
-template <class Type>
+template<class Type>
Foam::scalar Foam::uniformInterpolationTable<Type>::x0() const
{
return x0_;
}
-template <class Type>
+template<class Type>
Foam::scalar Foam::uniformInterpolationTable<Type>::dx() const
{
return dx_;
}
-template <class Type>
+template<class Type>
const Foam::Switch& Foam::uniformInterpolationTable<Type>::log10() const
{
return log10_;
}
-template <class Type>
+template<class Type>
const Foam::Switch& Foam::uniformInterpolationTable<Type>::bound() const
{
return bound_;
}
-template <class Type>
+template<class Type>
Foam::scalar& Foam::uniformInterpolationTable<Type>::x0()
{
return x0_;
}
-template <class Type>
+template<class Type>
Foam::scalar& Foam::uniformInterpolationTable<Type>::dx()
{
return dx_;
}
-template <class Type>
+template<class Type>
Foam::Switch& Foam::uniformInterpolationTable<Type>::log10()
{
return log10_;
}
-template <class Type>
+template<class Type>
Foam::Switch& Foam::uniformInterpolationTable<Type>::bound()
{
return bound_;
}
-template <class Type>
+template<class Type>
Foam::scalar Foam::uniformInterpolationTable<Type>::xMin() const
{
return x0_;
}
-template <class Type>
+template<class Type>
Foam::scalar Foam::uniformInterpolationTable<Type>::xMax() const
{
return x0_ + dx_*(size() - 1);
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
index 3d254c04ba3e2045101d070d379a6b603eb6fb63..ab1858b1484f436d7434f0e5c84044cb34a15b9e 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -112,7 +112,7 @@ class globalMeshData
// Private class
// To combineReduce a pointField. Just appends all lists.
- template <class T>
+ template<class T>
class plusEqOp
{
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
index 26711f2d0b3b5c87ae4f79208c0da46c8b851a9a..d089d04f9eaaf91baa1d76a3aad4606582160fe2 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -65,7 +65,7 @@ class syncTools
// Private Member Functions
//- Combine value with existing value in map.
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void combine
(
Map<T>& pointValues,
@@ -75,7 +75,7 @@ class syncTools
);
//- Combine val with existing value at (implicit index) e.
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void combine
(
EdgeMap<T>& edgeValues,
@@ -92,7 +92,7 @@ public:
// use specialisations below.
//- Synchronize values on selected points.
- template <class T, class CombineOp, class TransformOp>
+ template<class T, class CombineOp, class TransformOp>
static void syncPointMap
(
const polyMesh&,
@@ -102,7 +102,7 @@ public:
);
//- Synchronize values on selected edges.
- template <class T, class CombineOp, class TransformOp>
+ template<class T, class CombineOp, class TransformOp>
static void syncEdgeMap
(
const polyMesh&,
@@ -112,7 +112,7 @@ public:
);
//- Synchronize values on all mesh points.
- template <class T, class CombineOp, class TransformOp>
+ template<class T, class CombineOp, class TransformOp>
static void syncPointList
(
const polyMesh&,
@@ -123,7 +123,7 @@ public:
);
//- Synchronize values on selected mesh points.
- template <class T, class CombineOp, class TransformOp>
+ template<class T, class CombineOp, class TransformOp>
static void syncPointList
(
const polyMesh&,
@@ -135,7 +135,7 @@ public:
);
//- Synchronize values on all mesh edges.
- template <class T, class CombineOp, class TransformOp>
+ template<class T, class CombineOp, class TransformOp>
static void syncEdgeList
(
const polyMesh&,
@@ -146,7 +146,7 @@ public:
);
//- Synchronize values on selected mesh edges.
- template <class T, class CombineOp, class TransformOp>
+ template<class T, class CombineOp, class TransformOp>
static void syncEdgeList
(
const polyMesh&,
@@ -158,7 +158,7 @@ public:
);
//- Synchronize values on boundary faces only.
- template <class T, class CombineOp, class TransformOp>
+ template<class T, class CombineOp, class TransformOp>
static void syncBoundaryFaceList
(
const polyMesh&,
@@ -171,7 +171,7 @@ public:
// Synchronise point-wise data
//- Synchronize values on all mesh points.
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void syncPointList
(
const polyMesh& mesh,
@@ -191,7 +191,7 @@ public:
}
//- Synchronize locations on all mesh points.
- template <class CombineOp>
+ template<class CombineOp>
static void syncPointPositions
(
const polyMesh& mesh,
@@ -211,7 +211,7 @@ public:
}
//- Synchronize values on selected mesh points.
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void syncPointList
(
const polyMesh& mesh,
@@ -233,7 +233,7 @@ public:
}
//- Synchronize locations on selected mesh points.
- template <class CombineOp>
+ template<class CombineOp>
static void syncPointPositions
(
const polyMesh& mesh,
@@ -258,7 +258,7 @@ public:
// Synchronise edge-wise data
//- Synchronize values on all mesh edges.
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void syncEdgeList
(
const polyMesh& mesh,
@@ -278,7 +278,7 @@ public:
}
//- Synchronize locations on all mesh edges.
- template <class CombineOp>
+ template<class CombineOp>
static void syncEdgePositions
(
const polyMesh& mesh,
@@ -298,7 +298,7 @@ public:
}
//- Synchronize values on selected mesh edges.
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void syncEdgeList
(
const polyMesh& mesh,
@@ -320,7 +320,7 @@ public:
}
//- Synchronize locations on selected mesh edges.
- template <class CombineOp>
+ template<class CombineOp>
static void syncEdgePositions
(
const polyMesh& mesh,
@@ -346,7 +346,7 @@ public:
// Synchronise face-wise data
//- Synchronize values on boundary faces only.
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void syncBoundaryFaceList
(
const polyMesh& mesh,
@@ -358,7 +358,7 @@ public:
}
//- Synchronize locations on boundary faces only.
- template <class CombineOp>
+ template<class CombineOp>
static void syncBoundaryFacePositions
(
const polyMesh& mesh,
@@ -376,7 +376,7 @@ public:
}
//- Synchronize values on all mesh faces.
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void syncFaceList
(
const polyMesh& mesh,
@@ -401,7 +401,7 @@ public:
}
//- Synchronize locations on all mesh faces.
- template <class CombineOp>
+ template<class CombineOp>
static void syncFacePositions
(
const polyMesh& mesh,
@@ -425,7 +425,7 @@ public:
}
//- Swap coupled boundary face values.
- template <class T>
+ template<class T>
static void swapBoundaryFaceList
(
const polyMesh& mesh,
@@ -442,7 +442,7 @@ public:
}
//- Swap coupled positions.
- template <class T>
+ template<class T>
static void swapBoundaryFacePositions
(
const polyMesh& mesh,
@@ -459,7 +459,7 @@ public:
}
//- Swap coupled face values.
- template <class T>
+ template<class T>
static void swapFaceList
(
const polyMesh& mesh,
@@ -482,7 +482,7 @@ public:
}
//- Swap to obtain neighbour cell values for all boundary faces
- template <class T>
+ template<class T>
static void swapBoundaryCellList
(
const polyMesh& mesh,
@@ -493,7 +493,7 @@ public:
// Sparse versions
//- Synchronize values on selected points.
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void syncPointMap
(
const polyMesh& mesh,
@@ -505,7 +505,7 @@ public:
}
//- Synchronize locations on selected points.
- template <class CombineOp>
+ template<class CombineOp>
static void syncPointPositions
(
const polyMesh& mesh,
@@ -519,7 +519,7 @@ public:
//- Synchronize values on selected edges. Edges are represented
// by the two vertices that make it up so global edges never get
// constructed.
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void syncEdgeMap
(
const polyMesh& mesh,
@@ -531,7 +531,7 @@ public:
}
//- Synchronize locations on selected edges.
- template <class T, class CombineOp>
+ template<class T, class CombineOp>
static void syncEdgePositions
(
const polyMesh& mesh,
@@ -544,7 +544,7 @@ public:
// PackedList versions
- template <unsigned nBits, class CombineOp>
+ template<unsigned nBits, class CombineOp>
static void syncFaceList
(
const polyMesh& mesh,
@@ -552,14 +552,14 @@ public:
const CombineOp& cop
);
- template <unsigned nBits>
+ template<unsigned nBits>
static void swapFaceList
(
const polyMesh& mesh,
PackedList<nBits>& faceValues
);
- template <unsigned nBits, class CombineOp>
+ template<unsigned nBits, class CombineOp>
static void syncPointList
(
const polyMesh& mesh,
@@ -568,7 +568,7 @@ public:
const unsigned int nullValue
);
- template <unsigned nBits, class CombineOp>
+ template<unsigned nBits, class CombineOp>
static void syncEdgeList
(
const polyMesh& mesh,
diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
index 5d6364a681602c6c0fcf3a7aaa575980dd32b757..5f2b9706ee2bca7b27ab3644aecd7ad30b1c01bc 100644
--- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -36,7 +36,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Combine val with existing value at index
-template <class T, class CombineOp>
+template<class T, class CombineOp>
void Foam::syncTools::combine
(
Map<T>& pointValues,
@@ -59,7 +59,7 @@ void Foam::syncTools::combine
// Combine val with existing value at (implicit index) e.
-template <class T, class CombineOp>
+template<class T, class CombineOp>
void Foam::syncTools::combine
(
EdgeMap<T>& edgeValues,
@@ -81,7 +81,7 @@ void Foam::syncTools::combine
}
-template <class T, class CombineOp, class TransformOp>
+template<class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncPointMap
(
const polyMesh& mesh,
@@ -386,7 +386,7 @@ void Foam::syncTools::syncPointMap
}
-template <class T, class CombineOp, class TransformOp>
+template<class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncEdgeMap
(
const polyMesh& mesh,
@@ -761,7 +761,7 @@ void Foam::syncTools::syncEdgeMap
}
-//template <class T, class CombineOp, class TransformOp>
+//template<class T, class CombineOp, class TransformOp>
//void Foam::syncTools::syncPointList
//(
// const polyMesh& mesh,
@@ -937,7 +937,7 @@ void Foam::syncTools::syncEdgeMap
//}
-//template <class T, class CombineOp, class TransformOp>
+//template<class T, class CombineOp, class TransformOp>
//void Foam::syncTools::syncPointList
//(
// const polyMesh& mesh,
@@ -987,7 +987,7 @@ void Foam::syncTools::syncEdgeMap
// }
//}
-template <class T, class CombineOp, class TransformOp>
+template<class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncPointList
(
const polyMesh& mesh,
@@ -1013,7 +1013,7 @@ void Foam::syncTools::syncPointList
}
-//template <class CombineOp>
+//template<class CombineOp>
//void Foam::syncTools::syncPointPositions
//(
// const polyMesh& mesh,
@@ -1037,7 +1037,7 @@ void Foam::syncTools::syncPointList
//}
-template <class T, class CombineOp, class TransformOp>
+template<class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncPointList
(
const polyMesh& mesh,
@@ -1097,7 +1097,7 @@ void Foam::syncTools::syncPointList
}
-//template <class CombineOp>
+//template<class CombineOp>
//void Foam::syncTools::syncPointPositions
//(
// const polyMesh& mesh,
@@ -1157,7 +1157,7 @@ void Foam::syncTools::syncPointList
//}
-template <class T, class CombineOp, class TransformOp>
+template<class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncEdgeList
(
const polyMesh& mesh,
@@ -1204,7 +1204,7 @@ void Foam::syncTools::syncEdgeList
}
-//template <class CombineOp>
+//template<class CombineOp>
//void Foam::syncTools::syncEdgePositions
//(
// const polyMesh& mesh,
@@ -1251,7 +1251,7 @@ void Foam::syncTools::syncEdgeList
//}
-template <class T, class CombineOp, class TransformOp>
+template<class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncEdgeList
(
const polyMesh& mesh,
@@ -1310,7 +1310,7 @@ void Foam::syncTools::syncEdgeList
}
}
-template <class T, class CombineOp, class TransformOp>
+template<class T, class CombineOp, class TransformOp>
void Foam::syncTools::syncBoundaryFaceList
(
const polyMesh& mesh,
@@ -1436,7 +1436,7 @@ void Foam::syncTools::syncBoundaryFaceList
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <unsigned nBits, class CombineOp>
+template<unsigned nBits, class CombineOp>
void Foam::syncTools::syncFaceList
(
const polyMesh& mesh,
@@ -1553,7 +1553,7 @@ void Foam::syncTools::syncFaceList
}
-template <class T>
+template<class T>
void Foam::syncTools::swapBoundaryCellList
(
const polyMesh& mesh,
@@ -1592,7 +1592,7 @@ void Foam::syncTools::swapBoundaryCellList
}
-template <unsigned nBits>
+template<unsigned nBits>
void Foam::syncTools::swapFaceList
(
const polyMesh& mesh,
@@ -1603,7 +1603,7 @@ void Foam::syncTools::swapFaceList
}
-template <unsigned nBits, class CombineOp>
+template<unsigned nBits, class CombineOp>
void Foam::syncTools::syncPointList
(
const polyMesh& mesh,
@@ -1650,7 +1650,7 @@ void Foam::syncTools::syncPointList
}
-template <unsigned nBits, class CombineOp>
+template<unsigned nBits, class CombineOp>
void Foam::syncTools::syncEdgeList
(
const polyMesh& mesh,
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
index db8f216c2d817705b5fe74fe0950e8c4cdf836ff..354dfa3f99390c3dbe51ad655fd05ffd6e1a2b91 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -394,7 +394,7 @@ public:
// Other patch operations
//- Project vertices of patch onto another patch
- template <class ToPatch>
+ template<class ToPatch>
List<objectHit> projectPoints
(
const ToPatch& targetPatch,
@@ -404,7 +404,7 @@ public:
) const;
//- Project vertices of patch onto another patch
- template <class ToPatch>
+ template<class ToPatch>
List<objectHit> projectFaceCentres
(
const ToPatch& targetPatch,
diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
index 2c0115a96cf2e70af230af4630346f338f2de7f6..61dc971e3999f5e208a484456e23fb6f0e94fd9a 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -41,7 +41,7 @@ template
class PointField,
class PointType
>
-template <class ToPatch>
+template<class ToPatch>
Foam::List<Foam::objectHit>
Foam::PrimitivePatch<Face, FaceList, PointField, PointType>::
projectPoints
@@ -288,7 +288,7 @@ template
class PointField,
class PointType
>
-template <class ToPatch>
+template<class ToPatch>
Foam::List<Foam::objectHit>
Foam::PrimitivePatch<Face, FaceList, PointField, PointType>::
projectFaceCentres
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
index 57f6faf2912591d342f5d610279ca6445539f81f..2d64825ed773b75333672f07f0f1e34251f677f7 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensor.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -50,7 +50,7 @@ namespace Foam
Class DiagTensor Declaration
\*---------------------------------------------------------------------------*/
-template <class Cmpt>
+template<class Cmpt>
class DiagTensor
:
public VectorSpace<DiagTensor<Cmpt>, Cmpt, 3>
@@ -86,7 +86,8 @@ public:
inline DiagTensor();
//- Construct given VectorSpace
- inline DiagTensor(const VectorSpace<DiagTensor<Cmpt>, Cmpt, 3>&);
+ template<class Cmpt2>
+ inline DiagTensor(const VectorSpace<DiagTensor<Cmpt2>, Cmpt2, 3>&);
//- Construct given three components
inline DiagTensor(const Cmpt& txx, const Cmpt& tyy, const Cmpt& tzz);
diff --git a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
index 1f09330bf4a87c0ad0e85e0e96569f2b365f8d5b..4fd082897ae1546d46ea6a7497d3c5e9e8e05b42 100644
--- a/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
+++ b/src/OpenFOAM/primitives/DiagTensor/DiagTensorI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,25 +32,23 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct null
-template <class Cmpt>
+template<class Cmpt>
inline DiagTensor<Cmpt>::DiagTensor()
{}
-// Construct given VectorSpace
-template <class Cmpt>
+template<class Cmpt>
+template<class Cmpt2>
inline DiagTensor<Cmpt>::DiagTensor
(
- const VectorSpace<DiagTensor<Cmpt>, Cmpt, 3>& vs
+ const VectorSpace<DiagTensor<Cmpt2>, Cmpt2, 3>& vs
)
:
VectorSpace<DiagTensor<Cmpt>, Cmpt, 3>(vs)
{}
-// Construct given three Cmpts
-template <class Cmpt>
+template<class Cmpt>
inline DiagTensor<Cmpt>::DiagTensor
(
const Cmpt& vxx,
@@ -64,8 +62,7 @@ inline DiagTensor<Cmpt>::DiagTensor
}
-// Construct from Istream
-template <class Cmpt>
+template<class Cmpt>
inline DiagTensor<Cmpt>::DiagTensor(Istream& is)
:
VectorSpace<DiagTensor<Cmpt>, Cmpt, 3>(is)
@@ -74,38 +71,38 @@ inline DiagTensor<Cmpt>::DiagTensor(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& DiagTensor<Cmpt>::xx() const
{
return this->v_[XX];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& DiagTensor<Cmpt>::yy() const
{
return this->v_[YY];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& DiagTensor<Cmpt>::zz() const
{
return this->v_[ZZ];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& DiagTensor<Cmpt>::xx()
{
return this->v_[XX];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& DiagTensor<Cmpt>::yy()
{
return this->v_[YY];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& DiagTensor<Cmpt>::zz()
{
return this->v_[ZZ];
@@ -114,7 +111,7 @@ inline Cmpt& DiagTensor<Cmpt>::zz()
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator+(const DiagTensor<Cmpt>& dt1, const Tensor<Cmpt>& t2)
{
@@ -127,7 +124,7 @@ operator+(const DiagTensor<Cmpt>& dt1, const Tensor<Cmpt>& t2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator+(const Tensor<Cmpt>& t1, const DiagTensor<Cmpt>& dt2)
{
@@ -140,7 +137,7 @@ operator+(const Tensor<Cmpt>& t1, const DiagTensor<Cmpt>& dt2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator-(const DiagTensor<Cmpt>& dt1, const Tensor<Cmpt>& t2)
{
@@ -153,7 +150,7 @@ operator-(const DiagTensor<Cmpt>& dt1, const Tensor<Cmpt>& t2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator-(const Tensor<Cmpt>& t1, const DiagTensor<Cmpt>& dt2)
{
@@ -167,7 +164,7 @@ operator-(const Tensor<Cmpt>& t1, const DiagTensor<Cmpt>& dt2)
//- Inner-product between two diagonal tensors
-template <class Cmpt>
+template<class Cmpt>
inline DiagTensor<Cmpt>
operator&(const DiagTensor<Cmpt>& dt1, const DiagTensor<Cmpt>& dt2)
{
@@ -181,7 +178,7 @@ operator&(const DiagTensor<Cmpt>& dt1, const DiagTensor<Cmpt>& dt2)
//- Inner-product between a diagonal tensor and a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator&(const DiagTensor<Cmpt>& dt1, const Tensor<Cmpt>& t2)
{
@@ -203,7 +200,7 @@ operator&(const DiagTensor<Cmpt>& dt1, const Tensor<Cmpt>& t2)
//- Inner-product between a tensor and a diagonal tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator&(const Tensor<Cmpt>& t1, const DiagTensor<Cmpt>& dt2)
{
@@ -225,7 +222,7 @@ operator&(const Tensor<Cmpt>& t1, const DiagTensor<Cmpt>& dt2)
//- Inner-product between a diagonal tensor and a vector
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt>
operator&(const DiagTensor<Cmpt>& dt, const Vector<Cmpt>& v)
{
@@ -239,7 +236,7 @@ operator&(const DiagTensor<Cmpt>& dt, const Vector<Cmpt>& v)
//- Inner-product between a vector and a diagonal tensor
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt>
operator&(const Vector<Cmpt>& v, const DiagTensor<Cmpt>& dt)
{
@@ -253,7 +250,7 @@ operator&(const Vector<Cmpt>& v, const DiagTensor<Cmpt>& dt)
//- Division of a scalar by a diagonalTensor
-template <class Cmpt>
+template<class Cmpt>
inline DiagTensor<Cmpt>
operator/(const scalar s, const DiagTensor<Cmpt>& dt)
{
@@ -262,7 +259,7 @@ operator/(const scalar s, const DiagTensor<Cmpt>& dt)
//- Division of a vector by a diagonalTensor
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt>
operator/(const Vector<Cmpt> v, const DiagTensor<Cmpt>& dt)
{
@@ -271,7 +268,7 @@ operator/(const Vector<Cmpt> v, const DiagTensor<Cmpt>& dt)
//- Return the trace of a diagonal tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt tr(const DiagTensor<Cmpt>& dt)
{
return dt.xx() + dt.yy() + dt.zz();
@@ -279,7 +276,7 @@ inline Cmpt tr(const DiagTensor<Cmpt>& dt)
//- Return the spherical part of a diagonal tensor
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor<Cmpt> sph(const DiagTensor<Cmpt>& dt)
{
return 0.5*tr(dt);
@@ -287,7 +284,7 @@ inline SphericalTensor<Cmpt> sph(const DiagTensor<Cmpt>& dt)
//- Return the determinant of a diagonal tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt det(const DiagTensor<Cmpt>& t)
{
return t.xx()*t.yy()*t.zz();
@@ -295,7 +292,7 @@ inline Cmpt det(const DiagTensor<Cmpt>& t)
//- Return the inverse of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline DiagTensor<Cmpt> inv(const DiagTensor<Cmpt>& dt)
{
return DiagTensor<Cmpt>(1.0/dt.xx(), 1.0/dt.yy(), 1.0/dt.zz());
@@ -303,7 +300,7 @@ inline DiagTensor<Cmpt> inv(const DiagTensor<Cmpt>& dt)
//- Return the diagonal of a tensor as a diagonal tensor
-template <class Cmpt>
+template<class Cmpt>
inline DiagTensor<Cmpt> diag(const Tensor<Cmpt>& t)
{
return DiagTensor<Cmpt>(t.xx(), t.yy(), t.zz());
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
index ddd4a5f243ffbbc8ab4d20b2fa8827b7e8bde6ae..a2bb56e3f4c96a0398b6ab2ac724fae9af36ff96 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensor.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -91,9 +91,10 @@ public:
inline SphericalTensor();
//- Construct given VectorSpace
+ template<class Cmpt2>
inline SphericalTensor
(
- const VectorSpace<SphericalTensor<Cmpt>, Cmpt, 1>&
+ const VectorSpace<SphericalTensor<Cmpt2>, Cmpt2, 1>&
);
//- Construct given the component
diff --git a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
index d0f4014f30d72b85ec3a92289fcd61b1b4b449bb..5db52eb1bb45606184751aed5a987a5c3966977d 100644
--- a/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor/SphericalTensorI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,33 +32,30 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct null
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor<Cmpt>::SphericalTensor()
{}
-// Construct given VectorSpace
-template <class Cmpt>
+template<class Cmpt>
+template<class Cmpt2>
inline SphericalTensor<Cmpt>::SphericalTensor
(
- const VectorSpace<SphericalTensor<Cmpt>, Cmpt, 1>& vs
+ const VectorSpace<SphericalTensor<Cmpt2>, Cmpt2, 1>& vs
)
:
VectorSpace<SphericalTensor<Cmpt>, Cmpt, 1>(vs)
{}
-// Construct given three Cmpts
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor<Cmpt>::SphericalTensor(const Cmpt& stii)
{
this->v_[II] = stii;
}
-// Construct from Istream
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor<Cmpt>::SphericalTensor(Istream& is)
:
VectorSpace<SphericalTensor<Cmpt>, Cmpt, 1>(is)
@@ -67,21 +64,21 @@ inline SphericalTensor<Cmpt>::SphericalTensor(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& SphericalTensor<Cmpt>::ii() const
{
return this->v_[II];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& SphericalTensor<Cmpt>::ii()
{
return this->v_[II];
}
-template <class Cmpt>
+template<class Cmpt>
inline const SphericalTensor<Cmpt>& SphericalTensor<Cmpt>::T() const
{
return *this;
@@ -91,7 +88,7 @@ inline const SphericalTensor<Cmpt>& SphericalTensor<Cmpt>::T() const
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
//- Inner-product between two spherical tensors
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor<Cmpt>
operator&(const SphericalTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& st2)
{
@@ -100,7 +97,7 @@ operator&(const SphericalTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& st2)
//- Inner-product between a spherical tensor and a vector
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt>
operator&(const SphericalTensor<Cmpt>& st, const Vector<Cmpt>& v)
{
@@ -114,7 +111,7 @@ operator&(const SphericalTensor<Cmpt>& st, const Vector<Cmpt>& v)
//- Inner-product between a vector and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt>
operator&(const Vector<Cmpt>& v, const SphericalTensor<Cmpt>& st)
{
@@ -128,7 +125,7 @@ operator&(const Vector<Cmpt>& v, const SphericalTensor<Cmpt>& st)
//- Double-dot-product between a spherical tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt
operator&&(const SphericalTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& st2)
{
@@ -137,7 +134,7 @@ operator&&(const SphericalTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& st2)
//- Division of a scalar by a sphericalTensor
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor<Cmpt>
operator/(const scalar s, const SphericalTensor<Cmpt>& st)
{
@@ -145,7 +142,7 @@ operator/(const scalar s, const SphericalTensor<Cmpt>& st)
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt magSqr(const SphericalTensor<Cmpt>& st)
{
return 3*magSqr(st.ii());
@@ -153,7 +150,7 @@ inline Cmpt magSqr(const SphericalTensor<Cmpt>& st)
//- Return the trace of a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt tr(const SphericalTensor<Cmpt>& st)
{
return 3*st.ii();
@@ -161,7 +158,7 @@ inline Cmpt tr(const SphericalTensor<Cmpt>& st)
//- Return the spherical part of a spherical tensor, i.e. itself
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor<Cmpt> sph(const SphericalTensor<Cmpt>& st)
{
return st;
@@ -169,7 +166,7 @@ inline SphericalTensor<Cmpt> sph(const SphericalTensor<Cmpt>& st)
//- Return the determinant of a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt det(const SphericalTensor<Cmpt>& st)
{
return st.ii()*st.ii()*st.ii();
@@ -177,7 +174,7 @@ inline Cmpt det(const SphericalTensor<Cmpt>& st)
//- Return the inverse of a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor<Cmpt> inv(const SphericalTensor<Cmpt>& st)
{
return SphericalTensor<Cmpt>(1.0/st.ii());
diff --git a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
index 42007e199ad79d571257fd16ab58c88eef85db15..389180fe5cd495c93e5e810c83d173ccb0c165d8 100644
--- a/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
+++ b/src/OpenFOAM/primitives/SphericalTensor2D/SphericalTensor2DI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,13 +33,13 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct null
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor2D<Cmpt>::SphericalTensor2D()
{}
// Construct given VectorSpace
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor2D<Cmpt>::SphericalTensor2D
(
const VectorSpace<SphericalTensor2D<Cmpt>, Cmpt, 1>& vs
@@ -50,7 +50,7 @@ inline SphericalTensor2D<Cmpt>::SphericalTensor2D
// Construct given three Cmpts
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor2D<Cmpt>::SphericalTensor2D(const Cmpt& stii)
{
this->v_[II] = stii;
@@ -58,7 +58,7 @@ inline SphericalTensor2D<Cmpt>::SphericalTensor2D(const Cmpt& stii)
// Construct from Istream
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor2D<Cmpt>::SphericalTensor2D(Istream& is)
:
VectorSpace<SphericalTensor2D<Cmpt>, Cmpt, 1>(is)
@@ -67,14 +67,14 @@ inline SphericalTensor2D<Cmpt>::SphericalTensor2D(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& SphericalTensor2D<Cmpt>::ii() const
{
return this->v_[II];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& SphericalTensor2D<Cmpt>::ii()
{
return this->v_[II];
@@ -84,7 +84,7 @@ inline Cmpt& SphericalTensor2D<Cmpt>::ii()
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
//- Inner-product between two spherical tensors
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor2D<Cmpt>
operator&
(
@@ -97,7 +97,7 @@ operator&
//- Inner-product between a spherical tensor and a vector
-template <class Cmpt>
+template<class Cmpt>
inline Vector2D<Cmpt>
operator&(const SphericalTensor2D<Cmpt>& st, const Vector2D<Cmpt>& v)
{
@@ -110,7 +110,7 @@ operator&(const SphericalTensor2D<Cmpt>& st, const Vector2D<Cmpt>& v)
//- Inner-product between a vector and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Vector2D<Cmpt>
operator&(const Vector2D<Cmpt>& v, const SphericalTensor2D<Cmpt>& st)
{
@@ -123,7 +123,7 @@ operator&(const Vector2D<Cmpt>& v, const SphericalTensor2D<Cmpt>& st)
//- Division of a scalar by a sphericalTensor2D
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor2D<Cmpt>
operator/(const scalar s, const SphericalTensor2D<Cmpt>& st)
{
@@ -132,7 +132,7 @@ operator/(const scalar s, const SphericalTensor2D<Cmpt>& st)
//- Return the trace of a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt tr(const SphericalTensor2D<Cmpt>& st)
{
return 2*st.ii();
@@ -140,7 +140,7 @@ inline Cmpt tr(const SphericalTensor2D<Cmpt>& st)
//- Return the spherical part of a spherical tensor, i.e. itself
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor2D<Cmpt> sph(const SphericalTensor2D<Cmpt>& st)
{
return st;
@@ -148,7 +148,7 @@ inline SphericalTensor2D<Cmpt> sph(const SphericalTensor2D<Cmpt>& st)
//- Return the determinant of a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt det(const SphericalTensor2D<Cmpt>& st)
{
return st.ii()*st.ii();
@@ -156,7 +156,7 @@ inline Cmpt det(const SphericalTensor2D<Cmpt>& st)
//- Return the inverse of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor2D<Cmpt> inv(const SphericalTensor2D<Cmpt>& st)
{
return SphericalTensor2D<Cmpt>(1.0/st.ii());
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
index 07eaba880da82dd0c7b158ce971c1227a497aa6f..afa1dbb622f14964f1e1390071699166444ec9cb 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensor.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -50,7 +50,7 @@ namespace Foam
Class SymmTensor Declaration
\*---------------------------------------------------------------------------*/
-template <class Cmpt>
+template<class Cmpt>
class SymmTensor
:
public VectorSpace<SymmTensor<Cmpt>, Cmpt, 6>
@@ -91,8 +91,9 @@ public:
//- Construct null
inline SymmTensor();
- //- Construct given VectorSpace
- inline SymmTensor(const VectorSpace<SymmTensor<Cmpt>, Cmpt, 6>&);
+ //- Construct given VectorSpace of the same rank
+ template<class Cmpt2>
+ inline SymmTensor(const VectorSpace<SymmTensor<Cmpt2>, Cmpt2, 6>&);
//- Construct given SphericalTensor
inline SymmTensor(const SphericalTensor<Cmpt>&);
diff --git a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
index 4566cc7550897d5625a52ca7c12c73c1f7425a13..dce79844d803b88122654c29c34df3ded71c64fc 100644
--- a/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
+++ b/src/OpenFOAM/primitives/SymmTensor/SymmTensorI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -33,22 +33,23 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt>::SymmTensor()
{}
-template <class Cmpt>
+template<class Cmpt>
+template<class Cmpt2>
inline SymmTensor<Cmpt>::SymmTensor
(
- const VectorSpace<SymmTensor<Cmpt>, Cmpt, 6>& vs
+ const VectorSpace<SymmTensor<Cmpt2>, Cmpt2, 6>& vs
)
:
VectorSpace<SymmTensor<Cmpt>, Cmpt, 6>(vs)
{}
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt>::SymmTensor(const SphericalTensor<Cmpt>& st)
{
this->v_[XX] = st.ii(); this->v_[XY] = 0; this->v_[XZ] = 0;
@@ -57,7 +58,7 @@ inline SymmTensor<Cmpt>::SymmTensor(const SphericalTensor<Cmpt>& st)
}
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt>::SymmTensor
(
const Cmpt txx, const Cmpt txy, const Cmpt txz,
@@ -71,7 +72,7 @@ inline SymmTensor<Cmpt>::SymmTensor
}
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt>::SymmTensor(Istream& is)
:
VectorSpace<SymmTensor<Cmpt>, Cmpt, 6>(is)
@@ -80,81 +81,81 @@ inline SymmTensor<Cmpt>::SymmTensor(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& SymmTensor<Cmpt>::xx() const
{
return this->v_[XX];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& SymmTensor<Cmpt>::xy() const
{
return this->v_[XY];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& SymmTensor<Cmpt>::xz() const
{
return this->v_[XZ];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& SymmTensor<Cmpt>::yy() const
{
return this->v_[YY];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& SymmTensor<Cmpt>::yz() const
{
return this->v_[YZ];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& SymmTensor<Cmpt>::zz() const
{
return this->v_[ZZ];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& SymmTensor<Cmpt>::xx()
{
return this->v_[XX];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& SymmTensor<Cmpt>::xy()
{
return this->v_[XY];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& SymmTensor<Cmpt>::xz()
{
return this->v_[XZ];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& SymmTensor<Cmpt>::yy()
{
return this->v_[YY];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& SymmTensor<Cmpt>::yz()
{
return this->v_[YZ];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& SymmTensor<Cmpt>::zz()
{
return this->v_[ZZ];
}
-template <class Cmpt>
+template<class Cmpt>
inline const SymmTensor<Cmpt>& SymmTensor<Cmpt>::T() const
{
return *this;
@@ -163,7 +164,7 @@ inline const SymmTensor<Cmpt>& SymmTensor<Cmpt>::T() const
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline void SymmTensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
{
this->v_[XX] = st.ii(); this->v_[XY] = 0; this->v_[XZ] = 0;
@@ -176,7 +177,7 @@ inline void SymmTensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
//- Hodge Dual operator (tensor -> vector)
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt> operator*(const SymmTensor<Cmpt>& st)
{
return Vector<Cmpt>(st.yz(), -st.xz(), st.xy());
@@ -184,7 +185,7 @@ inline Vector<Cmpt> operator*(const SymmTensor<Cmpt>& st)
//- Inner-product between two symmetric tensors
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator&(const SymmTensor<Cmpt>& st1, const SymmTensor<Cmpt>& st2)
{
@@ -206,7 +207,7 @@ operator&(const SymmTensor<Cmpt>& st1, const SymmTensor<Cmpt>& st2)
//- Double-dot-product between a symmetric tensor and a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt
operator&&(const SymmTensor<Cmpt>& st1, const SymmTensor<Cmpt>& st2)
{
@@ -220,7 +221,7 @@ operator&&(const SymmTensor<Cmpt>& st1, const SymmTensor<Cmpt>& st2)
//- Inner-product between a symmetric tensor and a vector
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt>
operator&(const SymmTensor<Cmpt>& st, const Vector<Cmpt>& v)
{
@@ -234,7 +235,7 @@ operator&(const SymmTensor<Cmpt>& st, const Vector<Cmpt>& v)
//- Inner-product between a vector and a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt>
operator&(const Vector<Cmpt>& v, const SymmTensor<Cmpt>& st)
{
@@ -247,7 +248,7 @@ operator&(const Vector<Cmpt>& v, const SymmTensor<Cmpt>& st)
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt magSqr(const SymmTensor<Cmpt>& st)
{
return
@@ -260,7 +261,7 @@ inline Cmpt magSqr(const SymmTensor<Cmpt>& st)
//- Return the trace of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt tr(const SymmTensor<Cmpt>& st)
{
return st.xx() + st.yy() + st.zz();
@@ -268,7 +269,7 @@ inline Cmpt tr(const SymmTensor<Cmpt>& st)
//- Return the spherical part of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor<Cmpt> sph(const SymmTensor<Cmpt>& st)
{
return (1.0/3.0)*tr(st);
@@ -276,7 +277,7 @@ inline SphericalTensor<Cmpt> sph(const SymmTensor<Cmpt>& st)
//- Return the symmetric part of a symmetric tensor, i.e. itself
-template <class Cmpt>
+template<class Cmpt>
inline const SymmTensor<Cmpt>& symm(const SymmTensor<Cmpt>& st)
{
return st;
@@ -284,7 +285,7 @@ inline const SymmTensor<Cmpt>& symm(const SymmTensor<Cmpt>& st)
//- Return twice the symmetric part of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt> twoSymm(const SymmTensor<Cmpt>& st)
{
return 2*st;
@@ -292,7 +293,7 @@ inline SymmTensor<Cmpt> twoSymm(const SymmTensor<Cmpt>& st)
//- Return the deviatoric part of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt> dev(const SymmTensor<Cmpt>& st)
{
return st - SphericalTensor<Cmpt>::oneThirdI*tr(st);
@@ -300,7 +301,7 @@ inline SymmTensor<Cmpt> dev(const SymmTensor<Cmpt>& st)
//- Return the deviatoric part of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt> dev2(const SymmTensor<Cmpt>& st)
{
return st - SphericalTensor<Cmpt>::twoThirdsI*tr(st);
@@ -308,7 +309,7 @@ inline SymmTensor<Cmpt> dev2(const SymmTensor<Cmpt>& st)
//- Return the determinant of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt det(const SymmTensor<Cmpt>& st)
{
return
@@ -321,7 +322,7 @@ inline Cmpt det(const SymmTensor<Cmpt>& st)
//- Return the cofactor symmetric tensor of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt> cof(const SymmTensor<Cmpt>& st)
{
return SymmTensor<Cmpt>
@@ -339,7 +340,7 @@ inline SymmTensor<Cmpt> cof(const SymmTensor<Cmpt>& st)
//- Return the inverse of a symmetric tensor give the determinant
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st, const Cmpt detst)
{
return SymmTensor<Cmpt>
@@ -357,7 +358,7 @@ inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st, const Cmpt detst)
//- Return the inverse of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st)
{
return inv(st, det(st));
@@ -365,7 +366,7 @@ inline SymmTensor<Cmpt> inv(const SymmTensor<Cmpt>& st)
//- Return the 1st invariant of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt invariantI(const SymmTensor<Cmpt>& st)
{
return tr(st);
@@ -373,7 +374,7 @@ inline Cmpt invariantI(const SymmTensor<Cmpt>& st)
//- Return the 2nd invariant of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt invariantII(const SymmTensor<Cmpt>& st)
{
return
@@ -390,14 +391,14 @@ inline Cmpt invariantII(const SymmTensor<Cmpt>& st)
//- Return the 3rd invariant of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt invariantIII(const SymmTensor<Cmpt>& st)
{
return det(st);
}
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt>
operator+(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
{
@@ -410,7 +411,7 @@ operator+(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
}
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt>
operator+(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
{
@@ -423,7 +424,7 @@ operator+(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
}
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt>
operator-(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
{
@@ -436,7 +437,7 @@ operator-(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
}
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt>
operator-(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
{
@@ -450,7 +451,7 @@ operator-(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
//- Inner-product between a spherical symmetric tensor and a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt>
operator&(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
{
@@ -464,7 +465,7 @@ operator&(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
//- Inner-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt>
operator&(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
{
@@ -478,7 +479,7 @@ operator&(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
//- Double-dot-product between a spherical tensor and a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt
operator&&(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
{
@@ -487,7 +488,7 @@ operator&&(const SphericalTensor<Cmpt>& spt1, const SymmTensor<Cmpt>& st2)
//- Double-dot-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt
operator&&(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
{
@@ -495,7 +496,7 @@ operator&&(const SymmTensor<Cmpt>& st1, const SphericalTensor<Cmpt>& spt2)
}
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt> sqr(const Vector<Cmpt>& v)
{
return SymmTensor<Cmpt>
diff --git a/src/OpenFOAM/primitives/Tensor/Tensor.H b/src/OpenFOAM/primitives/Tensor/Tensor.H
index 94b567d532b08ce10c40afbd255ac0b47400735e..4a82e7ba2fa0b63cddf1174e5d78d59339e9efab 100644
--- a/src/OpenFOAM/primitives/Tensor/Tensor.H
+++ b/src/OpenFOAM/primitives/Tensor/Tensor.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -53,7 +53,7 @@ class SymmTensor;
Class Tensor Declaration
\*---------------------------------------------------------------------------*/
-template <class Cmpt>
+template<class Cmpt>
class Tensor
:
public VectorSpace<Tensor<Cmpt>, Cmpt, 9>
@@ -94,8 +94,9 @@ public:
//- Construct null
inline Tensor();
- //- Construct given VectorSpace
- inline Tensor(const VectorSpace<Tensor<Cmpt>, Cmpt, 9>&);
+ //- Construct given VectorSpace of the same rank
+ template<class Cmpt2>
+ inline Tensor(const VectorSpace<Tensor<Cmpt2>, Cmpt2, 9>&);
//- Construct given SphericalTensor
inline Tensor(const SphericalTensor<Cmpt>&);
diff --git a/src/OpenFOAM/primitives/Tensor/TensorI.H b/src/OpenFOAM/primitives/Tensor/TensorI.H
index 416507e6b758ccee0e9fdb44a8584fb37bd8c76d..06c52b75c33c1e7f69e8c6404133ef1a8fad1f25 100644
--- a/src/OpenFOAM/primitives/Tensor/TensorI.H
+++ b/src/OpenFOAM/primitives/Tensor/TensorI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,22 +32,20 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-//- Construct null
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>::Tensor()
{}
-//- Construct given VectorSpace
-template <class Cmpt>
-inline Tensor<Cmpt>::Tensor(const VectorSpace<Tensor<Cmpt>, Cmpt, 9>& vs)
+template<class Cmpt>
+template<class Cmpt2>
+inline Tensor<Cmpt>::Tensor(const VectorSpace<Tensor<Cmpt2>, Cmpt2, 9>& vs)
:
VectorSpace<Tensor<Cmpt>, Cmpt, 9>(vs)
{}
-//- Construct given SphericalTensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>::Tensor(const SphericalTensor<Cmpt>& st)
{
this->v_[XX] = st.ii(); this->v_[XY] = 0; this->v_[XZ] = 0;
@@ -56,8 +54,7 @@ inline Tensor<Cmpt>::Tensor(const SphericalTensor<Cmpt>& st)
}
-//- Construct given SymmTensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>::Tensor(const SymmTensor<Cmpt>& st)
{
this->v_[XX] = st.xx(); this->v_[XY] = st.xy(); this->v_[XZ] = st.xz();
@@ -66,8 +63,7 @@ inline Tensor<Cmpt>::Tensor(const SymmTensor<Cmpt>& st)
}
-//- Construct given triad
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>::Tensor(const Vector<Vector<Cmpt> >& tr)
{
this->v_[XX] = tr.x().x();
@@ -84,8 +80,7 @@ inline Tensor<Cmpt>::Tensor(const Vector<Vector<Cmpt> >& tr)
}
-//- Construct given the three vector components
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>::Tensor
(
const Vector<Cmpt>& x,
@@ -99,8 +94,7 @@ inline Tensor<Cmpt>::Tensor
}
-//- Construct from components
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>::Tensor
(
const Cmpt txx, const Cmpt txy, const Cmpt txz,
@@ -114,8 +108,7 @@ inline Tensor<Cmpt>::Tensor
}
-//- Construct from Istream
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>::Tensor(Istream& is)
:
VectorSpace<Tensor<Cmpt>, Cmpt, 9>(is)
@@ -124,133 +117,133 @@ inline Tensor<Cmpt>::Tensor(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline const Vector<Cmpt> Tensor<Cmpt>::x() const
{
return Vector<Cmpt>(this->v_[XX], this->v_[XY], this->v_[XZ]);
}
-template <class Cmpt>
+template<class Cmpt>
inline const Vector<Cmpt> Tensor<Cmpt>::y() const
{
return Vector<Cmpt>(this->v_[YX], this->v_[YY], this->v_[YZ]);
}
-template <class Cmpt>
+template<class Cmpt>
inline const Vector<Cmpt> Tensor<Cmpt>::z() const
{
return Vector<Cmpt>(this->v_[ZX], this->v_[ZY], this->v_[ZZ]);
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor<Cmpt>::xx() const
{
return this->v_[XX];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor<Cmpt>::xy() const
{
return this->v_[XY];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor<Cmpt>::xz() const
{
return this->v_[XZ];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor<Cmpt>::yx() const
{
return this->v_[YX];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor<Cmpt>::yy() const
{
return this->v_[YY];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor<Cmpt>::yz() const
{
return this->v_[YZ];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor<Cmpt>::zx() const
{
return this->v_[ZX];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor<Cmpt>::zy() const
{
return this->v_[ZY];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor<Cmpt>::zz() const
{
return this->v_[ZZ];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor<Cmpt>::xx()
{
return this->v_[XX];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor<Cmpt>::xy()
{
return this->v_[XY];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor<Cmpt>::xz()
{
return this->v_[XZ];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor<Cmpt>::yx()
{
return this->v_[YX];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor<Cmpt>::yy()
{
return this->v_[YY];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor<Cmpt>::yz()
{
return this->v_[YZ];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor<Cmpt>::zx()
{
return this->v_[ZX];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor<Cmpt>::zy()
{
return this->v_[ZY];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor<Cmpt>::zz()
{
return this->v_[ZZ];
@@ -258,7 +251,7 @@ inline Cmpt& Tensor<Cmpt>::zz()
//- Return tensor transpose
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt> Tensor<Cmpt>::T() const
{
return Tensor<Cmpt>
@@ -272,7 +265,7 @@ inline Tensor<Cmpt> Tensor<Cmpt>::T() const
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline void Tensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
{
this->v_[XX] = st.ii(); this->v_[XY] = 0; this->v_[XZ] = 0;
@@ -281,7 +274,7 @@ inline void Tensor<Cmpt>::operator=(const SphericalTensor<Cmpt>& st)
}
-template <class Cmpt>
+template<class Cmpt>
inline void Tensor<Cmpt>::operator=(const SymmTensor<Cmpt>& st)
{
this->v_[XX] = st.xx(); this->v_[XY] = st.xy(); this->v_[XZ] = st.xz();
@@ -290,7 +283,7 @@ inline void Tensor<Cmpt>::operator=(const SymmTensor<Cmpt>& st)
}
-template <class Cmpt>
+template<class Cmpt>
inline void Tensor<Cmpt>::operator=(const Vector<Vector<Cmpt> >& tr)
{
this->v_[XX] = tr.x().x();
@@ -310,7 +303,7 @@ inline void Tensor<Cmpt>::operator=(const Vector<Vector<Cmpt> >& tr)
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
//- Hodge Dual operator (tensor -> vector)
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt> operator*(const Tensor<Cmpt>& t)
{
return Vector<Cmpt>(t.yz(), -t.xz(), t.xy());
@@ -318,7 +311,7 @@ inline Vector<Cmpt> operator*(const Tensor<Cmpt>& t)
//- Hodge Dual operator (vector -> tensor)
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt> operator*(const Vector<Cmpt>& v)
{
return Tensor<Cmpt>
@@ -331,7 +324,7 @@ inline Tensor<Cmpt> operator*(const Vector<Cmpt>& v)
//- Inner-product between two tensors
-template <class Cmpt>
+template<class Cmpt>
inline typename innerProduct<Tensor<Cmpt>, Tensor<Cmpt> >::type
operator&(const Tensor<Cmpt>& t1, const Tensor<Cmpt>& t2)
{
@@ -353,7 +346,7 @@ operator&(const Tensor<Cmpt>& t1, const Tensor<Cmpt>& t2)
//- Inner-product between a tensor and a vector
-template <class Cmpt>
+template<class Cmpt>
inline typename innerProduct<Tensor<Cmpt>, Vector<Cmpt> >::type
operator&(const Tensor<Cmpt>& t, const Vector<Cmpt>& v)
{
@@ -367,7 +360,7 @@ operator&(const Tensor<Cmpt>& t, const Vector<Cmpt>& v)
//- Inner-product between a vector and a tensor
-template <class Cmpt>
+template<class Cmpt>
inline typename innerProduct<Vector<Cmpt>, Tensor<Cmpt> >::type
operator&(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
{
@@ -381,7 +374,7 @@ operator&(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
//- Outer-product between two vectors
-template <class Cmpt>
+template<class Cmpt>
inline typename outerProduct<Vector<Cmpt>, Vector<Cmpt> >::type
operator*(const Vector<Cmpt>& v1, const Vector<Cmpt>& v2)
{
@@ -395,7 +388,7 @@ operator*(const Vector<Cmpt>& v1, const Vector<Cmpt>& v2)
//- Division of a vector by a tensor, i.e. dot-product with the tensor inverse
-template <class Cmpt>
+template<class Cmpt>
inline typename innerProduct<Vector<Cmpt>, Tensor<Cmpt> >::type
operator/(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
{
@@ -406,7 +399,7 @@ operator/(const Vector<Cmpt>& v, const Tensor<Cmpt>& t)
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
//- Return the trace of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt tr(const Tensor<Cmpt>& t)
{
return t.xx() + t.yy() + t.zz();
@@ -414,7 +407,7 @@ inline Cmpt tr(const Tensor<Cmpt>& t)
//- Return the spherical part of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor<Cmpt> sph(const Tensor<Cmpt>& t)
{
return (1.0/3.0)*tr(t);
@@ -422,7 +415,7 @@ inline SphericalTensor<Cmpt> sph(const Tensor<Cmpt>& t)
//- Return the symmetric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt> symm(const Tensor<Cmpt>& t)
{
return SymmTensor<Cmpt>
@@ -435,7 +428,7 @@ inline SymmTensor<Cmpt> symm(const Tensor<Cmpt>& t)
//- Return twice the symmetric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline SymmTensor<Cmpt> twoSymm(const Tensor<Cmpt>& t)
{
return SymmTensor<Cmpt>
@@ -448,7 +441,7 @@ inline SymmTensor<Cmpt> twoSymm(const Tensor<Cmpt>& t)
//- Return the skew-symmetric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt> skew(const Tensor<Cmpt>& t)
{
return Tensor<Cmpt>
@@ -461,7 +454,7 @@ inline Tensor<Cmpt> skew(const Tensor<Cmpt>& t)
//- Return the skew-symmetric part of a symmetric tensor
-template <class Cmpt>
+template<class Cmpt>
inline const Tensor<Cmpt>& skew(const SymmTensor<Cmpt>& st)
{
return Tensor<Cmpt>::zero;
@@ -469,7 +462,7 @@ inline const Tensor<Cmpt>& skew(const SymmTensor<Cmpt>& st)
//- Return the deviatoric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt> dev(const Tensor<Cmpt>& t)
{
return t - SphericalTensor<Cmpt>::oneThirdI*tr(t);
@@ -477,7 +470,7 @@ inline Tensor<Cmpt> dev(const Tensor<Cmpt>& t)
//- Return the deviatoric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt> dev2(const Tensor<Cmpt>& t)
{
return t - SphericalTensor<Cmpt>::twoThirdsI*tr(t);
@@ -485,7 +478,7 @@ inline Tensor<Cmpt> dev2(const Tensor<Cmpt>& t)
//- Return the determinant of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt det(const Tensor<Cmpt>& t)
{
return
@@ -498,7 +491,7 @@ inline Cmpt det(const Tensor<Cmpt>& t)
//- Return the cofactor tensor of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt> cof(const Tensor<Cmpt>& t)
{
return Tensor<Cmpt>
@@ -519,7 +512,7 @@ inline Tensor<Cmpt> cof(const Tensor<Cmpt>& t)
//- Return the inverse of a tensor given the determinant
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t, const Cmpt dett)
{
return Tensor<Cmpt>
@@ -540,7 +533,7 @@ inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t, const Cmpt dett)
//- Return the inverse of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t)
{
return inv(t, det(t));
@@ -548,7 +541,7 @@ inline Tensor<Cmpt> inv(const Tensor<Cmpt>& t)
//- Return the 1st invariant of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt invariantI(const Tensor<Cmpt>& t)
{
return tr(t);
@@ -556,7 +549,7 @@ inline Cmpt invariantI(const Tensor<Cmpt>& t)
//- Return the 2nd invariant of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt invariantII(const Tensor<Cmpt>& t)
{
return
@@ -573,7 +566,7 @@ inline Cmpt invariantII(const Tensor<Cmpt>& t)
//- Return the 3rd invariant of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt invariantIII(const Tensor<Cmpt>& t)
{
return det(t);
@@ -582,7 +575,7 @@ inline Cmpt invariantIII(const Tensor<Cmpt>& t)
// * * * * * * * * * Mixed Tensor SphericalTensor Operators * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator+(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
{
@@ -595,7 +588,7 @@ operator+(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator+(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
{
@@ -608,7 +601,7 @@ operator+(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator-(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
{
@@ -621,7 +614,7 @@ operator-(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator-(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
{
@@ -635,7 +628,7 @@ operator-(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
//- Inner-product between a spherical tensor and a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
{
@@ -649,7 +642,7 @@ operator&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
//- Inner-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
{
@@ -663,7 +656,7 @@ operator&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
//- Double-dot-product between a spherical tensor and a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt
operator&&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
{
@@ -672,7 +665,7 @@ operator&&(const SphericalTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
//- Double-dot-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt
operator&&(const Tensor<Cmpt>& t1, const SphericalTensor<Cmpt>& st2)
{
@@ -714,7 +707,7 @@ public:
// * * * * * * * * * * Mixed Tensor SymmTensor Operators * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator+(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
{
@@ -727,7 +720,7 @@ operator+(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator+(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
{
@@ -740,7 +733,7 @@ operator+(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator-(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
{
@@ -753,7 +746,7 @@ operator-(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator-(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
{
@@ -767,7 +760,7 @@ operator-(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
//- Inner-product between a spherical tensor and a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator&(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
{
@@ -789,7 +782,7 @@ operator&(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
//- Inner-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor<Cmpt>
operator&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
{
@@ -811,7 +804,7 @@ operator&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
//- Double-dot-product between a spherical tensor and a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt
operator&&(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
{
@@ -825,7 +818,7 @@ operator&&(const SymmTensor<Cmpt>& st1, const Tensor<Cmpt>& t2)
//- Double-dot-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt
operator&&(const Tensor<Cmpt>& t1, const SymmTensor<Cmpt>& st2)
{
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
index a354bd038c1e2633e19966057f979db8e2cd8342..d0d22c3a3f237ad00dc7bf140b6b7c95020d3272 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2D.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -50,7 +50,7 @@ namespace Foam
Class Tensor2D Declaration
\*---------------------------------------------------------------------------*/
-template <class Cmpt>
+template<class Cmpt>
class Tensor2D
:
public VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>
diff --git a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
index 7fe348c9d348b398005fa8f599ec6849db111642..1c72d588acf951b8bb53b53bb0bd87c933791436 100644
--- a/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
+++ b/src/OpenFOAM/primitives/Tensor2D/Tensor2DI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,19 +30,19 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt>::Tensor2D()
{}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt>::Tensor2D(const VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>& vs)
:
VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>(vs)
{}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt>::Tensor2D(const SphericalTensor2D<Cmpt>& st)
{
this->v_[XX] = st.ii(); this->v_[XY] = 0;
@@ -50,7 +50,7 @@ inline Tensor2D<Cmpt>::Tensor2D(const SphericalTensor2D<Cmpt>& st)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt>::Tensor2D
(
const Vector2D<Cmpt>& x,
@@ -62,7 +62,7 @@ inline Tensor2D<Cmpt>::Tensor2D
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt>::Tensor2D
(
const Cmpt txx, const Cmpt txy,
@@ -74,7 +74,7 @@ inline Tensor2D<Cmpt>::Tensor2D
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt>::Tensor2D(Istream& is)
:
VectorSpace<Tensor2D<Cmpt>, Cmpt, 4>(is)
@@ -83,70 +83,70 @@ inline Tensor2D<Cmpt>::Tensor2D(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline Vector2D<Cmpt> Tensor2D<Cmpt>::x() const
{
return Vector2D<Cmpt>(this->v_[XX], this->v_[XY]);
}
-template <class Cmpt>
+template<class Cmpt>
inline Vector2D<Cmpt> Tensor2D<Cmpt>::y() const
{
return Vector2D<Cmpt>(this->v_[YX], this->v_[YY]);
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor2D<Cmpt>::xx() const
{
return this->v_[XX];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor2D<Cmpt>::xy() const
{
return this->v_[XY];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor2D<Cmpt>::yx() const
{
return this->v_[YX];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Tensor2D<Cmpt>::yy() const
{
return this->v_[YY];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor2D<Cmpt>::xx()
{
return this->v_[XX];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor2D<Cmpt>::xy()
{
return this->v_[XY];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor2D<Cmpt>::yx()
{
return this->v_[YX];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Tensor2D<Cmpt>::yy()
{
return this->v_[YY];
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt> Tensor2D<Cmpt>::T() const
{
return Tensor2D<Cmpt>
@@ -159,7 +159,7 @@ inline Tensor2D<Cmpt> Tensor2D<Cmpt>::T() const
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline void Tensor2D<Cmpt>::operator=(const SphericalTensor2D<Cmpt>& st)
{
this->v_[XX] = st.ii(); this->v_[XY] = 0;
@@ -171,7 +171,7 @@ inline void Tensor2D<Cmpt>::operator=(const SphericalTensor2D<Cmpt>& st)
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
//- Inner-product between two tensors
-template <class Cmpt>
+template<class Cmpt>
inline typename innerProduct<Tensor2D<Cmpt>, Tensor2D<Cmpt> >::type
operator&(const Tensor2D<Cmpt>& t1, const Tensor2D<Cmpt>& t2)
{
@@ -186,7 +186,7 @@ operator&(const Tensor2D<Cmpt>& t1, const Tensor2D<Cmpt>& t2)
}
//- Inner-product between a tensor and a vector
-template <class Cmpt>
+template<class Cmpt>
inline typename innerProduct<Tensor2D<Cmpt>, Vector2D<Cmpt> >::type
operator&(const Tensor2D<Cmpt>& t, const Vector2D<Cmpt>& v)
{
@@ -198,7 +198,7 @@ operator&(const Tensor2D<Cmpt>& t, const Vector2D<Cmpt>& v)
}
//- Inner-product between a vector and a tensor
-template <class Cmpt>
+template<class Cmpt>
inline typename innerProduct<Vector2D<Cmpt>, Tensor2D<Cmpt> >::type
operator&(const Vector2D<Cmpt>& v, const Tensor2D<Cmpt>& t)
{
@@ -210,7 +210,7 @@ operator&(const Vector2D<Cmpt>& v, const Tensor2D<Cmpt>& t)
}
//- Outer-product between two vectors
-template <class Cmpt>
+template<class Cmpt>
inline typename outerProduct<Vector2D<Cmpt>, Vector2D<Cmpt> >::type
operator*(const Vector2D<Cmpt>& v1, const Vector2D<Cmpt>& v2)
{
@@ -223,7 +223,7 @@ operator*(const Vector2D<Cmpt>& v1, const Vector2D<Cmpt>& v2)
//- Return the trace of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt tr(const Tensor2D<Cmpt>& t)
{
return t.xx() + t.yy();
@@ -231,7 +231,7 @@ inline Cmpt tr(const Tensor2D<Cmpt>& t)
//- Return the spherical part of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline SphericalTensor2D<Cmpt> sph(const Tensor2D<Cmpt>& t)
{
return 0.5*tr(t);
@@ -239,7 +239,7 @@ inline SphericalTensor2D<Cmpt> sph(const Tensor2D<Cmpt>& t)
//- Return the symmetric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt> symm(const Tensor2D<Cmpt>& t)
{
return Tensor2D<Cmpt>
@@ -250,7 +250,7 @@ inline Tensor2D<Cmpt> symm(const Tensor2D<Cmpt>& t)
}
//- Return the twice the symmetric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt> twoSymm(const Tensor2D<Cmpt>& t)
{
return Tensor2D<Cmpt>
@@ -261,7 +261,7 @@ inline Tensor2D<Cmpt> twoSymm(const Tensor2D<Cmpt>& t)
}
//- Return the skew-symmetric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt> skew(const Tensor2D<Cmpt>& t)
{
return Tensor2D<Cmpt>
@@ -273,7 +273,7 @@ inline Tensor2D<Cmpt> skew(const Tensor2D<Cmpt>& t)
//- Return the deviatoric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt> dev(const Tensor2D<Cmpt>& t)
{
return t - SphericalTensor2D<Cmpt>::oneThirdI*tr(t);
@@ -281,7 +281,7 @@ inline Tensor2D<Cmpt> dev(const Tensor2D<Cmpt>& t)
//- Return the deviatoric part of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt> dev2(const Tensor2D<Cmpt>& t)
{
return t - SphericalTensor2D<Cmpt>::twoThirdsI*tr(t);
@@ -289,7 +289,7 @@ inline Tensor2D<Cmpt> dev2(const Tensor2D<Cmpt>& t)
//- Return the determinant of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt det(const Tensor2D<Cmpt>& t)
{
return(t.xx()*t.yy() - t.xy()*t.yx());
@@ -297,7 +297,7 @@ inline Cmpt det(const Tensor2D<Cmpt>& t)
//- Return the cofactor tensor of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt> cof(const Tensor2D<Cmpt>& t)
{
return Tensor2D<Cmpt>
@@ -309,7 +309,7 @@ inline Tensor2D<Cmpt> cof(const Tensor2D<Cmpt>& t)
//- Return the inverse of a tensor given the determinant
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t, const Cmpt dett)
{
return cof(t)/dett;
@@ -317,7 +317,7 @@ inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t, const Cmpt dett)
//- Return the inverse of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t)
{
return inv(t, det(t));
@@ -325,7 +325,7 @@ inline Tensor2D<Cmpt> inv(const Tensor2D<Cmpt>& t)
//- Return the 1st invariant of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt invariantI(const Tensor2D<Cmpt>& t)
{
return tr(t);
@@ -333,7 +333,7 @@ inline Cmpt invariantI(const Tensor2D<Cmpt>& t)
//- Return the 2nd invariant of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt invariantII(const Tensor2D<Cmpt>& t)
{
return
@@ -349,7 +349,7 @@ inline Cmpt invariantII(const Tensor2D<Cmpt>& t)
//- Return the 3rd invariant of a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt invariantIII(const Tensor2D<Cmpt>& t)
{
return det(t);
@@ -358,7 +358,7 @@ inline Cmpt invariantIII(const Tensor2D<Cmpt>& t)
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt>
operator+(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
{
@@ -370,7 +370,7 @@ operator+(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt>
operator+(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
{
@@ -382,7 +382,7 @@ operator+(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt>
operator-(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
{
@@ -394,7 +394,7 @@ operator-(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt>
operator-(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
{
@@ -407,7 +407,7 @@ operator-(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
//- Inner-product between a spherical tensor and a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt>
operator&(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
{
@@ -422,7 +422,7 @@ operator&(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
//- Inner-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Tensor2D<Cmpt>
operator&(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
{
@@ -438,7 +438,7 @@ operator&(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
//- Double-dot-product between a spherical tensor and a tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt
operator&&(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
{
@@ -447,7 +447,7 @@ operator&&(const SphericalTensor2D<Cmpt>& st1, const Tensor2D<Cmpt>& t2)
//- Double-dot-product between a tensor and a spherical tensor
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt
operator&&(const Tensor2D<Cmpt>& t1, const SphericalTensor2D<Cmpt>& st2)
{
diff --git a/src/OpenFOAM/primitives/Vector/Vector.H b/src/OpenFOAM/primitives/Vector/Vector.H
index 0a59344b668eefeff730349ac7d8751abddd49cd..cb2e71d10658831f23d0fbe16efc07b8e370d175 100644
--- a/src/OpenFOAM/primitives/Vector/Vector.H
+++ b/src/OpenFOAM/primitives/Vector/Vector.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -54,7 +54,7 @@ template<class T> class List;
Class Vector Declaration
\*---------------------------------------------------------------------------*/
-template <class Cmpt>
+template<class Cmpt>
class Vector
:
public VectorSpace<Vector<Cmpt>, Cmpt, 3>
@@ -93,8 +93,9 @@ public:
//- Construct null
inline Vector();
- //- Construct given VectorSpace
- inline Vector(const VectorSpace<Vector<Cmpt>, Cmpt, 3>&);
+ //- Construct given VectorSpace of the same rank
+ template<class Cmpt2>
+ inline Vector(const VectorSpace<Vector<Cmpt2>, Cmpt2, 3>&);
//- Construct given three components
inline Vector(const Cmpt& vx, const Cmpt& vy, const Cmpt& vz);
diff --git a/src/OpenFOAM/primitives/Vector/VectorI.H b/src/OpenFOAM/primitives/Vector/VectorI.H
index 6ab90aefaac6c068da4d787c22bc30f0c034ae42..cf26a40722f7c98fedd2f78eea8ded1f81a83b1e 100644
--- a/src/OpenFOAM/primitives/Vector/VectorI.H
+++ b/src/OpenFOAM/primitives/Vector/VectorI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,22 +30,20 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct null
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt>::Vector()
{}
-// Construct given VectorSpace
-template <class Cmpt>
-inline Vector<Cmpt>::Vector(const VectorSpace<Vector<Cmpt>, Cmpt, 3>& vs)
+template<class Cmpt>
+template<class Cmpt2>
+inline Vector<Cmpt>::Vector(const VectorSpace<Vector<Cmpt2>, Cmpt2, 3>& vs)
:
VectorSpace<Vector<Cmpt>, Cmpt, 3>(vs)
{}
-// Construct given three Cmpts
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt>::Vector(const Cmpt& vx, const Cmpt& vy, const Cmpt& vz)
{
this->v_[X] = vx;
@@ -54,8 +52,7 @@ inline Vector<Cmpt>::Vector(const Cmpt& vx, const Cmpt& vy, const Cmpt& vz)
}
-// Construct from Istream
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt>::Vector(Istream& is)
:
VectorSpace<Vector<Cmpt>, Cmpt, 3>(is)
@@ -64,38 +61,38 @@ inline Vector<Cmpt>::Vector(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Vector<Cmpt>::x() const
{
return this->v_[X];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Vector<Cmpt>::y() const
{
return this->v_[Y];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Vector<Cmpt>::z() const
{
return this->v_[Z];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Vector<Cmpt>::x()
{
return this->v_[X];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Vector<Cmpt>::y()
{
return this->v_[Y];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Vector<Cmpt>::z()
{
return this->v_[Z];
@@ -104,7 +101,7 @@ inline Cmpt& Vector<Cmpt>::z()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline const Vector<Cmpt>& Vector<Cmpt>::centre
(
const Foam::List<Vector<Cmpt> >&
@@ -116,7 +113,7 @@ inline const Vector<Cmpt>& Vector<Cmpt>::centre
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline typename innerProduct<Vector<Cmpt>, Vector<Cmpt> >::type
operator&(const Vector<Cmpt>& v1, const Vector<Cmpt>& v2)
{
@@ -124,7 +121,7 @@ operator&(const Vector<Cmpt>& v1, const Vector<Cmpt>& v2)
}
-template <class Cmpt>
+template<class Cmpt>
inline Vector<Cmpt> operator^(const Vector<Cmpt>& v1, const Vector<Cmpt>& v2)
{
return Vector<Cmpt>
diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2D.H b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
index 9b5a4260bfb5f21d4909f8cb009f9a7704302b49..2f429673d1f3aa1d8f217dc26b698690eb6666d8 100644
--- a/src/OpenFOAM/primitives/Vector2D/Vector2D.H
+++ b/src/OpenFOAM/primitives/Vector2D/Vector2D.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -48,7 +48,7 @@ namespace Foam
Class Vector2D Declaration
\*---------------------------------------------------------------------------*/
-template <class Cmpt>
+template<class Cmpt>
class Vector2D
:
public VectorSpace<Vector2D<Cmpt>, Cmpt, 2>
diff --git a/src/OpenFOAM/primitives/Vector2D/Vector2DI.H b/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
index f65df35acff134b0174509b1b0c2772acc0b0100..beb077485ff14e9d4ad5f919a6865d5db14c401f 100644
--- a/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
+++ b/src/OpenFOAM/primitives/Vector2D/Vector2DI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,13 +31,13 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct null
-template <class Cmpt>
+template<class Cmpt>
inline Vector2D<Cmpt>::Vector2D()
{}
// Construct given VectorSpace
-template <class Cmpt>
+template<class Cmpt>
inline Vector2D<Cmpt>::Vector2D(const VectorSpace<Vector2D<Cmpt>, Cmpt, 2>& vs)
:
VectorSpace<Vector2D<Cmpt>, Cmpt, 2>(vs)
@@ -45,7 +45,7 @@ inline Vector2D<Cmpt>::Vector2D(const VectorSpace<Vector2D<Cmpt>, Cmpt, 2>& vs)
// Construct given three Cmpts
-template <class Cmpt>
+template<class Cmpt>
inline Vector2D<Cmpt>::Vector2D(const Cmpt& vx, const Cmpt& vy)
{
this->v_[X] = vx;
@@ -54,7 +54,7 @@ inline Vector2D<Cmpt>::Vector2D(const Cmpt& vx, const Cmpt& vy)
// Construct from Istream
-template <class Cmpt>
+template<class Cmpt>
inline Vector2D<Cmpt>::Vector2D(Istream& is)
:
VectorSpace<Vector2D<Cmpt>, Cmpt, 2>(is)
@@ -63,26 +63,26 @@ inline Vector2D<Cmpt>::Vector2D(Istream& is)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Vector2D<Cmpt>::x() const
{
return this->v_[X];
}
-template <class Cmpt>
+template<class Cmpt>
inline const Cmpt& Vector2D<Cmpt>::y() const
{
return this->v_[Y];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Vector2D<Cmpt>::x()
{
return this->v_[X];
}
-template <class Cmpt>
+template<class Cmpt>
inline Cmpt& Vector2D<Cmpt>::y()
{
return this->v_[Y];
@@ -91,7 +91,7 @@ inline Cmpt& Vector2D<Cmpt>::y()
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
-template <class Cmpt>
+template<class Cmpt>
inline typename innerProduct<Vector2D<Cmpt>, Vector2D<Cmpt> >::type
operator&(const Vector2D<Cmpt>& v1, const Vector2D<Cmpt>& v2)
{
@@ -99,7 +99,7 @@ operator&(const Vector2D<Cmpt>& v1, const Vector2D<Cmpt>& v2)
}
-template <class Cmpt>
+template<class Cmpt>
inline scalar Vector2D<Cmpt>::perp(const Vector2D<Cmpt>& b) const
{
return x()*b.y()-y()*b.x();
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
index c6980add1ea412d45cef50f8c6644efc8e5c2c31..f9bf6dfc67b2e9ced2658df060d9d0889f851332 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -107,6 +107,10 @@ public:
//- Construct as copy
inline VectorSpace(const VectorSpace<Form, Cmpt, nCmpt>&);
+ //- Construct as copy of another VectorSpace type of the same rank
+ template<class Form2, class Cmpt2>
+ inline VectorSpace(const VectorSpace<Form2, Cmpt2, nCmpt>&);
+
// Member Functions
diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
index 82ecce7f06d0d73732731697fbd458fef02f0898..70ccf2a1856a34cbd62dc86dbc931e3d8b2cf657 100644
--- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
+++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -50,6 +50,17 @@ inline VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
}
+template<class Form, class Cmpt, int nCmpt>
+template<class Form2, class Cmpt2>
+inline VectorSpace<Form, Cmpt, nCmpt>::VectorSpace
+(
+ const VectorSpace<Form2, Cmpt2, nCmpt>& vs
+)
+{
+ VectorSpaceOps<nCmpt,0>::eqOp(*this, vs, eqOp<Cmpt>());
+}
+
+
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Form, class Cmpt, int nCmpt>
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
index ae9d512529b037937086aa067ae12b03cb592dca..4b2080fbf9872acb0ffaca17d2ea21193ac0a4b8 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -103,14 +103,14 @@ class fvMeshDistribute
label findNonEmptyPatch() const;
//- Save boundary fields
- template <class T, class Mesh>
+ template<class T, class Mesh>
void saveBoundaryFields
(
PtrList<FieldField<fvsPatchField, T> >& bflds
) const;
//- Map boundary fields
- template <class T, class Mesh>
+ template<class T, class Mesh>
void mapBoundaryFields
(
const mapPolyMesh& map,
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
index a09d538083c93c41a032d55aeace7536b6c890d4..2c92a072fa3a2f7d29c0681eff4d4ba09d366381 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -56,7 +56,7 @@ void Foam::fvMeshDistribute::printFieldInfo(const fvMesh& mesh)
// Save whole boundary field
-template <class T, class Mesh>
+template<class T, class Mesh>
void Foam::fvMeshDistribute::saveBoundaryFields
(
PtrList<FieldField<fvsPatchField, T> >& bflds
@@ -85,7 +85,7 @@ void Foam::fvMeshDistribute::saveBoundaryFields
// Map boundary field
-template <class T, class Mesh>
+template<class T, class Mesh>
void Foam::fvMeshDistribute::mapBoundaryFields
(
const mapPolyMesh& map,
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
index d1f847629252723372fcc77d6ba10353b0311f59..ce04d65990a60c3be98c42e1446d2c5d005d4e50 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
+++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -49,7 +49,7 @@ const Foam::scalar Foam::topoCellLooper::featureCos = Foam::cos(degToRad(10.0));
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// In-memory truncate a list
-template <class T>
+template<class T>
void Foam::topoCellLooper::subsetList
(
const label startI,
diff --git a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
index 8804f4c46bed62c26be7022644ce55fa8220d754..2e33ef880fe46b5185e85888fc8f5a02f4143643 100644
--- a/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
+++ b/src/dynamicMesh/meshCut/cellLooper/topoCellLooper.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -72,7 +72,7 @@ class topoCellLooper
// Private Member Functions
//- In-memory truncate a list
- template <class T>
+ template<class T>
static void subsetList
(
const label startI,
diff --git a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H
index 2f0fdd004f7c8f6c07fdf45be636d1fd5110ae55..c2c77f7384ae468ec84e72a7e80bce20d0e375ee 100644
--- a/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H
+++ b/src/dynamicMesh/meshCut/directions/directionInfo/directionInfoI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -285,7 +285,7 @@ inline bool Foam::directionInfo::updateFace
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::directionInfo::equal
(
const directionInfo& rhs,
diff --git a/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H b/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H
index 2e584576800671cb6c76d528fae563aa41e32b58..e24734607b813da582b3ab4ac79280fd2401af58 100644
--- a/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H
+++ b/src/dynamicMesh/meshCut/wallLayerCells/wallNormalInfo/wallNormalInfoI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -194,7 +194,7 @@ inline bool Foam::wallNormalInfo::updateFace
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::wallNormalInfo::equal
(
const wallNormalInfo& rhs,
diff --git a/src/dynamicMesh/motionSmoother/motionSmoother.H b/src/dynamicMesh/motionSmoother/motionSmoother.H
index fe4073c1b5a450d4871b5663d57580f8b2a9d96e..ee5432ad4ec4218768f8226a95770ecd71915897 100644
--- a/src/dynamicMesh/motionSmoother/motionSmoother.H
+++ b/src/dynamicMesh/motionSmoother/motionSmoother.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -179,7 +179,7 @@ class motionSmoother
// Private Member Functions
//- Average of connected points.
- template <class Type>
+ template<class Type>
tmp<GeometricField<Type, pointPatchField, pointMesh> > avg
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
@@ -187,7 +187,7 @@ class motionSmoother
) const;
//- Average postion of connected points.
- template <class Type>
+ template<class Type>
tmp<GeometricField<Type, pointPatchField, pointMesh> > avgPositions
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
@@ -510,7 +510,7 @@ public:
//- Fully explicit smoothing of fields (not positions)
// of internal points with varying diffusivity.
- template <class Type>
+ template<class Type>
void smooth
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
index 74a255dc854a93d6a6cf1355c9a3d590249947fc..89667aade37ff693125799db48ff47b2a4d0a05d 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -153,7 +153,7 @@ void Foam::motionSmoother::applyCornerConstraints
// Average of connected points.
-template <class Type>
+template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
Foam::motionSmoother::avg
(
@@ -252,7 +252,7 @@ Foam::motionSmoother::avg
// smooth field (point-jacobi)
-template <class Type>
+template<class Type>
void Foam::motionSmoother::smooth
(
const GeometricField<Type, pointPatchField, pointMesh>& fld,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H
index 76bcdf4753da00b906857b4f8e0d1ebe7f8ffc68..84a11d1cbe657365bdcdc40e9c66ae03d469313f 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/pointEdgeCollapse/pointEdgeCollapseI.H
@@ -266,7 +266,7 @@ inline bool Foam::pointEdgeCollapse::updateEdge
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::pointEdgeCollapse::equal
(
const pointEdgeCollapse& rhs,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeTemplates.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeTemplates.C
index b55c89e6ee108555b8d5af2d783c7f2b48fe9faf..69da6c4a2ece2802acbafc31a02bb5bfcc0f5e09 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeTemplates.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChangeTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class T>
+template<class T>
void Foam::polyTopoChange::reorder
(
const labelList& oldToNew,
@@ -49,7 +49,7 @@ void Foam::polyTopoChange::reorder
}
-template <class T>
+template<class T>
void Foam::polyTopoChange::reorder
(
const labelList& oldToNew,
@@ -71,7 +71,7 @@ void Foam::polyTopoChange::reorder
}
-template <class T>
+template<class T>
void Foam::polyTopoChange::renumberKey
(
const labelList& oldToNew,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDataI.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDataI.H
index fa519750241a56deedff0aed42fdce46634aa24b..edf115b3a88abc7dc9583ce3cb522ff969e79382 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDataI.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDataI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -236,7 +236,7 @@ inline bool Foam::refinementData::updateFace
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::refinementData::equal
(
const refinementData& rhs,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDistanceDataI.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDistanceDataI.H
index 33045f2541d00b734b8c09f317b97c73598b3db5..28d24017751c0a651ec899b7ffa953e50595e1a6 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDistanceDataI.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/refinementDistanceDataI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -260,7 +260,7 @@ inline bool Foam::refinementDistanceData::updateFace
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::refinementDistanceData::equal
(
const refinementDistanceData& rhs,
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
index e0ea2e41af4a239e150b22746e9ba87a8ffd833d..b628afde9a6ed642b2d5772df9503a27dcf3e318 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -44,7 +44,7 @@ defineTypeNameAndDebug(removePoints, 0);
//- Combine-reduce operator to combine data on faces. Takes care
// of reverse orientation on coupled face.
-template <class T, template<class> class CombineOp>
+template<class T, template<class> class CombineOp>
class faceEqOp
{
@@ -73,7 +73,7 @@ public:
//// Dummy transform for List. Used in synchronisation.
-//template <class T>
+//template<class T>
//class dummyTransformList
//{
//public:
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index bd6bf3107c6199f1132c3344a26c2bebd77c20d5..66729d197c2d4603cc4eea1b010b15d3577ffdf3 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -55,18 +55,20 @@ extendedStencil = fvMesh/extendedStencil
cellToCell = $(extendedStencil)/cellToCell
$(cellToCell)/extendedCellToCellStencil.C
$(cellToCell)/extendedCentredCellToCellStencil.C
-$(cellToCell)/fullStencils/cellToCellStencil.C
-$(cellToCell)/fullStencils/CFCCellToCellStencil.C
-$(cellToCell)/fullStencils/CPCCellToCellStencil.C
-$(cellToCell)/fullStencils/CECCellToCellStencil.C
+$(cellToCell)/globalIndexStencils/cellToCellStencil.C
+$(cellToCell)/globalIndexStencils/CFCCellToCellStencil.C
+$(cellToCell)/globalIndexStencils/CPCCellToCellStencil.C
+$(cellToCell)/globalIndexStencils/CECCellToCellStencil.C
$(cellToCell)/MeshObjects/centredCECCellToCellStencilObject.C
+$(cellToCell)/MeshObjects/centredCFCCellToCellStencilObject.C
+$(cellToCell)/MeshObjects/centredCPCCellToCellStencilObject.C
cellToFace = $(extendedStencil)/cellToFace
-$(cellToFace)/fullStencils/cellToFaceStencil.C
-$(cellToFace)/fullStencils/CFCCellToFaceStencil.C
-$(cellToFace)/fullStencils/CECCellToFaceStencil.C
-$(cellToFace)/fullStencils/CPCCellToFaceStencil.C
-$(cellToFace)/fullStencils/FECCellToFaceStencil.C
+$(cellToFace)/globalIndexStencils/cellToFaceStencil.C
+$(cellToFace)/globalIndexStencils/CFCCellToFaceStencil.C
+$(cellToFace)/globalIndexStencils/CECCellToFaceStencil.C
+$(cellToFace)/globalIndexStencils/CPCCellToFaceStencil.C
+$(cellToFace)/globalIndexStencils/FECCellToFaceStencil.C
$(cellToFace)/extendedCellToFaceStencil.C
$(cellToFace)/extendedCentredCellToFaceStencil.C
$(cellToFace)/extendedUpwindCellToFaceStencil.C
@@ -81,8 +83,8 @@ $(cellToFace)/MeshObjects/upwindFECCellToFaceStencilObject.C
$(cellToFace)/MeshObjects/pureUpwindCFCCellToFaceStencilObject.C
faceToCell = $(extendedStencil)/faceToCell
-$(faceToCell)/fullStencils/faceToCellStencil.C
-$(faceToCell)/fullStencils/CFCFaceToCellStencil.C
+$(faceToCell)/globalIndexStencils/faceToCellStencil.C
+$(faceToCell)/globalIndexStencils/CFCFaceToCellStencil.C
$(faceToCell)/extendedFaceToCellStencil.C
$(faceToCell)/extendedCentredFaceToCellStencil.C
$(faceToCell)/MeshObjects/centredCFCFaceToCellStencilObject.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
index 47fd87059f95fc8ed8cb38603b71bcde71c5ad8e..42d52401d8701e17e4fabdfb6e4cca1c7a959e1c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/oscillatingFixedValue/oscillatingFixedValueFvPatchField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -104,7 +104,11 @@ oscillatingFixedValueFvPatchField<Type>::oscillatingFixedValueFvPatchField
}
else
{
- fixedValueFvPatchField<Type>::operator==(refValue_*currentScale());
+ fixedValueFvPatchField<Type>::operator==
+ (
+ refValue_*currentScale()
+ + offset_
+ );
}
}
@@ -179,9 +183,11 @@ void oscillatingFixedValueFvPatchField<Type>::updateCoeffs()
if (curTimeIndex_ != this->db().time().timeIndex())
{
- Field<Type>& patchField = *this;
-
- patchField = refValue_*currentScale() + offset_;
+ fixedValueFvPatchField<Type>::operator==
+ (
+ refValue_*currentScale()
+ + offset_
+ );
curTimeIndex_ = this->db().time().timeIndex();
}
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/smoothDataI.H b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/smoothDataI.H
index 162389fb80087fa45ae8821b2d83a64c59814381..fa39a6e09452bb5b5b1adbfab93c1289f53251c8 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/smoothDataI.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/smoothDataI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -177,7 +177,7 @@ inline bool Foam::smoothData::updateFace
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::smoothData::equal
(
const smoothData& rhs,
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/sweepDataI.H b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/sweepDataI.H
index 1cd43e52de92afd8e7576f209338e01ccf01333d..0668fad184d1732f6b6f0dbc12890fa9bf157622 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/sweepDataI.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/sweepDataI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -193,7 +193,7 @@ inline bool Foam::sweepData::updateFace
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::sweepData::equal
(
const sweepData& rhs,
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/MeshObjects/centredCFCCellToCellStencilObject.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/MeshObjects/centredCFCCellToCellStencilObject.C
new file mode 100644
index 0000000000000000000000000000000000000000..422e10de1993dc5cad95ce750ced602974161cb7
--- /dev/null
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/MeshObjects/centredCFCCellToCellStencilObject.C
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\/ 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "centredCFCCellToCellStencilObject.H"
+
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(centredCFCCellToCellStencilObject, 0);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/MeshObjects/centredCFCCellToCellStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/MeshObjects/centredCFCCellToCellStencilObject.H
new file mode 100644
index 0000000000000000000000000000000000000000..ccc559d242c74fa1e2f0e5e7c12a58babe4b5c76
--- /dev/null
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/MeshObjects/centredCFCCellToCellStencilObject.H
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\/ 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::centredCFCCellToCellStencilObject
+
+Description
+
+SourceFiles
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef centredCFCCellToCellStencilObject_H
+#define centredCFCCellToCellStencilObject_H
+
+#include "extendedCentredCellToCellStencil.H"
+#include "CFCCellToCellStencil.H"
+#include "MeshObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class centredCFCCellToCellStencilObject Declaration
+\*---------------------------------------------------------------------------*/
+
+class centredCFCCellToCellStencilObject
+:
+ public MeshObject<fvMesh, centredCFCCellToCellStencilObject>,
+ public extendedCentredCellToCellStencil
+{
+
+public:
+
+ TypeName("centredCFCCellToCellStencil");
+
+ // Constructors
+
+ //- Construct from uncompacted cell stencil
+ explicit centredCFCCellToCellStencilObject
+ (
+ const fvMesh& mesh
+ )
+ :
+ MeshObject<fvMesh, centredCFCCellToCellStencilObject>(mesh),
+ extendedCentredCellToCellStencil(CFCCellToCellStencil(mesh))
+ {}
+
+
+ //- Destructor
+ virtual ~centredCFCCellToCellStencilObject()
+ {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/MeshObjects/centredCPCCellToCellStencilObject.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/MeshObjects/centredCPCCellToCellStencilObject.C
new file mode 100644
index 0000000000000000000000000000000000000000..7a3146c6648dfa052bd69de678de6698599dc1ce
--- /dev/null
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/MeshObjects/centredCPCCellToCellStencilObject.C
@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\/ 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "centredCPCCellToCellStencilObject.H"
+
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+ defineTypeNameAndDebug(centredCPCCellToCellStencilObject, 0);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/MeshObjects/centredCPCCellToCellStencilObject.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/MeshObjects/centredCPCCellToCellStencilObject.H
new file mode 100644
index 0000000000000000000000000000000000000000..e2799a468c3e2daf777278d77767e211ecdcbd82
--- /dev/null
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/MeshObjects/centredCPCCellToCellStencilObject.H
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\/ 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+ Foam::centredCPCCellToCellStencilObject
+
+Description
+
+SourceFiles
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef centredCPCCellToCellStencilObject_H
+#define centredCPCCellToCellStencilObject_H
+
+#include "extendedCentredCellToCellStencil.H"
+#include "CPCCellToCellStencil.H"
+#include "MeshObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+ Class centredCPCCellToCellStencilObject Declaration
+\*---------------------------------------------------------------------------*/
+
+class centredCPCCellToCellStencilObject
+:
+ public MeshObject<fvMesh, centredCPCCellToCellStencilObject>,
+ public extendedCentredCellToCellStencil
+{
+
+public:
+
+ TypeName("centredCPCCellToCellStencil");
+
+ // Constructors
+
+ //- Construct from uncompacted cell stencil
+ explicit centredCPCCellToCellStencilObject
+ (
+ const fvMesh& mesh
+ )
+ :
+ MeshObject<fvMesh, centredCPCCellToCellStencilObject>(mesh),
+ extendedCentredCellToCellStencil(CPCCellToCellStencil(mesh))
+ {}
+
+
+ //- Destructor
+ virtual ~centredCPCCellToCellStencilObject()
+ {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
index 57e6b2c6245941ca965e88335c4d5a227d0feaa8..dee4ee411c34960aa2d7c04ef24ba07651d833de 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencil.H
@@ -68,24 +68,23 @@ public:
// Member Functions
-// //- Use map to get the data into stencil order
-// template<class T>
-// static void collectData
-// (
-// const mapDistribute& map,
-// const labelListList& stencil,
-// const GeometricField<T, fvsPatchField, surfaceMesh>& fld,
-// List<List<T> >& stencilFld
-// );
-//
//- Sum surface field contributions to create cell values
- template<class Type>
- static tmp<GeometricField<Type, fvPatchField, volMesh> > weightedSum
+ template<class Type, class WeightType>
+ static
+ tmp
+ <
+ GeometricField
+ <
+ typename outerProduct<WeightType, Type>::type,
+ fvPatchField,
+ volMesh
+ >
+ > weightedSum
(
const mapDistribute& map,
const labelListList& stencil,
const GeometricField<Type, fvPatchField, volMesh>& fld,
- const List<List<scalar> >& stencilWeights
+ const List<List<WeightType> >& stencilWeights
);
};
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
index b9307adad700b629d36cbc3b322c577fd9108f3a..85c27293c29c47e2ab200c4fccd272a5e5c91d7f 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C
@@ -24,28 +24,40 @@ License
\*---------------------------------------------------------------------------*/
#include "extendedCellToCellStencil.H"
+#include "extendedCellToFaceStencil.H"
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template<class Type>
-Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh> >
-Foam::extendedCellToCellStencil::weightedSum
+template<class Type, class WeightType>
+Foam::tmp
+<
+ Foam::GeometricField
+ <
+ typename Foam::outerProduct<WeightType, Type>::type,
+ Foam::fvPatchField,
+ Foam::volMesh
+ >
+> Foam::extendedCellToCellStencil::weightedSum
(
const mapDistribute& map,
const labelListList& stencil,
const GeometricField<Type, fvPatchField, volMesh>& fld,
- const List<List<scalar> >& stencilWeights
+ const List<List<WeightType> >& stencilWeights
)
{
+ typedef typename outerProduct<WeightType, Type>::type WeightedType;
+ typedef GeometricField<WeightedType, fvPatchField, volMesh>
+ WeightedFieldType;
+
const fvMesh& mesh = fld.mesh();
// Collect internal and boundary values
List<List<Type> > stencilFld;
- collectData(map, stencil, fld, stencilFld);
+ extendedCellToFaceStencil::collectData(map, stencil, fld, stencilFld);
- tmp<GeometricField<Type, fvPatchField, volMesh> > tsfCorr
+ tmp<WeightedFieldType> twf
(
- new GeometricField<Type, fvPatchField, volMesh>
+ new WeightedFieldType
(
IOobject
(
@@ -54,31 +66,31 @@ Foam::extendedCellToCellStencil::weightedSum
mesh
),
mesh,
- dimensioned<Type>
+ dimensioned<WeightedType>
(
fld.name(),
fld.dimensions(),
- pTraits<Type>::zero
+ pTraits<WeightedType>::zero
)
)
);
- GeometricField<Type, fvPatchField, volMesh>& sf = tsfCorr();
+ WeightedFieldType& wf = twf();
// cells
- forAll(sf, cellI)
+ forAll(wf, cellI)
{
const List<Type>& stField = stencilFld[cellI];
- const List<scalar>& stWeight = stencilWeights[cellI];
+ const List<WeightType>& stWeight = stencilWeights[cellI];
forAll(stField, i)
{
- sf[cellI] += stField[i]*stWeight[i];
+ wf[cellI] += stWeight[i]*stField[i];
}
}
// Boundaries values?
- return tsfCorr;
+ return twf;
}
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
index e2cc865ce463a2d64992f7b63fc47adc9554fd70..f325a1fcc83c050cbccbe548f9f4e73b4381927a 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCentredCellToCellStencil.H
@@ -116,14 +116,22 @@ public:
}
//- Sum vol field contributions to create cell values
- template<class Type>
- tmp<GeometricField<Type, fvPatchField, volMesh> > weightedSum
+ template<class Type, class WeightType>
+ tmp
+ <
+ GeometricField
+ <
+ typename outerProduct<WeightType, Type>::type,
+ fvPatchField,
+ volMesh
+ >
+ > weightedSum
(
const GeometricField<Type, fvPatchField, volMesh>& fld,
- const List<List<scalar> >& stencilWeights
+ const List<List<WeightType> >& stencilWeights
) const
{
- return weightedSum
+ return extendedCellToCellStencil::weightedSum
(
map(),
stencil(),
@@ -131,7 +139,6 @@ public:
stencilWeights
);
}
-
};
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CECCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.C
similarity index 98%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CECCellToCellStencil.C
rename to src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.C
index 20b63d824f2719da17e59785cef974090af250ef..7d2d6648c45ddce45c58f5f40aaf61ae881d28af 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CECCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CECCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.H
similarity index 97%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CECCellToCellStencil.H
rename to src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.H
index 7205c93fa805f54888f44d1e1137f069906d3445..df7733c46dc002c2dbe2c0c63e0dba99ff313afc 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CECCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CECCellToCellStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CFCCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C
similarity index 98%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CFCCellToCellStencil.C
rename to src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C
index dd0f4050c18dc94a0fd09b15637c753cb8d3091a..d034b9549cf3a71b3df205fbcc0c8c7265569928 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CFCCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CFCCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.H
similarity index 96%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CFCCellToCellStencil.H
rename to src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.H
index 1bbfe7e611d48b8c30a708c029b1f63fbc7398f6..6c7edac71e1918d4018647bd27c28e3c399b3123 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CFCCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CFCCellToCellStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CPCCellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
similarity index 98%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CPCCellToCellStencil.C
rename to src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
index 5a581f24dde13ef4a801f61893f17d1728d2c5b3..024bb7e2acffded88d0ef387457b39db9bf6d69c 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CPCCellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CPCCellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.H
similarity index 97%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CPCCellToCellStencil.H
rename to src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.H
index a216673f05c7d1dbe69d3226efeace98afda5bc0..4bb75f2ddf479284031f5a4b65d1e7702bab190e 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/CPCCellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/CPCCellToCellStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/cellToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
similarity index 99%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/cellToCellStencil.C
rename to src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
index 6d784532aed0d6084bc1f560cce22d4be8c5f5f9..c2bc9d7e7ff0056876fd01135aab971c78649888 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/cellToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/cellToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.H
similarity index 98%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/cellToCellStencil.H
rename to src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.H
index e31b6395aae4ae4b0e8b8220bb30560c072cc6b9..cb8dd8592763d33085046e0d0cb3437ccd0d0d7a 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/fullStencils/cellToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/globalIndexStencils/cellToCellStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CECCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CECCellToFaceStencil.C
similarity index 95%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CECCellToFaceStencil.C
rename to src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CECCellToFaceStencil.C
index 30dfc852a604e7c18900ff52e5e610fb36a0c3e4..fdce95c55024dca5307453bfd5c1f3d55ed47e26 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CECCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CECCellToFaceStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CECCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CECCellToFaceStencil.H
similarity index 96%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CECCellToFaceStencil.H
rename to src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CECCellToFaceStencil.H
index c6ced6d6fab6e96090cc876eadc22c48b65a4f02..92fe51edabffa6a588dcb773a78f873596a23c6c 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CECCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CECCellToFaceStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CFCCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CFCCellToFaceStencil.C
similarity index 96%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CFCCellToFaceStencil.C
rename to src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CFCCellToFaceStencil.C
index 5a77cab318c4e512612c1468bd0f62f75fd3660d..e7cb4c43dc0eb6b7cda9b9b1caa2a3266b196010 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CFCCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CFCCellToFaceStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CFCCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CFCCellToFaceStencil.H
similarity index 96%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CFCCellToFaceStencil.H
rename to src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CFCCellToFaceStencil.H
index ea040a544d7c47e5aca17839915459625620b0fc..bef19a852e4a0ff8fef7015355fd2a1a5ad594b0 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CFCCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CFCCellToFaceStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CPCCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CPCCellToFaceStencil.C
similarity index 96%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CPCCellToFaceStencil.C
rename to src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CPCCellToFaceStencil.C
index 0cc2306779ac69cd2595f1ee75ea5623a9a76a5c..39b57ab9c1231f1e542e63e9a50fd5d261e23f10 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CPCCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CPCCellToFaceStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CPCCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CPCCellToFaceStencil.H
similarity index 96%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CPCCellToFaceStencil.H
rename to src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CPCCellToFaceStencil.H
index 17742e47f4c4ab0ed26ca96452e665cd2565d234..77cbffd3826059e4532fdf979489c8cbb1eef407 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/CPCCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/CPCCellToFaceStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/FECCellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
similarity index 99%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/FECCellToFaceStencil.C
rename to src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
index 4d171aa7177ca0961c0c635ea9391511a4a70165..78425f1190b64b7bd42c0efd65082290f0e9e8cf 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/FECCellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/FECCellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.H
similarity index 97%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/FECCellToFaceStencil.H
rename to src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.H
index dab62919ad0ee71dcdcb70436f7e52516e12557c..6d85ea414e51d51f3ea094ff15f3a12c8b839d67 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/FECCellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/FECCellToFaceStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/cellToFaceStencil.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
similarity index 99%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/cellToFaceStencil.C
rename to src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
index 8c5ccbff7a17dc14b73271f5cc61b1a60a4d229a..c57cf9e1005315518756342b33a9d48aba5ea5fc 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/cellToFaceStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/cellToFaceStencil.H b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.H
similarity index 98%
rename from src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/cellToFaceStencil.H
rename to src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.H
index d29130b20c3bcb77c7f48bae1a1a58815504c400..1b325ac3f54d3fd7e7253029845382a234bb807e 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/fullStencils/cellToFaceStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/globalIndexStencils/cellToFaceStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/CFCFaceToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.C
similarity index 98%
rename from src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/CFCFaceToCellStencil.C
rename to src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.C
index 6e7a53a8d23000ccd4e49a4d94b5537472dd28d1..7e49959a8bad1d9686826ea14e203607100b5724 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/CFCFaceToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/CFCFaceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.H
similarity index 96%
rename from src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/CFCFaceToCellStencil.H
rename to src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.H
index 7f0619d0ea826bb36a3e4cd6d72a0b54fd7f007e..29c083449e8a39f867a72d049360f6fbc26afc27 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/CFCFaceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/CFCFaceToCellStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/faceToCellStencil.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/faceToCellStencil.C
similarity index 95%
rename from src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/faceToCellStencil.C
rename to src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/faceToCellStencil.C
index 69bdd9a6004d85fc07efd83bbebcd8a811b4bae8..ac7f8b7ff08e12fdaba309eb96fbe00068ccbc4f 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/faceToCellStencil.C
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/faceToCellStencil.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/faceToCellStencil.H b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/faceToCellStencil.H
similarity index 97%
rename from src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/faceToCellStencil.H
rename to src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/faceToCellStencil.H
index 4e64c865c4da2e9475d7488d48d2bb4d34a1ca50..f46e14b22fdc87407435057b881fdf5181f2b124 100644
--- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/fullStencils/faceToCellStencil.H
+++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/globalIndexStencils/faceToCellStencil.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
index acb74235b78c3e7b440a1ffae29ec802c3327d79..d65fcc672bfe6314345109f705bda907ef46fc55 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/pointEdgeStructuredWalkI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -264,7 +264,7 @@ inline bool Foam::pointEdgeStructuredWalk::updateEdge
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::pointEdgeStructuredWalk::equal
(
const pointEdgeStructuredWalk& rhs,
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C
index 7ec34aad080ab6de1c8c769ee05b61c82cfb2666..378e58621f97eef9f360c7eb6f3ca2060f0a59c3 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class ParcelType>
+template<class ParcelType>
Foam::DsmcParcel<ParcelType>::DsmcParcel
(
const polyMesh& mesh,
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
index f7672204d0f5be1a09e68410994d025f00326ff4..9c0540bd0b5c22cb3317bc75497bda8407487d0c 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ using namespace Foam::constant::mathematical;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::energyRatio
(
scalar ChiA,
@@ -91,7 +91,7 @@ Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::energyRatio
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::
LarsenBorgnakkeVariableHardSphere
(
@@ -110,7 +110,7 @@ LarsenBorgnakkeVariableHardSphere
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::
~LarsenBorgnakkeVariableHardSphere()
{}
@@ -125,7 +125,7 @@ bool Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::active() const
}
-template <class CloudType>
+template<class CloudType>
Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::sigmaTcR
(
const typename CloudType::parcelType& pP,
@@ -174,7 +174,7 @@ Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::sigmaTcR
}
-template <class CloudType>
+template<class CloudType>
void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
(
typename CloudType::parcelType& pP,
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
index f5fc9ec0384d6accfd6e78d41fdbf05ef668cf8c..2f2de553197d1be2f65f3697261015d80ffdb4b6 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ using namespace Foam::constant::mathematical;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::NoBinaryCollision<CloudType>::NoBinaryCollision
(
const dictionary& dict,
@@ -43,7 +43,7 @@ Foam::NoBinaryCollision<CloudType>::NoBinaryCollision
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::NoBinaryCollision<CloudType>::~NoBinaryCollision()
{}
@@ -57,7 +57,7 @@ bool Foam::NoBinaryCollision<CloudType>::active() const
}
-template <class CloudType>
+template<class CloudType>
Foam::scalar Foam::NoBinaryCollision<CloudType>::sigmaTcR
(
const typename CloudType::parcelType& pP,
@@ -82,7 +82,7 @@ Foam::scalar Foam::NoBinaryCollision<CloudType>::sigmaTcR
}
-template <class CloudType>
+template<class CloudType>
void Foam::NoBinaryCollision<CloudType>::collide
(
typename CloudType::parcelType& pP,
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
index 1aa69335e1ea36c10bc496266ef0854adbba29f0..53bd85065ad422af316aa10d93b129cb63b2cdc9 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ using namespace Foam::constant::mathematical;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::VariableHardSphere<CloudType>::VariableHardSphere
(
const dictionary& dict,
@@ -44,7 +44,7 @@ Foam::VariableHardSphere<CloudType>::VariableHardSphere
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::VariableHardSphere<CloudType>::~VariableHardSphere()
{}
@@ -58,7 +58,7 @@ bool Foam::VariableHardSphere<CloudType>::active() const
}
-template <class CloudType>
+template<class CloudType>
Foam::scalar Foam::VariableHardSphere<CloudType>::sigmaTcR
(
const typename CloudType::parcelType& pP,
@@ -107,7 +107,7 @@ Foam::scalar Foam::VariableHardSphere<CloudType>::sigmaTcR
}
-template <class CloudType>
+template<class CloudType>
void Foam::VariableHardSphere<CloudType>::collide
(
typename CloudType::parcelType& pP,
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
index 34ceb5744d811421bb13c08c908866d7c8c33b1e..725c97f3827df949196a1b595b62a0b9f433c54a 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ using namespace Foam::constant::mathematical;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::FreeStream<CloudType>::FreeStream
(
const dictionary& dict,
@@ -116,14 +116,14 @@ Foam::FreeStream<CloudType>::FreeStream
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::FreeStream<CloudType>::~FreeStream()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
void Foam::FreeStream<CloudType>::inflow()
{
CloudType& cloud(this->owner());
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
index 3450c9ca4c77782147dbf6041425bb38ed0bf993..2e66fbbb88c5efd776be3e8be81510727265fc54 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::NoInflow<CloudType>::NoInflow
(
const dictionary& dict,
@@ -40,14 +40,14 @@ Foam::NoInflow<CloudType>::NoInflow
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::NoInflow<CloudType>::~NoInflow()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
void Foam::NoInflow<CloudType>::inflow()
{}
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
index 27faac9e72482c58b2a61a7f9e7a0f10461b4bc8..bad0545f1ad62b3a84d10ff3c47232268b501e23 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ using namespace Foam::constant;
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::MaxwellianThermal<CloudType>::MaxwellianThermal
(
const dictionary& dict,
@@ -43,14 +43,14 @@ Foam::MaxwellianThermal<CloudType>::MaxwellianThermal
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::MaxwellianThermal<CloudType>::~MaxwellianThermal()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
void Foam::MaxwellianThermal<CloudType>::correct
(
typename CloudType::parcelType& p,
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
index da0ec1b0827904b838bcd3d14e93d8fc4229418c..19273a756e9c2c8f9343bbd0a792cebdbc54c189 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::MixedDiffuseSpecular<CloudType>::MixedDiffuseSpecular
(
const dictionary& dict,
@@ -41,14 +41,14 @@ Foam::MixedDiffuseSpecular<CloudType>::MixedDiffuseSpecular
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::MixedDiffuseSpecular<CloudType>::~MixedDiffuseSpecular()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
void Foam::MixedDiffuseSpecular<CloudType>::correct
(
typename CloudType::parcelType& p,
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
index 06b12fbafbe068f5b6e5e9b28285503b3049ef01..1161600af5fefe7d13c297b7bdf71164e071790d 100644
--- a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::SpecularReflection<CloudType>::SpecularReflection
(
const dictionary& dict,
@@ -42,14 +42,14 @@ Foam::SpecularReflection<CloudType>::SpecularReflection
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::SpecularReflection<CloudType>::~SpecularReflection()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
void Foam::SpecularReflection<CloudType>::correct
(
typename CloudType::parcelType& p,
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index f1b58c79ca24ae660a46e4ee54446eb8c435f57b..6956a8b74cf80ff284e12d90760b88c528971a46 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -341,21 +341,21 @@ inline const Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb() const
}
-template <class ParcelType>
+template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::rhoc() const
{
return rhoc_;
}
-template <class ParcelType>
+template<class ParcelType>
inline const Foam::vector& Foam::KinematicParcel<ParcelType>::Uc() const
{
return Uc_;
}
-template <class ParcelType>
+template<class ParcelType>
inline Foam::scalar Foam::KinematicParcel<ParcelType>::muc() const
{
return muc_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.C
index ae8d7963445e1cb1fa92558a909c323ac82acf65..d2701fbdc8e34455d35ff5c5e695dc0919ff0660 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/MultiInteraction/MultiInteraction.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -110,7 +110,7 @@ Foam::MultiInteraction<CloudType>::MultiInteraction
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::MultiInteraction<CloudType>::~MultiInteraction()
{}
@@ -131,7 +131,7 @@ bool Foam::MultiInteraction<CloudType>::active() const
}
-template <class CloudType>
+template<class CloudType>
bool Foam::MultiInteraction<CloudType>::correct
(
typename CloudType::parcelType& p,
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
index 9bbd82d21f10e418ba833bc3a79b97e515f1583d..b93d687c209ef7775a97448267f9bf09792bdd01 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -441,7 +441,7 @@ void Foam::SprayParcel<ParcelType>::solveTABEq
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class ParcelType>
+template<class ParcelType>
Foam::SprayParcel<ParcelType>::SprayParcel(const SprayParcel<ParcelType>& p)
:
ParcelType(p),
@@ -459,7 +459,7 @@ Foam::SprayParcel<ParcelType>::SprayParcel(const SprayParcel<ParcelType>& p)
{}
-template <class ParcelType>
+template<class ParcelType>
Foam::SprayParcel<ParcelType>::SprayParcel
(
const SprayParcel<ParcelType>& p,
diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
index cdca04af29c5c2e0a7b62563bc7d43cf7085d59e..f4d443f92a7bc27a2f3bf70d87b7678f1725c8f8 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelIO.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -28,7 +28,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-template <class ParcelType>
+template<class ParcelType>
Foam::string Foam::SprayParcel<ParcelType>::propHeader =
ParcelType::propHeader
+ " d0"
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C b/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C
index 51661a89718e9e76b9d2a3cf85a7b00e18b4daa3..c3424551367aebf4e8e1bc0c9d392b9b92a853f7 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::BlobsSheetAtomization<CloudType>::BlobsSheetAtomization
(
const dictionary& dict,
@@ -40,7 +40,7 @@ Foam::BlobsSheetAtomization<CloudType>::BlobsSheetAtomization
{}
-template <class CloudType>
+template<class CloudType>
Foam::BlobsSheetAtomization<CloudType>::BlobsSheetAtomization
(
const BlobsSheetAtomization<CloudType>& am
@@ -54,7 +54,7 @@ Foam::BlobsSheetAtomization<CloudType>::BlobsSheetAtomization
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::BlobsSheetAtomization<CloudType>::~BlobsSheetAtomization()
{}
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
index 75fcb6a88c8ee2e0590fd406f8c44af16601ec8d..33cda4093b969f7808646f77674ba7ff29fdf1c9 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::LISAAtomization<CloudType>::LISAAtomization
(
const dictionary& dict,
@@ -62,7 +62,7 @@ Foam::LISAAtomization<CloudType>::LISAAtomization
}
}
-template <class CloudType>
+template<class CloudType>
Foam::LISAAtomization<CloudType>::LISAAtomization
(
const LISAAtomization<CloudType>& am
@@ -80,7 +80,7 @@ Foam::LISAAtomization<CloudType>::LISAAtomization
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::LISAAtomization<CloudType>::~LISAAtomization()
{}
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.C b/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.C
index 1c34ae6e9382c293677d4b730054b58198cfe622..038e90c5b46239d9eee0e95555da10466035a5a4 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::NoAtomization<CloudType>::NoAtomization
(
const dictionary& dict,
@@ -38,7 +38,7 @@ Foam::NoAtomization<CloudType>::NoAtomization
{}
-template <class CloudType>
+template<class CloudType>
Foam::NoAtomization<CloudType>::NoAtomization
(
const NoAtomization<CloudType>& am
@@ -50,7 +50,7 @@ Foam::NoAtomization<CloudType>::NoAtomization
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::NoAtomization<CloudType>::~NoAtomization()
{}
diff --git a/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.C b/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.C
index cbe837eafd8557d783c7b28e342410ff7d5bcc2e..1a233e2b2969fb06015849bc35fe597d03066aad 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::NoBreakup<CloudType>::NoBreakup
(
const dictionary&,
@@ -39,7 +39,7 @@ Foam::NoBreakup<CloudType>::NoBreakup
-template <class CloudType>
+template<class CloudType>
Foam::NoBreakup<CloudType>::NoBreakup(const NoBreakup<CloudType>& bum)
:
BreakupModel<CloudType>(bum)
@@ -48,7 +48,7 @@ Foam::NoBreakup<CloudType>::NoBreakup(const NoBreakup<CloudType>& bum)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::NoBreakup<CloudType>::~NoBreakup()
{}
diff --git a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C
index 2aca8ae5ad602142514d3aa82afea261a21adadf..d2ca617bbd77d018e52e52b68ab6ed074a2458e4 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::PilchErdman<CloudType>::PilchErdman
(
const dictionary& dict,
@@ -46,7 +46,7 @@ Foam::PilchErdman<CloudType>::PilchErdman
}
-template <class CloudType>
+template<class CloudType>
Foam::PilchErdman<CloudType>::PilchErdman(const PilchErdman<CloudType>& bum)
:
BreakupModel<CloudType>(bum),
@@ -57,7 +57,7 @@ Foam::PilchErdman<CloudType>::PilchErdman(const PilchErdman<CloudType>& bum)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::PilchErdman<CloudType>::~PilchErdman()
{}
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C
index 25a123fc6973c8a2e2497f747fcdb8d8e3868ddd..79b26186eb154f6f85b2e09d4194dd62a6e92fbf 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::ReitzDiwakar<CloudType>::ReitzDiwakar
(
const dictionary& dict,
@@ -50,7 +50,7 @@ Foam::ReitzDiwakar<CloudType>::ReitzDiwakar
}
-template <class CloudType>
+template<class CloudType>
Foam::ReitzDiwakar<CloudType>::ReitzDiwakar(const ReitzDiwakar<CloudType>& bum)
:
BreakupModel<CloudType>(bum),
@@ -63,7 +63,7 @@ Foam::ReitzDiwakar<CloudType>::ReitzDiwakar(const ReitzDiwakar<CloudType>& bum)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::ReitzDiwakar<CloudType>::~ReitzDiwakar()
{}
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C
index d58678c4bd8a2ddca5c654a876ccdeea69c60357..e714db22dc349b31f99b16a7ed6b846eb0696d8c 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::ReitzKHRT<CloudType>::ReitzKHRT
(
const dictionary& dict,
@@ -54,7 +54,7 @@ Foam::ReitzKHRT<CloudType>::ReitzKHRT
}
-template <class CloudType>
+template<class CloudType>
Foam::ReitzKHRT<CloudType>::ReitzKHRT(const ReitzKHRT<CloudType>& bum)
:
BreakupModel<CloudType>(bum),
@@ -69,7 +69,7 @@ Foam::ReitzKHRT<CloudType>::ReitzKHRT(const ReitzKHRT<CloudType>& bum)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::ReitzKHRT<CloudType>::~ReitzKHRT()
{}
diff --git a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
index a5816c8f99732ce11a966a6bbc5564b157e8b495..41e3ac307a724c61d6217010c2cfea50a1757d14 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::SHF<CloudType>::SHF
(
const dictionary& dict,
@@ -67,7 +67,7 @@ Foam::SHF<CloudType>::SHF
{}
-template <class CloudType>
+template<class CloudType>
Foam::SHF<CloudType>::SHF(const SHF<CloudType>& bum)
:
BreakupModel<CloudType>(bum),
@@ -105,7 +105,7 @@ Foam::SHF<CloudType>::SHF(const SHF<CloudType>& bum)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::SHF<CloudType>::~SHF()
{}
diff --git a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
index 8838a73ea06cdb9ed395eebc93410b5935527325..0fe325fbacff1f9d22ac2fbe9fb01c1625d539d1 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::TAB<CloudType>::TAB
(
const dictionary& dict,
@@ -80,7 +80,7 @@ Foam::TAB<CloudType>::TAB
}
-template <class CloudType>
+template<class CloudType>
Foam::TAB<CloudType>::TAB(const TAB<CloudType>& bum)
:
BreakupModel<CloudType>(bum),
@@ -93,7 +93,7 @@ Foam::TAB<CloudType>::TAB(const TAB<CloudType>& bum)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::TAB<CloudType>::~TAB()
{}
diff --git a/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.C b/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.C
index 6eca022bc4e1d42bbe767555cff0c8566d82e0df..793eb50a35e7986d7f697e226252d05d45f3f385 100644
--- a/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.C
+++ b/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::ORourkeCollision<CloudType>::ORourkeCollision
(
const dictionary& dict,
@@ -39,7 +39,7 @@ Foam::ORourkeCollision<CloudType>::ORourkeCollision
{}
-template <class CloudType>
+template<class CloudType>
Foam::ORourkeCollision<CloudType>::ORourkeCollision
(
const ORourkeCollision<CloudType>& cm
@@ -52,7 +52,7 @@ Foam::ORourkeCollision<CloudType>::ORourkeCollision
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::ORourkeCollision<CloudType>::~ORourkeCollision()
{}
diff --git a/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.C b/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.C
index 585d7199f3c0771ccd7e4f63898471e223119b60..fa09dfc2ca9f162b01680ad292e91df74e70409c 100644
--- a/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.C
+++ b/src/lagrangian/spray/submodels/StochasticCollision/TrajectoryCollision/TrajectoryCollision.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::TrajectoryCollision<CloudType>::TrajectoryCollision
(
const dictionary& dict,
@@ -41,7 +41,7 @@ Foam::TrajectoryCollision<CloudType>::TrajectoryCollision
{}
-template <class CloudType>
+template<class CloudType>
Foam::TrajectoryCollision<CloudType>::TrajectoryCollision
(
const TrajectoryCollision<CloudType>& cm
@@ -56,7 +56,7 @@ Foam::TrajectoryCollision<CloudType>::TrajectoryCollision
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class CloudType>
+template<class CloudType>
Foam::TrajectoryCollision<CloudType>::~TrajectoryCollision()
{}
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
index b00ca55097d19bc18fe3ceb904f71d268cd74da4..69d59bcb0007e0545f1df44fbaeabf0db1bf7513 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/pointData/pointDataI.H
@@ -75,7 +75,7 @@ inline const Foam::vector& Foam::pointData::v() const
}
-template <class TrackingData>
+template<class TrackingData>
inline void Foam::pointData::transform
(
const tensor& rotTensor,
@@ -88,7 +88,7 @@ inline void Foam::pointData::transform
// Update this with information from connected edge
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::pointData::updatePoint
(
const polyMesh& mesh,
@@ -123,7 +123,7 @@ inline bool Foam::pointData::updatePoint
}
// Update this with new information on same point
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::pointData::updatePoint
(
const polyMesh& mesh,
@@ -157,7 +157,7 @@ inline bool Foam::pointData::updatePoint
// Update this with new information on same point. No extra information.
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::pointData::updatePoint
(
const pointData& newPointInfo,
@@ -179,7 +179,7 @@ inline bool Foam::pointData::updatePoint
// Update this with information from connected point
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::pointData::updateEdge
(
const polyMesh& mesh,
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
index c4999c64c3a902a29d5459f6eb728593df0f956d..4d4f0e12b155a122cb1e0a2dcef276d62499a839 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -116,7 +116,7 @@ void meshRefinement::testSyncBoundaryFaceList
}
-//template <class T, class Mesh>
+//template<class T, class Mesh>
template<class GeoField>
void meshRefinement::addPatchFields(fvMesh& mesh, const word& patchFieldType)
{
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.C b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
index bcba11321ae50f5803ad05e2cb9f53a464ff0555..946e23e53f89cfdb654b3eaa3f0c377beb666002 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.C
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -38,13 +38,13 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
const Foam::scalar Foam::FaceCellWave<Type, TrackingData>::geomTol_ = 1e-6;
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::scalar Foam::FaceCellWave<Type, TrackingData>::propagationTol_ = 0.01;
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
int Foam::FaceCellWave<Type, TrackingData>::dummyTrackData_ = 12345;
namespace Foam
@@ -111,7 +111,7 @@ namespace Foam
// Updates:
// - changedCell_, changedCells_, nChangedCells_,
// - statistics: nEvals_, nUnvisitedCells_
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
bool Foam::FaceCellWave<Type, TrackingData>::updateCell
(
const label cellI,
@@ -159,7 +159,7 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateCell
// Updates:
// - changedFace_, changedFaces_, nChangedFaces_,
// - statistics: nEvals_, nUnvisitedFaces_
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
bool Foam::FaceCellWave<Type, TrackingData>::updateFace
(
const label faceI,
@@ -207,7 +207,7 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateFace
// Updates:
// - changedFace_, changedFaces_, nChangedFaces_,
// - statistics: nEvals_, nUnvisitedFaces_
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
bool Foam::FaceCellWave<Type, TrackingData>::updateFace
(
const label faceI,
@@ -249,7 +249,7 @@ bool Foam::FaceCellWave<Type, TrackingData>::updateFace
// For debugging: check status on both sides of cyclic
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::FaceCellWave<Type, TrackingData>::checkCyclic
(
const polyPatch& patch
@@ -302,8 +302,8 @@ void Foam::FaceCellWave<Type, TrackingData>::checkCyclic
// Check if has cyclic patches
-template <class Type, class TrackingData>
-template <class PatchType>
+template<class Type, class TrackingData>
+template<class PatchType>
bool Foam::FaceCellWave<Type, TrackingData>::hasPatch() const
{
forAll(mesh_.boundaryMesh(), patchI)
@@ -318,7 +318,7 @@ bool Foam::FaceCellWave<Type, TrackingData>::hasPatch() const
// Copy face information into member data
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::FaceCellWave<Type, TrackingData>::setFaceInfo
(
const labelList& changedFaces,
@@ -349,7 +349,7 @@ void Foam::FaceCellWave<Type, TrackingData>::setFaceInfo
// Merge face information into member data
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::FaceCellWave<Type, TrackingData>::mergeFaceInfo
(
const polyPatch& patch,
@@ -384,7 +384,7 @@ void Foam::FaceCellWave<Type, TrackingData>::mergeFaceInfo
// Construct compact patchFace change arrays for a (slice of a) single patch.
// changedPatchFaces in local patch numbering.
// Return length of arrays.
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::label Foam::FaceCellWave<Type, TrackingData>::getChangedPatchFaces
(
const polyPatch& patch,
@@ -414,7 +414,7 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::getChangedPatchFaces
// Handle leaving domain. Implementation referred to Type
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::FaceCellWave<Type, TrackingData>::leaveDomain
(
const polyPatch& patch,
@@ -436,7 +436,7 @@ void Foam::FaceCellWave<Type, TrackingData>::leaveDomain
// Handle entering domain. Implementation referred to Type
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::FaceCellWave<Type, TrackingData>::enterDomain
(
const polyPatch& patch,
@@ -458,7 +458,7 @@ void Foam::FaceCellWave<Type, TrackingData>::enterDomain
// Transform. Implementation referred to Type
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::FaceCellWave<Type, TrackingData>::transform
(
const tensorField& rotTensor,
@@ -486,7 +486,7 @@ void Foam::FaceCellWave<Type, TrackingData>::transform
// Offset mesh face. Used for transferring from one cyclic half to the other.
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::FaceCellWave<Type, TrackingData>::offset
(
const polyPatch&,
@@ -503,7 +503,7 @@ void Foam::FaceCellWave<Type, TrackingData>::offset
// Tranfer all the information to/from neighbouring processors
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
{
const globalMeshData& pData = mesh_.globalData();
@@ -622,7 +622,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
// Transfer information across cyclic halves.
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::FaceCellWave<Type, TrackingData>::handleCyclicPatches()
{
forAll(mesh_.boundaryMesh(), patchI)
@@ -707,7 +707,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleCyclicPatches()
// Transfer information across cyclic halves.
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::FaceCellWave<Type, TrackingData>::handleAMICyclicPatches()
{
forAll(mesh_.boundaryMesh(), patchI)
@@ -800,7 +800,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleAMICyclicPatches()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Set up only. Use setFaceInfo and iterate() to do actual calculation.
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::FaceCellWave<Type, TrackingData>::FaceCellWave
(
const polyMesh& mesh,
@@ -852,7 +852,7 @@ Foam::FaceCellWave<Type, TrackingData>::FaceCellWave
// Iterate, propagating changedFacesInfo across mesh, until no change (or
// maxIter reached). Initial cell values specified.
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::FaceCellWave<Type, TrackingData>::FaceCellWave
(
const polyMesh& mesh,
@@ -929,14 +929,14 @@ Foam::FaceCellWave<Type, TrackingData>::FaceCellWave
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::label Foam::FaceCellWave<Type, TrackingData>::getUnsetCells() const
{
return nUnvisitedCells_;
}
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::label Foam::FaceCellWave<Type, TrackingData>::getUnsetFaces() const
{
return nUnvisitedFaces_;
@@ -945,7 +945,7 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::getUnsetFaces() const
// Propagate cell to face
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::label Foam::FaceCellWave<Type, TrackingData>::faceToCell()
{
const labelList& owner = mesh_.faceOwner();
@@ -1030,7 +1030,7 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::faceToCell()
// Propagate cell to face
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::label Foam::FaceCellWave<Type, TrackingData>::cellToFace()
{
const cellList& cells = mesh_.cells();
@@ -1112,7 +1112,7 @@ Foam::label Foam::FaceCellWave<Type, TrackingData>::cellToFace()
// Iterate
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::label Foam::FaceCellWave<Type, TrackingData>::iterate(const label maxIter)
{
if (hasCyclicPatches_)
diff --git a/src/meshTools/algorithms/MeshWave/FaceCellWave.H b/src/meshTools/algorithms/MeshWave/FaceCellWave.H
index cecfc6b5d3ea32fb22935307452fdbdd0cc87f61..93e2277daa2f900bcd7550e2cc6eb7939d5ce297 100644
--- a/src/meshTools/algorithms/MeshWave/FaceCellWave.H
+++ b/src/meshTools/algorithms/MeshWave/FaceCellWave.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -166,7 +166,7 @@ class FaceCellWave
void checkCyclic(const polyPatch& pPatch) const;
//- Has cyclic patch?
- template <class PatchType>
+ template<class PatchType>
bool hasPatch() const;
//- Merge received patch data into global data
diff --git a/src/meshTools/algorithms/MeshWave/MeshWave.C b/src/meshTools/algorithms/MeshWave/MeshWave.C
index 0a6ca3e794a38f64df01913d5a489a2e5911e44c..d7efb5626a761594fcb12ac9c99659cb2a1d04d4 100644
--- a/src/meshTools/algorithms/MeshWave/MeshWave.C
+++ b/src/meshTools/algorithms/MeshWave/MeshWave.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
int Foam::MeshWave<Type, TrackingData>::dummyTrackData_ = 12345;
@@ -37,7 +37,7 @@ int Foam::MeshWave<Type, TrackingData>::dummyTrackData_ = 12345;
// Iterate, propagating changedFacesInfo across mesh, until no change (or
// maxIter reached).
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::MeshWave<Type, TrackingData>::MeshWave
(
const polyMesh& mesh,
@@ -64,7 +64,7 @@ Foam::MeshWave<Type, TrackingData>::MeshWave
// Iterate, propagating changedFacesInfo across mesh, until no change (or
// maxIter reached). Initial cell values specified.
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::MeshWave<Type, TrackingData>::MeshWave
(
const polyMesh& mesh,
diff --git a/src/meshTools/algorithms/MeshWave/MeshWave.H b/src/meshTools/algorithms/MeshWave/MeshWave.H
index 21316d8fb6974b22387dc0ab756635002e90374c..04fe52c5199558b44476395eb295fdcbf207f6a8 100644
--- a/src/meshTools/algorithms/MeshWave/MeshWave.H
+++ b/src/meshTools/algorithms/MeshWave/MeshWave.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -53,7 +53,7 @@ TemplateName(MeshWave);
Class MeshWave Declaration
\*---------------------------------------------------------------------------*/
-template <class Type, class TrackingData = int>
+template<class Type, class TrackingData = int>
class MeshWave
:
public MeshWaveName
diff --git a/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfoI.H b/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfoI.H
index 881e586626a1f69760486c948a9a66ed0da341dd..433fbfc207953088f37844a72386c13ad2106cec 100644
--- a/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfoI.H
+++ b/src/meshTools/algorithms/PatchEdgeFaceWave/patchEdgeFaceInfoI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -234,7 +234,7 @@ inline bool Foam::patchEdgeFaceInfo::updateFace
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::patchEdgeFaceInfo::equal
(
const patchEdgeFaceInfo& rhs,
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
index e6dd1846acfd4f4b8512155c69133d5c9bc217e4..765e1e6136d8c2d7a7acec286ba52dd690349af0 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
@@ -37,10 +37,10 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::scalar Foam::PointEdgeWave<Type, TrackingData>::propagationTol_ = 0.01;
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
int Foam::PointEdgeWave<Type, TrackingData>::dummyTrackData_ = 12345;
namespace Foam
@@ -71,7 +71,7 @@ namespace Foam
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Handle leaving domain. Implementation referred to Type
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::PointEdgeWave<Type, TrackingData>::leaveDomain
(
const polyPatch& patch,
@@ -93,7 +93,7 @@ void Foam::PointEdgeWave<Type, TrackingData>::leaveDomain
// Handle entering domain. Implementation referred to Type
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::PointEdgeWave<Type, TrackingData>::enterDomain
(
const polyPatch& patch,
@@ -115,7 +115,7 @@ void Foam::PointEdgeWave<Type, TrackingData>::enterDomain
// Transform. Implementation referred to Type
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::PointEdgeWave<Type, TrackingData>::transform
(
const polyPatch& patch,
@@ -156,7 +156,7 @@ void Foam::PointEdgeWave<Type, TrackingData>::transform
// Updates:
// - changedPoint_, changedPoints_, nChangedPoints_,
// - statistics: nEvals_, nUnvisitedPoints_
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
(
const label pointI,
@@ -203,7 +203,7 @@ bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
// Updates:
// - changedPoint_, changedPoints_, nChangedPoints_,
// - statistics: nEvals_, nUnvisitedPoints_
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
(
const label pointI,
@@ -248,7 +248,7 @@ bool Foam::PointEdgeWave<Type, TrackingData>::updatePoint
// Updates:
// - changedEdge_, changedEdges_, nChangedEdges_,
// - statistics: nEvals_, nUnvisitedEdge_
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
bool Foam::PointEdgeWave<Type, TrackingData>::updateEdge
(
const label edgeI,
@@ -291,8 +291,8 @@ bool Foam::PointEdgeWave<Type, TrackingData>::updateEdge
// Check if patches of given type name are present
-template <class Type, class TrackingData>
-template <class PatchType>
+template<class Type, class TrackingData>
+template<class PatchType>
Foam::label Foam::PointEdgeWave<Type, TrackingData>::countPatchType() const
{
label nPatches = 0;
@@ -309,7 +309,7 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::countPatchType() const
// Transfer all the information to/from neighbouring processors
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
{
// 1. Send all point info on processor patches.
@@ -458,7 +458,7 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
}
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::PointEdgeWave<Type, TrackingData>::handleCyclicPatches()
{
// 1. Send all point info on cyclic patches.
@@ -549,7 +549,7 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleCyclicPatches()
// Guarantee collocated points have same information.
// Return number of points changed.
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
{
// Transfer onto coupled patch
@@ -643,7 +643,7 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
// Iterate, propagating changedPointsInfo across mesh, until no change (or
// maxIter reached). Initial point values specified.
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::PointEdgeWave<Type, TrackingData>::PointEdgeWave
(
const polyMesh& mesh,
@@ -728,7 +728,7 @@ Foam::PointEdgeWave<Type, TrackingData>::PointEdgeWave
}
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::PointEdgeWave<Type, TrackingData>::PointEdgeWave
(
const polyMesh& mesh,
@@ -756,7 +756,7 @@ Foam::PointEdgeWave<Type, TrackingData>::PointEdgeWave
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::PointEdgeWave<Type, TrackingData>::~PointEdgeWave()
{}
@@ -764,14 +764,14 @@ Foam::PointEdgeWave<Type, TrackingData>::~PointEdgeWave()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::label Foam::PointEdgeWave<Type, TrackingData>::getUnsetPoints() const
{
return nUnvisitedPoints_;
}
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::label Foam::PointEdgeWave<Type, TrackingData>::getUnsetEdges() const
{
return nUnvisitedEdges_;
@@ -779,7 +779,7 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::getUnsetEdges() const
// Copy point information into member data
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
void Foam::PointEdgeWave<Type, TrackingData>::setPointInfo
(
const labelList& changedPoints,
@@ -816,7 +816,7 @@ void Foam::PointEdgeWave<Type, TrackingData>::setPointInfo
// Propagate information from edge to point. Return number of points changed.
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::label Foam::PointEdgeWave<Type, TrackingData>::edgeToPoint()
{
for
@@ -892,7 +892,7 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::edgeToPoint()
// Propagate information from point to edge. Return number of edges changed.
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::label Foam::PointEdgeWave<Type, TrackingData>::pointToEdge()
{
const labelListList& pointEdges = mesh_.pointEdges();
@@ -960,7 +960,7 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::pointToEdge()
// Iterate
-template <class Type, class TrackingData>
+template<class Type, class TrackingData>
Foam::label Foam::PointEdgeWave<Type, TrackingData>::iterate
(
const label maxIter
diff --git a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
index 440e90367657925f4bcacc64b6751562d1b226e3..1e951590b8ffb1c329bce9d9535a14bc3ec967cd 100644
--- a/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
+++ b/src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.H
@@ -82,7 +82,7 @@ TemplateName(PointEdgeWave);
Class PointEdgeWave Declaration
\*---------------------------------------------------------------------------*/
-template <class Type, class TrackingData = int>
+template<class Type, class TrackingData = int>
class PointEdgeWave
:
public PointEdgeWaveName
@@ -196,7 +196,7 @@ class PointEdgeWave
// Parallel, cyclic
//- Has patches of certain type?
- template <class PatchType>
+ template<class PatchType>
label countPatchType() const;
//- Merge data from across processor boundaries
@@ -323,7 +323,7 @@ public:
\*---------------------------------------------------------------------------*/
//- List update operation
-template <class Type, class TrackingData = int>
+template<class Type, class TrackingData = int>
class listUpdateOp
{
//- Additional data to be passed into container
diff --git a/src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H b/src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H
index b466b268287a92453280bd06326364b43d59aaf7..bc55dda9ce9f7049f8b8212dcb5d95e495b7b900 100644
--- a/src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H
+++ b/src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H
@@ -296,7 +296,7 @@ inline bool Foam::pointEdgePoint::updateEdge
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::pointEdgePoint::equal
(
const pointEdgePoint& rhs,
diff --git a/src/meshTools/cellClassification/cellInfoI.H b/src/meshTools/cellClassification/cellInfoI.H
index 357bc247d65f850d9ec7c21e43479188589418cf..300f920036746327f65b40f658ff0eddf1db9e14 100644
--- a/src/meshTools/cellClassification/cellInfoI.H
+++ b/src/meshTools/cellClassification/cellInfoI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -244,7 +244,7 @@ inline bool Foam::cellInfo::updateFace
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::cellInfo::equal
(
const cellInfo& rhs,
diff --git a/src/meshTools/cellDist/wallPoint/wallPointData.C b/src/meshTools/cellDist/wallPoint/wallPointData.C
index 6143cb570a9aa5635d77dab28a929d2b69e7d694..7379e2c11386a0557eabc0580b96d787d69c5233 100644
--- a/src/meshTools/cellDist/wallPoint/wallPointData.C
+++ b/src/meshTools/cellDist/wallPoint/wallPointData.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ namespace Foam
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Ostream& operator<<
(
Ostream& os,
@@ -45,7 +45,7 @@ Ostream& operator<<
}
-template <class Type>
+template<class Type>
Istream& operator>>
(
Istream& is,
diff --git a/src/meshTools/cellDist/wallPoint/wallPointData.H b/src/meshTools/cellDist/wallPoint/wallPointData.H
index 406a3b9dc56ea3873b9b0203c6efeb9065677547..0c40fde65042a84eecf2aac0bb13936222cf9af9 100644
--- a/src/meshTools/cellDist/wallPoint/wallPointData.H
+++ b/src/meshTools/cellDist/wallPoint/wallPointData.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -58,7 +58,7 @@ template<class Type> Ostream& operator<<(Ostream&, const wallPointData<Type>&);
Class wallPointData Declaration
\*---------------------------------------------------------------------------*/
-template <class Type>
+template<class Type>
class wallPointData
:
public wallPoint
@@ -163,37 +163,37 @@ public:
//- Data associated with wallPointData type are contiguous. List the usual
// ones.
-template <>
+template<>
inline bool contiguous<wallPointData<bool> >()
{
return contiguous<wallPoint>();
}
-template <>
+template<>
inline bool contiguous<wallPointData<label> >()
{
return contiguous<wallPoint>();
}
-template <>
+template<>
inline bool contiguous<wallPointData<scalar> >()
{
return contiguous<wallPoint>();
}
-template <>
+template<>
inline bool contiguous<wallPointData<vector> >()
{
return contiguous<wallPoint>();
}
-template <>
+template<>
inline bool contiguous<wallPointData<sphericalTensor> >()
{
return contiguous<wallPoint>();
}
-template <>
+template<>
inline bool contiguous<wallPointData<symmTensor> >()
{
return contiguous<wallPoint>();
}
-template <>
+template<>
inline bool contiguous<wallPointData<tensor> >()
{
return contiguous<wallPoint>();
diff --git a/src/meshTools/cellDist/wallPoint/wallPointDataI.H b/src/meshTools/cellDist/wallPoint/wallPointDataI.H
index 3ec9dd9d5b6ccaf21ab067b557e7032e1ad94a2d..73de754ef992651f6615639ded19f7b03ff96416 100644
--- a/src/meshTools/cellDist/wallPoint/wallPointDataI.H
+++ b/src/meshTools/cellDist/wallPoint/wallPointDataI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,8 +31,8 @@ namespace Foam
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Update this with w2 if w2 nearer to pt.
-template <class Type>
-template <class TrackingData>
+template<class Type>
+template<class TrackingData>
inline bool wallPointData<Type>::update
(
const point& pt,
@@ -75,7 +75,7 @@ inline bool wallPointData<Type>::update
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Null constructor
-template <class Type>
+template<class Type>
inline wallPointData<Type>::wallPointData()
:
wallPoint(),
@@ -84,7 +84,7 @@ inline wallPointData<Type>::wallPointData()
// Construct from components
-template <class Type>
+template<class Type>
inline wallPointData<Type>::wallPointData
(
const point& origin,
@@ -99,14 +99,14 @@ inline wallPointData<Type>::wallPointData
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class Type>
+template<class Type>
inline const Type& wallPointData<Type>::data() const
{
return data_;
}
-template <class Type>
+template<class Type>
inline Type& wallPointData<Type>::data()
{
return data_;
@@ -114,8 +114,8 @@ inline Type& wallPointData<Type>::data()
// Update this with w2 if w2 nearer to pt.
-template <class Type>
-template <class TrackingData>
+template<class Type>
+template<class TrackingData>
inline bool wallPointData<Type>::updateCell
(
const polyMesh& mesh,
@@ -139,8 +139,8 @@ inline bool wallPointData<Type>::updateCell
// Update this with w2 if w2 nearer to pt.
-template <class Type>
-template <class TrackingData>
+template<class Type>
+template<class TrackingData>
inline bool wallPointData<Type>::updateFace
(
const polyMesh& mesh,
@@ -164,8 +164,8 @@ inline bool wallPointData<Type>::updateFace
// Update this with w2 if w2 nearer to pt.
-template <class Type>
-template <class TrackingData>
+template<class Type>
+template<class TrackingData>
inline bool wallPointData<Type>::updateFace
(
const polyMesh& mesh,
diff --git a/src/meshTools/cellDist/wallPoint/wallPointI.H b/src/meshTools/cellDist/wallPoint/wallPointI.H
index 8cad5f6a764b36ba09b9ce6a0e3779c26fba5b2c..95f0f02cdb3372cb463efa529f276a691aad2f73 100644
--- a/src/meshTools/cellDist/wallPoint/wallPointI.H
+++ b/src/meshTools/cellDist/wallPoint/wallPointI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -277,7 +277,7 @@ inline bool Foam::wallPoint::updateFace
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::wallPoint::equal
(
const wallPoint& rhs,
diff --git a/src/meshTools/meshStructure/pointTopoDistanceDataI.H b/src/meshTools/meshStructure/pointTopoDistanceDataI.H
index c42dbffce2e7f01795d215fe81b5b05d7aa3c8c8..4dcf167625f28b27b69d03f57e8ca658173834de 100644
--- a/src/meshTools/meshStructure/pointTopoDistanceDataI.H
+++ b/src/meshTools/meshStructure/pointTopoDistanceDataI.H
@@ -52,7 +52,7 @@ inline Foam::pointTopoDistanceData::pointTopoDistanceData
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::pointTopoDistanceData::valid(TrackingData& td) const
{
return distance_ != -1;
@@ -60,7 +60,7 @@ inline bool Foam::pointTopoDistanceData::valid(TrackingData& td) const
// No geometric data so never any problem on cyclics
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::pointTopoDistanceData::sameGeometry
(
const pointTopoDistanceData&,
@@ -73,7 +73,7 @@ inline bool Foam::pointTopoDistanceData::sameGeometry
// No geometric data.
-template <class TrackingData>
+template<class TrackingData>
inline void Foam::pointTopoDistanceData::leaveDomain
(
const polyPatch& patch,
@@ -85,7 +85,7 @@ inline void Foam::pointTopoDistanceData::leaveDomain
// No geometric data.
-template <class TrackingData>
+template<class TrackingData>
inline void Foam::pointTopoDistanceData::transform
(
const tensor& rotTensor,
@@ -95,7 +95,7 @@ inline void Foam::pointTopoDistanceData::transform
// No geometric data.
-template <class TrackingData>
+template<class TrackingData>
inline void Foam::pointTopoDistanceData::enterDomain
(
const polyPatch& patch,
@@ -107,7 +107,7 @@ inline void Foam::pointTopoDistanceData::enterDomain
// Update this with information from connected edge
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::pointTopoDistanceData::updatePoint
(
const polyMesh& mesh,
@@ -199,7 +199,7 @@ inline bool Foam::pointTopoDistanceData::updateEdge
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::pointTopoDistanceData::equal
(
const pointTopoDistanceData& rhs,
diff --git a/src/meshTools/meshStructure/topoDistanceDataI.H b/src/meshTools/meshStructure/topoDistanceDataI.H
index 388c923a2ae0d63808b88bf3888c71b2987a3fcb..a0a5ddae1396a7e7cfe959eacad35abb0cb55939 100644
--- a/src/meshTools/meshStructure/topoDistanceDataI.H
+++ b/src/meshTools/meshStructure/topoDistanceDataI.H
@@ -52,7 +52,7 @@ inline Foam::topoDistanceData::topoDistanceData
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::topoDistanceData::valid(TrackingData& td) const
{
return distance_ != -1;
@@ -60,7 +60,7 @@ inline bool Foam::topoDistanceData::valid(TrackingData& td) const
// No geometric data so never any problem on cyclics
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::topoDistanceData::sameGeometry
(
const polyMesh&,
@@ -74,7 +74,7 @@ inline bool Foam::topoDistanceData::sameGeometry
// No geometric data.
-template <class TrackingData>
+template<class TrackingData>
inline void Foam::topoDistanceData::leaveDomain
(
const polyMesh&,
@@ -87,7 +87,7 @@ inline void Foam::topoDistanceData::leaveDomain
// No geometric data.
-template <class TrackingData>
+template<class TrackingData>
inline void Foam::topoDistanceData::transform
(
const polyMesh&,
@@ -98,7 +98,7 @@ inline void Foam::topoDistanceData::transform
// No geometric data.
-template <class TrackingData>
+template<class TrackingData>
inline void Foam::topoDistanceData::enterDomain
(
const polyMesh&,
@@ -111,7 +111,7 @@ inline void Foam::topoDistanceData::enterDomain
// Update cell with neighbouring face information
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::topoDistanceData::updateCell
(
const polyMesh&,
@@ -135,7 +135,7 @@ inline bool Foam::topoDistanceData::updateCell
// Update face with neighbouring cell information
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::topoDistanceData::updateFace
(
const polyMesh& mesh,
@@ -162,7 +162,7 @@ inline bool Foam::topoDistanceData::updateFace
// Update face with coupled face information
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::topoDistanceData::updateFace
(
const polyMesh&,
@@ -185,7 +185,7 @@ inline bool Foam::topoDistanceData::updateFace
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::topoDistanceData::equal
(
const topoDistanceData& rhs,
diff --git a/src/meshTools/sets/faceSources/regionToFace/patchEdgeFaceRegionI.H b/src/meshTools/sets/faceSources/regionToFace/patchEdgeFaceRegionI.H
index eea60716a74a6a44c8d26b9a24d96413fb16c279..07e6935b257fbaa6b84a3c6513c1a4ddbb0ecf9c 100644
--- a/src/meshTools/sets/faceSources/regionToFace/patchEdgeFaceRegionI.H
+++ b/src/meshTools/sets/faceSources/regionToFace/patchEdgeFaceRegionI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -163,7 +163,7 @@ inline bool Foam::patchEdgeFaceRegion::updateFace
}
-template <class TrackingData>
+template<class TrackingData>
inline bool Foam::patchEdgeFaceRegion::equal
(
const patchEdgeFaceRegion& rhs,
diff --git a/src/postProcessing/foamCalcFunctions/field/components/writeComponentFields.C b/src/postProcessing/foamCalcFunctions/field/components/writeComponentFields.C
index 23004ce1649068537955543bf858400768a55224..866952afa7d05c290a88bf1bfb523dd97d6b0df3 100644
--- a/src/postProcessing/foamCalcFunctions/field/components/writeComponentFields.C
+++ b/src/postProcessing/foamCalcFunctions/field/components/writeComponentFields.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
-template <class Type>
+template<class Type>
void Foam::calcTypes::components::writeComponentFields
(
const IOobject& header,
diff --git a/src/postProcessing/foamCalcFunctions/field/randomise/writeRandomField.C b/src/postProcessing/foamCalcFunctions/field/randomise/writeRandomField.C
index 72ebd6e998f1709b5f2faa046404a050e9cd3dbb..0c024aa136e625cba0580f8e2dc02440e57760b5 100644
--- a/src/postProcessing/foamCalcFunctions/field/randomise/writeRandomField.C
+++ b/src/postProcessing/foamCalcFunctions/field/randomise/writeRandomField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
-template <class Type>
+template<class Type>
void Foam::calcTypes::randomise::writeRandomField
(
const IOobject& header,
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
index cf9fb292364ca523ece7e94f592bdd07271d7409..78186661379549d0794711d003b22ef23444afa2 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
+++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.C
@@ -26,6 +26,7 @@ License
#include "fieldValueDelta.H"
#include "ListOps.H"
#include "Time.H"
+#include "volFields.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -38,16 +39,15 @@ namespace Foam
template<>
const char*
- NamedEnum<fieldValues::fieldValueDelta::operationType, 5>::names[] =
+ NamedEnum<fieldValues::fieldValueDelta::operationType, 4>::names[] =
{
"add",
"subtract",
"min",
- "max",
- "average"
+ "max"
};
- const NamedEnum<fieldValues::fieldValueDelta::operationType, 5>
+ const NamedEnum<fieldValues::fieldValueDelta::operationType, 4>
fieldValues::fieldValueDelta::operationTypeNames_;
}
@@ -159,7 +159,7 @@ void Foam::fieldValues::fieldValueDelta::write()
if (log_)
{
- Info<< type() << " " << name_ << " output:" << endl;
+ Info<< type() << " output:" << endl;
}
bool found = false;
@@ -180,8 +180,10 @@ void Foam::fieldValues::fieldValueDelta::write()
{
Info<< " none" << endl;
}
-
- Info<< endl;
+ else
+ {
+ Info<< endl;
+ }
}
}
diff --git a/src/sampling/probes/patchProbes.H b/src/sampling/probes/patchProbes.H
index 096015f19af006e6e4642314ae1ba110f5095686..972dab79b873e54ad125d4effaeeb85b7f1d0284 100644
--- a/src/sampling/probes/patchProbes.H
+++ b/src/sampling/probes/patchProbes.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -83,7 +83,7 @@ class patchProbes
//- Sample and write all the fields of the given type
- template <class Type>
+ template<class Type>
void sampleAndWrite(const fieldGroup<Type>&);
@@ -109,7 +109,7 @@ class patchProbes
//- Sample a single field on all sample locations
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sample(const word& fieldName) const;
diff --git a/src/sampling/probes/patchProbesTemplates.C b/src/sampling/probes/patchProbesTemplates.C
index 898fdf254c6c2f05f92e28e7fd98d03f636f5a73..8f37e2f07cde46ec8abf4e08cffbfb6decc8d56d 100644
--- a/src/sampling/probes/patchProbesTemplates.C
+++ b/src/sampling/probes/patchProbesTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -78,7 +78,7 @@ void Foam::patchProbes::sampleAndWrite
}
-template <class Type>
+template<class Type>
void Foam::patchProbes::sampleAndWrite
(
const fieldGroup<Type>& fields
diff --git a/src/sampling/probes/probes.H b/src/sampling/probes/probes.H
index 85a3928fdcae70f2f149b02e3e2225a7f9cf0b36..80a4037571259f24f62956598cf0b8e5d2ff92d5 100644
--- a/src/sampling/probes/probes.H
+++ b/src/sampling/probes/probes.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -269,11 +269,11 @@ public:
) const;
//- Sample a single vol field on all sample locations
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sample(const word& fieldName) const;
//- Sample a single scalar field on all sample locations
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sampleSurfaceFields(const word& fieldName) const;
//- Sample a surface field at all locations
diff --git a/src/sampling/probes/probesTemplates.C b/src/sampling/probes/probesTemplates.C
index 3c03d7dcff60bf8d57f54aad8d57b299b14c4c0b..3a34c1c264f640ff5d5570bbabada9868db502ca 100644
--- a/src/sampling/probes/probesTemplates.C
+++ b/src/sampling/probes/probesTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -111,7 +111,7 @@ void Foam::probes::sampleAndWrite
}
-template <class Type>
+template<class Type>
void Foam::probes::sampleAndWrite(const fieldGroup<Type>& fields)
{
forAll(fields, fieldI)
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H
index 2b4987303d2962f4d9eacc5f55f5c2135147ea92..a2ad2f1418bb438b2cfa305006e60a485733a88f 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.H
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -105,7 +105,7 @@ class sampledSets
//- Class used for sampling volFields
- template <class Type>
+ template<class Type>
class volFieldSampler
:
public List<Field<Type> >
diff --git a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
index ab96643d7df0e49899c5a83699dd030f27bcbae9..a646a8c7c3013d522b4b949441f9e67f21b21a46 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
(
const word& interpolationScheme,
@@ -76,7 +76,7 @@ Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
}
-template <class Type>
+template<class Type>
Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
(
const GeometricField<Type, fvPatchField, volMesh>& field,
@@ -109,7 +109,7 @@ Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
}
-template <class Type>
+template<class Type>
Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
(
const List<Field<Type> >& values,
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
index 2b971970872db59f58db19a885ac9d363a0fdd58..da4b8d775e74b323e1f6984b99e4a40c1626b30e 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -104,14 +104,14 @@ class distanceSurface
void createGeometry();
//- sample field on faces
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
- template <class Type>
+ template<class Type>
tmp<Field<Type> >
interpolateField(const interpolation<Type>&) const;
diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C b/src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C
index d8871126ea71629c05d62e9a196ca6b7602fdfe8..fb076b86ea1bcea3c1a0d9fae39571c7645ad82f 100644
--- a/src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/distanceSurface/distanceSurfaceTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::distanceSurface::sampleField
(
@@ -54,7 +54,7 @@ Foam::distanceSurface::sampleField
}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::distanceSurface::interpolateField
(
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurface.H b/src/sampling/sampledSurface/isoSurface/isoSurface.H
index 1406ede0e019263c3660f4b2bf98368af90871da..9f6dc7d76e0318abe34e3455c9ffeb9bd0de77b1 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurface.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -427,7 +427,7 @@ public:
//- Interpolates cCoords,pCoords. Uses the references to the original
// fields used to create the iso surface.
- template <class Type>
+ template<class Type>
tmp<Field<Type> > interpolate
(
const GeometricField<Type, fvPatchField, volMesh>& cCoords,
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
index 8a0b75c1b097aaba6c689336a6b16d6666f527b6..7e12efc7bbead6bdac2d7bc23561734530dfe3ca 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCell.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -357,7 +357,7 @@ public:
//- Interpolates cCoords,pCoords. Takes the original fields
// used to create the iso surface.
- template <class Type>
+ template<class Type>
tmp<Field<Type> > interpolate
(
const scalarField& cVals,
@@ -367,7 +367,7 @@ public:
) const;
//- Interpolates cCoords,pCoords.
- template <class Type>
+ template<class Type>
tmp<Field<Type> > interpolate
(
const Field<Type>& cCoords,
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
index 8b933f5aab0bac2c78f836a6f7224cfc00c3e680..4a88c3d968ee448aceb8dab32fce37264025ac92 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -491,7 +491,7 @@ void Foam::isoSurfaceCell::generateTriPoints
}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::isoSurfaceCell::interpolate
(
@@ -545,7 +545,7 @@ Foam::isoSurfaceCell::interpolate
}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::isoSurfaceCell::interpolate
(
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
index 5a15bddbf811b62b5f8585397b7fb53c0c88b0d3..6f64c9fe541198ea8524f097b69921702d525264 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -681,7 +681,7 @@ void Foam::isoSurface::generateTriPoints
}
-//template <class Type>
+//template<class Type>
//Foam::tmp<Foam::Field<Type> >
//Foam::isoSurface::sample(const Field<Type>& vField) const
//{
@@ -689,7 +689,7 @@ void Foam::isoSurface::generateTriPoints
//}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::isoSurface::interpolate
(
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
index cebc201aafdbe66fe6d38013cbc4e75678ba4372..11b7ea025c64160ac50c50dcc91c14411f42bd04 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -122,14 +122,14 @@ class sampledIsoSurface
bool updateGeometry() const;
//- sample field on faces
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
- template <class Type>
+ template<class Type>
tmp<Field<Type> >
interpolateField(const interpolation<Type>&) const;
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
index 6232812975843bd294aa1caa33fc9b1ab1bc443f..ecd6d30e392f563d6e422424fff52298219a2587 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -91,14 +91,14 @@ class sampledIsoSurfaceCell
bool updateGeometry() const;
//- sample field on faces
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
- template <class Type>
+ template<class Type>
tmp<Field<Type> >
interpolateField(const interpolation<Type>&) const;
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
index 78ad62954389cd68c9d23da41f221f4e67aa7c44..b0d6eaa6eb02a1c1e03c76c2d0e65ddd0367c794 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledIsoSurfaceCell::sampleField
(
@@ -45,7 +45,7 @@ Foam::sampledIsoSurfaceCell::sampleField
}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledIsoSurfaceCell::interpolateField
(
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
index c58a665416389e8cd157d424b7b569c1504cae77..513cf2fb5d76202007660c94150acb37f3a8aa96 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -30,7 +30,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledIsoSurface::sampleField
(
@@ -44,7 +44,7 @@ Foam::sampledIsoSurface::sampleField
}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledIsoSurface::interpolateField
(
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
index e6ba957919c78af64d7cc0a612a687e58eb35d86..ce7182f91c487071325d3240f06981ffe3b856c6 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -102,14 +102,14 @@ class sampledCuttingPlane
void createGeometry();
//- sample field on faces
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
- template <class Type>
+ template<class Type>
tmp<Field<Type> >
interpolateField(const interpolation<Type>&) const;
diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
index 87950767c021246789c5f552d4f5fabc5fec5111..a188f6ef0f468099b437396d4f5d8ffad2e4e436 100644
--- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
+++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlaneTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -31,7 +31,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledCuttingPlane::sampleField
(
@@ -42,7 +42,7 @@ Foam::sampledCuttingPlane::sampleField
}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledCuttingPlane::interpolateField
(
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
index 0ec8dbd89fbc77a206ff22c0833d01fc6f382f23..0385f96a633a1345f5ea25b402be875b811adf0f 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -81,20 +81,20 @@ class sampledPatch
// Private Member Functions
//- sample field on faces
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
//- sample surface field on faces
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sampleField
(
const GeometricField<Type, fvsPatchField, surfaceMesh>& sField
) const;
- template <class Type>
+ template<class Type>
tmp<Field<Type> >
interpolateField(const interpolation<Type>&) const;
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
index 8725f412bea741fd2dbc4252736f50560b1acfff..2ffcb3a010db59786e73ecc5c6d2a6797f0747dd 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledPatch::sampleField
(
@@ -48,7 +48,7 @@ Foam::sampledPatch::sampleField
}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledPatch::sampleField
(
@@ -69,7 +69,7 @@ Foam::sampledPatch::sampleField
}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledPatch::interpolateField
(
diff --git a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
index e785c7091ff0c37a9ad9d7ee70f53561993cc06e..f2b3b7c4dc31e493968873b73674b04509641653 100644
--- a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
+++ b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -65,13 +65,13 @@ class sampledPatchInternalField
// Private Member Functions
//- sample field on faces
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
- template <class Type>
+ template<class Type>
tmp<Field<Type> > interpolateField(const interpolation<Type>&) const;
public:
diff --git a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
index 825b154907711f283305cf5d25b0addca5fd9fb4..2d187fa3148768efe1c22e56df6fd88dff933456 100644
--- a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
+++ b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,7 +29,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledPatchInternalField::sampleField
(
@@ -64,7 +64,7 @@ Foam::sampledPatchInternalField::sampleField
}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledPatchInternalField::interpolateField
(
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
index b555ffdd189cf2f80d0190dab28087c08f84847a..1c6a1b80589129792b26d8ca961335e4a2710315 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlane.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -66,14 +66,14 @@ class sampledPlane
// Private Member Functions
//- sample field on faces
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
- template <class Type>
+ template<class Type>
tmp<Field<Type> >
interpolateField(const interpolation<Type>&) const;
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
index e81d3397396db282090853219279fab32219d09b..b5083803766f84facf90be9ad97169003c4cf147 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledPlane::sampleField
(
@@ -38,7 +38,7 @@ Foam::sampledPlane::sampleField
}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledPlane::interpolateField
(
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
index 9c8d81d2a109f61f8ef1c8b82af72ab53d0573ed..79272f2dbb22f1ee3681af10277a0a9b56c04127 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -125,14 +125,14 @@ private:
const indexedOctree<treeDataFace>& nonCoupledboundaryTree() const;
//- sample field on faces
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
- template <class Type>
+ template<class Type>
tmp<Field<Type> >
interpolateField(const interpolation<Type>&) const;
diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
index 5957c36f2d1c47c2a34f0bc6791d00f145585d1d..ca6931ef8745d5c23516627bf8d8504507299bda 100644
--- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
+++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledTriSurfaceMesh::sampleField
(
@@ -83,7 +83,7 @@ Foam::sampledTriSurfaceMesh::sampleField
}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledTriSurfaceMesh::interpolateField
(
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
index 5cfd076d1edb35782ef39de0ad77ee335d1eed2d..13ef2a3e51f6d20f2f3eda668a76bbff48d2f84d 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -89,14 +89,14 @@ class sampledThresholdCellFaces
bool updateGeometry() const;
//- sample field on faces
- template <class Type>
+ template<class Type>
tmp<Field<Type> > sampleField
(
const GeometricField<Type, fvPatchField, volMesh>& vField
) const;
- template <class Type>
+ template<class Type>
tmp<Field<Type> >
interpolateField(const interpolation<Type>&) const;
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
index 95cfc8e700649f60b255005f6885322d69d25493..ed6b5c3a9f65cb71ecce78584539764027d9e73c 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ License
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledThresholdCellFaces::sampleField
(
@@ -46,7 +46,7 @@ Foam::sampledThresholdCellFaces::sampleField
}
-template <class Type>
+template<class Type>
Foam::tmp<Foam::Field<Type> >
Foam::sampledThresholdCellFaces::interpolateField
(
diff --git a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
index b394efc1e5f4c53f942d8df2dbe3aa9373203b92..16fbd8b519f3fbe3827ea7469a63058c1571bf59 100644
--- a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
+++ b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -189,7 +189,7 @@ inline bool smoothDelta::deltaData::updateFace
}
-template <class TrackingData>
+template<class TrackingData>
inline bool smoothDelta::deltaData::equal
(
const deltaData& rhs,
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
index e966e7295428f2caceb92b63ca27f3223a06085c..05370cbc441a7134731e0905c6aaa8b20168e332 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
@@ -337,7 +337,7 @@ void thermalBaffle1DFvPatchScalarField<solidType>::updateCoeffs()
mixedFvPatchScalarField::updateCoeffs();
}
-template <class solidType>
+template<class solidType>
void thermalBaffle1DFvPatchScalarField<solidType>::
write(Ostream& os) const
{