From 2ef49676937b1469bf69564c59449c194de7005b Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 30 Mar 2016 17:08:01 +0300 Subject: [PATCH] 23261: [CEA 1695] Patch for updating GHS3DPRLPLUGIN --- bin/mg-tetra_hpc.bash | 33 ++++++++++--------- .../GHS3DPRLPlugin_GHS3DPRL.cxx | 10 +++--- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/bin/mg-tetra_hpc.bash b/bin/mg-tetra_hpc.bash index 4a2cd6c..786a422 100755 --- a/bin/mg-tetra_hpc.bash +++ b/bin/mg-tetra_hpc.bash @@ -14,30 +14,30 @@ CURRENTDIR=`pwd` COMPILDIR=`dirname $0` echo "COMPILDIR" $COMPILDIR echo "CURRENTDIR" $CURRENTDIR -if [[ $HOSTNAME == *hpcspot* ]] - then - HOST="hpcspot" - else - HOST="STANDART_CentOs6" #CentOs6 default -fi -echo "HOST" $HOST +#if [[ $HOSTNAME == *hpcspot* ]] +# then +# HOST="hpcspot" +# else +# HOST="STANDART_CentOs6" #CentOs6 default +#fi +#echo "HOST" $HOST #we need to compile for mg-tetra_hpc.exe #DISTENE_LICENSE_FILE is for example, have to be set -if [ $HOST == "hpcspot" ] - then +#if [ $HOST == "hpcspot" ] +# then #env openmpi centos6.5 hpcspot.com - source /apps/mpi/openmpi-1.6-x86_64-gcc48/env.sh +# source /apps/mpi/openmpi-1.6-x86_64-gcc48/env.sh #export DISTENE_LICENSE_FILE="Use global envvar: DLIM8VAR" #export DLIM8VAR="dlim8 1:1:29030@10.27.51.1/002590c96d98::8fbdc02cde090ca0369ad028e839065b97709e3c33e640eb6a3c2c7e40fe3985" - else +# else #env openmpi centos6.5 standart lgls is206786 - export WD2=/usr/lib64/openmpi - export PATH=$WD2/bin:${PATH} - export LD_LIBRARY_PATH=$COMPILDIR:$WD2/lib:${LD_LIBRARY_PATH} +# export WD2=/usr/lib64/openmpi +# export PATH=$WD2/bin:${PATH} +# export LD_LIBRARY_PATH=$COMPILDIR:$WD2/lib:${LD_LIBRARY_PATH} #export DISTENE_LICENSE_FILE="Use global envvar: DLIM8VAR" #export DLIM8VAR="dlim8 1:1:29030@132.166.151.49/84c419b8::87af196ab2a936ab31363624539bff8096fbe1f3c83028c8f6b399b0a904ef85" -fi +#fi cd $COMPILDIR if [ ! -f libmeshgems_mpi.so ] @@ -53,6 +53,7 @@ env | grep DLIM #mg-tetra_hpc.exe_Linux_64_avril2014 --help #ldd `which mg-tetra_hpc.exe_Linux_64_avril2014` -mpirun -n $2 mg-tetra_hpc.exe_Linux_64_avril2014 ${@:3:30} +#mpirun -n $2 mg-tetra_hpc.exe_Linux_64_avril2014 ${@:3:30} +mpirun -n $2 $MESHGEMS_ROOT_DIR/bin/run_mg-tetra_hpc.sh ${@:3:30} diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx index f716df2..d08bc1f 100755 --- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx +++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx @@ -520,11 +520,11 @@ bool GHS3DPRLPlugin_GHS3DPRL::Compute(SMESH_Mesh& theMesh, " --launchtetra=yes"; //no more meshhole option //if (_ToMeshHoles) run_GHS3DPRL += " --meshholes=yes"; else run_GHS3DPRL += " --meshholes=no"; - if (_ToMergeSubdomains) run_GHS3DPRL += " --merge_subdomains=yes"; else run_GHS3DPRL += " --merge_subdomains=no"; - if (_ToTagSubdomains) run_GHS3DPRL += " --tag_subdomains=yes"; else run_GHS3DPRL += " --tag_subdomains=no"; - if (_ToOutputInterfaces) run_GHS3DPRL += " --output_interfaces=yes"; else run_GHS3DPRL += " --output_interfaces=no"; - if (_ToDiscardSubdomains) run_GHS3DPRL += " --discard_subdomains=yes"; else run_GHS3DPRL += " --discard_subdomains=no"; - if (_Background) run_GHS3DPRL += " --background=yes"; else run_GHS3DPRL += " --background=no"; + //if (_ToMergeSubdomains) run_GHS3DPRL += " --merge_subdomains=yes"; else run_GHS3DPRL += " --merge_subdomains=no"; + //if (_ToTagSubdomains) run_GHS3DPRL += " --tag_subdomains=yes"; else run_GHS3DPRL += " --tag_subdomains=no"; + //if (_ToOutputInterfaces) run_GHS3DPRL += " --output_interfaces=yes"; else run_GHS3DPRL += " --output_interfaces=no"; + //if (_ToDiscardSubdomains) run_GHS3DPRL += " --discard_subdomains=yes"; else run_GHS3DPRL += " --discard_subdomains=no"; + //if (_Background) run_GHS3DPRL += " --background=yes"; else run_GHS3DPRL += " --background=no"; run_nokeep_files = rm +GHS3DPRL_In + "* " + path + "tetrahpc.log"; system( run_nokeep_files.ToCString() ); //clean files run_nokeep_files = rm + GHS3DPRL_In + "* "; -- 2.30.2