Deprecate dunder methods.

Author: lindsayad

include/solvers/petsc_linear_solver.h

@@ -45,6 +45,24 @@
 // Give them an obscure name to avoid namespace pollution.
 extern "C"
 {
+#if PETSC_RELEASE_LESS_THAN(3,0,1)
+ /**
+ * This function is called by PETSc to initialize the preconditioner.
+ * ctx will hold the Preconditioner.
+ */
+ PetscErrorCode libmesh_petsc_preconditioner_setup (void * ctx);
+
+ /**
+ * This function is called by PETSc to actually apply the preconditioner.
+ * ctx will hold the Preconditioner.
+ */
+ PetscErrorCode libmesh_petsc_preconditioner_apply(void * ctx, Vec x, Vec y);
+#else
+ PetscErrorCode libmesh_petsc_preconditioner_setup (PC);
+ PetscErrorCode libmesh_petsc_preconditioner_apply(PC, Vec x, Vec y);
+#endif
+
+#if LIBMESH_ENABLE_DEPRECATED
 #if PETSC_RELEASE_LESS_THAN(3,0,1)
  /**
  * This function is called by PETSc to initialize the preconditioner.
@@ -61,6 +79,7 @@ extern "C"
  PetscErrorCode __libmesh_petsc_preconditioner_setup (PC);
  PetscErrorCode __libmesh_petsc_preconditioner_apply(PC, Vec x, Vec y);
 #endif
+#endif
 } // end extern "C"
 
 

include/solvers/petsc_nonlinear_solver.h

@@ -40,11 +40,31 @@ class ResidualContext;
 // need access to these most of the time as they are used internally by this object.
 extern "C"
 {
+ PetscErrorCode libmesh_petsc_snes_monitor (SNES, PetscInt its, PetscReal fnorm, void *);
+ PetscErrorCode libmesh_petsc_snes_residual (SNES, Vec x, Vec r, void * ctx);
+ PetscErrorCode libmesh_petsc_snes_fd_residual (SNES, Vec x, Vec r, void * ctx);
+ PetscErrorCode libmesh_petsc_snes_mffd_residual (SNES snes, Vec x, Vec r, void * ctx);
+ PetscErrorCode libmesh_petsc_snes_mffd_interface (void * ctx, Vec x, Vec r);
+#if PETSC_RELEASE_LESS_THAN(3,5,0)
+ PetscErrorCode libmesh_petsc_snes_jacobian (SNES, Vec x, Mat * jac, Mat * pc, MatStructure * msflag, void * ctx);
+#else
+ PetscErrorCode libmesh_petsc_snes_jacobian (SNES, Vec x, Mat jac, Mat pc, void * ctx);
+#endif
+
+ PetscErrorCode libmesh_petsc_snes_postcheck(
+#if PETSC_VERSION_LESS_THAN(3,3,0)
+ SNES, Vec x, Vec y, Vec w, void * context, PetscBool * changed_y, PetscBool * changed_w
+#else
+ SNESLineSearch, Vec x, Vec y, Vec w, PetscBool * changed_y, PetscBool * changed_w, void * context
+#endif
+ );
+ PetscErrorCode libmesh_petsc_linesearch_shellfunc(SNESLineSearch linesearch, void * ctx);
+
+#ifdef LIBMESH_ENABLE_DEPRECATED
  PetscErrorCode __libmesh_petsc_snes_monitor (SNES, PetscInt its, PetscReal fnorm, void *);
  PetscErrorCode __libmesh_petsc_snes_residual (SNES, Vec x, Vec r, void * ctx);
  PetscErrorCode __libmesh_petsc_snes_fd_residual (SNES, Vec x, Vec r, void * ctx);
  PetscErrorCode __libmesh_petsc_snes_mffd_interface (void * ctx, Vec x, Vec r);
- PetscErrorCode __libmesh_petsc_snes_mffd_residual (SNES, Vec x, Vec r, void * ctx);
 #if PETSC_RELEASE_LESS_THAN(3,5,0)
  PetscErrorCode __libmesh_petsc_snes_jacobian (SNES, Vec x, Mat * jac, Mat * pc, MatStructure * msflag, void * ctx);
 #else
@@ -58,7 +78,7 @@ extern "C"
  SNESLineSearch, Vec x, Vec y, Vec w, PetscBool * changed_y, PetscBool * changed_w, void * context
 #endif
  );
- PetscErrorCode libmesh_petsc_linesearch_shellfunc(SNESLineSearch linesearch, void * ctx);
+#endif
 }
 
 /**
@@ -226,14 +246,13 @@ class PetscNonlinearSolver : public NonlinearSolver<T>
 #endif
 private:
  friend ResidualContext libmesh_petsc_snes_residual_helper (SNES snes, Vec x, void * ctx);
- friend PetscErrorCode __libmesh_petsc_snes_residual (SNES snes, Vec x, Vec r, void * ctx);
- friend PetscErrorCode __libmesh_petsc_snes_fd_residual (SNES snes, Vec x, Vec r, void * ctx);
- friend PetscErrorCode __libmesh_petsc_snes_mffd_interface (void * ctx, Vec x, Vec r);
- friend PetscErrorCode __libmesh_petsc_snes_mffd_residual (SNES snes, Vec x, Vec r, void * ctx);
+ friend PetscErrorCode libmesh_petsc_snes_residual (SNES snes, Vec x, Vec r, void * ctx);
+ friend PetscErrorCode libmesh_petsc_snes_fd_residual (SNES snes, Vec x, Vec r, void * ctx);
+ friend PetscErrorCode libmesh_petsc_snes_mffd_residual (SNES snes, Vec x, Vec r, void * ctx);
 #if PETSC_RELEASE_LESS_THAN(3,5,0)
- friend PetscErrorCode __libmesh_petsc_snes_jacobian (SNES snes, Vec x, Mat * jac, Mat * pc, MatStructure * msflag, void * ctx);
+ friend PetscErrorCode libmesh_petsc_snes_jacobian (SNES snes, Vec x, Mat * jac, Mat * pc, MatStructure * msflag, void * ctx);
 #else
- friend PetscErrorCode __libmesh_petsc_snes_jacobian (SNES snes, Vec x, Mat jac, Mat pc, void * ctx);
+ friend PetscErrorCode libmesh_petsc_snes_jacobian (SNES snes, Vec x, Mat jac, Mat pc, void * ctx);
 #endif
 };
 

src/solvers/petsc_linear_solver.C

@@ -42,7 +42,7 @@ namespace libMesh
 extern "C"
 {
 #if PETSC_RELEASE_LESS_THAN(3,0,1)
- PetscErrorCode __libmesh_petsc_preconditioner_setup (void * ctx)
+ PetscErrorCode libmesh_petsc_preconditioner_setup (void * ctx)
  {
  Preconditioner<Number> * preconditioner = static_cast<Preconditioner<Number> *>(ctx);
 
@@ -55,7 +55,7 @@ extern "C"
  }
 
 
- PetscErrorCode __libmesh_petsc_preconditioner_apply(void * ctx, Vec x, Vec y)
+ PetscErrorCode libmesh_petsc_preconditioner_apply(void * ctx, Vec x, Vec y)
  {
  Preconditioner<Number> * preconditioner = static_cast<Preconditioner<Number> *>(ctx);
 
@@ -67,7 +67,7 @@ extern "C"
  return 0;
  }
 #else
- PetscErrorCode __libmesh_petsc_preconditioner_setup (PC pc)
+ PetscErrorCode libmesh_petsc_preconditioner_setup (PC pc)
  {
  void * ctx;
  PetscErrorCode ierr = PCShellGetContext(pc,&ctx);CHKERRQ(ierr);
@@ -81,7 +81,7 @@ extern "C"
  return 0;
  }
 
- PetscErrorCode __libmesh_petsc_preconditioner_apply(PC pc, Vec x, Vec y)
+ PetscErrorCode libmesh_petsc_preconditioner_apply(PC pc, Vec x, Vec y)
  {
  void * ctx;
  PetscErrorCode ierr = PCShellGetContext(pc,&ctx);CHKERRQ(ierr);
@@ -95,6 +95,35 @@ extern "C"
  return 0;
  }
 #endif
+
+#ifdef LIBMESH_ENABLE_DEPRECATED
+#if PETSC_RELEASE_LESS_THAN(3,0,1)
+ PetscErrorCode __libmesh_petsc_preconditioner_setup (void * ctx)
+ {
+ libmesh_deprecated();
+ return libmesh_petsc_preconditioner_setup(ctx);
+ }
+
+ PetscErrorCode __libmesh_petsc_preconditioner_apply(void * ctx, Vec x, Vec y)
+ {
+ libmesh_deprecated();
+ return libmesh_petsc_preconditioner_apply(ctx, x, y);
+ }
+
+#else
+ PetscErrorCode __libmesh_petsc_preconditioner_setup (PC pc)
+ {
+ libmesh_deprecated();
+ return libmesh_petsc_preconditioner_setup(pc);
+ }
+
+ PetscErrorCode __libmesh_petsc_preconditioner_apply(PC pc, Vec x, Vec y)
+ {
+ libmesh_deprecated();
+ return libmesh_petsc_preconditioner_apply(pc, x, y);
+ }
+#endif
+#endif
 } // end extern "C"
 
 /*----------------------- functions ----------------------------------*/
@@ -227,8 +256,8 @@ void PetscLinearSolver<T>::init (const char * name)
  {
  this->_preconditioner->init();
  PCShellSetContext(_pc,(void *)this->_preconditioner);
- PCShellSetSetUp(_pc,__libmesh_petsc_preconditioner_setup);
- PCShellSetApply(_pc,__libmesh_petsc_preconditioner_apply);
+ PCShellSetSetUp(_pc,libmesh_petsc_preconditioner_setup);
+ PCShellSetApply(_pc,libmesh_petsc_preconditioner_apply);
  }
  }
 }
@@ -330,8 +359,8 @@ void PetscLinearSolver<T>::init (PetscMatrix<T> * matrix,
  this->_preconditioner->set_matrix(*matrix);
  this->_preconditioner->init();
  PCShellSetContext(_pc,(void *)this->_preconditioner);
- PCShellSetSetUp(_pc,__libmesh_petsc_preconditioner_setup);
- PCShellSetApply(_pc,__libmesh_petsc_preconditioner_apply);
+ PCShellSetSetUp(_pc,libmesh_petsc_preconditioner_setup);
+ PCShellSetApply(_pc,libmesh_petsc_preconditioner_apply);
  }
  }
 }