Hi Matt, <div><br></div><div>Thanks for your efforts here. I have pulled down the changes and everything seems to build appropriately. In my 1 min glance, there seem to still be some issues using it, but I will try to correct those later today if I get a chance.</div>
<div><br></div><div>Be Well</div><div>Anthony</div><div><br></div><div>PS thanks for the hg and vim tricks ;) <br><br><div class="gmail_quote">On Thu, Oct 4, 2012 at 12:25 AM, Matthew Turk <span dir="ltr"><<a href="mailto:matthewturk@gmail.com" target="_blank">matthewturk@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Anthony,<div><br></div><div>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:</div>
<div><br></div><div>hg up 24087b9826d1</div><div><br></div><div># To see differences in 3.0 versus the most recent common ancestor of the parents</div><div>hg diff -r "p1()" -r "ancestor(p1(), p2())" some/file.py</div>
<div># To see differences between the yt branch and that ancestor</div><div>hg diff -r "p2()" -r "ancestor(p1(), p2())" some/file.py</div><div><br></div><div>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.</div>
<div><br></div><div>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!</div>
<div><br></div><div>-Matt<div><div class="h5"><br><br>On Monday, October 1, 2012, Anthony Scopatz wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Thanks a ton, Matt. <div>
<br></div>
<div>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.</div>
<div><br></div><div>Be Well</div><div>Anthony<br><br><div class="gmail_quote">On Mon, Oct 1, 2012 at 9:24 PM, Matthew Turk <span dir="ltr"><<a>matthewturk@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Anthony,<br>
<br>
I'll have a go at merging all the changes into 3.0 sometime this week<br>
-- I'm still "offline" until tomorrow, but I should be able to take<br>
the time sometime either tomorrow, or Wednesday evening. That should<br>
fix the grid annotation; it's been a while since I've merged into 3.0,<br>
and I think a few points of divergence might cause some head<br>
scratching, but I'll ping the list when I'm done.<br>
<br>
-Matt<br>
<div><div><br>
On Fri, Sep 28, 2012 at 4:34 PM, Anthony Scopatz <<a>scopatz@gmail.com</a>> wrote:<br>
> Ahh Thanks Nathan,<br>
><br>
> I missed it in yt-3.0 because it is called "annotate_grids()" and it is<br>
> associated with the GridBoundaryCallback class. Also, it is totally broken<br>
> in yt-3.0 so I will probably be fixing it up.<br>
><br>
> Be Well<br>
> Anthony<br>
><br>
><br>
> On Fri, Sep 28, 2012 at 2:31 PM, Nathan Goldbaum <<a>nathan12343@gmail.com</a>><br>
> wrote:<br>
>><br>
>> Hi Anthony,<br>
>><br>
>> Yes there is, annotate_grid (see the grid callback in<br>
>> plot_modifications.py.).<br>
>><br>
>> -Nathan<br>
>><br>
>> On Sep 28, 2012, at 12:28 PM, Anthony Scopatz wrote:<br>
>><br>
>> > Hello yters,<br>
>> ><br>
>> > Is there already code that can be used to draw or display an AMR grid on<br>
>> > the plot itself? Or is this an annotation that I should write ;)?<br>
>> ><br>
>> > Be Well<br>
>> > Anthony<br>
>> > _______________________________________________<br>
>> > yt-dev mailing list<br>
>> > <a>yt-dev@lists.spacepope.org</a><br>
>> > <a href="http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org" target="_blank">http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org</a><br>
>><br>
>> _______________________________________________<br>
>> yt-dev mailing list<br>
>> <a>yt-dev@lists.spacepope.org</a><br>
>> <a href="http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org" target="_blank">http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org</a><br>
><br>
><br>
><br>
> _______________________________________________<br>
> yt-dev mailing list<br>
> <a>yt-dev@lists.spacepope.org</a><br>
> <a href="http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org" target="_blank">http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org</a><br>
><br>
_______________________________________________<br>
yt-dev mailing list<br>
<a>yt-dev@lists.spacepope.org</a><br>
<a href="http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org" target="_blank">http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org</a><br>
</div></div></blockquote></div><br></div>
</blockquote></div></div></div>
<br>_______________________________________________<br>
yt-dev mailing list<br>
<a href="mailto:yt-dev@lists.spacepope.org">yt-dev@lists.spacepope.org</a><br>
<a href="http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org" target="_blank">http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org</a><br>
<br></blockquote></div><br></div>