Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
bc5a1b38
Commit
bc5a1b38
authored
Apr 28, 2015
by
BRAMAS Berenger
Browse files
update the separation criteria control
parent
2ad103ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Src/Containers/FOctree.hpp
View file @
bc5a1b38
...
@@ -968,7 +968,7 @@ public:
...
@@ -968,7 +968,7 @@ public:
for
(
int
idxY
=
startY
;
idxY
<=
endY
;
++
idxY
){
for
(
int
idxY
=
startY
;
idxY
<=
endY
;
++
idxY
){
for
(
int
idxZ
=
startZ
;
idxZ
<=
endZ
;
++
idxZ
){
for
(
int
idxZ
=
startZ
;
idxZ
<=
endZ
;
++
idxZ
){
// if we are not on the current cell
// if we are not on the current cell
if
(
idxX
||
idxY
||
idxZ
){
if
(
neighSeparation
<
1
||
idxX
||
idxY
||
idxZ
){
const
FTreeCoordinate
otherParent
(
parentCell
.
getX
()
+
idxX
,
parentCell
.
getY
()
+
idxY
,
parentCell
.
getZ
()
+
idxZ
);
const
FTreeCoordinate
otherParent
(
parentCell
.
getX
()
+
idxX
,
parentCell
.
getY
()
+
idxY
,
parentCell
.
getZ
()
+
idxZ
);
FTreeCoordinate
otherParentInBox
(
otherParent
);
FTreeCoordinate
otherParentInBox
(
otherParent
);
...
...
Src/Containers/FTreeCoordinate.hpp
View file @
bc5a1b38
...
@@ -363,7 +363,7 @@ public:
...
@@ -363,7 +363,7 @@ public:
if
(
!
FMath
::
Between
(
parentCell
.
getZ
()
+
idxZ
,
0
,
limite
))
continue
;
if
(
!
FMath
::
Between
(
parentCell
.
getZ
()
+
idxZ
,
0
,
limite
))
continue
;
// if we are not on the current cell
// if we are not on the current cell
if
(
idxX
||
idxY
||
idxZ
){
if
(
neighSeparation
<
1
||
idxX
||
idxY
||
idxZ
){
const
FTreeCoordinate
otherParent
(
parentCell
.
getX
()
+
idxX
,
parentCell
.
getY
()
+
idxY
,
parentCell
.
getZ
()
+
idxZ
);
const
FTreeCoordinate
otherParent
(
parentCell
.
getX
()
+
idxX
,
parentCell
.
getY
()
+
idxY
,
parentCell
.
getZ
()
+
idxZ
);
const
MortonIndex
mortonOther
=
otherParent
.
getMortonIndex
(
inLevel
-
1
);
const
MortonIndex
mortonOther
=
otherParent
.
getMortonIndex
(
inLevel
-
1
);
...
@@ -408,7 +408,7 @@ public:
...
@@ -408,7 +408,7 @@ public:
if
(
!
FMath
::
Between
(
parentCell
.
getZ
()
+
idxZ
,
0
,
limite
))
continue
;
if
(
!
FMath
::
Between
(
parentCell
.
getZ
()
+
idxZ
,
0
,
limite
))
continue
;
// if we are not on the current cell
// if we are not on the current cell
if
(
idxX
||
idxY
||
idxZ
){
if
(
neighSeparation
<
1
||
idxX
||
idxY
||
idxZ
){
const
FTreeCoordinate
otherParent
(
parentCell
.
getX
()
+
idxX
,
parentCell
.
getY
()
+
idxY
,
parentCell
.
getZ
()
+
idxZ
);
const
FTreeCoordinate
otherParent
(
parentCell
.
getX
()
+
idxX
,
parentCell
.
getY
()
+
idxY
,
parentCell
.
getZ
()
+
idxZ
);
const
MortonIndex
mortonOther
=
otherParent
.
getMortonIndex
(
inLevel
-
1
);
const
MortonIndex
mortonOther
=
otherParent
.
getMortonIndex
(
inLevel
-
1
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment