]> SALOME platform Git repositories - modules/smesh.git/log
Salome HOME
modules/smesh.git
11 years agoFix make distcheck problem V6_main_FINAL pluginMGCleaner
vsr [Tue, 16 Apr 2013 08:52:10 +0000 (08:52 +0000)]
Fix make distcheck problem

11 years agoRegression of already fixed
eap [Mon, 15 Apr 2013 10:44:12 +0000 (10:44 +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 );

11 years agoRestore the copyrights 2003-2007
akl [Mon, 15 Apr 2013 06:50:37 +0000 (06:50 +0000)]
Restore the copyrights 2003-2007

11 years agoFix 'make distcheck'
rnv [Thu, 11 Apr 2013 13:10:03 +0000 (13:10 +0000)]
Fix 'make distcheck'

11 years agonon-regression test SMESH_TEST/Grids/smesh/mesh_rotation/A8
eap [Mon, 8 Apr 2013 13:09:24 +0000 (13:09 +0000)]
non-regression test SMESH_TEST/Grids/smesh/mesh_rotation/A8

Fix generateGroups() to correctly generate "top" groups for initial
groups of nodes

11 years agoFix Mirror()
eap [Mon, 8 Apr 2013 13:06:13 +0000 (13:06 +0000)]
Fix Mirror()

11 years agofixed the version number in the Yams plug-in documentation, the @VERSION@ variable...
rnc [Fri, 5 Apr 2013 16:52:04 +0000 (16:52 +0000)]
fixed the version number in the Yams plug-in documentation, the @VERSION@ variable is now used to generate a conf.py file with the right version number

11 years ago- added the doc of the Yams plugin in the SALOME install
rnc [Fri, 5 Apr 2013 16:04:30 +0000 (16:04 +0000)]
- added the doc of the Yams plugin in the SALOME install
- added an entry in the SMESH Plug-ins help menu

11 years agoFix of INT PAL 0022077: TC5.1.5: usage of filters in Modification dialogs, Add button.
akl [Thu, 4 Apr 2013 08:47:29 +0000 (08:47 +0000)]
Fix of INT PAL 0022077: TC5.1.5: usage of filters in Modification dialogs, Add button.
1) Don't clear selection at open of dialog;
2) Disable automatic insert of selected elements in the list box;
3) Don't clear mesh selection during geometry selection.

11 years agoRemove reference to NETGEN from AutomaticTetrahedralization(), a default
eap [Wed, 3 Apr 2013 14:39:29 +0000 (14:39 +0000)]
Remove reference to NETGEN from AutomaticTetrahedralization(), a default
triangular algorithm is used.

11 years ago0021556: EDF 2222 SMESH: 3D mesh after projection impossible
eap [Wed, 3 Apr 2013 12:50:17 +0000 (12:50 +0000)]
0021556: EDF 2222 SMESH: 3D mesh after projection impossible

Apply all-dimensional algos ("algos1") before applying
non-all-dimensional algos which are more local than all-dimensional
algos of upper dimension than algos1.
E.g.
 * global on a COMPOUND of SOLIDs: "Prism 3D"
 * local  on a SOLID: "Regular 1D"
 * local  on a FACE:  "Projection 1D-2D"
Fix is to apply "Projection 1D-2D" before applying "Regular 1D".

11 years ago0021556: EDF 2222 SMESH: 3D mesh after projection impossible
eap [Wed, 3 Apr 2013 12:37:35 +0000 (12:37 +0000)]
0021556: EDF 2222 SMESH: 3D mesh after projection impossible

Fix association of FACEs by propagation in case if many propagation
ways are available.

11 years agoFix of INT PAL 0022929: TC6.5.0: Filter 'Color of Group' dosn't work:
akl [Wed, 3 Apr 2013 09:47:34 +0000 (09:47 +0000)]
Fix of INT PAL 0022929: TC6.5.0: Filter 'Color of Group' dosn't work:
set 'C' locale to operate with '.' (dot) as decimal point during converting from string to double.

11 years agoFix OwnHypothesis()
eap [Tue, 2 Apr 2013 13:06:05 +0000 (13:06 +0000)]
Fix OwnHypothesis()

-        if not distribHyp:
+        if not self.distribHyp:

11 years agoVerbatim headers (fix mistake in previous integration)
vsr [Mon, 1 Apr 2013 12:23:11 +0000 (12:23 +0000)]
Verbatim headers (fix mistake in previous integration)

11 years agoAvoid verbatim copy of sources in the developer documentation
imn [Mon, 1 Apr 2013 09:39:46 +0000 (09:39 +0000)]
Avoid verbatim copy of sources in the developer documentation

11 years ago0022183: EDF SMESH: Error with ConvertToQuadratic
eap [Fri, 29 Mar 2013 15:22:09 +0000 (15:22 +0000)]
0022183: EDF SMESH: Error with ConvertToQuadratic

In AddNode(), throw an exception only if a node is already in an other
sub-mesh or its position in myNodes is wrong.

11 years ago0022183: EDF SMESH: Error with ConvertToQuadratic
eap [Fri, 29 Mar 2013 15:20:32 +0000 (15:20 +0000)]
0022183: EDF SMESH: Error with ConvertToQuadratic

In getMediumNodeOnComposedWire(), prevent an exception at setting a
medium node, already added to a sub-mesh in AddNode() due to
mySetElemOnShape==true, to another EDGE.

11 years ago0022183: EDF SMESH: Error with ConvertToQuadratic
eap [Fri, 29 Mar 2013 15:17:24 +0000 (15:17 +0000)]
0022183: EDF SMESH: Error with ConvertToQuadratic

In ConvertToQuadratic(), not set quadratic elements on shapes when converting
linear elements not assigned to any shape

11 years ago0022182: EDF SMESH: Mesh does not compute after a "Clear Mesh Data"
eap [Fri, 29 Mar 2013 14:24:07 +0000 (14:24 +0000)]
0022182: EDF SMESH: Mesh does not compute after a "Clear Mesh Data"

bool SMESH_subMesh::ComputeStateEngine(int event)
{
...
+  if ( event == CLEAN )
+    _alwaysComputed = false; // Unset 'true' set by MergeNodes() (issue 0022182)
}

11 years ago0051789: TC7.2.0: NoteBook cannot update study
eap [Fri, 29 Mar 2013 13:38:04 +0000 (13:38 +0000)]
0051789: TC7.2.0: NoteBook cannot update study

void StdMeshers_LayerDistribution_i::LoadFrom( const char* theStream )
{

+        SMESH::SMESH_Hypothesis_var me = _this();
+        hyp1D->SetHolderHypothesis( me );

11 years ago0051789: TC7.2.0: NoteBook cannot update study
eap [Fri, 29 Mar 2013 13:37:23 +0000 (13:37 +0000)]
0051789: TC7.2.0: NoteBook cannot update study

-  StdMeshersGUI_LayerDistributionParamWdg(SMESH::SMESH_Hypothesis_ptr,
-                                          const QString&,
-                                          QDialog*);
+  StdMeshersGUI_LayerDistributionParamWdg(SMESH::SMESH_Hypothesis_ptr holderHyp,
+                                          SMESH::SMESH_Hypothesis_ptr distribHyp,
+                                          const QString&              name,
+                                          QDialog*                    dlg);

 private:
+ SMESH::SMESH_Hypothesis_var myHolderHyp;

11 years ago0051789: TC7.2.0: NoteBook cannot update study
eap [Fri, 29 Mar 2013 13:36:15 +0000 (13:36 +0000)]
0051789: TC7.2.0: NoteBook cannot update study

Fix for "NumberOfSegmants" contained in "LayerDistribution" hypothesis

11 years ago0051789: TC7.2.0: NoteBook cannot update study
eap [Fri, 29 Mar 2013 13:35:25 +0000 (13:35 +0000)]
0051789: TC7.2.0: NoteBook cannot update study

Fix for "LayerDistribution" hypothesis

+    // string preceding an entry of object storing the attribute holding var names
+    static const char* ObjPrefix() { return " # OBJ: "; }

11 years ago0051789: TC7.2.0: NoteBook cannot update study
eap [Fri, 29 Mar 2013 13:34:37 +0000 (13:34 +0000)]
0051789: TC7.2.0: NoteBook cannot update study

Fix for "LayerDistribution" hypothesis

+  const std::string & GetLastObjEntry() const { return myLastObj; }

+  std::string  myLastObj;

11 years ago0051789: TC7.2.0: NoteBook cannot update study
eap [Fri, 29 Mar 2013 13:33:48 +0000 (13:33 +0000)]
0051789: TC7.2.0: NoteBook cannot update study

Fix for "LayerDistribution" hypothesis

+     * \brief Store a hypothesis wrapping this not published one.
+     *
+     * This hyp, which has no own parameters but is published, is used to store variables
+     * defining parameters of this hypothesis.
+     */
+    void SetHolderHypothesis(in SMESH::SMESH_Hypothesis hyp);

+  // a published hypothesis wrapping this not published one
+  SMESH::SMESH_Hypothesis_var myHolder;

11 years ago0051789: TC7.2.0: NoteBook cannot update study
eap [Fri, 29 Mar 2013 13:33:01 +0000 (13:33 +0000)]
0051789: TC7.2.0: NoteBook cannot update study

Fix for "LayerDistribution" hypothesis

+     * \brief Store a hypothesis wrapping this not published one.
+     *
+     * This hyp, which has no own parameters but is published, is used to store variables
+     * defining parameters of this hypothesis.
+     */
+    void SetHolderHypothesis(in SMESH::SMESH_Hypothesis hyp);

11 years ago0051789: TC7.2.0: NoteBook cannot update study
eap [Fri, 29 Mar 2013 13:29:39 +0000 (13:29 +0000)]
0051789: TC7.2.0: NoteBook cannot update study

In StdMeshersDC_RadialPrism3D, create LayerDistribution hyp only as needed

11 years ago0051789: TC7.2.0: NoteBook cannot update study
eap [Fri, 29 Mar 2013 13:17:47 +0000 (13:17 +0000)]
0051789: TC7.2.0: NoteBook cannot update study

Enable calling mesh.Prism('RadialPrism_3D')

+class StdMeshersDC_RadialPrism3D(StdMeshersDC_Prism3D):
+ ...

11 years agoFrom CoTech 51: change default preferences
vsr [Fri, 29 Mar 2013 13:13:59 +0000 (13:13 +0000)]
From CoTech 51: change default preferences

11 years agoFrom CoTech 51: change default preferences
vsr [Fri, 29 Mar 2013 10:59:00 +0000 (10:59 +0000)]
From CoTech 51: change default preferences

11 years agoImplementation of the "0021951: EDF 2355 SMESH : Supression of SetFilter button in...
rnv [Fri, 29 Mar 2013 10:27:35 +0000 (10:27 +0000)]
Implementation of the "0021951: EDF 2355 SMESH : Supression of SetFilter button in the standalone part of the group dialog" issue.

11 years agoCopyrights update 2013
akl [Fri, 29 Mar 2013 08:57:56 +0000 (08:57 +0000)]
Copyrights update 2013

11 years agoThe fix to show all element with the same color when all values are almost equal.
eap [Thu, 28 Mar 2013 16:17:09 +0000 (16:17 +0000)]
The fix to show all element with the same color when all values are almost equal.

11 years ago0051789: TC7.2.0: NoteBook cannot update study
eap [Thu, 28 Mar 2013 15:23:34 +0000 (15:23 +0000)]
0051789: TC7.2.0: NoteBook cannot update study

Fix approach to storage of NoteBook variables.
Before the fix: names of variables are stored in PythonDump commands
and nothing is stored in the Study.
Problem: after variable removal, the PythonDump script becomes invalid.
Fix: names of variables are stored in the Study, PythonDump commands
store indices of variables within "StringAttribute".

class SMESH_Gen_i {
...
-  void UpdateParameters(/*CORBA::Object_ptr theObject,*/ const char* theParameters);
+  void UpdateParameters(CORBA::Object_ptr theObject, const char* theParameters);

+  const std::vector< int >&  GetLastParamIndices() const;
+  std::vector< std::string > GetAllParameters(const std::string& theObjectEntry) const;

11 years agoIn IsStructured()
eap [Thu, 28 Mar 2013 15:13:04 +0000 (15:13 +0000)]
In IsStructured()

-  if ( nbWires != 1 || nbEdgesInWires.front() != 4 )
+  if ( nbWires != 1 /*|| nbEdgesInWires.front() != 4*/ ) // allow composite sides

11 years ago0051843: TC7.2.0: script SMESH_hexaedre ends with error
eap [Wed, 27 Mar 2013 16:07:12 +0000 (16:07 +0000)]
0051843: TC7.2.0: script SMESH_hexaedre ends with error

 make the script independent of order of edges in geometry

11 years agomark "Evaluating mesh size" as optional
eap [Tue, 26 Mar 2013 10:12:46 +0000 (10:12 +0000)]
mark "Evaluating mesh size" as optional

11 years agoadd ref to //www.code-aster.org/outils/med/html/connectivites.html
eap [Tue, 26 Mar 2013 10:11:42 +0000 (10:11 +0000)]
add ref to //www.code-aster.org/outils/med/html/connectivites.html

11 years agofix CheckGeomGroupModif() for the case of a mesh on a geom group
eap [Fri, 22 Mar 2013 15:33:42 +0000 (15:33 +0000)]
fix CheckGeomGroupModif() for the case of a mesh on a geom group

11 years agoDistribute CMakeLists.txt files with sources (make dist)
vsr [Wed, 20 Mar 2013 12:07:34 +0000 (12:07 +0000)]
Distribute CMakeLists.txt files with sources (make dist)

11 years agoInstall python examples.
rnv [Tue, 19 Mar 2013 15:32:40 +0000 (15:32 +0000)]
Install python examples.

11 years ago0020483: Mesh with descending connectivity. Fix for the case when the same entities...
jfa [Tue, 19 Mar 2013 10:23:26 +0000 (10:23 +0000)]
0020483: Mesh with descending connectivity. Fix for the case when the same entities are defined in both connectivities.

11 years ago0022150: [CEA 789] Projection_1D2D not taken into account by BLSURF
eap [Tue, 19 Mar 2013 08:36:53 +0000 (08:36 +0000)]
0022150: [CEA 789] Projection_1D2D not taken into account by BLSURF

Fix a problem with visualisation of 'left_translated' mesh.

SMDS_Mesh::SMDS_Mesh()
{ ...
-  points->SetNumberOfPoints(SMDS_Mesh::chunkSize);
+  points->SetNumberOfPoints(0);

11 years agorestore the previous version of segLength() in order not to damage a
eap [Tue, 19 Mar 2013 08:23:47 +0000 (08:23 +0000)]
restore the previous version of segLength() in order not to damage a
stable version with a minor fix. This revision must be rolled back
after the version release!

11 years agoUpdate header.
rnv [Fri, 15 Mar 2013 12:39:11 +0000 (12:39 +0000)]
Update header.

11 years agoFix for user docs (add dependency of usr_docs on html_docs)
vsr [Fri, 15 Mar 2013 11:43:14 +0000 (11:43 +0000)]
Fix for user docs (add dependency of usr_docs on html_docs)

11 years agoFix problem with generating user docs with CMake (make usr_docs)
vsr [Fri, 15 Mar 2013 09:40:23 +0000 (09:40 +0000)]
Fix problem with generating user docs with CMake (make usr_docs)

11 years agoDefine DBGOUT in release mode as well
eap [Fri, 15 Mar 2013 08:02:36 +0000 (08:02 +0000)]
Define DBGOUT in release mode as well

+#else
+#define DBGOUT(msg)

11 years ago0022166: [CEA 792] Regression on 07_Pentahedron.py, 12_3d_extrusion.py
eap [Thu, 14 Mar 2013 08:45:22 +0000 (08:45 +0000)]
0022166: [CEA 792] Regression on 07_Pentahedron.py, 12_3d_extrusion.py
and 13_projection_3d.py scripts from CEA test base

fix the regression on test_Prism3D_Improved.py (imps9/K2)

+    // not add not quadrilateral FACE as we can't compute it
+    // else if ( !quadAlgo->CheckNbEdges( theMesh, face ))
+    // // not add not quadrilateral FACE as it can be a prism side
+    // // else if ( myHelper->Count( face, TopAbs_EDGE, /*ignoreSame=*/false ) != 4 )
+    // {
+    //   notQuadFaces.push_back( face );
+    // }

11 years ago0022166: [CEA 792] Regression on 07_Pentahedron.py, 12_3d_extrusion.py
eap [Wed, 13 Mar 2013 17:17:24 +0000 (17:17 +0000)]
0022166: [CEA 792] Regression on 07_Pentahedron.py, 12_3d_extrusion.py
and 13_projection_3d.py scripts from CEA test base

When projecting quadratic 1D mesh to a 'vertical' composite side, fix
node location before creating a quadratic segment in order to have a
valid position (U and shape) of medium node.

11 years ago0022166: [CEA 792] Regression on 07_Pentahedron.py, 12_3d_extrusion.py
eap [Wed, 13 Mar 2013 17:14:05 +0000 (17:14 +0000)]
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

11 years agoCast negligible values to zero in order not to have a range of control
eap [Wed, 13 Mar 2013 08:35:24 +0000 (08:35 +0000)]
Cast negligible values to zero in order not to have a range of control
values of e.g. taper [0, 1e-13]

11 years agoIn OnEditDelete(),
eap [Tue, 12 Mar 2013 13:46:11 +0000 (13:46 +0000)]
In OnEditDelete(),

+    // Call mesh->Clear() to prevent loading mesh from file caused by hypotheses removal
+    ...

11 years ago // S = S0 * f(L/Lmin) where f(x) = 1 + (7 * 2/Pi * atan(x/5))
eap [Tue, 12 Mar 2013 11:31:32 +0000 (11:31 +0000)]
 // 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))

11 years agoFix FirstVertexOnCurve(edge): use MakeVertexOnCurve() instead of
eap [Tue, 12 Mar 2013 11:28:32 +0000 (11:28 +0000)]
Fix FirstVertexOnCurve(edge): use MakeVertexOnCurve() instead of
KindOfShape() to find the EDGE beginning

11 years agoIn MergeNodes():
eap [Tue, 12 Mar 2013 11:26:10 +0000 (11:26 +0000)]
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.
+        ...

11 years agoFix the regression entered by fix of
eap [Mon, 11 Mar 2013 11:10:27 +0000 (11:10 +0000)]
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.;

11 years agoFix a bug reported in SALOME Forum
eap [Thu, 7 Mar 2013 08:50:01 +0000 (08:50 +0000)]
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

11 years agoPPGP issue.
eap [Thu, 7 Mar 2013 08:37:57 +0000 (08:37 +0000)]
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);

11 years agoPPGP issue. Fix dump of not published SMESH_IDSource's. As a result
eap [Wed, 6 Mar 2013 16:30:42 +0000 (16:30 +0000)]
PPGP issue. Fix dump of not published SMESH_IDSource's. As a result
DumpStudy command fails.

11 years ago def FindHypothesis (self, hypname, args, CompareMethod, smeshpyD):
eap [Wed, 6 Mar 2013 16:03:18 +0000 (16:03 +0000)]
 def FindHypothesis (self, hypname, args, CompareMethod, smeshpyD):
         study = smeshpyD.GetCurrentStudy()
+        if not study: return None
         scomp = study.FindComponent(smeshpyD.ComponentDataType())

11 years agoTranslate(022150: [CEA 789] Projection_1D2D not taken into account by BLSURF
eap [Wed, 6 Mar 2013 14:16:29 +0000 (14:16 +0000)]
Translate(022150: [CEA 789] Projection_1D2D not taken into account by BLSURF

 Fix the previous integration

11 years agowhite space modif
eap [Wed, 6 Mar 2013 13:37:00 +0000 (13:37 +0000)]
white space modif

11 years agoIn Translate*() allow for definition of Vector as a list of 3 components
eap [Wed, 6 Mar 2013 13:36:33 +0000 (13:36 +0000)]
In Translate*() allow for definition of Vector as a list of 3 components

11 years ago022150: [CEA 789] Projection_1D2D not taken into account by BLSURF
eap [Wed, 6 Mar 2013 13:34:53 +0000 (13:34 +0000)]
022150: [CEA 789] Projection_1D2D not taken into account by BLSURF

 enum compute_event {
     ...
+    COMPUTE_SUBMESH

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 11:20:41 +0000 (11:20 +0000)]
0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:36:13 +0000 (08:36 +0000)]
0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

 add criterion SMESH::FT_EntityType

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:35:11 +0000 (08:35 +0000)]
0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:34:46 +0000 (08:34 +0000)]
0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

Add exceptions

+    void ConvertToBiQuadratic(in boolean        theForce3d,
+                              in SMESH_IDSource theObject)

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:34:11 +0000 (08:34 +0000)]
0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

+    FT_EntityType,

+  interface ElemEntityType : Predicate{

+    ElemEntityType    CreateElemEntityType();

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:33:31 +0000 (08:33 +0000)]
0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

-      editor.ConvertToQuadratic(/*theForce3d=*/false, tgtFaces);
+      editor.ConvertToQuadratic(/*theForce3d=*/false, tgtFaces, false);

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:32:30 +0000 (08:32 +0000)]
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();

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:31:58 +0000 (08:31 +0000)]
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):

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:30:04 +0000 (08:30 +0000)]
0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

+    operator<<(const SMESH::EntityType& theArg);

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:29:43 +0000 (08:29 +0000)]
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())

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:28:25 +0000 (08:28 +0000)]
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

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:22:55 +0000 (08:22 +0000)]
0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

+  operator<<(const SMESH::EntityType& theArg)

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:22:30 +0000 (08:22 +0000)]
0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

1) Treat SMESH.FT_EntityType criterion type
2) ConvertToBiQuadratic(...) -> ConvertToQuadratic(...,True)

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:14:30 +0000 (08:14 +0000)]
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;

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:12:22 +0000 (08:12 +0000)]
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);

11 years ago0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Wed, 6 Mar 2013 08:11:01 +0000 (08:11 +0000)]
0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

+    class SMESHCONTROLS_EXPORT ElemEntityType: public virtual Predicate{

11 years agomake a picture of central nodes of HEX27
eap [Wed, 6 Mar 2013 08:06:08 +0000 (08:06 +0000)]
make a picture of central nodes of HEX27

11 years agoFix problem of 'make installcheck' - set proper environment for tests
vsr [Tue, 5 Mar 2013 06:07:29 +0000 (06:07 +0000)]
Fix problem of 'make installcheck' - set proper environment for tests

11 years agoRemove "Suspicious continuation in line 85"
eap [Mon, 4 Mar 2013 14:02:27 +0000 (14:02 +0000)]
Remove "Suspicious continuation in line 85"

11 years ago0021859: EDF 2191 SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Mon, 4 Mar 2013 10:13:46 +0000 (10:13 +0000)]
0021859: EDF 2191 SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

11 years ago0021859: EDF 2191 SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
eap [Mon, 4 Mar 2013 10:07:58 +0000 (10:07 +0000)]
0021859: EDF 2191 SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27

11 years agofix failure of non-regression test SMESH_TEST/Grids/smesh/mesh_Projection_2D/A1
eap [Fri, 1 Mar 2013 16:45:29 +0000 (16:45 +0000)]
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 );

11 years agoa bit more comments
eap [Fri, 1 Mar 2013 16:44:43 +0000 (16:44 +0000)]
a bit more comments

11 years agoa bit more comments
eap [Fri, 1 Mar 2013 14:37:27 +0000 (14:37 +0000)]
a bit more comments

11 years agofix failure of non-regression test SMESH_TEST/Grids/smesh/mesh_Projection_2D/A1
eap [Fri, 1 Mar 2013 14:37:03 +0000 (14:37 +0000)]
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.

11 years agofix failure of non-regression test SMESH_TEST/Grids/smesh/mesh_Projection_2D/A1
eap [Fri, 1 Mar 2013 14:32:53 +0000 (14:32 +0000)]
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);

11 years agofix failure of non-regression test SMESH_TEST/Grids/smesh/mesh_Projection_2D/A0
eap [Fri, 1 Mar 2013 11:11:43 +0000 (11:11 +0000)]
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 );

11 years agofix failure of non-regression test SMESH_TEST/Grids/smesh/mesh_Projection_2D/A0
eap [Fri, 1 Mar 2013 11:10:18 +0000 (11:10 +0000)]
fix failure of non-regression test SMESH_TEST/Grids/smesh/mesh_Projection_2D/A0

  Fix IsStructured( SMESH_subMesh* faceSM ) for a cylindrical FACE

11 years agofix failure of non-regression test SMESH_TEST/Grids/smesh/imps8/I1
eap [Thu, 28 Feb 2013 15:12:29 +0000 (15:12 +0000)]
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

11 years ago1) Treat GMF import/export
eap [Thu, 28 Feb 2013 14:28:04 +0000 (14:28 +0000)]
1) Treat GMF import/export
2) Fix RemoveArgs() not to clear the whole command if it is like "(res1,res2) = meth(arg)"

11 years ago0022134: DriverGMF : reading quadratic meshes
eap [Thu, 28 Feb 2013 11:36:54 +0000 (11:36 +0000)]
0022134: DriverGMF : reading quadratic meshes

  Fix errors of import/export of meshes including both linear and
  quadratic elements.

11 years ago0022134: DriverGMF : reading quadratic meshes
eap [Thu, 28 Feb 2013 11:36:28 +0000 (11:36 +0000)]
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);

11 years ago0022134: DriverGMF : reading quadratic meshes
eap [Thu, 28 Feb 2013 11:33:57 +0000 (11:33 +0000)]
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;

11 years agofix failure of non-regression test SMESH_TEST/Grids/smesh/imps8/I1
eap [Wed, 27 Feb 2013 16:16:52 +0000 (16:16 +0000)]
fix failure of non-regression test SMESH_TEST/Grids/smesh/imps8/I1

  Compute stack of simple boxes with structured sides