From 92b0965b5617eee32b24ef0994abd0e5eb3293b2 Mon Sep 17 00:00:00 2001 From: eap Date: Tue, 27 Oct 2015 19:22:09 +0300 Subject: [PATCH] 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 --- .../images/netgen3d_local_size.png | Bin 16229 -> 18500 bytes .../NETGENPLUGIN/input/additional_hypo.doc | 2 +- doc/salome/gui/NETGENPLUGIN/input/index.doc | 4 ++-- .../NETGENPLUGIN/input/netgen_2d_3d_hypo.doc | 5 +++-- resources/NETGENPlugin.xml | 12 ++++++++---- src/GUI/NETGENPluginGUI_HypothesisCreator.cxx | 6 +++--- src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx | 10 +++++----- .../NETGENPlugin_Hypothesis_i.cxx | 2 +- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/doc/salome/gui/NETGENPLUGIN/images/netgen3d_local_size.png b/doc/salome/gui/NETGENPLUGIN/images/netgen3d_local_size.png index f7bcd18b9d4d3f0855e52a03e5c8d2357e303c4f..b93e4b0d070039e77972fe2dd6b2a6b8e07f423e 100644 GIT binary patch literal 18500 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 TiVZf?Kp^i$r9}$h+Ft($xlKJZ literal 16229 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 V7x=OO9-l{3kX4o`l{WhD{{W_oml*&6 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 << "\")"; } //============================================================================= -- 2.39.2