Skip to content

Commit 69e0561

Browse files
authored
Trilinos Couplings: Moving the STK Example to Tpetra (#13882)
* TrilinosCouplings: Initial move of example_Poisson_stk to Tpetra. It compiles, but doesn't work Signed-off-by: Chris Siefert <[email protected]> * TrilinosCouplings: Initial move of example_Poisson_stk to Tpetra. It compiles, but doesn't work Signed-off-by: Chris Siefert <[email protected]> * TrilinosCouplings: It runs Signed-off-by: Chris Siefert <[email protected]> * TrilinosCouplings: Cleaning up timing Signed-off-by: Chris Siefert <[email protected]> * TrilinosCouplings: Cleaning up timing Signed-off-by: Chris Siefert <[email protected]> * TrilinosCouplings: Cleaning up timing Signed-off-by: Chris Siefert <[email protected]> * TrilinosCouplings: Fixing cmake logic Signed-off-by: Chris Siefert <[email protected]> --------- Signed-off-by: Chris Siefert <[email protected]>
1 parent a49b240 commit 69e0561

File tree

3 files changed

+340
-331
lines changed

3 files changed

+340
-331
lines changed

packages/trilinoscouplings/cmake/Dependencies.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SET(LIB_REQUIRED_DEP_PACKAGES)
22
SET(LIB_OPTIONAL_DEP_PACKAGES Amesos AztecOO Belos EpetraExt Ifpack Isorropia ML MueLu NOX Stokhos Zoltan)
33
SET(TEST_REQUIRED_DEP_PACKAGES)
4-
SET(TEST_OPTIONAL_DEP_PACKAGES Amesos AvatarT AztecOO Epetra EpetraExt Ifpack Ifpack2 Intrepid Intrepid2 Isorropia Kokkos KokkosKernels ML MueLu MueLu Pamgen SEACASExodus SEACASNemesis Sacado STKIO STKMesh Stokhos Stratimikos Teko TeuchosKokkosComm TeuchosKokkosCompat Tpetra Zoltan)
4+
SET(TEST_OPTIONAL_DEP_PACKAGES Amesos Amesos2 AvatarT AztecOO Epetra EpetraExt Ifpack Ifpack2 Intrepid Intrepid2 Isorropia Kokkos KokkosKernels ML MueLu MueLu Pamgen SEACASExodus SEACASNemesis Sacado STKIO STKMesh Stokhos Stratimikos Teko TeuchosKokkosComm TeuchosKokkosCompat Tpetra Zoltan)
55
SET(LIB_REQUIRED_DEP_TPLS)
66
SET(LIB_OPTIONAL_DEP_TPLS)
77
SET(TEST_REQUIRED_DEP_TPLS)

packages/trilinoscouplings/examples/scaling/CMakeLists.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -241,14 +241,15 @@ IF(${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND
241241
ENDIF()
242242

243243

244-
IF(${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND
245-
${PACKAGE_NAME}_ENABLE_Amesos AND ${PACKAGE_NAME}_ENABLE_AztecOO AND
246-
${PACKAGE_NAME}_ENABLE_Intrepid AND ${PACKAGE_NAME}_ENABLE_ML AND
244+
IF(TPL_ENABLE_MPI AND ${PACKAGE_NAME}_ENABLE_Tpetra AND
245+
${PACKAGE_NAME}_ENABLE_Amesos2 AND ${PACKAGE_NAME}_ENABLE_Belos AND
246+
${PACKAGE_NAME}_ENABLE_Intrepid AND ${PACKAGE_NAME}_ENABLE_MueLu AND
247247
${PACKAGE_NAME}_ENABLE_STKIO AND ${PACKAGE_NAME}_ENABLE_STKMesh)
248-
message(STATUS "Building Example_Poisson_STK")
248+
message(STATUS "TrilinosCouplings: Building Example_Poisson_STK")
249249
TRIBITS_ADD_EXECUTABLE(
250250
Example_Poisson_STK
251251
SOURCES example_Poisson_stk.cpp
252+
TrilinosCouplings_TpetraIntrepidPoissonExample_SolveWithBelos.cpp
252253
)
253254
TRIBITS_COPY_FILES_TO_BINARY_DIR(CopyMeshFilesSTK
254255
SOURCE_FILES unit_cube_10int_hex.exo

0 commit comments

Comments
 (0)