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

updated Marc run_damask scripts, linking against BLAS is done by Marc anyway, removed. renamed extension of original files from org to more explicit original

This commit is contained in:
Martin Diehl 2014-05-07 14:29:53 +00:00
parent 13f1607e15
commit 6df66c6349
57 changed files with 190 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
installation/mods_MarcMentat/2010.2/Marc_tools/comp_user.org → installation/mods_MarcMentat/2010.2/Marc_tools/comp_user.original
View File

0
installation/mods_MarcMentat/2010.2/Marc_tools/include_linux64.org → installation/mods_MarcMentat/2010.2/Marc_tools/include_linux64.original
View File

10
installation/mods_MarcMentat/2010.2/Marc_tools/run_damask
View File

@ -1856,8 +1856,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
@ -2835,7 +2835,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3127,7 +3127,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3418,7 +3418,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_h
View File

@ -1856,8 +1856,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
@ -2835,7 +2835,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3127,7 +3127,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3418,7 +3418,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_hmp
View File

@ -1856,8 +1856,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
@ -2835,7 +2835,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3127,7 +3127,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3418,7 +3418,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_l
View File

@ -1856,8 +1856,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
@ -2835,7 +2835,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3127,7 +3127,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3418,7 +3418,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_lmp
View File

@ -1856,8 +1856,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
@ -2835,7 +2835,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3127,7 +3127,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3418,7 +3418,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_mp
View File

@ -1856,8 +1856,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
@ -2835,7 +2835,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3127,7 +3127,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3418,7 +3418,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

0
installation/mods_MarcMentat/2010.2/Marc_tools/run_marc.org → installation/mods_MarcMentat/2010.2/Marc_tools/run_marc.original
View File

0
installation/mods_MarcMentat/2010/Marc_tools/comp_user.org → installation/mods_MarcMentat/2010/Marc_tools/comp_user.original
View File

0
installation/mods_MarcMentat/2010/Marc_tools/include_linux64.org → installation/mods_MarcMentat/2010/Marc_tools/include_linux64.original
View File

10
installation/mods_MarcMentat/2010/Marc_tools/run_damask
View File

@ -1817,8 +1817,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
@ -2771,7 +2771,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"
@ -3062,7 +3062,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"
@ -3352,7 +3352,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"

10
installation/mods_MarcMentat/2010/Marc_tools/run_damask_h
View File

@ -1817,8 +1817,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -2770,7 +2770,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"
@ -3061,7 +3061,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"
@ -3351,7 +3351,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"

10
installation/mods_MarcMentat/2010/Marc_tools/run_damask_hmp
View File

@ -1817,8 +1817,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
@ -2771,7 +2771,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"
@ -3062,7 +3062,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"
@ -3352,7 +3352,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"

10
installation/mods_MarcMentat/2010/Marc_tools/run_damask_l
View File

@ -1817,8 +1817,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
@ -2771,7 +2771,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"
@ -3062,7 +3062,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"
@ -3352,7 +3352,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"

10
installation/mods_MarcMentat/2010/Marc_tools/run_damask_lmp
View File

@ -1817,8 +1817,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
@ -2771,7 +2771,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"
@ -3062,7 +3062,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"
@ -3352,7 +3352,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"

10
installation/mods_MarcMentat/2010/Marc_tools/run_damask_mp
View File

@ -1817,8 +1817,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -2770,7 +2770,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"
@ -3061,7 +3061,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"
@ -3351,7 +3351,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS || \ $SYSLIBS || \
{ {
echo "$0: link failed for ${user:+$userobj }$objs" echo "$0: link failed for ${user:+$userobj }$objs"

0
installation/mods_MarcMentat/2010/Marc_tools/run_marc.org → installation/mods_MarcMentat/2010/Marc_tools/run_marc.original
View File

0
installation/mods_MarcMentat/2011/Marc_tools/comp_user.org → installation/mods_MarcMentat/2011/Marc_tools/comp_user.original
View File

0
installation/mods_MarcMentat/2011/Marc_tools/include_linux64.org → installation/mods_MarcMentat/2011/Marc_tools/include_linux64.original
View File

10
installation/mods_MarcMentat/2011/Marc_tools/run_damask
View File

@ -1856,8 +1856,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -2834,7 +2834,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3126,7 +3126,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3417,7 +3417,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2011/Marc_tools/run_damask_h
View File

@ -1856,8 +1856,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
@ -2835,7 +2835,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3127,7 +3127,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3418,7 +3418,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2011/Marc_tools/run_damask_hmp
View File

@ -1856,8 +1856,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -2834,7 +2834,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3126,7 +3126,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3417,7 +3417,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2011/Marc_tools/run_damask_l
View File

@ -1856,8 +1856,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -2834,7 +2834,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3126,7 +3126,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3417,7 +3417,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2011/Marc_tools/run_damask_lmp
View File

@ -1856,8 +1856,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -2834,7 +2834,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3126,7 +3126,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3417,7 +3417,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2011/Marc_tools/run_damask_mp
View File

@ -1856,8 +1856,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
@ -2835,7 +2835,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3127,7 +3127,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3418,7 +3418,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

0
installation/mods_MarcMentat/2011/Marc_tools/run_marc.org → installation/mods_MarcMentat/2011/Marc_tools/run_marc.original
View File

0
installation/mods_MarcMentat/2012/Marc_tools/comp_user.org → installation/mods_MarcMentat/2012/Marc_tools/comp_user.original
View File

0
installation/mods_MarcMentat/2012/Marc_tools/include_linux64.org → installation/mods_MarcMentat/2012/Marc_tools/include_linux64.original
View File

10
installation/mods_MarcMentat/2012/Marc_tools/run_damask
View File

@ -1921,8 +1921,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -2898,7 +2898,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3191,7 +3191,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3483,7 +3483,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2012/Marc_tools/run_damask_h
View File

@ -1921,8 +1921,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -2898,7 +2898,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3191,7 +3191,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3483,7 +3483,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2012/Marc_tools/run_damask_hmp
View File

@ -1921,8 +1921,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -2898,7 +2898,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3191,7 +3191,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3483,7 +3483,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2012/Marc_tools/run_damask_l
View File

@ -1921,8 +1921,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -2898,7 +2898,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3191,7 +3191,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3483,7 +3483,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2012/Marc_tools/run_damask_lmp
View File

@ -1921,8 +1921,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -2898,7 +2898,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3191,7 +3191,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3483,7 +3483,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2012/Marc_tools/run_damask_mp
View File

@ -1921,8 +1921,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -2898,7 +2898,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3191,7 +3191,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3483,7 +3483,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

0
installation/mods_MarcMentat/2012/Marc_tools/run_marc.org → installation/mods_MarcMentat/2012/Marc_tools/run_marc.original
View File

0
installation/mods_MarcMentat/2013.1/Marc_tools/comp_user.org → installation/mods_MarcMentat/2013.1/Marc_tools/comp_user.original
View File

14
installation/mods_MarcMentat/2013.1/Marc_tools/include_linux64
View File

@ -410,7 +410,7 @@ then
PROFILE="-prof-gen=srcpos" PROFILE="-prof-gen=srcpos"
fi fi
FORT_OPT="-c -assume byterecl -safe_cray_ptr -mp1 -WB -shared-intel" FORT_OPT="-c -assume byterecl -safe_cray_ptr -mp1 -WB"
if test "$MTHREAD" = "OPENMP" if test "$MTHREAD" = "OPENMP"
then then
FORT_OPT=" $FORT_OPT -openmp" FORT_OPT=" $FORT_OPT -openmp"
@ -436,21 +436,21 @@ FORTNA="$FCOMP $FORT_OPT -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
DFORTLOW="$FCOMP $FORT_OPT $PROFILE -O0 $I8FFLAGS -I$MARC_SOURCE/common \ DFORTLOW="$FCOMP $FORT_OPT $PROFILE -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \ -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -shared-intel -O0 $I8FFLAGS -I$MARC_SOURCE/common \ DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -O0 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \ -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \
-openmp -openmp_report2 -openmp-threadprivate=compat\ -openmp -openmp_report2 -openmp-threadprivate=compat\
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTRAN="$FCOMP $FORT_OPT $PROFILE -O1 $I8FFLAGS -I$MARC_SOURCE/common \ DFORTRAN="$FCOMP $FORT_OPT $PROFILE -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \ -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -shared-intel -O1 $I8FFLAGS -I$MARC_SOURCE/common \ DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \ -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \
-openmp -openmp_report2 -openmp-threadprivate=compat\ -openmp -openmp_report2 -openmp-threadprivate=compat\
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGH="$FCOMP $FORT_OPT $PROFILE -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \ DFORTHIGH="$FCOMP $FORT_OPT $PROFILE -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \ -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -fno-alias -shared-intel -O2 $I8FFLAGS -I$MARC_SOURCE/common \ DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \ -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \
-openmp -openmp_report2 -openmp-threadprivate=compat\ -openmp -openmp_report2 -openmp-threadprivate=compat\
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
@ -470,21 +470,21 @@ then
DFORTLOW="$FCOMP $FORT_OPT $PROFILE $I8FFLAGS -I$MARC_SOURCE/common \ DFORTLOW="$FCOMP $FORT_OPT $PROFILE $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \ -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -shared-intel $I8FFLAGS -I$MARC_SOURCE/common \ DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \ -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \
-openmp -openmp_report2 -openmp-threadprivate=compat\ -openmp -openmp_report2 -openmp-threadprivate=compat\
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTRAN="$FCOMP $FORT_OPT $PROFILE $I8FFLAGS -I$MARC_SOURCE/common \ DFORTRAN="$FCOMP $FORT_OPT $PROFILE $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \ -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -shared-intel $I8FFLAGS -I$MARC_SOURCE/common \ DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \ -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \
-openmp -openmp_report2 -openmp-threadprivate=compat\ -openmp -openmp_report2 -openmp-threadprivate=compat\
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGH="$FCOMP $FORT_OPT $PROFILE -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ DFORTHIGH="$FCOMP $FORT_OPT $PROFILE -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \ -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -fno-alias -shared-intel $I8FFLAGS -I$MARC_SOURCE/common \ DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
-fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \ -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2013.1 \
-openmp -openmp_report2 -openmp-threadprivate=compat\ -openmp -openmp_report2 -openmp-threadprivate=compat\
-I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"

0
installation/mods_MarcMentat/2013.1/Marc_tools/include_linux64.org → installation/mods_MarcMentat/2013.1/Marc_tools/include_linux64.original
View File

10
installation/mods_MarcMentat/2013.1/Marc_tools/run_damask
View File

@ -2125,8 +2125,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -3235,7 +3235,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3528,7 +3528,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3838,7 +3838,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_h
View File

@ -2125,8 +2125,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -3235,7 +3235,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3528,7 +3528,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3838,7 +3838,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_hmp
View File

@ -2125,8 +2125,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -3235,7 +3235,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3528,7 +3528,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3838,7 +3838,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_l
View File

@ -2125,8 +2125,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -3235,7 +3235,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3528,7 +3528,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3838,7 +3838,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_lmp
View File

@ -2125,8 +2125,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -3235,7 +3235,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3528,7 +3528,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3838,7 +3838,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_mp
View File

@ -2125,8 +2125,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -3235,7 +3235,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3528,7 +3528,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3838,7 +3838,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

0
installation/mods_MarcMentat/2013.1/Marc_tools/run_marc.org → installation/mods_MarcMentat/2013.1/Marc_tools/run_marc.original
View File

0
installation/mods_MarcMentat/2013/Marc_tools/comp_user.org → installation/mods_MarcMentat/2013/Marc_tools/comp_user.original
View File

0
installation/mods_MarcMentat/2013/Marc_tools/include_linux64.org → installation/mods_MarcMentat/2013/Marc_tools/include_linux64.original
View File

10
installation/mods_MarcMentat/2013/Marc_tools/run_damask
View File

@ -1921,8 +1921,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -3031,7 +3031,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3324,7 +3324,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3634,7 +3634,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2013/Marc_tools/run_damask_h
View File

@ -1921,8 +1921,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -3031,7 +3031,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3324,7 +3324,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3634,7 +3634,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2013/Marc_tools/run_damask_hmp
View File

@ -1921,8 +1921,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -3031,7 +3031,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3324,7 +3324,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3634,7 +3634,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2013/Marc_tools/run_damask_l
View File

@ -1921,8 +1921,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -3031,7 +3031,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3324,7 +3324,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3634,7 +3634,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2013/Marc_tools/run_damask_lmp
View File

@ -1921,8 +1921,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -3031,7 +3031,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3324,7 +3324,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3634,7 +3634,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

10
installation/mods_MarcMentat/2013/Marc_tools/run_damask_mp
View File

@ -1921,8 +1921,8 @@ fi
# #
# user subroutine used # user subroutine used
# #
# add BLAS options for linking # add DAMASK options for linking
BLAS="%BLAS%" DAMASK=""
if test "$user" if test "$user"
then then
@ -3031,7 +3031,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3324,7 +3324,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {
@ -3634,7 +3634,7 @@ then
$TKLIBS \ $TKLIBS \
$MRCLIBS \ $MRCLIBS \
$METISLIBS \ $METISLIBS \
$BLAS \ $DAMASK \
$SYSLIBS \ $SYSLIBS \
$SECLIBS || \ $SECLIBS || \
{ {

0
installation/mods_MarcMentat/2013/Marc_tools/run_marc.org → installation/mods_MarcMentat/2013/Marc_tools/run_marc.original
View File

43
installation/mods_MarcMentat/apply_DAMASK_modifications.sh
View File

@ -33,47 +33,6 @@ done
INSTALLDIR=${INSTALLDIR%/} # remove trailing slash INSTALLDIR=${INSTALLDIR%/} # remove trailing slash
echo "MSC installation path: $INSTALLDIR" echo "MSC installation path: $INSTALLDIR"
BLASDIR=''
BLASTYPE=''
if [ "x$LAPACK_ROOT" != "x" ]; then
BLASDIR=$LAPACK_ROOT
BLASTYPE='LAPACK'
fi
if [ "x$ACML_ROOT" != "x" ]; then
BLASDIR=$ACML_ROOT
BLASTYPE='ACML'
fi
if [ "x$IMKL_ROOT" != "x" ]; then
BLASDIR=$IMKL_ROOT
BLASTYPE='IMKL'
fi
while [ ! -d "$BLASDIR" ] || [ -z "$BLASDIR" ]
do
echo "Input type of BLAS installation [IMKL | ACML | LAPACK]:"
read BLASTYPE
echo "Input path of BLAS installation:"
read BLASDIR
done
BLASDIR=${BLASDIR%/} # remove trailing slash
case $BLASTYPE in
IMKL | imkl)
BLAS=" -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lm -Wl,-rpath,$BLASDIR/lib/intel64 -L$BLASDIR/lib/intel64"
;;
ACML | acml)
BLAS=" -lacml -Wl,-rpath,$BLASDIR/ifort64/lib -L$BLASDIR/ifort64/lib"
;;
LAPACK | lapack)
BLAS=" -llapack -Wl,-rpath,$BLASDIR/lib,-rpath,$BLASDIR/lib64 -L$BLASDIR/lib64 -L$BLASDIR/lib"
;;
*)
echo "error, BLAS type must be IMKL, ACML, or LAPACK"
exit
;;
esac
DEFAULT_EDITOR='vi' DEFAULT_EDITOR='vi'
EDITOR='' EDITOR=''
while [ -z "$EDITOR" ] while [ -z "$EDITOR" ]
@ -106,7 +65,6 @@ for filename in 'comp_damask' \
cp $WORKINGDIR/$VERSION/Marc_tools/$filename $theDIR cp $WORKINGDIR/$VERSION/Marc_tools/$filename $theDIR
echo $theDIR/$filename | xargs perl -pi -e "s:%INSTALLDIR%:${INSTALLDIR}:g" echo $theDIR/$filename | xargs perl -pi -e "s:%INSTALLDIR%:${INSTALLDIR}:g"
echo $theDIR/$filename | xargs perl -pi -e "s:%VERSION%:${VERSION}:g" echo $theDIR/$filename | xargs perl -pi -e "s:%VERSION%:${VERSION}:g"
echo $theDIR/$filename | xargs perl -pi -e "s:%BLAS%:${BLAS}:g"
echo $filename echo $filename
done done
@ -179,6 +137,7 @@ case $YESNO in
'run_damask_lmp' \ 'run_damask_lmp' \
'run_damask_hmp'; do 'run_damask_hmp'; do
echo ${filename:4}$VERSION echo ${filename:4}$VERSION
[ -f $BIN_DIR/${filename:4}$VERSION ] && rm $BIN_DIR/${filename:4}$VERSION
ln -s $theDIR/$filename $BIN_DIR/${filename:4}$VERSION ln -s $theDIR/$filename $BIN_DIR/${filename:4}$VERSION
done done
;; ;;

8
lib/damask/solver/marc.py
View File

@ -18,9 +18,6 @@ class Marc(Solver):
'2011': ['linux64',''], '2011': ['linux64',''],
'2010.2':['linux64',''], '2010.2':['linux64',''],
'2010': ['linux64',''], '2010': ['linux64',''],
'2008r1':[''],
'2007r1':[''],
'2005r3':[''],
} }
@ -95,9 +92,8 @@ class Marc(Solver):
user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc') user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc')
# Define options [see Marc Installation and Operation Guide, pp 23] # Define options [see Marc Installation and Operation Guide, pp 23]
if int(release[0:4]) >= 2013: script = 'run_damask%s'%({False:'',True:'_'}[optimization!='' or openMP])
script = 'run_damask%s'%({False:'',True:'_'}[optimization!='' or openMP]) script = script+'%s%s'%({False:'',True:optimization}[optimization!=''],{False:'',True:'mp'}[openMP])
script = script+'%s%s'%({False:'',True:optimization}[optimization!=''],{False:'',True:'mp'}[openMP])
else: else:
script = 'run_marc' script = 'run_marc'