| #
fe998a80
|
| 13-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
manual merge of conflict
|
| #
d3c8c067
|
| 01-Jan-2015 |
Barry Smith <bsmith@mcs.anl.gov> |
Three directory namespace changes for better --prefix install support
1) include/finclude becomes include/petsc-finclude
2) include/mpiuni becomes include/petsc-mpiuni
3) conf (both $PETSC_DIR/conf
Three directory namespace changes for better --prefix install support
1) include/finclude becomes include/petsc-finclude
2) include/mpiuni becomes include/petsc-mpiuni
3) conf (both $PETSC_DIR/conf and $PETSC_DIR/$PETSC_ARCH/conf become) lib/petsc-conf
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
|
| #
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
|
| #
31134e8c
|
| 03-Nov-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge
Hg-commit: d0f613618ca66a5aeb1aac97d210d2cc29755d3d
|
| #
2d507118
|
| 03-Nov-2012 |
Satish Balay <balay@mcs.anl.gov> |
reemove OBJSC and OBJSF from invididual makefiles and auto-define in conf/variables
Hg-commit: 2f01c17f3c19dc4b89aaf306cfd60a12312c270d
|
| #
0f55b88d
|
| 03-Jul-2012 |
Satish Balay <balay@mcs.anl.gov> |
backout all chmod stuff in bf971ba58125
[but keep diffs to src/mat/impls/aij/mpi/mpimatmatmult.c ]
Hg-commit: 4a812fc1f35496ce2717c7da9ef12ffabbd13258
|
| #
c0174eb7
|
| 03-Jul-2012 |
Mark F. Adams <mark.adams@columbia.edu> |
removed a spurious call to MatSetBlockSize.
Hg-commit: bf971ba58125bd8cf7ceb2a9d0f5cdf27c27cc6a
|
| #
d39137a2
|
| 12-Jan-2012 |
Barry Smith <bsmith@mcs.anl.gov> |
commit after merge
Hg-commit: d540875a63b3c979c82b6a7fa7f062571e906d10
|
| #
247e2d92
|
| 06-Jan-2012 |
Jed Brown <jed@59A2.org> |
Mass revert file modes that were made executable in f6e61ee9c329
Hg-commit: 116d90d0b66125cee0db3e7351047057e756baf5
|
| #
832f7384
|
| 01-Jan-2012 |
Matthew G Knepley <knepley@gmail.com> |
Merge
Hg-commit: ee8d91ae0580d1d4fa92be38a18d40c838b9a257
|
| #
14e519b0
|
| 31-Dec-2011 |
Mark F. Adams <mark.adams@columbia.edu> |
changed MatMatMult to MatTranposeMatMult.
Hg-commit: f6e61ee9c329774cd5343eea1ee6b7432be17c3f
|
| #
64779880
|
| 08-Feb-2011 |
Matthew G Knepley <knepley@gmail.com> |
Now requirepackage is only used for proper packages, functions use requiresfunction, and the rest use requiresdefine
Hg-commit: dd65fd3461c02753386917514e6ebe12d345a30e
|
| #
238e7d2d
|
| 02-Dec-2009 |
Matthew Knepley <knepley@mcs.anl.gov> |
Merge
Hg-commit: 9c9e2b0243eedf0151e3676f8f4ccde9f7b93898
|
| #
f3a56f8b
|
| 30-Nov-2009 |
Jed Brown <jed@59A2.org> |
merge TrMalloc/MEMALIGN updates
Hg-commit: e66e6e0b392d0e3456a0c4fdee411b9bff8fd74a
|
| #
da93591f
|
| 29-Nov-2009 |
Barry Smith <bsmith@mcs.anl.gov> |
removed PETSC_ARCH/conf/base and
added support for not setting PETSC_ARCH and PETSC_DIR with --prefix option
Hg-commit: e478f4df238e5763b64567336d7cf94ca5d89d58
|
| #
3be44c43
|
| 18-Nov-2007 |
Barry Smith <bsmith@mcs.anl.gov> |
commit aFTERmerge
Hg-commit: 45a698803bd457bdc2ba32be5035e710250a5320
|
| #
8da04507
|
| 10-Jun-2007 |
Matthew Knepley <knepley@mcs.anl.gov> |
Merge
Hg-commit: 89a88a4570a641b3af1b53853d576da3947e5ca7
|
| #
2423cecc
|
| 08-Jun-2007 |
Barry Smith <bsmith@mcs.anl.gov> |
changed bmake/common everywhere to conf
fixed a little more for new install system
Hg-commit: 1aa781ff09e652ebafd6f016d84e88c15ea650f1
|
| #
5e45c6bb
|
| 18-Sep-2006 |
Matthew Knepley <knepley@mcs.anl.gov> |
Merge
Hg-commit: d993bb95b9a28fc97e0ded9563c316540b683a1d
|
| #
6029c235
|
| 18-Sep-2006 |
Dmitry Karpeev <karpeev@mcs.anl.gov> |
Merge.
Hg-commit: 17ef89a89b5377b81fb5c60d492533c99ddb41e2
|
| #
909a696e
|
| 12-Aug-2006 |
Barry Smith <bsmith@mcs.anl.gov> |
Split HAVE_MATLAB into HAVE_MATLAB meaning the Matlab
program and MEX exist and HAVE_MATLAB_ENGINE meaning we
are turning on the Matlab engine from PETSc (this may not
work anywhere because of
Split HAVE_MATLAB into HAVE_MATLAB meaning the Matlab
program and MEX exist and HAVE_MATLAB_ENGINE meaning we
are turning on the Matlab engine from PETSc (this may not
work anywhere because of the messy Matlab shared libraries)
Started to migrate the PETSC_VIEWER_SOCKET to have the same
usage as PETSC_VIEWER_BINARY. This means
1) the XXXView_Binary() methods will write to both sockets
and binary files and
2) the PETSc PetscBinaryRead.m Matlab program will read into
Matlab PETSc objects either from PETSc binary files or
the PETSc socket.
Hg-commit: b8dc60db1bec603d47badde4641525c65924524d
show more ...
|
| #
0c295ffd
|
| 10-Dec-2004 |
Satish Balay <balay@mcs.anl.gov> |
bk-changeset-1.2818
balay@asterix.mcs.anl.gov|ChangeSet|20041210193404|20830
ChangeSet
1.2818 04/12/10 13:34:04 balay@asterix.mcs.anl.gov +5 -0
discard 221 build fix for matlab & complex
src/f
bk-changeset-1.2818
balay@asterix.mcs.anl.gov|ChangeSet|20041210193404|20830
ChangeSet
1.2818 04/12/10 13:34:04 balay@asterix.mcs.anl.gov +5 -0
discard 221 build fix for matlab & complex
src/fortran/custom/zviewer.c
1.10 04/12/10 13:34:03 balay@asterix.mcs.anl.gov +0 -1
discard 221 build fix for matlab & complex
src/vec/impls/mpi/pdvec.c
1.45 04/12/10 13:31:05 balay@asterix.mcs.anl.gov +0 -0
Auto merged
src/sys/src/viewer/impls/socket/matlab/makefile
1.10 04/12/10 13:31:05 balay@asterix.mcs.anl.gov +0 -0
Auto merged
src/mat/impls/sbaij/mpi/mmsbaij.c
1.32 04/12/10 13:31:05 balay@asterix.mcs.anl.gov +0 -0
Auto merged
src/fortran/custom/zsys.c
1.31 04/12/10 13:31:05 balay@asterix.mcs.anl.gov +0 -0
Auto merged
Hg-commit: e2f3c1346cbd3f5b52b276ed0839cb32b727fd64
show more ...
|
| #
9aced7ae
|
| 10-Dec-2004 |
Satish Balay <balay@mcs.anl.gov> |
bk-changeset-1.2468.6.68
balay@asterix.mcs.anl.gov|ChangeSet|20041210193014|07027
ChangeSet
1.2468.6.68 04/12/10 13:30:14 balay@asterix.mcs.anl.gov +8 -0
use the following consistantly
PETSC_HA
bk-changeset-1.2468.6.68
balay@asterix.mcs.anl.gov|ChangeSet|20041210193014|07027
ChangeSet
1.2468.6.68 04/12/10 13:30:14 balay@asterix.mcs.anl.gov +8 -0
use the following consistantly
PETSC_HAVE_MATLAB && !PETSC_USE_COMPLEX && !PETSC_USE_SINGLE
src/vec/pf/impls/matlab/makefile
1.8 04/12/10 13:30:12 balay@asterix.mcs.anl.gov +1 -0
use the following consistantly
PETSC_HAVE_MATLAB && !PETSC_USE_COMPLEX && !PETSC_USE_SINGLE
src/vec/impls/mpi/pdvec.c
1.38.1.2 04/12/10 13:30:12 balay@asterix.mcs.anl.gov +3 -3
use the following consistantly
PETSC_HAVE_MATLAB && !PETSC_USE_COMPLEX && !PETSC_USE_SINGLE
src/sys/src/viewer/impls/socket/matlab/makefile
1.8.1.1 04/12/10 13:30:12 balay@asterix.mcs.anl.gov +1 -0
use the following consistantly
PETSC_HAVE_MATLAB && !PETSC_USE_COMPLEX && !PETSC_USE_SINGLE
src/sys/src/viewer/impls/matlab/makefile
1.5 04/12/10 13:30:12 balay@asterix.mcs.anl.gov +1 -0
use the following consistantly
PETSC_HAVE_MATLAB && !PETSC_USE_COMPLEX && !PETSC_USE_SINGLE
src/sys/src/matlabengine/makefile
1.10 04/12/10 13:30:12 balay@asterix.mcs.anl.gov +2 -1
use the following consistantly
PETSC_HAVE_MATLAB && !PETSC_USE_COMPLEX && !PETSC_USE_SINGLE
src/fortran/custom/zviewer.c
1.8.1.1 04/12/10 13:30:12 balay@asterix.mcs.anl.gov +1 -1
use the following consistantly
PETSC_HAVE_MATLAB && !PETSC_USE_COMPLEX && !PETSC_USE_SINGLE
src/fortran/custom/zsys.c
1.26.1.2 04/12/10 13:30:12 balay@asterix.mcs.anl.gov +1 -1
use the following consistantly
PETSC_HAVE_MATLAB && !PETSC_USE_COMPLEX && !PETSC_USE_SINGLE
include/petscversion.h
1.122 04/12/10 13:30:12 balay@asterix.mcs.anl.gov +2 -2
use the following consistantly
PETSC_HAVE_MATLAB && !PETSC_USE_COMPLEX && !PETSC_USE_SINGLE
Hg-commit: dfe85a0135b1197d77ccf03cf79f33ff8c08c7c5
show more ...
|