| #
4e7385fa
|
| 16-Feb-2015 |
Stefano Zampini <stefano.zampini@gmail.com> |
Merge branch 'master' into stefano_zampini/pcbddc-adaptive-selection
Conflicts:
src/ksp/pc/impls/bddc/bddcprivate.c
|
| #
a197972a
|
| 11-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/saws-options-merge-master
Totally confusing manual merge, could be wrong
Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c
Merge branch 'master' into barry/saws-options-merge-master
Totally confusing manual merge, could be wrong
Conflicts:
include/petscoptions.h
src/dm/impls/da/dacreate.c
src/sys/objects/aoptions.c
src/sys/threadcomm/interface/threadcomm.c
show more ...
|
| #
50705773
|
| 10-Feb-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into pr252/dmay/PetscViewerBinarySkipHeaderVecViewLoad
Manual merge of makefile
Conflicts:
src/sys/classes/viewer/examples/tutorials/makefile
|
| #
69c6db66
|
| 27-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'barry/experiment'
|
| #
33263987
|
| 25-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Manual merge since I removed hypre euclid and stefno added ams
Merge branch 'stefano_zampini/hypre-ams' into barry/experiment
Conflicts:
include/petscpc.h
src/ksp/pc/impls/hypre/hypre.c
|
| #
4cb006fe
|
| 27-Aug-2014 |
Stefano Zampini <stefano.zampini@gmail.com> |
PCHYPRE: added interface to auxiliary space Maxwell solver AMS
Interface is under testing.
Some specific functions could be namespaced to AMS
|
| #
4907a4d7
|
| 03-Jun-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merged upstream/master to feature-dmmoab
|
| #
299992b9
|
| 03-Jun-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merge remote-tracking branch 'upstream/master'
|
| #
0157cb02
|
| 02-Jun-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'jed/dmda-memusage'
|
| #
565245c5
|
| 29-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
remove DMDAGetGlobalIndices() since handled by DMGetLocalToGlobalMapping() followed by ISLocalToGlobalMappingGetIndices()
fixed cases where bs of ISLocalToGlobalMapping in Mat did not match matrix bl
remove DMDAGetGlobalIndices() since handled by DMGetLocalToGlobalMapping() followed by ISLocalToGlobalMappingGetIndices()
fixed cases where bs of ISLocalToGlobalMapping in Mat did not match matrix block size
show more ...
|
| #
92c494f3
|
| 23-May-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/saws-options
|
| #
95ecbf38
|
| 18-May-2014 |
Stefano Zampini <stefano.zampini@gmail.com> |
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 ...
|
| #
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
|
| #
1d763ceb
|
| 17-Mar-2014 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into prbrune/matcoloring-greedy
|
| #
061e9cde
|
| 27-Feb-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merging master with feature-dmmoab. Only conflict was with SOURCECXX specification under impls/moab/makefile.
|
| #
bf5b0b0b
|
| 25-Feb-2014 |
Vijay Mahadevan <vijay.m@gmail.com> |
Merged petsc/petsc into master
|
| #
020631bc
|
| 19-Feb-2014 |
Peter Brune <brune@mcs.anl.gov> |
Merge branch 'master' into prbrune/snes-fascontinuation
Conflicts:
include/petscsnesfas.h
|
| #
1f1b5a69
|
| 15-Feb-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into barry/ts-rhsjacobian-only
|
| #
6d808a57
|
| 13-Feb-2014 |
Shri Abhyankar <abhyshr@mcs.anl.gov> |
Merge branch 'shri/update-SuiteSparse' into shri/external-package-KLU
Conflicts:
conf/test
config/examples/arch-linux-pkgs-dbg-ftn-interfaces.py
config/examples/arch-linux-pkgs-opt.py
|
| #
bab9b9ec
|
| 07-Feb-2014 |
Barry Smith <bsmith@mcs.anl.gov> |
Merge branch 'master' into balay/tao-to-petsc
Conflicts:
src/dm/examples/tests/ex42.c
src/dm/examples/tutorials/ex65dm.c
src/ksp/ksp/examples/tutorials/ex42.c
src/snes/examples/tutorials/cahn-hi
Merge branch 'master' into balay/tao-to-petsc
Conflicts:
src/dm/examples/tests/ex42.c
src/dm/examples/tutorials/ex65dm.c
src/ksp/ksp/examples/tutorials/ex42.c
src/snes/examples/tutorials/cahn-hilliard-schemes/ex1.c
src/snes/examples/tutorials/ex54.c
src/snes/examples/tutorials/ex55.c
src/snes/examples/tutorials/ex60.c
src/snes/examples/tutorials/ex61.c
src/snes/examples/tutorials/ex63.c
src/snes/examples/tutorials/ex633d_db.c
src/snes/examples/tutorials/ex64.c
src/snes/examples/tutorials/ex65.c
src/snes/examples/tutorials/ex653d.c
src/ts/examples/tutorials/ex23.c
show more ...
|
| #
fbf5b483
|
| 03-Feb-2014 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'knepley/feature-periodic-mesh'
* knepley/feature-periodic-mesh:
Matt moved DMDA_BOUNDARY.. to DM_BOUNDARY... but did not fix ex2f.F includes
DM Fortran examples: fix petscdm.h -> f
Merge branch 'knepley/feature-periodic-mesh'
* knepley/feature-periodic-mesh:
Matt moved DMDA_BOUNDARY.. to DM_BOUNDARY... but did not fix ex2f.F includes
DM Fortran examples: fix petscdm.h -> finclude/petscdm.h
DMPlex: Fixed markers on periodic boundary
DM examples: include petscdm.h in examples that use DM_BOUNDARY_*
DMBoundary: fix line length for Fortran
DMPlex: Now DMPlexCreateHexBox() can have a Mobius topology using DM_BOUNDARY_TWIST
DM: Moved DMDABoundaryTypes to DMBoundaryTypes - Changed the enum values as well - Changed docs and updated Changes - Updated examples
DMPlex: DMPlexCreateHexBoxMesh() now allows periodicity - Changed declaration and uses - DMPlexCreateSquareMesh() now allows periodicity - Works with refinement
Conflicts:
src/dm/impls/plex/plexcreate.c
src/ts/examples/tutorials/advection-diffusion-reaction/ex10.c
show more ...
|
| #
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 ...
|
| #
bff4a2f0
|
| 09-Jan-2014 |
Matthew G. Knepley <knepley@gmail.com> |
DM: Moved DMDABoundaryTypes to DMBoundaryTypes
- Changed the enum values as well
- Changed docs and updated Changes
- Updated examples
|
| #
ed91c37e
|
| 19-Dec-2013 |
Matthew G. Knepley <knepley@gmail.com> |
Merge branch 'master' into knepley/feature-dmda-section
* master: (319 commits)
SNESGS: Fix for uninitialized variable warning in gssecant.c
DMPlex: Fix for orientation in Gmsh files - Fixed tes
Merge branch 'master' into knepley/feature-dmda-section
* master: (319 commits)
SNESGS: Fix for uninitialized variable warning in gssecant.c
DMPlex: Fix for orientation in Gmsh files - Fixed test output
do not use C99 struct initialization code in PETSc
Nightly Summary: Added time taken to each of the tests in the dashboard.
ASCII printing of floating point numbers must cast to (double) to support quad precision
configure: check fortranDatatypes only when fortran is enabled [this fixes configure crash with --with-fc=0]
don't use non-portable and also dependent on floating point precision system level math constants
picky compilers
fix a couple compiler warnings/errors (depending on compiler) for Matlab engine code
DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection()
DM: Added DMGet/SetCoordinateSection()
Fuckup: Fix for merge that is still untangling bad rebase from Oct. 17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed 2 mallocs
replace all echo in test/tutorial makefiles with printf since echo behaves differently on different systems
DMDA: Missing header - Damn rebase
DMPlex ex3: Added 2D Q_1 and 3D P_2 tests
DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff()
DMDA: Fixed 2D geometry - Should reuse DMPlex routines
DMDA: Fix bug in 2D closure operation for cells
DMDA: Make closure operations also return the size
DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection()
...
Conflicts:
config/builder.py
include/petscdmda.h
src/dm/dt/interface/dtfe.c
src/dm/impls/da/dageometry.c
src/dm/impls/da/dalocal.c
src/dm/impls/plex/plexgeometry.c
show more ...
|