223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'Marc-clean-patches' into 'development' 

Cleaned up the patches

See merge request damask/DAMASK!627
This commit is contained in:
Franz Roters 2022-10-07 11:46:05 +00:00
parent c453076ffa fd6b2c5e39
commit e5b2ac80e8
11 changed files with 140 additions and 802 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/MarcMentat/2022.1/Marc_tools/comp_damask_hmp.patch vendored
View File

@ -32,7 +32,7 @@
$LOAD ${program} $DIR/lib/main.o\ $LOAD ${program} $DIR/lib/main.o\
@@ -33,9 +42,13 @@ echo "program: $program" @@ -33,9 +42,13 @@
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
@ -46,4 +46,4 @@
/bin/rm $userobj /bin/rm $userobj
+ /bin/rm $DIRJOB/*.mod + /bin/rm $DIRJOB/*.mod
+ /bin/rm $DIRJOB/*.smod + /bin/rm $DIRJOB/*.smod
+ /bin/rm $DIRJOB/*_genmod.f90 + /bin/rm $DIRJOB/*_genmod.f90

4
install/MarcMentat/2022.1/Marc_tools/comp_damask_lmp.patch vendored
View File

@ -32,7 +32,7 @@
$LOAD ${program} $DIR/lib/main.o\ $LOAD ${program} $DIR/lib/main.o\
@@ -33,9 +42,13 @@ echo "program: $program" @@ -33,9 +42,13 @@
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
@ -46,4 +46,4 @@
/bin/rm $userobj /bin/rm $userobj
+ /bin/rm $DIRJOB/*.mod + /bin/rm $DIRJOB/*.mod
+ /bin/rm $DIRJOB/*.smod + /bin/rm $DIRJOB/*.smod
+ /bin/rm $DIRJOB/*_genmod.f90 + /bin/rm $DIRJOB/*_genmod.f90

4
install/MarcMentat/2022.1/Marc_tools/comp_damask_mp.patch vendored
View File

@ -32,7 +32,7 @@
$LOAD ${program} $DIR/lib/main.o\ $LOAD ${program} $DIR/lib/main.o\
@@ -33,9 +42,13 @@ echo "program: $program" @@ -33,9 +42,13 @@
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
@ -46,4 +46,4 @@
/bin/rm $userobj /bin/rm $userobj
+ /bin/rm $DIRJOB/*.mod + /bin/rm $DIRJOB/*.mod
+ /bin/rm $DIRJOB/*.smod + /bin/rm $DIRJOB/*.smod
+ /bin/rm $DIRJOB/*_genmod.f90 + /bin/rm $DIRJOB/*_genmod.f90

44
install/MarcMentat/2022.1/Marc_tools/include_linux64.patch vendored
View File

@ -1,6 +1,6 @@
--- ---
+++ +++
@@ -166,6 +166,11 @@ if test -n "$MSCCOSIM_HOME"; then @@ -166,6 +166,15 @@
MARC_COSIM_LIB="$MSCCOSIM_HOME/Cosim$MSCCOSIM_VERSION/Dcosim$MSCCOSIM_VERSION/lib" MARC_COSIM_LIB="$MSCCOSIM_HOME/Cosim$MSCCOSIM_VERSION/Dcosim$MSCCOSIM_VERSION/lib"
fi fi
@ -16,17 +16,7 @@
# AEM # AEM
if test "$MARCDLLOUTDIR" = ""; then if test "$MARCDLLOUTDIR" = ""; then
DLLOUTDIR="$MARC_LIB" DLLOUTDIR="$MARC_LIB"
@@ -477,8 +486,8 @@ if test "$MARC_INTEGER_SIZE" = "i4" ; then @@ -594,7 +603,7 @@
I8DEFINES=
I8CDEFINES=
else
- I8FFLAGS="-i8"
+ I8FFLAGS="-i8 -integer-size 64"
I8DEFINES="-DI64"
I8CDEFINES="-U_DOUBLE -D_SINGLE"
fi
@@ -594,7 +605,7 @@ then
PROFILE=" $PROFILE -pg" PROFILE=" $PROFILE -pg"
fi fi
@ -35,7 +25,7 @@
if test "$MTHREAD" = "OPENMP" if test "$MTHREAD" = "OPENMP"
then then
FORT_OPT=" $FORT_OPT -qopenmp" FORT_OPT=" $FORT_OPT -qopenmp"
@@ -607,7 +616,7 @@ else @@ -607,7 +616,7 @@
FORT_OPT=" $FORT_OPT -save -zero" FORT_OPT=" $FORT_OPT -save -zero"
fi fi
if test "$MARCHDF_HDF" = "HDF"; then if test "$MARCHDF_HDF" = "HDF"; then
@ -44,10 +34,10 @@
fi fi
FORTLOW="$FCOMP $FORT_OPT $PROFILE -O0 $I8FFLAGS -I$MARC_SOURCE/common \ FORTLOW="$FCOMP $FORT_OPT $PROFILE -O0 $I8FFLAGS -I$MARC_SOURCE/common \
@@ -621,6 +630,29 @@ FORTNA="$FCOMP $FORT_OPT -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \ @@ -621,6 +630,29 @@
# for compiling free form f90 files. high opt, integer(4) # for compiling free form f90 files. high opt, integer(4)
FORTF90="$FCOMP -c -O3" FORTF90="$FCOMP -c -O3"
+# determine DAMASK version +# determine DAMASK version
+if test -n "$DAMASK_USER"; then +if test -n "$DAMASK_USER"; then
+ DAMASKROOT=`dirname $DAMASK_USER`/.. + DAMASKROOT=`dirname $DAMASK_USER`/..
@ -74,30 +64,12 @@
if test "$MARCDEBUG" = "ON" if test "$MARCDEBUG" = "ON"
then then
FORTLOW="$FCOMP $FORT_OPT $PROFILE $I8FFLAGS -I$MARC_SOURCE/common \ FORTLOW="$FCOMP $FORT_OPT $PROFILE $I8FFLAGS -I$MARC_SOURCE/common \
@@ -778,7 +806,7 @@ SECLIBS="-L$MARC_LIB -llapi" @@ -778,7 +810,7 @@
SOLVERLIBS="${BCSSOLVERLIBS} ${VKISOLVERLIBS} ${CASISOLVERLIBS} ${MF2SOLVERLIBS} \ SOLVERLIBS="${BCSSOLVERLIBS} ${VKISOLVERLIBS} ${CASISOLVERLIBS} ${MF2SOLVERLIBS} \
-L$MARC_MKL \ -L$MARC_MKL \
- $MARC_LIB/blas_src.a ${ACSI_LIB}/ACSI_MarcLib.a $KDTREE2_LIB/libkdtree2.a $MARC_LIB/libtetmeshinterface.a $MARC_LIB/libcaefatigueinterface.a -L$MARC_LIB -lmkl_blacs_intelmpi_ilp64 -lmkl_scalapack_ilp64 -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core -liomp5 -ltetmesh -lmeshgems -lmg-tetra -lmeshgems_stubs $HDF_LIBS $SOLVER2LIBS" - $MARC_LIB/blas_src.a ${ACSI_LIB}/ACSI_MarcLib.a $KDTREE2_LIB/libkdtree2.a $MARC_LIB/libtetmeshinterface.a $MARC_LIB/libcaefatigueinterface.a -L$MARC_LIB -lmkl_blacs_intelmpi_ilp64 -lmkl_scalapack_ilp64 -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core -liomp5 -ltetmesh -lmeshgems -lmg-tetra -lmeshgems_stubs $HDF_LIBS $SOLVER2LIBS"
+ $MARC_LIB/blas_src.a ${ACSI_LIB}/ACSI_MarcLib.a $KDTREE2_LIB/libkdtree2.a $MARC_LIB/libtetmeshinterface.a $MARC_LIB/libcaefatigueinterface.a -L$MARC_LIB -lmkl_blacs_intelmpi_ilp64 -lmkl_scalapack_ilp64 -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core -liomp5 -ltetmesh -lmeshgems -lmg-tetra -lmeshgems_stubs $HDF5_LIB $SOLVER2LIBS" + $MARC_LIB/blas_src.a ${ACSI_LIB}/ACSI_MarcLib.a $KDTREE2_LIB/libkdtree2.a $MARC_LIB/libtetmeshinterface.a $MARC_LIB/libcaefatigueinterface.a -L$MARC_LIB -lmkl_blacs_intelmpi_ilp64 -lmkl_scalapack_ilp64 -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core -liomp5 -ltetmesh -lmeshgems -lmg-tetra -lmeshgems_stubs $HDF5_LIB $SOLVER2LIBS"
SOLVERLIBS_DLL=${SOLVERLIBS} SOLVERLIBS_DLL=${SOLVERLIBS}
if test "$AEM_DLL" -eq 1 if test "$AEM_DLL" -eq 1
@@ -802,7 +830,7 @@ then
OPENSSL=NONE
fi
-SYSLIBS=" $OPENMP -lpthread -shared-intel -cxxlib $MARC_RPC_LIB"
+SYSLIBS=" $OPENMP -lpthread -cxxlib $MARC_RPC_LIB"
# Uncomment the following lines to turn on the trace and comment out the next 4 lines
# if test $MPITYPE = intelmpi
@@ -812,7 +840,7 @@ SYSLIBS=" $OPENMP -lpthread -shared-intel -cxxlib $MARC_RPC_LIB"
# fi
if test $MPITYPE = intelmpi
then
- SYSLIBS="-L${MPI_ROOT}/lib/release -lmpi -L${MPI_ROOT}/lib -lmpifort -lrt $OPENMP -threads -lpthread -shared-intel -cxxlib $MARC_RPC_LIB"
+ SYSLIBS="-L${MPI_ROOT}/lib/release -lmpi -L${MPI_ROOT}/lib -lmpifort -lrt $OPENMP -threads -lpthread -cxxlib $MARC_RPC_LIB"
fi
if test "$ZLIB" = "ZLIB"; then

271
install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch vendored
View File

@ -1,6 +1,6 @@
--- ---
+++ +++
@@ -302,7 +302,23 @@ fi @@ -302,7 +302,23 @@
. "$DIR/getarch" . "$DIR/getarch"
@ -24,7 +24,7 @@
# #
# #
@@ -405,7 +421,7 @@ sid= @@ -405,7 +421,7 @@
did= did=
vid= vid=
user= user=
@ -33,16 +33,7 @@
objs= objs=
qid=background qid=background
cpu= cpu=
@@ -573,7 +589,7 @@ do @@ -676,50 +692,19 @@
justlist=yes
;;
-fe* | -FE*)
- feature=$value
+ feature=$value
;;
-pr* | -PR*)
@@ -676,50 +692,19 @@ do
esac esac
;; ;;
-u* | -U*) -u* | -U*)
@ -99,39 +90,7 @@
;; ;;
-obj | -OBJ) -obj | -OBJ)
objs="$value" objs="$value"
@@ -739,19 +724,19 @@ do @@ -1207,12 +1192,12 @@
;;
esac
;;
- -dl | -DL)
- case $value in
- y* | Y*)
- deletelog=yes
- ;;
- n* | N*)
- deletelog=no
- ;;
- *)
- ;;
- esac
+ -dl | -DL)
+ case $value in
+ y* | Y*)
+ deletelog=yes
+ ;;
+ n* | N*)
+ deletelog=no
+ ;;
+ *)
+ ;;
+ esac
- ;;
+ ;;
-at | -AT)
att=$value
;;
@@ -1207,12 +1192,12 @@ post file $DIRPID/$pid.t16 or $DIRPID/$pid.t19 or $DIRPID/$pid.h5 not accessible
fi fi
fi fi
fi fi
@ -147,16 +106,7 @@
fi fi
fi fi
if test "$objs" if test "$objs"
@@ -1386,7 +1371,7 @@ else @@ -1531,7 +1516,7 @@
else
error="$error
job id required"
- fi
+fi
fi
case $qid in
@@ -1531,7 +1516,7 @@ Program name : $prog
Marc shared lib : $progdll Marc shared lib : $progdll
Version type : $mode Version type : $mode
Job ID : $DIRJID/$jid$extra_job_info Job ID : $DIRJID/$jid$extra_job_info
@ -165,7 +115,7 @@
User objects/libs : $objs User objects/libs : $objs
Restart file job ID : $rid Restart file job ID : $rid
Substructure file ID : $sid Substructure file ID : $sid
@@ -1564,7 +1549,7 @@ Program name : $prog @@ -1564,7 +1549,7 @@
Marc shared lib : $progdll Marc shared lib : $progdll
Version type : $mode Version type : $mode
Job ID : $DIRJID/$jid$extra_job_info Job ID : $DIRJID/$jid$extra_job_info
@ -174,7 +124,7 @@
User objects/libs : $objs User objects/libs : $objs
Restart file job ID : $rid Restart file job ID : $rid
Substructure file ID : $sid Substructure file ID : $sid
@@ -1687,7 +1672,7 @@ Program name ($prog)? $ECHOTXT" @@ -1687,7 +1672,7 @@
;; ;;
esac esac
fi fi
@ -183,7 +133,7 @@
read value read value
if test "$value" if test "$value"
then then
@@ -1696,50 +1681,19 @@ Program name ($prog)? $ECHOTXT" @@ -1696,50 +1681,19 @@
user= user=
;; ;;
*) *)
@ -209,16 +159,13 @@
- fi - fi
+ user=$value + user=$value
case $user in case $user in
- \/*) \/*)
- ;; ;;
- *) *)
+ \/*)
+ ;;
+ *)
user=`pwd`/$user user=`pwd`/$user
- usersubname=`pwd`/$usersubname - usersubname=`pwd`/$usersubname
- ;; ;;
- esac esac
- if test ! -f $usersubname - if test ! -f $usersubname
- then - then
- if test -f $usersubname.f - if test -f $usersubname.f
@ -235,8 +182,6 @@
- usersubname=$usersubname.F90 - usersubname=$usersubname.F90
- fi - fi
- fi - fi
+ ;;
+ esac
+ usernoext=$user + usernoext=$user
+ usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f` + usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
+ usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F` + usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
@ -245,7 +190,7 @@
;; ;;
esac esac
fi fi
@@ -2274,11 +2228,12 @@ fi @@ -2274,11 +2228,12 @@
# #
# user subroutine used # user subroutine used
# #
@ -260,7 +205,7 @@
case $program in case $program in
\/* | \.\/*) \/* | \.\/*)
bd= bd=
@@ -2391,7 +2346,7 @@ fi @@ -2391,7 +2346,7 @@
fi fi
if test "$user" if test "$user"
then then
@ -269,7 +214,7 @@
usersub=1 usersub=1
fi fi
export execpath export execpath
@@ -3274,44 +3229,27 @@ then @@ -3274,44 +3229,27 @@
echo echo
if test "$user" if test "$user"
then then
@ -319,21 +264,15 @@
fi fi
@@ -3331,10 +3269,11 @@ then @@ -3331,6 +3269,7 @@
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
- $SFLIB \
+ $DAMASK \ + $DAMASK \
+ $SFLIB \ $SFLIB \
$OPENSSL_LIB \ $OPENSSL_LIB \
$SYSLIBS \ $SYSLIBS \
- $SECLIBS || \ @@ -3344,6 +3283,9 @@
+ $SECLIBS || \
{
echo "$0: link failed for ${user:+$userobj }$objs"
exit 1
@@ -3344,6 +3283,9 @@ else
prgsav=yes prgsav=yes
fi fi
/bin/rm $userobj 2>/dev/null /bin/rm $userobj 2>/dev/null
@ -343,7 +282,7 @@
# #
# run marc # run marc
@@ -3390,7 +3332,7 @@ if test $dllrun -eq 0; then @@ -3390,7 +3332,7 @@
fi fi
else else
if test $cpdll = yes; then if test $cpdll = yes; then
@ -352,7 +291,7 @@
/bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null
fi fi
if test $rmdll = yes if test $rmdll = yes
@@ -3556,7 +3498,7 @@ then @@ -3556,7 +3498,7 @@
# first copy over the user sub if local directories # first copy over the user sub if local directories
if test ${dirstatus[$counter]} = "local" if test ${dirstatus[$counter]} = "local"
then then
@ -361,7 +300,7 @@
fi fi
# do the compilation on the other machine # do the compilation on the other machine
if test ${dirstatus[$counter]} = "shared" if test ${dirstatus[$counter]} = "shared"
@@ -3569,21 +3511,21 @@ then @@ -3569,21 +3511,21 @@
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
@ -386,7 +325,7 @@
fi fi
fi fi
fi fi
@@ -3593,39 +3535,27 @@ then @@ -3593,39 +3535,27 @@
if test "$userhost" if test "$userhost"
then then
echo echo
@ -432,21 +371,15 @@
fi # if test $user fi # if test $user
@@ -3645,10 +3575,11 @@ then @@ -3645,6 +3575,7 @@
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
- $SFLIB \
+ $DAMASK \ + $DAMASK \
+ $SFLIB \ $SFLIB \
$OPENSSL_LIB \ $OPENSSL_LIB \
$SYSLIBS \ $SYSLIBS \
- $SECLIBS || \ @@ -3686,6 +3617,9 @@
+ $SECLIBS || \
{
echo "$0: link failed for ${user:+$userobj }$objs"
echo " $PRODUCT Exit number 3"
@@ -3686,6 +3617,9 @@ else # if test $link
prgsav=yes prgsav=yes
fi # if test $link fi # if test $link
/bin/rm $userobj 2>/dev/null /bin/rm $userobj 2>/dev/null
@ -456,69 +389,7 @@
# #
# run marc # run marc
@@ -3744,42 +3678,42 @@ then @@ -3779,7 +3713,7 @@
counter=0
if test -f "$host_filt"
then
- for i in `$AWK -v n=$numfield '{print $n}' $host_filt`
- do
- ibase=${i%%.*}
- if test $ibase != $thishost
+ for i in `$AWK -v n=$numfield '{print $n}' $host_filt`
+ do
+ ibase=${i%%.*}
+ if test $ibase != $thishost
+ then
+ counter=$((counter+1))
+ DIR1=$DIRJOB
+ line=`grep -v '^#' $userhost | grep "^$ibase "`
+ workdir=`echo $line | $AWK '{print $3}'`
+ if test -n "$workdir"
then
- counter=$((counter+1))
- DIR1=$DIRJOB
- line=`grep -v '^#' $userhost | grep "^$ibase "`
- workdir=`echo $line | $AWK '{print $3}'`
- if test -n "$workdir"
- then
- DIR1=$workdir
- fi
- # if an incompatible host uses shared directory,
- # then the root machine deletes the executable
- if test ${dirstatus[$counter]} = "shared" -a ${compstatus[$counter]} = "no"
- then
- hname=_$ibase
- /bin/rm ${execname}$hname
- fi
- # if local directory used, the remote machine
- # deletes the executable
- if test ${dirstatus[$counter]} = "local"
- then
- $RSH $i /bin/rm $DIR1/${execname} 2>/dev/null
- fi
+ DIR1=$workdir
fi
- done
- fi
+ # if an incompatible host uses shared directory,
+ # then the root machine deletes the executable
+ if test ${dirstatus[$counter]} = "shared" -a ${compstatus[$counter]} = "no"
+ then
+ hname=_$ibase
+ /bin/rm ${execname}$hname
+ fi
+ # if local directory used, the remote machine
+ # deletes the executable
+ if test ${dirstatus[$counter]} = "local"
+ then
+ $RSH $i /bin/rm $DIR1/${execname} 2>/dev/null
+ fi
+ fi
+ done
fi
fi
fi
+fi
else else
#dllrun >0 #dllrun >0
if test $cpdll = yes; then if test $cpdll = yes; then
@ -527,7 +398,7 @@
/bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null
fi fi
if test $rmdll = yes;then if test $rmdll = yes;then
@@ -3904,7 +3838,7 @@ then @@ -3904,7 +3838,7 @@
# first copy over the user sub if local directories # first copy over the user sub if local directories
if test ${dirstatus[$counter]} = "local" if test ${dirstatus[$counter]} = "local"
then then
@ -536,7 +407,7 @@
fi fi
# do the compilation on the other machine # do the compilation on the other machine
if test ${dirstatus[$counter]} = "shared" if test ${dirstatus[$counter]} = "shared"
@@ -3917,20 +3851,20 @@ then @@ -3917,20 +3851,20 @@
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
@ -560,7 +431,7 @@
fi fi
fi fi
fi fi
@@ -3940,37 +3874,25 @@ then @@ -3940,37 +3874,25 @@
if test "$userhost" if test "$userhost"
then then
echo echo
@ -604,7 +475,7 @@
fi # if test $user fi # if test $user
@@ -3990,10 +3912,11 @@ then @@ -3990,6 +3912,7 @@
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
@ -612,12 +483,7 @@
$SFLIB \ $SFLIB \
$OPENSSL_LIB \ $OPENSSL_LIB \
$SYSLIBS \ $SYSLIBS \
- $SECLIBS || \ @@ -4030,7 +3953,9 @@
+ $SECLIBS || \
{
echo "$0: link failed for ${user:+$userobj }$objs"
exit 1
@@ -4030,7 +3953,9 @@ else # if test $link
prgsav=yes prgsav=yes
fi # if test $link fi # if test $link
/bin/rm $userobj 2>/dev/null /bin/rm $userobj 2>/dev/null
@ -628,78 +494,7 @@
# done if no job id given # done if no job id given
if test -z "$jid" if test -z "$jid"
then then
@@ -4070,7 +3995,7 @@ if test $ddm_arc -gt 0; then @@ -4149,7 +4074,7 @@
RUN_JOB="$BINDIR/exeddm $RUN_JOB -ddm $ddm_arc "
fi
-$RUN_JOB
+ $RUN_JOB
if test $nprocd -gt 1
then
@@ -4114,42 +4039,42 @@ then
counter=0
if test -f "$host_filt"
then
- for i in `$AWK -v n=$numfield '{print $n}' $host_filt`
- do
- ibase=${i%%.*}
- if test $ibase != $thishost
+ for i in `$AWK -v n=$numfield '{print $n}' $host_filt`
+ do
+ ibase=${i%%.*}
+ if test $ibase != $thishost
+ then
+ counter=$((counter+1))
+ DIR1=$DIRJOB
+ line=`grep -v '^#' $userhost | grep "^$ibase "`
+ workdir=`echo $line | $AWK '{print $3}'`
+ if test -n "$workdir"
then
- counter=$((counter+1))
- DIR1=$DIRJOB
- line=`grep -v '^#' $userhost | grep "^$ibase "`
- workdir=`echo $line | $AWK '{print $3}'`
- if test -n "$workdir"
- then
- DIR1=$workdir
- fi
- # if an incompatible host uses shared directory,
- # then the root machine deletes the executable
- if test ${dirstatus[$counter]} = "shared" -a ${compstatus[$counter]} = "no"
- then
- hname=_$ibase
- /bin/rm ${execname}$hname
- fi
- # if local directory used, the remote machine
- # deletes the executable
- if test ${dirstatus[$counter]} = "local"
- then
- $RSH $i /bin/rm $DIR1/${execname} 2>/dev/null
- fi
+ DIR1=$workdir
fi
- done
- fi
+ # if an incompatible host uses shared directory,
+ # then the root machine deletes the executable
+ if test ${dirstatus[$counter]} = "shared" -a ${compstatus[$counter]} = "no"
+ then
+ hname=_$ibase
+ /bin/rm ${execname}$hname
+ fi
+ # if local directory used, the remote machine
+ # deletes the executable
+ if test ${dirstatus[$counter]} = "local"
+ then
+ $RSH $i /bin/rm $DIR1/${execname} 2>/dev/null
+ fi
+ fi
+ done
fi
fi
fi
+fi
else else
#dllrun >0 #dllrun >0
if test $cpdll = yes; then if test $cpdll = yes; then

271
install/MarcMentat/2022.1/Marc_tools/run_damask_lmp.patch vendored
View File

@ -1,6 +1,6 @@
--- ---
+++ +++
@@ -302,7 +302,23 @@ fi @@ -302,7 +302,23 @@
. "$DIR/getarch" . "$DIR/getarch"
@ -24,7 +24,7 @@
# #
# #
@@ -405,7 +421,7 @@ sid= @@ -405,7 +421,7 @@
did= did=
vid= vid=
user= user=
@ -33,16 +33,7 @@
objs= objs=
qid=background qid=background
cpu= cpu=
@@ -573,7 +589,7 @@ do @@ -676,50 +692,19 @@
justlist=yes
;;
-fe* | -FE*)
- feature=$value
+ feature=$value
;;
-pr* | -PR*)
@@ -676,50 +692,19 @@ do
esac esac
;; ;;
-u* | -U*) -u* | -U*)
@ -99,39 +90,7 @@
;; ;;
-obj | -OBJ) -obj | -OBJ)
objs="$value" objs="$value"
@@ -739,19 +724,19 @@ do @@ -1207,12 +1192,12 @@
;;
esac
;;
- -dl | -DL)
- case $value in
- y* | Y*)
- deletelog=yes
- ;;
- n* | N*)
- deletelog=no
- ;;
- *)
- ;;
- esac
+ -dl | -DL)
+ case $value in
+ y* | Y*)
+ deletelog=yes
+ ;;
+ n* | N*)
+ deletelog=no
+ ;;
+ *)
+ ;;
+ esac
- ;;
+ ;;
-at | -AT)
att=$value
;;
@@ -1207,12 +1192,12 @@ post file $DIRPID/$pid.t16 or $DIRPID/$pid.t19 or $DIRPID/$pid.h5 not accessible
fi fi
fi fi
fi fi
@ -147,16 +106,7 @@
fi fi
fi fi
if test "$objs" if test "$objs"
@@ -1386,7 +1371,7 @@ else @@ -1531,7 +1516,7 @@
else
error="$error
job id required"
- fi
+fi
fi
case $qid in
@@ -1531,7 +1516,7 @@ Program name : $prog
Marc shared lib : $progdll Marc shared lib : $progdll
Version type : $mode Version type : $mode
Job ID : $DIRJID/$jid$extra_job_info Job ID : $DIRJID/$jid$extra_job_info
@ -165,7 +115,7 @@
User objects/libs : $objs User objects/libs : $objs
Restart file job ID : $rid Restart file job ID : $rid
Substructure file ID : $sid Substructure file ID : $sid
@@ -1564,7 +1549,7 @@ Program name : $prog @@ -1564,7 +1549,7 @@
Marc shared lib : $progdll Marc shared lib : $progdll
Version type : $mode Version type : $mode
Job ID : $DIRJID/$jid$extra_job_info Job ID : $DIRJID/$jid$extra_job_info
@ -174,7 +124,7 @@
User objects/libs : $objs User objects/libs : $objs
Restart file job ID : $rid Restart file job ID : $rid
Substructure file ID : $sid Substructure file ID : $sid
@@ -1687,7 +1672,7 @@ Program name ($prog)? $ECHOTXT" @@ -1687,7 +1672,7 @@
;; ;;
esac esac
fi fi
@ -183,7 +133,7 @@
read value read value
if test "$value" if test "$value"
then then
@@ -1696,50 +1681,19 @@ Program name ($prog)? $ECHOTXT" @@ -1696,50 +1681,19 @@
user= user=
;; ;;
*) *)
@ -209,16 +159,13 @@
- fi - fi
+ user=$value + user=$value
case $user in case $user in
- \/*) \/*)
- ;; ;;
- *) *)
+ \/*)
+ ;;
+ *)
user=`pwd`/$user user=`pwd`/$user
- usersubname=`pwd`/$usersubname - usersubname=`pwd`/$usersubname
- ;; ;;
- esac esac
- if test ! -f $usersubname - if test ! -f $usersubname
- then - then
- if test -f $usersubname.f - if test -f $usersubname.f
@ -235,8 +182,6 @@
- usersubname=$usersubname.F90 - usersubname=$usersubname.F90
- fi - fi
- fi - fi
+ ;;
+ esac
+ usernoext=$user + usernoext=$user
+ usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f` + usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
+ usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F` + usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
@ -245,7 +190,7 @@
;; ;;
esac esac
fi fi
@@ -2274,11 +2228,12 @@ fi @@ -2274,11 +2228,12 @@
# #
# user subroutine used # user subroutine used
# #
@ -260,7 +205,7 @@
case $program in case $program in
\/* | \.\/*) \/* | \.\/*)
bd= bd=
@@ -2391,7 +2346,7 @@ fi @@ -2391,7 +2346,7 @@
fi fi
if test "$user" if test "$user"
then then
@ -269,7 +214,7 @@
usersub=1 usersub=1
fi fi
export execpath export execpath
@@ -3274,44 +3229,27 @@ then @@ -3274,44 +3229,27 @@
echo echo
if test "$user" if test "$user"
then then
@ -319,21 +264,15 @@
fi fi
@@ -3331,10 +3269,11 @@ then @@ -3331,6 +3269,7 @@
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
- $SFLIB \
+ $DAMASK \ + $DAMASK \
+ $SFLIB \ $SFLIB \
$OPENSSL_LIB \ $OPENSSL_LIB \
$SYSLIBS \ $SYSLIBS \
- $SECLIBS || \ @@ -3344,6 +3283,9 @@
+ $SECLIBS || \
{
echo "$0: link failed for ${user:+$userobj }$objs"
exit 1
@@ -3344,6 +3283,9 @@ else
prgsav=yes prgsav=yes
fi fi
/bin/rm $userobj 2>/dev/null /bin/rm $userobj 2>/dev/null
@ -343,7 +282,7 @@
# #
# run marc # run marc
@@ -3390,7 +3332,7 @@ if test $dllrun -eq 0; then @@ -3390,7 +3332,7 @@
fi fi
else else
if test $cpdll = yes; then if test $cpdll = yes; then
@ -352,7 +291,7 @@
/bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null
fi fi
if test $rmdll = yes if test $rmdll = yes
@@ -3556,7 +3498,7 @@ then @@ -3556,7 +3498,7 @@
# first copy over the user sub if local directories # first copy over the user sub if local directories
if test ${dirstatus[$counter]} = "local" if test ${dirstatus[$counter]} = "local"
then then
@ -361,7 +300,7 @@
fi fi
# do the compilation on the other machine # do the compilation on the other machine
if test ${dirstatus[$counter]} = "shared" if test ${dirstatus[$counter]} = "shared"
@@ -3569,21 +3511,21 @@ then @@ -3569,21 +3511,21 @@
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
@ -386,7 +325,7 @@
fi fi
fi fi
fi fi
@@ -3593,39 +3535,27 @@ then @@ -3593,39 +3535,27 @@
if test "$userhost" if test "$userhost"
then then
echo echo
@ -432,21 +371,15 @@
fi # if test $user fi # if test $user
@@ -3645,10 +3575,11 @@ then @@ -3645,6 +3575,7 @@
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
- $SFLIB \
+ $DAMASK \ + $DAMASK \
+ $SFLIB \ $SFLIB \
$OPENSSL_LIB \ $OPENSSL_LIB \
$SYSLIBS \ $SYSLIBS \
- $SECLIBS || \ @@ -3686,6 +3617,9 @@
+ $SECLIBS || \
{
echo "$0: link failed for ${user:+$userobj }$objs"
echo " $PRODUCT Exit number 3"
@@ -3686,6 +3617,9 @@ else # if test $link
prgsav=yes prgsav=yes
fi # if test $link fi # if test $link
/bin/rm $userobj 2>/dev/null /bin/rm $userobj 2>/dev/null
@ -456,69 +389,7 @@
# #
# run marc # run marc
@@ -3744,42 +3678,42 @@ then @@ -3779,7 +3713,7 @@
counter=0
if test -f "$host_filt"
then
- for i in `$AWK -v n=$numfield '{print $n}' $host_filt`
- do
- ibase=${i%%.*}
- if test $ibase != $thishost
+ for i in `$AWK -v n=$numfield '{print $n}' $host_filt`
+ do
+ ibase=${i%%.*}
+ if test $ibase != $thishost
+ then
+ counter=$((counter+1))
+ DIR1=$DIRJOB
+ line=`grep -v '^#' $userhost | grep "^$ibase "`
+ workdir=`echo $line | $AWK '{print $3}'`
+ if test -n "$workdir"
then
- counter=$((counter+1))
- DIR1=$DIRJOB
- line=`grep -v '^#' $userhost | grep "^$ibase "`
- workdir=`echo $line | $AWK '{print $3}'`
- if test -n "$workdir"
- then
- DIR1=$workdir
- fi
- # if an incompatible host uses shared directory,
- # then the root machine deletes the executable
- if test ${dirstatus[$counter]} = "shared" -a ${compstatus[$counter]} = "no"
- then
- hname=_$ibase
- /bin/rm ${execname}$hname
- fi
- # if local directory used, the remote machine
- # deletes the executable
- if test ${dirstatus[$counter]} = "local"
- then
- $RSH $i /bin/rm $DIR1/${execname} 2>/dev/null
- fi
+ DIR1=$workdir
fi
- done
- fi
+ # if an incompatible host uses shared directory,
+ # then the root machine deletes the executable
+ if test ${dirstatus[$counter]} = "shared" -a ${compstatus[$counter]} = "no"
+ then
+ hname=_$ibase
+ /bin/rm ${execname}$hname
+ fi
+ # if local directory used, the remote machine
+ # deletes the executable
+ if test ${dirstatus[$counter]} = "local"
+ then
+ $RSH $i /bin/rm $DIR1/${execname} 2>/dev/null
+ fi
+ fi
+ done
fi
fi
fi
+fi
else else
#dllrun >0 #dllrun >0
if test $cpdll = yes; then if test $cpdll = yes; then
@ -527,7 +398,7 @@
/bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null
fi fi
if test $rmdll = yes;then if test $rmdll = yes;then
@@ -3904,7 +3838,7 @@ then @@ -3904,7 +3838,7 @@
# first copy over the user sub if local directories # first copy over the user sub if local directories
if test ${dirstatus[$counter]} = "local" if test ${dirstatus[$counter]} = "local"
then then
@ -536,7 +407,7 @@
fi fi
# do the compilation on the other machine # do the compilation on the other machine
if test ${dirstatus[$counter]} = "shared" if test ${dirstatus[$counter]} = "shared"
@@ -3917,20 +3851,20 @@ then @@ -3917,20 +3851,20 @@
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
@ -560,7 +431,7 @@
fi fi
fi fi
fi fi
@@ -3940,37 +3874,25 @@ then @@ -3940,37 +3874,25 @@
if test "$userhost" if test "$userhost"
then then
echo echo
@ -604,7 +475,7 @@
fi # if test $user fi # if test $user
@@ -3990,10 +3912,11 @@ then @@ -3990,6 +3912,7 @@
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
@ -612,12 +483,7 @@
$SFLIB \ $SFLIB \
$OPENSSL_LIB \ $OPENSSL_LIB \
$SYSLIBS \ $SYSLIBS \
- $SECLIBS || \ @@ -4030,7 +3953,9 @@
+ $SECLIBS || \
{
echo "$0: link failed for ${user:+$userobj }$objs"
exit 1
@@ -4030,7 +3953,9 @@ else # if test $link
prgsav=yes prgsav=yes
fi # if test $link fi # if test $link
/bin/rm $userobj 2>/dev/null /bin/rm $userobj 2>/dev/null
@ -628,78 +494,7 @@
# done if no job id given # done if no job id given
if test -z "$jid" if test -z "$jid"
then then
@@ -4070,7 +3995,7 @@ if test $ddm_arc -gt 0; then @@ -4149,7 +4074,7 @@
RUN_JOB="$BINDIR/exeddm $RUN_JOB -ddm $ddm_arc "
fi
-$RUN_JOB
+ $RUN_JOB
if test $nprocd -gt 1
then
@@ -4114,42 +4039,42 @@ then
counter=0
if test -f "$host_filt"
then
- for i in `$AWK -v n=$numfield '{print $n}' $host_filt`
- do
- ibase=${i%%.*}
- if test $ibase != $thishost
+ for i in `$AWK -v n=$numfield '{print $n}' $host_filt`
+ do
+ ibase=${i%%.*}
+ if test $ibase != $thishost
+ then
+ counter=$((counter+1))
+ DIR1=$DIRJOB
+ line=`grep -v '^#' $userhost | grep "^$ibase "`
+ workdir=`echo $line | $AWK '{print $3}'`
+ if test -n "$workdir"
then
- counter=$((counter+1))
- DIR1=$DIRJOB
- line=`grep -v '^#' $userhost | grep "^$ibase "`
- workdir=`echo $line | $AWK '{print $3}'`
- if test -n "$workdir"
- then
- DIR1=$workdir
- fi
- # if an incompatible host uses shared directory,
- # then the root machine deletes the executable
- if test ${dirstatus[$counter]} = "shared" -a ${compstatus[$counter]} = "no"
- then
- hname=_$ibase
- /bin/rm ${execname}$hname
- fi
- # if local directory used, the remote machine
- # deletes the executable
- if test ${dirstatus[$counter]} = "local"
- then
- $RSH $i /bin/rm $DIR1/${execname} 2>/dev/null
- fi
+ DIR1=$workdir
fi
- done
- fi
+ # if an incompatible host uses shared directory,
+ # then the root machine deletes the executable
+ if test ${dirstatus[$counter]} = "shared" -a ${compstatus[$counter]} = "no"
+ then
+ hname=_$ibase
+ /bin/rm ${execname}$hname
+ fi
+ # if local directory used, the remote machine
+ # deletes the executable
+ if test ${dirstatus[$counter]} = "local"
+ then
+ $RSH $i /bin/rm $DIR1/${execname} 2>/dev/null
+ fi
+ fi
+ done
fi
fi
fi
+fi
else else
#dllrun >0 #dllrun >0
if test $cpdll = yes; then if test $cpdll = yes; then

311
install/MarcMentat/2022.1/Marc_tools/run_damask_mp.patch vendored
View File

@ -1,8 +1,6 @@
diff --git "a/C:\\Users\\f.roters\\Documents\\Forschung\\FEM\\Kristallplastizit\303\244t\\Programme\\Userroutinen\\Marc\\Marc_mods\\2022.1\\Marc_tools\\run_marc.original" "b/C:\\Users\\f.roters\\Documents\\Forschung\\FEM\\Kristallplastizit\303\244t\\Programme\\Userroutinen\\Marc\\Marc_mods\\2022.1\\Marc_tools\\run_damask_mp" ---
index 88a3027..85beabe 100644 +++
--- "a/C:\\Users\\f.roters\\Documents\\Forschung\\FEM\\Kristallplastizit\303\244t\\Programme\\Userroutinen\\Marc\\Marc_mods\\2022.1\\Marc_tools\\run_marc.original" @@ -302,7 +302,23 @@
+++ "b/C:\\Users\\f.roters\\Documents\\Forschung\\FEM\\Kristallplastizit\303\244t\\Programme\\Userroutinen\\Marc\\Marc_mods\\2022.1\\Marc_tools\\run_damask_mp"
@@ -302,7 +302,23 @@ fi
. "$DIR/getarch" . "$DIR/getarch"
@ -26,7 +24,7 @@ index 88a3027..85beabe 100644
# #
# #
@@ -405,7 +421,7 @@ sid= @@ -405,7 +421,7 @@
did= did=
vid= vid=
user= user=
@ -35,16 +33,7 @@ index 88a3027..85beabe 100644
objs= objs=
qid=background qid=background
cpu= cpu=
@@ -573,7 +589,7 @@ do @@ -676,50 +692,19 @@
justlist=yes
;;
-fe* | -FE*)
- feature=$value
+ feature=$value
;;
-pr* | -PR*)
@@ -676,50 +692,19 @@ do
esac esac
;; ;;
-u* | -U*) -u* | -U*)
@ -101,39 +90,7 @@ index 88a3027..85beabe 100644
;; ;;
-obj | -OBJ) -obj | -OBJ)
objs="$value" objs="$value"
@@ -739,19 +724,19 @@ do @@ -1207,12 +1192,12 @@
;;
esac
;;
- -dl | -DL)
- case $value in
- y* | Y*)
- deletelog=yes
- ;;
- n* | N*)
- deletelog=no
- ;;
- *)
- ;;
- esac
+ -dl | -DL)
+ case $value in
+ y* | Y*)
+ deletelog=yes
+ ;;
+ n* | N*)
+ deletelog=no
+ ;;
+ *)
+ ;;
+ esac
- ;;
+ ;;
-at | -AT)
att=$value
;;
@@ -1207,12 +1192,12 @@ post file $DIRPID/$pid.t16 or $DIRPID/$pid.t19 or $DIRPID/$pid.h5 not accessible
fi fi
fi fi
fi fi
@ -149,16 +106,7 @@ index 88a3027..85beabe 100644
fi fi
fi fi
if test "$objs" if test "$objs"
@@ -1386,7 +1371,7 @@ else @@ -1531,7 +1516,7 @@
else
error="$error
job id required"
- fi
+fi
fi
case $qid in
@@ -1531,7 +1516,7 @@ Program name : $prog
Marc shared lib : $progdll Marc shared lib : $progdll
Version type : $mode Version type : $mode
Job ID : $DIRJID/$jid$extra_job_info Job ID : $DIRJID/$jid$extra_job_info
@ -167,16 +115,7 @@ index 88a3027..85beabe 100644
User objects/libs : $objs User objects/libs : $objs
Restart file job ID : $rid Restart file job ID : $rid
Substructure file ID : $sid Substructure file ID : $sid
@@ -1548,8 +1533,6 @@ GPGPU option : $gpuids @@ -1564,7 +1549,7 @@
Host file name : $host" > $jid.log
if test "$iprintsimufact" = true ; then
echo "DDM with ARC Mapper : $ddm_arc" >> $jid.log
- echo "Mapper directory : $MESHERDIR" >> $jid.log
- echo "Meshing directory : $MESHERDIR" >> $jid.log
fi
echo \
"Message passing type : $itree
@@ -1564,7 +1547,7 @@ Program name : $prog
Marc shared lib : $progdll Marc shared lib : $progdll
Version type : $mode Version type : $mode
Job ID : $DIRJID/$jid$extra_job_info Job ID : $DIRJID/$jid$extra_job_info
@ -185,16 +124,7 @@ index 88a3027..85beabe 100644
User objects/libs : $objs User objects/libs : $objs
Restart file job ID : $rid Restart file job ID : $rid
Substructure file ID : $sid Substructure file ID : $sid
@@ -1579,6 +1562,8 @@ Solver processes : $nsolverprint @@ -1687,7 +1672,7 @@
Solver threads : $ntsprint"
if test "$iprintsimufact" = true ; then
echo "DDM with ARC Mapper : $ddm_arc"
+ echo "Mapper directory : $MESHERDIR" >> $jid.log
+ echo "Meshing directory : $MESHERDIR" >> $jid.log
fi
echo \
"GPGPU option : $gpuids
@@ -1687,7 +1672,7 @@ Program name ($prog)? $ECHOTXT"
;; ;;
esac esac
fi fi
@ -203,7 +133,7 @@ index 88a3027..85beabe 100644
read value read value
if test "$value" if test "$value"
then then
@@ -1696,50 +1681,19 @@ Program name ($prog)? $ECHOTXT" @@ -1696,50 +1681,19 @@
user= user=
;; ;;
*) *)
@ -229,16 +159,13 @@ index 88a3027..85beabe 100644
- fi - fi
+ user=$value + user=$value
case $user in case $user in
- \/*) \/*)
- ;; ;;
- *) *)
+ \/*)
+ ;;
+ *)
user=`pwd`/$user user=`pwd`/$user
- usersubname=`pwd`/$usersubname - usersubname=`pwd`/$usersubname
- ;; ;;
- esac esac
- if test ! -f $usersubname - if test ! -f $usersubname
- then - then
- if test -f $usersubname.f - if test -f $usersubname.f
@ -255,8 +182,6 @@ index 88a3027..85beabe 100644
- usersubname=$usersubname.F90 - usersubname=$usersubname.F90
- fi - fi
- fi - fi
+ ;;
+ esac
+ usernoext=$user + usernoext=$user
+ usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f` + usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f`
+ usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F` + usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F`
@ -265,7 +190,7 @@ index 88a3027..85beabe 100644
;; ;;
esac esac
fi fi
@@ -2274,11 +2228,12 @@ fi @@ -2274,11 +2228,12 @@
# #
# user subroutine used # user subroutine used
# #
@ -280,7 +205,7 @@ index 88a3027..85beabe 100644
case $program in case $program in
\/* | \.\/*) \/* | \.\/*)
bd= bd=
@@ -2391,7 +2346,7 @@ fi @@ -2391,7 +2346,7 @@
fi fi
if test "$user" if test "$user"
then then
@ -289,7 +214,7 @@ index 88a3027..85beabe 100644
usersub=1 usersub=1
fi fi
export execpath export execpath
@@ -3274,44 +3229,27 @@ then @@ -3274,44 +3229,27 @@
echo echo
if test "$user" if test "$user"
then then
@ -315,7 +240,7 @@ index 88a3027..85beabe 100644
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
- $FORTRAN $usersub || \ - $FORTRAN $usersub || \
+ $DFORTRANMP $user || \ + $DFORTHIGHMP $user || \
{ {
- echo "$0: compile failed for $user.f" - echo "$0: compile failed for $user.f"
+ echo "$0: compile failed for $user" + echo "$0: compile failed for $user"
@ -324,7 +249,7 @@ index 88a3027..85beabe 100644
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
- $FORTRAN $usersub -o $userobj || \ - $FORTRAN $usersub -o $userobj || \
+ $DFORTRANMP $user -o $userobj || \ + $DFORTHIGHMP $user -o $userobj || \
{ {
- echo "$0: compile failed for $user.f" - echo "$0: compile failed for $user.f"
+ echo "$0: compile failed for $user" + echo "$0: compile failed for $user"
@ -339,21 +264,15 @@ index 88a3027..85beabe 100644
fi fi
@@ -3331,10 +3269,11 @@ then @@ -3331,6 +3269,7 @@
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
- $SFLIB \
+ $DAMASK \ + $DAMASK \
+ $SFLIB \ $SFLIB \
$OPENSSL_LIB \ $OPENSSL_LIB \
$SYSLIBS \ $SYSLIBS \
- $SECLIBS || \ @@ -3344,6 +3283,9 @@
+ $SECLIBS || \
{
echo "$0: link failed for ${user:+$userobj }$objs"
exit 1
@@ -3344,6 +3283,9 @@ else
prgsav=yes prgsav=yes
fi fi
/bin/rm $userobj 2>/dev/null /bin/rm $userobj 2>/dev/null
@ -363,7 +282,7 @@ index 88a3027..85beabe 100644
# #
# run marc # run marc
@@ -3390,7 +3332,7 @@ if test $dllrun -eq 0; then @@ -3390,7 +3332,7 @@
fi fi
else else
if test $cpdll = yes; then if test $cpdll = yes; then
@ -372,7 +291,7 @@ index 88a3027..85beabe 100644
/bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null
fi fi
if test $rmdll = yes if test $rmdll = yes
@@ -3556,7 +3498,7 @@ then @@ -3556,7 +3498,7 @@
# first copy over the user sub if local directories # first copy over the user sub if local directories
if test ${dirstatus[$counter]} = "local" if test ${dirstatus[$counter]} = "local"
then then
@ -381,12 +300,12 @@ index 88a3027..85beabe 100644
fi fi
# do the compilation on the other machine # do the compilation on the other machine
if test ${dirstatus[$counter]} = "shared" if test ${dirstatus[$counter]} = "shared"
@@ -3569,21 +3511,21 @@ then @@ -3569,21 +3511,21 @@
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
- $RSH $i $DIR2/tools/comp_user $DIR2 $DIR1 $remoteuser $remoteprog - $RSH $i $DIR2/tools/comp_user $DIR2 $DIR1 $remoteuser $remoteprog
+ $RSH $i $DIR2/tools/comp_damask_mp $DIR2 $DIR1 $remoteuser $remoteprog + $RSH $i $DIR2/tools/comp_damask_hmp $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -406,7 +325,7 @@ index 88a3027..85beabe 100644
fi fi
fi fi
fi fi
@@ -3593,39 +3535,27 @@ then @@ -3593,39 +3535,27 @@
if test "$userhost" if test "$userhost"
then then
echo echo
@ -426,7 +345,7 @@ index 88a3027..85beabe 100644
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
- $FORTRAN $usersub || \ - $FORTRAN $usersub || \
+ $DFORTRANMP $user || \ + $DFORTHIGHMP $user || \
{ {
- echo "$0: compile failed for $user.f" - echo "$0: compile failed for $user.f"
+ echo "$0: compile failed for $user" + echo "$0: compile failed for $user"
@ -436,7 +355,7 @@ index 88a3027..85beabe 100644
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
- $FORTRAN $usersub -o $userobj || \ - $FORTRAN $usersub -o $userobj || \
+ $DFORTRANMP $user -o $userobj || \ + $DFORTHIGHMP $user -o $userobj || \
{ {
- echo "$0: compile failed for $user.f" - echo "$0: compile failed for $user.f"
+ echo "$0: compile failed for $user" + echo "$0: compile failed for $user"
@ -452,21 +371,15 @@ index 88a3027..85beabe 100644
fi # if test $user fi # if test $user
@@ -3645,10 +3575,11 @@ then @@ -3645,6 +3575,7 @@
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
- $SFLIB \
+ $DAMASK \ + $DAMASK \
+ $SFLIB \ $SFLIB \
$OPENSSL_LIB \ $OPENSSL_LIB \
$SYSLIBS \ $SYSLIBS \
- $SECLIBS || \ @@ -3686,6 +3617,9 @@
+ $SECLIBS || \
{
echo "$0: link failed for ${user:+$userobj }$objs"
echo " $PRODUCT Exit number 3"
@@ -3686,6 +3617,9 @@ else # if test $link
prgsav=yes prgsav=yes
fi # if test $link fi # if test $link
/bin/rm $userobj 2>/dev/null /bin/rm $userobj 2>/dev/null
@ -476,69 +389,7 @@ index 88a3027..85beabe 100644
# #
# run marc # run marc
@@ -3744,42 +3678,42 @@ then @@ -3779,7 +3713,7 @@
counter=0
if test -f "$host_filt"
then
- for i in `$AWK -v n=$numfield '{print $n}' $host_filt`
- do
- ibase=${i%%.*}
- if test $ibase != $thishost
+ for i in `$AWK -v n=$numfield '{print $n}' $host_filt`
+ do
+ ibase=${i%%.*}
+ if test $ibase != $thishost
+ then
+ counter=$((counter+1))
+ DIR1=$DIRJOB
+ line=`grep -v '^#' $userhost | grep "^$ibase "`
+ workdir=`echo $line | $AWK '{print $3}'`
+ if test -n "$workdir"
then
- counter=$((counter+1))
- DIR1=$DIRJOB
- line=`grep -v '^#' $userhost | grep "^$ibase "`
- workdir=`echo $line | $AWK '{print $3}'`
- if test -n "$workdir"
- then
- DIR1=$workdir
- fi
- # if an incompatible host uses shared directory,
- # then the root machine deletes the executable
- if test ${dirstatus[$counter]} = "shared" -a ${compstatus[$counter]} = "no"
- then
- hname=_$ibase
- /bin/rm ${execname}$hname
- fi
- # if local directory used, the remote machine
- # deletes the executable
- if test ${dirstatus[$counter]} = "local"
- then
- $RSH $i /bin/rm $DIR1/${execname} 2>/dev/null
- fi
+ DIR1=$workdir
fi
- done
- fi
+ # if an incompatible host uses shared directory,
+ # then the root machine deletes the executable
+ if test ${dirstatus[$counter]} = "shared" -a ${compstatus[$counter]} = "no"
+ then
+ hname=_$ibase
+ /bin/rm ${execname}$hname
+ fi
+ # if local directory used, the remote machine
+ # deletes the executable
+ if test ${dirstatus[$counter]} = "local"
+ then
+ $RSH $i /bin/rm $DIR1/${execname} 2>/dev/null
+ fi
+ fi
+ done
fi
fi
fi
+fi
else else
#dllrun >0 #dllrun >0
if test $cpdll = yes; then if test $cpdll = yes; then
@ -547,7 +398,7 @@ index 88a3027..85beabe 100644
/bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null
fi fi
if test $rmdll = yes;then if test $rmdll = yes;then
@@ -3904,7 +3838,7 @@ then @@ -3904,7 +3838,7 @@
# first copy over the user sub if local directories # first copy over the user sub if local directories
if test ${dirstatus[$counter]} = "local" if test ${dirstatus[$counter]} = "local"
then then
@ -556,12 +407,12 @@ index 88a3027..85beabe 100644
fi fi
# do the compilation on the other machine # do the compilation on the other machine
if test ${dirstatus[$counter]} = "shared" if test ${dirstatus[$counter]} = "shared"
@@ -3917,20 +3851,20 @@ then @@ -3917,20 +3851,20 @@
remoteuser=$DIR1/`$BASENAME $user` remoteuser=$DIR1/`$BASENAME $user`
$RSH $i /bin/rm $remoteprog 2> /dev/null $RSH $i /bin/rm $remoteprog 2> /dev/null
echo echo
- $RSH $i $DIR2/tools/comp_user $DIR2 $DIR1 $remoteuser $remoteprog - $RSH $i $DIR2/tools/comp_user $DIR2 $DIR1 $remoteuser $remoteprog
+ $RSH $i $DIR2/tools/comp_damask_mp $DIR2 $DIR1 $remoteuser $remoteprog + $RSH $i $DIR2/tools/comp_damask_hmp $DIR2 $DIR1 $remoteuser $remoteprog
# check if successful, the new executable should be there # check if successful, the new executable should be there
line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` line=`$RSH $i /bin/ls $remoteprog 2> /dev/null`
if test "$line" if test "$line"
@ -580,7 +431,7 @@ index 88a3027..85beabe 100644
fi fi
fi fi
fi fi
@@ -3940,37 +3874,25 @@ then @@ -3940,37 +3874,25 @@
if test "$userhost" if test "$userhost"
then then
echo echo
@ -600,7 +451,7 @@ index 88a3027..85beabe 100644
if test $MACHINENAME = "CRAY" if test $MACHINENAME = "CRAY"
then then
- $FORTRAN $usersub || \ - $FORTRAN $usersub || \
+ $DFORTRANMP $user || \ + $DFORTHIGHMP $user || \
{ {
- echo "$0: compile failed for $user.f" - echo "$0: compile failed for $user.f"
+ echo "$0: compile failed for $user" + echo "$0: compile failed for $user"
@ -609,7 +460,7 @@ index 88a3027..85beabe 100644
/bin/rm $program 2>/dev/null /bin/rm $program 2>/dev/null
else else
- $FORTRAN $usersub -o $userobj || \ - $FORTRAN $usersub -o $userobj || \
+ $DFORTRANMP $user -o $userobj || \ + $DFORTHIGHMP $user -o $userobj || \
{ {
- echo "$0: compile failed for $user.f" - echo "$0: compile failed for $user.f"
+ echo "$0: compile failed for $user" + echo "$0: compile failed for $user"
@ -624,7 +475,7 @@ index 88a3027..85beabe 100644
fi # if test $user fi # if test $user
@@ -3990,10 +3912,11 @@ then @@ -3990,6 +3912,7 @@
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
@ -632,12 +483,7 @@ index 88a3027..85beabe 100644
$SFLIB \ $SFLIB \
$OPENSSL_LIB \ $OPENSSL_LIB \
$SYSLIBS \ $SYSLIBS \
- $SECLIBS || \ @@ -4030,7 +3953,9 @@
+ $SECLIBS || \
{
echo "$0: link failed for ${user:+$userobj }$objs"
exit 1
@@ -4030,7 +3953,9 @@ else # if test $link
prgsav=yes prgsav=yes
fi # if test $link fi # if test $link
/bin/rm $userobj 2>/dev/null /bin/rm $userobj 2>/dev/null
@ -648,78 +494,7 @@ index 88a3027..85beabe 100644
# done if no job id given # done if no job id given
if test -z "$jid" if test -z "$jid"
then then
@@ -4070,7 +3995,7 @@ if test $ddm_arc -gt 0; then @@ -4149,7 +4074,7 @@
RUN_JOB="$BINDIR/exeddm $RUN_JOB -ddm $ddm_arc "
fi
-$RUN_JOB
+ $RUN_JOB
if test $nprocd -gt 1
then
@@ -4114,42 +4039,42 @@ then
counter=0
if test -f "$host_filt"
then
- for i in `$AWK -v n=$numfield '{print $n}' $host_filt`
- do
- ibase=${i%%.*}
- if test $ibase != $thishost
+ for i in `$AWK -v n=$numfield '{print $n}' $host_filt`
+ do
+ ibase=${i%%.*}
+ if test $ibase != $thishost
+ then
+ counter=$((counter+1))
+ DIR1=$DIRJOB
+ line=`grep -v '^#' $userhost | grep "^$ibase "`
+ workdir=`echo $line | $AWK '{print $3}'`
+ if test -n "$workdir"
then
- counter=$((counter+1))
- DIR1=$DIRJOB
- line=`grep -v '^#' $userhost | grep "^$ibase "`
- workdir=`echo $line | $AWK '{print $3}'`
- if test -n "$workdir"
- then
- DIR1=$workdir
- fi
- # if an incompatible host uses shared directory,
- # then the root machine deletes the executable
- if test ${dirstatus[$counter]} = "shared" -a ${compstatus[$counter]} = "no"
- then
- hname=_$ibase
- /bin/rm ${execname}$hname
- fi
- # if local directory used, the remote machine
- # deletes the executable
- if test ${dirstatus[$counter]} = "local"
- then
- $RSH $i /bin/rm $DIR1/${execname} 2>/dev/null
- fi
+ DIR1=$workdir
fi
- done
- fi
+ # if an incompatible host uses shared directory,
+ # then the root machine deletes the executable
+ if test ${dirstatus[$counter]} = "shared" -a ${compstatus[$counter]} = "no"
+ then
+ hname=_$ibase
+ /bin/rm ${execname}$hname
+ fi
+ # if local directory used, the remote machine
+ # deletes the executable
+ if test ${dirstatus[$counter]} = "local"
+ then
+ $RSH $i /bin/rm $DIR1/${execname} 2>/dev/null
+ fi
+ fi
+ done
fi
fi
fi
+fi
else else
#dllrun >0 #dllrun >0
if test $cpdll = yes; then if test $cpdll = yes; then

6
install/MarcMentat/2022.1/Mentat_bin/submit4.patch vendored
View File

@ -1,6 +1,6 @@
--- ---
+++ +++
@@ -63,10 +64,10 @@ doe_nparallel=$6 @@ -63,10 +63,10 @@
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
slv="-iam sfm" slv="-iam sfm"
fi fi
@ -13,7 +13,7 @@
slv="-iam datfit" slv="-iam datfit"
fi fi
@@ -91,6 +92,7 @@ if [ "$srcfile" != "" -a "$srcfile" != "-" ]; then @@ -91,6 +91,7 @@
srcfile="-u $srcfile -save y" srcfile="-u $srcfile -save y"
;; ;;
runsaved) runsaved)
@ -21,7 +21,7 @@
srcfile="-prog $srcfile" srcfile="-prog $srcfile"
;; ;;
esac esac
@@ -189,12 +191,12 @@ unset PYTHONHOME @@ -189,12 +190,12 @@
unset PYTHONPATH unset PYTHONPATH
if [ "$doe_first" = "-" ]; then # submit of regular Marc job if [ "$doe_first" = "-" ]; then # submit of regular Marc job

6
install/MarcMentat/2022.1/Mentat_bin/submit5.patch vendored
View File

@ -1,6 +1,6 @@
--- ---
+++ +++
@@ -63,10 +64,10 @@ doe_nparallel=$6 @@ -63,10 +63,10 @@
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
slv="-iam sfm" slv="-iam sfm"
fi fi
@ -13,7 +13,7 @@
slv="-iam datfit" slv="-iam datfit"
fi fi
@@ -91,6 +92,7 @@ if [ "$srcfile" != "" -a "$srcfile" != "-" ]; then @@ -91,6 +91,7 @@
srcfile="-u $srcfile -save y" srcfile="-u $srcfile -save y"
;; ;;
runsaved) runsaved)
@ -21,7 +21,7 @@
srcfile="-prog $srcfile" srcfile="-prog $srcfile"
;; ;;
esac esac
@@ -189,12 +191,12 @@ unset PYTHONHOME @@ -189,12 +190,12 @@
unset PYTHONPATH unset PYTHONPATH
if [ "$doe_first" = "-" ]; then # submit of regular Marc job if [ "$doe_first" = "-" ]; then # submit of regular Marc job

6
install/MarcMentat/2022.1/Mentat_bin/submit6.patch vendored
View File

@ -1,6 +1,6 @@
--- ---
+++ +++
@@ -63,10 +64,10 @@ doe_nparallel=$6 @@ -63,10 +63,10 @@
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
slv="-iam sfm" slv="-iam sfm"
fi fi
@ -13,7 +13,7 @@
slv="-iam datfit" slv="-iam datfit"
fi fi
@@ -91,6 +92,7 @@ if [ "$srcfile" != "" -a "$srcfile" != "-" ]; then @@ -91,6 +91,7 @@
srcfile="-u $srcfile -save y" srcfile="-u $srcfile -save y"
;; ;;
runsaved) runsaved)
@ -21,7 +21,7 @@
srcfile="-prog $srcfile" srcfile="-prog $srcfile"
;; ;;
esac esac
@@ -189,12 +191,12 @@ unset PYTHONHOME @@ -189,12 +190,12 @@
unset PYTHONPATH unset PYTHONPATH
if [ "$doe_first" = "-" ]; then # submit of regular Marc job if [ "$doe_first" = "-" ]; then # submit of regular Marc job

15
install/MarcMentat/2022.1/Mentat_menus/job_run.ms.patch vendored
View File

@ -1,6 +1,6 @@
--- ---
+++ +++
@@ -261,11 +261,18 @@ popmenu job_run_popmenu { @@ -261,12 +261,19 @@
} }
button { button {
position +25 = position +25 =
@ -10,21 +10,21 @@
help "job_run#Job Submission And Control" help "job_run#Job Submission And Control"
popmenu job_submit_adv_pm popmenu job_submit_adv_pm
} }
+ button { button {
+ position +18 = + position +18 =
+ size 7 4 + size 7 4
+ text "DAMASK" + text "DAMASK"
+ help "damask_run#Job Submission And Control" + help "damask_run#Job Submission And Control"
+ popmenu damask + popmenu damask
+ } + }
button { + button {
position 0 +4 position 0 +4
size 12 4 size 12 4
@@ -1189,6 +1196,135 @@ popmenu job_submit_adv_pm { text "UPDATE"
} @@ -1190,6 +1197,135 @@
+#-------------------------------------------------------------------------------------------------- #--------------------------------------------------------------------------------------------------
+popmenu damask { +popmenu damask {
+ +
+#ifdef QT_MENTAT +#ifdef QT_MENTAT
@ -153,6 +153,7 @@
+ mode permanent + mode permanent
+} +}
+ +
#-------------------------------------------------------------------------------------------------- +#--------------------------------------------------------------------------------------------------
popmenu job_exit_msg_pm { popmenu job_exit_msg_pm {
text "EXIT MESSAGE"