From: Christian Van Wambeke Date: Fri, 11 Jul 2014 14:27:04 +0000 (+0200) Subject: add mg-tetra_hpc.bash X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=582458817d41988ba47659e4da57e3ae86cb2e96;p=plugins%2Fghs3dprlplugin.git add mg-tetra_hpc.bash --- diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 35de229..35d3ac3 100755 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -22,7 +22,7 @@ SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) # scripts / static / binaries # temporary standalone project version of mg-tetra_hpc.exe SET(_bin_SCRIPTS - mg-tetra_hpc.exe + mg-tetra_hpc.bash mg-tetra_hpc.exe_Linux_64_avril2014 meshgems_mpi.c meshgems_mpi.h diff --git a/bin/mg-tetra_hpc.bash b/bin/mg-tetra_hpc.bash new file mode 100755 index 0000000..9470a30 --- /dev/null +++ b/bin/mg-tetra_hpc.bash @@ -0,0 +1,57 @@ +#!/bin/bash + +#bash script mg-tetra_hpc.bash +#we have renamed binary executable mg-tetra_hpc.exe V1.3.0 as mg-tetra_hpc.exe_Linux_64_avril2014 +#to assume call of other beta-versions of distene mg-tetra_hpc.exe code in standalone plugin GHS3DPRLPLUGIN sources +#and also assume licence file set to overriding licence file of other distene products ( HEXOTIC, GHS3D, etc... ) +#this script is used for only one call of mg-tetra_hpc.bash from salome plugin GHS3DPRLPLUGIN + +#echo "mg-tetra_hpc.bash initial parameters are:" $1 $2 $3 $4 +echo "mg-tetra_hpc.bash initial parameters are:" $* +#$0 is ignored + +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 + +#we need to compile for mg-tetra_hpc.exe +if [ $HOST == "hpcspot" ] + then + #env openmpi centos6.5 hpcspot.com + 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 + #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 DISTENE_LICENSE_FILE="Use global envvar: DLIM8VAR" + export DLIM8VAR="dlim8 1:1:29030@132.166.151.49/84c419b8::87af196ab2a936ab31363624539bff8096fbe1f3c83028c8f6b399b0a904ef85" +fi + +cd $COMPILDIR +if [ ! -f libmeshgems_mpi.so ] +then + echo "libmeshgems_mpi.sols does not exist, I compile it..." + mpicc meshgems_mpi.c -shared -fPIC -o libmeshgems_mpi.so + ls -alt lib* +fi +cd $CURRENTDIR + +echo "mg-tetra_hpc.bash assume licence file set:" +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} + + diff --git a/bin/mg-tetra_hpc.exe b/bin/mg-tetra_hpc.exe deleted file mode 100755 index 6276ab3..0000000 --- a/bin/mg-tetra_hpc.exe +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -#bash script mg-tetra_hpc.exe -#we have renamed binary executable mg-tetra_hpc.exe V1.3.0 as mg-tetra_hpc.exe_Linux_64_avril2014 -#to assume call of other beta-versions of distene mg-tetra_hpc.exe code in standalone plugin GHS3DPRLPLUGIN 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-tetra_hpc.exe from salome plugin GHS3DPRLPLUGIN - -#echo "mg-tetra_hpc.exe initial parameters are:" $1 $2 $3 $4 -echo "mg-tetra_hpc.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" - -CURRENTDIR=`pwd` -COMPILDIR=`dirname $0` -echo COMPILDIR $COMPILDIR -echo CURRENTDIR $CURRENTDIR -#we need to compile for mg-tetra_hpc.exe -#env openmpi centos6.4 -export WD2=/usr/lib64/openmpi -export PATH=.:$WD2/bin:${PATH} -export LD_LIBRARY_PATH=.:$WD2/lib:${LD_LIBRARY_PATH} -cd $COMPILDIR -mpicc meshgems_mpi.c -shared -fPIC -o libmeshgems_mpi.so -cd $CURRENTDIR - -echo "mg-tetra_hpc.exe assume licence file set:" -env | grep DLIM - -#mg-tetra_hpc.exe_Linux_64_avril2014 --help -ldd `which mg-tetra_hpc.exe_Linux_64_avril2014` -mg-tetra_hpc.exe_Linux_64_avril2014 $* - - diff --git a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx index 96d723b..5ee4fe4 100755 --- a/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx +++ b/src/GHS3DPRLPlugin/GHS3DPRLPlugin_GHS3DPRL.cxx @@ -582,7 +582,7 @@ bool GHS3DPRLPlugin_GHS3DPRL::Compute(SMESH_Mesh& theMesh, Ok = false; //but it is not a problem but if true my message is overwritten fclose(aResultFile); cout<<"GHS3DPRL OK output master file "<