From a1f5d9d680e3668328093518ce59b7ebfa71a25e Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 8 Sep 2014 19:14:03 +0400 Subject: [PATCH] COTECH: Update names of DISTENE products BLSURF -> MG-CADSurf GHS3D -> MG-Tetra Hexotic -> MG-Hexa and GHS3DPRL -> MG-Tetra Parallel --- .../gui/BLSURFPLUGIN/input/blsurf_hypo.doc | 44 ++++++------------- .../input/blsurfplugin_python_interface.doc | 5 ++- doc/salome/gui/BLSURFPLUGIN/input/index.doc | 6 +-- resources/BLSURFPlugin.xml | 12 ++--- src/BLSURFPlugin/BLSURFPluginBuilder.py | 5 ++- src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx | 2 +- src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx | 2 +- src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx | 2 +- src/BLSURFPlugin/BLSURFPlugin_i.cxx | 6 ++- src/GUI/BLSURFPluginGUI.cxx | 3 +- src/GUI/BLSURFPlugin_images.ts | 8 ++-- 11 files changed, 41 insertions(+), 54 deletions(-) diff --git a/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc b/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc index a4e77ad..6e3b94c 100644 --- a/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc +++ b/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc @@ -1,6 +1,7 @@ /*! -\page blsurf_hypo_page BLSURF Parameters hypothesis +\page blsurf_hypo_page MG-CADSurf Parameters hypothesis (former BLSURF +Parameters) \anchor blsurf_top @@ -10,7 +11,7 @@ \image html blsurf_parameters.png -- Name - allows defining the name of the hypothesis (BLSURF +- Name - allows defining the name of the hypothesis (MG-CADSurf Parameters_n by default). - Physical Mesh - can be set to None, Global size @@ -98,13 +99,13 @@ MeshGems-CADSurf and MeshGems-PreCAD [0-100]. - ExportGMF - saves the computed mesh into a GMF file (.mesh or .meshb). -- Add option - provides the choice of multiple PreCAD and BLSURF +- Add option - provides the choice of multiple PreCAD and MG-CADSurf advanced options, which appear, if selected, in a table where it is possible to input the value of the option and edit it later. - Clear option - removes the option selected in the table. -The following BLSURF options are commonly usable: +The following MG-CADSurf options are commonly usable: - \b frontal (integer) @@ -297,7 +298,7 @@ not with an attractor size map described above. prescribed by the attractor function. - Else the growing is only controled by the standard arguments of - BLSURF (gradation ...). + MG-CADSurf (gradation ...). \image html blsurf_const_size_near_shape2.png "Example of size map with constant size option, the size is kept constant on the left side of the surface until a certain distance" @@ -306,7 +307,7 @@ attractors are defined or the "constant size" option is used because a map of distances has to be built on the whole surface for each face where such a hypothesis has been defined. -\sa Sample TUI Script of the \ref tui_blsurf "creation of a BLSurf hypothesis", including size map. +\sa Sample TUI Script of the \ref tui_blsurf "creation of a MG-CADSurf hypothesis", including size map. \ref blsurf_local_size "Back to \"Local size\""\n \ref blsurf_top "Back to top" @@ -334,7 +335,7 @@ shape. The distance is the geodesic distance (i.e. calculated by following the s \image html blsurf_parameters_enforced_vertices.png -It is possible to define some enforced vertices to BLSurf algorithm. +It is possible to define some enforced vertices to MG-CADSurf algorithm. An enforced vertex is defined on a Face or a Compound by - selecting an existing Vertex or Compound, @@ -353,7 +354,7 @@ The enforced vertex is the projection of a point defined by its All the internal vertices of the faces can be considered as enforced vertices if the corresponding checkbox is checked. A group can optionnaly be defined on those enforced vertices. -\sa Sample TUI Script of the \ref tui_blsurf "creation of a BLSurf hypothesis", including enforced vertices. +\sa Sample TUI Script of the \ref tui_blsurf "creation of a MG-CADSurf hypothesis", including enforced vertices. \ref blsurf_top "Back to top" @@ -365,7 +366,7 @@ A group can optionnaly be defined on those enforced vertices. Periodicity is used to have the same discretization on two faces (in 3D) or two edges (in 2D). This is useful for instance for a Representative Volume Element so that the translated meshes share the same nodes on the common faces. -In GUI, periodicity association uses PreCAD (optional BLSURF add-on). Be sure to have a PreCAD license to be able to use it. Otherwise, use \ref periodicity_tui_basic_api_usage "the basic API in TUI" or the \ref periodicity_tui_advanced_api_usage "the advanced API in TUI". +In GUI, periodicity association uses PreCAD (optional MG-CADSurf add-on). Be sure to have a PreCAD license to be able to use it. Otherwise, use \ref periodicity_tui_basic_api_usage "the basic API in TUI" or the \ref periodicity_tui_advanced_api_usage "the advanced API in TUI". \image html blsurf_periodicity_translation.png "Two periodic faces (translation)" @@ -394,7 +395,7 @@ The two methods to define periodicity with PreCAD are: List of source and target vertices to define a transformation are optional. -\sa Sample TUI Script of the definition of BLSurf periodicity \ref tui_blsurf_periodicity_preCAD "using preCAD". +\sa Sample TUI Script of the definition of MG-CADSurf periodicity \ref tui_blsurf_periodicity_preCAD "using preCAD". \subsection periodicity_tui_basic_api_usage TUI Basic API usage @@ -406,7 +407,7 @@ The methods are: - BLSURFPluginBuilder.BLSURF_Algorithm.AddEdgePeriodicityWithoutFaces - BLSURFPluginBuilder.BLSURF_Algorithm.AddVertexPeriodicity -Sample TUI Script of the definition of BLSurf periodicity \ref tui_blsurf_periodicity_basic "using basic API (without preCAD)". +Sample TUI Script of the definition of MG-CADSurf periodicity \ref tui_blsurf_periodicity_basic "using basic API (without preCAD)". \subsection periodicity_tui_advanced_api_usage TUI Advanced API usage @@ -415,27 +416,8 @@ To ease the periodicity description, the basic API methods can be called through - BLSURFPluginBuilder.BLSURF_Algorithm.AddAdvancedFacesPeriodicity (in 3D) - BLSURFPluginBuilder.BLSURF_Algorithm.AddAdvancedEdgesPeriodicity (in 2D) -Sample TUI Script of the definition of BLSurf periodicity \ref tui_blsurf_periodicity_advanced "using advanced API (without preCAD)". +Sample TUI Script of the definition of MG-CADSurf periodicity \ref tui_blsurf_periodicity_advanced "using advanced API (without preCAD)". \ref blsurf_top "Back to top" -\section blsurf_limitations Limitations - -Currently BLSURF plugin has the following limitations. - -- BLSURF algorithm cannot be used as a local algorithm (on -sub-meshes) or as a provider of a low-level -mesh for some 3D algorithms, because the BLSURF mesher (and -consequently plugin) does not provide the information on node -parameters on edges (U) and faces (U,V). For example the -following combinations of algorithms are impossible: - - - global MEFISTO or Quadrangle(mapping) + local BLSURF; - - - BLSURF + Projection 2D from faces meshed by BLSURF; - - - local BLSURF + Extrusion 3D; - -\ref blsurf_top "Back to top" - */ diff --git a/doc/salome/gui/BLSURFPLUGIN/input/blsurfplugin_python_interface.doc b/doc/salome/gui/BLSURFPLUGIN/input/blsurfplugin_python_interface.doc index f09654f..38698de 100644 --- a/doc/salome/gui/BLSURFPLUGIN/input/blsurfplugin_python_interface.doc +++ b/doc/salome/gui/BLSURFPLUGIN/input/blsurfplugin_python_interface.doc @@ -10,10 +10,11 @@ Below you can see an example of usage of the BLSURFPluginBuilder Python API for \anchor tui_blsurf -\section blsurf_construct_mesh Construction of Mesh using BLSurf algorithm +\section blsurf_construct_mesh Construction of Mesh using MG-CADSurf +(former BLSURF) algorithm \anchor example_BLSURFPlugin -

Example of mesh generation with BLSurf algorithm:

+

Example of mesh generation with MG-CADSurf algorithm:

\tui_script{blsurfdemo.py} \anchor tui_blsurf_periodicity_preCAD diff --git a/doc/salome/gui/BLSURFPLUGIN/input/index.doc b/doc/salome/gui/BLSURFPLUGIN/input/index.doc index 83ea929..2ab9eec 100644 --- a/doc/salome/gui/BLSURFPLUGIN/input/index.doc +++ b/doc/salome/gui/BLSURFPLUGIN/input/index.doc @@ -5,16 +5,16 @@ \b BLSURFPLUGIN SALOME module represents a meshing plug-in that can be used within the SALOME Mesh module for generation of 2D mesh. -\note BLSURFPLUGIN plugin uses DISTENE BLSurf commercial meshing +\note BLSURFPLUGIN plugin uses DISTENE MG-CADSurf commercial meshing software and requires a license at the run time (to work within the Mesh module). To obtain a licence, visit http://www.distene.com/en/corp/eval-distene.html \b BLSURFPLUGIN plugin is destined for: - Meshing of the 2D geometric entities. -To manage parameters of the BLSURFPLUGIN, use \subpage blsurf_hypo_page. +To manage parameters of the MG-CADSurf mesher, use \subpage blsurf_hypo_page. -Also, all BLSURFPLUGIN functionalities are accessible via the +Also, all MG-CADSurf functionalities are accessible via the \subpage blsurfplugin_python_interface_page "BLSURFPLUGIN Python interface". */ diff --git a/resources/BLSURFPlugin.xml b/resources/BLSURFPlugin.xml index 05dbb18..e2da767 100644 --- a/resources/BLSURFPlugin.xml +++ b/resources/BLSURFPlugin.xml @@ -31,8 +31,8 @@ server-lib="BLSURFEngine" gui-lib="BLSURFPluginGUI"> - @@ -65,15 +65,15 @@ - - BLSURF=Triangle(algo=smeshBuilder.BLSURF) + BLSURF=Triangle(algo=smeshBuilder.MG_CADSurf) BLSURF_Parameters=Parameters() ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges()) diff --git a/src/BLSURFPlugin/BLSURFPluginBuilder.py b/src/BLSURFPlugin/BLSURFPluginBuilder.py index 299e5b6..b60ce41 100644 --- a/src/BLSURFPlugin/BLSURFPluginBuilder.py +++ b/src/BLSURFPlugin/BLSURFPluginBuilder.py @@ -45,7 +45,8 @@ except ImportError: #---------------------------- ## Algorithm type: BLSurf triangle 2D algorithm, see BLSURF_Algorithm -BLSURF = "BLSURF" +BLSURF = "MG_CADSurf" +MG_CADSurf = "MG_CADSurf" #---------------------- # Algorithms @@ -430,7 +431,7 @@ class BLSURF_Algorithm(Mesh_Algorithm): # @return hypothesis object def Parameters(self): if not self.params: - self.params = self.Hypothesis("BLSURF_Parameters", [], + self.params = self.Hypothesis("MG_CADSurf_Parameters", [], "libBLSURFEngine.so", UseExisting=0) pass return self.params diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx index 3487b7c..7624e36 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx @@ -241,7 +241,7 @@ BLSURFPlugin_BLSURF::BLSURFPlugin_BLSURF(int hypId, int studyId, { MESSAGE("BLSURFPlugin_BLSURF::BLSURFPlugin_BLSURF"); - _name = "BLSURF"; + _name = "MG_CADSurf";//"BLSURF"; _shapeType = (1 << TopAbs_FACE); // 1 bit /shape type _compatibleHypothesis.push_back(BLSURFPlugin_Hypothesis::GetHypType()); _compatibleHypothesis.push_back(StdMeshers_ViscousLayers2D::GetHypType()); diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx index 2b55557..61ffc49 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx @@ -82,7 +82,7 @@ BLSURFPlugin_Hypothesis::BLSURFPlugin_Hypothesis(int hypId, int studyId, SMESH_G _preCadFacesPeriodicityVector(GetDefaultPreCadFacesPeriodicityVector()), _preCadEdgesPeriodicityVector(GetDefaultPreCadEdgesPeriodicityVector()) { - _name = "BLSURF_Parameters"; + _name = GetHypType(); _param_algo_dim = 2; // _GMFFileMode = false; // GMF ascii mode diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx index 0e10ac7..324e26e 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx +++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx @@ -64,7 +64,7 @@ public: GeometricalLocalSize }; - static const char* GetHypType() { return "BLSURF_Parameters"; } + static const char* GetHypType() { return "MG_CADSurf_Parameters"; } TopoDS_Shape entryToShape(std::string entry); diff --git a/src/BLSURFPlugin/BLSURFPlugin_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_i.cxx index 2b2463e..4e2aed2 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_i.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_i.cxx @@ -59,10 +59,12 @@ extern "C" GenericHypothesisCreator_i* aCreator = 0; // Algorithms - if (strcmp(aHypName, "BLSURF") == 0) + if (strcmp(aHypName, "BLSURF") == 0 || + strcmp(aHypName, "MG_CADSurf") == 0 ) aCreator = new BLSURFPlugin_Creator_i; // Hypotheses - else if (strcmp(aHypName, "BLSURF_Parameters") == 0) + else if (strcmp(aHypName, "BLSURF_Parameters") == 0 || + strcmp(aHypName, "MG_CADSurf_Parameters") == 0 ) aCreator = new BLSURFPlugin_Creator_i; else ; diff --git a/src/GUI/BLSURFPluginGUI.cxx b/src/GUI/BLSURFPluginGUI.cxx index c47db3e..ce97e99 100755 --- a/src/GUI/BLSURFPluginGUI.cxx +++ b/src/GUI/BLSURFPluginGUI.cxx @@ -43,7 +43,8 @@ extern "C" SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator( const QString& aHypType ) { SMESHGUI_GenericHypothesisCreator* aCreator = NULL; - if( aHypType=="BLSURF_Parameters" ) + if( aHypType=="BLSURF_Parameters" || + aHypType=="MG_CADSurf_Parameters") aCreator = new BLSURFPluginGUI_HypothesisCreator( aHypType ); return aCreator; } diff --git a/src/GUI/BLSURFPlugin_images.ts b/src/GUI/BLSURFPlugin_images.ts index 62c3f59..3b34d52 100644 --- a/src/GUI/BLSURFPlugin_images.ts +++ b/src/GUI/BLSURFPlugin_images.ts @@ -4,19 +4,19 @@ @default - BLSURF_ICON_SELECT + MG_CADSurf_ICON_SELECT mesh_select_BLSURF.png - ICON_DLG_BLSURF_PARAMETERS + ICON_DLG_MG_CADSurf_PARAMETERS mesh_hypo_BLSURF.png - ICON_SMESH_TREE_ALGO_BLSURF + ICON_SMESH_TREE_ALGO_MG_CADSurf mesh_tree_algo_BLSURF.png - ICON_SMESH_TREE_HYPO_BLSURF_Parameters + ICON_SMESH_TREE_HYPO_MG_CADSurf_Parameters mesh_tree_hypo_BLSURF.png -- 2.39.2