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=121-439
+  - GEOSX_TPL_TAG=120-447
 
 # 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.

integratedTests

@@ -50,20 +50,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/cmake/GeosxOptions.cmake

@@ -72,6 +72,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/LvArray

@@ -575,14 +575,38 @@
 		<xsd:attribute name="name" type="string" use="required" />
 	</xsd:complexType>
 	<xsd:complexType name="LinearSolverParametersType">
-		<!--amgCoarseSolver => AMG coarsest level solver/smoother type
-Available options are: jacobi, gaussSeidel, blockGaussSeidel, chebyshev, direct-->
-		<xsd:attribute name="amgCoarseSolver" type="string" default="direct" />
+		<!--amgCoarseSolver => AMG coarsest level solver/smoother type. Valid options (not all may be supported by linear algebra package):
+* none
+* jacobi
+* gs
+* sgs
+* chebyshev
+* iluk
+* ilut
+* icc
+* ict
+* amg
+* mgr
+* block
+* direct-->
+		<xsd:attribute name="amgCoarseSolver" type="geosx_LinearSolverParameters_PreconditionerType" default="direct" />
 		<!--amgNumSweeps => AMG smoother sweeps-->
 		<xsd:attribute name="amgNumSweeps" type="integer" default="2" />
-		<!--amgSmootherType => AMG smoother type
-Available options are: jacobi, blockJacobi, gaussSeidel, blockGaussSeidel, chebyshev, icc, ilu, ilut-->
-		<xsd:attribute name="amgSmootherType" type="string" default="gaussSeidel" />
+		<!--amgSmootherType => AMG smoother type. Valid options (not all may be supported by linear algebra package):
+* none
+* jacobi
+* gs
+* sgs
+* chebyshev
+* iluk
+* ilut
+* icc
+* ict
+* amg
+* mgr
+* block
+* direct-->
+		<xsd:attribute name="amgSmootherType" type="geosx_LinearSolverParameters_PreconditionerType" default="gs" />
 		<!--amgThreshold => AMG strength-of-connection threshold-->
 		<xsd:attribute name="amgThreshold" type="real64" default="0" />
 		<!--iluFill => ILU(K) fill factor-->
@@ -609,13 +633,15 @@ the relative residual norm satisfies:
 * jacobi
 * gs
 * sgs
+* chebyshev
 * iluk
 * ilut
 * icc
 * ict
 * amg
 * mgr
-* block-->
+* block
+* direct-->
 		<xsd:attribute name="preconditionerType" type="geosx_LinearSolverParameters_PreconditionerType" default="iluk" />
 		<!--solverType => Linear solver type. Available options are:
 * direct
@@ -628,7 +654,7 @@ the relative residual norm satisfies:
 	</xsd:complexType>
 	<xsd:simpleType name="geosx_LinearSolverParameters_PreconditionerType">
 		<xsd:restriction base="xsd:string">
-			<xsd:pattern value=".*[\[\]`$].*|none|jacobi|gs|sgs|iluk|ilut|icc|ict|amg|mgr|block" />
+			<xsd:pattern value=".*[\[\]`$].*|none|jacobi|gs|sgs|chebyshev|iluk|ilut|icc|ict|amg|mgr|block|direct" />
 		</xsd:restriction>
 	</xsd:simpleType>
 	<xsd:simpleType name="geosx_LinearSolverParameters_SolverType">

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/fileIO/schema/docs/LinearSolverParameters.rst

@@ -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/fileIO/schema/schema.xsd

@@ -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