From 7c4c6cdbea2c65430d9b1658b643c087c5bdb58d Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 29 May 2012 18:07:58 +0100
Subject: [PATCH] BUG: globalMeshDataTemplates: only create reference if
necessary
---
.../globalMeshData/globalMeshDataTemplates.C | 38 ++++++++++++-------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
index b5d18c2cd8b..664dffd55f4 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
@@ -59,8 +59,6 @@ void Foam::globalMeshData::syncData
if (slavePoints.size()+nTransformSlavePoints > 0)
{
- const labelList& transformSlavePoints = transformedSlaves[i];
-
// Combine master with untransformed slave data
forAll(slavePoints, j)
{
@@ -68,20 +66,27 @@ void Foam::globalMeshData::syncData
}
// Combine master with transformed slave data
- forAll(transformSlavePoints, j)
+ if (nTransformSlavePoints)
{
- cop(elem, elems[transformSlavePoints[j]]);
+ const labelList& transformSlavePoints = transformedSlaves[i];
+ forAll(transformSlavePoints, j)
+ {
+ cop(elem, elems[transformSlavePoints[j]]);
+ }
}
-
// Copy result back to slave slots
forAll(slavePoints, j)
{
elems[slavePoints[j]] = elem;
}
- forAll(transformSlavePoints, j)
+ if (nTransformSlavePoints)
{
- elems[transformSlavePoints[j]] = elem;
+ const labelList& transformSlavePoints = transformedSlaves[i];
+ forAll(transformSlavePoints, j)
+ {
+ elems[transformSlavePoints[j]] = elem;
+ }
}
}
}
@@ -125,8 +130,6 @@ void Foam::globalMeshData::syncData
if (slavePoints.size()+nTransformSlavePoints > 0)
{
- const labelList& transformSlavePoints = transformedSlaves[i];
-
// Combine master with untransformed slave data
forAll(slavePoints, j)
{
@@ -134,20 +137,27 @@ void Foam::globalMeshData::syncData
}
// Combine master with transformed slave data
- forAll(transformSlavePoints, j)
+ if (nTransformSlavePoints)
{
- cop(elem, elems[transformSlavePoints[j]]);
+ const labelList& transformSlavePoints = transformedSlaves[i];
+ forAll(transformSlavePoints, j)
+ {
+ cop(elem, elems[transformSlavePoints[j]]);
+ }
}
-
// Copy result back to slave slots
forAll(slavePoints, j)
{
elems[slavePoints[j]] = elem;
}
- forAll(transformSlavePoints, j)
+ if (nTransformSlavePoints)
{
- elems[transformSlavePoints[j]] = elem;
+ const labelList& transformSlavePoints = transformedSlaves[i];
+ forAll(transformSlavePoints, j)
+ {
+ elems[transformSlavePoints[j]] = elem;
+ }
}
}
}
--
GitLab