Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
+ void SetParameters(double aUparam, double aVparam);
[modules/smesh.git]
/
src
/
SMDS
/
SMDS_MeshCell.cxx
diff --git
a/src/SMDS/SMDS_MeshCell.cxx
b/src/SMDS/SMDS_MeshCell.cxx
index 521c976ffbc4d6656252086f3ca83e7a4b7c9c61..04e843490b443886011d2d462a9668a66253fed5 100644
(file)
--- a/
src/SMDS/SMDS_MeshCell.cxx
+++ b/
src/SMDS/SMDS_MeshCell.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2010-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2010-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-51,6
+51,7
@@
VTKCellType SMDS_MeshCell::toVtkType (SMDSAbs_EntityType smdsType)
vtkTypes[ SMDSEntity_Quad_Edge ] = VTK_QUADRATIC_EDGE;
vtkTypes[ SMDSEntity_Triangle ] = VTK_TRIANGLE;
vtkTypes[ SMDSEntity_Quad_Triangle ] = VTK_QUADRATIC_TRIANGLE;
vtkTypes[ SMDSEntity_Quad_Edge ] = VTK_QUADRATIC_EDGE;
vtkTypes[ SMDSEntity_Triangle ] = VTK_TRIANGLE;
vtkTypes[ SMDSEntity_Quad_Triangle ] = VTK_QUADRATIC_TRIANGLE;
+ vtkTypes[ SMDSEntity_BiQuad_Triangle ] = VTK_BIQUADRATIC_TRIANGLE;
vtkTypes[ SMDSEntity_Quadrangle ] = VTK_QUAD;
vtkTypes[ SMDSEntity_Quad_Quadrangle ] = VTK_QUADRATIC_QUAD;
vtkTypes[ SMDSEntity_BiQuad_Quadrangle ] = VTK_BIQUADRATIC_QUAD;
vtkTypes[ SMDSEntity_Quadrangle ] = VTK_QUAD;
vtkTypes[ SMDSEntity_Quad_Quadrangle ] = VTK_QUADRATIC_QUAD;
vtkTypes[ SMDSEntity_BiQuad_Quadrangle ] = VTK_BIQUADRATIC_QUAD;
@@
-198,6
+199,10
@@
const std::vector<int>& SMDS_MeshCell::reverseSmdsOrder(SMDSAbs_EntityType smdsT
const int ids[] = {0,2,1,5,4,3};
reverseInterlaces[SMDSEntity_Quad_Triangle].assign( &ids[0], &ids[0]+6 );
}
const int ids[] = {0,2,1,5,4,3};
reverseInterlaces[SMDSEntity_Quad_Triangle].assign( &ids[0], &ids[0]+6 );
}
+ {
+ const int ids[] = {0,2,1,5,4,3,6};
+ reverseInterlaces[SMDSEntity_BiQuad_Triangle].assign( &ids[0], &ids[0]+7 );
+ }
{
const int ids[] = {0,3,2,1};
reverseInterlaces[SMDSEntity_Quadrangle].assign( &ids[0], &ids[0]+4 );
{
const int ids[] = {0,3,2,1};
reverseInterlaces[SMDSEntity_Quadrangle].assign( &ids[0], &ids[0]+4 );
@@
-272,8
+277,9
@@
const std::vector<int>& SMDS_MeshCell::interlacedSmdsOrder(SMDSAbs_EntityType sm
interlace[SMDSEntity_Quad_Edge].assign( &ids[0], &ids[0]+3 );
}
{
interlace[SMDSEntity_Quad_Edge].assign( &ids[0], &ids[0]+3 );
}
{
- const int ids[] = {0,3,1,4,2,5};
+ const int ids[] = {0,3,1,4,2,5
,6
};
interlace[SMDSEntity_Quad_Triangle].assign( &ids[0], &ids[0]+6 );
interlace[SMDSEntity_Quad_Triangle].assign( &ids[0], &ids[0]+6 );
+ interlace[SMDSEntity_BiQuad_Triangle].assign( &ids[0], &ids[0]+7 );
}
{
const int ids[] = {0,4,1,5,2,6,3,7,8};
}
{
const int ids[] = {0,4,1,5,2,6,3,7,8};
@@
-351,6
+357,7
@@
SMDSAbs_ElementType SMDS_MeshCell::toSmdsType(SMDSAbs_EntityType entityType)
case SMDSEntity_Triangle:
case SMDSEntity_Quad_Triangle:
case SMDSEntity_Triangle:
case SMDSEntity_Quad_Triangle:
+ case SMDSEntity_BiQuad_Triangle:
case SMDSEntity_Quadrangle:
case SMDSEntity_Quad_Quadrangle:
case SMDSEntity_BiQuad_Quadrangle:
case SMDSEntity_Quadrangle:
case SMDSEntity_Quad_Quadrangle:
case SMDSEntity_BiQuad_Quadrangle: