Commits

Jed Brown committed bc25336 Merge with conflicts

Merge branch 'knepley/feature-plex-generic-distribute' into next

* knepley/feature-plex-generic-distribute:
DMPlex: add missing declarations DMPlexDistribute{Field,Data}

Conflicts:
include/petscdmplex.h

  • Participants
  • Parent commits 412aae5, 86eb08f
  • Branches jed/next-seaice, knepley/fix-quadrature-order 3
    1. madams/sr-driver
    2. madams/sr1
    3. next-oct-2014

Comments (0)

Files changed (1)

File include/petscdmplex.h

 PETSC_EXTERN PetscErrorCode DMPlexCreatePartition(DM, const char[], PetscInt, PetscBool, PetscSection *, IS *, PetscSection *, IS *);
 PETSC_EXTERN PetscErrorCode DMPlexCreatePartitionClosure(DM, PetscSection, IS, PetscSection *, IS *);
 PETSC_EXTERN PetscErrorCode DMPlexDistribute(DM, const char[], PetscInt, PetscSF*, DM*);
+PETSC_EXTERN PetscErrorCode DMPlexDistributeField(DM,PetscSF,PetscSection,Vec,PetscSection,Vec);
+PETSC_EXTERN PetscErrorCode DMPlexDistributeData(DM,PetscSF,PetscSection,MPI_Datatype,void*,PetscSection,void**);
 
 /* Submesh Support */
 PETSC_EXTERN PetscErrorCode DMPlexGetSubpointMap(DM, DMLabel*);