Sync changes with solver_test002

tests/solver_test002/CMakeLists.txt

@@ -32,7 +32,10 @@ if(USE_SOLVER)
 endif()
 
 add_test(NAME solver_test002_serial_inner_ilu2                 COMMAND $<TARGET_FILE:solver_test002>  0 20)
-add_test(NAME solver_test002_serial_inner_mliluc               COMMAND $<TARGET_FILE:solver_test002>  1 20)
+add_test(NAME solver_test002_serial_inner_ddpqiluc               COMMAND $<TARGET_FILE:solver_test002>  1 20)
+if(HAVE_SOLVER_MPTILUC2)
+add_test(NAME solver_test002_serial_inner_mptiluc               COMMAND $<TARGET_FILE:solver_test002>  1 20)
+endif()
 if(USE_SOLVER_PETSC)
 add_test(NAME solver_test002_serial_petsc                      COMMAND $<TARGET_FILE:solver_test002>  2 20)
 endif()
@@ -51,7 +54,10 @@ endif()
 if( USE_MPI )
 if( EXISTS ${MPIEXEC} )
 add_test(NAME solver_test002_parallel_inner_ilu2        COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test002>  0 20)
-add_test(NAME solver_test002_parallel_inner_mliluc      COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test002>  1 20)
+add_test(NAME solver_test002_parallel_inner_ddpqiluc      COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test002>  1 20)
+if(HAVE_SOLVER_MPTILUC2)
+add_test(NAME solver_test002_parallel_inner_mptiluc      COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test002>  1 20)
+endif()
 if(USE_SOLVER_PETSC)
 add_test(NAME solver_test002_parallel_petsc             COMMAND ${MPIEXEC} -np 4 $<TARGET_FILE:solver_test002>  2 20)
 endif()

tests/solver_test002/main.cpp

@@ -94,13 +94,14 @@ int main(int argc, char ** argv)
 	switch(atoi(argv[1]))
 	{
 		case 0: type = Solver::INNER_ILU2; break;
-		case 1: type = Solver::INNER_MLILUC; break;
+		case 1: type = Solver::INNER_DDPQILUC; break;
 		case 2: type = Solver::PETSc; break;
 		case 3: type = Solver::Trilinos_Aztec; break;
 		case 4: type = Solver::Trilinos_Belos; break;
 		case 5: type = Solver::Trilinos_Ifpack; break;
 		case 6: type = Solver::Trilinos_ML; break;
 		case 7: type = Solver::ANI; break;
+		case 8: type = Solver::INNER_MPTILUC; break;
 	}
 	int n = atoi(argv[2]);
 	Solver::Initialize(&argc,&argv,argc > 3 ? argv[3] : NULL); // Initialize the linear solver in accordance with args