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

Fixed merge errors

Browse source
This commit is contained in:
Hrvoje Jasak 2012-08-24 13:33:51 +01:00
parent 4b1db283f9
commit 31c0472261
1 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/dynamicMesh/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C
View file

@ -310,17 +310,10 @@ void Foam::mixerFvMesh::calcMovingMask() const
( (
word(dict_.subDict("slider").lookup("moving")) + "Zone" word(dict_.subDict("slider").lookup("moving")) + "Zone"
); );
<<<<<<< HEAD
const labelList& movingSliderAddr = const labelList& movingSliderAddr =
faceZones()[faceZones().findZoneID(movingSliderZoneName)]; faceZones()[faceZones().findZoneID(movingSliderZoneName)];
=======
const labelList& movingSliderAddr =
faceZones()[faceZones().findZoneID(movingSliderZoneName)];
>>>>>>> parallelTopo
forAll (movingSliderAddr, faceI) forAll (movingSliderAddr, faceI)
{ {
const face& curFace = f[movingSliderAddr[faceI]]; const face& curFace = f[movingSliderAddr[faceI]];
@ -486,7 +479,6 @@ bool Foam::mixerFvMesh::update()
mappedOldPointsNew.map(oldPointsNew, topoChangeMap->pointMap()); mappedOldPointsNew.map(oldPointsNew, topoChangeMap->pointMap());
movePoints(mappedOldPointsNew); movePoints(mappedOldPointsNew);
<<<<<<< HEAD
resetMotion(); resetMotion();
setV0(); setV0();
@ -505,27 +497,6 @@ bool Foam::mixerFvMesh::update()
// Move the sliding interface points to correct position // Move the sliding interface points to correct position
movePoints(newPoints); movePoints(newPoints);
} }
=======
resetMotion();
setV0();
// Move the sliding interface points to correct position
movePoints(topoChangeMap->preMotionPoints());
}
else
{
pointField newPoints = allPoints();
movePoints(oldPointsNew);
resetMotion();
setV0();
// Move the sliding interface points to correct position
movePoints(newPoints);
}
>>>>>>> parallelTopo
} }
return topoChangeMap->morphing(); return topoChangeMap->morphing();