Skip to content

Commit 2c00ff6

Browse files
committed
Bug #7466 : Fixes to build TriKota with Dakota 6.12
- disable test that fails to compile - will need ROL devs to advise: * ROL_adapters_trikota_test_sol_SparseGridBurgersControl - the following test compiles but segfaults: * ROL_adapters_trikota_test_sol_SparseGridQuadratureTest
1 parent a754b2f commit 2c00ff6

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

test/CMakeLists.txt

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,26 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR(TriKotaSimpleCopyDakotaIn
3131
EXEDEPS SimpleEpetraExtME
3232
)
3333

34-
TRIBITS_ADD_EXECUTABLE_AND_TEST(
35-
SimpleThyraME
36-
SOURCES
37-
Main_SimpleThyraME.cpp
38-
Simple_EpetraExtME.cpp
39-
Simple_EpetraExtME.hpp
40-
COMM serial mpi
41-
NUM_MPI_PROCS 2
42-
ARGS -v
43-
PASS_REGULAR_EXPRESSION "TEST PASSED"
44-
)
34+
IF(${PACKAGE_NAME}_ENABLE_ThyraTpetraAdapters)
35+
TRIBITS_ADD_EXECUTABLE_AND_TEST(
36+
SimpleThyraME
37+
SOURCES
38+
Main_SimpleThyraME.cpp
39+
Simple_EpetraExtME.cpp
40+
Simple_EpetraExtME.hpp
41+
COMM serial mpi
42+
NUM_MPI_PROCS 2
43+
ARGS -v
44+
PASS_REGULAR_EXPRESSION "TEST PASSED"
45+
)
4546

46-
TRIBITS_COPY_FILES_TO_BINARY_DIR(TriKotaThyraMECopyDakotaIn
47-
DEST_FILES dakota.in
48-
SOURCE_DIR ${PACKAGE_SOURCE_DIR}/test
49-
SOURCE_PREFIX "_"
50-
EXEDEPS SimpleThyraME
51-
)
47+
TRIBITS_COPY_FILES_TO_BINARY_DIR(TriKotaThyraMECopyDakotaIn
48+
DEST_FILES dakota.in
49+
SOURCE_DIR ${PACKAGE_SOURCE_DIR}/test
50+
SOURCE_PREFIX "_"
51+
EXEDEPS SimpleThyraME
52+
)
53+
ENDIF(${PACKAGE_NAME}_ENABLE_ThyraTpetraAdapters)
5254

5355
TRIBITS_ADD_EXECUTABLE_AND_TEST(
5456
ParallelDiagonalThyraME

test/Main_ParallelDiagonalThyraME.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ int main(int argc, char* argv[])
9797
Dakota::Variables finalVariables = dakota.getFinalSolution();
9898
Dakota::RealVector finalValues = finalVariables.continuous_variables();
9999

100-
std::cout << "\nfinalValues =\n" << finalValues;
100+
std::cout << "\nfinalValues =\n";
101+
finalValues.print(*out);
101102

102103
const double errorTol = 1e-6;
103104
double finalError = 0.0;

test/Main_SimpleEpetraExtME.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ int main(int argc, char* argv[])
9494
Dakota::Variables finalVariables = dakota.getFinalSolution();
9595
Dakota::RealVector finalValues = finalVariables.continuous_variables();
9696

97-
*out << "\nfinalValues =\n" << finalValues;
97+
*out << "\nfinalValues =\n";
98+
finalValues.print(*out);
9899

99100
const double errorTol = 1e-12;
100101
const double finalError = std::sqrt(

0 commit comments

Comments
 (0)