Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
9a4e744f
Commit
9a4e744f
authored
Feb 23, 2015
by
Thomas Pitiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changement mineurs particules a tester vertexstate et modif subdivide
parent
36158b13
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
+5
-3
include/Algo/MovingObjects/particle_cell_3D.hpp
include/Algo/MovingObjects/particle_cell_3D.hpp
+4
-1
No files found.
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
View file @
9a4e744f
...
...
@@ -27,7 +27,7 @@
#include "Algo/Modelisation/extrusion.h"
#include "Topology/generic/dartmarker.h"
#define DEBUG_affichage
//
#define DEBUG_affichage
namespace
CGoGN
{
...
...
@@ -214,13 +214,15 @@ Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, VertexAttribute<type
if
(
OneLevelDifference
)
{
Traversor3WF
<
typename
PFP
::
MAP
>
traF
(
map
,
old
);
for
(
Dart
dit
=
traF
.
begin
();
dit
!=
traF
.
end
();
dit
=
traF
.
next
())
{
Dart
nv
=
map
.
phi3
(
dit
);
if
(
!
map
.
isBoundaryMarked
(
3
,
nv
))
if
(
map
.
volumeLevel
(
nv
)
==
vLevel
-
1
)
subdivideVolumeClassic
<
PFP
>
(
map
,
nv
,
position
,
OneLevelDifference
);
subdivideVolumeClassic
<
PFP
>
(
map
,
nv
,
position
,
OneLevelDifference
);
}
}
...
...
@@ -354,7 +356,7 @@ Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, VertexAttribute<type
// v.push_back(map.phi1(e));
// v.push_back(map.phi1(map.phi1(e)));
std
::
cout
<<
"v size = "
<<
v
.
size
()
<<
std
::
endl
;
//
std::cout << "v size = " << v.size() << std::endl;
e
=
map
.
phi2
(
map
.
phi_1
(
e
));
}
while
(
e
!=
*
edge
);
...
...
include/Algo/MovingObjects/particle_cell_3D.hpp
View file @
9a4e744f
...
...
@@ -366,7 +366,7 @@ void ParticleCell3D<PFP>::vertexState(const VEC3& current)
#ifdef DEBUG
std
::
cout
<<
"points equal vrai :"
<<
current
<<
" || "
<<
this
->
m_position
<<
" || "
<<
d
<<
" || "
<<
position
[
d
]
<<
std
::
endl
;
#endif
//
this->m_position = som;
this
->
m_position
=
som
;
this
->
m_positionFace
=
som
;
state
=
VERTEX
;
return
;
...
...
@@ -535,11 +535,14 @@ void ParticleCell3D<PFP>::edgeState(const VEC3& current)
}
else
{
// sur le sommet de l'arete
this
->
m_position
=
position
[
2
];
std
::
cout
<<
"edgeState va dans sommet cas 1 position :"
<<
this
->
m_position
<<
std
::
endl
;
vertexState
(
current
);
}
}
else
{
// sur l'autre sommet de l'arete
d
=
m
.
phi1
(
d
);
std
::
cout
<<
"edgeState va dans sommet cas 1 position :"
<<
this
->
m_position
<<
std
::
endl
;
vertexState
(
current
);
}
}
...
...
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