<div dir="ltr">On Fri, Jul 24, 2015 at 11:23 AM, Ian Hinder <span dir="ltr"><<a href="mailto:ian.hinder@aei.mpg.de" target="_blank">ian.hinder@aei.mpg.de</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word"><br><div><span class=""><div>On 24 Jul 2015, at 17:04, Ian Hinder <<a href="mailto:ian.hinder@aei.mpg.de" target="_blank">ian.hinder@aei.mpg.de</a>> wrote:</div><br><blockquote type="cite"><div style="word-wrap:break-word"><br><div><div>On 24 Jul 2015, at 16:59, Ian Hinder <<a href="mailto:ian.hinder@aei.mpg.de" target="_blank">ian.hinder@aei.mpg.de</a>> wrote:</div><br><blockquote type="cite"><div style="word-wrap:break-word"><br><div><div>On 24 Jul 2015, at 14:13, Erik Schnetter <<a href="mailto:schnetter@cct.lsu.edu" target="_blank">schnetter@cct.lsu.edu</a>> wrote:</div><br><blockquote type="cite"><div dir="ltr">I just pushed all the changes related to the McLachlan-rewrite merge. Apart from the McLachlan Kranc scripts and the respective generated code, there are a few thorns that needed to have test results updated.<div><br></div><div>I see zero test failures with these changes on Bethe, Blue Waters, Carver, Datura, Edison, Hopper, Mike, Nvidia (a Perimeter workstation), Philip, Queen Bee, Shelob, and Stampede.</div></div></blockquote><div><br></div><div>Hi Erik,</div><div><br></div><div>It looks like there are some issues with backward compatibility. I get this error:</div><div><br></div><div>WARNING[L2,P0] (Cactus): ParameterSetKeyword: Unable to set keyword 'ML_BSSN::my_rhs_boundary_condition', new value 'static' is not in any active range<br>WARNING[L1,P0] (Cactus): Major error in parameter file '/lustre/datura/ianhin/simulations/einsteintoolkit/rewrite_ML_BSSN_bench_o4/output-0000/ML_BSSN_bench.par' line 30: Range error setting parameter 'ML_BSSN::my_rhs_boundary_condition' to 'static'<br></div></div></div></blockquote><div><br></div><div>Also, any output parameters referring to the old variables are now invalid; e.g. phi has been renamed phiW. Given this, it looks like old parameter files will very likely all have to be modified for the new version.</div></div></div></blockquote><div><br></div></span><div>Hi Erik,</div><div><br></div><div>Something is wrong with the merge: the merge commit should have two parents, but it only has one. </div></div><div><br></div><span style="white-space:pre-wrap"> </span><a href="https://bitbucket.org/einsteintoolkit/mclachlan/commits/all" target="_blank">https://bitbucket.org/einsteintoolkit/mclachlan/commits/all</a><div><br></div><div>It looks like the "merge" is just a set of changes on the master branch.</div></div></blockquote><div><br></div><div>I merged the master branch into the rewrite branch, and the result of this then back into the master. The former was non-trivial because of other changes that happened to the master in the mean time, including regenerating code, so I introduced a temporary branch "integrate-rewrite" for this. I didn't look at the parent structures of the commits.</div><div><br></div><div>I now see that integrate-rewrite doesn't have rewrite as parent. Very strange. I only used SourceTree, and only used standard mechanisms (merging, branching, committing).</div><div><br></div><div>-erik</div></div><div><br></div>-- <br><div class="gmail_signature">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></div>