Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
074a0cc7
Commit
074a0cc7
authored
Jan 15, 2013
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of cgogn:~pitiot/CGoGN
parents
271c50a6
5ec3305b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
24 deletions
+8
-24
include/Algo/MovingObjects/particle_cell_2D_memo.h
include/Algo/MovingObjects/particle_cell_2D_memo.h
+1
-1
include/Algo/MovingObjects/particle_cell_2D_memo.hpp
include/Algo/MovingObjects/particle_cell_2D_memo.hpp
+2
-21
include/Topology/generic/cellmarker.h
include/Topology/generic/cellmarker.h
+5
-2
No files found.
include/Algo/MovingObjects/particle_cell_2D_memo.h
View file @
074a0cc7
...
...
@@ -48,8 +48,8 @@ public:
virtual
void
faceState
(
const
VEC3
&
current
,
CellMarkerMemo
<
FACE
>&
memo_cross
)
;
std
::
vector
<
Dart
>
move
(
const
VEC3
&
goal
)
;
std
::
vector
<
Dart
>
move
(
const
VEC3
&
goal
,
CellMarkerMemo
<
FACE
>&
memo_cross
)
;
std
::
vector
<
Dart
>
move
(
const
VEC3
&
goal
);
}
;
#include "particle_cell_2D_memo.hpp"
...
...
include/Algo/MovingObjects/particle_cell_2D_memo.hpp
View file @
074a0cc7
template
<
typename
PFP
>
std
::
vector
<
Dart
>
ParticleCell2DMemo
<
PFP
>::
move
(
const
VEC3
&
goal
)
{
this
->
crossCell
=
NO_CROSS
;
...
...
@@ -34,26 +35,7 @@ template <typename PFP>
std
::
vector
<
Dart
>
ParticleCell2DMemo
<
PFP
>::
move
(
const
VEC3
&
goal
,
CellMarkerMemo
<
FACE
>&
memo_cross
)
{
memo_cross
.
mark
(
this
->
d
);
this
->
crossCell
=
NO_CROSS
;
if
(
!
Geom
::
arePointsEquals
(
goal
,
this
->
getPosition
()))
{
switch
(
this
->
getState
())
{
case
VERTEX
:
vertexState
(
goal
,
memo_cross
)
;
break
;
case
EDGE
:
edgeState
(
goal
,
memo_cross
)
;
break
;
case
FACE
:
faceState
(
goal
,
memo_cross
)
;
break
;
}
}
else
this
->
ParticleBase
<
PFP
>::
move
(
goal
)
;
this
->
move
(
goal
,
memo_cross
);
return
memo_cross
.
get_markedCells
();
}
...
...
@@ -108,7 +90,6 @@ void ParticleCell2DMemo<PFP>::vertexState(const VEC3& current, CellMarkerMemo<FA
{
this
->
edgeState
(
current
,
memo_cross
)
;
return
;
}
this
->
d
=
this
->
m
.
phi2_1
(
this
->
d
)
;
...
...
include/Topology/generic/cellmarker.h
View file @
074a0cc7
...
...
@@ -344,9 +344,12 @@ public:
{
assert
(
this
->
m_map
.
template
getMarkerSet
<
CELL
>(
this
->
m_thread
).
testMark
(
this
->
m_mark
));
assert
(
this
->
m_markVector
!=
NULL
);
for
(
std
::
vector
<
Dart
>::
iterator
it
=
m_markedDarts
.
begin
();
it
!=
m_markedDarts
.
end
();
++
it
)
this
->
m_markVector
->
operator
[](
this
->
m_map
.
template
getEmbedding
<
CELL
>(
*
it
)).
unsetMark
(
this
->
m_mark
)
;
{
this
->
unmark
(
*
it
)
;
}
m_markedDarts
.
clear
();
}
std
::
vector
<
Dart
>
get_markedCells
()
{
...
...
Write
Preview
Markdown
is supported
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