Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openfoam
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
openfoam
Commits
c9b123cb
Commit
c9b123cb
authored
12 years ago
by
Henry
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev
parents
03c8cf06
740c4fa8
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
+26
-17
26 additions, 17 deletions
src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
with
26 additions
and
17 deletions
src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.C
+
26
−
17
View file @
c9b123cb
...
@@ -566,7 +566,8 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
...
@@ -566,7 +566,8 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
elems
[
pointI
]
=
allPointInfo_
[
meshPoints
[
pointI
]];
elems
[
pointI
]
=
allPointInfo_
[
meshPoints
[
pointI
]];
}
}
// Pull slave data onto master. No need to update transformed slots.
// Pull slave data onto master (which might or might not have any
// initialised points). No need to update transformed slots.
slavesMap
.
distribute
(
elems
,
false
);
slavesMap
.
distribute
(
elems
,
false
);
// Combine master data with slave data
// Combine master data with slave data
...
@@ -597,26 +598,34 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
...
@@ -597,26 +598,34 @@ Foam::label Foam::PointEdgeWave<Type, TrackingData>::handleCollocatedPoints()
// Extract back onto mesh
// Extract back onto mesh
forAll
(
meshPoints
,
pointI
)
forAll
(
meshPoints
,
pointI
)
{
{
Type
&
elem
=
allPointInfo_
[
meshPoints
[
pointI
]];
if
(
elems
[
pointI
].
valid
(
td_
))
// Like updatePoint but bypass Type::updatePoint with its tolerance
// checking
if
(
!
elem
.
valid
(
td_
)
||
!
elem
.
equal
(
elems
[
pointI
],
td_
))
{
{
nEvals_
++
;
label
meshPointI
=
meshPoints
[
pointI
];
elem
=
elems
[
pointI
];
// See if element now valid
Type
&
elem
=
allPointInfo_
[
meshPointI
];
if
(
elem
.
valid
(
td_
))
{
--
nUnvisitedPoints_
;
}
// Update database of changed points
bool
wasValid
=
elem
.
valid
(
td_
);
if
(
!
changedPoint_
[
pointI
])
// Like updatePoint but bypass Type::updatePoint with its tolerance
// checking
//if (!elem.valid(td_) || !elem.equal(elems[pointI], td_))
if
(
!
elem
.
equal
(
elems
[
pointI
],
td_
))
{
{
changedPoint_
[
pointI
]
=
true
;
nEvals_
++
;
changedPoints_
[
nChangedPoints_
++
]
=
pointI
;
elem
=
elems
[
pointI
];
// See if element now valid
if
(
!
wasValid
&&
elem
.
valid
(
td_
))
{
--
nUnvisitedPoints_
;
}
// Update database of changed points
if
(
!
changedPoint_
[
meshPointI
])
{
changedPoint_
[
meshPointI
]
=
true
;
changedPoints_
[
nChangedPoints_
++
]
=
meshPointI
;
}
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment