Merge branch 'master' into barry/xcode

Merge branch 'barry/saws-push-header-body' into barry/saws-options

Merge branch 'jed/malloc-array'

Type arguments dropped from PetscMalloc[2-7], PetscNew, and PetscNewLog,
added PetscMalloc1 for allocating typed arrays, add PetscCalloc[1-7] for
allocating cleared (

Merge branch 'jed/malloc-array'

Type arguments dropped from PetscMalloc[2-7], PetscNew, and PetscNewLog,
added PetscMalloc1 for allocating typed arrays, add PetscCalloc[1-7] for
allocating cleared (zeroed) memory.

* jed/malloc-array:
Sys: Add pointer casts from (void **) in calls to PetscMalloc1()
Sys: drop explicit type arguments from PetscNew() and PetscNewLog()
Sys: add PetscCalloc[1-7]
Sys: add PetscMalloc1 macro, array allocation without redundant types
PetscMalloc[2-7]: remove type arguments, infer from pointer type
SNESComputeJacobianDefaultColor: fix uninitialized variable

show more ...

Sys: drop explicit type arguments from PetscNew() and PetscNewLog()

git grep -l 'PetscNew\(Log\)\?(' -- $1 | xargs perl -pi -e '
s@PetscNew\([^,;()]+ *, *@PetscNew(@;
s@PetscNewLog\(([^,;()]+) *,[^,

Sys: drop explicit type arguments from PetscNew() and PetscNewLog()

git grep -l 'PetscNew\(Log\)\?(' -- $1 | xargs perl -pi -e '
s@PetscNew\([^,;()]+ *, *@PetscNew(@;
s@PetscNewLog\(([^,;()]+) *,[^,;()]+, *@PetscNewLog($1,@'

show more ...

Merge branch 'master' into knepley/feature-dmda-section

* master: (397 commits)
PetscSynchronizedFGets: fix deadlock at EOF
Compiler: Fix warnings from MPI impls which do not initialize outputs

Merge branch 'master' into knepley/feature-dmda-section

* master: (397 commits)
PetscSynchronizedFGets: fix deadlock at EOF
Compiler: Fix warnings from MPI impls which do not initialize outputs
Increase patchlevel to 3.4.3
SNES: Now work vectors come from the DM
SNES ex62: Remove code generation
SNES: Move setup involving snes->vec_sol from SNESSetUp() to SNESolve()
Compiler: Fix warnings from MPI impls which do not initialize outputs
DMPlex ex7: Added missing test output
SNES ex52: Removed old Jacobian stuff, and fixed call to DMPlexProjectFunction() - Fixed calls for new element handling
SNES ex12: Added a performance profiling mode
DMPlex ex8: Fixed leak
PetscSection: Must reset the section when changing the number of fields
DMPlex ex7: Fixed test output - Corrected orientations in interpolation
DMPlex ex1: Fixed test output - Uniform refinement for quads changed
DMPlex: Fix overagressive checks
PC: Removed support graph PC
configure: both downloadonWindows and worksonWindows refer to MS compilers. Also fix isWindows() -> isWindows(CC).
MatXAIJSetPreallocation: use array[] notation to help out Fortran
__float128: when blas/lapack is not found instruct using f2cblaslapack
Configure: Package.downloadonWindows is supposed to mean that Windows compilers work. not Cygwin - Also changed doc for Package.worksonWindows, which does refer to Cygwin
...

Conflicts:
src/dm/impls/da/dalocal.c

show more ...

Merge branch 'master' into barry/wirth-fusion-materials

Conflicts:
src/ts/examples/tutorials/advection-diffusion-reaction/ex10.c

Merge branch 'barry/dmvecmattypes' into barry/saws

Needed to work with version of PETSc that did not have constant calls to VecSetFromOptions() etc

Conflicts:
src/ksp/ksp/interface/ams/kspams.c
s

Merge branch 'barry/dmvecmattypes' into barry/saws

Needed to work with version of PETSc that did not have constant calls to VecSetFromOptions() etc

Conflicts:
src/ksp/ksp/interface/ams/kspams.c
src/snes/impls/composite/snescomposite.c
src/snes/impls/gs/snesgs.c
src/snes/impls/nasm/nasm.c
src/snes/impls/ngmres/snesngmres.c

show more ...

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (71 commits)
Sys: revert packed PetscMalloc to PetscMallocN in PetscCommBuildTwoSided_Allreduce
SNESMonitorCancel: enable fort

Merge branch 'master' into knepley/feature-plex-refine-3d

* master: (71 commits)
Sys: revert packed PetscMalloc to PetscMallocN in PetscCommBuildTwoSided_Allreduce
SNESMonitorCancel: enable fortran interface
PetscSection: Added docs for Fortran binding for VecSetValuesSection()
Vec: Removed old F90 binding for PetscSection
bgq: fix deadlock on bgq due to inconsistant values returned by getpwuid(getuid()) on runs with 256nodes [or 4096 cores]. This fix removes the reliance on PetscGetHomeDirectory() returning 'same' value across nodes. [using the fact that PetscOptionsInsertFile() uses HOMEDIR from node-0 only]
DMPlex: change order of assignment to appease -Wmaybe-initialized (gcc-4.8.1)
DMPlex: Fix 64-bit int problem in VTK
Mat: Fix for PetscSparseDenseMaxDot() for complex
Vec: Correct VecUniqueEntries() for 64-bit indices
MatSeqAIJGetArrayF90: add man pages and fix typo in MatDense version
SF docs: add link to summary page and fix title
Doc: Fixed DM code in manual
metis/parmetis: update to metis-5.1.0/parmetis-4.0.3 Also update the test output as the partitioning appears to have changed.
DMPlex: remove unused variables
blaslapack: update f,f2c tarballs to 3.4.2 version
DMPlex ex5: Added test for 2 face cohesive submesh - Fixed old tests for cohesive cell orientation
DMPlex: Put in depth label optimization
DMPlex: Fix flipping of fault normal
DMPlex: We label cells with only vertices on the fault, but they have no cone replacement
DMPlex: Fix translation to cohesive edges in 3D - They are labeled by the vertices they connect
...

Conflicts:
include/petscdmplex.h

show more ...

Merge branch 'master' into knepley/feature-dt-fem

* master: (51 commits)
Sys: revert packed PetscMalloc to PetscMallocN in PetscCommBuildTwoSided_Allreduce
SNESMonitorCancel: enable fortran inte

Merge branch 'master' into knepley/feature-dt-fem

* master: (51 commits)
Sys: revert packed PetscMalloc to PetscMallocN in PetscCommBuildTwoSided_Allreduce
SNESMonitorCancel: enable fortran interface
PetscSection: Added docs for Fortran binding for VecSetValuesSection()
Vec: Removed old F90 binding for PetscSection
bgq: fix deadlock on bgq due to inconsistant values returned by getpwuid(getuid()) on runs with 256nodes [or 4096 cores]. This fix removes the reliance on PetscGetHomeDirectory() returning 'same' value across nodes. [using the fact that PetscOptionsInsertFile() uses HOMEDIR from node-0 only]
DMPlex: change order of assignment to appease -Wmaybe-initialized (gcc-4.8.1)
metis/parmetis: update to metis-5.1.0/parmetis-4.0.3 Also update the test output as the partitioning appears to have changed.
DMPlex: remove unused variables
blaslapack: update f,f2c tarballs to 3.4.2 version
DMPlex ex5: Added test for 2 face cohesive submesh - Fixed old tests for cohesive cell orientation
DMPlex: Put in depth label optimization
DMPlex: Fix flipping of fault normal
DMPlex: We label cells with only vertices on the fault, but they have no cone replacement
DMPlex: Fix translation to cohesive edges in 3D - They are labeled by the vertices they connect
DMPlex: Added flip argument to DMPlexLabelCohesiveComplete() to reverse submesh normal - Fixed ex5 test
DMPlex ex5: Fixed existing tests and added two cohesive cell test - Fixed tests for new cohesive cell orientation
DMPlex: Propagate orientation information to the submesh properly
DMPlex: Orientation of cohesive cell should come from face to which it is attached
DMPlex: Added subdm argument to DMPlexLabelCohesiveComplete() - Use the subdm for orientation information so we replace vertices all on the same side
DMPlex: Fix DMPlexOrient() for submeshes - Need to also reverse cone orientation of cells attached to fault faces when we flip them
...

Conflicts:
config/builder.py
include/petsc-private/dmpleximpl.h
include/petscdm.h
src/dm/impls/plex/plex.c
src/dm/impls/plex/plexfem.c
src/dm/interface/dlregisdmdm.c
src/snes/examples/tutorials/ex52.c
src/snes/examples/tutorials/output/ex12_10.out
src/snes/examples/tutorials/output/ex12_11.out
src/snes/examples/tutorials/output/ex12_5.out
src/snes/examples/tutorials/output/ex12_6.out
src/snes/examples/tutorials/output/ex12_7.out
src/snes/examples/tutorials/output/ex12_8.out
src/snes/examples/tutorials/output/ex12_9.out

show more ...

Merge branch 'knepley/fix-circular-refs'

* knepley/fix-circular-refs:
DM: During DMDestroy(), clear out known compositions to avoid circular ref - These come from FS
Sys OList: When deleting an

Merge branch 'knepley/fix-circular-refs'

* knepley/fix-circular-refs:
DM: During DMDestroy(), clear out known compositions to avoid circular ref - These come from FS
Sys OList: When deleting an object, remove it from the list first, then deref - This prevent circular refs from repeatedly destroying the object

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

show more ...

Sys OList: When deleting an object, remove it from the list first, then deref
- This prevent circular refs from repeatedly destroying the object

Merge branch 'master' into jed/ts-eimex

Sync to include Git conversion, PETSC_EXTERN, and minor API changes.

Conflicts:
src/ts/interface/tsregall.c

removed PETSC_NULL from C and Fortran (except declaration in C for backward compatibility). Kept PETSC_NULL_xxx for Fortran
Fixed a few bugs where PETSC_NULL had been used incorrectly.

Hg-commit: 05

removed PETSC_NULL from C and Fortran (except declaration in C for backward compatibility). Kept PETSC_NULL_xxx for Fortran
Fixed a few bugs where PETSC_NULL had been used incorrectly.

Hg-commit: 054705a517d7f4388a8a084415d7478cbe95dff4

show more ...

Uncrustified src/sys/*

Hg-commit: 9f71677807bad7b55428a6cc0f5ccc5052e91805

commit aftr merge

Hg-commit: 854807b200896ff0e3d6fb344a549ed1a2b93850

Updated style to obey 'Do not put a blank line immediately after PetscFunctionBegin;'

Hg-commit: 5408b9ce2402ad624305b7a7a323ab3ae5e0c3f1

removed silly abreviations

Hg-commit: 0641f9ef776cf11cc3336b494981da756bf9d14f

Commit after merge

Hg-commit: 29c41d281e3ece3127c753661dccfd04e452b7f8

removed trailing blanks from source code
added rule rmtrailingblanks accessible via make ACTION=remtrailingblanks tree

Hg-commit: 6e3652165d48aa5f3e94dd66bf607adea6fac27a

backout all chmod stuff in bf971ba58125
[but keep diffs to src/mat/impls/aij/mpi/mpimatmatmult.c ]

Hg-commit: 4a812fc1f35496ce2717c7da9ef12ffabbd13258

removed a spurious call to MatSetBlockSize.

Hg-commit: bf971ba58125bd8cf7ceb2a9d0f5cdf27c27cc6a

commit after merge from petsc-dev (MatMult_Add function)

Hg-commit: 95a831be5dc2ba75bb17311cad14d2f38977c0b7

merge TS refactor and ARKIMEX

Hg-commit: 59f7583bab4d65bff41afa11bfb8e8a5b8f1572b

Commit after merge

Hg-commit: ffd683a78f863f71bc61daf24b4d08442fa344d9

improve contour plotting with periodic boundary conditions; still not perfect

Hg-commit: f76d22ccf1d3bcc77f82f7b2c70d9ee8c20f885f