Merge remote-tracking branch 'origin/barry/consistent-formating-ascii-solver-viewers'

Merge branch 'maint'

Merge branch 'stefano_zampini/fix-matis-missing-setuplayout' into maint

MATIS: add PetscLayoutSetUp in MatIS creation

Merge branch 'stefano_zampini/fix-matis-addlocalprealloc'

MATIS: add preallocation for MATHYPRE and MatSetUp for matrix types that miss preallocation routines

Merge branch 'maint'

MATIS: just an aesthetic commit

MATIS: yet another bug in the preallocation for the dense rectangular case

Reported-by: Franck Houssen <franck.houssen@inria.fr>

MATIS: fix preallocation with rectangular local matrices

this was fixed in master but not in maint

Reported-by: Franck Houssen <franck.houssen@inria.fr>

Merge branch 'maint'

MATIS: fix preallocation with rectangular dense local matrices

Reported-by: Franck Houssen <franck.houssen@inria.fr>

MATIS: setup layout of local matrices when they are created

MatIS: use MATSEQAIJ and not MATAIJ

With MATAIJ MatConvert_Basic is used!

Merge branch 'jed/matisrestorelocalmat'

* jed/matisrestorelocalmat:
MatISRestoreLocalMat: new (currently no-op) paired with MatISGetLocalMat

Merge branch 'scott/test-datafiles-fix' of https://bitbucket.org/petsc/petsc into scott/test-datafiles-fix

Merge branch 'master' into knepley/feature-plex-sphere-mesh

* master: (2633 commits)
Bib: Added ref
SNES ex56: Update test output
add a citation to petsc.bib
Plex: Initialize variables
ini

Merge branch 'master' into knepley/feature-plex-sphere-mesh

* master: (2633 commits)
Bib: Added ref
SNES ex56: Update test output
add a citation to petsc.bib
Plex: Initialize variables
initialize ap as complained by the nightly tests
Plex ex3: Update to new point function API
initialize some variables as complained by nightly tests
SNES ex12: Mix misnaming Nf --> Nc
update tests
add tests
add MatView_SeqXAIJ_ASCII_structonly(); enable A->structure_only in MatSetValuesBlocked_SeqBAIJ
typo
fill-in some references
Bib: Fixed ref
Plex: Added PLY to file support
Plex: Adding PLY support
PetscDS: Turn off Fortran bindings for Constants
Plex tests: Updated to new point function API
SNES ex56: Moved tests to new format
DM: Allow field projection functions to take an array of scalars - This will allow us to pass in user data to kernels without void *, more efficiency than aux fields
...

Conflicts:
config/builder.py
include/petscdmplex.h
src/dm/impls/plex/examples/tests/ex1.c
src/dm/impls/plex/plexcreate.c
src/dm/impls/plex/plexgmsh.c
src/snes/examples/tutorials/ex63.c

show more ...

MatISRestoreLocalMat: new (currently no-op) paired with MatISGetLocalMat

Merge branch 'maint'

* maint:
MatISGetLocalMat: add note on reference counting

MatISGetLocalMat: add note on reference counting

Reported-by: Franck Houssen <franck.houssen@inria.fr>

Merge branch 'master' into knepley/feature-plex-torus

* master: (174 commits)
Bib: Another ref
Increase patchlevel to 3.7.6
Explicitly listing the LTO library causes difficulties on MacOS so a

Merge branch 'master' into knepley/feature-plex-torus

* master: (174 commits)
Bib: Another ref
Increase patchlevel to 3.7.6
Explicitly listing the LTO library causes difficulties on MacOS so avoid it
TSBDF: Update changes/dev.html
Added Fortran TaoType and TaoLineSearchType definitions
Add Fortran TaoType and TaoLineSearchType definitions
setblocksize for iscol_sub
TSBDF: Use standard TS API and options to control adaptivity
Bib: More refs and a correction
SNESTest: Bug-fix in SNESTest when threshold printing option is turned on.
fix warning and valgrind complains reported by the nightly tests
Section+Doc: Small doc fix
pflotran: switch to using the new upstream git repo
DMPlex: Error if attempt to partition a distributed graph with Chaco
fix complex build error
fix complex build
PetscError() did not properly copy over the specific error message when error type was PETSC_ERROR_INITIAL
TSAdapt: Refactor handling of the always_accept flag
Additional clarification for MatMeshToCellGraph() manual page
optimize MatCreateSubMatrix_MPIAIJ() by merging check of sameXXXDist() into one MPI_AllReduce
...

Conflicts:
config/BuildSystem/config/packages/med.py

show more ...

MATIS: setup layout of local matrices when they are created

Merge branch 'stefano_zampini/enhancements-fetidp-saddlepoint' into stefano_zampini/feature-fetidp-ex69

MatIS: use MATSEQAIJ and not MATAIJ

With MATAIJ MatConvert_Basic is used!

Merge branch 'master' into knepley/feature-plex-tests-new

* master: (108 commits)
Bib: Added ref
Bib: Updated reference
Bib: Updated reference
Work around problems with Apple Xcode 8.3 and h

Merge branch 'master' into knepley/feature-plex-tests-new

* master: (108 commits)
Bib: Added ref
Bib: Updated reference
Bib: Updated reference
Work around problems with Apple Xcode 8.3 and handling of rpath argument with gfortran
help menu update for MatCreateSubMatrices() Reported-by: Brad Aagaard <baagaard@usgs.gov>
fix flops for PCApply_PBJacobi_1 and PCApply_PBJacobi_7 Reported-by: Pierre Jolivet <pierre.jolivet@enseeiht.fr>
TSRK: Fix FSAL optimization to not skip update and check or stages.
Travis-CI: Workaround too long TMPDIR in macOS with Open MPI
test: Fix type mismatch in KSP test.
test: Fix warnings from gfortran -Wconversion (OS X, Homebrew build)
MPIUNI: Silence GCC -Wconversion warnings
Fortran: Add error checking for incorrect PETSC_NULL_XXX argument when expecting function
fix test output per changes in 517c9301b2e9239931bfd644803fd6bb859387ea
MUMPS: update to version 5.1.1 with opensolaris compile fixes
TSRK: Mention 5BS in the changelog.
TSRK: Mention the new 5BS scheme in the manual.
fix 'unused variable' warning
Remove unused code
added hbw_realloc
fixed undefined ptr
...

Conflicts:
config/BuildSystem/config/packages/med.py

show more ...