Panzer: add Tpetra tests

trilinos · Sep 22, 2023 · 24a49fa · 24a49fa
1 parent f1282ab
commit 24a49fa
Show file tree

Hide file tree

Showing 32 changed files with 7,385 additions and 681 deletions.
diff --git a/packages/panzer/adapters-stk/src/Panzer_STK_Utilities.hpp b/packages/panzer/adapters-stk/src/Panzer_STK_Utilities.hpp
@@ -40,15 +40,15 @@
 // ***********************************************************************
 // @HEADER
 
-#ifdef PANZER_HAVE_EPETRA_STACK
-
 #ifndef __Panzer_STK_Utilities_hpp__
 #define __Panzer_STK_Utilities_hpp__
 
 #include "Panzer_STK_Interface.hpp"
 
+#ifdef PANZER_HAVE_EPETRA_STACK
 #include "Epetra_Vector.h"
 #include "Epetra_MultiVector.h"
+#endif
 
 namespace panzer {
  class GlobalIndexer;
@@ -66,9 +66,13 @@ namespace panzer_stk {
  */
 void write_cell_data(panzer_stk::STK_Interface & mesh,const std::vector<double> & data,const std::string & fieldName);
 
+#ifdef PANZER_HAVE_EPETRA_STACK
+
 void write_solution_data(const panzer::GlobalIndexer& dofMngr,panzer_stk::STK_Interface & mesh,const Epetra_MultiVector & x,const std::string & prefx="",const std::string & postfix="");
 void write_solution_data(const panzer::GlobalIndexer& dofMngr,panzer_stk::STK_Interface & mesh,const Epetra_Vector & x,const std::string & prefix="",const std::string & postfix="");
 
+#endif // PANZER_HAVE_EPETRA_STACK
+
 /** Using a container, compute the sorted permutation vector
  * do not modifiy the original container.
  *
@@ -130,5 +134,3 @@ void sorted_permutation(const RAContainer & cont,std::vector<std::size_t> & perm
 }
 
 #endif
-
-#endif // PANZER_HAVE_EPETRA_STACK
diff --git a/packages/panzer/adapters-stk/test/CMakeLists.txt b/packages/panzer/adapters-stk/test/CMakeLists.txt
@@ -1,14 +1,13 @@
 IF (PANZER_HAVE_EPETRA_STACK)
- ADD_SUBDIRECTORY(assembly_engine)
- ADD_SUBDIRECTORY(field_manager_builder)
- ADD_SUBDIRECTORY(model_evaluator)
  ADD_SUBDIRECTORY(solver)
- ADD_SUBDIRECTORY(ip_coordinates)
- ADD_SUBDIRECTORY(bcstrategy)
- ADD_SUBDIRECTORY(periodic_bcs)
- ADD_SUBDIRECTORY(initial_condition_builder)
 ENDIF (PANZER_HAVE_EPETRA_STACK)
 
+ADD_SUBDIRECTORY(model_evaluator)
+ADD_SUBDIRECTORY(assembly_engine)
+ADD_SUBDIRECTORY(bcstrategy)
+ADD_SUBDIRECTORY(periodic_bcs)
+ADD_SUBDIRECTORY(initial_condition_builder)
+ADD_SUBDIRECTORY(field_manager_builder)
 ADD_SUBDIRECTORY(stk_interface_test)
 ADD_SUBDIRECTORY(stk_connmngr)
 ADD_SUBDIRECTORY(panzer_workset_builder)
@@ -22,3 +21,4 @@ ADD_SUBDIRECTORY(local_mesh)
 ADD_SUBDIRECTORY(projection)
 ADD_SUBDIRECTORY(transform_bc_names)
 ADD_SUBDIRECTORY(sideset_overlap)
+ADD_SUBDIRECTORY(ip_coordinates)
diff --git a/packages/panzer/adapters-stk/test/assembly_engine/assembly_engine.cpp b/packages/panzer/adapters-stk/test/assembly_engine/assembly_engine.cpp
diff --git a/packages/panzer/adapters-stk/test/assembly_engine/simple_bc.cpp b/packages/panzer/adapters-stk/test/assembly_engine/simple_bc.cpp
diff --git a/packages/panzer/adapters-stk/test/bcstrategy/CMakeLists.txt b/packages/panzer/adapters-stk/test/bcstrategy/CMakeLists.txt
@@ -7,23 +7,41 @@ TRIBITS_INCLUDE_DIRECTORIES(${PARENT_PACKAGE_SOURCE_DIR}/disc-fe/test/closure_mo
 SET(UNIT_TEST_DRIVER
  ${PANZER_UNIT_TEST_MAIN})
 
-SET(SOURCES
- bcstrategy.cpp
+SET(COMMON_HEADERS
  user_app_BCStrategy_Dirichlet_Constant.hpp
  user_app_BCStrategy_Dirichlet_Constant_impl.hpp
  user_app_BCStrategy_Neumann_Constant.hpp
  user_app_BCStrategy_Neumann_Constant_impl.hpp
  user_app_BCStrategy_Factory.hpp
- ) 
+ )
+
+
+
+SET(SOURCES_TPETRA
+ bcstrategy_tpetra.cpp
+ )
 
 TRIBITS_ADD_EXECUTABLE_AND_TEST(
- bcstrategy
- SOURCES ${SOURCES} ${UNIT_TEST_DRIVER}
+ bcstrategy_tpetra
+ SOURCES ${SOURCES_TPETRA} ${COMMON_HEADERS} ${UNIT_TEST_DRIVER}
  NUM_MPI_PROCS 1
  )
 
 TRIBITS_ADD_EXECUTABLE_AND_TEST(
  bcstrategy_composite_factory
  SOURCES bcstrategy_composite_factory.cpp ${UNIT_TEST_DRIVER} user_app_BCStrategy_Dirichlet_Constant.hpp user_app_BCStrategy_Dirichlet_Constant_impl.hpp user_app_BCStrategy_Factory_Physics1.hpp user_app_BCStrategy_Factory_Physics2.hpp
  NUM_MPI_PROCS 1
- )
+ )
+
+IF (PANZER_HAVE_EPETRA)
+ SET(SOURCES_EPETRA
+ bcstrategy.cpp
+ )
+ TRIBITS_ADD_EXECUTABLE_AND_TEST(
+ bcstrategy_epetra
+ SOURCES ${SOURCES_EPETRA} ${COMMON_HEADERS} ${UNIT_TEST_DRIVER}
+ NUM_MPI_PROCS 1
+ )
+ENDIF(PANZER_HAVE_EPETRA)
+
+
diff --git a/packages/panzer/adapters-stk/test/bcstrategy/bcstrategy_composite_factory.cpp b/packages/panzer/adapters-stk/test/bcstrategy/bcstrategy_composite_factory.cpp
@@ -75,13 +75,10 @@
 #include "user_app_EquationSetFactory.hpp"
 #include "user_app_ClosureModel_Factory_TemplateBuilder.hpp"
 
-#include "Epetra_MpiComm.h"
-
 namespace panzer {
 
  TEUCHOS_UNIT_TEST(bcstrategy, basic_construction)
  {
-
  std::size_t bc_id = 0;
  panzer::BCType neumann = BCT_Dirichlet;
  std::string sideset_id = "4";