<div dir="ltr">Hi Erik,<div><br></div><div>Thanks for the feedback, and sorry to hear about the frustration. Indeed BaikalETK is only a proof-of-principle code at the moment, in which the second stage of development (copying the code blocks in the Jupyter notebook to a proper, callable, git-friendly Python module) hasn't been completed yet. I'm hoping that with more resources to combine ETK & NRPy+ development, the full modularization of all the ETK Jupyter notebooks can be completed.</div><div><br></div><div>> The only way I see is to undo my changes ("git checkout"), and then pull your changes. In this case that's fine because there are no major changes, but if I had made changes I'd be in trouble.</div><div><br></div><div>I generally do a `git diff` if `git pull` complains about conflicts, and it's usually easy to see if anything significant has changed (and then do `git checkout` if not). Maybe if I chose a standard way of prefixing lines that are ignorable comments (e.g., "COMMENT: Finished BSSN symbolic expressions in") a simple script could be written that checks for trivial differences like these. Removing all output isn't a good idea as it would wipe away the "standard" output displayed on nbviewer (<a href="https://nbviewer.jupyter.org/github/zachetienne/nrpytutorial/blob/master/NRPyPlus_Tutorial.ipynb">https://nbviewer.jupyter.org/github/zachetienne/nrpytutorial/blob/master/NRPyPlus_Tutorial.ipynb</a>) in case the user wants only to learn from the Jupyter documentation.</div><div><br></div><div>Also if in doubt, one can simply compare the thorn output from the master Jupyter notebook with your own version. We're making it easier to redirect all NRPy+ output to whatever directory you like, so that such diffs can be made quickly and easily.</div><div><br clear="all"><div><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div style="font-size:12.8px">-Zach</div><div style="font-size:12.8px"><br></div><span style="font-size:12.8px">* * *</span><br style="font-size:12.8px"><span style="font-size:12.8px">Prof. Zachariah Etienne</span></div><div dir="ltr">Physics & Astronomy Dept.<br style="font-size:12.8px"><div style="font-size:12.8px">West Virginia University</div><div><a href="http://astro.phys.wvu.edu/zetienne/" target="_blank">http://astro.phys.wvu.edu/zetienne/</a></div><div><a href="http://blackholesathome.net/" target="_blank">http://blackholesathome.net</a><a href="https://blackholesathome.net" style="font-size:12.8px" target="_blank"><br></a><br></div></div></div></div></div></div></div></div></div></div></div></div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Nov 4, 2019 at 11:56 AM Erik Schnetter <<a href="mailto:schnetter@cct.lsu.edu">schnetter@cct.lsu.edu</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr"><div dir="ltr"><div dir="ltr">On Mon, Nov 4, 2019 at 8:38 AM Zach Etienne <<a href="mailto:trac-noreply@einsteintoolkit.org" target="_blank">trac-noreply@einsteintoolkit.org</a>> wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">#2064: Add GiRaFFE to the Einstein Toolkit
<table style="border-spacing:1ex 0pt">
<tbody><tr><td style="text-align:right"> Reporter:</td><td>Zach Etienne</td></tr>
<tr><td style="text-align:right"> Status:</td><td>open</td></tr>
<tr><td style="text-align:right">Milestone:</td><td>ET_2019_10</td></tr>
<tr><td style="text-align:right"> Version:</td><td>development version</td></tr>
<tr><td style="text-align:right"> Type:</td><td>enhancement</td></tr>
<tr><td style="text-align:right"> Priority:</td><td>minor</td></tr>
<tr><td style="text-align:right">Component:</td><td>EinsteinToolkit thorn</td></tr>
</tbody></table>
<p>Comment (by Zach Etienne):</p>
<p><span>@Ian Hinder</span> : Version control with Jupyter is only slightly more difficult than with plain source code, as its JSON is plaintext. </p>
<blockquote>
<p>Is it a good idea to pull the whole code into notebooks? I don’t know how sustainable it is when you have multiple contributors; merging changes from different people can become very difficult.</p>
</blockquote>
<p>Writing the Jupyter notebook is only the first step in NRPy+ development, but arguably the most important as it contains the documentation and some validation checks. I’d liken the Jupyter notebook phase more to collaboratively writing a journal article with a shared git repo than code development within such a repo.</p></blockquote><div><br></div><div>I'd like to add a point to this, out of frustration:</div><div><br></div><div>A few weeks ago I downloaded and ran Tutorial-BaikalETK.ipynb. Today I try to "git pull", and it doesn't work, because there are differences in the output everywhere (e.g. "Finished BSSN symbolic expressions in 1.2987918853759766 seconds"). The only way I see is to undo my changes ("git checkout"), and then pull your changes. In this case that's fine because there are no major changes, but if I had made changes I'd be in trouble.</div><div><br></div><div>I think the problem is that the output is stored in the git repo. In the future, you might want to switch to a system where (a) notebooks automatically have all output removed before they are committed, and (b) upon commit, Travis or a similar system creates for-viewing-only notebooks with a standardized output.</div><div><br></div><div>-erik</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><p> </p>
<p>After the notebook has been written, a separate Python module containing the code developed in the Jupyter notebook is then written. At the bottom of every NRPy+ Jupyter notebook it is required to include a self-validation check against the separate Python module (many NRPy+ Jupyter notebooks have additional validation checks). Further, all NRPy+ Python modules must include proper unit testing on all symbolic expressions generated, so that Travis CI can confirm agreement with the trusted version. This has the nice consequence of often requiring developers to update the documentation any time the module is updated in order for the Jupyter notebook to pass self-validation tests, though generally NRPy+ developers prefer updating the Jupyter notebooks as a first step, then propagating changes to the module & unit tests. Proper documentation makes our lives much easier and is the foundation of a sustainable codebase.</p>
<p>The above approach has worked fine with multiple contributors so far, as NRPy+ is extremely modular, with 70+ Python modules & about 100 Jupyter notebooks. Also I generally don’t put multiple students on exactly the same project (though they certainly do interact and benefit from each others' documentation). Thus
</p><p>--<br>
Ticket URL: <a href="https://bitbucket.org/einsteintoolkit/tickets/issues/2064/add-giraffe-to-the-einstein-toolkit" target="_blank">https://bitbucket.org/einsteintoolkit/tickets/issues/2064/add-giraffe-to-the-einstein-toolkit</a></p>
_______________________________________________<br>
Trac mailing list<br>
<a href="mailto:Trac@einsteintoolkit.org" target="_blank">Trac@einsteintoolkit.org</a><br>
<a href="http://lists.einsteintoolkit.org/mailman/listinfo/trac" rel="noreferrer" target="_blank">http://lists.einsteintoolkit.org/mailman/listinfo/trac</a><br>
<p></p></blockquote></div><br clear="all"><div><br></div>-- <br><div dir="ltr"><div dir="ltr"><div>Erik Schnetter <<a href="mailto:schnetter@cct.lsu.edu" target="_blank">schnetter@cct.lsu.edu</a>><br><a href="http://www.perimeterinstitute.ca/personal/eschnetter/" target="_blank">http://www.perimeterinstitute.ca/personal/eschnetter/</a></div><div><br></div></div></div></div></div></div>
_______________________________________________<br>
Users mailing list<br>
<a href="mailto:Users@einsteintoolkit.org" target="_blank">Users@einsteintoolkit.org</a><br>
<a href="http://lists.einsteintoolkit.org/mailman/listinfo/users" rel="noreferrer" target="_blank">http://lists.einsteintoolkit.org/mailman/listinfo/users</a><br>
</blockquote></div>