future full release [3.7] will be from 'master' branch. future patch fix release [3.6.x] will be from 'maint' branch.
You can choose the branch to use - based on your need.. Satish On Thu, 14 Jan 2016, Gideon Simpson wrote: > Is this change going to be part of the next patch release, or the eventual > 3.7? > > -gideon > > > On Jan 14, 2016, at 10:42 AM, Satish Balay <[email protected]> wrote: > > > > Hopefully all changes should be documented in the changes file.. > > > > http://www.mcs.anl.gov/petsc/documentation/changes/dev.html > > > > You can use git to find out more info.. > > > > balay@asterix /home/balay/petsc (master=) > > $ git grep PetscOptionsGetScalar include/ > > include/petscoptions.h:PETSC_EXTERN PetscErrorCode > > PetscOptionsGetScalar(PetscOptions,const char[],const char[],PetscScalar > > *,PetscBool *); > > include/petscoptions.h:PETSC_EXTERN PetscErrorCode > > PetscOptionsGetScalarArray(PetscOptions,const char[],const > > char[],PetscScalar[],PetscInt *,PetscBool *); > > balay@asterix /home/balay/petsc (hzhang/update-networkex=) > > $ git annotate include/petscoptions.h |grep PetscOptionsGetScalar > > c5929fdf (Barry Smith 2015-10-30 21:20:21 -0500 > > 17)PETSC_EXTERN PetscErrorCode PetscOptionsGetScalar(PetscOptions,const > > char[],const char[],PetscScalar *,PetscBool *); > > c5929fdf (Barry Smith 2015-10-30 21:20:21 -0500 > > 20)PETSC_EXTERN PetscErrorCode > > PetscOptionsGetScalarArray(PetscOptions,const char[],const > > char[],PetscScalar[],PetscInt *,PetscBool *); > > balay@asterix /home/balay/petsc (hzhang/update-networkex=) > > $ git show -q c5929fdf > > commit c5929fdf3082647d199855a5c1d0286204349b03 > > Author: Barry Smith <[email protected]> > > Date: Fri Oct 30 21:20:21 2015 -0500 > > > > Complete update to new PetscOptions interface > > balay@asterix /home/balay/petsc (hzhang/update-networkex=) > > $ gitk c5929fdf > > > > etc.. > > > > Satish > > > > > > On Thu, 14 Jan 2016, Gideon Simpson wrote: > > > >> I know I did a git pull recently, but when did that change? What’s the > >> fifth argument represent? > >> > >> -gideon > >> > >>> On Jan 13, 2016, at 11:54 PM, Satish Balay <[email protected]> wrote: > >>> > >>> On Wed, 13 Jan 2016, Gideon Simpson wrote: > >>> > >>>> I haven’t seen this before: > >>>> > >>>> /mnt/HA/opt/openmpi/intel/2015/1.8.1-mlnx-ofed/bin/mpicc -o > >>>> fixed_batch.o -c -fPIC -wd1572 -g > >>>> -I/home/simpson/software/petsc/include > >>>> -I/home/simpson/software/petsc/arch-linux2-c-debug/include > >>>> -I/mnt/HA/opt/openmpi/intel/2015/1.8.1-mlnx-ofed/include -Wall > >>>> `pwd`/fixed_batch.c > >>>> /home/simpson/projects/dnls/petsc/fixed_batch.c(44): warning #167: > >>>> argument of type "PetscScalar={PetscReal={double}} *" is incompatible > >>>> with parameter of type "const char *" > >>>> PetscOptionsGetScalar(NULL,"-xmax",&xmax,NULL); > >>>> ^ > >>>> > >>>> /home/simpson/projects/dnls/petsc/fixed_batch.c(44): error #165: too few > >>>> arguments in function call > >>>> PetscOptionsGetScalar(NULL,"-xmax",&xmax,NULL); > >>> > >>> Try: > >>> > >>> PetscOptionsGetScalar(NULL,NULL,"-xmax",&xmax,NULL); > >>> > >>> Satish > >> > >> > >
