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
PAL9022. Use improved SMESHDS_Mesh API methods, comment unused variables
[modules/smesh.git]
/
src
/
SMDS
/
SMDS_VolumeOfNodes.cxx
diff --git
a/src/SMDS/SMDS_VolumeOfNodes.cxx
b/src/SMDS/SMDS_VolumeOfNodes.cxx
index b2a7a547d16c27d8661691337256f4cee7294d0b..cd893f484a87e45a70059e678810ce358bb25271 100644
(file)
--- a/
src/SMDS/SMDS_VolumeOfNodes.cxx
+++ b/
src/SMDS/SMDS_VolumeOfNodes.cxx
@@
-19,25
+19,32
@@
//
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
//
// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
-#include "utilities.h"
+#ifdef _MSC_VER
+#pragma warning(disable:4786)
+#endif
+
#include "SMDS_VolumeOfNodes.hxx"
#include "SMDS_MeshNode.hxx"
#include "SMDS_VolumeOfNodes.hxx"
#include "SMDS_MeshNode.hxx"
+#include "utilities.h"
+
+using namespace std;
///////////////////////////////////////////////////////////////////////////////
/// Create an hexahedron. node 1,2,3,4 and 5,6,7,8 are quadrangle and
/// 5,1 and 7,3 are an edges.
///////////////////////////////////////////////////////////////////////////////
SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
///////////////////////////////////////////////////////////////////////////////
/// Create an hexahedron. node 1,2,3,4 and 5,6,7,8 are quadrangle and
/// 5,1 and 7,3 are an edges.
///////////////////////////////////////////////////////////////////////////////
SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
- SMDS_MeshNode * node1,
- SMDS_MeshNode * node2,
- SMDS_MeshNode * node3,
- SMDS_MeshNode * node4,
- SMDS_MeshNode * node5,
- SMDS_MeshNode * node6,
- SMDS_MeshNode * node7,
- SMDS_MeshNode * node8)
+
const
SMDS_MeshNode * node1,
+
const
SMDS_MeshNode * node2,
+
const
SMDS_MeshNode * node3,
+
const
SMDS_MeshNode * node4,
+
const
SMDS_MeshNode * node5,
+
const
SMDS_MeshNode * node6,
+
const
SMDS_MeshNode * node7,
+
const
SMDS_MeshNode * node8)
{
{
- myNodes.resize(8);
+ myNbNodes = 8;
+ myNodes = new const SMDS_MeshNode* [myNbNodes];
myNodes[0]=node1;
myNodes[1]=node2;
myNodes[2]=node3;
myNodes[0]=node1;
myNodes[1]=node2;
myNodes[2]=node3;
@@
-49,12
+56,13
@@
SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
}
SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
}
SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
- SMDS_MeshNode * node1,
- SMDS_MeshNode * node2,
- SMDS_MeshNode * node3,
- SMDS_MeshNode * node4)
+
const
SMDS_MeshNode * node1,
+
const
SMDS_MeshNode * node2,
+
const
SMDS_MeshNode * node3,
+
const
SMDS_MeshNode * node4)
{
{
- myNodes.resize(4);
+ myNbNodes = 4;
+ myNodes = new const SMDS_MeshNode* [myNbNodes];
myNodes[0]=node1;
myNodes[1]=node2;
myNodes[2]=node3;
myNodes[0]=node1;
myNodes[1]=node2;
myNodes[2]=node3;
@@
-62,13
+70,14
@@
SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
}
SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
}
SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
- SMDS_MeshNode * node1,
- SMDS_MeshNode * node2,
- SMDS_MeshNode * node3,
- SMDS_MeshNode * node4,
- SMDS_MeshNode * node5)
+
const
SMDS_MeshNode * node1,
+
const
SMDS_MeshNode * node2,
+
const
SMDS_MeshNode * node3,
+
const
SMDS_MeshNode * node4,
+
const
SMDS_MeshNode * node5)
{
{
- myNodes.resize(5);
+ myNbNodes = 5;
+ myNodes = new const SMDS_MeshNode* [myNbNodes];
myNodes[0]=node1;
myNodes[1]=node2;
myNodes[2]=node3;
myNodes[0]=node1;
myNodes[1]=node2;
myNodes[2]=node3;
@@
-77,14
+86,15
@@
SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
}
SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
}
SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
- SMDS_MeshNode * node1,
- SMDS_MeshNode * node2,
- SMDS_MeshNode * node3,
- SMDS_MeshNode * node4,
- SMDS_MeshNode * node5,
- SMDS_MeshNode * node6)
+
const
SMDS_MeshNode * node1,
+
const
SMDS_MeshNode * node2,
+
const
SMDS_MeshNode * node3,
+
const
SMDS_MeshNode * node4,
+
const
SMDS_MeshNode * node5,
+
const
SMDS_MeshNode * node6)
{
{
- myNodes.resize(6);
+ myNbNodes = 6;
+ myNodes = new const SMDS_MeshNode* [myNbNodes];
myNodes[0]=node1;
myNodes[1]=node2;
myNodes[2]=node3;
myNodes[0]=node1;
myNodes[1]=node2;
myNodes[2]=node3;
@@
-92,6
+102,30
@@
SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
myNodes[4]=node5;
myNodes[5]=node6;
}
myNodes[4]=node5;
myNodes[5]=node6;
}
+
+bool SMDS_VolumeOfNodes::ChangeNodes(const SMDS_MeshNode* nodes[],
+ const int nbNodes)
+{
+ if (nbNodes < 4 || nbNodes > 8 || nbNodes == 7)
+ return false;
+
+ delete [] myNodes;
+ myNbNodes = nbNodes;
+ myNodes = new const SMDS_MeshNode* [myNbNodes];
+ for ( int i = 0; i < nbNodes; i++ )
+ myNodes[ i ] = nodes [ i ];
+
+ return true;
+}
+
+SMDS_VolumeOfNodes::~SMDS_VolumeOfNodes()
+{
+ if (myNodes != NULL) {
+ delete [] myNodes;
+ myNodes = NULL;
+ }
+}
+
//=======================================================================
//function : Print
//purpose :
//=======================================================================
//function : Print
//purpose :
@@
-115,11
+149,12
@@
int SMDS_VolumeOfNodes::NbFaces() const
case 8: return 6;
default: MESSAGE("invalid number of nodes");
}
case 8: return 6;
default: MESSAGE("invalid number of nodes");
}
+ return 0;
}
int SMDS_VolumeOfNodes::NbNodes() const
{
}
int SMDS_VolumeOfNodes::NbNodes() const
{
- return myN
odes.size()
;
+ return myN
bNodes
;
}
int SMDS_VolumeOfNodes::NbEdges() const
}
int SMDS_VolumeOfNodes::NbEdges() const
@@
-132,36
+167,43
@@
int SMDS_VolumeOfNodes::NbEdges() const
case 8: return 12;
default: MESSAGE("invalid number of nodes");
}
case 8: return 12;
default: MESSAGE("invalid number of nodes");
}
+ return 0;
}
}
-SMDS_Iterator<const SMDS_MeshElement *> * SMDS_VolumeOfNodes::
+class SMDS_VolumeOfNodes_MyIterator:public SMDS_ElemIterator
+{
+ const SMDS_MeshNode* const* mySet;
+ int myLength;
+ int index;
+ public:
+ SMDS_VolumeOfNodes_MyIterator(const SMDS_MeshNode* const* s, int l):
+ mySet(s),myLength(l),index(0) {}
+
+ bool more()
+ {
+ return index<myLength;
+ }
+
+ const SMDS_MeshElement* next()
+ {
+ index++;
+ return mySet[index-1];
+ }
+};
+
+SMDS_ElemIteratorPtr SMDS_VolumeOfNodes::
elementsIterator(SMDSAbs_ElementType type) const
{
elementsIterator(SMDSAbs_ElementType type) const
{
- class MyIterator:public SMDS_Iterator<const SMDS_MeshElement*>
- {
- const vector<const SMDS_MeshNode*>& mySet;
- int index;
- public:
- MyIterator(const vector<const SMDS_MeshNode*>& s):mySet(s),index(0)
- {}
-
- bool more()
- {
- return index<mySet.size();
- }
-
- const SMDS_MeshElement* next()
- {
- index++;
- return mySet[index-1];
- }
- };
- switch(type)
- {
- case SMDSAbs_Volume:return SMDS_MeshElement::elementsIterator(SMDSAbs_Volume);
- case SMDSAbs_Node:return new MyIterator(myNodes);
- default: MESSAGE("ERROR : Iterator not implemented");
- }
+ switch(type)
+ {
+ case SMDSAbs_Volume:
+ return SMDS_MeshElement::elementsIterator(SMDSAbs_Volume);
+ case SMDSAbs_Node:
+ return SMDS_ElemIteratorPtr(new SMDS_VolumeOfNodes_MyIterator(myNodes,myNbNodes));
+ default:
+ MESSAGE("ERROR : Iterator not implemented");
+ return SMDS_ElemIteratorPtr((SMDS_ElemIterator*)NULL);
+ }
}
SMDSAbs_ElementType SMDS_VolumeOfNodes::GetType() const
}
SMDSAbs_ElementType SMDS_VolumeOfNodes::GetType() const