Commit Graph

167 Commits

Author SHA1 Message Date
eap
f55c997d2e fix indentation 2014-01-20 10:45:36 +00:00
eap
f500e5a8b6 22316: EDF 2719 SMESH: Split hexas into prisms 2014-01-20 10:31:23 +00:00
vsr
f7aba4830d Merge from BR_imps_2013 14/01/2014 2014-01-15 09:41:17 +00:00
vsr
072a73120b Merge from V7_3_BR (09/01/2014) 2014-01-09 14:20:44 +00:00
vsr
2cd148d066 Merge from V7_3_BR branch 18/12/2013 2013-12-18 15:08:18 +00:00
eap
5cdfcba279 More safety
-        if ( l_d->first->IsDeletable() )
+        if ( l_d->first != listener && l_d->first->IsDeletable() )
2013-11-26 13:33:52 +00:00
eap
d5b3009987 - static bool isStraight( const TopoDS_Edge & E, const bool degenResult=false );
+  static bool IsStraight( const TopoDS_Edge & E, const bool degenResult=false );
2013-11-22 13:17:22 +00:00
eap
0280d2e6a7 22361: EDF SMESH: Quadrangle (mapping) algorithm: faces with more than 4 edges
Fix "int WrapIndex(const int ind, const int nbNodes)" for ind=-4 and nbNodes=4
2013-11-22 12:34:45 +00:00
eap
45b939fb48 Regression SALOME_TESTS/Grids/smesh/3D_mesh_HEXA3D_00/C2
Fix GetAngle() to take Orientation() of input edges as is and not
using GetSubShapeOri() which is wrong for the seam edge
2013-11-18 14:55:27 +00:00
eap
bfcfbc1ba9 Prevent failure if a degenerated EDGE is not meshed 2013-11-15 10:20:33 +00:00
eap
66f244f657 Enable canceling Compute 2013-11-14 14:25:12 +00:00
eap
7ba5d8000f 022398: EDF 2783 SMESH: No end with viscous layer computation
1) Fix CheckNodeU() for unfinite U and NURBS curve
2)
+  static double GetAngle( const TopoDS_Edge & E1, const TopoDS_Edge & E2, const TopoDS_Face & F);
2013-11-12 14:48:16 +00:00
eap
56fa701d47 022398: EDF 2783 SMESH: No end with viscous layer computation
+  static double GetAngle( const TopoDS_Edge & E1, const TopoDS_Edge & E2, const TopoDS_Face & F);
2013-11-12 14:46:58 +00:00
eap
7b33bc39fd 22355: EDF SMESH: New 1D hypothesis "Adaptive" 2013-11-11 11:07:44 +00:00
rnv
e33e8e2029 WIN32 compilation of the SMESH module:
1) Fix common WIN32 compilation errors.
2) Replace WNT deprecated macro definition by the WIN32.
3) Remove unnecessary test executables.
4) Make MEFISTO2D algorithm optional: try to determine f2c generator and generate C code from Fortran, otherwise MEFISTO2D is unavailable.
2013-10-18 13:29:00 +00:00
eap
0d3dd80ac2 22332: EDF 2725 SMESH: Convert to bi-quadratic failure after hexotic meshing
In GetCentralNode(), check UV of corner nodes
2013-10-16 14:24:20 +00:00
rnv
1bd4ba8acd Porting SALOME SMESH module to the CMake build system: initial version. 2013-10-10 12:57:42 +00:00
eap
48653b1aec -#if OCC_VERSION_LARGE > 0x06010000
OCC_CATCH_SIGNALS;
-#endif
2013-10-10 10:29:42 +00:00
eap
a6a734f166 catch exceptions in "rate = algo->GetProgress();" 2013-10-10 10:26:03 +00:00
eap
f5c4ae89eb 0022172: [CEA 790] create the groups corresponding to domains (note 0016221)
A better fix for Clear() for the mesh w/o shape
2013-10-04 10:12:56 +00:00
eap
ad501c420b 0022172: [CEA 790] create the groups corresponding to domains (note 0016221)
Fix Clear() for the mesh w/o shape
2013-10-04 10:08:21 +00:00
eap
8b3847f1af Fix warning
unused variable 'ielem'
2013-09-27 07:54:54 +00:00
eap
5cdebf6f36 For PPGP: in GetAlgoState() remove INFOS( "None algorithm attached" ) since hyp
definition errors are reported now in both gui and tui modes
2013-09-25 08:16:55 +00:00
vsr
9be2f33e68 Fix linkage problem 2013-09-12 06:56:51 +00:00
eap
c81123c27b 22170: [CEA 704] Redirect NETGEN outup in a log file
restore cout possibly redirected by algo
2013-09-10 13:52:57 +00:00
eap
3efca6d10c Progress bar. Increase difference between computeCost of EDGE and FACE 2013-09-03 15:48:57 +00:00
eap
8a85c65b1e Regression of XSMESH_TEST/SMESHCOMMON/SMESH_TEST/Grids/smesh/3D_mesh_Extrusion/A6
TTElemOfElemListMap and TElemOfVecOfNnlmiMap must use same comparator
for correct work of makeWalls()
2013-09-03 11:38:19 +00:00
eap
a1c755a149 SALOME Forum bug: http://www.salome-platform.org/forum/forum_10/967838025
Do not report a compute error if a degenerated EDGE is not computed
2013-08-23 16:22:51 +00:00
eap
211c8198b3 SALOME Forum bug: http://www.salome-platform.org/forum/forum_10/967838025
Re-fix "Regression of XSMESH_TEST/SMESHCOMMON/SMESH_TEST/Grids/smesh/bugs12/M6"
previously fixed by revision 1.23.2.9.
Use TElemOfElemListMap with new comparator TIDTypeCompare instead of
TElemOfElemListMap declared in SMESH_TypeDefs.hxx which uses
TIDCompare (whose behavior has been just restored)
2013-08-23 13:15:52 +00:00
eap
3c53917e76 SALOME Forum bug: http://www.salome-platform.org/forum/forum_10/967838025
Don't use BRep_Tool::Degenerated() which sometimes gives a wrong answer,
use SMESH_Algo::isDegenerated() instead
2013-08-23 07:44:07 +00:00
eap
3939500c74 In ExportMED() use SMESH_TRY to normally transfer exceptions from the driver 2013-08-14 12:34:41 +00:00
eap
2d070665a5 Fix regression of SMESH_TEST/Grids/smesh/3D_mesh_Extrusion/A3
+  static bool isStraight( const TopoDS_Edge & E, const bool degenResult=false );
2013-08-13 16:35:31 +00:00
eap
5f791c80a4 Optimize cleanSubMesh( SMESH_subMesh * subMesh ) a bit 2013-08-08 12:38:25 +00:00
eap
e97c496f7d 0022297: BR_new_bop3/Occdev_3f4689a163 => Faces are missing after an extrusion
Fix ConvertToQuadratic(): do not convert twice quadratic volumes
2013-08-08 12:36:02 +00:00
eap
9a4f5e4852 progress bar: fix for viscous layers 2013-08-05 12:30:05 +00:00
prascle
ef59152514 PR : merge from V7_2_1p1
memory leaks, bug in import 1D for cracks
M src/SMDS/SMDS_UnstructuredGrid.cxx
M src/SMESH/SMESH_MeshEditor.cxx
M src/SMESH/SMESH_MesherHelper.cxx
M src/SMESHUtils/SMESH_MeshAlgos.cxx
M src/SMESHUtils/SMESH_MeshAlgos.hxx
M src/SMESHUtils/SMESH_Octree.hxx
M src/SMESHUtils/SMESH_Tree.hxx
M src/SMESH_PY/smeshstudytools.py
M src/StdMeshers/StdMeshers_Import_1D.cxx
2013-08-03 11:11:12 +00:00
eap
04fe81eb47 SALOME Forum bug: structured mesh is not strictly rectilinear with Viscous Layers.
http://www.salome-platform.org/forum/forum_10/998544058

 class SMESH_2D_Algo
 {
+  /*!
+   * \brief Method in which an algorithm generating a structured mesh
+   *        fixes positions of in-face nodes after there movement
+   *        due to insertion of viscous layers.
+   */
+  virtual bool FixInternalNodes(const SMESH_ProxyMesh& mesh,
+                                const TopoDS_Face&     face);
2013-07-31 11:21:55 +00:00
eap
09020c0206 fix a comment 2013-07-31 11:18:51 +00:00
rnc
094287b4df BUG: EDF 2655: Hexa splitting into tetra low performance
A better fix has been found by improving the getNextFree() method in ObjectPool.hxx. When there is no "hole" in the ID list we don't iterate on the _freeList to find the next free ID. We jump straight to the last occupied ID.
This fix is simpler and can benefit to other methods of SMESH_Editor like QuadTo4Tri for example.
2013-07-22 08:46:57 +00:00
rnc
3f3beb8b95 BUG: EDF 2655: Low performance of hexa to tetra splitting
The whole procedure performance was almost O(n^2) due to insertion of for example 5 elements in a mesh with a free ID at the beginning. The second element is then inserted with a O(n) complexity.
The hexas are now removed after all tetra insertions, which guarantees a O(n) complexity for the whole procedure at a limited memory cost (transient additional cost of 1/5 of total memory occupation at the end).
2013-07-19 16:01:27 +00:00
eap
e7dbe802e0 22252: EDF 2684 SMESH: Extrusion along a path with a curvilinear edge
Some decorations in ExtrusionAlongTrack()
2013-07-16 14:30:30 +00:00
eap
c96730d0aa Compute Progress bar 2013-07-09 11:59:40 +00:00
eap
42d136bcdc Compute Progress bar
+  bool DependsOn( const SMESH_subMesh* other ) const;
+  int                   _realComputeCost; // _computeCost depending on presence of needed hypotheses
2013-07-09 11:59:18 +00:00
eap
a311b5af11 Compute Progress bar
-  int& GetComputeCost() { return _computeCost; }
+  std::vector<SMESH_subMesh*>& SubMeshesToCompute() { return _smToCompute; }
2013-07-09 11:58:41 +00:00
eap
e0f019ccf9 Compute Progress bar: ignore sub-meshes that are NOT_READY to compute 2013-07-08 11:27:16 +00:00
eap
8ead976689 Compute Progress bar
SMESH_subMeshIteratorPtr getDependsOnIterator(const bool includeSelf,
-                                                const bool complexShapeFirst) const;
+                                                const bool complexShapeFirst=false) const;

+  int GetComputeCost() const;

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

+  int                   _computeCost; // how costly is to compute this sub-mesh
2013-07-03 16:12:38 +00:00
eap
ffa2f0be82 Compute Progress bar
+  double GetComputeProgress() const;
+  SMESH_Hypothesis * GetHypothesis(const int aHypID) const;
2013-07-03 16:10:31 +00:00
eap
1481fb61da - std::map < int, SMESH_Algo * >_mapAlgo;
-  std::map < int, SMESH_0D_Algo * >_map0D_Algo;
-  std::map < int, SMESH_1D_Algo * >_map1D_Algo;
-  std::map < int, SMESH_2D_Algo * >_map2D_Algo;
-  std::map < int, SMESH_3D_Algo * >_map3D_Algo;
2013-07-03 16:09:54 +00:00
eap
fad96c2870 Compute Progress bar
+  virtual double GetProgress() const;
+  double GetProgressByTic() const;
+  int& GetComputeCost() { return _computeCost; }

+  int           _computeCost;     //!< "compute cost" of shapes being Compute()d
+  int           _progressTic;     //!< counter of calls from SMESH_Mesh::GetComputeProgress()
+  double        _progress;        //!< progress of Compute() [0.,1.]
2013-07-03 16:09:28 +00:00
eap
dbf60372a6 CoTech decision: move MEDWrapper from MED to SMESH
-	$(MED_CXXFLAGS) \

+	-I$(srcdir)/../MEDWrapper/Base \
2013-06-24 10:07:19 +00:00