Merge branch 'master' into barry/sawsConflicts: src/ksp/pc/impls/gamg/gamg.c src/sys/classes/viewer/impls/ams/ams.c src/sys/objects/pinit.c
Merge branch 'barry/dmvecmattypes'The MatType argument is removed from DMCreateMatrix(), you can useDMSetMatType() to indicate the type you want used with a DM, defaults toMATAIJ.* barry/dmvecm
Merge branch 'barry/dmvecmattypes'The MatType argument is removed from DMCreateMatrix(), you can useDMSetMatType() to indicate the type you want used with a DM, defaults toMATAIJ.* barry/dmvecmattypes: DMPlex ExodusII: fix dm->vectype pointer syntax removed use of VecSetFromOptions() all over the placed, instead use MatGetVecs() or use dm->vectype to determine type added DMGetVecType() and DMGetMatTYpe() removed MatType argument from DMCreateMatrix() and DMCreateColoring() since information is obtained from DMConflicts: src/dm/impls/da/fdda.c src/dm/impls/plex/plex.c
show more ...
Merge branch 'jed/converged-default-and-skip'This process started with SNESDefaultConverged -> SNESConvergedDefaultin v3.4, but the other parts have been added piecemeal. Deprecationsupport in C
Merge branch 'jed/converged-default-and-skip'This process started with SNESDefaultConverged -> SNESConvergedDefaultin v3.4, but the other parts have been added piecemeal. Deprecationsupport in C interface.* jed/converged-default-and-skip: SNES and KSP: add deprecation for *DefaultConverged and *SkipConverged KSP: rename KSPDefaultConverged* to KSPConvergedDefault* KSP: rename KSPSkipConverged -> KSPConvergedSkip SNES: document SNESSkipConverged -> SNESConvergedSkip snes->ttol to be used only in convergence tests. Renamed SNESKSPEW_Pre/PostSolve --> KSPPre/PostSolve_SNESEW. Renamed SNESSkipConverged --> SNESConvergedSkip.Conflicts: include/petscsnes.h src/docs/website/documentation/changes/dev.html
Merge branch 'barry/dmvecmattypes' into barry/sawsNeeded to work with version of PETSc that did not have constant calls to VecSetFromOptions() etcConflicts: src/ksp/ksp/interface/ams/kspams.c s
Merge branch 'barry/dmvecmattypes' into barry/sawsNeeded to work with version of PETSc that did not have constant calls to VecSetFromOptions() etcConflicts: src/ksp/ksp/interface/ams/kspams.c src/snes/impls/composite/snescomposite.c src/snes/impls/gs/snesgs.c src/snes/impls/nasm/nasm.c src/snes/impls/ngmres/snesngmres.c
removed use of VecSetFromOptions() all over the placed, instead use MatGetVecs() or use dm->vectype to determine typeadded DMGetVecType() and DMGetMatTYpe()
Merge branch 'barry/improve-memory-logging'Conflicts: src/ksp/pc/impls/redundant/redundant.c src/mat/interface/matnull.c
snes->ttol to be used only in convergence tests.
Renamed SNESSkipConverged --> SNESConvergedSkip.
converted uAMS usage to SAWs usage; starts server but cannot see any published directories
logging memory now credits to all ancestors
SNES VISS: remove stale linesearch comment
SNES: call SNESLineSearchGetSuccess before using result in PetscInfoMicrosoft's compiler warns about this use of an uninitialized variable.
SNESGetLineSearch / SNESSetLineSearch: rename for consistencyThis function was introduced as SNESGetPetscLineSearch, which matches noestablished convention, then changed to SNESGetSNESLineSearch a
SNESGetLineSearch / SNESSetLineSearch: rename for consistencyThis function was introduced as SNESGetPetscLineSearch, which matches noestablished convention, then changed to SNESGetSNESLineSearch accordingto the object name SNESLineSearch. This is inconsistent with names suchas MatGetInfo, MatGetColoring, MatGetNullSpace, MatGetLocalToGlobalMapping,SNESGetConvergedReason, and TSGetAdapt.This is a change from petsc-3.3.
LOCDIR: fix all outdated paths and normalize trailing slashUpdate 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 slashUpdate 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 resultcan be checked by 'bin/maint/checkloc.py'.
PetscObjectQueryFunction: use macro to hide PetscVoidFunction* castRationale is the same as the parent. This makes all ofPetscFunctionListAdd(), PetscFunctionListFind(),PetscObjectComposeFunction
PetscObjectQueryFunction: use macro to hide PetscVoidFunction* castRationale is the same as the parent. This makes all ofPetscFunctionListAdd(), PetscFunctionListFind(),PetscObjectComposeFunction(), and PetscObjectQueryFunction() consistentregarding function pointer return types.
removed string version of function name for XXXRegister(), PetscFunctionListAdd() and PetscObjectComposeFunction()
fixed calls to PetscObjectAMSTake/GrantAccess() to cast first argument to PetscObject
work on AMS interface, consistent naming, ams.h not included in petscviewer.h, no ifdefsHg-commit: 642571a1dc7109fdb7e5b0abb23bf260d10eb970
added KSPSetPreSolve() and KSPSetPostSolve() and removing SNES_KSPSolve() having the Eisenstat-Walker code use the SetPre and PostHg-commit: e42d7b26aaba7877248896e0fb4089fe619da155
made public several private KSP and SNES methods that may be used by plugin KSP and SNES classes written by usersHg-commit: 0d6205a1c0feb0cbd5a40a08327fe43345c19792
fixed function names with Default to match new standard (which I just wrote)fixed a few more functions that should be PETSC_INTERNHg-commit: 87889fe4f6d4e8d0963adcc79d438e75330601c6
Change all PETSC_EXTERN_C to PETSC_EXTERNHg-commit: 8d2ebbb193fb583bccc64015e35640c4e08c3426
updated from EXTERN_C_BEGIN/END through sys directoryHg-commit: ee6b7ef2f48ce66402e7e807302de19506ce15df
began removing unneeded EXTERN_C_BEGIN/END and converting needed ones to PETSC_EXTERN_CHg-commit: e0c157606a3283d5a4ba8902a0da5cad0e2aa531
changed use of PetscObjectComposeFunctionDynamic() to PetscObjectComposeFunction() to allow use of static for functions for standard use in PETScPetscObjectComposeFunctionDynamic() is still availabl
changed use of PetscObjectComposeFunctionDynamic() to PetscObjectComposeFunction() to allow use of static for functions for standard use in PETScPetscObjectComposeFunctionDynamic() is still available for use if neededalso fixed calls to PetscObjectComposeFunction() to not wrap lines (per PETSc coding style)Hg-commit: 822f9ddaac95a8ff6c2a9ad77fbf07d02d2c20d9
12345678910>>...16