DMCreateInjection: return Mat rather than VecScatterFor (amongst others) FV discretisations, the natural injection may wellbe cell averaging, which is not expressible as a VecScatter.
manual merge of conflict
SNES FAS: Better comments
Merge branch 'maint'Conflicts: config/BuildSystem/config/packages/ml.py src/ksp/pc/impls/mg/mg.c
fix formatting of some manual pagesspecifically remove use of $ from the middle of parameter or options lists
MatGetVecs() and KSPGetVecs() replaced with MatCreateVecs() and KSPCreateVecs()since they are creators not getters
Placate static analyzer complaints about unreachable codeHenry Tufo's "shared separator" project is unlikely to be completed, atleast not by him, so delete the incomplete code fragment.Reported-
Placate static analyzer complaints about unreachable codeHenry Tufo's "shared separator" project is unlikely to be completed, atleast not by him, so delete the incomplete code fragment.Reported-by: Patrick Sanan <patrick.sanan@gmail.com>
show more ...
Merge branch 'prbrune/snes-fascontinuation'* prbrune/snes-fascontinuation: SNESFAS: added tau-corrected grid continuation.
SNESFAS: SNESFASGetSmoother(Down/Up) and SNESFASGetCoarseSolve prefix fix.When the user uses the SNESFASGetSmoother*() interfaces to create the smoothersthe prefix is set incorrectly due to the wr
SNESFAS: SNESFASGetSmoother(Down/Up) and SNESFASGetCoarseSolve prefix fix.When the user uses the SNESFASGetSmoother*() interfaces to create the smoothersthe prefix is set incorrectly due to the wrong outer SNES being passed toSNESFASCycleCreateSmoother_Private(). The fix is merely to pass the correct one.Based-on-patch-by: Lawrence Mitchell <lawrence.mitchell@imperial.ac.uk>
Merge branch 'master' into prbrune/snes-fascontinuation* master: (855 commits) fix for moab example had wrong blocksize of mapping docs:remove src/docs/doxygen/manual [per Barry's instructions]
Merge branch 'master' into prbrune/snes-fascontinuation* master: (855 commits) fix for moab example had wrong blocksize of mapping docs:remove src/docs/doxygen/manual [per Barry's instructions] gfortran: remove 132 char limit from f90 free-form SNES: Set up matrix-free *after* copying the user Jacobian to snes->pc DMPlex-Gmsh: Use trueNumCells when building the coordinate section Sys: Got guard logic reversed Sys: The #define guard for PetscMalloc*() must match the one for PetscFree*() PetscFV: I hate fucking complex removed ltog scatter from DMDA since functionality can be obtained with gtol scatter and less memory fix test of DMLocalToGlobalBegin/End and add actual test cases improve object memory logging for DA, ISLocalToGlobal and ISBLOCK lower high water mark of constructing parallel scatter by allocating only as much room in svalues as needed owner in VecScatter construction is the rank, therefor can use PetscMPIInt to hold it do not PetscInt another reuse of allocated array in 2d/3d DMDA create improved high water mark of DMDASetups by implementing and using PETSC_USE_POINTER for ISCreateBlock() PetscFV: Another complex fix DMPlex+TS: Fixing types ISIdentity() was wrong for block IS! Indices are NOT scaled by bs PetscFV: Straighten out complex types TS ex11: Fix casts and remove unused variable ...
Remove SNESGetFunctionNorm() and SNESSetFunctionNorm().The intended replacement is:1. SNESGetFunction()2. VecNorm()snes->norm was going stale, causing some confusion among users. Thisway, the
Remove SNESGetFunctionNorm() and SNESSetFunctionNorm().The intended replacement is:1. SNESGetFunction()2. VecNorm()snes->norm was going stale, causing some confusion among users. Thisway, there's no confusion.
Merge branch 'master' into knepley/feature-plex-fas* master: (863 commits) Revert "mpich: use latest mpich tarball with gcov but use '--enable-coverage' mpich configure option." MatCreateTransp
Merge branch 'master' into knepley/feature-plex-fas* master: (863 commits) Revert "mpich: use latest mpich tarball with gcov but use '--enable-coverage' mpich configure option." MatCreateTranspose: fix for lazy block size mpich: use latest mpich tarball with gcov but use '--enable-coverage' mpich configure option. configure: add FC_DEFINE_FLAG to petscvariables added a citation for pounders, Stefan finally came through update to latest netcdf fixes bug that did not allow building on recent Mac OS X DMPlex: Fixes for CGNS - Fixed loop bounds since CGNS uses closed intervals - Bug with mixed cell types - Typo with coordinates final updates from nightly tests fix for countcfunction removed outdated docs and comments on MatStructure usage removed SAME_PRECONDITIONER since no longer used removed unneed use of MatStructure in Schur complement matrix removed MatStructure arguments from Tao fixes for Sundials and fun3d cannot use MPIU_SUM for integer arrays inplace ILU factorization must update state of inplace matrix to prevent infinite recursion of updating PC fixes for BDDC by the way not having BDDC always in the testing is going to lead to trouble the compute Jacobian functions for SNES and TS now do not take a MatStructure flag KSPSetOperators() no longer has the MatStructure argument. The Mat objects now track that information themselves. Use KPS/PCSetReusePreconditioner() to prevent the recomputation of the preconditioner if the operator changed in the way that SAME_PRECONDITIONER did with KSPSetOperators() tracks when Mat's have a change in nonzero structure this information can be used by PC to determine how preconditioners must be rebuilt currently only does an error check if the user said same nonzero pattern but actually changed the pattern completed cleanup of removal of matrix pointers to compute jacobian routines makefile: Added 'make includegraph' to create an inclusion dependency graph. Contrib: Updated include-graph.sh script to ignore *.hh files ...Conflicts: src/dm/dt/interface/dt.c
Merge branch 'master' into prbrune/snes-fascontinuationConflicts: include/petscsnesfas.h
Merge branch 'balay/tao-to-petsc'Conflicts: src/snes/impls/fas/fasfunc.c src/snes/impls/fas/fasgalerkin.c
Merge branch 'barry/rm-petscsnesfas_h'
added citations for TS and SNES papers
SNES: Fixed FAS docs
merge petscsnesfas.h into petscsnes.h
fixed quote marks for includes to <>
Merge branch 'prbrune/fas-gscolorsecant'
Sys: drop explicit type arguments from PetscNew() and PetscNewLog()git grep -l 'PetscNew\(Log\)\?(' -- $1 | xargs perl -pi -e 's@PetscNew\([^,;()]+ *, *@PetscNew(@;s@PetscNewLog\(([^,;()]+) *,[^,
Sys: drop explicit type arguments from PetscNew() and PetscNewLog()git grep -l 'PetscNew\(Log\)\?(' -- $1 | xargs perl -pi -e 's@PetscNew\([^,;()]+ *, *@PetscNew(@;s@PetscNewLog\(([^,;()]+) *,[^,;()]+, *@PetscNewLog($1,@'
SNESFAS brackets around CHKERRQ(ierr) and call
SNESFAS: added tau-corrected grid continuation.This just means exact upsweep solves.
Merge branch 'prbrune/snes-fasfull'This branch adds several cycle types to FAS
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
12345678910>>...13