| #
2f07c833
|
| 14-Apr-2018 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/feature-snes-ex13-spectral
* master: (2350 commits) migrate warning fix from next-tmp Revert "Remove dead code." clarifying comment in the code Remove dead
Merge branch 'master' into knepley/feature-snes-ex13-spectral
* master: (2350 commits) migrate warning fix from next-tmp Revert "Remove dead code." clarifying comment in the code Remove dead code. Add JuMP citation Copyedits and updates to developers manual Add more protection to intrinsics MPI: protect arguments in MPI macros Add the missing conditionals for 64-bit build Plex+VTK: Fix field type determination Fix bug in name cleanup Bib: Added ref Plex+VTK: Fix field type determination Plex: Updated test output - I am now hating this shit forgot to save file after moving prototypes to petscsys.h update Apple example project settings per Xcode Two functions should actually be public, used, for example from Apple MacOS and iOS programs includes should always be included relative to include directory Apple removed old locations of docsets SNES ex12: Updated test output ...
Conflicts: src/snes/examples/tutorials/ex13.c
show more ...
|
| #
e4bc0d72
|
| 08-Apr-2018 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/feature-pc-patch
* master: (440 commits) revert sources to dev - reset PETSC_VERSION_RELEASE - reset changes/dev.html release: set v3.9 strings fix grep us
Merge branch 'master' into knepley/feature-pc-patch
* master: (440 commits) revert sources to dev - reset PETSC_VERSION_RELEASE - reset changes/dev.html release: set v3.9 strings fix grep usage on solaris [use egrep] opensolaris: fix errors Update timer reporting and minor reporting fix Remove redundant if statement. Found by @jedbrown Fixed problem with order of developer photos on website. superlu_dist: use correct flag in example [PETSC_HAVE_SUPERLU -> PETSC_HAVE_SUPERLU_DIST] Bib: PERMON ref fix for osx doc: more author fixes doc: more author fixes Italicized "orderings" in MPI process placement discussion. Added Richard to the user manual author list. Added Richard to the list of active developers on the website. add string check for MS-MPI and IMPI timeout errors opensolaris does not have multiple grep utils - but default one does not support -F. So use fgrep instead Standardizing timeout checks Report wall clock time of total tests Use time instead of date %s ...
Conflicts: include/petscpc.h src/ksp/ksp/interface/itfunc.c
show more ...
|
| #
10d7b5b7
|
| 27-Mar-2018 |
Karl Rupp <me@karlrupp.net> |
Merge branch 'denera/tao-bounded-nlcg' [PR #898]
* denera/tao-bounded-nlcg: Extension of the existing unconstrained NCG with gradient projections and additional resetting safeguards required to guar
Merge branch 'denera/tao-bounded-nlcg' [PR #898]
* denera/tao-bounded-nlcg: Extension of the existing unconstrained NCG with gradient projections and additional resetting safeguards required to guarantee convergence.
show more ...
|