| #
af3d4eeb
|
| 16-Apr-2015 |
Fande Kong <fdkong.jd@gmail.com> |
Merge branch 'pr192/Fande-Kong/scalable-matincreaseoverlap/master' of https://bitbucket.org/petsc/petsc
|
| #
f1c23e0e
|
| 15-Apr-2015 |
Fande Kong <fdkong.jd@gmail.com> |
Merged petsc/petsc into master
|
| #
4bc2dc4b
|
| 15-Apr-2015 |
Stefano Zampini <stefano.zampini@gmail.com> |
Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection
Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
s
Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection
Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
src/ksp/pc/impls/bddc/bddcscalingbasic.c
src/mat/impls/aij/mpi/mumps/mumps.c
src/mat/impls/is/matis.h
show more ...
|
| #
305f5a7e
|
| 14-Apr-2015 |
semihozmen <semihozmen@gmail.com> |
Merged master into semihozmen/ksp-fcg-eigen-comp-support
|
| #
f9185b66
|
| 13-Apr-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into pr192/Fande-Kong/scalable-matincreaseoverlap/master
Needed to merge master to update to new calling sequence PetscCommBuildTwoSided
|
| #
66d7bb0d
|
| 12-Apr-2015 |
semihozmen <semihozmen@gmail.com> |
Merged petsc/petsc into master
|
| #
255664f4
|
| 12-Apr-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/fix-directory-layout'
|
| #
af0996ce
|
| 11-Apr-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
updated PETSc directory layout to match standard packaging strategies
include/petsc finclude,private,mpiuni
lib/petsc conf
bin/petsc*
|
| #
898446f9
|
| 11-Mar-2015 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Merge branch 'master' into shri/ts-is-for-differential-variables
Conflicts:
include/petsc-private/tsimpl.h
src/ts/impls/eimex/eimex.c
src/ts/interface/ts.c
|
| #
9c925a2c
|
| 18-Mar-2014 |
Shri <abhyshr@mcs.anl.gov> |
Merge branch 'master' into shri/ts-events
Conflicts:
src/ts/interface/ts.c
|
| #
5f6acfaf
|
| 18-Mar-2014 |
Shri <abhyshr@mcs.anl.gov> |
Merge branch 'master' into shri/feature-dm-circuit
Conflicts:
src/dm/impls/makefile
|
| #
c7ff62de
|
| 13-Jan-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/wirth-fusion-materials
bad manual merge needs to be fixed
this is what happens when branches hang around too long
Conflicts:
src/ts/examples/tutorials/advection-dif
Merge branch 'master' into barry/wirth-fusion-materials
bad manual merge needs to be fixed
this is what happens when branches hang around too long
Conflicts:
src/ts/examples/tutorials/advection-diffusion-reaction/ex10.c
show more ...
|
| #
edbbd480
|
| 10-Dec-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/xcode
|
| #
cd4f0679
|
| 18-Nov-2013 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/feature-dmda-section
* master: (528 commits)
Doc: Fixed configure doc
Nightly summary: Added configure section.
TSSetErrorIfStepFails: fix __FUNCT__
TS: fi
Merge branch 'master' into knepley/feature-dmda-section
* master: (528 commits)
Doc: Fixed configure doc
Nightly summary: Added configure section.
TSSetErrorIfStepFails: fix __FUNCT__
TS: fix for TSGetRHSMats_Private() in the creation of the Arhs and Brhs matrices
protect logging of objects (which uses global variables) with PETSC_USE_LOG
error handler API had been previously changed but this example was not updated to new API.
DMPlex: Fixed bug in coordinate permutation
PetscSection: Doc fix for permutation
Bib: Added Top500 and fixed entry
fun3d: update PetscMallocValidate() usage
bugfix of MatCreateSeqAIJFromTriple() contributed by Nicolas Marsic <nicolas.marsic@montefiore.ulg.ac.be>
bib: rename ref with duplicate key
Webpage: Corrected '-dm_mat_type cusp' to 'dm_mat_type aijcusp'.
completed removing server code that was not removed in previous commit
removed PETSc webserver and configure package files that supported it
Allow calling MatGetBlockSize[s]() before matrix preallocation
SNESLINESEARCHBT: Set the norms when exiting early due to negligible step.
fix outdated PetscOptionsList
SNESQN: only monitor real part of dot product (fails with C++ complex)
Fix for multiple definitions in mat/color/interface/ custom fortran bindings
...
Conflicts:
config/builder.py
include/petscdmplex.h
src/dm/impls/da/dageometry.c
src/dm/impls/plex/examples/tests/ex4.c
src/dm/impls/plex/plex.c
src/dm/impls/plex/plexinterpolate.c
show more ...
|
| #
c4fbd833
|
| 08-Nov-2013 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/feature-fem-dgspace
* master: (593 commits)
Bib: Added Top500 and fixed entry
fun3d: update PetscMallocValidate() usage
bib: rename ref with duplicate key
Merge branch 'master' into knepley/feature-fem-dgspace
* master: (593 commits)
Bib: Added Top500 and fixed entry
fun3d: update PetscMallocValidate() usage
bib: rename ref with duplicate key
Webpage: Corrected '-dm_mat_type cusp' to 'dm_mat_type aijcusp'.
Allow calling MatGetBlockSize[s]() before matrix preallocation
SNESLINESEARCHBT: Set the norms when exiting early due to negligible step.
SNESQN: only monitor real part of dot product (fails with C++ complex)
Corrected the #include statement in the man pages for the PetscObjectComposedDataSet/Getwhatever routines.
DMPlex: Added doc for DMPlexGetHybridBounds()
winzip: detect if winzip is used to extract petsc.tar.gz and error out.
configure: remove self.archIndependent as its not being used. [it is used to create externalpackages/package/arch dir which is unused]
configure: fix packages using package-dir/PETSC_ARCH as out-of-source-build location Perhaps this should be changed to package-dir/build?
configure: remove dead code previously used to download BuildSystem
configure: check if compilerDefines [and compilerFixes] exist in framework before using them
configure: save/restore reconfigure.py when --with-clean is used
configure: add --with-clean option to delete buildfiles/externalpackages in PETSC_DIR/PETSC_ARCH and potential externalpackages in --with-external-package-dir/PETSC_ARCH
configure: With --with-externalpackages-dir=dir store/build packages in dir/PETSC_ARCH
Add MatSeqSBAIJSetPreallocationCSR()
configure: switch to using PETSC_DIR/PETSC_ARCH/externalpackages by updating package.py to use externalpackages.py as the externalPackagesDirProvider
configure: move dead code configureExternalPackagesDir() from petscdir.py to externalpackagesdir.py Also set PETSC_DIR/PETSC_ARCH/externalpackages as the externalpackagesdir
...
show more ...
|
| #
7737a228
|
| 31-Oct-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/saws
Conflicts:
src/ksp/pc/impls/gamg/gamg.c
src/sys/classes/viewer/impls/ams/ams.c
src/sys/objects/pinit.c
|
| #
004eb1ce
|
| 20-Oct-2013 |
Jed Brown <jedbrown@mcs.anl.gov> |
Merge branch 'balay/remove-sdir'
__SDIR__ is gone. This is an ABI change (PetscError) so dependent
packages must be recompiled.
* balay/remove-sdir:
__SDIR__: remove remaining traces and documen
Merge branch 'balay/remove-sdir'
__SDIR__ is gone. This is an ABI change (PetscError) so dependent
packages must be recompiled.
* balay/remove-sdir:
__SDIR__: remove remaining traces and document in changes.html
__SDIR__: remove usage of __SDIR__ from PETSc sources.
This merge fixes one instance of __SDIR__ that was added after
'balay/remove-sdir' branched off.
show more ...
|
| #
efca3c55
|
| 29-May-2013 |
Satish Balay <balay@mcs.anl.gov> |
__SDIR__: remove usage of __SDIR__ from PETSc sources.
|
| #
4042b796
|
| 17-Mar-2013 |
Jed Brown <jed@59A2.org> |
Merge branch 'master' into jed/ts-eimex
Sync to include Git conversion, PETSC_EXTERN, and minor API changes.
Conflicts:
src/ts/interface/tsregall.c
|
| #
c19eab39
|
| 06-Mar-2013 |
Richard Tran Mills <rmills@ornl.gov> |
Automerge.
Hg-commit: b6659d546870fb013f3da5bcd5066d1dc0dc329c
|
| #
296840b1
|
| 06-Mar-2013 |
Jed Brown <jed@59A2.org> |
Merge branch 'master' of gitifyhg::ssh://hg@bitbucket.org/BarryFSmith/petsc-dev-simp
Symbol visibility and namespacing.
C++ builds always set extern "C" and can be called from plain C. Most
users w
Merge branch 'master' of gitifyhg::ssh://hg@bitbucket.org/BarryFSmith/petsc-dev-simp
Symbol visibility and namespacing.
C++ builds always set extern "C" and can be called from plain C. Most
users will only want --with-clanguage=C++ for std::complex.
Hg-commit: f848d02318cae92d7b32037c7ee88f92dbe46347
show more ...
|
| #
8cc058d9
|
| 06-Mar-2013 |
Jed Brown <jed@59A2.org> |
Change all PETSC_EXTERN_C to PETSC_EXTERN
Hg-commit: 8d2ebbb193fb583bccc64015e35640c4e08c3426
|
| #
39d7646b
|
| 06-Mar-2013 |
Jed Brown <jed@59A2.org> |
Change all PETSC_EXTERN_C to PETSC_EXTERN
Hg-commit: ba0cf153561ff2dc521f42e94b7164fbe7b5d798
|
| #
9f7953f8
|
| 05-Mar-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
finished all EXTERN_C_BEGIN/END fixes up through Mat including all fortran interface files
Hg-commit: a763120ba50023930be975663a3f80c58e415743
|
| #
e79ce49d
|
| 02-Feb-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge
Hg-commit: f37b1e00e84f4f2c19b94a78ed2de72bd29e5778
|