Several fixes for MUMPS, TRILINOS.

Author: l-korous

CMake.vars.example.Windows

@@ -41,9 +41,14 @@
       # MUMPS
       # Sequential version of MUMPS may be enabled by setting YES on the following line
       # and pointing to the package installation directory with MUMPS_ROOT.
+      # Winblas (any BLAS library) is also necessary.
+      # For Win64 platform, ifconsol.lib is also necessary (part of the hermes-windows repository).
       set(WITH_MUMPS NO)
         set(MUMPS_ROOT "d:/hpfem/hermes/dependencies")
         set(WINBLAS_ROOT "d:/hpfem/hermes/dependencies")
+        if(${CMAKE_CL_64}) # This means that the following is only for 64-bit build.
+          set(IFCONSOL_LIB_DIRECTORY "d:/hpfem/hermes/dependencies/lib")
+        endif(${CMAKE_CL_64})
 
       # Trilinos
       set(WITH_TRILINOS NO)

doc/src/installation/matrix_solvers/mumps.rst

@@ -43,7 +43,7 @@ Installation of MUMPS using MSVC is rather easy:
 
   - preparation
 
-    - download MUMPS from http://mumps.enseeiht.fr/MUMPS_4.10.0.tar.gz (if the link does not work, look for 4.10 version of MUMPS)
+    - download MUMPS from `<http://mumps.enseeiht.fr/MUMPS_4.10.0.tar.gz`_ (if the link does not work, look for 4.10 version of MUMPS)
     - download WinMUMPS utility from `<http://sourceforge.net/projects/winmumps/>`_.
     - download a Fortran compiler (e.g. `<http://software.intel.com/en-us/intel-fortran-studio-xe-evaluation-options)>`_.
     - download BLAS (Debug/Release, static/dynamic, 32-bit/64-bit as you like) from `<http://icl.cs.utk.edu/lapack-for-windows/lapack/index.html#libraries>`_.

hermes_common/CMakeLists.txt

@@ -202,6 +202,13 @@ project(hermes_common)
   # Add a target for a specified version of the Hermes library (REAL/COMPLEX, RELEASE/DEBUG),
   # and set its build properties (compile and link flags, installation directories).
   macro(BUILD_COMMON_LIB HERMES_COMMON_LIB BUILD_FLAGS)
+  
+    if(${CMAKE_CL_64})
+      if(WITH_MUMPS)
+        LINK_DIRECTORIES(${IFCONSOL_LIB_DIRECTORY})
+      endif()
+    endif()
+    
     if(${HERMES_STATIC_LIBS})
       add_library(${HERMES_COMMON_LIB} ${SRC} ${HEADERS})
     else()

hermes_common/include/solvers/interfaces/epetra.h

@@ -36,6 +36,7 @@
 #include <EpetraExt_MatrixMatrix.h>
 #include <EpetraExt_RowMatrixOut.h>
 #include <EpetraExt_VectorOut.h>
+#include <Teuchos_TestForException.hpp>
 
 namespace Hermes
 {