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

Update points using setOldPoints to avoid geometrical update

Browse source
This commit is contained in:
Hrvoje Jasak 2015-08-25 15:49:13 +01:00
parent 171fdf38f6
commit 2c88222c95
6 changed files with 74 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/dynamicMesh/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
View file

@ -363,26 +363,52 @@ bool Foam::linearValveFvMesh::update()
Info << "Moving points post slider attach" << endl;
if (topoChangeMap3->morphing())
bool localMorphing3 = topoChangeMap3->morphing();
bool globalMorphing3 = localMorphing3;
reduce(globalMorphing3, orOp<bool>());
if (globalMorphing3)
{
msPtr_->updateMesh(topoChangeMap3());
if (debug)
{
Info << "Moving points post slider attach" << endl;
}
pointField newPoints = allPoints();
pointField mappedOldPointsNew(newPoints.size());
mappedOldPointsNew.map(oldPointsNew, topoChangeMap3->pointMap());
if (localMorphing3)
{
msPtr_->updateMesh(topoChangeMap3());
// Solve the correct mesh motion to make sure motion fluxes
// are solved for and not mapped
movePoints(mappedOldPointsNew);
resetMotion();
setV0();
movePoints(newPoints);
pointField mappedOldPointsNew(newPoints.size());
mappedOldPointsNew.map
(
oldPointsNew,
topoChangeMap3->pointMap()
);
// Solve the correct mesh motion to make sure motion fluxes
// are solved for and not mapped
// Note: using setOldPoints instead of movePoints.
// HJ, 23/Aug/2015
setOldPoints(mappedOldPointsNew);
resetMotion();
setV0();
fvMesh::movePoints(newPoints);
}
else
{
// No local topological change. Execute double motion for
// sync with topological changes
// Note: using setOldPoints instead of movePoints.
// HJ, 23/Aug/2015
setOldPoints(oldPointsNew);
resetMotion();
setV0();
// Set new point motion
fvMesh::movePoints(newPoints);
}
}
}

16
src/dynamicMesh/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
View file

@ -532,12 +532,16 @@ bool Foam::linearValveLayersFvMesh::update()
if (localMorphing2)
{
Info << "Topology change; executing pre-motion" << endl;
movePoints(topoChangeMap2->preMotionPoints());
// Note: using setOldPoints instead of movePoints.
// HJ, 23/Aug/2015
setOldPoints(topoChangeMap2->preMotionPoints());
newPoints = topoChangeMap2->preMotionPoints();
}
else
{
movePoints(newPoints);
// Note: using setOldPoints instead of movePoints.
// HJ, 23/Aug/2015
setOldPoints(newPoints);
}
setV0();
@ -589,7 +593,9 @@ bool Foam::linearValveLayersFvMesh::update()
// Solve the correct mesh motion to make sure motion fluxes
// are solved for and not mapped
movePoints(mappedOldPointsNew);
// Note: using setOldPoints instead of movePoints.
// HJ, 23/Aug/2015
setOldPoints(mappedOldPointsNew);
resetMotion();
setV0();
@ -601,7 +607,9 @@ bool Foam::linearValveLayersFvMesh::update()
{
// No local topological change. Execute double motion for
// sync with topological changes
movePoints(oldPointsNew);
// Note: using setOldPoints instead of movePoints.
// HJ, 23/Aug/2015
setOldPoints(oldPointsNew);
resetMotion();
setV0();

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

@ -477,7 +477,9 @@ bool Foam::mixerFvMesh::update()
pointField mappedOldPointsNew(allPoints().size());
mappedOldPointsNew.map(oldPointsNew, topoChangeMap->pointMap());
movePoints(mappedOldPointsNew);
// Note: using setOldPoints instead of movePoints.
// HJ, 23/Aug/2015
setOldPoints(mappedOldPointsNew);
resetMotion();
setV0();
@ -488,7 +490,10 @@ bool Foam::mixerFvMesh::update()
else
{
pointField newPoints = allPoints();
movePoints(oldPointsNew);
// Note: using setOldPoints instead of movePoints.
// HJ, 23/Aug/2015
setOldPoints(oldPointsNew);
resetMotion();
setV0();

8
src/dynamicMesh/topoChangerFvMesh/movingBodyTopoFvMesh/movingBodyTopoFvMesh.C
View file

@ -276,7 +276,9 @@ bool Foam::movingBodyTopoFvMesh::update()
// pointField mappedOldPointsNew(allPoints().size());
// mappedOldPointsNew.map(oldPointsNew, topoChangeMap->pointMap());
// movePoints(mappedOldPointsNew);
// // Note: using setOldPoints instead of movePoints.
// // HJ, 23/Aug/2015
// setOldPoints(mappedOldPointsNew);
// resetMotion();
// setV0();
@ -286,7 +288,9 @@ bool Foam::movingBodyTopoFvMesh::update()
// else
// {
// // No change, use old points
// movePoints(oldPointsNew);
// // Note: using setOldPoints instead of movePoints.
// // HJ, 23/Aug/2015
// setOldPoints(oldPointsNew);
// resetMotion();
// setV0();
// }

5
src/dynamicMesh/topoChangerFvMesh/multiMixerFvMesh/multiMixerFvMesh.C
View file

@ -284,7 +284,10 @@ bool Foam::multiMixerFvMesh::update()
pointField mappedOldPointsNew(allPoints().size());
mappedOldPointsNew.map(oldPointsNew, topoChangeMap->pointMap());
movePoints(mappedOldPointsNew);
// Note: using setOldPoints instead of movePoints.
// HJ, 23/Aug/2015
setOldPoints(mappedOldPointsNew);
resetMotion();
setV0();

4
src/dynamicMesh/topoChangerFvMesh/multiTopoBodyFvMesh/multiTopoBodyFvMesh.C
View file

@ -236,7 +236,9 @@ bool Foam::multiTopoBodyFvMesh::update()
// pointField mappedOldPointsNew(allPoints().size());
// mappedOldPointsNew.map(oldPointsNew, topoChangeMap->pointMap());
// movePoints(mappedOldPointsNew);
// // Note: using setOldPoints instead of movePoints.
// // HJ, 23/Aug/2015
// setOldPoints(mappedOldPointsNew);
// resetMotion();
// setV0();