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 ...

Merge branch 'master' into stefano_zampini/feature-fetidp-ex69

Merge branch 'master' into knepley/feature-plex-boundary-values

* master: (487 commits)
Bib: More refs
Fixed errors in the manuals and ts_glee source code doc
fix bug to enable '-xxx_via [alg]

Merge branch 'master' into knepley/feature-plex-boundary-values

* master: (487 commits)
Bib: More refs
Fixed errors in the manuals and ts_glee source code doc
fix bug to enable '-xxx_via [alg]' to showup in '-help' Reported-by: Mark Adams <mfadams@lbl.gov>
Plex: Remove dead code
TS tutorials ex11: remove unused functions
TSAdapt: Set TSADAPTNONE as default adapt type
DMPlex: missed viewer change in synchronized output
Revert "Merge branch 'hzhang/ts-ex9busdmnetwork'"
TSAdapt: Update changes/dev.html
TSAdapt: Set default type for TSGLEE
TS tutorials ex11: make work with complex scalars
Bib: Added ref
TS ex18: Fix initializer
TS ex11: Fix M_PI
Plex ex1f90: FUCK FORTRAN
f2cblaslapack: remove duplicate xerbla.o and xerbla_array.o from lapack [they are already in blas]
TSAdapt: Refactor handling of default adapt type
TSAdapt: Update changes/dev.html
TSAdapt: Update manual
TSAdapt: Refactor interface and implementations
...

show more ...

Merged in dalcinl/ts-adapt-default-type (pull request #674)

TSAdapt: Refactor handling of default adapt type

Approved-by: BarryFSmith <bsmith@mcs.anl.gov>

TSAdapt: Set TSADAPTNONE as default adapt type

* TSCreate() set TSADAPTNONE as default adapt type
* TSSetType() set TSADAPTNONE before running the constructor
* Add missing error checking in TSXXXSe

TSAdapt: Set TSADAPTNONE as default adapt type

* TSCreate() set TSADAPTNONE as default adapt type
* TSSetType() set TSADAPTNONE before running the constructor
* Add missing error checking in TSXXXSetType()

show more ...

TSAdapt: Refactor handling of default adapt type

* Let TS subtypes state its preference for adaptivity
* Methods without embedded error estimators prefer TSADAPTNONE
* If not set, use TS_EXACTFINALT

TSAdapt: Refactor handling of default adapt type

* Let TS subtypes state its preference for adaptivity
* Methods without embedded error estimators prefer TSADAPTNONE
* If not set, use TS_EXACTFINALTIME_MATCHSTEP when using adaptivity

* Remove command line option -ts_theta_adapt
* Use `-ts_adapt_type basic` to turn on adaptivity in TSTHETA

* Remove command line option -ts_alpha_adapt
* Remove routine TSAlphaUseAdapt() and TSAlpha2UseAdapt()
* Use `-ts_adapt_type basic` to turn on adaptivity in TSALPHA/TSALPHA2

show more ...

Merge branch 'master' into knepley/feature-plex-pragmatic-parallel

* master: (1379 commits)
Minor fixes for tchem examples due to changes in PETSc infrastructure
update webpage about API changes

Merge branch 'master' into knepley/feature-plex-pragmatic-parallel

* master: (1379 commits)
Minor fixes for tchem examples due to changes in PETSc infrastructure
update webpage about API changes
add help menu for MatCreateSubMatricesMPI()
rename struct Mat_SubMat -> Mat_SubSppt
add a little information to the manual about using tchem
rename MatCreateSubMatrixComposite -> MatCreateSubMatrixVirtual; Mat_SubMatrix -> Mat_SubVirtual
need to protect the \ passed on the makefile on my Mac
Bib: Updated ref
update src/mat/examples/tests/output/ex23_#.out
rename MatGetSubMat -> MatCreateSubMat
Mark MatCreateMPIAIJWithSplitArrays() and MatMPIAIJSetPreallocationCSR() with MAT_NO_OFF_PROC_ENTRIES
superlu: libray is installed in PREFIX/lib64 - fix this to use PREFIX/lib
backport fixes cc105cc3 2b35c90a - required for 3bf428d - that was backported from master - 80c96bb
'echo -n' fails on opensolaris/osx - so avoid using it.
fix diffs in nightlybuilds due to options in ~/.petscrc
add Kelley03 to src/docs/tex/petsc.bib
build: determine moudles, mpi.h used during buildtime and print in 'info'
fix analyzer warnings
fix build failure on opensolaris - where -lm from flibs is removed due to -lm in cxxlibs. But then - only flib gets used for some configure tests [blaslapack, parms]
config: prefer __restrict over C99 restrict keyword
...

show more ...

Merge branch 'barry/remove-funct'

Remove the use and definition of __FUNCT__ throughout the code

Since all modern C/C++ compilers provide this functionality we no longer need to provide it manually in PETSc
Time: 1.5 hours
Thanks-t

Remove the use and definition of __FUNCT__ throughout the code

Since all modern C/C++ compilers provide this functionality we no longer need to provide it manually in PETSc
Time: 1.5 hours
Thanks-to: Andreas Mang <andreas@ices.utexas.edu>

show more ...

Merge branch 'shri/fixes-for-step-restart'

Code fixes for TS step restarting (used in ARKIMEX)

i) TSClone() in ARK step-restart was not copying over the event and
trajectory data structures.
ii) When TSDestroy() is called at the end of ARK s

Code fixes for TS step restarting (used in ARKIMEX)

i) TSClone() in ARK step-restart was not copying over the event and
trajectory data structures.
ii) When TSDestroy() is called at the end of ARK step-restart, the event
and trajectory structs were getting destroyed.
iii) ARK step-restart calls TSSolve() that resets ts->steps and
ts->total_steps. This caused the filenames created by TSTrajectory to be
overwritten and thus the saved solutions in the file were not matching
with the correct step numbers.

show more ...

Merge branch 'master' into stefano_zampini/feature-pcbddc-saddlepoint

Conflicts:
src/ksp/pc/impls/bddc/bddc.c
src/ksp/pc/impls/bddc/bddcgraph.c
src/ksp/pc/impls/bddc/bddcprivate.c

Merged in dalcinl/fix-tsrollback (pull request #456)

TS: Refactor TSStep() and TSRollBack()

TS: Refactor TSStep() and TSRollBack()

* TSStep() handles the step counter increment, and not TSStep_XXX().
* TSRollBack() handles the step counter decrement.
* Removed ``time_step_prev`` from the T

TS: Refactor TSStep() and TSRollBack()

* TSStep() handles the step counter increment, and not TSStep_XXX().
* TSRollBack() handles the step counter decrement.
* Removed ``time_step_prev`` from the TS structure. New code should use
ts->ptime - ts->ptime_prev to determine the previous time step size.
* Removed unused ``time_step_orig`` from the TS structure.
* Removed unused ``time_step_since_decrease`` from the TS structure.
* Minor update bouncing ball test examples.
* Regenerate some test examples output.

show more ...

Merged in dalcinl/fix-tsadapt (pull request #441)

TSAdapt and related improvements

TS: Fix TSGetAdapt() to require output argument

The handling of the output argument and was breaking standard API rules.

Merge branch 'tisaac/dmforest' into mlange/fix-plex-multi-level-overlap

Merge branch 'master' into stefano_zampini/feature-pcbddc-saddlepoint

Conflicts:
src/ksp/pc/impls/bddc/bddc.c
src/ksp/pc/impls/bddc/bddcgraph.c
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/imp

Merge branch 'master' into stefano_zampini/feature-pcbddc-saddlepoint

Conflicts:
src/ksp/pc/impls/bddc/bddc.c
src/ksp/pc/impls/bddc/bddcgraph.c
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/ksp/pc/impls/bddc/bddcschurs.c
src/mat/impls/is/matis.c

show more ...

Merge remote-tracking branch 'origin/knepley/fix-plex-test-partitions' into tisaac/dmforest

* origin/knepley/fix-plex-test-partitions: (151 commits)
Plex ex5: Provide test partitions
Plex ex4: P

Merge remote-tracking branch 'origin/knepley/fix-plex-test-partitions' into tisaac/dmforest

* origin/knepley/fix-plex-test-partitions: (151 commits)
Plex ex5: Provide test partitions
Plex ex4: Provide test partitions
Configure: I really hate exceptions - We should rewrite this to eliminate all exceptions in favor of return codes
Configure: I hate exceptions
fix typo for 'runex19_superlu_dist_2'
Fix for freeing just what needs to be free when SuperLU_Dist factorizations reused
Updated to latest hypre pre-release with fixes for handling blas/lapack libraries
Switch back to petsc fork of SuperLU_Dist that turns of use of findMPI
PCFactorSetUpMatSolverPackage() should not crash but instead produce a useful error message if called before it is in the proper state.
Clarify that SNESGetLinearSolveIterations() does not include failed iterations.
User reported issues with downloading boost using the previous URL but not this one
Configure: Small change to log order
MatFDColoringSetUp_MPIXAIJ: fix broken initialization of colmap
Bib: Missing comma
add support for binary viewer for -ts_monitor that records time at each timestep
superlu_dist: set MPI_C_COMPILER etc options - so that superlu_dist cmake does not look for a different/incompatible mpi compiler. [and its CFLAGS].
remove reference to VecGetValuesBlocked() and VecGetValuesLocal() from manual page since they do not exist.
Stop configure if user builds with threadsafety and debugging on
Added configure option --with-viewfromoptions=0 which will speed up code with many small solves substantially
Only generate list of all PetscFunctionLists generated in debug mode since in some circumstances where many objects are created searching this list is very slow.
...

Conflicts:
src/ts/examples/tutorials/ex11.c

show more ...

Merge branch 'barry/feature-force-setting-exactfinaltime'

Cause TS_EXACTFINALTIME_MATCHSTEP to error for non-adaptive schemes
This also causes non-adapative schemes to not have a TSAdapt object (which they don't use anyway)

Funded-by: IMEX
Time: .2 hours
R

Cause TS_EXACTFINALTIME_MATCHSTEP to error for non-adaptive schemes
This also causes non-adapative schemes to not have a TSAdapt object (which they don't use anyway)

Funded-by: IMEX
Time: .2 hours
Reported-by: Ed Bueler <elbueler@alaska.edu>

show more ...

Require users to explicitly call TSSetExactFinalTime() or use the option -ts_exact_final_time
This will make it more likely they understand what the solution of the ODE solver at the
final time is pr

Require users to explicitly call TSSetExactFinalTime() or use the option -ts_exact_final_time
This will make it more likely they understand what the solution of the ODE solver at the
final time is producing and not mistakenly think it is neccessarily the solution exact at the
final time they requested.

Funded-by: IMEX
Time: 2 hours
Thanks-to: Ed Bueler <elbueler@alaska.edu>

show more ...

Merge branch 'master' into barry/add-pcfieldsplit-logevent

Merge branch 'master' into tisaac/dmforest

* master: (87 commits)
fixed --download-xxx=/directory to not mistake other options such as --download-mpich-pm=hydra etc
Correct spelling for Autotool

Merge branch 'master' into tisaac/dmforest

* master: (87 commits)
fixed --download-xxx=/directory to not mistake other options such as --download-mpich-pm=hydra etc
Correct spelling for Autotools libtoolize in commit a0848688a08a6eb150afdc95a2f6ce49cd4cd079
Fix for commit c8b462efbd8e8a5f06df500cf417f3a48f2b88d9 Put back the gitpreReq() check that was needed for MOAB
website: fix Fluidity link
bib/cite: add UMFPACK
nightlybuilds: update test tu use newer intel compiler [detect and use compiler path]
nightlybuilds: fix vec/ex7,ex7f link issue by using the correct LIBS option
Added support for users to provide their own download package installers --download-xxx=/directory where the directory contains the file xxx.py that is a standard PETSc package definition like in config/BuildSystem/config/packages/xxx.py
nightlybuilds: switch default intel compiler [& MKL] from 13.1.3 to 16.0.0.
mkl_pardiso: fix runex125_mkl_pardiso
mkl_pardiso: fix runex2_mkl_pardiso_cholesky
nightlybuilds: switch OSX to use boost from brew [as --download-boost is broken]
trilinos: gitcommit - always specify branch as origin/branch
Add error check to boost.py when running on Mac OS because the shared libraries created do not work since they do not have the proper rpath set
Update output files for mpi matrices that use to be seq
Move PostProcess() runs until after PETSc configure has saved all data to the filesystem so that make install will work correctly.
Switch to Trilinos release candidate for --download-trilinos Tested, failed with unresolved Kokos methods, Issue report to Trilinos team
Some configure packages UnitTest-CPP requires libtoolize to be called before autoreconf on some systems
--download-ideas now downloads unittest-cpp
simplied ./configure packages that need autoreconf to be run first (like moab and unittest-cpp) added unittest-ccp download changed downloadfilename to downloaddirname since that is what it is
...

# 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 ...