Commit Graph

2270 Commits

Author SHA1 Message Date
eap
9be2d55b4b 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
-      editor.ConvertToQuadratic(/*theForce3d=*/false, tgtFaces);
+      editor.ConvertToQuadratic(/*theForce3d=*/false, tgtFaces, false);
2013-03-06 08:33:31 +00:00
eap
db7638e9f9 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
-      map< double, int >::reverse_iterator maxLen_i = len2edgeMap.rbegin();
+      multimap< double, int >::reverse_iterator maxLen_i = len2edgeMap.rbegin();
2013-03-06 08:32:30 +00:00
eap
e8589cb6af 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
-    def ConvertToQuadratic(self, theForce3d, theSubMesh=None):
+    def ConvertToQuadratic(self, theForce3d, theSubMesh=None, theToBiQuad=False):
2013-03-06 08:31:58 +00:00
eap
4b7538ca03 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
+    operator<<(const SMESH::EntityType& theArg);
2013-03-06 08:30:04 +00:00
eap
d1d0695ce5 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
Add exceptions

+  void           ConvertToBiQuadratic(CORBA::Boolean            theForce3d,
+                                      SMESH::SMESH_IDSource_ptr theObject)

+  void convertToQuadratic(CORBA::Boolean            theForce3d,
+                          CORBA::Boolean            theToBiQuad,
+                          SMESH::SMESH_IDSource_ptr theObject = SMESH::SMESH_IDSource::_nil())
2013-03-06 08:29:43 +00:00
eap
caef356842 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
+  class SMESH_I_EXPORT ElemEntityType_i: public virtual POA_SMESH::ElemEntityType,
+                                         public virtual Predicate_i
2013-03-06 08:28:25 +00:00
eap
8f6c844ca6 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
+  operator<<(const SMESH::EntityType& theArg)
2013-03-06 08:22:55 +00:00
eap
ee2ad1063a 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
1) Treat SMESH.FT_EntityType criterion type
2) ConvertToBiQuadratic(...) -> ConvertToQuadratic(...,True)
2013-03-06 08:22:30 +00:00
eap
f2d9abb577 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
+  inline static gp_XY calcTFI(double x, double y, ...
+  void SetIsBiQuadratic(const bool theBuildBiQuadratic);
+  const SMDS_MeshNode* GetCentralNode(const SMDS_MeshNode* n1, ...

+  std::map< TBiQuad, SMDS_MeshNode* > myMapWithCentralNode; // central nodes of faces
+  bool            myCreateBiQuadratic;
2013-03-06 08:14:30 +00:00
eap
b3b654c67b 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
-  void ConvertToQuadratic(const bool theForce3d);
+  void ConvertToQuadratic(const bool theForce3d, const bool theToBiQuad);
2013-03-06 08:12:22 +00:00
eap
f0cd60b411 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
+    class SMESHCONTROLS_EXPORT ElemEntityType: public virtual Predicate{
2013-03-06 08:11:01 +00:00
eap
13ba132d92 make a picture of central nodes of HEX27 2013-03-06 08:06:08 +00:00
vsr
39980f8b0b Fix problem of 'make installcheck' - set proper environment for tests 2013-03-05 06:07:29 +00:00
eap
f0275eace6 Remove "Suspicious continuation in line 85" 2013-03-04 14:02:27 +00:00
eap
39c2e0502a 0021859: EDF 2191 SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27 2013-03-04 10:13:46 +00:00
eap
40d4699681 0021859: EDF 2191 SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27 2013-03-04 10:07:58 +00:00
eap
d17c1bedcc fix failure of non-regression test SMESH_TEST/Grids/smesh/mesh_Projection_2D/A1
+//   bool isDegenTria( const SMDS_MeshNode * nn[3] )
+//   {

+    // It was an attemp to fix a problem of a zero area face whose all nodes
+    // are on one staight EDGE. But omitting this face makes a hole in the mesh :(
+    // if ( !isDegen && allNodesAreOld )
+    //   isDegen = isDegenTria( nn );
2013-03-01 16:45:29 +00:00
eap
0cf41cbddc a bit more comments 2013-03-01 16:44:43 +00:00
eap
560e3a2a7f a bit more comments 2013-03-01 14:37:27 +00:00
eap
3f790d0220 fix failure of non-regression test SMESH_TEST/Grids/smesh/mesh_Projection_2D/A1
Let the helper set nodes on shape to avoid the pb with a medium nodes
 set by mistake to EDGE instead of FACE.
 The case is a triangle whose 3 nodes are on the same EDGE. The worst
 is that in this case the medium node which is logically on FACE falls
 to a straight EDGE, as the triangle is of zero area.
2013-03-01 14:37:03 +00:00
eap
9f9b9d6ceb fix failure of non-regression test SMESH_TEST/Grids/smesh/mesh_Projection_2D/A1
Avoid returning EDGE position for 2 nodes on the same EDGE, while the
 medium node should be on FACE. The case is a triangle whose 3 nodes are on
 the same EDGE. The worst is that in this case the medium node which
 is logically on FACE falls to a straight EDGE, as the triangle is of
 zero area (thanks to MEFISTO)

 std::pair<int, TopAbs_ShapeEnum> GetMediumPos(const SMDS_MeshNode* n1,
                                               const SMDS_MeshNode* n2,
+                                              const bool           useCurSubShape=false);
2013-03-01 14:32:53 +00:00
eap
6444728ac0 fix failure of non-regression test SMESH_TEST/Grids/smesh/mesh_Projection_2D/A0
Allow assigning "3D Extrusion" algo to a computed 2D mesh w/o
  clearing existing 2D elements

-  void cleanDependsOn( bool keepSupportedsubMeshes = false );
+  void cleanDependsOn( SMESH_Algo* algoRequiringCleaning=0 );
2013-03-01 11:11:43 +00:00
eap
3fa0d8a978 fix failure of non-regression test SMESH_TEST/Grids/smesh/mesh_Projection_2D/A0
Fix IsStructured( SMESH_subMesh* faceSM ) for a cylindrical FACE
2013-03-01 11:10:18 +00:00
eap
54cd5176e8 fix failure of non-regression test SMESH_TEST/Grids/smesh/imps8/I1
Fix cleanDependsOn() which mush do at least CHECK_COMPUTE_STATE even in empty mesh
2013-02-28 15:12:29 +00:00
eap
b5d9b2799b 1) Treat GMF import/export
2) Fix RemoveArgs() not to clear the whole command if it is like "(res1,res2) = meth(arg)"
2013-02-28 14:28:04 +00:00
eap
1dbda4f113 0022134: DriverGMF : reading quadratic meshes
Fix errors of import/export of meshes including both linear and
  quadratic elements.
2013-02-28 11:36:54 +00:00
eap
12e809327d 0022134: DriverGMF : reading quadratic meshes
Fix errors of import/export of meshes including both linear and
  quadratic elements.

+  SMDS_ElemIteratorPtr elementIterator(SMDSAbs_ElementType  type);
+  SMDS_ElemIteratorPtr elementIterator(SMDSAbs_EntityType   type);
+  SMDS_ElemIteratorPtr elementIterator(SMDSAbs_GeometryType type);
2013-02-28 11:36:28 +00:00
eap
2728268e48 0022134: DriverGMF : reading quadratic meshes
+  inline int NbElements(SMDSAbs_EntityType   type) const { return NbEntities(type); }
+  inline int NbElements(SMDSAbs_GeometryType type) const { return NbElementsOfGeom(type); }
+  inline int NbElementsOfGeom(SMDSAbs_GeometryType geom) const;
2013-02-28 11:33:57 +00:00
eap
5baae36018 fix failure of non-regression test SMESH_TEST/Grids/smesh/imps8/I1
Compute stack of simple boxes with structured sides
2013-02-27 16:16:52 +00:00
eap
694e1f27be fix failure of non-regression test SMESH_TEST/Grids/smesh/imps7/H5
Synchronize Evaluate() with Compute()
2013-02-27 15:32:39 +00:00
eap
7d9f9fd31f fix failure of non-regression test SMESH_TEST/Grids/smesh/imps6/G0
in getSubmeshIDForCopiedMesh(), fix invalid index (subIndex==0) for OCCT map in
case if srcMeshDS->GetPersistentId() == 0
2013-02-27 14:39:34 +00:00
eap
e453ca2b46 fix failures of non-regression tests
Perform a thorough analysis of mesh on FACEs even in case of 1 SOLID
2013-02-27 13:21:20 +00:00
eap
ed66a53f3e fix failures of non-regression tests
1) compute the given bottom FACE in StdMeshers_Prism_3D::compute(const TPrismTopo& thePrism)
2) set higher priority to non-quadrilateral computed FACEs over all FACEs having structured mesh
2013-02-27 11:53:02 +00:00
eap
318c408131 0022124: [CEA 763] Projection 1D does not work with Netgen 1D2D
-typedef StdMeshers_ProjectionUtils TAssocTool;
+namespace TAssocTool = StdMeshers_ProjectionUtils;
2013-02-26 10:42:13 +00:00
eap
9635ee01fa 0022124: [CEA 763] Projection 1D does not work with Netgen 1D2D
1) namespace TAssocTool = StdMeshers_ProjectionUtils;
2) Use StdMeshers_ProjectionUtils::SourceNotComputedError()
2013-02-26 10:41:45 +00:00
eap
46c3601d73 0022124: [CEA 763] Projection 1D does not work with Netgen 1D2D
- class StdMeshers_ProjectionUtils
+ namespace StdMeshers_ProjectionUtils

+  /*!
+   * \brief Returns an error message to show in case if MakeComputed( sm ) fails.
+   */
+  std::string SourceNotComputedError( SMESH_subMesh * sm = 0,
+                                      SMESH_Algo*     projAlgo=0);
2013-02-26 10:40:03 +00:00
eap
27bf438fc0 0022124: [CEA 763] Projection 1D does not work with Netgen 1D2D
Move struct AlgoData from SMESH_Gen.cxx to struct SMESH_Algo::Features
2013-02-26 10:37:45 +00:00
rnc
a1c4092296 Update error message about not supported types of elements. All quadratic quadrangles and hexaedra can now be written in .mesh format 2013-02-25 10:36:44 +00:00
rnc
25dbdaf408 Used new Keyword GmfExtraVerticesAt .. for reading and writing tetra and hexa quadratic meshes in GMF format 2013-02-25 10:34:59 +00:00
eap
6f79204fcf -#define __myDEBUG
+//#define __myDEBUG
2013-02-22 13:16:07 +00:00
eap
4a40272838 SALOME Forum: viscous layers builder: failed at the very first inflation step
http://www.salome-platform.org/forum/forum_10/537530484
2013-02-22 13:04:17 +00:00
eap
ab9600ccf0 0022134: DriverGMF : reading quadratic meshes
BEGINNING OF
  The way of storage of quadratic elements has been corrected
2013-02-22 08:22:12 +00:00
akl
2770bdc924 0022123: EDF 2558 SMESH: Group creation crashs with the filter "Free faces":
using reject() slot instead of closeEvent() and hideEvent().
2013-02-21 12:10:00 +00:00
eap
469f938766 0022130: EDF 2579 SMESH: Issue with Viscous Layer
fix detection of the closed EDGE
2013-02-20 16:06:58 +00:00
eap
f35cfb87a0 0022005: Error at the end of NETGEN 3D spheres mesh while tetrahedrons have been generated
SMESH_Algo::IsReversedSubMesh() is moved to SMESH_MesherHelper
2013-02-20 08:47:05 +00:00
eap
bb00f9a545 0022005: Error at the end of NETGEN 3D spheres mesh while tetrahedrons have been generated
-  SMESH_TNodeXYZ( const SMDS_MeshElement* e)
+  SMESH_TNodeXYZ( const SMDS_MeshElement* e=0)
2013-02-20 08:46:42 +00:00
eap
98e6b6eb53 0022005: Error at the end of NETGEN 3D spheres mesh while tetrahedrons have been generated
SMESH_Algo::IsReversedSubMesh() is fixed and moved to SMESH_MesherHelper
2013-02-20 08:45:49 +00:00
vsr
0d03554147 Fix problem with make distcheck 2013-02-20 07:13:59 +00:00
eap
9c8fdf5101 0022124: [CEA 763] Projection 1D does not work with Netgen 1D2D
Do not call algo->Compute() if !algo->NeedDiscreteBoundary() and
  computing a sub-mesh of the current sub-mesh already failed.
2013-02-19 12:04:39 +00:00
eap
3060a379b0 0022124: [CEA 763] Projection 1D does not work with Netgen 1D2D
-  bool SubMeshesComputed() const;
+  bool SubMeshesComputed(bool * isFailedToCompute=0) const;

   TopoDS_Shape getCollection(SMESH_Gen * theGen,
                              SMESH_Algo* theAlgo,
                              bool &      theSubComputed,
+                             bool &      theSubFailed);

+  SMESH_Algo *          _algo; // the algorithm found by last *StateEngine() call
2013-02-19 12:02:54 +00:00