ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-04 23:34:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

0022100: EDF 2413 SMESH: Take into account TRIA7

Browse Source
This commit is contained in:
eap 2013-05-16 16:30:18 +00:00
parent f0c8a5c35a
commit 6cc3a49ea9
5 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/SMESHDS/SMESHDS_Command.cxx
View File

@ -502,6 +502,29 @@ void SMESHDS_Command::AddFace(int NewFaceID,
myNumber++; myNumber++;
} }
//=======================================================================
//function : AddFace
//purpose :
//=======================================================================
void SMESHDS_Command::AddFace(int NewFaceID,
int n1, int n2, int n3,
int n12, int n23, int n31, int nCenter)
{
if (!myType == SMESHDS_AddBiQuadTriangle) {
MESSAGE("SMESHDS_Command::AddFace : Bad Type");
return;
}
myIntegers.push_back(NewFaceID);
myIntegers.push_back(n1);
myIntegers.push_back(n2);
myIntegers.push_back(n3);
myIntegers.push_back(n12);
myIntegers.push_back(n23);
myIntegers.push_back(n31);
myIntegers.push_back(nCenter);
myNumber++;
}
//======================================================================= //=======================================================================
//function : AddFace //function : AddFace
//purpose : //purpose :

2
src/SMESHDS/SMESHDS_Command.hxx
View File

@ -65,6 +65,8 @@ class SMESHDS_EXPORT SMESHDS_Command
void AddEdge(int NewEdgeID, int n1, int n2, int n12); void AddEdge(int NewEdgeID, int n1, int n2, int n12);
void AddFace(int NewFaceID, int n1, int n2, int n3, void AddFace(int NewFaceID, int n1, int n2, int n3,
int n12, int n23, int n31); int n12, int n23, int n31);
void AddFace(int NewFaceID, int n1, int n2, int n3,
int n12, int n23, int n31, int nCenter);
void AddFace(int NewFaceID, int n1, int n2, int n3, int n4, void AddFace(int NewFaceID, int n1, int n2, int n3, int n4,
int n12, int n23, int n34, int n41); int n12, int n23, int n34, int n41);
void AddFace(int NewFaceID, int n1, int n2, int n3, int n4, void AddFace(int NewFaceID, int n1, int n2, int n3, int n4,

3
src/SMESHDS/SMESHDS_CommandType.hxx
View File

@ -45,7 +45,7 @@ enum SMESHDS_CommandType {
SMESHDS_ChangePolyhedronNodes, SMESHDS_ChangePolyhedronNodes,
SMESHDS_Renumber, SMESHDS_Renumber,
SMESHDS_ClearAll, SMESHDS_ClearAll,
// special types for quadratic elements // quadratic elements
SMESHDS_AddQuadEdge, SMESHDS_AddQuadEdge,
SMESHDS_AddQuadTriangle, SMESHDS_AddQuadTriangle,
SMESHDS_AddQuadQuadrangle, SMESHDS_AddQuadQuadrangle,
@ -55,6 +55,7 @@ enum SMESHDS_CommandType {
SMESHDS_AddQuadHexahedron, SMESHDS_AddQuadHexahedron,
// //
SMESHDS_Add0DElement, SMESHDS_Add0DElement,
SMESHDS_AddBiQuadTriangle,
SMESHDS_AddBiQuadQuadrangle, SMESHDS_AddBiQuadQuadrangle,
SMESHDS_AddTriQuadHexa, SMESHDS_AddTriQuadHexa,
SMESHDS_AddHexagonalPrism, SMESHDS_AddHexagonalPrism,

15
src/SMESHDS/SMESHDS_Script.cxx
View File

@ -435,6 +435,21 @@ void SMESHDS_Script::AddFace(int NewFaceID, int n1, int n2, int n3,
n12, n23, n31); n12, n23, n31);
} }
//=======================================================================
//function : AddFace
//purpose :
//=======================================================================
void SMESHDS_Script::AddFace(int NewFaceID, int n1, int n2, int n3,
int n12, int n23, int n31, int nCenter)
{
if(myIsEmbeddedMode){
myIsModified = true;
return;
}
getCommand(SMESHDS_AddBiQuadTriangle)->AddFace(NewFaceID, n1, n2, n3,
n12, n23, n31, nCenter);
}
//======================================================================= //=======================================================================
//function : AddFace //function : AddFace
//purpose : //purpose :

2
src/SMESHDS/SMESHDS_Script.hxx
View File

@ -73,6 +73,8 @@ class SMESHDS_EXPORT SMESHDS_Script
void AddEdge(int NewEdgeID, int n1, int n2, int n12); void AddEdge(int NewEdgeID, int n1, int n2, int n12);
void AddFace(int NewFaceID, int n1, int n2, int n3, void AddFace(int NewFaceID, int n1, int n2, int n3,
int n12, int n23, int n31); int n12, int n23, int n31);
void AddFace(int NewFaceID, int n1, int n2, int n3,
int n12, int n23, int n31, int nCenter);
void AddFace(int NewFaceID, int n1, int n2, int n3, int n4, void AddFace(int NewFaceID, int n1, int n2, int n3, int n4,
int n12, int n23, int n34, int n41); int n12, int n23, int n34, int n41);
void AddFace(int NewFaceID, int n1, int n2, int n3, int n4, void AddFace(int NewFaceID, int n1, int n2, int n3, int n4,