Merge Pull Request #12507 from trilinos/Trilinos/12505-Tempus-Split-U…

…p-IMEX-RK-Partitioned-FSA-Tests Automatically Merged using Trilinos Pull Request AutoTester PR Title: b'Tempus: Split Up IMEX RK Partitioned FSA Tests' PR Author: ccober6
trilinos · Nov 10, 2023 · b6b853e · b6b853e
2 parents 1767fbf + 63a09db
commit b6b853e
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 9 deletions.
diff --git a/packages/tempus/test/IMEX_RK_Partitioned/CMakeLists.txt b/packages/tempus/test/IMEX_RK_Partitioned/CMakeLists.txt
@@ -42,6 +42,43 @@ TRIBITS_ADD_TEST(
   NUM_MPI_PROCS 1
   )
 
+
+TRIBITS_ADD_EXECUTABLE(
+  IMEX_RK_Partitioned_Combined_FSA_Tangent
+  SOURCES Tempus_IMEX_RK_Partitioned_Combined_FSA_Tangent.cpp Tempus_IMEX_RK_Partitioned_FSA.hpp
+  TESTONLYLIBS tempus_test_models
+  )
+
+TRIBITS_ADD_TEST(
+  IMEX_RK_Partitioned_Combined_FSA_Tangent
+  NAME "IMEX_RK_Partitioned_Combined_FSA_Tangent_Partitioned_IMEX_RK_1st_Order"
+  ARGS "--method=\"Partitioned IMEX RK 1st order\""
+  NUM_MPI_PROCS 1
+  )
+
+TRIBITS_ADD_TEST(
+  IMEX_RK_Partitioned_Combined_FSA_Tangent
+  NAME "IMEX_RK_Partitioned_Combined_FSA_Tangent_Partitioned_IMEX_RK_SSP2"
+  ARGS "--method=\"Partitioned IMEX RK SSP2\""
+  NUM_MPI_PROCS 1
+  )
+
+TRIBITS_ADD_TEST(
+  IMEX_RK_Partitioned_Combined_FSA_Tangent
+  NAME "IMEX_RK_Partitioned_Combined_FSA_Tangent_Partitioned_IMEX_RK_ARS_233"
+  ARGS "--method=\"Partitioned IMEX RK ARS 233\""
+  NUM_MPI_PROCS 1
+  )
+
+TRIBITS_ADD_TEST(
+  IMEX_RK_Partitioned_Combined_FSA_Tangent
+  NAME "IMEX_RK_Partitioned_Combined_FSA_Tangent_General_Partioned_IMEX_RK"
+  ARGS "--method=\"General Partitioned IMEX RK\""
+  NUM_MPI_PROCS 1
+  )
+
+
+
 TRIBITS_ADD_EXECUTABLE(
   IMEX_RK_Partitioned_Staggered_FSA
   SOURCES Tempus_IMEX_RK_Partitioned_Staggered_FSA.cpp Tempus_IMEX_RK_Partitioned_FSA.hpp
@@ -76,7 +113,43 @@ TRIBITS_ADD_TEST(
   NUM_MPI_PROCS 1
   )
 
+
+
+TRIBITS_ADD_EXECUTABLE(
+  IMEX_RK_Partitioned_Staggered_FSA_Tangent
+  SOURCES Tempus_IMEX_RK_Partitioned_Staggered_FSA_Tangent.cpp Tempus_IMEX_RK_Partitioned_FSA.hpp
+  TESTONLYLIBS tempus_test_models
+  )
+
+TRIBITS_ADD_TEST(
+  IMEX_RK_Partitioned_Staggered_FSA_Tangent
+  NAME "IMEX_RK_Partitioned_Staggered_FSA_Tangent_Partitioned_IMEX_RK_1st_Order"
+  ARGS "--method=\"Partitioned IMEX RK 1st order\""
+  NUM_MPI_PROCS 1
+  )
+
+TRIBITS_ADD_TEST(
+  IMEX_RK_Partitioned_Staggered_FSA_Tangent
+  NAME "IMEX_RK_Partitioned_Staggered_FSA_Tangent_Partitioned_IMEX_RK_SSP2"
+  ARGS "--method=\"Partitioned IMEX RK SSP2\""
+  NUM_MPI_PROCS 1
+  )
+
+TRIBITS_ADD_TEST(
+  IMEX_RK_Partitioned_Staggered_FSA_Tangent
+  NAME "IMEX_RK_Partitioned_Staggered_FSA_Tangent_Partitioned_IMEX_RK_ARS_233"
+  ARGS "--method=\"Partitioned IMEX RK ARS 233\""
+  NUM_MPI_PROCS 1
+  )
+
+TRIBITS_ADD_TEST(
+  IMEX_RK_Partitioned_Staggered_FSA_Tangent
+  NAME "IMEX_RK_Partitioned_Staggered_FSA_Tangent_General_Partioned_IMEX_RK"
+  ARGS "--method=\"General Partitioned IMEX RK\""
+  NUM_MPI_PROCS 1
+  )
+
 TRIBITS_COPY_FILES_TO_BINARY_DIR(Test_IMEX_RK_Partitioned_CopyFiles
   DEST_FILES Tempus_IMEX_RK_VanDerPol.xml
-  EXEDEPS IMEX_RK_Partitioned
+  EXEDEPS IMEX_RK_Partitioned IMEX_RK_Partitioned_Combined_FSA IMEX_RK_Partitioned_Combined_FSA_Tangent IMEX_RK_Partitioned_Staggered_FSA IMEX_RK_Partitioned_Staggered_FSA_Tangent
   )
diff --git a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Combined_FSA.cpp b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Combined_FSA.cpp
@@ -21,10 +21,6 @@ TEUCHOS_UNIT_TEST(IMEX_RK_Partitioned, VanDerPol_Combined_FSA)
   test_vdp_fsa(method_name, true, false, out, success);
 }
 
-TEUCHOS_UNIT_TEST(IMEX_RK_Partitioned, VanDerPol_Combined_FSA_Tangent)
-{
-  test_vdp_fsa(method_name, true, true, out, success);
-}
 
 } // namespace Tempus_Test
 

diff --git a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Combined_FSA_Tangent.cpp b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Combined_FSA_Tangent.cpp
@@ -0,0 +1,37 @@
+// @HEADER
+// ****************************************************************************
+//                Tempus: Copyright (2017) Sandia Corporation
+//
+// Distributed under BSD 3-clause license (See accompanying file Copyright.txt)
+// ****************************************************************************
+// @HEADER
+
+#include "Tempus_IMEX_RK_Partitioned_FSA.hpp"
+
+#include "Teuchos_UnitTestRepository.hpp"
+#include "Teuchos_GlobalMPISession.hpp"
+#include "Teuchos_CommandLineProcessor.hpp"
+
+std::string method_name;
+
+namespace Tempus_Test {
+
+TEUCHOS_UNIT_TEST(IMEX_RK_Partitioned, VanDerPol_Combined_FSA_Tangent)
+{
+  test_vdp_fsa(method_name, true, true, out, success);
+}
+
+
+} // namespace Tempus_Test
+
+int main( int argc, char* argv[] )
+{
+  Teuchos::GlobalMPISession mpiSession(&argc, &argv);
+
+  // Add "--method" command line argument
+  Teuchos::CommandLineProcessor& CLP = Teuchos::UnitTestRepository::getCLP();
+  method_name = "";
+  CLP.setOption("method", &method_name, "Stepper method");
+
+  return Teuchos::UnitTestRepository::runUnitTestsFromMain(argc, argv);
+}
diff --git a/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Staggered_FSA.cpp b/packages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Staggered_FSA.cpp
@@ -21,10 +21,6 @@ TEUCHOS_UNIT_TEST(IMEX_RK_Partitioned, VanDerPol_Staggered_FSA)
   test_vdp_fsa(method_name, false, false, out, success);
 }
 
-TEUCHOS_UNIT_TEST(IMEX_RK_Partitioned, VanDerPol_Staggered_FSA_Tangent)
-{
-  test_vdp_fsa(method_name, false, true, out, success);
-}
 
 } // namespace Tempus_Test
 

diff --git a/...ages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Staggered_FSA_Tangent.cpp b/...ages/tempus/test/IMEX_RK_Partitioned/Tempus_IMEX_RK_Partitioned_Staggered_FSA_Tangent.cpp
@@ -0,0 +1,36 @@
+// @HEADER
+// ****************************************************************************
+//                Tempus: Copyright (2017) Sandia Corporation
+//
+// Distributed under BSD 3-clause license (See accompanying file Copyright.txt)
+// ****************************************************************************
+// @HEADER
+
+#include "Tempus_IMEX_RK_Partitioned_FSA.hpp"
+
+#include "Teuchos_UnitTestRepository.hpp"
+#include "Teuchos_GlobalMPISession.hpp"
+#include "Teuchos_CommandLineProcessor.hpp"
+
+std::string method_name;
+
+namespace Tempus_Test {
+
+TEUCHOS_UNIT_TEST(IMEX_RK_Partitioned, VanDerPol_Staggered_FSA_Tangent)
+{
+  test_vdp_fsa(method_name, false, true, out, success);
+}
+
+} // namespace Tempus_Test
+
+int main( int argc, char* argv[] )
+{
+  Teuchos::GlobalMPISession mpiSession(&argc, &argv);
+
+  // Add "--method" command line argument
+  Teuchos::CommandLineProcessor& CLP = Teuchos::UnitTestRepository::getCLP();
+  method_name = "";
+  CLP.setOption("method", &method_name, "Stepper method");
+
+  return Teuchos::UnitTestRepository::runUnitTestsFromMain(argc, argv);
+}