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

Guard NOX support in include/deal.II/numerics/nonlinear.h #15704

Merged
merged 1 commit into from
Jul 10, 2023
Merged

Guard NOX support in include/deal.II/numerics/nonlinear.h #15704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions include/deal.II/numerics/nonlinear.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class NonlinearSolverSelector
* Set the additional data for NOX. See TrilinosWrappers::NOXSolver
* for more information.
*/
#ifdef DEAL_II_WITH_TRILINOS
#ifdef DEAL_II_TRILINOS_WITH_NOX
void
set_data(
const typename TrilinosWrappers::NOXSolver<VectorType>::AdditionalData
Expand Down Expand Up @@ -374,7 +374,7 @@ class NonlinearSolverSelector
/**
* NOX configuration data
*/
#ifdef DEAL_II_WITH_TRILINOS
#ifdef DEAL_II_TRILINOS_WITH_NOX
typename TrilinosWrappers::NOXSolver<VectorType>::AdditionalData
additional_data_nox;
Teuchos::RCP<Teuchos::ParameterList> parameters_nox =
Expand Down Expand Up @@ -432,7 +432,7 @@ NonlinearSolverSelector<VectorType>::set_data(
#endif

// Do the same thing we did above but with NOX
#ifdef DEAL_II_WITH_TRILINOS
#ifdef DEAL_II_TRILINOS_WITH_NOX
parameters_nox->set("Nonlinear Solver", "Line Search Based");
Teuchos::ParameterList &Line_Search = parameters_nox->sublist("Line Search");
Line_Search.set("Method", "Full Step");
Expand Down Expand Up @@ -539,7 +539,7 @@ NonlinearSolverSelector<VectorType>::AdditionalData::AdditionalData(



#ifdef DEAL_II_WITH_TRILINOS
#ifdef DEAL_II_TRILINOS_WITH_NOX
template <typename VectorType>
void
NonlinearSolverSelector<VectorType>::set_data(
Expand Down Expand Up @@ -617,7 +617,7 @@ NonlinearSolverSelector<VectorType>::solve(
#ifdef DEAL_II_WITH_PETSC
additional_data.solver_type = AdditionalData::SolverType::petsc_snes;
#endif
#ifdef DEAL_II_WITH_TRILINOS
#ifdef DEAL_II_TRILINOS_WITH_NOX
additional_data.solver_type = AdditionalData::SolverType::nox;
#endif
#ifdef DEAL_II_WITH_SUNDIALS
Expand Down Expand Up @@ -655,7 +655,7 @@ NonlinearSolverSelector<VectorType>::solve(
}
else if (additional_data.solver_type == AdditionalData::SolverType::nox)
{
#ifdef DEAL_II_WITH_TRILINOS
#ifdef DEAL_II_TRILINOS_WITH_NOX

TrilinosWrappers::NOXSolver<VectorType> nonlinear_solver(
additional_data_nox, parameters_nox);
Expand Down Expand Up @@ -688,7 +688,7 @@ NonlinearSolverSelector<VectorType>::solve(
#ifdef DEAL_II_WITH_SUNDIALS
"kinsol\n"
#endif
#ifdef DEAL_II_WITH_TRILINOS
#ifdef DEAL_II_TRILINOS_WITH_NOX
"NOX\n"
#endif
#ifdef DEAL_II_WITH_PETSC
Expand Down