| #
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
|
| #
a32ce8cf
|
| 21-Oct-2013 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into prbrune/fas-gscolorsecant
There was a build error in master when I last merged.
|
| #
320ba4d2
|
| 18-Oct-2013 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/fix-plex-doc-small'
* knepley/fix-plex-doc-small: DMPlex: Small doc fix Doc: typo fix for location of bagimpl.h
|
| #
f773284b
|
| 16-Oct-2013 |
Satish Balay <balay@mcs.anl.gov> |
Doc: typo fix for location of bagimpl.h
|
| #
256ff83f
|
| 11-Sep-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/wirth-fusion-materials
Conflicts: src/ts/examples/tutorials/advection-diffusion-reaction/ex10.c
|
| #
81f98445
|
| 02-Jul-2013 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'prbrune/dm-coordinaterestrict' into prbrune/snes-elasticityexample
|
| #
1e14497c
|
| 28-Jun-2013 |
Jed Brown <jedbrown@mcs.anl.gov> |
Merge branch 'maint'
* maint: fixed src/dm/examples/tutorials/ex7.c to use replacement for PetscViewerBinaryMatlabOpen() also needed to fix bin/matlab/PetscBagRead.m for new location of bagimpl.
Merge branch 'maint'
* maint: fixed src/dm/examples/tutorials/ex7.c to use replacement for PetscViewerBinaryMatlabOpen() also needed to fix bin/matlab/PetscBagRead.m for new location of bagimpl.h and put bagimpl.h into the appropriate public place
show more ...
|
| #
9bb5e83d
|
| 28-Jun-2013 |
Barry Smith <bsmith@mcs.anl.gov> |
fixed src/dm/examples/tutorials/ex7.c to use replacement for PetscViewerBinaryMatlabOpen() also needed to fix bin/matlab/PetscBagRead.m for new location of bagimpl.h and put bagimpl.h into the approp
fixed src/dm/examples/tutorials/ex7.c to use replacement for PetscViewerBinaryMatlabOpen() also needed to fix bin/matlab/PetscBagRead.m for new location of bagimpl.h and put bagimpl.h into the appropriate public place
show more ...
|
| #
e33c197d
|
| 11-Jun-2013 |
Richard Mills <rtm@eecs.utk.edu> |
Merged petsc/petsc into rmills/petsc master.
|
| #
20cbb662
|
| 11-Apr-2013 |
Jed Brown <jed@59A2.org> |
Merge branch 'jed/fix-locdir'
* jed/fix-locdir: LOCDIR: fix all outdated paths and normalize trailing slash
|
| #
3e1910f1
|
| 10-Apr-2013 |
Jed Brown <jed@59A2.org> |
LOCDIR: fix all outdated paths and normalize trailing slash
Update performed by:
git ls-files '*/makefile' | xargs perl -pi -MFile::Basename \ -e 's!(LOCDIR[[:space:]]+=) *(.+)$!$1." ".dirnam
LOCDIR: fix all outdated paths and normalize trailing slash
Update performed by:
git ls-files '*/makefile' | xargs perl -pi -MFile::Basename \ -e 's!(LOCDIR[[:space:]]+=) *(.+)$!$1." ".dirname($ARGV)."/"!e'
Fortran auto must be fixed using 'make allfortranstubs' and the result can be checked by 'bin/maint/checkloc.py'.
show more ...
|
| #
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
|
| #
2b1f8b2a
|
| 02-Jan-2013 |
Jed Brown <jed@59A2.org> |
Update header file relative paths from src/sys/classes/
Hg-commit: e132f54d7dd57ff487f4fef2691fc7e4f4a92dd6
|
| #
b769355b
|
| 31-Dec-2012 |
Jed Brown <jed@59A2.org> |
merge PetscSF implementation
Hg-commit: 98dccc99445b69cb7a66312149eb16fec359e294
|
| #
5a4671ae
|
| 30-Dec-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
removed trailing spaces from all files
Hg-commit: 1cfa55059afe46c5145e0e830cd797b97216abfb
|
| #
29aa02fc
|
| 11-Dec-2012 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Commit after merge.
Hg-commit: a128a87f5736ccbab37df5d559616f8376f7026e
|
| #
5c6c1dae
|
| 10-Dec-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
reorg of src/sys directory directories that define objects now in the classes subdirectory rename several confusing name directories
Hg-commit: b2612422c63ac4afe82112892d9efda808f3d601
|