]> SALOME platform Git repositories - plugins/netgenplugin.git/commitdiff
Salome HOME
IPAL52922: Wrong processing of "Growth rate" value (Netgen 2D Parameters hypothesis... V8_0_pre
authoreap <eap@opencascade.com>
Tue, 27 Oct 2015 16:22:09 +0000 (19:22 +0300)
committereap <eap@opencascade.com>
Tue, 27 Oct 2015 16:22:09 +0000 (19:22 +0300)
IPAL52926: NETGENPLUGIN User's Guide documentation: screenshot should be updated
    Doc updated

IPAL52936: [NETGEN] Unset Local size is incorrectly dumped
    hyp impl and a resource file fixed

doc/salome/gui/NETGENPLUGIN/images/netgen3d_local_size.png
doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc
doc/salome/gui/NETGENPLUGIN/input/index.doc
doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc
resources/NETGENPlugin.xml
src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx

index f7bcd18b9d4d3f0855e52a03e5c8d2357e303c4f..b93e4b0d070039e77972fe2dd6b2a6b8e07f423e 100644 (file)
Binary files a/doc/salome/gui/NETGENPLUGIN/images/netgen3d_local_size.png and b/doc/salome/gui/NETGENPLUGIN/images/netgen3d_local_size.png differ
index dfc1fcef0787f2d26c065f2d7b14c5eb8216064a..0463e30798a76ff4c737d3d4a05127dfede853eb 100644 (file)
@@ -13,11 +13,11 @@ This hypothesis allows creation of layers of highly stretched prisms near
 mesh boundary, which is beneficial for high quality viscous
 computations. The prisms constructed on the quadrangular mesh faces are
 actually the hexahedrons.</li>
-</ul>
 
 <li><b>Quadrangle Preference</b> - This additional hypothesis can be
   used together with Netgen 2D algorithm.
 It allows Netgen 2D to build quad-dominant meshes.</li>
+</ul>
 <br>
 
 For more detailed description of the described above hypothesis please refer SALOME Mesh User's Guide.
index dff87a6cfd8e4adfd512d2e97239637f0b0eab64..f2d23d4cf0041924045e9fea40f7533b70630d2f 100644 (file)
@@ -10,8 +10,8 @@
   constructed as a transition from quadrangles to tetrahedra.
 - Generating 3D meshes from 2D meshes, working without geometrical objects.
 
-To manage parameters of the NETGENPLUGIN use \subpage
-netgen_2d_3d_hypo_page and \subpage additional_hypo_page.
+To manage parameters of the NETGENPLUGIN use 
+\subpage netgen_2d_3d_hypo_page and \subpage additional_hypo_page.
 
 Native Netgen mesher usually prints a lot of trace output to the terminal
 window. This output is redirected to some log file by the Plugin. It
index cf9c245412a452441ecbae586923967e8f103e4d..fc69e0ca5a1b0a24a2d9b65e6f50bb7afb5771b8 100644 (file)
@@ -42,8 +42,9 @@ size at a given point. This parameter is used only if <b>Limit Size by
 then size of mesh segments and mesh faces on curved edges and surfaces
 is defined using value of <b>Nb Segs per Radius</b> parameter, and
 number of segments on straight edges is defined by values of
-<b>Nb. Segs per Edge</b> parameter. If this box is not checked in,
-then size of elements is defined by three parameters only:
+<b>Nb. Segs per Edge</b> parameter. (<b>Growth rate</b> is also taken
+into account.) If this box is not checked in, then size of elements is
+defined by three parameters only:
 <b>Max Size</b>, <b>Min Size</b> and <b>Growth rate</b>.
 - <b>Allow Quadrangles</b> - if this box is checked in, the mesher
 tries to generate quadrangle 2D mesh. Triangle elements are created
index 3def5e36acc546ba2b580b5371487186c8eeb024..bfda2359fd669455bafc46a062cd4b8bbf5c9233 100644 (file)
@@ -40,7 +40,8 @@
                dim="3">
       <python-wrap>
         <accumulative-methods>
-          SetLocalSizeOnShape
+          SetLocalSizeOnShape,
+          UnsetLocalSizeOnEntry
         </accumulative-methods>
       </python-wrap>
     </hypothesis>
@@ -50,7 +51,8 @@
                dim="2">
       <python-wrap>
         <accumulative-methods>
-          SetLocalSizeOnShape
+          SetLocalSizeOnShape,
+          UnsetLocalSizeOnEntry
         </accumulative-methods>
       </python-wrap>
     </hypothesis>
@@ -60,7 +62,8 @@
                dim="3">
       <python-wrap>
         <accumulative-methods>
-          SetLocalSizeOnShape
+          SetLocalSizeOnShape,
+          UnsetLocalSizeOnEntry
         </accumulative-methods>
       </python-wrap>
     </hypothesis>
@@ -70,7 +73,8 @@
                dim="2">
       <python-wrap>
         <accumulative-methods>
-          SetLocalSizeOnShape
+          SetLocalSizeOnShape,
+          UnsetLocalSizeOnEntry
         </accumulative-methods>
       </python-wrap>
     </hypothesis>
index d09a15a1b0b7d4eebcb42adc314f10c4e887cd42..cf9853c4e6b15de79b15c6f8994c82ff136e2256 100644 (file)
@@ -418,9 +418,9 @@ bool NETGENPluginGUI_HypothesisCreator::readParamsFromHypo( NetgenHypothesisData
         h_data.myAllowQuadrangles = h->GetQuadAllowed();
     }
   
-  NETGENPluginGUI_HypothesisCreator* that = (NETGENPluginGUI_HypothesisCreator*)this;
+  NETGENPluginGUI_HypothesisCreator*  that = (NETGENPluginGUI_HypothesisCreator*)this;
   NETGENPlugin::string_array_var myEntries = h->GetLocalSizeEntries();
-  for ( int i=0 ; i<myEntries->length() ; i++ )
+  for ( size_t i = 0; i < myEntries->length(); i++ )
     {
       QString entry = myEntries[i].in();
       double val = h->GetLocalSizeOnEntry(entry.toStdString().c_str());
@@ -642,7 +642,7 @@ void NETGENPluginGUI_HypothesisCreator::addLocalSizeOnShape(TopAbs_ShapeEnum typ
   SALOME_ListIO ListSelectedObjects;
   mySel->selectedObjects(ListSelectedObjects, NULL, false );
   SALOME_ListIteratorOfListIO Object_It(ListSelectedObjects);
-  for (Object_It ; Object_It.More() ; Object_It.Next())
+  for ( ; Object_It.More() ; Object_It.Next())
     {
       Handle(SALOME_InteractiveObject) anObject = Object_It.Value();
       std::string entry, shapeName;
index b3e0b035f9f9af2edb2bd3d14779058c27bd5fec..300c4cd3d2d7a40ce4776cfbbfab6a05bab216e2 100644 (file)
@@ -216,15 +216,15 @@ void NETGENPlugin_Hypothesis::SetNbSegPerRadius(double theVal)
 void NETGENPlugin_Hypothesis::SetLocalSizeOnEntry(const std::string& entry, double localSize)
 {
   if(_localSize[entry] != localSize)
-    {
-      _localSize[entry] = localSize;
-      NotifySubMeshesHypothesisModification();
-    }
+  {
+    _localSize[entry] = localSize;
+    NotifySubMeshesHypothesisModification();
+  }
 }
 
 //=============================================================================
 /*!
- *  
+ *
  */
 //=============================================================================
 double NETGENPlugin_Hypothesis::GetLocalSizeOnEntry(const std::string& entry)
index 2da2e821abcc68d5fb726d3013b2a6b6a858cff8..63ac27752dc68befe8049143c46427aeb164e429 100644 (file)
@@ -363,7 +363,7 @@ NETGENPlugin::string_array* NETGENPlugin_Hypothesis_i::GetLocalSizeEntries()
 void NETGENPlugin_Hypothesis_i::UnsetLocalSizeOnEntry(const char* entry)
 {
   this->GetImpl()->UnsetLocalSizeOnEntry(entry);
-  SMESH::TPythonDump() << _this() << ".UnsetLocalSizeOnEntry(" << entry << ")";
+  SMESH::TPythonDump() << _this() << ".UnsetLocalSizeOnEntry(\"" << entry << "\")";
 }
 
 //=============================================================================