From: Christian Van Wambeke Date: Fri, 4 Jul 2014 13:47:09 +0000 (+0200) Subject: add bin/mg-hybrid.exe_Linux_64_avril2014 X-Git-Tag: CASSIS_V1.0~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fad04d598da0bc0ac8acfcf49c04a5961491baa6;p=plugins%2Fhybridplugin.git add bin/mg-hybrid.exe_Linux_64_avril2014 --- diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index d220062..a3e5fd4 100755 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -18,3 +18,16 @@ # SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) + + +# scripts / static / binaries +# temporary standalone project version of mg-hybrid.exe +SET(_bin_SCRIPTS + essai.bash + mg-hybrid.exe + mg-hybrid.exe_Linux_64_avril2014 +) + + +# --- rules --- +SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_BINS}) diff --git a/bin/essai.bash b/bin/essai.bash new file mode 100755 index 0000000..b2e8e59 --- /dev/null +++ b/bin/essai.bash @@ -0,0 +1,3 @@ +#!/bin/bash + +echo "hello essai" diff --git a/bin/mg-hybrid.exe b/bin/mg-hybrid.exe new file mode 100755 index 0000000..596ecc3 --- /dev/null +++ b/bin/mg-hybrid.exe @@ -0,0 +1,21 @@ +#!/bin/bash + +#bash script mg-hybrid.exe +#we have renamed binary executable mg-hybrid.exe V1.3.0 as mg-hybrid.exe_Linux_64_avril2014 +#to assume call of other beta-versions of distene mg-hybrid.exe code in standalone plugin HYBRIDPLUGIN sources +#and also assume licence file set to overriding licence file of other distene products ( HEXOTIC, GHS3D, etc... ) +#all that for for only one call of mg-hybrid.exe from salome plugin HYBRIDPLUGIN + +#echo "mg-hybrid.exe initial parameters are:" $1 $2 $3 $4 +echo "mg-hybrid.exe initial parameters are:" $* +#$0 is ignored + +export DISTENE_LICENSE_FILE="Use global envvar: DLIM8VAR" +export DLIM8VAR="dlim8 1:1:29030@132.166.151.49/84c419b8::87af196ab2a936ab31363624539bff8096fbe1f3c83028c8f6b399b0a904ef85" + +echo "mg-hybrid.exe assume licence file set:" +env | grep DLIM + +#mg-hybrid.exe_Linux_64_avril2014 --help +mg-hybrid.exe_Linux_64_avril2014 $* + diff --git a/bin/mg-hybrid.exe_Linux_64_avril2014 b/bin/mg-hybrid.exe_Linux_64_avril2014 new file mode 100755 index 0000000..4dc2b53 Binary files /dev/null and b/bin/mg-hybrid.exe_Linux_64_avril2014 differ diff --git a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx index a0ab956..f905e21 100644 --- a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx @@ -405,12 +405,16 @@ QFrame* HYBRIDPluginGUI_HypothesisCreator::buildFrame() types << tr( "LEVEL_NONE" ) << tr( "LEVEL_LIGHT" ) << tr( "LEVEL_MEDIUM" ) << tr( "LEVEL_STANDARDPLUS" ) << tr( "LEVEL_STRONG" ); myOptimizationLevelCombo->addItems( types ); - aStdLayout->addWidget( new QLabel( tr( "HYBRID_BOUNDARY_LAYERS_GROWTH" ), myStdGroup ), row, 0, 1, 1 ); + QLabel* aLabel = new QLabel( tr( "HYBRID_BOUNDARY_LAYERS_GROWTH" ), myStdGroup ); + aLabel->setToolTip(tr( "HYBRID_BOUNDARY_LAYERS_HELP" )); + aStdLayout->addWidget( aLabel, row, 0, 1, 1 ); myBoundaryLayersGrowthCombo = new QComboBox( myStdGroup ); + myBoundaryLayersGrowthCombo->setToolTip(tr( "HYBRID_BOUNDARY_LAYERS_HELP" )); + aStdLayout->addWidget( myBoundaryLayersGrowthCombo, row++, 1, 1, 1 ); QStringList typesBoundaryLayersGrowth; - typesBoundaryLayersGrowth << tr( "HYBRID_LAYER_GROWTH_INWARD" ) << tr( "HYBRID_LAYER_GROWTH_OUTWARD" ); + typesBoundaryLayersGrowth << tr( "HYBRID_LAYER_GROWTH_UPWARD" ) << tr( "HYBRID_LAYER_GROWTH_DOWNWARD" ); myBoundaryLayersGrowthCombo->addItems( typesBoundaryLayersGrowth ); aStdLayout->addWidget( new QLabel( tr( "HYBRID_HeightFirstLayer" ), myStdGroup ), row, 0, 1, 1 ); diff --git a/src/GUI/HYBRIDPlugin_msg_en.ts b/src/GUI/HYBRIDPlugin_msg_en.ts index 520200a..32cff99 100644 --- a/src/GUI/HYBRIDPlugin_msg_en.ts +++ b/src/GUI/HYBRIDPlugin_msg_en.ts @@ -31,6 +31,13 @@ HYBRID_BOUNDARY_LAYERS_GROWTH Growth of boundary layers + + HYBRID_BOUNDARY_LAYERS_HELP + Pay attention: +due to random conventions of normals orientations of many mesher, +downward means inward and upward means outward ... +... or vice versa. + HYBRID_LAYER_GROWTH_INWARD Inward growth @@ -39,6 +46,14 @@ HYBRID_LAYER_GROWTH_OUTWARD Outward growth + + HYBRID_LAYER_GROWTH_UPWARD + Upward growth + + + HYBRID_LAYER_GROWTH_DOWNWARD + Downward growth + HYBRID_GENERATION_ELEMENT Element type for mesh in the remaining volume diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx index bcdcbc8..769bea3 100644 --- a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx +++ b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx @@ -3092,7 +3092,7 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, // cmd += TCollection_AsciiString(" --required_vertices ") + aGenericNameRequired; cmd += TCollection_AsciiString(" --out ") + aResultFileName; if ( !_logInStandardOutput ) - cmd += TCollection_AsciiString(" 1>" ) + aLogFileName; // dump into file + cmd += TCollection_AsciiString(" &>" ) + aLogFileName; // dump into file std::cout << std::endl; std::cout << "Hybrid execution with geometry..." << std::endl; @@ -3359,7 +3359,7 @@ bool HYBRIDPlugin_HYBRID::Compute(SMESH_Mesh& theMesh, // cmd += TCollection_AsciiString(" --required_vertices ") + aGenericNameRequired; cmd += TCollection_AsciiString(" --out ") + aResultFileName; if ( !_logInStandardOutput ) - cmd += TCollection_AsciiString(" 1>" ) + aLogFileName; // dump into file + cmd += TCollection_AsciiString(" &>" ) + aLogFileName; // dump into file std::cout << std::endl; std::cout << "Hybrid execution w/o geometry..." << std::endl;