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"