Merge pull request #7467 from rhoope/7466-Fix-TriKota

TriKota Bug #7466 : Fixes to build TriKota with Dakota 6.12
trilinos · Jun 9, 2020 · 7ba2010 · 7ba2010
2 parents 06d0fd0 + b43e7ad
commit 7ba2010
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 27 deletions.
diff --git a/packages/TriKota/test/CMakeLists.txt b/packages/TriKota/test/CMakeLists.txt
@@ -31,24 +31,26 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR(TriKotaSimpleCopyDakotaIn
   EXEDEPS  SimpleEpetraExtME
   )
 
-TRIBITS_ADD_EXECUTABLE_AND_TEST(
-  SimpleThyraME
-  SOURCES 
-  Main_SimpleThyraME.cpp
-  Simple_EpetraExtME.cpp
-  Simple_EpetraExtME.hpp
-  COMM serial mpi
-  NUM_MPI_PROCS 2
-  ARGS -v
-  PASS_REGULAR_EXPRESSION "TEST PASSED"
-  )
+IF(${PACKAGE_NAME}_ENABLE_ThyraTpetraAdapters)
+  TRIBITS_ADD_EXECUTABLE_AND_TEST(
+    SimpleThyraME
+    SOURCES 
+    Main_SimpleThyraME.cpp
+    Simple_EpetraExtME.cpp
+    Simple_EpetraExtME.hpp
+    COMM serial mpi
+    NUM_MPI_PROCS 2
+    ARGS -v
+    PASS_REGULAR_EXPRESSION "TEST PASSED"
+    )
 
-TRIBITS_COPY_FILES_TO_BINARY_DIR(TriKotaThyraMECopyDakotaIn
-  DEST_FILES   dakota.in
-  SOURCE_DIR   ${PACKAGE_SOURCE_DIR}/test
-  SOURCE_PREFIX "_"
-  EXEDEPS  SimpleThyraME
-  )
+  TRIBITS_COPY_FILES_TO_BINARY_DIR(TriKotaThyraMECopyDakotaIn
+    DEST_FILES   dakota.in
+    SOURCE_DIR   ${PACKAGE_SOURCE_DIR}/test
+    SOURCE_PREFIX "_"
+    EXEDEPS  SimpleThyraME
+    )
+ENDIF(${PACKAGE_NAME}_ENABLE_ThyraTpetraAdapters)
 
 TRIBITS_ADD_EXECUTABLE_AND_TEST(
   ParallelDiagonalThyraME 

diff --git a/packages/TriKota/test/Main_ParallelDiagonalThyraME.cpp b/packages/TriKota/test/Main_ParallelDiagonalThyraME.cpp
@@ -97,7 +97,8 @@ int main(int argc, char* argv[])
       Dakota::Variables finalVariables = dakota.getFinalSolution();
       Dakota::RealVector finalValues = finalVariables.continuous_variables();
 
-      std::cout << "\nfinalValues =\n" << finalValues;
+      std::cout << "\nfinalValues =\n";
+      finalValues.print(*out);
 
       const double errorTol = 1e-6;
       double finalError = 0.0;

diff --git a/packages/TriKota/test/Main_SimpleEpetraExtME.cpp b/packages/TriKota/test/Main_SimpleEpetraExtME.cpp
@@ -94,7 +94,8 @@ int main(int argc, char* argv[])
       Dakota::Variables finalVariables = dakota.getFinalSolution();
       Dakota::RealVector finalValues = finalVariables.continuous_variables();
 
-      *out << "\nfinalValues =\n" << finalValues;
+      *out << "\nfinalValues =\n";
+      finalValues.print(*out);
 
       const double errorTol = 1e-12;
       const double finalError = std::sqrt(

diff --git a/packages/rol/adapters/trikota/src/sol/sparse_grids/ROL_QuadratureHelpers.hpp b/packages/rol/adapters/trikota/src/sol/sparse_grids/ROL_QuadratureHelpers.hpp
@@ -44,6 +44,7 @@
 #ifndef ROL_QUADRATUREHELPERS_HPP
 #define ROL_QUADRATUREHELPERS_HPP
 
+#include <set>
 #include "sandia_rules.hpp"
 
 namespace ROL {

diff --git a/packages/rol/adapters/trikota/test/sol/CMakeLists.txt b/packages/rol/adapters/trikota/test/sol/CMakeLists.txt
@@ -1,14 +1,16 @@
 
 IF(${PROJECT_NAME}_ENABLE_TriKota)
 
-  TRIBITS_ADD_EXECUTABLE_AND_TEST(
-    SparseGridBurgersControl
-    SOURCES test_01.cpp
-    ARGS PrintItAll
-    COMM serial mpi  
-    PASS_REGULAR_EXPRESSION "TEST PASSED"
-    ADD_DIR_TO_NAME
-    )
+  INCLUDE_DIRECTORIES(${ROL_SOURCE_DIR}/adapters/teuchos/src/sol)
+
+  #TRIBITS_ADD_EXECUTABLE_AND_TEST(
+  #  SparseGridBurgersControl
+  #  SOURCES test_01.cpp
+  #  ARGS PrintItAll
+  #  COMM serial mpi  
+  #  PASS_REGULAR_EXPRESSION "TEST PASSED"
+  #  ADD_DIR_TO_NAME
+  #  )
 
   TRIBITS_ADD_EXECUTABLE_AND_TEST(
     SparseGridQuadratureTest