Add Tpetra-based Trilinos interface. Refactor LAI vector unit tests.

Author: klevzoff

.travis.yml

@@ -2,7 +2,7 @@ language: minimal
 
 env:
   global:
-  - GEOSX_TPL_TAG=119-434
+  - GEOSX_TPL_TAG=120-440
 
 # The integrated test repository contains large data (using git lfs) and we do not use them here.
 # To save time (and money) we do not let travis automatically clone all our (lfs) subrepositories and do it by hand.

src/cmake/GeosxOptions.cmake

@@ -49,20 +49,22 @@ option( ENABLE_PETSC "Enables PETSC" OFF )
 
 ### LAI SETUP ###
 
-set( supported_LAI Trilinos Hypre Petsc )
+set( supported_LAI Trilinos TrilinosTpetra Hypre Petsc )
 set( GEOSX_LA_INTERFACE "Trilinos" CACHE STRING "Linear algebra interface to use in solvers" )
-message( STATUS "GEOSX_LA_INTERFACE = ${GEOSX_LA_INTERFACE}" )
+message( "GEOSX_LA_INTERFACE = ${GEOSX_LA_INTERFACE}" )
 
 if( NOT ( GEOSX_LA_INTERFACE IN_LIST supported_LAI ) )
   message( FATAL_ERROR "GEOSX_LA_INTERFACE must be one of: ${supported_LAI}" )
 endif()
 
 string( TOUPPER "${GEOSX_LA_INTERFACE}" upper_LAI )
-if( NOT ENABLE_${upper_LAI} )
-  message( FATAL_ERROR "${GEOSX_LA_INTERFACE} LA interface is selected, but ENABLE_${upper_LAI} is OFF" )
-endif()
 option( GEOSX_LA_INTERFACE_${upper_LAI} "${upper_LAI} LA interface is selected" ON )
 
+string( REPLACE "TPETRA" "" dep_LAI "${upper_LAI}" )
+if( NOT ENABLE_${dep_LAI} )
+  message( FATAL_ERROR "${GEOSX_LA_INTERFACE} LA interface is selected, but ENABLE_${dep_LAI} is OFF" )
+endif()
+
 ### MPI/OMP/CUDA SETUP ###
 
 option( ENABLE_MPI "" ON )

src/coreComponents/LvArray

@@ -69,6 +69,8 @@
 #cmakedefine GEOSX_LA_INTERFACE @GEOSX_LA_INTERFACE@
 /// Macro defined when Trilinos interface is selected
 #cmakedefine GEOSX_LA_INTERFACE_TRILINOS
+/// Macro defined when Trilinos interface is selected
+#cmakedefine GEOSX_LA_INTERFACE_TRILINOSTPETRA
 /// Macro defined when Hypre interface is selected
 #cmakedefine GEOSX_LA_INTERFACE_HYPRE
 /// Macro defined when PETSc interface is selected

src/coreComponents/common/GeosxConfig.hpp.in

@@ -26,9 +26,9 @@ set( finiteVolume_sources
    )
 
 if ( BUILD_OBJ_LIBS )
-  set( dependencyList dataRepository codingUtilities managers)
+  set( dependencyList dataRepository codingUtilities managers )
 else()
-  set( dependencyList common)
+  set( dependencyList common managers )
 endif()
 
 if ( ENABLE_OPENMP )

src/coreComponents/finiteVolume/CMakeLists.txt

@@ -63,16 +63,27 @@ if( ENABLE_TRILINOS )
           interfaces/trilinos/EpetraMatrix.hpp
           interfaces/trilinos/EpetraVector.hpp
           interfaces/trilinos/EpetraUtils.hpp
+          interfaces/trilinos/TpetraMatrix.hpp
+          interfaces/trilinos/TpetraVector.hpp
+          interfaces/trilinos/TpetraUtils.hpp
           interfaces/trilinos/TrilinosPreconditioner.hpp
+          interfaces/trilinos/TrilinosTpetraPreconditioner.hpp
           interfaces/trilinos/TrilinosSolver.hpp
-          interfaces/trilinos/TrilinosInterface.hpp )
+          interfaces/trilinos/TrilinosTpetraSolver.hpp
+          interfaces/trilinos/TrilinosInterface.hpp
+          interfaces/trilinos/TrilinosTpetraInterface.hpp )
 
     list( APPEND linearAlgebra_sources
           interfaces/trilinos/EpetraMatrix.cpp
           interfaces/trilinos/EpetraVector.cpp
+          interfaces/trilinos/TpetraMatrix.cpp
+          interfaces/trilinos/TpetraVector.cpp
           interfaces/trilinos/TrilinosPreconditioner.cpp
+          interfaces/trilinos/TrilinosTpetraPreconditioner.cpp
           interfaces/trilinos/TrilinosSolver.cpp
-          interfaces/trilinos/TrilinosInterface.cpp )
+          interfaces/trilinos/TrilinosTpetraSolver.cpp
+          interfaces/trilinos/TrilinosInterface.cpp
+          interfaces/trilinos/TrilinosTpetraInterface.cpp )
 
     list( APPEND dependencyList trilinos )
 

src/coreComponents/linearAlgebra/CMakeLists.txt

@@ -1983,6 +1983,7 @@ void DofManager::printFieldInfo( std::ostream & os ) const
 
 #ifdef GEOSX_USE_TRILINOS
 MAKE_DOFMANAGER_METHOD_INST( TrilinosInterface )
+MAKE_DOFMANAGER_METHOD_INST( TrilinosTpetraInterface )
 #endif
 
 #ifdef GEOSX_USE_HYPRE

src/coreComponents/linearAlgebra/DofManager.cpp

@@ -23,6 +23,7 @@
 
 #ifdef GEOSX_USE_TRILINOS
 #include "linearAlgebra/interfaces/trilinos/TrilinosInterface.hpp"
+#include "linearAlgebra/interfaces/trilinos/TrilinosTpetraInterface.hpp"
 #endif
 
 #ifdef GEOSX_USE_HYPRE
@@ -62,6 +63,7 @@ inline void setupLAI( int & argc, char * * & argv )
 {
 #ifdef GEOSX_USE_TRILINOS
   TrilinosInterface::initialize( argc, argv );
+  TrilinosTpetraInterface::initialize( argc, argv );
 #endif
 #ifdef GEOSX_USE_HYPRE
   HypreInterface::initialize( argc, argv );
@@ -78,6 +80,7 @@ inline void finalizeLAI()
 {
 #ifdef GEOSX_USE_TRILINOS
   TrilinosInterface::finalize();
+  TrilinosTpetraInterface::finalize();
 #endif
 #ifdef GEOSX_USE_HYPRE
   HypreInterface::finalize();

src/coreComponents/linearAlgebra/interfaces/InterfaceTypes.hpp

@@ -21,7 +21,6 @@
 
 #include "linearAlgebra/common.hpp"
 #include "linearAlgebra/interfaces/LinearOperator.hpp"
-//#include "LvArray/src/streamIO.hpp"
 
 namespace geosx
 {
@@ -438,36 +437,6 @@ class MatrixBase : public virtual LinearOperator< VECTOR >
                        arraySlice1d< globalIndex const > const & colIndices,
                        arraySlice2d< real64 const, MatrixLayout::ROW_MAJOR > const & values ) = 0;
 
-  /**
-   * @brief Add a dense block of values.
-   * @param rowIndices Global row indices
-   * @param colIndices Global col indices
-   * @param values Dense local matrix of values
-   */
-  virtual void add( arraySlice1d< globalIndex const > const & rowIndices,
-                    arraySlice1d< globalIndex const > const & colIndices,
-                    arraySlice2d< real64 const, MatrixLayout::COL_MAJOR > const & values ) = 0;
-
-  /**
-   * @brief Set a dense block of values.
-   * @param rowIndices Global row indices
-   * @param colIndices Global col indices
-   * @param values Dense local matrix of values
-   */
-  virtual void set( arraySlice1d< globalIndex const > const & rowIndices,
-                    arraySlice1d< globalIndex const > const & colIndices,
-                    arraySlice2d< real64 const, MatrixLayout::COL_MAJOR > const & values ) = 0;
-
-  /**
-   * @brief Insert a dense block of values.
-   * @param rowIndices Global row indices
-   * @param colIndices Global col indices
-   * @param values Dense local matrix of values
-   */
-  virtual void insert( arraySlice1d< globalIndex const > const & rowIndices,
-                       arraySlice1d< globalIndex const > const & colIndices,
-                       arraySlice2d< real64 const, MatrixLayout::COL_MAJOR > const & values ) = 0;
-
   /**
    * @brief Add a dense block of values.
    * @param rowIndices Global row indices

src/coreComponents/linearAlgebra/interfaces/MatrixBase.hpp

@@ -149,7 +149,7 @@ class VectorBase
    * @param localValues local data to put into vector
    * @param comm MPI communicator to use
    */
-  virtual void create( arrayView1d< real64 const > const & localValues, MPI_Comm const & comm ) = 0;
+  virtual void createWithLocalValues( arrayView1d< real64 > const & localValues, MPI_Comm const & comm ) = 0;
 
   ///@}
 
@@ -414,6 +414,7 @@ class VectorBase
    */
   virtual void extract( arrayView1d< real64 > const & localVector ) const
   {
+    GEOSX_LAI_ASSERT_EQ( localSize(), localVector.size() );
     real64 const * const data = extractLocalVector();
     forAll< parallelHostPolicy >( localSize(), [=] ( localIndex const k )
     {