Merge Pull Request #12225 from hkthorn/Trilinos/develop

Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'Belos: Fixed the CG multi-precision test for Tpetra' PR Author: hkthorn
trilinos · Sep 9, 2023 · 347a6f2 · 347a6f2
2 parents 3fea29e + 3b2e6ef
commit 347a6f2
Show file tree

Hide file tree

Showing 21 changed files with 124 additions and 202 deletions.
diff --git a/packages/belos/epetra/example/BlockCG/Dummy b/packages/belos/epetra/example/BlockCG/Dummy
diff --git a/packages/belos/epetra/example/BlockGmres/Dummy b/packages/belos/epetra/example/BlockGmres/Dummy
diff --git a/packages/belos/epetra/example/GCRODR/Dummy b/packages/belos/epetra/example/GCRODR/Dummy
diff --git a/packages/belos/epetra/example/RCG/Dummy b/packages/belos/epetra/example/RCG/Dummy
diff --git a/packages/belos/epetra/example/TFQMR/Dummy b/packages/belos/epetra/example/TFQMR/Dummy
diff --git a/packages/belos/epetra/test/BlockCG/Dummy b/packages/belos/epetra/test/BlockCG/Dummy
diff --git a/packages/belos/epetra/test/BlockGmres/Dummy b/packages/belos/epetra/test/BlockGmres/Dummy
diff --git a/packages/belos/epetra/test/GCRODR/Dummy b/packages/belos/epetra/test/GCRODR/Dummy
diff --git a/packages/belos/epetra/test/MINRES/Dummy b/packages/belos/epetra/test/MINRES/Dummy
diff --git a/packages/belos/epetra/test/RCG/Dummy b/packages/belos/epetra/test/RCG/Dummy
diff --git a/packages/belos/epetra/test/TFQMR/Dummy b/packages/belos/epetra/test/TFQMR/Dummy
diff --git a/packages/belos/test/BlockCG/Dummy b/packages/belos/test/BlockCG/Dummy
diff --git a/packages/belos/test/BlockGmres/Dummy b/packages/belos/test/BlockGmres/Dummy
diff --git a/packages/belos/test/GCRODR/Dummy b/packages/belos/test/GCRODR/Dummy
diff --git a/packages/belos/test/MVOPTester/Dummy b/packages/belos/test/MVOPTester/Dummy
diff --git a/packages/belos/test/TFQMR/Dummy b/packages/belos/test/TFQMR/Dummy
diff --git a/packages/belos/tpetra/test/BlockCG/CMakeLists.txt b/packages/belos/tpetra/test/BlockCG/CMakeLists.txt
@@ -23,20 +23,37 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
 
 ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Triutils)
 ASSERT_DEFINED(Tpetra_INST_COMPLEX_DOUBLE)
-IF (${PACKAGE_NAME}_ENABLE_Triutils AND Tpetra_INST_COMPLEX_DOUBLE)
-
-  TRIBITS_ADD_EXECUTABLE_AND_TEST(
-    Tpetra_BlockCG_complex_hb_test
-    SOURCES test_bl_cg_complex_hb.cpp
-    ARGS "--verbose"
-    COMM serial mpi
-    )
-
-  TRIBITS_COPY_FILES_TO_BINARY_DIR(Tpetra_BlockCG_complex_hb_CopyFiles
-    SOURCE_DIR ${Anasazi_SOURCE_DIR}/testmatrices
-    SOURCE_FILES mhd1280b.cua
-    EXEDEPS Tpetra_BlockCG_complex_hb_test
-    )
+ASSERT_DEFINED(Tpetra_INST_FLOAT)
+
+IF (${PACKAGE_NAME}_ENABLE_Triutils)
+
+  IF (Tpetra_INST_FLOAT)
+
+    TRIBITS_ADD_EXECUTABLE_AND_TEST(
+      Tpetra_BlockCG_DoubleFloat_test
+      SOURCES test_bl_cg_hb_df.cpp
+      ARGS "--verbose"
+      COMM serial mpi
+      )
+
+  ENDIF()
+
+  IF (Tpetra_INST_COMPLEX_DOUBLE)
+
+    TRIBITS_ADD_EXECUTABLE_AND_TEST(
+      Tpetra_BlockCG_complex_hb_test
+      SOURCES test_bl_cg_complex_hb.cpp
+      ARGS "--verbose"
+      COMM serial mpi
+      )
+
+    TRIBITS_COPY_FILES_TO_BINARY_DIR(Tpetra_BlockCG_complex_hb_CopyFiles
+      SOURCE_DIR ${Anasazi_SOURCE_DIR}/testmatrices
+      SOURCE_FILES mhd1280b.cua
+      EXEDEPS Tpetra_BlockCG_complex_hb_test
+      )
+
+  ENDIF ()
 
 ENDIF()
 

diff --git a/packages/belos/tpetra/test/BlockCG/Dummy b/packages/belos/tpetra/test/BlockCG/Dummy