ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-29 19:00:35 +05:00
Code Issues Packages Projects Releases Wiki Activity
2,240 Commits 378 Branches 499 Tags 99 MiB
b5f12761af
Commit Graph

2240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
eap
b5f12761af 0022166: [CEA 792] Regression on 07_Pentahedron.py, 12_3d_extrusion.py 
and 13_projection_3d.py scripts from CEA test base

Set implicitly created nodes (medium and central ones) to shape
independently of mySetElemOnShape
 2013-03-13 17:14:05 +00:00
eap
e64b615389 Cast negligible values to zero in order not to have a range of control 
values of e.g. taper [0, 1e-13]
 2013-03-13 08:35:24 +00:00
eap
37b13e00d4 In OnEditDelete(), 
+    // Call mesh->Clear() to prevent loading mesh from file caused by hypotheses removal
+    ...
 2013-03-12 13:46:11 +00:00
eap
6da7fe1a54 // S = S0 * f(L/Lmin) where f(x) = 1 + (7 * 2/Pi * atan(x/5)) 
+    // The above formular gives too short segments when Lmax/Lmin is too high
+    // because by this formular the largest segment is only 8 times longer than the
+    // shortest one ( 2/Pi * atan(x/5) varies within [0,1] ). So a new formular is:
+    // f(x) = 1 + (x/7 * 2/Pi * atan(x/5))
 2013-03-12 11:31:32 +00:00
eap
dbd3054f4f Fix FirstVertexOnCurve(edge): use MakeVertexOnCurve() instead of 
KindOfShape() to find the EDGE beginning
 2013-03-12 11:28:32 +00:00
eap
1303d07964 In MergeNodes(): 
+        // set _alwaysComputed to a sub-mesh of VERTEX to enable mesh computing
+        // after MergeNodes() w/o creating node in place of merged ones.
+        ...
 2013-03-12 11:26:10 +00:00
eap
28489e5c19 Fix the regression entered by fix of 
0021999: EDF 2480 SMESH : Aspect ratio on a flat mesh

-    if ( A < theEps )
-      return theInf;
+    if ( A < Precision::Angular() )
+      return 0.;
 2013-03-11 11:10:27 +00:00
eap
fd24bd006b Fix a bug reported in SALOME Forum 
http://www.salome-platform.org/forum/forum_10/862626562

Fix LoadNodeColumns() for the base EDGE w/o viscous layers but on
which the mesh is squeezed by viscous layers on adjacent EDGEs
 2013-03-07 08:50:01 +00:00
eap
19ddff45f9 PPGP issue. 
Make a script valid even if some involved object are not published:
eliminate SetName() and object removal from the scrip

SMESH_2smeshpy::
   ConvertScript(const TCollection_AsciiString&            theScript,
                 Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
                 Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
+                std::set< TCollection_AsciiString >&      theRemovedObjIDs,
                 SALOMEDS::Study_ptr&                      theStudy,
                 const bool                                theHistoricalDump);
 2013-03-07 08:37:57 +00:00
eap
23d265a7a7 PPGP issue. Fix dump of not published SMESH_IDSource's. As a result 
DumpStudy command fails.
 2013-03-06 16:30:42 +00:00
eap
77f09a6ae5 def FindHypothesis (self, hypname, args, CompareMethod, smeshpyD): 
study = smeshpyD.GetCurrentStudy()
+        if not study: return None
         scomp = study.FindComponent(smeshpyD.ComponentDataType())
 2013-03-06 16:03:18 +00:00
eap
f3304d692b Translate(022150: [CEA 789] Projection_1D2D not taken into account by BLSURF 
Fix the previous integration
 2013-03-06 14:16:29 +00:00
eap
170c6d4f11 white space modif 2013-03-06 13:37:00 +00:00
eap
31345e6622 In Translate*() allow for definition of Vector as a list of 3 components 2013-03-06 13:36:33 +00:00
eap
71b66afd04 022150: [CEA 789] Projection_1D2D not taken into account by BLSURF 
enum compute_event {
     ...
+    COMPUTE_SUBMESH
 2013-03-06 13:34:53 +00:00
eap
0a56ccc761 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27 2013-03-06 11:20:41 +00:00
eap
52ffb07d75 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27 
add criterion SMESH::FT_EntityType
 2013-03-06 08:36:13 +00:00
eap
91a2b8aad9 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27 2013-03-06 08:35:11 +00:00
eap
acf3857e67 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27 
Add exceptions

+    void ConvertToBiQuadratic(in boolean        theForce3d,
+                              in SMESH_IDSource theObject)
 2013-03-06 08:34:46 +00:00
eap
640a246d06 0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27 
+    FT_EntityType,

+  interface ElemEntityType : Predicate{

+    ElemEntityType    CreateElemEntityType();
 2013-03-06 08:34:11 +00:00
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