add new lines to SAWs citation

Merge branch 'maint'

version: update in PetscCitationsInitialize()

Merge branch 'balay/fix-win32-printf-2digit-exponent'

win32: set printf output format to print 2-digit exponent [instead of the default 3-digit]

Merge branch 'shri/feature-dmnetwork'

Moved Satish back as the first author and updated bibtex entries.

fixed a bug in pinit.c and ex19.c to display information correctly

Merged upstream/master to feature-dmmoab

Merge remote-tracking branch 'upstream/master'

Merge branch 'karpeev/fix-options-init'

Conflicts:
src/sys/objects/pinit.c

Merge branch 'master' into prbrune/snes-fascontinuation

* master: (855 commits)
fix for moab example had wrong blocksize of mapping
docs:remove src/docs/doxygen/manual [per Barry's instructions]

Merge branch 'master' into prbrune/snes-fascontinuation

* master: (855 commits)
fix for moab example had wrong blocksize of mapping
docs:remove src/docs/doxygen/manual [per Barry's instructions]
gfortran: remove 132 char limit from f90 free-form
SNES: Set up matrix-free *after* copying the user Jacobian to snes->pc
DMPlex-Gmsh: Use trueNumCells when building the coordinate section
Sys: Got guard logic reversed
Sys: The #define guard for PetscMalloc*() must match the one for PetscFree*()
PetscFV: I hate fucking complex
removed ltog scatter from DMDA since functionality can be obtained with gtol scatter and less memory
fix test of DMLocalToGlobalBegin/End and add actual test cases
improve object memory logging for DA, ISLocalToGlobal and ISBLOCK
lower high water mark of constructing parallel scatter by allocating only as much room in svalues as needed
owner in VecScatter construction is the rank, therefor can use PetscMPIInt to hold it do not PetscInt
another reuse of allocated array in 2d/3d DMDA create
improved high water mark of DMDASetups by implementing and using PETSC_USE_POINTER for ISCreateBlock()
PetscFV: Another complex fix
DMPlex+TS: Fixing types
ISIdentity() was wrong for block IS! Indices are NOT scaled by bs
PetscFV: Straighten out complex types
TS ex11: Fix casts and remove unused variable
...

show more ...

Merge branch 'master' into barry/saws-options

Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement

Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bdd

Merge branch 'master' into stefano_zampini/pcbddc-multilevel-improvement

Conflicts:
src/docs/website/documentation/changes/dev.html
src/ksp/ksp/examples/tutorials/ex59.c
src/ksp/pc/impls/bddc/bddcprivate.c

show more ...

Merge branch 'master' of bitbucket.org:petsc/petsc

doc: fix getpdflabels to count manual chapters correctly.
Also fix URLs from man pages to manual.pdf

Merge remote-tracking branch 'origin/master' into feature-dmmoab

Merged petsc/petsc into master

Merge branch 'master' into knepley/feature-plex-hdf5-parallel-load

* master: (125 commits)
since PETSc cannot view factored matrices, generate an error rather than display the wrong stuff (this wa

Merge branch 'master' into knepley/feature-plex-hdf5-parallel-load

* master: (125 commits)
since PETSc cannot view factored matrices, generate an error rather than display the wrong stuff (this was really bad)
outdated example that doesn't match coding style removed and buggy
petscversion.h: workaround ifort -cpp lack of referential transparency
configure: ignore AR, MAKEFLAGS [if set in env]
incorrect first entry in array being zeroed in example
sizeof.c: remove dependence on petsc [and fix syntax error]
nightlybuilds: use consistant PETSC_ARCH, machine names
TS: Allow viewing of TS solutions
DMPlex: Fix comparison for complex
change MPIVersion streams to use MPI_Wtime() to be portable to Windows do not use scalar square root on real number; it upsets Microsoft
cannot use I in PETSc code because in complex it sometimes represents imaginary number cannot pass PetscScalar * to VecNorm()
in dashboard don't warn about SSL and BOI deprecated
TS ex11: Fixed output formatting
Doc+DMPlex: Added function documentation for some refinement functions
streams: translate code from 'bash' to 'sh' [fix freebsd]
barry is an idiot who doesn't have a clue as to what he is doing (and git's unfriendlyness doesn't help matters)
don't list examples under C that don't work with complex!
forgotten output file
removed valgrind warning about sending uninitialized data
nightly builds ignore unrecognized pragma and .c file as C++ code
...

Conflicts:
include/petsc-private/dmpleximpl.h

show more ...

Merge branch 'maint'

* maint:
petscversion.h: workaround ifort -cpp lack of referential transparency
Do not use PetscViewerASCIIGetStdout() after all registered objects have been destroyed in Pe

Merge branch 'maint'

* maint:
petscversion.h: workaround ifort -cpp lack of referential transparency
Do not use PetscViewerASCIIGetStdout() after all registered objects have been destroyed in PetscFinalize() therwise zeroed out ascii viewer is returned from PETSc internal communicator if not all PETSc objects have been destroyed and -options_left is used

Conflicts:
src/sys/objects/pinit.c

show more ...

PetscTextBelt() requires socket viewer

Merge branch 'barry/google'

Fixing merge conflicts in dmregall.

Merged petsc/petsc into master

Do not use PetscViewerASCIIGetStdout() after all registered objects have been destroyed
in PetscFinalize() therwise zeroed out ascii viewer is returned from PETSc internal communicator if
not all PET

Do not use PetscViewerASCIIGetStdout() after all registered objects have been destroyed
in PetscFinalize() therwise zeroed out ascii viewer is returned from PETSc internal communicator if
not all PETSc objects have been destroyed and -options_left is used

Reported by: william.perkins@pnnl.gov

show more ...