[petsc-dev] strangness in Chebyshev estimate of eigenvalues

Mark Adams mfadams at lbl.gov
Wed May 25 13:36:22 CDT 2016 

On Wed, May 25, 2016 at 11:31 AM, Satish Balay <balay at mcs.anl.gov> wrote:

> Mark,
>
> To simplify - lets start over..
>
> - you delete your copy of mark/snes-ex56c, jed/mark/snes-ex56c
>
> i.e:
> git rebase --abort
> git reset --hard
> git checkout master
> git branch -D mark/snes-ex56c jed/mark/snes-ex56c
>

done


>
> - Then I'll push to 'mark/snes-ex56c' [delete jed/mark/snes-ex56c on
> server]
>
> - After I do my changes - you can start using mark/snes-ex56c
>
> Satish
>
> On Wed, 25 May 2016, Mark Adams wrote:
>
> > On Wed, May 25, 2016 at 11:14 AM, Satish Balay <balay at mcs.anl.gov>
> wrote:
> >
> > > This is hopeless..
> > >
> > > Did you reset your 'mark/snes-ex56c' again to the old stuff?
> > >
> > > I don't get any merge conflicts - If I start from Jed's rebased/branch
> > > commit f2cb8422898d35ef96e146caa3a95b2f879b25f1
> > >
> >
> > I did this from the non-jed version.
> >
> >
> > >
> > > balay at asterix /home/balay/petsc (master=)
> > > $ git co -b test f2cb8422898d35ef96e146caa3a95b2f879b25f1
> > > Switched to a new branch 'test'
> > > balay at asterix /home/balay/petsc (test)
> > > $ git rebase -i master
> > > Successfully rebased and updated refs/heads/test.
> > >
> > >
> > Maybe I corrupted jed's branch. I now get a different error.  This rebase
> > pulled up a vi window and I replaced "pick" with "s" for commits that I
> > want to squash.
> >
> > 11:15 jed/mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ git
> > rebase -i master
> > The previous cherry-pick is now empty, possibly due to conflict
> resolution.
> > If you wish to commit it anyway, use:
> >
> >     git commit --allow-empty
> >
> > Otherwise, please use 'git reset'
> > interactive rebase in progress; onto 9c9a9c5
> > Last commands done (93 commands done):
> >    pick 5a3406a added ex56 in snes, 3D linear elasticity using Plex on a
> > cube
> >    pick 95a678b DMP4est: fix coarseEdge calculation in transfer_Point
> > Next commands to do (102 remaining commands):
> >    pick 013797a Need to declare TSSSPList as PETSC_EXTERN so users can
> add
> > to the list
> >    pick f92a85d Latest boost release seems to handle shared libraries on
> > Mac properly so remove error message
> > You are currently rebasing branch 'jed/mark/snes-ex56c' on '9c9a9c5'.
> >
> > Untracked files:
> >         ShockTube_Dx_converg.png
> >         mhdforest.aux
> >         mhdforest.pdf
> >         mhdforest.tex
> >         out
> >         out_alltest_ex56
> >         out_alltest_next
> >         src/dm/examples/tutorials/dmda-mpiio.pbvec
> >         src/dm/examples/tutorials/dmda.pbvec
> >         src/dm/examples/tutorials/gauss.h5
> >         src/dm/examples/tutorials/hdf5output.h5
> >         src/dm/impls/picell/
> >         src/ksp/ksp/examples/tutorials/.petscrc
> >         src/ksp/ksp/examples/tutorials/ex34_1.tmp
> >         src/ksp/ksp/examples/tutorials/ex34_2.tmp
> >         src/mat/examples/tests/ex191matrix
> >         src/mat/examples/tests/fort.7
> >         src/snes/examples/tests/base_module.mod
> >         src/snes/examples/tests/ex1f_2.tmp
> >         src/snes/examples/tests/extended_module.mod
> >         src/snes/examples/tests/function_module.mod
> >         src/snes/examples/tutorials/.petscrc
> >         src/snes/examples/tutorials/f90module.mod
> >         src/snes/examples/tutorials/f90moduleinterfaces.mod
> >         src/snes/examples/tutorials/petsc_kkt_solver.mod
> >         src/snes/examples/tutorials/petsc_kkt_solver_interfaces.mod
> >         src/sys/examples/tutorials/bag_data_module.mod
> >         src/sys/examples/tutorials/bag_interface_module.mod
> >         src/sys/examples/tutorials/binaryoutput
> >         src/sys/logging/examples/tutorials/filename.xml
> >         src/ts/examples/tutorials/SA-data/
> >         src/ts/examples/tutorials/advection-diffusion-reaction/SA-data/
> >         src/ts/examples/tutorials/petscshiftmod.mod
> >         src/ts/examples/tutorials/power_grid/SA-data/
> >         src/ts/examples/tutorials/power_grid/stability_9bus/SA-data/
> >         src/ts/examples/tutorials/power_grid/stability_9bus/out.bin
> >         src/vec/is/examples/tests/testfile
> >         src/vec/vec/examples/tests/ex29_bts_2_subset.tmp
> >         src/vec/vec/examples/tests/x.h5
> >         src/vec/vec/examples/tests/xH.pbvec
> >         src/vec/vec/examples/tests/xHmpi.pbvec
> >         src/vec/vec/examples/tutorials/mymodule.mod
> >
> > nothing added to commit but untracked files present
> > Could not apply 95a678b879f0666d009cbaa65ec66f87451d4d65... DMP4est: fix
> > coarseEdge calculation in transfer_Point
> > 11:19 1 jed/mark/snes-ex56c|REBASE-i 93/195
> > ~/Codes/petsc/src/snes/examples/tutorials$
> >
> >
> >
> >
> > > <after a editor prompt with the following commits - for interactive
> rebase>
> > > pick 849c9e8 changed Cheby random to noisy
> > > pick ee4626e added snes ex56, Plex with 3D linear elasticity
> > > pick b79c9a7 added ex56 in snes, 3D linear elasticity using Plex on a
> cube
> > > pick a64eebe clean up cheby fix
> > > pick 23c3567 small cleanup of noisy cheby
> > > pick cc7a30b fix ex56 init/fin error
> > > pick c34fc5a remove spaces
> > > pick 0008a30 fix complex build
> > > pick e78b637 updated test for new cheby
> > > pick 4acf97d fixed test for new cheby
> > > pick fdcaa90 merge makefile changed for ex56 and parmetis
> > > pick f2cb842 fixed bug in makefile
> > >
> > > Satish
> > >
> > >
> > > On Wed, 25 May 2016, Mark Adams wrote:
> > >
> > > > I do git rebase -i master, and I get a lot of these:
> > > >
> > > > 10:53 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ git
> > > > rebase -i master
> > > > error: could not apply 121daff... I am sick of finding examples that
> have
> > > > no test cases!
> > > >
> > > > When you have resolved this problem, run "git rebase --continue".
> > > > If you prefer to skip this patch, run "git rebase --skip" instead.
> > > > To check out the original branch and stop rebasing, run "git rebase
> > > > --abort".
> > > > Could not apply 121daff3befe8860e39d0d85f21fecb925e5e5cd... I am
> sick of
> > > > finding examples that have no test cases!
> > > >
> > > > I did this this morning and there were about 8 of these conflicts
> that I
> > > > had to fix manually. I wanted to check before I proceed. They were
> > > > straightforward fixes.
> > > >
> > > > Mark
> > > >
> > > >
> > > > On Wed, May 25, 2016 at 10:40 AM, Mark Adams <mfadams at lbl.gov>
> wrote:
> > > >
> > > > >
> > > > >
> > > > > On Wed, May 25, 2016 at 10:18 AM, Satish Balay <balay at mcs.anl.gov>
> > > wrote:
> > > > >
> > > > >> On Wed, 25 May 2016, Mark Adams wrote:
> > > > >>
> > > > >> >
> > > > >> > 10:09 mark/snes-ex56c=
> ~/Codes/petsc/src/snes/examples/tutorials$
> > > git
> > > > >> reset
> > > > >> > --hard f2cb8422898d35ef96e146caa3a95b2f879b25f1
> > > > >> > HEAD is now at f2cb842 fixed bug in makefile
> > > > >> >
> > > > >> > OK, now what?
> > > > >>
> > > > >> 1. Verify that its feature complete as you expect [and not
> missing any
> > > > >> commits]?
> > > > >>
> > > > >> gitk master..mark/snes-ex56c
> > > > >>
> > > > >
> > > > > I got this error:
> > > > >
> > > > > 10:37 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$
> gitk
> > > > > master..mark/snes-ex56c
> > > > > Error in startup script: unknown color name "lime"
> > > > >     (processing "-fore" option)
> > > > >     invoked from within
> > > > > "$ctext tag conf m2 -fore [lindex $mergecolors 2]"
> > > > >     (procedure "makewindow" line 347)
> > > > >     invoked from within
> > > > > "makewindow"
> > > > >     (file "/Users/markadams/homebrew/bin/gitk" line 12434)
> > > > >
> > > > >
> > > > >
> > > > >>
> > > > >> 2. Update branch as needed [perhaps you were wanting to squash
> > > > >> commits? since you've mentioned 'rebase -i' previously?]
> > > > >>
> > > > >>
> > > > > git rebase -i
> > > > >
> > > > > or
> > > > >
> > > > > git rebase -i master
> > > > >
> > > > > ?
> > > > >
> > > > >
> > > > >> 3. verify and test locally?
> > > > >>
> > > > >> 4. update 'mark/snes-ex56c' on server.
> > > > >>
> > > > >> git push -f
> > > > >>
> > > > >> 5. If feature complete - update pull request?
> > > > >>
> > > > >> Satish
> > > > >>
> > > > >
> > > > >
> > > >
> > >
> > >
> >
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20160525/3ddf3bf8/attachment.html>

More information about the petsc-dev mailing list