diff --git a/installation/mods_MarcMentat/2010.2/Marc_tools/run_h_marc b/installation/mods_MarcMentat/2010.2/Marc_tools/run_h_marc index 9479a9e4c..700e90b1e 100644 --- a/installation/mods_MarcMentat/2010.2/Marc_tools/run_h_marc +++ b/installation/mods_MarcMentat/2010.2/Marc_tools/run_h_marc @@ -1856,9 +1856,8 @@ fi # # user subroutine used # -# add BLAS and FFTW options for linking +# add BLAS options for linking BLAS="%BLAS%" - FFTW="%FFTW%" if test "$user" @@ -2837,7 +2836,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3130,7 +3128,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3422,7 +3419,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { diff --git a/installation/mods_MarcMentat/2010.2/Marc_tools/run_marc b/installation/mods_MarcMentat/2010.2/Marc_tools/run_marc index 0d62ba016..f6aa534ca 100644 --- a/installation/mods_MarcMentat/2010.2/Marc_tools/run_marc +++ b/installation/mods_MarcMentat/2010.2/Marc_tools/run_marc @@ -1856,9 +1856,8 @@ fi # # user subroutine used # -# add BLAS and FFTW options for linking +# add BLAS options for linking BLAS="%BLAS%" - FFTW="%FFTW%" if test "$user" @@ -2837,7 +2836,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3130,7 +3128,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3422,7 +3419,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { diff --git a/installation/mods_MarcMentat/2010.2/Marc_tools/run_mp_marc b/installation/mods_MarcMentat/2010.2/Marc_tools/run_mp_marc index c785f5fd1..8eb6e2bc5 100644 --- a/installation/mods_MarcMentat/2010.2/Marc_tools/run_mp_marc +++ b/installation/mods_MarcMentat/2010.2/Marc_tools/run_mp_marc @@ -1856,9 +1856,8 @@ fi # # user subroutine used # -# add BLAS and FFTW options for linking +# add BLAS options for linking BLAS="%BLAS%" - FFTW="%FFTW%" if test "$user" @@ -2837,7 +2836,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3130,7 +3128,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3422,7 +3419,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { diff --git a/installation/mods_MarcMentat/2010/Marc_tools/run_h_marc b/installation/mods_MarcMentat/2010/Marc_tools/run_h_marc index 12225cbb8..bd75dc52b 100644 --- a/installation/mods_MarcMentat/2010/Marc_tools/run_h_marc +++ b/installation/mods_MarcMentat/2010/Marc_tools/run_h_marc @@ -1817,9 +1817,8 @@ fi # # user subroutine used # -# add BLAS and FFTW options for linking +# add BLAS options for linking BLAS="%BLAS%" - FFTW="%FFTW%" if test "$user" then @@ -2772,7 +2771,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS || \ { echo "$0: link failed for ${user:+$userobj }$objs" @@ -3064,7 +3062,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS || \ { echo "$0: link failed for ${user:+$userobj }$objs" @@ -3355,7 +3352,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS || \ { echo "$0: link failed for ${user:+$userobj }$objs" diff --git a/installation/mods_MarcMentat/2010/Marc_tools/run_marc b/installation/mods_MarcMentat/2010/Marc_tools/run_marc index 66881c8db..5b27cd4cf 100644 --- a/installation/mods_MarcMentat/2010/Marc_tools/run_marc +++ b/installation/mods_MarcMentat/2010/Marc_tools/run_marc @@ -1817,9 +1817,8 @@ fi # # user subroutine used # -# add BLAS and FFTW options for linking +# add BLAS options for linking BLAS="%BLAS%" - FFTW="%FFTW%" if test "$user" @@ -2773,7 +2772,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS || \ { echo "$0: link failed for ${user:+$userobj }$objs" @@ -3065,7 +3063,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS || \ { echo "$0: link failed for ${user:+$userobj }$objs" @@ -3356,7 +3353,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS || \ { echo "$0: link failed for ${user:+$userobj }$objs" diff --git a/installation/mods_MarcMentat/2010/Marc_tools/run_mp_marc b/installation/mods_MarcMentat/2010/Marc_tools/run_mp_marc index 7f12e0984..251027201 100644 --- a/installation/mods_MarcMentat/2010/Marc_tools/run_mp_marc +++ b/installation/mods_MarcMentat/2010/Marc_tools/run_mp_marc @@ -1817,9 +1817,8 @@ fi # # user subroutine used # -# add BLAS and FFTW options for linking +# add BLAS options for linking BLAS="%BLAS%" - FFTW="%FFTW%" if test "$user" then @@ -2772,7 +2771,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS || \ { echo "$0: link failed for ${user:+$userobj }$objs" @@ -3064,7 +3062,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS || \ { echo "$0: link failed for ${user:+$userobj }$objs" @@ -3355,7 +3352,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS || \ { echo "$0: link failed for ${user:+$userobj }$objs" diff --git a/installation/mods_MarcMentat/2011/Marc_tools/run_h_marc b/installation/mods_MarcMentat/2011/Marc_tools/run_h_marc index 0f828cb55..75a24d3ff 100644 --- a/installation/mods_MarcMentat/2011/Marc_tools/run_h_marc +++ b/installation/mods_MarcMentat/2011/Marc_tools/run_h_marc @@ -1856,9 +1856,8 @@ fi # # user subroutine used # -# add BLAS and FFTW options for linking +# add BLAS options for linking BLAS="%BLAS%" - FFTW="%FFTW%" if test "$user" @@ -2837,7 +2836,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3130,7 +3128,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3422,7 +3419,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { diff --git a/installation/mods_MarcMentat/2011/Marc_tools/run_marc b/installation/mods_MarcMentat/2011/Marc_tools/run_marc index 2678eea82..bbe9b5494 100644 --- a/installation/mods_MarcMentat/2011/Marc_tools/run_marc +++ b/installation/mods_MarcMentat/2011/Marc_tools/run_marc @@ -1856,9 +1856,8 @@ fi # # user subroutine used # -# add BLAS and FFTW options for linking +# add BLAS options for linking BLAS="%BLAS%" - FFTW="%FFTW%" if test "$user" then @@ -2836,7 +2835,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3129,7 +3127,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3421,7 +3418,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { diff --git a/installation/mods_MarcMentat/2011/Marc_tools/run_mp_marc b/installation/mods_MarcMentat/2011/Marc_tools/run_mp_marc index 255ecf571..468d770a4 100644 --- a/installation/mods_MarcMentat/2011/Marc_tools/run_mp_marc +++ b/installation/mods_MarcMentat/2011/Marc_tools/run_mp_marc @@ -1856,9 +1856,8 @@ fi # # user subroutine used # -# add BLAS and FFTW options for linking +# add BLAS options for linking BLAS="%BLAS%" - FFTW="%FFTW%" if test "$user" @@ -2837,7 +2836,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3130,7 +3128,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3422,7 +3419,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { diff --git a/installation/mods_MarcMentat/2012/Marc_tools/run_h_marc b/installation/mods_MarcMentat/2012/Marc_tools/run_h_marc index e80ee5b6d..1c8c4a100 100644 --- a/installation/mods_MarcMentat/2012/Marc_tools/run_h_marc +++ b/installation/mods_MarcMentat/2012/Marc_tools/run_h_marc @@ -1921,9 +1921,8 @@ fi # # user subroutine used # -# add BLAS and FFTW options for linking +# add BLAS options for linking BLAS="%BLAS%" - FFTW="%FFTW%" if test "$user" then @@ -2900,7 +2899,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3194,7 +3192,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3487,7 +3484,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { diff --git a/installation/mods_MarcMentat/2012/Marc_tools/run_marc b/installation/mods_MarcMentat/2012/Marc_tools/run_marc index ff4f1cb11..63d42b610 100644 --- a/installation/mods_MarcMentat/2012/Marc_tools/run_marc +++ b/installation/mods_MarcMentat/2012/Marc_tools/run_marc @@ -1921,9 +1921,8 @@ fi # # user subroutine used # -# add BLAS and FFTW options for linking +# add BLAS options for linking BLAS="%BLAS%" - FFTW="%FFTW%" if test "$user" then @@ -2900,7 +2899,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3194,7 +3192,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3487,7 +3484,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { diff --git a/installation/mods_MarcMentat/2012/Marc_tools/run_mp_marc b/installation/mods_MarcMentat/2012/Marc_tools/run_mp_marc index d2a553393..b4f747ef5 100644 --- a/installation/mods_MarcMentat/2012/Marc_tools/run_mp_marc +++ b/installation/mods_MarcMentat/2012/Marc_tools/run_mp_marc @@ -1921,9 +1921,8 @@ fi # # user subroutine used # -# add BLAS and FFTW options for linking +# add BLAS options for linking BLAS="%BLAS%" - FFTW="%FFTW%" if test "$user" then @@ -2900,7 +2899,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3194,7 +3192,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ { @@ -3487,7 +3484,6 @@ then $MRCLIBS \ $METISLIBS \ $BLAS \ - $FFTW \ $SYSLIBS \ $SECLIBS || \ {