From e238388b8f1d5a8799b14c9d40975ec0d2fe1d99 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 10 Jul 2023 17:55:24 -0400 Subject: [PATCH] Restrict tests requiring NOX --- tests/numerics/nonlinear_solver_selector_01.cc | 2 +- ...solver_selector_01_nox.with_trilinos_with_nox=on.output} | 0 tests/numerics/nonlinear_solver_selector_03.cc | 6 +++--- ...lector_03_nox.with_trilinos_with_nox=on.mpirun=4.output} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename tests/numerics/{nonlinear_solver_selector_01_nox.with_trilinos=on.output => nonlinear_solver_selector_01_nox.with_trilinos_with_nox=on.output} (100%) rename tests/numerics/{nonlinear_solver_selector_03_nox.with_trilinos=on.mpirun=4.output => nonlinear_solver_selector_03_nox.with_trilinos_with_nox=on.mpirun=4.output} (100%) diff --git a/tests/numerics/nonlinear_solver_selector_01.cc b/tests/numerics/nonlinear_solver_selector_01.cc index f858e0f4c0..05252a98a1 100644 --- a/tests/numerics/nonlinear_solver_selector_01.cc +++ b/tests/numerics/nonlinear_solver_selector_01.cc @@ -51,7 +51,7 @@ #ifdef DEAL_II_WITH_SUNDIALS # include #endif -#ifdef DEAL_II_WITH_TRILINOS +#ifdef DEAL_II_TRILINOS_WITH_NOX # include #endif diff --git a/tests/numerics/nonlinear_solver_selector_01_nox.with_trilinos=on.output b/tests/numerics/nonlinear_solver_selector_01_nox.with_trilinos_with_nox=on.output similarity index 100% rename from tests/numerics/nonlinear_solver_selector_01_nox.with_trilinos=on.output rename to tests/numerics/nonlinear_solver_selector_01_nox.with_trilinos_with_nox=on.output diff --git a/tests/numerics/nonlinear_solver_selector_03.cc b/tests/numerics/nonlinear_solver_selector_03.cc index 51c2dfc4be..bc2c6b752a 100644 --- a/tests/numerics/nonlinear_solver_selector_03.cc +++ b/tests/numerics/nonlinear_solver_selector_03.cc @@ -29,13 +29,13 @@ namespace LA { #if defined(DEAL_II_WITH_PETSC) && \ - (!defined(DEAL_II_WITH_TRILINOS) || defined(FORCE_USE_OF_PETSC)) + (!defined(DEAL_II_TRILINOS_WITH_NOX) || defined(FORCE_USE_OF_PETSC)) using namespace dealii::LinearAlgebraPETSc; # define USE_PETSC_LA -#elif defined(DEAL_II_WITH_TRILINOS) +#elif defined(DEAL_II_TRILINOS_WITH_NOX) using namespace dealii::LinearAlgebraTrilinos; #else -# error DEAL_II_WITH_PETSC or DEAL_II_WITH_TRILINOS required +# error DEAL_II_WITH_PETSC or DEAL_II_TRILINOS_WITH_NOX required #endif } // namespace LA diff --git a/tests/numerics/nonlinear_solver_selector_03_nox.with_trilinos=on.mpirun=4.output b/tests/numerics/nonlinear_solver_selector_03_nox.with_trilinos_with_nox=on.mpirun=4.output similarity index 100% rename from tests/numerics/nonlinear_solver_selector_03_nox.with_trilinos=on.mpirun=4.output rename to tests/numerics/nonlinear_solver_selector_03_nox.with_trilinos_with_nox=on.mpirun=4.output -- 2.39.5