I use DMHEADER and DMOPS() for my own DM implementation. With the
recent include path modification, I include "../src/dm/dmimpl.h", but it
would seem more consistent to put this in include/private.
With pedantic warnings, my compiler finds some duplicate declarations
which the attached patch removes. I assume the declaration of
MatCreateSchurComplement should also move to petscksp.h.
Jed
-------------- next part --------------
diff -r af487d5b45da include/petscda.h
--- a/include/petscda.h Thu Nov 06 14:46:27 2008 -0600
+++ b/include/petscda.h Thu Nov 06 22:06:59 2008 +0100
@@ -121,7 +121,6 @@
EXTERN PetscErrorCode PETSCDM_DLLEXPORT DACreateGlobalVector(DA,Vec *);
EXTERN PetscErrorCode PETSCDM_DLLEXPORT DACreateLocalVector(DA,Vec *);
EXTERN PetscErrorCode PETSCDM_DLLEXPORT DACreateNaturalVector(DA,Vec *);
-EXTERN PetscErrorCode PETSCDM_DLLEXPORT DACreateLocalVector(DA,Vec *);
#define DAGetLocalVector(da,v) DMGetLocalVector((DM)da,v)
#define DARestoreLocalVector(da,v) DMRestoreLocalVector((DM)da,v)
#define DAGetGlobalVector(da,v) DMGetGlobalVector((DM)da,v)
diff -r af487d5b45da include/petscerror.h
--- a/include/petscerror.h Thu Nov 06 14:46:27 2008 -0600
+++ b/include/petscerror.h Thu Nov 06 22:06:59 2008 +0100
@@ -435,7 +435,6 @@
.seealso: PetscTraceBackErrorHandler(), PetscPushErrorHandler(), PetscError(),
SETERRQ(), CHKMEMQ, SETERRQ1(), SETERRQ2(), SETERRQ3(),
CHKERRQ(), PetscExceptionCaught(), PetscExceptionPush(),
PetscExceptionPop(), PetscExceptionTry1()
M*/
-extern PetscErrorCode PetscExceptionTmp;
#define PetscExceptionTrySyncNorm(comm,a,b) (PetscExceptionTmp =
PetscExceptionPush(b)) ? PetscExceptionTmp : \
(PetscExceptionTmp = a ,
PetscExceptionPop(b),PetscExceptionTrySyncNorm_Private(comm,PetscExceptionTmp,b))
diff -r af487d5b45da include/petscmat.h
--- a/include/petscmat.h Thu Nov 06 14:46:27 2008 -0600
+++ b/include/petscmat.h Thu Nov 06 22:06:59 2008 +0100
@@ -195,7 +195,6 @@
#define MatRegisterDynamic(a,b,c,d) MatRegister(a,b,c,d)
#endif
-EXTERN PetscErrorCode PETSCMAT_DLLEXPORT MatRegisterAll(const char[]);
extern PetscTruth MatRegisterAllCalled;
extern PetscFList MatList;
@@ -309,7 +308,6 @@
EXTERN PetscErrorCode PETSCMAT_DLLEXPORT
MatCreateSeqFFTW(MPI_Comm,PetscInt,const PetscInt[],Mat*);
EXTERN PetscErrorCode PETSCMAT_DLLEXPORT MatCreateTranspose(Mat,Mat*);
EXTERN PetscErrorCode PETSCMAT_DLLEXPORT
MatCreateSchurComplement(Mat,Mat,Mat,Mat,Mat*);
-EXTERN PetscErrorCode PETSCMAT_DLLEXPORT
MatSchurComplementUpdate(Mat,Mat,Mat,Mat,Mat,MatStructure);
EXTERN PetscErrorCode PETSCMAT_DLLEXPORT MatSetUp(Mat);
EXTERN PetscErrorCode PETSCMAT_DLLEXPORT MatDestroy(Mat);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL:
<http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20081106/3a8051f1/attachment.pgp>
