From: Daniel Arndt Date: Mon, 10 Jul 2023 15:32:14 +0000 (-0400) Subject: Guard NOX support in include/deal.II/numerics/nonlinear.h X-Git-Tag: relicensing~705^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F15704%2Fhead;p=dealii.git Guard NOX support in include/deal.II/numerics/nonlinear.h --- diff --git a/include/deal.II/numerics/nonlinear.h b/include/deal.II/numerics/nonlinear.h index 90b009991a..cf2ae9046a 100644 --- a/include/deal.II/numerics/nonlinear.h +++ b/include/deal.II/numerics/nonlinear.h @@ -239,7 +239,7 @@ public: * 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::AdditionalData @@ -374,7 +374,7 @@ private: /** * NOX configuration data */ -#ifdef DEAL_II_WITH_TRILINOS +#ifdef DEAL_II_TRILINOS_WITH_NOX typename TrilinosWrappers::NOXSolver::AdditionalData additional_data_nox; Teuchos::RCP parameters_nox = @@ -432,7 +432,7 @@ NonlinearSolverSelector::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"); @@ -539,7 +539,7 @@ NonlinearSolverSelector::AdditionalData::AdditionalData( -#ifdef DEAL_II_WITH_TRILINOS +#ifdef DEAL_II_TRILINOS_WITH_NOX template void NonlinearSolverSelector::set_data( @@ -617,7 +617,7 @@ NonlinearSolverSelector::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 @@ -655,7 +655,7 @@ NonlinearSolverSelector::solve( } else if (additional_data.solver_type == AdditionalData::SolverType::nox) { -#ifdef DEAL_II_WITH_TRILINOS +#ifdef DEAL_II_TRILINOS_WITH_NOX TrilinosWrappers::NOXSolver nonlinear_solver( additional_data_nox, parameters_nox); @@ -688,7 +688,7 @@ NonlinearSolverSelector::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