]>
SALOME platform Git repositories - modules/smesh.git/log
eap [Thu, 16 May 2013 17:16:44 +0000 (17:16 +0000)]
indentation
eap [Thu, 16 May 2013 17:15:56 +0000 (17:15 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
+ case 4137: // BIQUADRATIC TRIANGLE
Support all types of elements in DAT format files
eap [Thu, 16 May 2013 17:14:15 +0000 (17:14 +0000)]
+ void ClearLastCreated() raises (SALOME::SALOME_Exception);
eap [Thu, 16 May 2013 17:14:04 +0000 (17:14 +0000)]
0022098 : EDF 2036 SMESH: Create groups from none conected parts of a mesh
+ FT_ConnectedElements,
+ interface ConnectedElements : Predicate {
eap [Thu, 16 May 2013 17:13:13 +0000 (17:13 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
+ Entity_BiQuad_Triangle,
eap [Thu, 16 May 2013 17:12:43 +0000 (17:12 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
+ mesh_biquad_triangle.png \
eap [Thu, 16 May 2013 17:12:15 +0000 (17:12 +0000)]
0022098 : EDF 2036 SMESH: Create groups from none conected parts of a mesh
eap [Thu, 16 May 2013 17:09:28 +0000 (17:09 +0000)]
untabify
eap [Thu, 16 May 2013 17:08:45 +0000 (17:08 +0000)]
0022195 : EDF SMESH: Mesh using existing elements.
eap [Thu, 16 May 2013 17:06:42 +0000 (17:06 +0000)]
0022195 : EDF SMESH: Mesh using existing elements.
In Compute() call assure the source mesh is loaded:
_sourceHyp->GetGroups(/*loaded=*/true);
In getMaps(), do not clear n2n map to assure sharing nodes on EDGEs
for adjacent FACEs
eap [Thu, 16 May 2013 17:02:10 +0000 (17:02 +0000)]
0022195 : EDF SMESH: Mesh using existing elements.
To load the mesh owning source groups
- const std::vector<SMESH_Group*>& GetGroups() const;
+ const std::vector<SMESH_Group*>& GetGroups(bool loaded=false) const;
eap [Thu, 16 May 2013 16:58:08 +0000 (16:58 +0000)]
0022098 : EDF 2036 SMESH: Create groups from none conected parts of a mesh
+#include "SMESH_MeshAlgos.hxx"
eap [Thu, 16 May 2013 16:55:53 +0000 (16:55 +0000)]
+ subMeshOfSolid->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE );
eap [Thu, 16 May 2013 16:55:14 +0000 (16:55 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
0022098 : EDF 2036 SMESH: Create groups from none conected parts of a mesh
+ def NbBiQuadTriangles(self):
+ def ClearLastCreated(self):
def GetFilter(self,elementType,
CritType=FT_Undefined,
Compare=FT_EqualTo,
Threshold="",
UnaryOp=FT_Undefined,
Tolerance=1e-07,
+ mesh=None):
eap [Thu, 16 May 2013 16:53:18 +0000 (16:53 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
eap [Thu, 16 May 2013 16:49:03 +0000 (16:49 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
+ CORBA::Long NbBiQuadTriangles()
eap [Thu, 16 May 2013 16:48:19 +0000 (16:48 +0000)]
+#include "SMESH_MeshAlgos.hxx"
+// A macro used in SMESH_TryCatch.hxx,
+// it re-raises a CORBA SALOME exception thrown by SMESH_MeshEditor_i and caught by SMESH_CATCH
+#define SMY_OWN_CATCH \
+ catch ( SALOME::SALOME_Exception & e ) { throw e; }
+ void ClearLastCreated() throw (SALOME::SALOME_Exception);
eap [Thu, 16 May 2013 16:46:57 +0000 (16:46 +0000)]
+ void ClearLastCreated() throw (SALOME::SALOME_Exception);
eap [Thu, 16 May 2013 16:46:26 +0000 (16:46 +0000)]
0022098 : EDF 2036 SMESH: Create groups from none conected parts of a mesh
+ class SMESH_I_EXPORT ConnectedElements_i: public virtual POA_SMESH::ConnectedElements,
+ public virtual Predicate_i
+ ConnectedElements_ptr CreateConnectedElements();
eap [Thu, 16 May 2013 16:45:34 +0000 (16:45 +0000)]
0022098 : EDF 2036 SMESH: Create groups from none conected parts of a mesh
eap [Thu, 16 May 2013 16:44:02 +0000 (16:44 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
0022098 : EDF 2036 SMESH: Create groups from none conected parts of a mesh
eap [Thu, 16 May 2013 16:41:58 +0000 (16:41 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
+ aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_TRIANGLE);
eap [Thu, 16 May 2013 16:41:30 +0000 (16:41 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
decompose bi-quadratic elements using the central node of face
eap [Thu, 16 May 2013 16:39:55 +0000 (16:39 +0000)]
1) Remove writing into stdout
2) Support all types of elements
eap [Thu, 16 May 2013 16:38:48 +0000 (16:38 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
eap [Thu, 16 May 2013 16:36:26 +0000 (16:36 +0000)]
0022098 : EDF 2036 SMESH: Create groups from none conected parts of a mesh
+#include "SMESH_MeshAlgos.hxx"
+ class SMESHCONTROLS_EXPORT ConnectedElements: public virtual Predicate
eap [Thu, 16 May 2013 16:35:18 +0000 (16:35 +0000)]
0022098 : EDF 2036 SMESH: Create groups from none conected parts of a mesh
Move SMESH_ElementSearcher to from SMESH/SMESH_MeshEditor.hxx SMESHUtils/SMESH_MeshAlgos.hxx
in order to make SMESH_ElementSearcher accessible from Controls/SMESH_Controls.cxx
+ SMESH_MeshAlgos.cxx
eap [Thu, 16 May 2013 16:33:34 +0000 (16:33 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
Fix AddNode() for the case if a node already in
eap [Thu, 16 May 2013 16:32:39 +0000 (16:32 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
- void SetNodeInVolume(SMDS_MeshNode * aNode, const TopoDS_Shell & S);
+ void SetNodeInVolume(const SMDS_MeshNode * aNode, const TopoDS_Shell & S);
- void MoveNode(const SMDS_MeshNode *, double x, double y, double z);
+ virtual void MoveNode(const SMDS_MeshNode *, double x, double y, double z);
+ // biquadratic triangle of 7 nodes
+ virtual SMDS_MeshFace* AddFaceWithID(int n1, int n2, int n3,
+ int n12,int n23,int n31, int nCenter, int ID);
eap [Thu, 16 May 2013 16:30:18 +0000 (16:30 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
eap [Thu, 16 May 2013 16:29:56 +0000 (16:29 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
+ inline void AddBiQuadTriasWithID(SMDS_Mesh* theMesh,
+ SMESH::log_array_var theSeq,
+ CORBA::Long theId)
eap [Thu, 16 May 2013 16:29:29 +0000 (16:29 +0000)]
arrange #include
eap [Thu, 16 May 2013 16:28:40 +0000 (16:28 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
+ const SMDS_MeshNode* GetCentralNode(const SMDS_MeshNode* n1,
+ const SMDS_MeshNode* n2,
+ const SMDS_MeshNode* n3,
+ const SMDS_MeshNode* n12,
+ const SMDS_MeshNode* n23,
+ const SMDS_MeshNode* n31,
+ bool force3d);
eap [Thu, 16 May 2013 16:27:06 +0000 (16:27 +0000)]
1)
0022100 : EDF 2413 SMESH: Take into account TRIA7
2)
0022098 : EDF 2036 SMESH: Create groups from none conected parts of a mesh
Move SMESH_ElementSearcher to from SMESH/SMESH_MeshEditor.hxx SMESHUtils/SMESH_MeshAlgos.hxx
in order to make SMESH_ElementSearcher accessible from Controls/SMESH_Controls.cxx
-struct SMESH_NodeSearcher
-{
-struct SMESH_ElementSearcher
-{
- SMESH_NodeSearcher* GetNodeSearcher();
- SMESH_ElementSearcher* GetElementSearcher();
- SMESH_ElementSearcher* GetElementSearcher( SMDS_ElemIteratorPtr elemIt );
- static bool IsOut( const SMDS_MeshElement* element, const gp_Pnt& point, double tol );
- static double GetDistance( const SMDS_MeshFace* face, const gp_Pnt& point );
- static const SMDS_MeshElement* FindFaceInSet(const SMDS_MeshNode* n1,
eap [Thu, 16 May 2013 16:23:11 +0000 (16:23 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
+ int NbBiQuadTriangles() const throw(SALOME_Exception);
eap [Thu, 16 May 2013 16:22:25 +0000 (16:22 +0000)]
0022098 : EDF 2036 SMESH: Create groups from none conected parts of a mesh
Move SMESH_ElementSearcher to from SMESH/SMESH_MeshEditor.hxx SMESHUtils/SMESH_MeshAlgos.hxx
in order to make SMESH_ElementSearcher accessible from Controls/SMESH_Controls.cxx
- static bool FaceNormal(const SMDS_MeshElement* F, gp_XYZ& normal, bool normalized=true);
- static std::vector< const SMDS_MeshNode*> GetCommonNodes(const SMDS_MeshElement* e1,
- const SMDS_MeshElement* e2);
eap [Thu, 16 May 2013 16:17:16 +0000 (16:17 +0000)]
- virtual SMDS_ElemIteratorPtr nodesIteratorToUNV() const;
- virtual SMDS_ElemIteratorPtr interlacedNodesElemIterator() const;
+ virtual SMDS_NodeIteratorPtr nodesIteratorToUNV() const;
+ virtual SMDS_NodeIteratorPtr interlacedNodesIterator() const;
eap [Thu, 16 May 2013 16:16:22 +0000 (16:16 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
Now SMDS_VtkCellIteratorToUNV inherits from SMDS_NodeIterator and
hence next() returns a node
-class SMDS_VtkCellIteratorToUNV: public SMDS_VtkCellIterator
+class SMDS_VtkCellIteratorToUNV: public SMDS_NodeIterator, protected SMDS_VtkCellIterator
{
public:
SMDS_VtkCellIteratorToUNV(SMDS_Mesh* mesh, int vtkCellId, SMDSAbs_EntityType aType);
+ virtual const SMDS_MeshNode* next();
+ virtual bool more();
virtual ~SMDS_VtkCellIteratorToUNV();
};
eap [Thu, 16 May 2013 16:14:01 +0000 (16:14 +0000)]
Make IsFreeFace() fast, the old implementation of IsFreeFace() is renamed -> IsFreeFaceAdv()
bool IsFreeFace( int faceIndex, const SMDS_MeshElement** otherVol=0 ) const;
- // Check that all volumes built on the face nodes lays on one side
+ // Fast check that only one volume is built on nodes of a given face
+ // otherVol returns another volume sharing the given facet
+
+ bool IsFreeFaceAdv( int faceIndex, const SMDS_MeshElement** otherVol=0 ) const;
+ // Thorough check that all volumes built on the face nodes lays on one side
+ bool IsPoly() const { return myPolyedre; }
eap [Thu, 16 May 2013 16:11:35 +0000 (16:11 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
eap [Thu, 16 May 2013 16:10:37 +0000 (16:10 +0000)]
- SMDS_ElemIteratorPtr interlacedNodesElemIterator() const;
eap [Thu, 16 May 2013 16:08:36 +0000 (16:08 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
+ int NbBiQuadTriangles() const { return myNbBiQuadTriangles; }
eap [Thu, 16 May 2013 16:08:00 +0000 (16:08 +0000)]
- virtual SMDS_ElemIteratorPtr nodesIteratorToUNV() const;
+ virtual SMDS_NodeIteratorPtr nodeIterator() const;
+ virtual SMDS_NodeIteratorPtr interlacedNodesIterator() const;
+ virtual SMDS_NodeIteratorPtr nodesIteratorToUNV() const;
eap [Thu, 16 May 2013 16:06:21 +0000 (16:06 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
+ virtual SMDS_MeshFace*
AddFace (const SMDS_MeshNode * n1,
+ const SMDS_MeshNode * n2,
+ const SMDS_MeshNode * n3,
+ const SMDS_MeshNode * n12,
+ const SMDS_MeshNode * n23,
+ const SMDS_MeshNode * n31,
+ const SMDS_MeshNode * nCenter);
+ virtual void MoveNode(const SMDS_MeshNode *n, double x, double y, double z);
eap [Thu, 16 May 2013 16:04:50 +0000 (16:04 +0000)]
indentation
eap [Thu, 16 May 2013 16:04:30 +0000 (16:04 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
+ _cellDimension[VTK_BIQUADRATIC_TRIANGLE] = 2;
eap [Thu, 16 May 2013 16:04:10 +0000 (16:04 +0000)]
0022100 : EDF 2413 SMESH: Take into account TRIA7
+ SMDSEntity_BiQuad_Triangle,
pnoyret [Thu, 16 May 2013 13:31:34 +0000 (13:31 +0000)]
specification des unités de chordal deviation
pnoyret [Thu, 16 May 2013 13:24:39 +0000 (13:24 +0000)]
Pour prise en compte de la bonne valeur par defaut du chordal deviation
eap [Mon, 29 Apr 2013 14:18:32 +0000 (14:18 +0000)]
0022202 : EDF SMESH: Regression in a script meshing prisms and hexaedrons
Fix notifyListenersOnEvent() for the case of removing an EventListener (attempt No.2)
eap [Mon, 29 Apr 2013 12:00:40 +0000 (12:00 +0000)]
0022202 : EDF SMESH: Regression in a script meshing prisms and hexaedrons
Fix notifyListenersOnEvent() for the case of removing an EventListener
eap [Fri, 26 Apr 2013 15:53:34 +0000 (15:53 +0000)]
Regression of SMESH_TEST/Grids/smesh/imps7/H6
Unreachable deep idea
bool subComputed = false, subFailed = false;
if (!algo->OnlyUnaryInput()) {
- if ( event == COMPUTE &&
- ( algo->NeedDiscreteBoundary() || algo->SupportSubmeshes() ))
+ if ( event == COMPUTE /*&&
+ ( algo->NeedDiscreteBoundary() || algo->SupportSubmeshes() )*/)
shape = getCollection( gen, algo, subComputed, subFailed );
else
subComputed = SubMeshesComputed( & subFailed );
eap [Fri, 26 Apr 2013 14:43:46 +0000 (14:43 +0000)]
Regression of SMESH_TEST/Grids/smesh/imps7/H5
Fix position of medium nodes that are set to FACE by
StdMeshers_Projection_2D, since EDGEs are discreteized later than FACE.
eap [Fri, 26 Apr 2013 11:47:26 +0000 (11:47 +0000)]
Regression of XSMESH_TEST/SMESHCOMMON/SMESH_TEST/Grids/smesh/bugs12/M6
Fix the ensuring stability of SMESH_MeshEditor::makeWalls().
eap [Fri, 26 Apr 2013 11:46:58 +0000 (11:46 +0000)]
Regression of XSMESH_TEST/SMESHCOMMON/SMESH_TEST/Grids/smesh/bugs12/M6
Fix the ensuring stability of SMESH_MeshEditor::makeWalls(). Allow
storing both nodes and cells in one map sorted by ID.
struct TIDCompare {
bool operator () (const SMDS_MeshElement* e1, const SMDS_MeshElement* e2) const
- { return e1->GetID() < e2->GetID(); }
+ { return e1->GetType() == e2->GetType() ? e1->GetID() < e2->GetID() : e1->GetType() < e2->GetType(); }
eap [Fri, 26 Apr 2013 10:21:24 +0000 (10:21 +0000)]
0022202 : EDF SMESH: Regression in a script meshing prisms and hexaedrons
- for ( int iF = 1; iF < faceToSolids.Extent(); ++iF )
+ for ( int iF = 1; iF <= faceToSolids.Extent(); ++iF )
akl [Wed, 24 Apr 2013 13:25:21 +0000 (13:25 +0000)]
Call 'Location' with correct indices only to avoid exception.
akl [Wed, 24 Apr 2013 13:13:40 +0000 (13:13 +0000)]
Fix to avoid dependence of mesh on itself (it leaded to cycle in 'SetRemovedFromStudy').
eap [Wed, 24 Apr 2013 12:59:33 +0000 (12:59 +0000)]
Regression of XSMESH_TEST/SMESHCOMMON/SMESH_TEST/Grids/smesh/bugs12/M6
To assure stability of makeWalls(), use maps sorted by ID, that are
declared in SMESH_TypeDefs.hxx
-typedef map<const SMDS_MeshElement*, list<const SMDS_MeshNode*> > TElemOfNodeListMap;
-typedef map<const SMDS_MeshElement*, list<const SMDS_MeshElement*> > TElemOfElemListMap;
eap [Wed, 24 Apr 2013 12:56:57 +0000 (12:56 +0000)]
Regression of XSMESH_TEST/SMESHCOMMON/SMESH_TEST/Grids/smesh/bugs12/M6
typedef std::map<const SMDS_MeshElement*,
- std::list<const SMDS_MeshElement*> > TElemOfElemListMap;
+ std::list<const SMDS_MeshElement*>, TIDCompare > TElemOfElemListMap;
eap [Wed, 24 Apr 2013 12:13:36 +0000 (12:13 +0000)]
-algo=smesh.xxxx ==> algo.smeshBuilder.xxxx
+algo=smesh.xxxx ==> algo=smeshBuilder.xxxx
akl [Mon, 22 Apr 2013 10:37:55 +0000 (10:37 +0000)]
Check for null object was added.
akl [Mon, 22 Apr 2013 10:36:36 +0000 (10:36 +0000)]
Indexation of OCC sequence is started from 1, but not 0.
gdd [Thu, 18 Apr 2013 09:07:26 +0000 (09:07 +0000)]
Update translations
eap [Thu, 18 Apr 2013 07:58:41 +0000 (07:58 +0000)]
Correction after the proof reading
prascle [Wed, 17 Apr 2013 20:33:51 +0000 (20:33 +0000)]
PR: correction due to refactoring
vsr [Wed, 17 Apr 2013 16:20:21 +0000 (16:20 +0000)]
Update documentation for 7.2.0
akl [Wed, 17 Apr 2013 11:34:31 +0000 (11:34 +0000)]
Correction because of 'geompyDC' refactoring.
akl [Wed, 17 Apr 2013 10:15:09 +0000 (10:15 +0000)]
Correction because of 'smeshDC' refactoring.
akl [Wed, 17 Apr 2013 06:21:15 +0000 (06:21 +0000)]
Correction of script because of 'geompyDC' refactoring.
prascle [Tue, 16 Apr 2013 16:47:43 +0000 (16:47 +0000)]
PR: relax constraints on node distances on StdMeshers_import_1D
prascle [Tue, 16 Apr 2013 14:07:03 +0000 (14:07 +0000)]
PR: Spelling
prascle [Tue, 16 Apr 2013 13:50:10 +0000 (13:50 +0000)]
PR: Deprecation Warning more precise
vsr [Tue, 16 Apr 2013 07:37:02 +0000 (07:37 +0000)]
Fix make distcheck problem
eap [Mon, 15 Apr 2013 10:48:46 +0000 (10:48 +0000)]
Regression of already fixed
0021406 : EDF 1975 NETGENPLUGIN: Submesh hypothesis not taken into account
Correct the patch for
0021556 : EDF 2222 SMESH: 3D mesh after projection impossible
- smWithAlgoSupportingSubmeshes[0].push_back( shDim2smIt->second );
+ smWithAlgoSupportingSubmeshes[3].push_back( shDim2smIt->second );
vsr [Mon, 15 Apr 2013 07:25:40 +0000 (07:25 +0000)]
Fix test script
prascle [Sat, 13 Apr 2013 19:48:28 +0000 (19:48 +0000)]
PR: improve documentation on scripts adaptation to V7
prascle [Fri, 12 Apr 2013 16:27:32 +0000 (16:27 +0000)]
PR: doc on script migration
vsr [Fri, 12 Apr 2013 15:28:58 +0000 (15:28 +0000)]
Increment version to 7.2.0
vsr [Fri, 12 Apr 2013 14:40:29 +0000 (14:40 +0000)]
Merge from V6_main 12/04/2013
prascle [Thu, 11 Apr 2013 08:59:26 +0000 (08:59 +0000)]
PR: update documentation of class SMESH_2smeshpy
prascle [Thu, 11 Apr 2013 08:53:12 +0000 (08:53 +0000)]
PR: update comments in dump function: smesh instead of smesh.smesh
prascle [Wed, 10 Apr 2013 16:33:43 +0000 (16:33 +0000)]
PR: true singleton instance of smesh
akl [Wed, 10 Apr 2013 10:43:21 +0000 (10:43 +0000)]
Using HTML_EXTRA_STYLESHEET instead of HTML_STYLESHEET to use default style and customize the header and footer only.
prascle [Wed, 10 Apr 2013 09:16:19 +0000 (09:16 +0000)]
PR: missing imports when tests are executed alone
prascle [Tue, 9 Apr 2013 16:47:57 +0000 (16:47 +0000)]
PR: restore missing attributes for compatibility with old scripts
vsr [Mon, 8 Apr 2013 16:05:28 +0000 (16:05 +0000)]
Improve documentation
vsr [Mon, 8 Apr 2013 15:17:34 +0000 (15:17 +0000)]
Improve documentation
vsr [Mon, 8 Apr 2013 14:50:20 +0000 (14:50 +0000)]
Improve documentation
vsr [Mon, 8 Apr 2013 14:36:08 +0000 (14:36 +0000)]
Improve documentation
vsr [Mon, 8 Apr 2013 14:25:54 +0000 (14:25 +0000)]
Improve documentation
boulant [Fri, 5 Apr 2013 17:26:35 +0000 (17:26 +0000)]
Add comment in the documentation of the padder plugin (for the problem of ssh connection)
prascle [Fri, 5 Apr 2013 15:19:53 +0000 (15:19 +0000)]
PR: debug G. Nicolas (EDF 1967)
pnoyret [Fri, 5 Apr 2013 11:43:24 +0000 (11:43 +0000)]
Push double click
vsr [Fri, 5 Apr 2013 09:24:23 +0000 (09:24 +0000)]
Restore documentation of methods dynamically added by plug-ins to the Mesh class, killed by previous integration
pnoyret [Fri, 5 Apr 2013 09:12:37 +0000 (09:12 +0000)]
minor bugs
vsr [Fri, 5 Apr 2013 09:00:43 +0000 (09:00 +0000)]
Restore documentation of methods dynamically added by plug-ins to the Mesh class, killed by previous integration
vsr [Thu, 4 Apr 2013 07:08:19 +0000 (07:08 +0000)]
Merge from BR_plugins_pbyacs 03/04/2013
inv [Thu, 4 Apr 2013 06:19:28 +0000 (06:19 +0000)]
Fix bug with missing documentation for dynamic methods
vsr [Tue, 2 Apr 2013 14:33:29 +0000 (14:33 +0000)]
Merge from V6_main 01/04/2013