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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
1c3da58f
Commit
1c3da58f
authored
Nov 12, 2014
by
pitiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reparation particules 3D
parent
38233cd7
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
90 additions
and
99 deletions
+90
-99
Apps/Examples/mcmesh.cpp
Apps/Examples/mcmesh.cpp
+1
-1
apps_cmake.txt
apps_cmake.txt
+2
-4
include/Algo/ImplicitHierarchicalMesh/ihm3.hxx
include/Algo/ImplicitHierarchicalMesh/ihm3.hxx
+1
-1
include/Algo/ImplicitHierarchicalMesh/subdivision3.hppxx
include/Algo/ImplicitHierarchicalMesh/subdivision3.hppxx
+52
-52
include/Algo/ImplicitHierarchicalMesh/subdivision3.hxx
include/Algo/ImplicitHierarchicalMesh/subdivision3.hxx
+16
-16
include/Algo/Import/import2tablesVolume.hpp
include/Algo/Import/import2tablesVolume.hpp
+2
-2
include/Algo/MovingObjects/particle_cell_2D_memo.hpp
include/Algo/MovingObjects/particle_cell_2D_memo.hpp
+3
-3
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
+3
-3
include/Algo/MovingObjects/particle_cell_3D.h
include/Algo/MovingObjects/particle_cell_3D.h
+1
-1
include/Topology/ihmap/ihm3.h
include/Topology/ihmap/ihm3.h
+6
-0
include/Topology/ihmap/ihm3.hpp
include/Topology/ihmap/ihm3.hpp
+1
-14
include/Topology/map/map2.hpp
include/Topology/map/map2.hpp
+1
-1
include/Topology/map/map3.hpp
include/Topology/map/map3.hpp
+1
-1
No files found.
Apps/Examples/mcmesh.cpp
View file @
1c3da58f
...
...
@@ -170,7 +170,7 @@ void MCMesh::updateRender()
void
MCMesh
::
fromFile
(
char
*
fname
)
{
myImg
=
new
SAlgo
::
MC
::
Image
<
DATATYPE
>
();
myImg
->
loadInrgz
(
fname
);
//
myImg->loadInrgz(fname);
CGoGNout
<<
"Image chargee"
<<
CGoGNendl
;
CGoGNout
<<
myImg
->
getWidthX
()
<<
"x"
<<
myImg
->
getWidthY
()
<<
"x"
<<
myImg
->
getWidthZ
()
<<
"voxels"
<<
CGoGNendl
;
}
...
...
apps_cmake.txt
View file @
1c3da58f
...
...
@@ -78,11 +78,9 @@ IF(WIN32)
ELSE(WIN32)
find_package(SuiteSparse REQUIRED)
SET (COMMON_INCLUDES ${COMMON_INCLUDES} ${SUITESPARSE_INCLUDE_DIRS})
<<<<<<< HEAD
SET (COMMON_LIBS ${SUITESPARSE_LIBRARIES} lapack blas ${COMMON_LIBS})
=======
SET (COMMON_LIBS ${SUITESPARSE_LIBRARIES} lapack blas ${COMMON_LIBS} )
>>>>>>> c2fbbbce446c3f437c531debda00b48f13f29790
ENDIF(WIN32)
...
...
include/Algo/ImplicitHierarchicalMesh/ihm3.hxx
View file @
1c3da58f
...
...
@@ -478,7 +478,7 @@ public:
}
// namespace CGoGN
#include "Algo/ImplicitHierarchicalMesh/ihm3.hpp"
#include "Algo/ImplicitHierarchicalMesh/ihm3.hpp
xx
"
#endif
...
...
include/Algo/ImplicitHierarchicalMesh/subdivision3.hppxx
View file @
1c3da58f
This diff is collapsed.
Click to expand it.
include/Algo/ImplicitHierarchicalMesh/subdivision3.hxx
View file @
1c3da58f
...
...
@@ -48,7 +48,7 @@ enum SubdivideType
template
<
typename
PFP
>
void
newLevelHexa
(
typename
PFP
::
MAP
&
map
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
);
void
newLevelHexa
(
typename
PFP
::
MAP
&
map
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
);
/***********************************************************************************
...
...
@@ -56,13 +56,13 @@ void newLevelHexa(typename PFP::MAP& map, AttributeHandler<typename PFP::VEC3, V
***********************************************************************************/
template
<
typename
PFP
>
void
subdivideEdge
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
)
;
void
subdivideEdge
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
)
;
template
<
typename
PFP
>
void
subdivideFace
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
,
SubdivideType
sType
=
S_TRI
);
void
subdivideFace
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
,
SubdivideType
sType
=
S_TRI
);
template
<
typename
PFP
>
Dart
subdivideVolumeClassic
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
);
Dart
subdivideVolumeClassic
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
);
...
...
@@ -72,13 +72,13 @@ Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, AttributeHandler<typ
template
<
typename
PFP
>
void
subdivideEdgeWrong
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
)
;
void
subdivideEdgeWrong
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
)
;
template
<
typename
PFP
>
void
subdivideFaceWrong
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
,
SubdivideType
sType
=
S_TRI
);
void
subdivideFaceWrong
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
,
SubdivideType
sType
=
S_TRI
);
template
<
typename
PFP
>
Dart
subdivideVolumeClassicWrong
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
);
Dart
subdivideVolumeClassicWrong
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
);
...
...
@@ -89,23 +89,23 @@ Dart subdivideVolumeClassicWrong(typename PFP::MAP& map, Dart d, AttributeHandle
template
<
typename
PFP
>
Dart
subdivideVolume
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
);
Dart
subdivideVolume
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
);
template
<
typename
PFP
>
Dart
subdivideVolumeGen
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
);
Dart
subdivideVolumeGen
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
);
template
<
typename
PFP
>
Dart
subdivideVolumeClassic2
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
);
Dart
subdivideVolumeClassic2
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
);
template
<
typename
PFP
>
void
subdivideLoop
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
);
void
subdivideLoop
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
);
/***********************************************************************************
...
...
@@ -113,13 +113,13 @@ void subdivideLoop(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP
***********************************************************************************/
template
<
typename
PFP
>
void
coarsenEdge
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
);
void
coarsenEdge
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
);
template
<
typename
PFP
>
void
coarsenFace
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
,
SubdivideType
sType
=
S_TRI
);
void
coarsenFace
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
,
SubdivideType
sType
=
S_TRI
);
template
<
typename
PFP
>
void
coarsenVolume
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
);
void
coarsenVolume
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
);
/***********************************************************************************
* Raffinement
...
...
@@ -128,7 +128,7 @@ void coarsenVolume(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP
* Un brin de la face oppose aux faces a spliter
*/
template
<
typename
PFP
>
void
splitVolume
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
>&
position
);
void
splitVolume
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
AttributeHandler
<
typename
PFP
::
VEC3
,
VERTEX
,
typename
PFP
::
MAP
>&
position
);
...
...
@@ -138,6 +138,6 @@ void splitVolume(typename PFP::MAP& map, Dart d, AttributeHandler<typename PFP::
}
//namespace Algo
}
//namespace CGoGN
#include "Algo/ImplicitHierarchicalMesh/subdivision3.hpp"
#include "Algo/ImplicitHierarchicalMesh/subdivision3.hpp
xx
"
#endif
include/Algo/Import/import2tablesVolume.hpp
View file @
1c3da58f
...
...
@@ -131,10 +131,10 @@ bool MeshTablesVolume<PFP>::importMesh(const std::string& filename, std::vector<
template <typename PFP>
bool MeshTablesVolume<PFP>::importTet(const std::string& filename, std::vector<std::string>& attrNames)
{
VertexAttribute
<
VEC3
,
MAP
>
position
=
m_map
.
template
getAttribute
<
VEC3
,
VERTEX
,
MAP
>(
"position"
)
;
VertexAttribute<VEC3, MAP> position = m_map.template getAttribute<VEC3, VERTEX, MAP>("position") ;
if (!position.isValid())
position
=
m_map
.
template
addAttribute
<
VEC3
,
VERTEX
,
MAP
>(
"position"
)
;
position = m_map.template addAttribute<VEC3, VERTEX, MAP>("position") ;
attrNames.push_back(position.name()) ;
...
...
include/Algo/MovingObjects/particle_cell_2D_memo.hpp
View file @
1c3da58f
...
...
@@ -101,7 +101,7 @@ void ParticleCell2DMemo<PFP>::vertexState(const VEC3& current, CellMarkerMemo<MA
CGoGNout
<<
"vertexState"
<<
this
->
d
<<
CGoGNendl
;
#endif
assert
(
std
::
isfinite
(
current
[
0
])
&&
std
::
isfinite
(
current
[
1
])
&&
std
::
isfinite
(
current
[
2
]))
;
memo_cross
.
mark
(
this
->
d
);
if
(
!
memo_cross
.
isMarked
(
this
->
d
))
memo_cross
.
mark
(
this
->
d
);
this
->
crossCell
=
CROSS_OTHER
;
if
(
Geometry
::
isPointOnVertex
<
PFP
>
(
this
->
m
,
this
->
d
,
this
->
positionAttribut
,
current
))
...
...
@@ -190,7 +190,7 @@ void ParticleCell2DMemo<PFP>::edgeState(const VEC3& current, CellMarkerMemo<MAP,
assert
(
std
::
isfinite
(
current
[
0
])
&&
std
::
isfinite
(
current
[
1
])
&&
std
::
isfinite
(
current
[
2
]))
;
// assert(Geometry::isPointOnEdge<PFP>(m,d,m_positions,m_position));
memo_cross
.
mark
(
this
->
d
);
if
(
!
memo_cross
.
isMarked
(
this
->
d
))
memo_cross
.
mark
(
this
->
d
);
if
(
this
->
crossCell
==
NO_CROSS
)
{
this
->
crossCell
=
CROSS_EDGE
;
...
...
@@ -247,7 +247,7 @@ void ParticleCell2DMemo<PFP>::faceState(const VEC3& current, CellMarkerMemo<MAP,
&&
std
::
isfinite
(
this
->
getPosition
()[
2
]))
;
assert
(
std
::
isfinite
(
current
[
0
])
&&
std
::
isfinite
(
current
[
1
])
&&
std
::
isfinite
(
current
[
2
]))
;
// assert(Geometry::isPointInConvexFace2D<PFP>(m,d,m_positions,m_position,true));
memo_cross
.
mark
(
this
->
d
);
if
(
!
memo_cross
.
isMarked
(
this
->
d
))
memo_cross
.
mark
(
this
->
d
);
Dart
dd
=
this
->
d
;
float
wsoe
=
this
->
getOrientationFace
(
current
,
this
->
m
.
phi1
(
this
->
d
))
;
...
...
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
View file @
1c3da58f
...
...
@@ -107,7 +107,7 @@ void ParticleCell2DAndHalfMemo<PFP>::vertexState(VEC3 current, CellMarkerMemo<MA
CGoGNout
<<
"vertexState"
<<
d
<<
CGoGNendl
;
#endif
assert
(
current
.
isFinite
());
if
(
!
memo_cross
.
isMarked
(
this
->
d
))
memo_cross
.
mark
(
this
->
d
);
this
->
crossCell
=
CROSS_OTHER
;
if
(
Geometry
::
isPointOnVertex
<
PFP
>
(
this
->
m
,
this
->
d
,
this
->
m_positions
,
current
))
...
...
@@ -176,7 +176,7 @@ void ParticleCell2DAndHalfMemo<PFP>::edgeState(VEC3 current, CellMarkerMemo<MAP,
#ifdef DEBUG
CGoGNout
<<
"edgeState"
<<
d
<<
CGoGNendl
;
#endif
if
(
!
memo_cross
.
isMarked
(
this
->
d
))
memo_cross
.
mark
(
this
->
d
);
assert
(
current
.
isFinite
());
// assert(Geometry::isPointOnEdge<PFP>(m,d,m_positions,m_position));
...
...
@@ -247,7 +247,7 @@ void ParticleCell2DAndHalfMemo<PFP>::faceState(VEC3 current, CellMarkerMemo<MAP,
CGoGNout
<<
"faceState"
<<
this
->
d
<<
CGoGNendl
;
#endif
if
(
memo_cross
.
isMarked
(
this
->
d
))
return
;
memo_cross
.
mark
(
this
->
d
);
if
(
!
memo_cross
.
isMarked
(
this
->
d
))
memo_cross
.
mark
(
this
->
d
);
assert
(
this
->
getPosition
().
isFinite
());
assert
(
current
.
isFinite
());
...
...
include/Algo/MovingObjects/particle_cell_3D.h
View file @
1c3da58f
...
...
@@ -60,7 +60,7 @@ public :
m
(
map
),
position
(
tabPos
),
d
(
belonging_cell
),
state
(
3
)
state
(
4
)
{
m_positionFace
=
pointInFace
(
d
);
}
...
...
include/Topology/ihmap/ihm3.h
View file @
1c3da58f
...
...
@@ -185,6 +185,12 @@ public:
/***************************************************
* ID MANAGEMENT *
***************************************************/
unsigned
int
triRefinementEdgeId
(
Dart
d
);
unsigned
int
quadRefinementEdgeId
(
Dart
d
);
unsigned
int
faceId
(
Dart
d
);
//! Give a new unique id to all the edges of the map
/*!
*/
...
...
include/Topology/ihmap/ihm3.hpp
View file @
1c3da58f
...
...
@@ -573,20 +573,7 @@ inline unsigned int ImplicitHierarchicalMap3::faceId(Dart d)
{
unsigned
int
fId
=
getFaceId
(
phi2
(
d
));
if
(
fId
==
0
)
return
1
;
else
if
(
id
==
1
)
return
2
;
else
if
(
id
==
2
)
{
if
(
dId
==
eId
)
return
0
;
else
return
1
;
}
//else if(id == 3)
return
0
;
return
(
fId
+
1
)
%
2
;
}
inline
unsigned
int
ImplicitHierarchicalMap3
::
getFaceId
(
Dart
d
)
...
...
include/Topology/map/map2.hpp
View file @
1c3da58f
...
...
@@ -866,7 +866,7 @@ bool Map2<MAP_IMPL>::sameOrientedVolume(Vol v1, Vol v2) const
mark
.
mark
(
it
);
// Mark
Dart
adj
=
phi2
(
it
);
// Get adjacent face
if
(
!
this
->
isBoundaryMarked2
(
adj
)
&&
!
mark
.
isMarked
(
adj
))
if
(
!
this
->
isBoundaryMarked
(
2
,
adj
)
&&
!
mark
.
isMarked
(
adj
))
visitedFaces
.
push_back
(
adj
);
// Add it
it
=
this
->
phi1
(
it
);
}
while
(
it
!=
*
face
);
...
...
include/Topology/map/map3.hpp
View file @
1c3da58f
...
...
@@ -1428,7 +1428,7 @@ unsigned int Map3<MAP_IMPL>::closeMap()
if (phi3(d) == d)
{
++nb ;
closeHole(d,true
);
closeHole(d
);
}
}
return nb ;
...
...
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