2022-05-04 18:26:50 +05:30
|
|
|
---
|
|
|
|
|
+++
|
2022-09-29 18:46:58 +05:30
|
|
|
@@ -63,10 +63,10 @@
|
2022-05-04 18:26:50 +05:30
|
|
|
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
|
|
|
|
|
slv="-iam sfm"
|
|
|
|
|
fi
|
|
|
|
|
-if [ "$slv" == "marc" ]; then
|
|
|
|
|
+if [ "$slv" = "marc" ]; then
|
|
|
|
|
slv=""
|
|
|
|
|
fi
|
|
|
|
|
-if [ "$slv" == "datfit" ]; then
|
|
|
|
|
+if [ "$slv" = "datfit" ]; then
|
|
|
|
|
slv="-iam datfit"
|
|
|
|
|
fi
|
|
|
|
|
|
2022-09-29 18:46:58 +05:30
|
|
|
@@ -91,6 +91,7 @@
|
2022-05-04 18:26:50 +05:30
|
|
|
srcfile="-u $srcfile -save y"
|
|
|
|
|
;;
|
|
|
|
|
runsaved)
|
|
|
|
|
+ srcfile=${srcfile%.*}".marc"
|
|
|
|
|
srcfile="-prog $srcfile"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
2022-09-29 18:46:58 +05:30
|
|
|
@@ -189,12 +190,12 @@
|
2022-05-04 18:26:50 +05:30
|
|
|
unset PYTHONPATH
|
|
|
|
|
|
|
|
|
|
if [ "$doe_first" = "-" ]; then # submit of regular Marc job
|
|
|
|
|
- "${DIR}/tools/run_marc" $slv -j $job -v n -b y $nprocds $nprocd \
|
|
|
|
|
+ "${DIR}/tools/run_damask_mp" $slv -j $job -v n -b y $nprocds $nprocd \
|
|
|
|
|
$srcfile $restart $postfile $viewfactorsfile $hostfile \
|
|
|
|
|
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \
|
|
|
|
|
$assem_recov_nthread $nthread $nsolver $mode $gpu > /dev/null 2>&1
|
|
|
|
|
else # submit of a DoE Marc job
|
|
|
|
|
- "${DIR}/tools/run_marc" $slv -j $job -v n -b n $nprocds $nprocd \
|
|
|
|
|
+ "${DIR}/tools/run_damask_mp" $slv -j $job -v n -b n $nprocds $nprocd \
|
|
|
|
|
$srcfile $restart $postfile $viewfactorsfile $hostfile \
|
|
|
|
|
$compat $copy_datfile $copy_postfile $scr_dir $dcoup \
|
|
|
|
|
$assem_recov_nthread $nthread $nsolver $mode $gpu
|
