PS thanks for the hg and vim tricks ;)

On Thu, Oct 4, 2012 at 12:25 AM, Matthew Turk <matthewturk@gmail.com> wrote:

Hi Anthony,

I've gone ahead and merged in changeset 24087b9826d1. This merge also overlapped with the na/np changes -- so I had to do a whole bunch of conflict resolution. I think I did it correctly, but you can also check this by inspecting the actual diffs:

hg up 24087b9826d1

# To see differences in 3.0 versus the most recent common ancestor of the parents
hg diff -r "p1()" -r "ancestor(p1(), p2())" some/file.py

# To see differences between the yt branch and that ancestor
hg diff -r "p2()" -r "ancestor(p1(), p2())" some/file.py

If something looks wrong when you use it next, this is a good way to figure out what the differences could have been. (revsets are awesome.) Fortunately none of the files I split up into multiple files changed very much.

Sidenote: this took me a while (nearly all of the episode "The Final Sacrifice" from season 10), largely because of the na/np stuff touching other changes, although I am glad we applied that change to both branches roughly simultaneously. But, I also discovered you can 1) set options in vimdiff based on whether you're in diff mode or not, so I conditionally disabled a couple plugins, and 2) use vimdiff in horizontal mode. So those're both good!

-Matt

On Monday, October 1, 2012, Anthony Scopatz wrote:
Thanks a ton, Matt.

I was hoping to get to this myself, but it doesn't look like I am going to have the chance in the next week or so. And you are probably right that a real merge needs to be done anyway.

Be Well
Anthony

On Mon, Oct 1, 2012 at 9:24 PM, Matthew Turk <matthewturk@gmail.com> wrote:

Hi Anthony,

I'll have a go at merging all the changes into 3.0 sometime this week
-- I'm still "offline" until tomorrow, but I should be able to take
the time sometime either tomorrow, or Wednesday evening. That should
fix the grid annotation; it's been a while since I've merged into 3.0,
and I think a few points of divergence might cause some head
scratching, but I'll ping the list when I'm done.

-Matt

On Fri, Sep 28, 2012 at 4:34 PM, Anthony Scopatz <scopatz@gmail.com> wrote:
> Ahh Thanks Nathan,
>
> I missed it in yt-3.0 because it is called "annotate_grids()" and it is
> associated with the GridBoundaryCallback class. Also, it is totally broken
> in yt-3.0 so I will probably be fixing it up.
>
> Be Well
> Anthony
>
>
> On Fri, Sep 28, 2012 at 2:31 PM, Nathan Goldbaum <nathan12343@gmail.com>
> wrote:
>>
>> Hi Anthony,
>>
>> Yes there is, annotate_grid (see the grid callback in
>> plot_modifications.py.).
>>
>> -Nathan
>>
>> On Sep 28, 2012, at 12:28 PM, Anthony Scopatz wrote:
>>
>> > Hello yters,
>> >
>> > Is there already code that can be used to draw or display an AMR grid on
>> > the plot itself? Or is this an annotation that I should write ;)?
>> >
>> > Be Well
>> > Anthony
>> > _______________________________________________
>> > yt-dev mailing list
>> > yt-dev@lists.spacepope.org
>> > http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org
>>
>> _______________________________________________
>> yt-dev mailing list
>> yt-dev@lists.spacepope.org
>> http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org
>
>
>
> _______________________________________________
> yt-dev mailing list
> yt-dev@lists.spacepope.org
> http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org
>
_______________________________________________
yt-dev mailing list
yt-dev@lists.spacepope.org
http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org

_______________________________________________
yt-dev mailing list
yt-dev@lists.spacepope.org
http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org