Done. But I may have messed up the history a little
On Sep 8, 2015, at 4:28 PM, Satish Balay <[email protected]> wrote:
Barry,
I see you made some changes to pr352/dmay/pctelescope/master and merged to next [and pushed]
However - you did not push pr352/dmay/pctelescope/master. Could you push this branch?
I have fix for the following warnings - and would like to push my changes..
[Just want to make sure all changes are in sync]
thanks, Satish --------
/home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c: In function 'PCTelescopeGetKSP': /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c:654: warning: statement with no effect /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c: In function 'PCTelescopeGetReductionFactor': /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c:675: warning: statement with no effect /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c: In function 'PCTelescopeSetReductionFactor': /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c:696: warning: statement with no effect /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c: In function 'PCTelescopeGetIgnoreDM': /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c:717: warning: statement with no effect /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c: In function 'PCTelescopeSetIgnoreDM': /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c:738: warning: statement with no effect /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c: In function 'PCTelescopeGetDM': /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c:759: warning: statement with no effect /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c: In function 'PCSetUp_Telescope': /home/balay/petsc.test/src/ksp/pc/impls/telescope/telescope.c:352: warning: 'subcomm' may be used uninitialized in this function
On Tue, 8 Sep 2015, Satish Balay wrote:
Ok - pushed to pr352/dmay/pctelescope/master - and merged to next
https://bitbucket.org/petsc/petsc/commits/bfd6bcc6ac8e2f0022fa8b00b8cd29f3a3...
[please before further changes - or merge to master]
Satish
On Tue, 8 Sep 2015, Satish Balay wrote:
I haven't check the examples - but I have the following fix for the build. Will push now
Satish
diff --git a/include/petscpc.h b/include/petscpc.h index 7e583b8..0cddc86 100644 --- a/include/petscpc.h +++ b/include/petscpc.h @@ -324,7 +324,7 @@ PETSC_EXTERN PetscErrorCode PCMGResidualDefault(Mat,Vec,Vec,Vec); PETSC_EXTERN PetscErrorCode PCTelescopeGetReductionFactor(PC,PetscInt*); PETSC_EXTERN PetscErrorCode PCTelescopeSetReductionFactor(PC,PetscInt); PETSC_EXTERN PetscErrorCode PCTelescopeGetIgnoreDM(PC,PetscBool*); -PETSC_EXTERN PetscErrorCode PCTelescopeSetIgnoreDM(PC,PetscInt); +PETSC_EXTERN PetscErrorCode PCTelescopeSetIgnoreDM(PC,PetscBool); PETSC_EXTERN PetscErrorCode PCTelescopeGetDM(PC,DM*);
#endif /* __PETSCPC_H */ diff --git a/src/ksp/pc/impls/telescope/telescope.c b/src/ksp/pc/impls/telescope/telescope.c index 5e899de..fe75c46 100644 --- a/src/ksp/pc/impls/telescope/telescope.c +++ b/src/ksp/pc/impls/telescope/telescope.c @@ -207,7 +207,7 @@ PetscErrorCode PCTelescopeMatCreate_default(PC pc,PC_Telescope sred,MatReuse reu if (reuse != MAT_INITIAL_MATRIX) { Bred = *A; }
ierr = MatGetSize(Blocal,&mm,NULL);CHKERRQ(ierr); - //ierr = MatCreateMPIMatConcatenateSeqMat(subcomm,Blocal,PETSC_DECIDE,reuse,&Bred);CHKERRQ(ierr); + /* ierr = MatCreateMPIMatConcatenateSeqMat(subcomm,Blocal,PETSC_DECIDE,reuse,&Bred);CHKERRQ(ierr); */ ierr = MatCreateMPIMatConcatenateSeqMat(subcomm,Blocal,mm,reuse,&Bred);CHKERRQ(ierr); } *A = Bred; @@ -734,7 +734,7 @@ PetscErrorCode PCTelescopeGetIgnoreDM(PC pc,PetscBool *v)
.keywords: PC, telescoping solve @*/ -PetscErrorCode PCTelescopeSetIgnoreDM(PC pc,PetscInt v) +PetscErrorCode PCTelescopeSetIgnoreDM(PC pc,PetscBool v) { PetscTryMethod(pc,"PCTelescopeSetIgnoreDM_C",(PC,PetscBool),(pc,v)); return(0); diff --git a/src/ksp/pc/impls/telescope/telescope_dmda.c b/src/ksp/pc/impls/telescope/telescope_dmda.c index edd1708..98d0c7f 100644 --- a/src/ksp/pc/impls/telescope/telescope_dmda.c +++ b/src/ksp/pc/impls/telescope/telescope_dmda.c @@ -757,7 +757,7 @@ PetscErrorCode PCTelescopeMatCreate_dmda(PC pc,PC_Telescope sred,MatReuse reuse,
if (reuse != MAT_INITIAL_MATRIX) {Bred = *A;} ierr = MatGetSize(Blocal,&mm,NULL);CHKERRQ(ierr); - //ierr = MatCreateMPIMatConcatenateSeqMat(subcomm,Blocal,PETSC_DECIDE,reuse,&Bred);CHKERRQ(ierr); + /* ierr = MatCreateMPIMatConcatenateSeqMat(subcomm,Blocal,PETSC_DECIDE,reuse,&Bred);CHKERRQ(ierr); */ ierr = MatCreateMPIMatConcatenateSeqMat(subcomm,Blocal,mm,reuse,&Bred);CHKERRQ(ierr); } *A = Bred;
On Tue, 8 Sep 2015, Barry Smith wrote:
Dave,
I'll be fixing these.
Barry
On Sep 8, 2015, at 9:00 AM, PETSc checkBuilds <[email protected]> wrote:
Dear PETSc developer,
This email contains listings of contributions attributed to you by `git blame` that caused compiler errors or warnings in PETSc automated testing. Follow the links to see the full log files. Please attempt to fix the issues promptly or let us know at [email protected] if you are unable to resolve the issues.
Thanks, The PETSc development team
----
warnings attributed to commit https://bitbucket.org/petsc/petsc/commits/6ab51f8 PCSemiRedundant:
src/ksp/pc/impls/telescope/telescope.c:116 [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone/src/ksp/pc/impls/telescope/telescope.c:116:3: warning: 'subdm' may be used uninitialized in this function [-Wmaybe-uninitialized]
src/ksp/pc/impls/telescope/telescope.c:210 [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone-2/src/ksp/pc/impls/telescope/telescope.c:210:5: error: expected expression before '/' token
src/ksp/pc/impls/telescope/telescope.c:380 [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone/src/ksp/pc/impls/telescope/telescope.c:380:12: warning: 'subcomm' may be used uninitialized in this function [-Wmaybe-uninitialized]
src/ksp/pc/impls/telescope/telescope_dmda.c:112 [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone/src/ksp/pc/impls/telescope/telescope_dmda.c:112:18: warning: 'start_IJK' may be used uninitialized in this function [-Wmaybe-uninitialized] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone/src/ksp/pc/impls/telescope/telescope_dmda.c:112:7: warning: 'start_IJK' may be used uninitialized in this function [-Wmaybe-uninitialized]
src/ksp/pc/impls/telescope/telescope_dmda.c:535 [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/balay/petsc.clone-3/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone-2/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/balay/petsc.clone-2/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone-3/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /home/balay/petsc.clone-3/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone-2/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone-2/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone-3/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/balay/petsc.clone-4/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/balay/petsc.clone/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone/src/ksp/pc/impls/telescope/telescope_dmda.c:535:54: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable]
src/ksp/pc/impls/telescope/telescope_dmda.c:609 [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone-2/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone-2/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/balay/petsc.clone-4/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/balay/petsc.clone-3/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/balay/petsc.clone/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /home/balay/petsc.clone-3/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone-3/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone-2/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone-3/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable] [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/balay/petsc.clone-2/src/ksp/pc/impls/telescope/telescope_dmda.c:609:49: warning: variable 'natural_ijk' set but not used [-Wunused-but-set-variable]
src/ksp/pc/impls/telescope/telescope_dmda.c:760 [http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/09/08/build_next_a...] /sandbox/petsc/petsc.clone-2/src/ksp/pc/impls/telescope/telescope_dmda.c:760:5: error: expected expression before '/' token
---- To opt-out from receiving these messages - send a request to [email protected].