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
cb535c9e
Commit
cb535c9e
authored
12 years ago
by
mattijs
Browse files
Options
Downloads
Patches
Plain Diff
GIT: pointEdgePoint: reverting incorrect commit
parent
49645b59
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/pointEdgePointI.H
+2
-57
2 additions, 57 deletions
src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H
with
2 additions
and
57 deletions
src/meshTools/algorithms/PointEdgeWave/pointEdgePointI.H
+
2
−
57
View file @
cb535c9e
...
...
@@ -59,63 +59,8 @@ inline bool Foam::pointEdgePoint::update
if
((
diff
<
SMALL
)
||
((
distSqr_
>
SMALL
)
&&
(
diff
/
distSqr_
<
tol
)))
{
// don't propagate small changes unless origins differ
scalar
originDiff2
=
magSqr
(
origin_
-
w2
.
origin
());
if
(
originDiff2
<
SMALL
||
((
distSqr_
>
SMALL
)
&&
(
originDiff2
/
distSqr_
<
tol
))
)
{
return
false
;
}
else
{
// Different origin. Choose lexical ordering.
bool
w2less
=
false
;
for
(
direction
cmp
=
0
;
cmp
<
vector
::
nComponents
;
cmp
++
)
{
scalar
d
=
w2
.
origin
()[
cmp
]
-
origin_
[
cmp
];
scalar
magD
=
mag
(
d
);
if
(
magD
<
SMALL
||
((
distSqr_
>
SMALL
)
&&
(
magD
/
distSqr_
>
tol
))
)
{
// Small difference. Test next component.
}
else
if
(
d
<
0
)
{
w2less
=
true
;
break
;
}
else
if
(
d
>
0
)
{
break
;
}
}
if
(
w2less
)
{
// update with new values
distSqr_
=
dist2
;
origin_
=
w2
.
origin
();
return
true
;
}
else
{
Pout
<<
"** same distance. at:"
<<
pt
<<
nl
<<
" old distance:"
<<
Foam
::
sqr
(
distSqr_
)
<<
nl
<<
" new distance:"
<<
Foam
::
sqr
(
dist2
)
<<
nl
<<
" old origin:"
<<
origin_
<<
nl
<<
" new origin:"
<<
w2
.
origin
()
<<
nl
<<
endl
;
Pout
<<
"** w2 looses."
<<
endl
;
return
false
;
}
}
// don't propagate small changes
return
false
;
}
else
{
...
...
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