Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct calculation of DoF for the "multi" constraints
[modules/shaper.git]
/
salome_run.sh
diff --git
a/salome_run.sh
b/salome_run.sh
index ce82805fa075cd3a18179f9322f5be290bfca2b7..8feb27cac881deaa6b8c23b1fcdf268edc6aeb81 100755
(executable)
--- a/
salome_run.sh
+++ b/
salome_run.sh
@@
-3,6
+3,8
@@
source env.sh
source ${TOOLS_DIR}/env_salome.sh
source env.sh
source ${TOOLS_DIR}/env_salome.sh
+${TOOLS_DIR}/solver.sh "$@"
+
# kill processes of previous SALOME run
if [ -f .salomeport ]; then
SALOME_PORT=$(cat .salomeport)
# kill processes of previous SALOME run
if [ -f .salomeport ]; then
SALOME_PORT=$(cat .salomeport)
@@
-12,7
+14,9
@@
if [ -f .salomeport ]; then
fi
SALOME_ARGS=""
fi
SALOME_ARGS=""
-SALOME_ARGS="${SALOME_ARGS} -r ./test.squish/shared/testdata/SalomeApp.xml"
+if [[ "${SALOME_SQUISH_PREFS:-FALSE}" == "TRUE" ]]; then
+ SALOME_ARGS="${SALOME_ARGS} -r ${SOURCES_DIR}/test.squish/shared/testdata/SalomeApp.xml"
+fi
SALOME_ARGS="${SALOME_ARGS} --ns-port-log=$(pwd)/.salomeport"
${KERNEL_ROOT_DIR}/bin/salome/runSalome.py ${SALOME_ARGS} >log_runSalome 2>err_runSalome
SALOME_ARGS="${SALOME_ARGS} --ns-port-log=$(pwd)/.salomeport"
${KERNEL_ROOT_DIR}/bin/salome/runSalome.py ${SALOME_ARGS} >log_runSalome 2>err_runSalome