From: eap Date: Tue, 27 Oct 2015 16:22:09 +0000 (+0300) Subject: IPAL52922: Wrong processing of "Growth rate" value (Netgen 2D Parameters hypothesis... X-Git-Tag: V8_0_pre X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=92b0965b5617eee32b24ef0994abd0e5eb3293b2;p=plugins%2Fnetgenplugin.git IPAL52922: Wrong processing of "Growth rate" value (Netgen 2D Parameters hypothesis) or Salome User's Guide documentation should be updated 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 --- diff --git a/doc/salome/gui/NETGENPLUGIN/images/netgen3d_local_size.png b/doc/salome/gui/NETGENPLUGIN/images/netgen3d_local_size.png index f7bcd18..b93e4b0 100644 Binary files a/doc/salome/gui/NETGENPLUGIN/images/netgen3d_local_size.png and b/doc/salome/gui/NETGENPLUGIN/images/netgen3d_local_size.png differ diff --git a/doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc b/doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc index dfc1fce..0463e30 100644 --- a/doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc +++ b/doc/salome/gui/NETGENPLUGIN/input/additional_hypo.doc @@ -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. -
  • Quadrangle Preference - This additional hypothesis can be used together with Netgen 2D algorithm. It allows Netgen 2D to build quad-dominant meshes.
    • +
    For more detailed description of the described above hypothesis please refer SALOME Mesh User's Guide. diff --git a/doc/salome/gui/NETGENPLUGIN/input/index.doc b/doc/salome/gui/NETGENPLUGIN/input/index.doc index dff87a6..f2d23d4 100644 --- a/doc/salome/gui/NETGENPLUGIN/input/index.doc +++ b/doc/salome/gui/NETGENPLUGIN/input/index.doc @@ -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 diff --git a/doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc b/doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc index cf9c245..fc69e0c 100644 --- a/doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc +++ b/doc/salome/gui/NETGENPLUGIN/input/netgen_2d_3d_hypo.doc @@ -42,8 +42,9 @@ size at a given point. This parameter is used only if Limit Size by then size of mesh segments and mesh faces on curved edges and surfaces is defined using value of Nb Segs per Radius parameter, and number of segments on straight edges is defined by values of -Nb. Segs per Edge parameter. If this box is not checked in, -then size of elements is defined by three parameters only: +Nb. Segs per Edge parameter. (Growth rate is also taken +into account.) If this box is not checked in, then size of elements is +defined by three parameters only: Max Size, Min Size and Growth rate. - Allow Quadrangles - if this box is checked in, the mesher tries to generate quadrangle 2D mesh. Triangle elements are created diff --git a/resources/NETGENPlugin.xml b/resources/NETGENPlugin.xml index 3def5e3..bfda235 100644 --- a/resources/NETGENPlugin.xml +++ b/resources/NETGENPlugin.xml @@ -40,7 +40,8 @@ dim="3"> - SetLocalSizeOnShape + SetLocalSizeOnShape, + UnsetLocalSizeOnEntry @@ -50,7 +51,8 @@ dim="2"> - SetLocalSizeOnShape + SetLocalSizeOnShape, + UnsetLocalSizeOnEntry @@ -60,7 +62,8 @@ dim="3"> - SetLocalSizeOnShape + SetLocalSizeOnShape, + UnsetLocalSizeOnEntry @@ -70,7 +73,8 @@ dim="2"> - SetLocalSizeOnShape + SetLocalSizeOnShape, + UnsetLocalSizeOnEntry diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx index d09a15a..cf9853c 100644 --- a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx @@ -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 ; ilength() ; 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; diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx index b3e0b03..300c4cd 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx @@ -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) diff --git a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx index 2da2e82..63ac277 100644 --- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx +++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx @@ -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 << "\")"; } //=============================================================================