exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Intel 2016 compiler porting

Browse source
This commit is contained in:
Hrvoje Jasak 2015-09-07 11:08:41 +01:00
parent ac6110c117
commit 3d354b7c6d
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/meshTools/triSurface/octreeData/octreeDataTriSurfaceTreeLeaf.H
View file

@ -45,7 +45,7 @@ namespace Foam
// Forward declaration of classes // Forward declaration of classes
class octreeDataTriSurface; class octreeDataTriSurface;
template<> inline template<>
bool treeLeaf<octreeDataTriSurface>::findNearest bool treeLeaf<octreeDataTriSurface>::findNearest
( (
const octreeDataTriSurface& shapes, const octreeDataTriSurface& shapes,

30
src/surfMesh/MeshedSurface/MeshedSurface.C
View file

@ -32,6 +32,8 @@ License
#include "polyBoundaryMesh.H" #include "polyBoundaryMesh.H"
#include "polyMesh.H" #include "polyMesh.H"
#include "surfMesh.H" #include "surfMesh.H"
#include "Xfer.H"
#include "surfZone.H"
#include "primitivePatch.H" #include "primitivePatch.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
@ -170,9 +172,9 @@ Foam::MeshedSurface<Face>::MeshedSurface()
template<class Face> template<class Face>
Foam::MeshedSurface<Face>::MeshedSurface Foam::MeshedSurface<Face>::MeshedSurface
( (
const Xfer< pointField >& pointLst, const Xfer<pointField >& pointLst,
const Xfer< List<Face> >& faceLst, const Xfer<List<Face> >& faceLst,
const Xfer< surfZoneList >& zoneLst const Xfer<surfZoneList>& zoneLst
) )
: :
ParentType(List<Face>(), pointField()), ParentType(List<Face>(), pointField()),
@ -185,8 +187,8 @@ Foam::MeshedSurface<Face>::MeshedSurface
template<class Face> template<class Face>
Foam::MeshedSurface<Face>::MeshedSurface Foam::MeshedSurface<Face>::MeshedSurface
( (
const Xfer< pointField >& pointLst, const Xfer<pointField>& pointLst,
const Xfer< List<Face> >& faceLst, const Xfer<List<Face> >& faceLst,
const UList<label>& zoneSizes, const UList<label>& zoneSizes,
const UList<word>& zoneNames const UList<word>& zoneNames
) )
@ -534,17 +536,17 @@ void Foam::MeshedSurface<Face>::reset
// Take over new primitive data. // Take over new primitive data.
// Optimized to avoid overwriting data at all // Optimized to avoid overwriting data at all
if (!pointLst().empty()) if (!pointLst->empty())
{ {
storedPoints().transfer(pointLst()); storedPoints().transfer(pointLst());
} }
if (!faceLst().empty()) if (!faceLst->empty())
{ {
storedFaces().transfer(faceLst()); storedFaces().transfer(faceLst());
} }
if (!zoneLst().empty()) if (!zoneLst->empty())
{ {
storedZones().transfer(zoneLst()); storedZones().transfer(zoneLst());
} }
@ -554,26 +556,26 @@ void Foam::MeshedSurface<Face>::reset
template<class Face> template<class Face>
void Foam::MeshedSurface<Face>::reset void Foam::MeshedSurface<Face>::reset
( (
const Xfer< List<point> >& pointLst, const Xfer<List<point> >& pointLst,
const Xfer< List<Face> >& faceLst, const Xfer<List<Face> >& faceLst,
const Xfer< surfZoneList >& zoneLst const Xfer<surfZoneList>& zoneLst
) )
{ {
ParentType::clearOut(); ParentType::clearOut();
// Take over new primitive data. // Take over new primitive data.
// Optimized to avoid overwriting data at all // Optimized to avoid overwriting data at all
if (!pointLst().empty()) if (!pointLst->empty())
{ {
storedPoints().transfer(pointLst()); storedPoints().transfer(pointLst());
} }
if (!faceLst().empty()) if (!faceLst->empty())
{ {
storedFaces().transfer(faceLst()); storedFaces().transfer(faceLst());
} }
if (!zoneLst().empty()) if (!zoneLst->empty())
{ {
storedZones().transfer(zoneLst()); storedZones().transfer(zoneLst());
} }