From ea9621987148e236183e787ea92494c61467a5da Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 10 Sep 2022 12:39:54 +0200 Subject: [PATCH 01/10] white space issue --- install/MarcMentat/2022.1/Marc_tools/comp_damask_hmp.patch | 2 +- install/MarcMentat/2022.1/Marc_tools/comp_damask_lmp.patch | 2 +- install/MarcMentat/2022.1/Marc_tools/comp_damask_mp.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install/MarcMentat/2022.1/Marc_tools/comp_damask_hmp.patch b/install/MarcMentat/2022.1/Marc_tools/comp_damask_hmp.patch index 8dda8e1ce..ac1794163 100644 --- a/install/MarcMentat/2022.1/Marc_tools/comp_damask_hmp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/comp_damask_hmp.patch @@ -46,4 +46,4 @@ /bin/rm $userobj + /bin/rm $DIRJOB/*.mod + /bin/rm $DIRJOB/*.smod -+ /bin/rm $DIRJOB/*_genmod.f90 ++ /bin/rm $DIRJOB/*_genmod.f90 diff --git a/install/MarcMentat/2022.1/Marc_tools/comp_damask_lmp.patch b/install/MarcMentat/2022.1/Marc_tools/comp_damask_lmp.patch index 6ea9c098f..8f1a82df9 100644 --- a/install/MarcMentat/2022.1/Marc_tools/comp_damask_lmp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/comp_damask_lmp.patch @@ -46,4 +46,4 @@ /bin/rm $userobj + /bin/rm $DIRJOB/*.mod + /bin/rm $DIRJOB/*.smod -+ /bin/rm $DIRJOB/*_genmod.f90 ++ /bin/rm $DIRJOB/*_genmod.f90 diff --git a/install/MarcMentat/2022.1/Marc_tools/comp_damask_mp.patch b/install/MarcMentat/2022.1/Marc_tools/comp_damask_mp.patch index 3316227d6..8e38fccd9 100644 --- a/install/MarcMentat/2022.1/Marc_tools/comp_damask_mp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/comp_damask_mp.patch @@ -46,4 +46,4 @@ /bin/rm $userobj + /bin/rm $DIRJOB/*.mod + /bin/rm $DIRJOB/*.smod -+ /bin/rm $DIRJOB/*_genmod.f90 ++ /bin/rm $DIRJOB/*_genmod.f90 From a9aa222961193c7c0140c4446556880e40db7716 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 10 Sep 2022 12:40:39 +0200 Subject: [PATCH 02/10] ignore whitespaces in diff use diff -ub to get nice patch --- .../2022.1/Marc_tools/run_damask_hmp.patch | 275 +++------------- .../2022.1/Marc_tools/run_damask_lmp.patch | 275 +++------------- .../2022.1/Marc_tools/run_damask_mp.patch | 295 +++--------------- 3 files changed, 105 insertions(+), 740 deletions(-) diff --git a/install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch b/install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch index e3a364e00..7a0fce208 100644 --- a/install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch @@ -1,6 +1,6 @@ ---- -+++ -@@ -302,7 +302,23 @@ fi +--- run_damask_hmp.orig 2022-09-10 12:21:10.390110879 +0200 ++++ run_damask_hmp 2022-09-10 12:32:42.804232871 +0200 +@@ -302,7 +302,23 @@ . "$DIR/getarch" @@ -24,7 +24,7 @@ # # -@@ -405,7 +421,7 @@ sid= +@@ -405,7 +421,7 @@ did= vid= user= @@ -33,16 +33,7 @@ objs= qid=background cpu= -@@ -573,7 +589,7 @@ do - justlist=yes - ;; - -fe* | -FE*) -- feature=$value -+ feature=$value - - ;; - -pr* | -PR*) -@@ -676,50 +692,19 @@ do +@@ -676,50 +692,19 @@ esac ;; -u* | -U*) @@ -99,39 +90,7 @@ ;; -obj | -OBJ) objs="$value" -@@ -739,19 +724,19 @@ do - ;; - 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 +@@ -1207,12 +1192,12 @@ fi fi fi @@ -147,16 +106,7 @@ fi fi if test "$objs" -@@ -1386,7 +1371,7 @@ else - else - error="$error - job id required" -- fi -+fi - fi - - case $qid in -@@ -1531,7 +1516,7 @@ Program name : $prog +@@ -1531,7 +1516,7 @@ Marc shared lib : $progdll Version type : $mode Job ID : $DIRJID/$jid$extra_job_info @@ -165,7 +115,7 @@ User objects/libs : $objs Restart file job ID : $rid Substructure file ID : $sid -@@ -1564,7 +1549,7 @@ Program name : $prog +@@ -1564,7 +1549,7 @@ Marc shared lib : $progdll Version type : $mode Job ID : $DIRJID/$jid$extra_job_info @@ -174,7 +124,7 @@ User objects/libs : $objs Restart file job ID : $rid Substructure file ID : $sid -@@ -1687,7 +1672,7 @@ Program name ($prog)? $ECHOTXT" +@@ -1687,7 +1672,7 @@ ;; esac fi @@ -183,7 +133,7 @@ read value if test "$value" then -@@ -1696,50 +1681,19 @@ Program name ($prog)? $ECHOTXT" +@@ -1696,50 +1681,19 @@ user= ;; *) @@ -209,16 +159,13 @@ - fi + user=$value case $user in -- \/*) -- ;; -- *) -+ \/*) -+ ;; -+ *) + \/*) + ;; + *) user=`pwd`/$user - usersubname=`pwd`/$usersubname -- ;; -- esac + ;; + esac - if test ! -f $usersubname - then - if test -f $usersubname.f @@ -235,8 +182,6 @@ - usersubname=$usersubname.F90 - fi - fi -+ ;; -+ esac + usernoext=$user + usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f` + usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F` @@ -245,7 +190,7 @@ ;; esac fi -@@ -2274,11 +2228,12 @@ fi +@@ -2274,11 +2228,12 @@ # # user subroutine used # @@ -260,7 +205,7 @@ case $program in \/* | \.\/*) bd= -@@ -2391,7 +2346,7 @@ fi +@@ -2391,7 +2346,7 @@ fi if test "$user" then @@ -269,7 +214,7 @@ usersub=1 fi export execpath -@@ -3274,44 +3229,27 @@ then +@@ -3274,44 +3229,27 @@ echo if test "$user" then @@ -319,21 +264,15 @@ fi -@@ -3331,10 +3269,11 @@ then +@@ -3331,6 +3269,7 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ -- $SFLIB \ + $DAMASK \ -+ $SFLIB \ + $SFLIB \ $OPENSSL_LIB \ $SYSLIBS \ -- $SECLIBS || \ -+ $SECLIBS || \ - { - echo "$0: link failed for ${user:+$userobj }$objs" - exit 1 -@@ -3344,6 +3283,9 @@ else +@@ -3344,6 +3283,9 @@ prgsav=yes fi /bin/rm $userobj 2>/dev/null @@ -343,7 +282,7 @@ # # run marc -@@ -3390,7 +3332,7 @@ if test $dllrun -eq 0; then +@@ -3390,7 +3332,7 @@ fi else if test $cpdll = yes; then @@ -352,7 +291,7 @@ /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null fi if test $rmdll = yes -@@ -3556,7 +3498,7 @@ then +@@ -3556,7 +3498,7 @@ # first copy over the user sub if local directories if test ${dirstatus[$counter]} = "local" then @@ -361,7 +300,7 @@ fi # do the compilation on the other machine if test ${dirstatus[$counter]} = "shared" -@@ -3569,21 +3511,21 @@ then +@@ -3569,21 +3511,21 @@ remoteuser=$DIR1/`$BASENAME $user` $RSH $i /bin/rm $remoteprog 2> /dev/null echo @@ -386,7 +325,7 @@ fi fi fi -@@ -3593,39 +3535,27 @@ then +@@ -3593,39 +3535,27 @@ if test "$userhost" then echo @@ -432,21 +371,15 @@ fi # if test $user -@@ -3645,10 +3575,11 @@ then +@@ -3645,6 +3575,7 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ -- $SFLIB \ + $DAMASK \ -+ $SFLIB \ + $SFLIB \ $OPENSSL_LIB \ $SYSLIBS \ -- $SECLIBS || \ -+ $SECLIBS || \ - { - echo "$0: link failed for ${user:+$userobj }$objs" - echo " $PRODUCT Exit number 3" -@@ -3686,6 +3617,9 @@ else # if test $link +@@ -3686,6 +3617,9 @@ prgsav=yes fi # if test $link /bin/rm $userobj 2>/dev/null @@ -456,69 +389,7 @@ # # run marc -@@ -3744,42 +3678,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 +@@ -3779,7 +3713,7 @@ else #dllrun >0 if test $cpdll = yes; then @@ -527,7 +398,7 @@ /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null fi if test $rmdll = yes;then -@@ -3904,7 +3838,7 @@ then +@@ -3904,7 +3838,7 @@ # first copy over the user sub if local directories if test ${dirstatus[$counter]} = "local" then @@ -536,7 +407,7 @@ fi # do the compilation on the other machine if test ${dirstatus[$counter]} = "shared" -@@ -3917,20 +3851,20 @@ then +@@ -3917,20 +3851,20 @@ remoteuser=$DIR1/`$BASENAME $user` $RSH $i /bin/rm $remoteprog 2> /dev/null echo @@ -560,7 +431,7 @@ fi fi fi -@@ -3940,37 +3874,25 @@ then +@@ -3940,37 +3874,25 @@ if test "$userhost" then echo @@ -604,7 +475,7 @@ fi # if test $user -@@ -3990,10 +3912,11 @@ then +@@ -3990,6 +3912,7 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ @@ -612,12 +483,7 @@ $SFLIB \ $OPENSSL_LIB \ $SYSLIBS \ -- $SECLIBS || \ -+ $SECLIBS || \ - { - echo "$0: link failed for ${user:+$userobj }$objs" - exit 1 -@@ -4030,7 +3953,9 @@ else # if test $link +@@ -4030,7 +3953,9 @@ prgsav=yes fi # if test $link /bin/rm $userobj 2>/dev/null @@ -628,78 +494,7 @@ # done if no job id given if test -z "$jid" then -@@ -4070,7 +3995,7 @@ if test $ddm_arc -gt 0; then - 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 +@@ -4149,7 +4074,7 @@ else #dllrun >0 if test $cpdll = yes; then diff --git a/install/MarcMentat/2022.1/Marc_tools/run_damask_lmp.patch b/install/MarcMentat/2022.1/Marc_tools/run_damask_lmp.patch index a5989bfca..ec2bccb77 100644 --- a/install/MarcMentat/2022.1/Marc_tools/run_damask_lmp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/run_damask_lmp.patch @@ -1,6 +1,6 @@ ---- -+++ -@@ -302,7 +302,23 @@ fi +--- run_damask_lmp.orig 2022-09-10 12:21:10.760114849 +0200 ++++ run_damask_lmp 2022-09-10 12:31:51.623680675 +0200 +@@ -302,7 +302,23 @@ . "$DIR/getarch" @@ -24,7 +24,7 @@ # # -@@ -405,7 +421,7 @@ sid= +@@ -405,7 +421,7 @@ did= vid= user= @@ -33,16 +33,7 @@ objs= qid=background cpu= -@@ -573,7 +589,7 @@ do - justlist=yes - ;; - -fe* | -FE*) -- feature=$value -+ feature=$value - - ;; - -pr* | -PR*) -@@ -676,50 +692,19 @@ do +@@ -676,50 +692,19 @@ esac ;; -u* | -U*) @@ -99,39 +90,7 @@ ;; -obj | -OBJ) objs="$value" -@@ -739,19 +724,19 @@ do - ;; - 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 +@@ -1207,12 +1192,12 @@ fi fi fi @@ -147,16 +106,7 @@ fi fi if test "$objs" -@@ -1386,7 +1371,7 @@ else - else - error="$error - job id required" -- fi -+fi - fi - - case $qid in -@@ -1531,7 +1516,7 @@ Program name : $prog +@@ -1531,7 +1516,7 @@ Marc shared lib : $progdll Version type : $mode Job ID : $DIRJID/$jid$extra_job_info @@ -165,7 +115,7 @@ User objects/libs : $objs Restart file job ID : $rid Substructure file ID : $sid -@@ -1564,7 +1549,7 @@ Program name : $prog +@@ -1564,7 +1549,7 @@ Marc shared lib : $progdll Version type : $mode Job ID : $DIRJID/$jid$extra_job_info @@ -174,7 +124,7 @@ User objects/libs : $objs Restart file job ID : $rid Substructure file ID : $sid -@@ -1687,7 +1672,7 @@ Program name ($prog)? $ECHOTXT" +@@ -1687,7 +1672,7 @@ ;; esac fi @@ -183,7 +133,7 @@ read value if test "$value" then -@@ -1696,50 +1681,19 @@ Program name ($prog)? $ECHOTXT" +@@ -1696,50 +1681,19 @@ user= ;; *) @@ -209,16 +159,13 @@ - fi + user=$value case $user in -- \/*) -- ;; -- *) -+ \/*) -+ ;; -+ *) + \/*) + ;; + *) user=`pwd`/$user - usersubname=`pwd`/$usersubname -- ;; -- esac + ;; + esac - if test ! -f $usersubname - then - if test -f $usersubname.f @@ -235,8 +182,6 @@ - usersubname=$usersubname.F90 - fi - fi -+ ;; -+ esac + usernoext=$user + usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f` + usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F` @@ -245,7 +190,7 @@ ;; esac fi -@@ -2274,11 +2228,12 @@ fi +@@ -2274,11 +2228,12 @@ # # user subroutine used # @@ -260,7 +205,7 @@ case $program in \/* | \.\/*) bd= -@@ -2391,7 +2346,7 @@ fi +@@ -2391,7 +2346,7 @@ fi if test "$user" then @@ -269,7 +214,7 @@ usersub=1 fi export execpath -@@ -3274,44 +3229,27 @@ then +@@ -3274,44 +3229,27 @@ echo if test "$user" then @@ -319,21 +264,15 @@ fi -@@ -3331,10 +3269,11 @@ then +@@ -3331,6 +3269,7 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ -- $SFLIB \ + $DAMASK \ -+ $SFLIB \ + $SFLIB \ $OPENSSL_LIB \ $SYSLIBS \ -- $SECLIBS || \ -+ $SECLIBS || \ - { - echo "$0: link failed for ${user:+$userobj }$objs" - exit 1 -@@ -3344,6 +3283,9 @@ else +@@ -3344,6 +3283,9 @@ prgsav=yes fi /bin/rm $userobj 2>/dev/null @@ -343,7 +282,7 @@ # # run marc -@@ -3390,7 +3332,7 @@ if test $dllrun -eq 0; then +@@ -3390,7 +3332,7 @@ fi else if test $cpdll = yes; then @@ -352,7 +291,7 @@ /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null fi if test $rmdll = yes -@@ -3556,7 +3498,7 @@ then +@@ -3556,7 +3498,7 @@ # first copy over the user sub if local directories if test ${dirstatus[$counter]} = "local" then @@ -361,7 +300,7 @@ fi # do the compilation on the other machine if test ${dirstatus[$counter]} = "shared" -@@ -3569,21 +3511,21 @@ then +@@ -3569,21 +3511,21 @@ remoteuser=$DIR1/`$BASENAME $user` $RSH $i /bin/rm $remoteprog 2> /dev/null echo @@ -386,7 +325,7 @@ fi fi fi -@@ -3593,39 +3535,27 @@ then +@@ -3593,39 +3535,27 @@ if test "$userhost" then echo @@ -432,21 +371,15 @@ fi # if test $user -@@ -3645,10 +3575,11 @@ then +@@ -3645,6 +3575,7 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ -- $SFLIB \ + $DAMASK \ -+ $SFLIB \ + $SFLIB \ $OPENSSL_LIB \ $SYSLIBS \ -- $SECLIBS || \ -+ $SECLIBS || \ - { - echo "$0: link failed for ${user:+$userobj }$objs" - echo " $PRODUCT Exit number 3" -@@ -3686,6 +3617,9 @@ else # if test $link +@@ -3686,6 +3617,9 @@ prgsav=yes fi # if test $link /bin/rm $userobj 2>/dev/null @@ -456,69 +389,7 @@ # # run marc -@@ -3744,42 +3678,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 +@@ -3779,7 +3713,7 @@ else #dllrun >0 if test $cpdll = yes; then @@ -527,7 +398,7 @@ /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null fi if test $rmdll = yes;then -@@ -3904,7 +3838,7 @@ then +@@ -3904,7 +3838,7 @@ # first copy over the user sub if local directories if test ${dirstatus[$counter]} = "local" then @@ -536,7 +407,7 @@ fi # do the compilation on the other machine if test ${dirstatus[$counter]} = "shared" -@@ -3917,20 +3851,20 @@ then +@@ -3917,20 +3851,20 @@ remoteuser=$DIR1/`$BASENAME $user` $RSH $i /bin/rm $remoteprog 2> /dev/null echo @@ -560,7 +431,7 @@ fi fi fi -@@ -3940,37 +3874,25 @@ then +@@ -3940,37 +3874,25 @@ if test "$userhost" then echo @@ -604,7 +475,7 @@ fi # if test $user -@@ -3990,10 +3912,11 @@ then +@@ -3990,6 +3912,7 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ @@ -612,12 +483,7 @@ $SFLIB \ $OPENSSL_LIB \ $SYSLIBS \ -- $SECLIBS || \ -+ $SECLIBS || \ - { - echo "$0: link failed for ${user:+$userobj }$objs" - exit 1 -@@ -4030,7 +3953,9 @@ else # if test $link +@@ -4030,7 +3953,9 @@ prgsav=yes fi # if test $link /bin/rm $userobj 2>/dev/null @@ -628,78 +494,7 @@ # done if no job id given if test -z "$jid" then -@@ -4070,7 +3995,7 @@ if test $ddm_arc -gt 0; then - 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 +@@ -4149,7 +4074,7 @@ else #dllrun >0 if test $cpdll = yes; then diff --git a/install/MarcMentat/2022.1/Marc_tools/run_damask_mp.patch b/install/MarcMentat/2022.1/Marc_tools/run_damask_mp.patch index 924af6fbd..2e3e543b3 100644 --- a/install/MarcMentat/2022.1/Marc_tools/run_damask_mp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/run_damask_mp.patch @@ -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" -+++ "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 +--- run_damask_mp.orig 2022-09-10 12:21:11.130118821 +0200 ++++ run_damask_mp 2022-09-10 12:32:23.577358746 +0200 +@@ -302,7 +302,23 @@ . "$DIR/getarch" @@ -26,7 +24,7 @@ index 88a3027..85beabe 100644 # # -@@ -405,7 +421,7 @@ sid= +@@ -405,7 +421,7 @@ did= vid= user= @@ -35,16 +33,7 @@ index 88a3027..85beabe 100644 objs= qid=background cpu= -@@ -573,7 +589,7 @@ do - justlist=yes - ;; - -fe* | -FE*) -- feature=$value -+ feature=$value - - ;; - -pr* | -PR*) -@@ -676,50 +692,19 @@ do +@@ -676,50 +692,19 @@ esac ;; -u* | -U*) @@ -101,39 +90,7 @@ index 88a3027..85beabe 100644 ;; -obj | -OBJ) objs="$value" -@@ -739,19 +724,19 @@ do - ;; - 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 +@@ -1207,12 +1192,12 @@ fi fi fi @@ -149,16 +106,7 @@ index 88a3027..85beabe 100644 fi fi if test "$objs" -@@ -1386,7 +1371,7 @@ else - else - error="$error - job id required" -- fi -+fi - fi - - case $qid in -@@ -1531,7 +1516,7 @@ Program name : $prog +@@ -1531,7 +1516,7 @@ Marc shared lib : $progdll Version type : $mode Job ID : $DIRJID/$jid$extra_job_info @@ -167,16 +115,7 @@ index 88a3027..85beabe 100644 User objects/libs : $objs Restart file job ID : $rid Substructure file ID : $sid -@@ -1548,8 +1533,6 @@ GPGPU option : $gpuids - 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 +@@ -1564,7 +1549,7 @@ Marc shared lib : $progdll Version type : $mode Job ID : $DIRJID/$jid$extra_job_info @@ -185,16 +124,7 @@ index 88a3027..85beabe 100644 User objects/libs : $objs Restart file job ID : $rid Substructure file ID : $sid -@@ -1579,6 +1562,8 @@ Solver processes : $nsolverprint - 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" +@@ -1689,7 +1674,7 @@ ;; esac fi @@ -203,7 +133,7 @@ index 88a3027..85beabe 100644 read value if test "$value" then -@@ -1696,50 +1681,19 @@ Program name ($prog)? $ECHOTXT" +@@ -1698,50 +1683,19 @@ user= ;; *) @@ -229,16 +159,13 @@ index 88a3027..85beabe 100644 - fi + user=$value case $user in -- \/*) -- ;; -- *) -+ \/*) -+ ;; -+ *) + \/*) + ;; + *) user=`pwd`/$user - usersubname=`pwd`/$usersubname -- ;; -- esac + ;; + esac - if test ! -f $usersubname - then - if test -f $usersubname.f @@ -255,8 +182,6 @@ index 88a3027..85beabe 100644 - usersubname=$usersubname.F90 - fi - fi -+ ;; -+ esac + usernoext=$user + usernoext=`dirname $usernoext`/`$BASENAME $usernoext .f` + usernoext=`dirname $usernoext`/`$BASENAME $usernoext .F` @@ -265,7 +190,7 @@ index 88a3027..85beabe 100644 ;; esac fi -@@ -2274,11 +2228,12 @@ fi +@@ -2276,11 +2230,12 @@ # # user subroutine used # @@ -280,7 +205,7 @@ index 88a3027..85beabe 100644 case $program in \/* | \.\/*) bd= -@@ -2391,7 +2346,7 @@ fi +@@ -2393,7 +2348,7 @@ fi if test "$user" then @@ -289,7 +214,7 @@ index 88a3027..85beabe 100644 usersub=1 fi export execpath -@@ -3274,44 +3229,27 @@ then +@@ -3276,44 +3231,27 @@ echo if test "$user" then @@ -339,21 +264,15 @@ index 88a3027..85beabe 100644 fi -@@ -3331,10 +3269,11 @@ then +@@ -3333,6 +3271,7 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ -- $SFLIB \ + $DAMASK \ -+ $SFLIB \ + $SFLIB \ $OPENSSL_LIB \ $SYSLIBS \ -- $SECLIBS || \ -+ $SECLIBS || \ - { - echo "$0: link failed for ${user:+$userobj }$objs" - exit 1 -@@ -3344,6 +3283,9 @@ else +@@ -3346,6 +3285,9 @@ prgsav=yes fi /bin/rm $userobj 2>/dev/null @@ -363,7 +282,7 @@ index 88a3027..85beabe 100644 # # run marc -@@ -3390,7 +3332,7 @@ if test $dllrun -eq 0; then +@@ -3392,7 +3334,7 @@ fi else if test $cpdll = yes; then @@ -372,7 +291,7 @@ index 88a3027..85beabe 100644 /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null fi if test $rmdll = yes -@@ -3556,7 +3498,7 @@ then +@@ -3558,7 +3500,7 @@ # first copy over the user sub if local directories if test ${dirstatus[$counter]} = "local" then @@ -381,7 +300,7 @@ index 88a3027..85beabe 100644 fi # do the compilation on the other machine if test ${dirstatus[$counter]} = "shared" -@@ -3569,21 +3511,21 @@ then +@@ -3571,21 +3513,21 @@ remoteuser=$DIR1/`$BASENAME $user` $RSH $i /bin/rm $remoteprog 2> /dev/null echo @@ -406,7 +325,7 @@ index 88a3027..85beabe 100644 fi fi fi -@@ -3593,39 +3535,27 @@ then +@@ -3595,39 +3537,27 @@ if test "$userhost" then echo @@ -452,21 +371,15 @@ index 88a3027..85beabe 100644 fi # if test $user -@@ -3645,10 +3575,11 @@ then +@@ -3647,6 +3577,7 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ -- $SFLIB \ + $DAMASK \ -+ $SFLIB \ + $SFLIB \ $OPENSSL_LIB \ $SYSLIBS \ -- $SECLIBS || \ -+ $SECLIBS || \ - { - echo "$0: link failed for ${user:+$userobj }$objs" - echo " $PRODUCT Exit number 3" -@@ -3686,6 +3617,9 @@ else # if test $link +@@ -3688,6 +3619,9 @@ prgsav=yes fi # if test $link /bin/rm $userobj 2>/dev/null @@ -476,69 +389,7 @@ index 88a3027..85beabe 100644 # # run marc -@@ -3744,42 +3678,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 +@@ -3781,7 +3715,7 @@ else #dllrun >0 if test $cpdll = yes; then @@ -547,7 +398,7 @@ index 88a3027..85beabe 100644 /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null fi if test $rmdll = yes;then -@@ -3904,7 +3838,7 @@ then +@@ -3906,7 +3840,7 @@ # first copy over the user sub if local directories if test ${dirstatus[$counter]} = "local" then @@ -556,7 +407,7 @@ index 88a3027..85beabe 100644 fi # do the compilation on the other machine if test ${dirstatus[$counter]} = "shared" -@@ -3917,20 +3851,20 @@ then +@@ -3919,20 +3853,20 @@ remoteuser=$DIR1/`$BASENAME $user` $RSH $i /bin/rm $remoteprog 2> /dev/null echo @@ -580,7 +431,7 @@ index 88a3027..85beabe 100644 fi fi fi -@@ -3940,37 +3874,25 @@ then +@@ -3942,37 +3876,25 @@ if test "$userhost" then echo @@ -624,7 +475,7 @@ index 88a3027..85beabe 100644 fi # if test $user -@@ -3990,10 +3912,11 @@ then +@@ -3992,6 +3914,7 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ @@ -632,12 +483,7 @@ index 88a3027..85beabe 100644 $SFLIB \ $OPENSSL_LIB \ $SYSLIBS \ -- $SECLIBS || \ -+ $SECLIBS || \ - { - echo "$0: link failed for ${user:+$userobj }$objs" - exit 1 -@@ -4030,7 +3953,9 @@ else # if test $link +@@ -4032,7 +3955,9 @@ prgsav=yes fi # if test $link /bin/rm $userobj 2>/dev/null @@ -648,78 +494,7 @@ index 88a3027..85beabe 100644 # done if no job id given if test -z "$jid" then -@@ -4070,7 +3995,7 @@ if test $ddm_arc -gt 0; then - 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 +@@ -4151,7 +4076,7 @@ else #dllrun >0 if test $cpdll = yes; then From afc3622366593ad64d63d16846dfe7f5848ee8df Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 10 Sep 2022 13:04:20 +0200 Subject: [PATCH 03/10] precision is set explicitly via Fortran kinds --- .../MarcMentat/2022.1/Marc_tools/include_linux64.patch | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch b/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch index d11e84f1a..7263d8094 100644 --- a/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch +++ b/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch @@ -16,16 +16,6 @@ # AEM if test "$MARCDLLOUTDIR" = ""; then DLLOUTDIR="$MARC_LIB" -@@ -477,8 +486,8 @@ if test "$MARC_INTEGER_SIZE" = "i4" ; then - 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" fi From e24e7f9121aa31a65a158e5945fc6be1074c331d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 10 Sep 2022 13:04:57 +0200 Subject: [PATCH 04/10] shared-intel seems to cause no issues (anymore) --- .../2022.1/Marc_tools/include_linux64.patch | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch b/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch index 7263d8094..de272f18b 100644 --- a/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch +++ b/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch @@ -73,21 +73,3 @@ SOLVERLIBS_DLL=${SOLVERLIBS} 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 From a2b075c031575087d1d892e73a4d68db4de9298f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 10 Sep 2022 13:07:06 +0200 Subject: [PATCH 05/10] cleaning --- .../2022.1/Marc_tools/run_damask_hmp.patch | 4 +- .../2022.1/Marc_tools/run_damask_lmp.patch | 4 +- .../2022.1/Marc_tools/run_damask_mp.patch | 60 +++++++++---------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch b/install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch index 7a0fce208..91fa545c4 100644 --- a/install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch @@ -1,5 +1,5 @@ ---- run_damask_hmp.orig 2022-09-10 12:21:10.390110879 +0200 -+++ run_damask_hmp 2022-09-10 12:32:42.804232871 +0200 +--- ++++ @@ -302,7 +302,23 @@ . "$DIR/getarch" diff --git a/install/MarcMentat/2022.1/Marc_tools/run_damask_lmp.patch b/install/MarcMentat/2022.1/Marc_tools/run_damask_lmp.patch index ec2bccb77..21ed967f6 100644 --- a/install/MarcMentat/2022.1/Marc_tools/run_damask_lmp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/run_damask_lmp.patch @@ -1,5 +1,5 @@ ---- run_damask_lmp.orig 2022-09-10 12:21:10.760114849 +0200 -+++ run_damask_lmp 2022-09-10 12:31:51.623680675 +0200 +--- ++++ @@ -302,7 +302,23 @@ . "$DIR/getarch" diff --git a/install/MarcMentat/2022.1/Marc_tools/run_damask_mp.patch b/install/MarcMentat/2022.1/Marc_tools/run_damask_mp.patch index 2e3e543b3..cdeeecf4b 100644 --- a/install/MarcMentat/2022.1/Marc_tools/run_damask_mp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/run_damask_mp.patch @@ -1,5 +1,5 @@ ---- run_damask_mp.orig 2022-09-10 12:21:11.130118821 +0200 -+++ run_damask_mp 2022-09-10 12:32:23.577358746 +0200 +--- ++++ @@ -302,7 +302,23 @@ . "$DIR/getarch" @@ -124,7 +124,7 @@ User objects/libs : $objs Restart file job ID : $rid Substructure file ID : $sid -@@ -1689,7 +1674,7 @@ +@@ -1687,7 +1672,7 @@ ;; esac fi @@ -133,7 +133,7 @@ read value if test "$value" then -@@ -1698,50 +1683,19 @@ +@@ -1696,50 +1681,19 @@ user= ;; *) @@ -190,7 +190,7 @@ ;; esac fi -@@ -2276,11 +2230,12 @@ +@@ -2274,11 +2228,12 @@ # # user subroutine used # @@ -205,7 +205,7 @@ case $program in \/* | \.\/*) bd= -@@ -2393,7 +2348,7 @@ +@@ -2391,7 +2346,7 @@ fi if test "$user" then @@ -214,7 +214,7 @@ usersub=1 fi export execpath -@@ -3276,44 +3231,27 @@ +@@ -3274,44 +3229,27 @@ echo if test "$user" then @@ -240,7 +240,7 @@ if test $MACHINENAME = "CRAY" then - $FORTRAN $usersub || \ -+ $DFORTRANMP $user || \ ++ $DFORTHIGHMP $user || \ { - echo "$0: compile failed for $user.f" + echo "$0: compile failed for $user" @@ -249,7 +249,7 @@ /bin/rm $program 2>/dev/null else - $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" @@ -264,7 +264,7 @@ fi -@@ -3333,6 +3271,7 @@ +@@ -3331,6 +3269,7 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ @@ -272,7 +272,7 @@ $SFLIB \ $OPENSSL_LIB \ $SYSLIBS \ -@@ -3346,6 +3285,9 @@ +@@ -3344,6 +3283,9 @@ prgsav=yes fi /bin/rm $userobj 2>/dev/null @@ -282,7 +282,7 @@ # # run marc -@@ -3392,7 +3334,7 @@ +@@ -3390,7 +3332,7 @@ fi else if test $cpdll = yes; then @@ -291,7 +291,7 @@ /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null fi if test $rmdll = yes -@@ -3558,7 +3500,7 @@ +@@ -3556,7 +3498,7 @@ # first copy over the user sub if local directories if test ${dirstatus[$counter]} = "local" then @@ -300,12 +300,12 @@ fi # do the compilation on the other machine if test ${dirstatus[$counter]} = "shared" -@@ -3571,21 +3513,21 @@ +@@ -3569,21 +3511,21 @@ remoteuser=$DIR1/`$BASENAME $user` $RSH $i /bin/rm $remoteprog 2> /dev/null echo - $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 line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` if test "$line" @@ -325,7 +325,7 @@ fi fi fi -@@ -3595,39 +3537,27 @@ +@@ -3593,39 +3535,27 @@ if test "$userhost" then echo @@ -345,7 +345,7 @@ if test $MACHINENAME = "CRAY" then - $FORTRAN $usersub || \ -+ $DFORTRANMP $user || \ ++ $DFORTHIGHMP $user || \ { - echo "$0: compile failed for $user.f" + echo "$0: compile failed for $user" @@ -355,7 +355,7 @@ /bin/rm $program 2>/dev/null else - $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" @@ -371,7 +371,7 @@ fi # if test $user -@@ -3647,6 +3577,7 @@ +@@ -3645,6 +3575,7 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ @@ -379,7 +379,7 @@ $SFLIB \ $OPENSSL_LIB \ $SYSLIBS \ -@@ -3688,6 +3619,9 @@ +@@ -3686,6 +3617,9 @@ prgsav=yes fi # if test $link /bin/rm $userobj 2>/dev/null @@ -389,7 +389,7 @@ # # run marc -@@ -3781,7 +3715,7 @@ +@@ -3779,7 +3713,7 @@ else #dllrun >0 if test $cpdll = yes; then @@ -398,7 +398,7 @@ /bin/cp $DIRJOB/$marcdll $DIRJOB/${filename}_$marcdll 2>/dev/null fi if test $rmdll = yes;then -@@ -3906,7 +3840,7 @@ +@@ -3904,7 +3838,7 @@ # first copy over the user sub if local directories if test ${dirstatus[$counter]} = "local" then @@ -407,12 +407,12 @@ fi # do the compilation on the other machine if test ${dirstatus[$counter]} = "shared" -@@ -3919,20 +3853,20 @@ +@@ -3917,20 +3851,20 @@ remoteuser=$DIR1/`$BASENAME $user` $RSH $i /bin/rm $remoteprog 2> /dev/null echo - $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 line=`$RSH $i /bin/ls $remoteprog 2> /dev/null` if test "$line" @@ -431,7 +431,7 @@ fi fi fi -@@ -3942,37 +3876,25 @@ +@@ -3940,37 +3874,25 @@ if test "$userhost" then echo @@ -451,7 +451,7 @@ if test $MACHINENAME = "CRAY" then - $FORTRAN $usersub || \ -+ $DFORTRANMP $user || \ ++ $DFORTHIGHMP $user || \ { - echo "$0: compile failed for $user.f" + echo "$0: compile failed for $user" @@ -460,7 +460,7 @@ /bin/rm $program 2>/dev/null else - $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" @@ -475,7 +475,7 @@ fi # if test $user -@@ -3992,6 +3914,7 @@ +@@ -3990,6 +3912,7 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ @@ -483,7 +483,7 @@ $SFLIB \ $OPENSSL_LIB \ $SYSLIBS \ -@@ -4032,7 +3955,9 @@ +@@ -4030,7 +3953,9 @@ prgsav=yes fi # if test $link /bin/rm $userobj 2>/dev/null @@ -494,7 +494,7 @@ # done if no job id given if test -z "$jid" then -@@ -4151,7 +4076,7 @@ +@@ -4149,7 +4074,7 @@ else #dllrun >0 if test $cpdll = yes; then From fd6b2c5e395bb734c10edabcd7919191989454ab Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 29 Sep 2022 15:16:58 +0200 Subject: [PATCH 06/10] standard format --- .../2022.1/Marc_tools/comp_damask_hmp.patch | 2 +- .../2022.1/Marc_tools/comp_damask_lmp.patch | 2 +- .../2022.1/Marc_tools/comp_damask_mp.patch | 2 +- .../2022.1/Marc_tools/include_linux64.patch | 16 ++++++++-------- .../2022.1/Marc_tools/run_damask_hmp.patch | 2 +- .../MarcMentat/2022.1/Mentat_bin/submit4.patch | 6 +++--- .../MarcMentat/2022.1/Mentat_bin/submit5.patch | 6 +++--- .../MarcMentat/2022.1/Mentat_bin/submit6.patch | 6 +++--- .../2022.1/Mentat_menus/job_run.ms.patch | 15 ++++++++------- 9 files changed, 29 insertions(+), 28 deletions(-) diff --git a/install/MarcMentat/2022.1/Marc_tools/comp_damask_hmp.patch b/install/MarcMentat/2022.1/Marc_tools/comp_damask_hmp.patch index ac1794163..886ebf008 100644 --- a/install/MarcMentat/2022.1/Marc_tools/comp_damask_hmp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/comp_damask_hmp.patch @@ -32,7 +32,7 @@ $LOAD ${program} $DIR/lib/main.o\ -@@ -33,9 +42,13 @@ echo "program: $program" +@@ -33,9 +42,13 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ diff --git a/install/MarcMentat/2022.1/Marc_tools/comp_damask_lmp.patch b/install/MarcMentat/2022.1/Marc_tools/comp_damask_lmp.patch index 8f1a82df9..191cb1a53 100644 --- a/install/MarcMentat/2022.1/Marc_tools/comp_damask_lmp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/comp_damask_lmp.patch @@ -32,7 +32,7 @@ $LOAD ${program} $DIR/lib/main.o\ -@@ -33,9 +42,13 @@ echo "program: $program" +@@ -33,9 +42,13 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ diff --git a/install/MarcMentat/2022.1/Marc_tools/comp_damask_mp.patch b/install/MarcMentat/2022.1/Marc_tools/comp_damask_mp.patch index 8e38fccd9..7c9cf7ba7 100644 --- a/install/MarcMentat/2022.1/Marc_tools/comp_damask_mp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/comp_damask_mp.patch @@ -32,7 +32,7 @@ $LOAD ${program} $DIR/lib/main.o\ -@@ -33,9 +42,13 @@ echo "program: $program" +@@ -33,9 +42,13 @@ $TKLIBS \ $MRCLIBS \ $METISLIBS \ diff --git a/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch b/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch index de272f18b..18c92edd5 100644 --- a/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch +++ b/install/MarcMentat/2022.1/Marc_tools/include_linux64.patch @@ -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" fi @@ -16,7 +16,7 @@ # AEM if test "$MARCDLLOUTDIR" = ""; then DLLOUTDIR="$MARC_LIB" -@@ -594,7 +605,7 @@ then +@@ -594,7 +603,7 @@ PROFILE=" $PROFILE -pg" fi @@ -25,7 +25,7 @@ if test "$MTHREAD" = "OPENMP" then FORT_OPT=" $FORT_OPT -qopenmp" -@@ -607,7 +616,7 @@ else +@@ -607,7 +616,7 @@ FORT_OPT=" $FORT_OPT -save -zero" fi if test "$MARCHDF_HDF" = "HDF"; then @@ -34,10 +34,10 @@ fi 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) FORTF90="$FCOMP -c -O3" - + +# determine DAMASK version +if test -n "$DAMASK_USER"; then + DAMASKROOT=`dirname $DAMASK_USER`/.. @@ -64,12 +64,12 @@ if test "$MARCDEBUG" = "ON" then 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} \ -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 $HDF5_LIB $SOLVER2LIBS" - + SOLVERLIBS_DLL=${SOLVERLIBS} if test "$AEM_DLL" -eq 1 diff --git a/install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch b/install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch index 91fa545c4..cdeeecf4b 100644 --- a/install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch +++ b/install/MarcMentat/2022.1/Marc_tools/run_damask_hmp.patch @@ -1,4 +1,4 @@ ---- +--- +++ @@ -302,7 +302,23 @@ diff --git a/install/MarcMentat/2022.1/Mentat_bin/submit4.patch b/install/MarcMentat/2022.1/Mentat_bin/submit4.patch index 3f1371fdb..98c51e76d 100644 --- a/install/MarcMentat/2022.1/Mentat_bin/submit4.patch +++ b/install/MarcMentat/2022.1/Mentat_bin/submit4.patch @@ -1,6 +1,6 @@ --- +++ -@@ -63,10 +64,10 @@ doe_nparallel=$6 +@@ -63,10 +63,10 @@ if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then slv="-iam sfm" fi @@ -13,7 +13,7 @@ slv="-iam datfit" fi -@@ -91,6 +92,7 @@ if [ "$srcfile" != "" -a "$srcfile" != "-" ]; then +@@ -91,6 +91,7 @@ srcfile="-u $srcfile -save y" ;; runsaved) @@ -21,7 +21,7 @@ srcfile="-prog $srcfile" ;; esac -@@ -189,12 +191,12 @@ unset PYTHONHOME +@@ -189,12 +190,12 @@ unset PYTHONPATH if [ "$doe_first" = "-" ]; then # submit of regular Marc job diff --git a/install/MarcMentat/2022.1/Mentat_bin/submit5.patch b/install/MarcMentat/2022.1/Mentat_bin/submit5.patch index 9614d8c69..ab32b1058 100644 --- a/install/MarcMentat/2022.1/Mentat_bin/submit5.patch +++ b/install/MarcMentat/2022.1/Mentat_bin/submit5.patch @@ -1,6 +1,6 @@ --- +++ -@@ -63,10 +64,10 @@ doe_nparallel=$6 +@@ -63,10 +63,10 @@ if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then slv="-iam sfm" fi @@ -13,7 +13,7 @@ slv="-iam datfit" fi -@@ -91,6 +92,7 @@ if [ "$srcfile" != "" -a "$srcfile" != "-" ]; then +@@ -91,6 +91,7 @@ srcfile="-u $srcfile -save y" ;; runsaved) @@ -21,7 +21,7 @@ srcfile="-prog $srcfile" ;; esac -@@ -189,12 +191,12 @@ unset PYTHONHOME +@@ -189,12 +190,12 @@ unset PYTHONPATH if [ "$doe_first" = "-" ]; then # submit of regular Marc job diff --git a/install/MarcMentat/2022.1/Mentat_bin/submit6.patch b/install/MarcMentat/2022.1/Mentat_bin/submit6.patch index a3ed16135..d5ea3cfde 100644 --- a/install/MarcMentat/2022.1/Mentat_bin/submit6.patch +++ b/install/MarcMentat/2022.1/Mentat_bin/submit6.patch @@ -1,6 +1,6 @@ --- +++ -@@ -63,10 +64,10 @@ doe_nparallel=$6 +@@ -63,10 +63,10 @@ if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then slv="-iam sfm" fi @@ -13,7 +13,7 @@ slv="-iam datfit" fi -@@ -91,6 +92,7 @@ if [ "$srcfile" != "" -a "$srcfile" != "-" ]; then +@@ -91,6 +91,7 @@ srcfile="-u $srcfile -save y" ;; runsaved) @@ -21,7 +21,7 @@ srcfile="-prog $srcfile" ;; esac -@@ -189,12 +191,12 @@ unset PYTHONHOME +@@ -189,12 +190,12 @@ unset PYTHONPATH if [ "$doe_first" = "-" ]; then # submit of regular Marc job diff --git a/install/MarcMentat/2022.1/Mentat_menus/job_run.ms.patch b/install/MarcMentat/2022.1/Mentat_menus/job_run.ms.patch index 6cbcf895c..9ff6b8ae0 100644 --- a/install/MarcMentat/2022.1/Mentat_menus/job_run.ms.patch +++ b/install/MarcMentat/2022.1/Mentat_menus/job_run.ms.patch @@ -1,6 +1,6 @@ --- +++ -@@ -261,11 +261,18 @@ popmenu job_run_popmenu { +@@ -261,12 +261,19 @@ } button { position +25 = @@ -10,21 +10,21 @@ help "job_run#Job Submission And Control" popmenu job_submit_adv_pm } -+ button { + button { + position +18 = + size 7 4 + text "DAMASK" + help "damask_run#Job Submission And Control" + popmenu damask + } - button { ++ button { position 0 +4 size 12 4 -@@ -1189,6 +1196,135 @@ popmenu job_submit_adv_pm { - } + text "UPDATE" +@@ -1190,6 +1197,135 @@ -+#-------------------------------------------------------------------------------------------------- + #-------------------------------------------------------------------------------------------------- +popmenu damask { + +#ifdef QT_MENTAT @@ -153,6 +153,7 @@ + mode permanent +} + - #-------------------------------------------------------------------------------------------------- ++#-------------------------------------------------------------------------------------------------- popmenu job_exit_msg_pm { + text "EXIT MESSAGE" From 7eaf47ae98ca211b62d41158451ec2f5b602b05e Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 7 Oct 2022 18:11:41 +0200 Subject: [PATCH 07/10] [skip ci] updated version information after successful test of v3.0.0-alpha6-572-ge5b2ac80e --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1317bf17e..4b673fd9a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha6-564-gaad49b849 +3.0.0-alpha6-572-ge5b2ac80e From 94e9a9a0da27bc23196221b624b87e62a176ebcc Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 8 Oct 2022 19:23:16 +0200 Subject: [PATCH 08/10] migh resolve issue with GitHub actions (Intel) --- .github/workflows/Fortran.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Fortran.yml b/.github/workflows/Fortran.yml index e9175bd53..7b463e7fa 100644 --- a/.github/workflows/Fortran.yml +++ b/.github/workflows/Fortran.yml @@ -2,7 +2,7 @@ name: Grid and Mesh Solver on: [push] env: - PETSC_VERSION: '3.17.1' + PETSC_VERSION: '3.17.4' HOMEBREW_NO_ANALYTICS: 'ON' # Make Homebrew installation a little quicker HOMEBREW_NO_AUTO_UPDATE: 'ON' HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON' From ddb69d22343dad039f156783ebcd417209dad79d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 8 Oct 2022 20:07:56 +0200 Subject: [PATCH 09/10] Intel (classic) has issues on GitHub actions --- .github/workflows/Fortran.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Fortran.yml b/.github/workflows/Fortran.yml index 7b463e7fa..ef63149c8 100644 --- a/.github/workflows/Fortran.yml +++ b/.github/workflows/Fortran.yml @@ -158,7 +158,7 @@ jobs: if: contains( matrix.intel_v, 'classic') run: | cd petsc-${PETSC_VERSION} - ./configure --with-fc=mpiifort --with-cc=mpiicc --with-cxx=mpiicpc \ + ./configure --with-fc=mpiifort --with-cc="mpiicc -cc=icc" --with-cxx="mpiicpc -cxx=icpc" \ --download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib make all From c95e35de7088bceb1b2d4b357c2985d110c5b75b Mon Sep 17 00:00:00 2001 From: Test User Date: Sun, 9 Oct 2022 02:33:15 +0200 Subject: [PATCH 10/10] [skip ci] updated version information after successful test of v3.0.0-alpha6-575-gddb69d223 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4b673fd9a..3209fa3d6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha6-572-ge5b2ac80e +3.0.0-alpha6-575-gddb69d223