Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#153: Provide Tpetra version of CDR_Model #120

Merged
merged 9 commits into from
Sep 28, 2023
Merged

#153: Provide Tpetra version of CDR_Model #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
37cf869
Tempus: Remove epetra includes that are not needed
JacobDomagala Aug 17, 2023
4c4f46b
Tpetra changes
JacobDomagala Sep 7, 2023
08691e9
Tempus: Finialized CDR_Model_Tpetra
JacobDomagala Sep 14, 2023
e96e5a6
Tempus: Working CDR_Model_Tpetra
JacobDomagala Sep 15, 2023
da3d902
Tempus: Extract the core logic from CDR test into separate function, …
JacobDomagala Sep 20, 2023
1521cb8
Tempus: Revert changes done to Epetra CDR Model
JacobDomagala Sep 20, 2023
cbdc97b
Tempus: Use common function for Epetra CDR test
JacobDomagala Sep 20, 2023
8998fb2
Tempus: Use CDR_Model_Tpetra for BDF2 Test
JacobDomagala Sep 25, 2023
fb45636
Tempus: Cleanup code
JacobDomagala Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/tempus/src/Tempus_ExplicitTemplateInstantiation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

#include "Tempus_config.hpp"

#define TEMPUS_INSTANTIATE_TEMPLATE_CLASS_TPETRA(name, SC, LO, GO, Node) \
template class name<SC, LO, GO, Node>;

// Always instantiate on double
#define TEMPUS_INSTANTIATE_TEMPLATE_CLASS_ON_DOUBLE(name) \
template class name<double>;
Expand Down
108 changes: 63 additions & 45 deletions packages/tempus/test/BDF2/Tempus_BDF2Test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@

#include "../TestModels/SinCosModel.hpp"
#include "../TestModels/CDR_Model.hpp"
#include "../TestModels/CDR_Model_Tpetra.hpp"
#include "../TestModels/VanDerPolModel.hpp"
#include "../TestUtils/Tempus_ConvergenceTestUtils.hpp"

#include "Stratimikos_DefaultLinearSolverBuilder.hpp"
#include "Thyra_LinearOpWithSolveFactoryHelpers.hpp"
#include "Tpetra_Core.hpp"

#ifdef Tempus_ENABLE_MPI
#include "Epetra_MpiComm.h"
Expand Down Expand Up @@ -474,46 +476,34 @@ TEUCHOS_UNIT_TEST(BDF2, SinCosAdapt)
}


// ************************************************************
// ************************************************************
TEUCHOS_UNIT_TEST(BDF2, CDR)
{
// Create a communicator for Epetra objects
RCP<Epetra_Comm> comm;
#ifdef Tempus_ENABLE_MPI
comm = rcp(new Epetra_MpiComm(MPI_COMM_WORLD));
#else
comm = rcp(new Epetra_SerialComm);
#endif

template <typename SC, typename Model, typename Comm>
void CDR_Test(const Comm& comm, const int commSize, Teuchos::FancyOStream &out, bool& success){
RCP<Tempus::IntegratorBasic<double> > integrator;
std::vector<RCP<Thyra::VectorBase<double>>> solutions;
std::vector<RCP<Thyra::VectorBase<double>>> solutionsDot;
std::vector<double> StepSize;

// Read params from .xml file
RCP<ParameterList> pList =
getParametersFromXmlFile("Tempus_BDF2_CDR.xml");
auto pList = getParametersFromXmlFile("Tempus_BDF2_CDR.xml");
//Set initial time step = 2*dt specified in input file (for convergence study)
//
RCP<ParameterList> pl = sublist(pList, "Tempus", true);
double dt = pl->sublist("Demo Integrator")
.sublist("Time Step Control").get<double>("Initial Time Step");
auto pl = sublist(pList, "Tempus", true);
auto dt = pl->sublist("Demo Integrator").sublist("Time Step Control").get<double>("Initial Time Step");
dt *= 2.0;
RCP<ParameterList> model_pl = sublist(pList, "CDR Model", true);
auto model_pl = sublist(pList, "CDR Model", true);

const int nTimeStepSizes = model_pl->get<int>("Number of Time Step Sizes", 5);
const auto nTimeStepSizes = model_pl->get<int>("Number of Time Step Sizes", 5);

for (int n=0; n<nTimeStepSizes; n++) {

// Create CDR Model
const int num_elements = model_pl->get<int>("num elements");
const double left_end = model_pl->get<double>("left end");
const double right_end = model_pl->get<double>("right end");
const double a_convection = model_pl->get<double>("a (convection)");
const double k_source = model_pl->get<double>("k (source)");
const auto left_end = model_pl->get<SC>("left end");
const auto right_end = model_pl->get<SC>("right end");
const auto a_convection = model_pl->get<SC>("a (convection)");
const auto k_source = model_pl->get<SC>("k (source)");

auto model = rcp(new Tempus_Test::CDR_Model<double>(comm,
auto model = rcp(new Model(comm,
num_elements,
left_end,
right_end,
Expand All @@ -528,8 +518,7 @@ TEUCHOS_UNIT_TEST(BDF2, CDR)
p->set("Preconditioner Type", "None");
builder.setParameterList(p);

RCP< ::Thyra::LinearOpWithSolveFactoryBase<double> >
lowsFactory = builder.createLinearSolveStrategy("");
auto lowsFactory = builder.createLinearSolveStrategy("");

model->set_W_factory(lowsFactory);

Expand Down Expand Up @@ -563,23 +552,23 @@ TEUCHOS_UNIT_TEST(BDF2, CDR)

// Output finest temporal solution for plotting
// This only works for ONE MPI process
if ((n == nTimeStepSizes-1) && (comm->NumProc() == 1)) {
if ((n == nTimeStepSizes-1) && (commSize == 1)) {
std::ofstream ftmp("Tempus_BDF2_CDR.dat");
ftmp << "TITLE=\"BDF2 Solution to CDR\"\n"
<< "VARIABLES=\"z\",\"T\"\n";
const double dx = std::fabs(left_end-right_end) /
const auto dx = std::fabs(left_end-right_end) /
static_cast<double>(num_elements);
RCP<const SolutionHistory<double> > solutionHistory =
auto solutionHistory =
integrator->getSolutionHistory();
int nStates = solutionHistory->getNumStates();
for (int i=0; i<nStates; i++) {
RCP<const SolutionState<double> > solutionState = (*solutionHistory)[i];
RCP<const Thyra::VectorBase<double> > x = solutionState->getX();
double ttime = solutionState->getTime();
auto solutionState = (*solutionHistory)[i];
auto x = solutionState->getX();
auto ttime = solutionState->getTime();
ftmp << "ZONE T=\"Time="<<ttime<<"\", I="
<<num_elements+1<<", F=BLOCK\n";
for (int j = 0; j < num_elements+1; j++) {
const double x_coord = left_end + static_cast<double>(j) * dx;
const auto x_coord = left_end + static_cast<double>(j) * dx;
ftmp << x_coord << " ";
}
ftmp << std::endl;
Expand All @@ -596,8 +585,8 @@ TEUCHOS_UNIT_TEST(BDF2, CDR)
double xDotSlope = 0.0;
std::vector<double> xErrorNorm;
std::vector<double> xDotErrorNorm;
RCP<Tempus::Stepper<double> > stepper = integrator->getStepper();
double order = stepper->getOrder();
auto stepper = integrator->getStepper();
auto order = stepper->getOrder();
writeOrderError("Tempus_BDF2_CDR-Error.dat",
stepper, StepSize,
solutions, xErrorNorm, xSlope,
Expand All @@ -613,21 +602,20 @@ TEUCHOS_UNIT_TEST(BDF2, CDR)

// Write fine mesh solution at final time
// This only works for ONE MPI process
if (comm->NumProc() == 1) {
RCP<ParameterList> pListCDR =
getParametersFromXmlFile("Tempus_BDF2_CDR.xml");
RCP<ParameterList> model_pl_CDR = sublist(pListCDR, "CDR Model", true);
const int num_elements = model_pl_CDR->get<int>("num elements");
const double left_end = model_pl_CDR->get<double>("left end");
const double right_end = model_pl_CDR->get<double>("right end");
if (commSize == 1) {
auto pListCDR = getParametersFromXmlFile("Tempus_BDF2_CDR.xml");
auto model_pl_CDR = sublist(pListCDR, "CDR Model", true);
const auto num_elements = model_pl_CDR->get<int>("num elements");
const auto left_end = model_pl_CDR->get<double>("left end");
const auto right_end = model_pl_CDR->get<double>("right end");

const Thyra::VectorBase<double>& x = *(solutions[solutions.size()-1]);
const auto& x = *(solutions[solutions.size()-1]);

std::ofstream ftmp("Tempus_BDF2_CDR-Solution.dat");
for (int n = 0; n < num_elements+1; n++) {
const double dx = std::fabs(left_end-right_end) /
const auto dx = std::fabs(left_end-right_end) /
static_cast<double>(num_elements);
const double x_coord = left_end + static_cast<double>(n) * dx;
const auto x_coord = left_end + static_cast<double>(n) * dx;
ftmp << x_coord << " " << Thyra::get_ele(x,n) << std::endl;
}
ftmp.close();
Expand All @@ -636,6 +624,36 @@ TEUCHOS_UNIT_TEST(BDF2, CDR)
Teuchos::TimeMonitor::summarize();
}

// ************************************************************
// ************************************************************
TEUCHOS_UNIT_TEST(BDF2, CDR)
{
// Create a communicator for Epetra objects
RCP<Epetra_Comm> comm;
#ifdef Tempus_ENABLE_MPI
comm = rcp(new Epetra_MpiComm(MPI_COMM_WORLD));
#else
comm = rcp(new Epetra_SerialComm);
#endif

CDR_Test<double, Tempus_Test::CDR_Model<double>>(comm, comm->NumProc(), out, success);
}

// ************************************************************
// ************************************************************
TEUCHOS_UNIT_TEST(BDF2, CDR_Tpetra)
{
// Get default Tpetra template types
using SC = Tpetra::Vector<>::scalar_type;
using LO = Tpetra::Vector<>::local_ordinal_type;
using GO = Tpetra::Vector<>::global_ordinal_type;
using Node = Tpetra::Vector<>::node_type;

auto comm = Tpetra::getDefaultComm();

CDR_Test<SC, Tempus_Test::CDR_Model_Tpetra<SC, LO, GO, Node>>(comm, comm->getSize(), out, success);
}


// ************************************************************
// ************************************************************
Expand Down
71 changes: 45 additions & 26 deletions packages/tempus/test/BackwardEuler/Tempus_BackwardEulerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// ****************************************************************************
// @HEADER

#include "CDR_Model_Tpetra_decl.hpp"
#include "Teuchos_UnitTestHarness.hpp"
#include "Teuchos_XMLParameterListHelpers.hpp"
#include "Teuchos_TimeMonitor.hpp"
Expand All @@ -17,11 +18,13 @@

#include "../TestModels/SinCosModel.hpp"
#include "../TestModels/CDR_Model.hpp"
#include "../TestModels/CDR_Model_Tpetra.hpp"
#include "../TestModels/VanDerPolModel.hpp"
#include "../TestUtils/Tempus_ConvergenceTestUtils.hpp"

#include "Stratimikos_DefaultLinearSolverBuilder.hpp"
#include "Thyra_LinearOpWithSolveFactoryHelpers.hpp"
#include "Tpetra_Core.hpp"

#ifdef Tempus_ENABLE_MPI
#include "Epetra_MpiComm.h"
cwschilly marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -323,17 +326,9 @@ TEUCHOS_UNIT_TEST(BackwardEuler, SinCos)
}


// ************************************************************
// ************************************************************
TEUCHOS_UNIT_TEST(BackwardEuler, CDR)
{
// Create a communicator for Epetra objects
RCP<Epetra_Comm> comm;
#ifdef Tempus_ENABLE_MPI
comm = rcp(new Epetra_MpiComm(MPI_COMM_WORLD));
#else
comm = rcp(new Epetra_SerialComm);
#endif

template <typename SC, typename Model, typename Comm>
void CDR_Test(const Comm& comm, const int commSize, Teuchos::FancyOStream &out, bool& success){

RCP<Tempus::IntegratorBasic<double> > integrator;
std::vector<RCP<Thyra::VectorBase<double>>> solutions;
Expand All @@ -351,18 +346,13 @@ TEUCHOS_UNIT_TEST(BackwardEuler, CDR)

// Create CDR Model
RCP<ParameterList> model_pl = sublist(pList, "CDR Model", true);
const int num_elements = model_pl->get<int>("num elements");
const double left_end = model_pl->get<double>("left end");
const double right_end = model_pl->get<double>("right end");
const double a_convection = model_pl->get<double>("a (convection)");
const double k_source = model_pl->get<double>("k (source)");
const auto num_elements = model_pl->get<int>("num elements");
const auto left_end = model_pl->get<SC>("left end");
const auto right_end = model_pl->get<SC>("right end");
const auto a_convection = model_pl->get<SC>("a (convection)");
const auto k_source = model_pl->get<SC>("k (source)");

auto model = rcp(new Tempus_Test::CDR_Model<double>(comm,
num_elements,
left_end,
right_end,
a_convection,
k_source));
auto model = rcp(new Model(comm, num_elements, left_end, right_end, a_convection, k_source));

// Set the factory
::Stratimikos::DefaultLinearSolverBuilder builder;
Expand All @@ -372,8 +362,7 @@ TEUCHOS_UNIT_TEST(BackwardEuler, CDR)
p->set("Preconditioner Type", "None");
builder.setParameterList(p);

RCP< ::Thyra::LinearOpWithSolveFactoryBase<double> >
lowsFactory = builder.createLinearSolveStrategy("");
auto lowsFactory = builder.createLinearSolveStrategy("");

model->set_W_factory(lowsFactory);

Expand Down Expand Up @@ -408,7 +397,7 @@ TEUCHOS_UNIT_TEST(BackwardEuler, CDR)

// Output finest temporal solution for plotting
// This only works for ONE MPI process
if ((n == nTimeStepSizes-1) && (comm->NumProc() == 1)) {
if ((n == nTimeStepSizes-1) && (commSize == 1)) {
std::ofstream ftmp("Tempus_BackwardEuler_CDR.dat");
ftmp << "TITLE=\"Backward Euler Solution to CDR\"\n"
<< "VARIABLES=\"z\",\"T\"\n";
Expand Down Expand Up @@ -455,7 +444,7 @@ TEUCHOS_UNIT_TEST(BackwardEuler, CDR)

// Write fine mesh solution at final time
// This only works for ONE MPI process
if (comm->NumProc() == 1) {
if (commSize == 1) {
RCP<ParameterList> pList =
getParametersFromXmlFile("Tempus_BackwardEuler_CDR.xml");
RCP<ParameterList> model_pl = sublist(pList, "CDR Model", true);
Expand All @@ -478,6 +467,36 @@ TEUCHOS_UNIT_TEST(BackwardEuler, CDR)
Teuchos::TimeMonitor::summarize();
}

// ************************************************************
// ************************************************************
TEUCHOS_UNIT_TEST(BackwardEuler, CDR)
{
// Create a communicator for Epetra objects
RCP<Epetra_Comm> comm;
#ifdef Tempus_ENABLE_MPI
comm = rcp(new Epetra_MpiComm(MPI_COMM_WORLD));
#else
comm = rcp(new Epetra_SerialComm);
#endif

CDR_Test<double, Tempus_Test::CDR_Model<double>>(comm, comm->NumProc(), out, success);
}

// ************************************************************
// ************************************************************
TEUCHOS_UNIT_TEST(BackwardEuler, CDR_Tpetra)
{
// Get default Tpetra template types
using SC = Tpetra::Vector<>::scalar_type;
using LO = Tpetra::Vector<>::local_ordinal_type;
using GO = Tpetra::Vector<>::global_ordinal_type;
using Node = Tpetra::Vector<>::node_type;

auto comm = Tpetra::getDefaultComm();

CDR_Test<SC, Tempus_Test::CDR_Model_Tpetra<SC, LO, GO, Node>>(comm, comm->getSize(), out, success);
}


// ************************************************************
// ************************************************************
Expand Down
7 changes: 0 additions & 7 deletions packages/tempus/test/HHTAlpha/Tempus_HHTAlphaTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,6 @@
#include "Thyra_DetachedMultiVectorView.hpp"
#include "NOX_Thyra.H"


#ifdef Tempus_ENABLE_MPI
#include "Epetra_MpiComm.h"
#else
#include "Epetra_SerialComm.h"
#endif

#include <fstream>
#include <limits>
#include <sstream>
Expand Down
12 changes: 11 additions & 1 deletion packages/tempus/test/TestModels/CDR_Model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,19 @@
#ifdef HAVE_TEMPUS_EXPLICIT_INSTANTIATION
#include "CDR_Model.hpp"
#include "CDR_Model_impl.hpp"
#include "CDR_Model_Tpetra.hpp"
#include "CDR_Model_Tpetra_impl.hpp"


namespace Tempus_Test {
// Get default Tpetra template types
using SC = Tpetra::Vector<>::scalar_type;
using LO = Tpetra::Vector<>::local_ordinal_type;
using GO = Tpetra::Vector<>::global_ordinal_type;
using Node = Tpetra::Vector<>::node_type;

TEMPUS_INSTANTIATE_TEMPLATE_CLASS(CDR_Model)
TEMPUS_INSTANTIATE_TEMPLATE_CLASS_TPETRA(CDR_Model_Tpetra, SC, LO, GO, Node)
}

#endif
#endif // HAVE_TEMPUS_EXPLICIT_INSTANTIATION
Loading
Loading