Skip to content

Commit 262c8c4

Browse files
committed
Guard all examples to avoid errors with --disable-optional.
This way we can still run "make check" successfully even though it doesn't really check much of anything.
1 parent 20a8690 commit 262c8c4

File tree

36 files changed

+144
-0
lines changed

36 files changed

+144
-0
lines changed

examples/adaptivity/adaptivity_ex1/adaptivity_ex1.C

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ int main(int argc, char ** argv)
6565
// finalized.
6666
LibMeshInit init (argc, argv);
6767

68+
// This example requires a linear solver package.
69+
libmesh_example_requires(libMesh::default_solver_package() != INVALID_SOLVER_PACKAGE,
70+
"--enable-petsc, --enable-trilinos, or --enable-eigen");
71+
6872
// Skip adaptive examples on a non-adaptive libMesh build
6973
#ifndef LIBMESH_ENABLE_AMR
7074
libmesh_example_requires(false, "--enable-amr");

examples/adaptivity/adaptivity_ex2/adaptivity_ex2.C

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ int main (int argc, char ** argv)
119119
// Initialize libMesh.
120120
LibMeshInit init (argc, argv);
121121

122+
// This example requires a linear solver package.
123+
libmesh_example_requires(libMesh::default_solver_package() != INVALID_SOLVER_PACKAGE,
124+
"--enable-petsc, --enable-trilinos, or --enable-eigen");
125+
122126
#ifndef LIBMESH_ENABLE_AMR
123127
libmesh_example_requires(false, "--enable-amr");
124128
#else

examples/adaptivity/adaptivity_ex3/adaptivity_ex3.C

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ int main(int argc, char ** argv)
118118
// Initialize libMesh.
119119
LibMeshInit init (argc, argv);
120120

121+
// This example requires a linear solver package.
122+
libmesh_example_requires(libMesh::default_solver_package() != INVALID_SOLVER_PACKAGE,
123+
"--enable-petsc, --enable-trilinos, or --enable-eigen");
124+
121125
// Single precision is inadequate for p refinement
122126
libmesh_example_requires(sizeof(Real) > 4, "--disable-singleprecision");
123127

examples/adaptivity/adaptivity_ex4/adaptivity_ex4.C

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,10 @@ int main(int argc, char ** argv)
152152
// Initialize libMesh.
153153
LibMeshInit init (argc, argv);
154154

155+
// This example requires a linear solver package.
156+
libmesh_example_requires(libMesh::default_solver_package() != INVALID_SOLVER_PACKAGE,
157+
"--enable-petsc, --enable-trilinos, or --enable-eigen");
158+
155159
// Adaptive constraint calculations for fine Hermite elements seems
156160
// to require half-decent precision
157161
#ifdef LIBMESH_DEFAULT_SINGLE_PRECISION

examples/adaptivity/adaptivity_ex5/adaptivity_ex5.C

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@ int main (int argc, char ** argv)
129129
// Initialize libMesh.
130130
LibMeshInit init (argc, argv);
131131

132+
// This example requires a linear solver package.
133+
libmesh_example_requires(libMesh::default_solver_package() != INVALID_SOLVER_PACKAGE,
134+
"--enable-petsc, --enable-trilinos, or --enable-eigen");
135+
132136
// Skip this 2D example if libMesh was compiled as 1D-only.
133137
libmesh_example_requires(2 <= LIBMESH_DIM, "2D support");
134138

examples/adjoints/adjoints_ex1/adjoints_ex1.C

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@ int main (int argc, char ** argv)
236236
// Initialize libMesh.
237237
LibMeshInit init (argc, argv);
238238

239+
// This example requires a linear solver package.
240+
libmesh_example_requires(libMesh::default_solver_package() != INVALID_SOLVER_PACKAGE,
241+
"--enable-petsc, --enable-trilinos, or --enable-eigen");
242+
239243
// Skip adaptive examples on a non-adaptive libMesh build
240244
#ifndef LIBMESH_ENABLE_AMR
241245
libmesh_example_requires(false, "--enable-amr");

examples/adjoints/adjoints_ex2/adjoints_ex2.C

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,10 @@ int main (int argc, char ** argv)
236236
// Initialize libMesh.
237237
LibMeshInit init (argc, argv);
238238

239+
// This example requires a linear solver package.
240+
libmesh_example_requires(libMesh::default_solver_package() != INVALID_SOLVER_PACKAGE,
241+
"--enable-petsc, --enable-trilinos, or --enable-eigen");
242+
239243
// Skip adaptive examples on a non-adaptive libMesh build
240244
#ifndef LIBMESH_ENABLE_AMR
241245
libmesh_example_requires(false, "--enable-amr");

examples/adjoints/adjoints_ex4/adjoints_ex4.C

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,10 @@ int main (int argc, char** argv)
205205
// Initialize libMesh.
206206
LibMeshInit init (argc, argv);
207207

208+
// This example requires a linear solver package.
209+
libmesh_example_requires(libMesh::default_solver_package() != INVALID_SOLVER_PACKAGE,
210+
"--enable-petsc, --enable-trilinos, or --enable-eigen");
211+
208212
// Skip adaptive examples on a non-adaptive libMesh build
209213
#ifndef LIBMESH_ENABLE_AMR
210214
libmesh_example_requires(false, "--enable-amr");

examples/fem_system/fem_system_ex1/fem_system_ex1.C

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ int main (int argc, char ** argv)
5555
// Initialize libMesh.
5656
LibMeshInit init (argc, argv);
5757

58+
// This example requires a linear solver package.
59+
libmesh_example_requires(libMesh::default_solver_package() != INVALID_SOLVER_PACKAGE,
60+
"--enable-petsc, --enable-trilinos, or --enable-eigen");
61+
5862
// This example fails without at least double precision FP
5963
#ifdef LIBMESH_DEFAULT_SINGLE_PRECISION
6064
libmesh_example_requires(false, "--disable-singleprecision");

examples/fem_system/fem_system_ex2/fem_system_ex2.C

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@ int main(int argc, char ** argv)
149149
// Initialize libMesh and any dependent libraries
150150
LibMeshInit init(argc, argv);
151151

152+
// This example requires a linear solver package.
153+
libmesh_example_requires(libMesh::default_solver_package() != INVALID_SOLVER_PACKAGE,
154+
"--enable-petsc, --enable-trilinos, or --enable-eigen");
155+
152156
// Skip this example if we do not meet certain requirements
153157
#ifndef LIBMESH_HAVE_VTK
154158
libmesh_example_requires(false, "--enable-vtk");

0 commit comments

Comments
 (0)