Skip to content

Commit 8afbaa3

Browse files
committed
Drop deprecated PetscNonlinearSolver PETSc callbacks with leading double underscore names
These functions have been deprecated since 3f9bb5f (Feb 2018) in the 1.4.x release series, so it is way past time we removed them completely.
1 parent b8a8aad commit 8afbaa3

File tree

2 files changed

+0
-69
lines changed

2 files changed

+0
-69
lines changed

include/solvers/petsc_nonlinear_solver.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,6 @@ extern "C"
5959
PetscErrorCode libmesh_petsc_snes_precheck(SNESLineSearch, Vec X, Vec Y, PetscBool * changed, void * context);
6060
PetscErrorCode libmesh_petsc_snes_postcheck(SNESLineSearch, Vec x, Vec y, Vec w, PetscBool * changed_y, PetscBool * changed_w, void * context);
6161
PetscErrorCode libmesh_petsc_linesearch_shellfunc(SNESLineSearch linesearch, void * ctx);
62-
63-
#ifdef LIBMESH_ENABLE_DEPRECATED
64-
PetscErrorCode __libmesh_petsc_snes_monitor (SNES, PetscInt its, PetscReal fnorm, void *);
65-
PetscErrorCode __libmesh_petsc_snes_residual (SNES, Vec x, Vec r, void * ctx);
66-
PetscErrorCode __libmesh_petsc_snes_fd_residual (SNES, Vec x, Vec r, void * ctx);
67-
PetscErrorCode __libmesh_petsc_snes_mffd_interface (void * ctx, Vec x, Vec r);
68-
PetscErrorCode __libmesh_petsc_snes_jacobian (SNES, Vec x, Mat jac, Mat pc, void * ctx);
69-
PetscErrorCode __libmesh_petsc_snes_postcheck(SNESLineSearch, Vec x, Vec y, Vec w, PetscBool * changed_y, PetscBool * changed_w, void * context);
70-
#endif
7162
}
7263

7364
/**

src/solvers/petsc_nonlinear_solver.C

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,6 @@ extern "C"
150150
PetscFunctionReturn(LIBMESH_PETSC_SUCCESS);
151151
}
152152

153-
#ifdef LIBMESH_ENABLE_DEPRECATED
154-
PetscErrorCode
155-
__libmesh_petsc_snes_monitor (SNES, PetscInt its, PetscReal fnorm, void *)
156-
{
157-
PetscFunctionBegin;
158-
libmesh_deprecated();
159-
PetscFunctionReturn(libmesh_petsc_snes_monitor(nullptr, its, fnorm, nullptr));
160-
}
161-
#endif
162-
163-
164153
//---------------------------------------------------------------
165154
// this function is called by PETSc to evaluate the residual at X
166155
PetscErrorCode
@@ -237,16 +226,6 @@ extern "C"
237226
PetscFunctionReturn(LIBMESH_PETSC_SUCCESS);
238227
}
239228

240-
#ifdef LIBMESH_ENABLE_DEPRECATED
241-
PetscErrorCode
242-
__libmesh_petsc_snes_residual (SNES snes, Vec x, Vec r, void * ctx)
243-
{
244-
PetscFunctionBegin;
245-
libmesh_deprecated();
246-
PetscFunctionReturn(libmesh_petsc_snes_residual(snes, x, r, ctx));
247-
}
248-
#endif
249-
250229
//-----------------------------------------------------------------------------------------
251230
// this function is called by PETSc to approximate the Jacobian at X via finite differences
252231
PetscErrorCode
@@ -292,16 +271,6 @@ extern "C"
292271
PetscFunctionReturn(LIBMESH_PETSC_SUCCESS);
293272
}
294273

295-
#ifdef LIBMESH_ENABLE_DEPRECATED
296-
PetscErrorCode
297-
__libmesh_petsc_snes_fd_residual (SNES snes, Vec x, Vec r, void * ctx)
298-
{
299-
PetscFunctionBegin;
300-
libmesh_deprecated();
301-
PetscFunctionReturn(libmesh_petsc_snes_fd_residual(snes, x, r, ctx));
302-
}
303-
#endif
304-
305274
//----------------------------------------------------------------
306275
// this function is called by PETSc to approximate Jacobian-vector
307276
// products at X via finite differences
@@ -426,16 +395,6 @@ extern "C"
426395
PetscFunctionReturn(LIBMESH_PETSC_SUCCESS);
427396
}
428397

429-
#ifdef LIBMESH_ENABLE_DEPRECATED
430-
PetscErrorCode
431-
__libmesh_petsc_snes_mffd_interface (void * ctx, Vec x, Vec r)
432-
{
433-
PetscFunctionBegin;
434-
libmesh_deprecated();
435-
PetscFunctionReturn(libmesh_petsc_snes_mffd_interface(ctx, x, r));
436-
}
437-
#endif
438-
439398
//---------------------------------------------------------------
440399
// this function is called by PETSc to evaluate the Jacobian at X
441400
PetscErrorCode
@@ -578,16 +537,6 @@ extern "C"
578537
PetscFunctionReturn(LIBMESH_PETSC_SUCCESS);
579538
}
580539

581-
#ifdef LIBMESH_ENABLE_DEPRECATED
582-
PetscErrorCode
583-
__libmesh_petsc_snes_jacobian(SNES snes, Vec x, Mat jac, Mat pc, void * ctx)
584-
{
585-
PetscFunctionBegin;
586-
libmesh_deprecated();
587-
PetscFunctionReturn(libmesh_petsc_snes_jacobian(snes, x, jac, pc, ctx));
588-
}
589-
#endif
590-
591540
// This function gets called by PETSc after the SNES linesearch is
592541
// complete. We use it to exactly enforce any constraints on the
593542
// solution which may have drifted during the linear solve. In the
@@ -670,15 +619,6 @@ extern "C"
670619
PetscFunctionReturn(LIBMESH_PETSC_SUCCESS);
671620
}
672621

673-
#ifdef LIBMESH_ENABLE_DEPRECATED
674-
PetscErrorCode __libmesh_petsc_snes_postcheck(SNESLineSearch, Vec x, Vec y, Vec w, PetscBool * changed_y, PetscBool * changed_w, void * context)
675-
{
676-
PetscFunctionBegin;
677-
libmesh_deprecated();
678-
PetscFunctionReturn(libmesh_petsc_snes_postcheck(nullptr, x, y, w, changed_y, changed_w, context));
679-
}
680-
#endif
681-
682622
PetscErrorCode libmesh_petsc_snes_precheck(SNESLineSearch, Vec X, Vec Y, PetscBool * changed, void * context)
683623
{
684624
PetscFunctionBegin;

0 commit comments

Comments
 (0)