diff --git a/doc/binary_c2.html b/doc/binary_c2.html index d434a2eb35cfd132be5232e41a5e9164ee39ca8f..2e8b3d870c5cb0f4bb17427706fe1fb164e7bb9d 100644 --- a/doc/binary_c2.html +++ b/doc/binary_c2.html @@ -266,7 +266,7 @@ div.float-caption { <div class="body" role="main"> -<div class="standard" style='text-align: center;' id='magicparlabel-2'><img style='width:55%;' src='images/1.png' alt='image: 7_tmp_binary_c_lyx_images_10.png' /> +<div class="standard" style='text-align: center;' id='magicparlabel-2'><img style='width:55%;' src='images/1.png' alt='image: 7_tmp_binary_c_lyx_images_1.png' /> </div> <div class="standard" id='magicparlabel-3'><div class='Frameless'><div class="plain_layout" style='text-align: center;' id='magicparlabel-7'><b>An introduction to the <i>binary_c</i> framework: software to make populations of single and binary stars on your computer(s). @@ -1109,12 +1109,12 @@ $ tbse</pre><br /> <div class="standard" id='magicparlabel-578'>In order to obtain an account, you need to do the following, in order</div> -<ol class="enumerate" id='magicparlabel-579'><li class="enumerate_item">Try to log in at <a href="https://gitlab.eps.surrey.ac.uk/ri0005/<i>binary_c</i>">https://gitlab.eps.surrey.ac.uk/ri0005/<i>binary_c</i></a> using your Gmail account by clicking on the <img style='width:1.2em;' src='images/2.png' alt='image: 8_tmp_binary_c_lyx_images_3.png' /> +<ol class="enumerate" id='magicparlabel-579'><li class="enumerate_item">Try to log in at <a href="https://gitlab.eps.surrey.ac.uk/ri0005/<i>binary_c</i>">https://gitlab.eps.surrey.ac.uk/ri0005/<i>binary_c</i></a> using your Gmail account by clicking on the <img style='width:1.2em;' src='images/2.png' alt='image: 8_tmp_binary_c_lyx_images_9.png' /> . You will be told <em>your account is locked!</em> This poorly-worded message means you have to…</li> <li class="enumerate_item">Email me at r.izzard@surrey.ac.uk and tell me your account is “locked”. I will then email IT support, who will unlock your account.</li> <li class="enumerate_item">IT support should then tell me your account is unlocked so I should then be able to tell you. However, IT support have been known to unlock accounts and <em>not </em>let me know, so please keep trying. If you find you <em>can </em>access the gitlab server (i.e. you can log in) but get a “404 The page could not be found or you don't have permission to view it” error when trying to view <a href="https://gitlab.eps.surrey.ac.uk/ri0005/<i>binary_c</i>">https://gitlab.eps.surrey.ac.uk/ri0005/<i>binary_c</i></a>, then I can probably fix the problem. But you have to tell me, so keep trying to log in :)</li> <li class="enumerate_item">This may take some time: please do hot hold your breath, <em>it is most unwise.</em></li> -<li class="enumerate_item">Once you have confirmation from me (or before, if you are impatient) go back to the website, please click on the <img style='width:1.2em;' src='images/3.png' alt='image: 9_tmp_binary_c_lyx_images_4.png' /> +<li class="enumerate_item">Once you have confirmation from me (or before, if you are impatient) go back to the website, please click on the <img style='width:1.2em;' src='images/3.png' alt='image: 9_tmp_binary_c_lyx_images_10.png' /> to sign in, and grab the code. If everything works, great! If not, I may have to talk with IT support, yet again.</li> </ol> <div class="standard" style='text-align: center;' id='magicparlabel-584'><div class='Boxed' style='width: 75%; '><div class="plain_layout" id='magicparlabel-588'>If you do not know me, it would really help me – and those who fund <em><span class='math'>binary_c</i></span> @@ -1343,17 +1343,7 @@ $ ninja libbinary_c_symlink</pre><br /> <div class="standard" id='magicparlabel-1041'><br /> <pre class\s*='listings bash'>$ cd builddir $ ninja binary_c_install_legacy</pre><br /> -This puts a copy of the <span class="flex_file"><i>binary_c</i></span> executable in the root <i>binary_c</i> directory, and copies the shared library file <span class="flex_file"><i>libbinary_c.so</i></span> to the <span class="flex_file">src</span> directory, i.e. the locations <math xmlns="http://www.w3.org/1998/Math/MathML"><mstyle mathvariant='sans-serif-italic' mathsize='85%'> - <mrow> - <mrow> - <mstyle mathvariant='normal'> - <mstyle mathvariant='italic'> - <mrow><mi>b</mi><mi>i</mi><mi>n</mi><mi>a</mi><mi>r</mi><mi>y</mi>_<mi>g</mi><mi>r</mi><mi>i</mi><mi>d</mi> - </mrow> - </mstyle> - </mstyle><mn>2</mn> - </mrow> - </mrow></mstyle></math> expects.</div> +This puts a copy of the <span class="flex_file"><i>binary_c</i></span> executable in the root <i>binary_c</i> directory, and copies the shared library file <span class="flex_file"><i>libbinary_c.so</i></span> to the <span class="flex_file">src</span> directory, i.e. the locations <i>binary_grid2</i> expects.</div> <div class="standard" id='magicparlabel-1059'>After doing the above, you can remove the <span class="flex_file">builddir</span> completely.</div> <h4 class="subsubsection" id='magicparlabel-1064'><span class="subsubsection_label">4.4.7</span> Alternative compiler</h4> @@ -1903,8 +1893,8 @@ Binary population synthesis is a glorified form of accountancy, without the huge </mstyle> </mrow> </mrow></mstyle></math>. </div> -<div class='float-figure'><div class="plain_layout" style='text-align: center;' id='magicparlabel-2257'><img style='width:45%;' src='images/4.png' alt='image: 10_tmp_binary_c_lyx_images_1.png' /> -<img style='width:45%;' src='images/5.png' alt='image: 11_tmp_binary_c_lyx_images_2.png' /> +<div class='float-figure'><div class="plain_layout" style='text-align: center;' id='magicparlabel-2257'><img style='width:45%;' src='images/4.png' alt='image: 10_tmp_binary_c_lyx_images_2.png' /> +<img style='width:45%;' src='images/5.png' alt='image: 11_tmp_binary_c_lyx_images_3.png' /> </div> <div class="plain_layout" id='magicparlabel-2258'><span class='float-caption-Standard float-caption float-caption-standard'>Figure 1: <div id="fig_grid_size"></div> @@ -5564,7 +5554,7 @@ This will automatically be converted into <span class="flex_perlcode">\&main </mrow></mstyle></math>, as clearly shown in Figs. <a href="#fig_Timing_tests_klaipeda_dt0">2</a> and <a href="#fig_Timing_tests_aibn36_dt0">3</a>.</div> -<div class='float-figure'><div class="plain_layout" style='text-align: center;' id='magicparlabel-4449'><img style='width:85%;' src='images/6.png' alt='image: 12_tmp_binary_c_lyx_images_5.png' /> +<div class='float-figure'><div class="plain_layout" style='text-align: center;' id='magicparlabel-4449'><img style='width:85%;' src='images/6.png' alt='image: 12_tmp_binary_c_lyx_images_4.png' /> </div> <div class="plain_layout" id='magicparlabel-4450'><span class='float-caption-Standard float-caption float-caption-standard'>Figure 2: Timing tests for <math xmlns="http://www.w3.org/1998/Math/MathML"><mstyle mathvariant='sans-serif-italic' mathsize='85%'> @@ -5576,7 +5566,7 @@ This will automatically be converted into <span class="flex_perlcode">\&main </div> -<div class='float-figure'><div class="plain_layout" style='text-align: center;' id='magicparlabel-4459'><img style='width:85%;' src='images/7.png' alt='image: 13_tmp_binary_c_lyx_images_6.png' /> +<div class='float-figure'><div class="plain_layout" style='text-align: center;' id='magicparlabel-4459'><img style='width:85%;' src='images/7.png' alt='image: 13_tmp_binary_c_lyx_images_5.png' /> </div> <div class="plain_layout" id='magicparlabel-4460'><span class='float-caption-Standard float-caption float-caption-standard'>Figure 3: Timing tests for <math xmlns="http://www.w3.org/1998/Math/MathML"><mstyle mathvariant='sans-serif-italic' mathsize='85%'> @@ -5603,7 +5593,7 @@ This will automatically be converted into <span class="flex_perlcode">\&main <mrow><mn>1.0</mn> </mrow></mstyle></math> are <em>always</em> achieved, showing the <span class='math'>\binarygrid</span> does an excellent job in this case.</div> -<div class='float-figure'><div class="plain_layout" style='text-align: center;' id='magicparlabel-4470'><img style='width:85%;' src='images/8.png' alt='image: 14_tmp_binary_c_lyx_images_7.png' /> +<div class='float-figure'><div class="plain_layout" style='text-align: center;' id='magicparlabel-4470'><img style='width:85%;' src='images/8.png' alt='image: 14_tmp_binary_c_lyx_images_6.png' /> </div> <div class="plain_layout" id='magicparlabel-4471'><span class='float-caption-Standard float-caption float-caption-standard'>Figure 4: Timing tests for <math xmlns="http://www.w3.org/1998/Math/MathML"><mstyle mathvariant='sans-serif-italic' mathsize='85%'> @@ -5639,7 +5629,7 @@ This will automatically be converted into <span class="flex_perlcode">\&main <mrow><mo> ≳ </mo><mn>100</mn> </mrow> </mrow></mstyle></math>). With 10 stars and 32 threads, the tests are pretty much meaningless in any case because 22 threads do no work at all! </div> -<div class='float-figure'><div class="plain_layout" style='text-align: center;' id='magicparlabel-4481'><img style='width:85%;' src='images/9.png' alt='image: 15_tmp_binary_c_lyx_images_8.png' /> +<div class='float-figure'><div class="plain_layout" style='text-align: center;' id='magicparlabel-4481'><img style='width:85%;' src='images/9.png' alt='image: 15_tmp_binary_c_lyx_images_7.png' /> </div> <div class="plain_layout" id='magicparlabel-4482'><span class='float-caption-Standard float-caption float-caption-standard'>Figure 5: Timing tests for <math xmlns="http://www.w3.org/1998/Math/MathML"><mstyle mathvariant='sans-serif-italic' mathsize='85%'> @@ -5681,7 +5671,7 @@ This will automatically be converted into <span class="flex_perlcode">\&main </mrow> </mrow></mstyle></math><em>.</em> Again <span class='math'>\binarygrid</span> does a great job.</div> -<div class='float-figure'><div class="plain_layout" style='text-align: center;' id='magicparlabel-4491'><img style='width:95%;' src='images/10.png' alt='image: 16_tmp_binary_c_lyx_images_9.png' /> +<div class='float-figure'><div class="plain_layout" style='text-align: center;' id='magicparlabel-4491'><img style='width:95%;' src='images/10.png' alt='image: 16_tmp_binary_c_lyx_images_8.png' /> </div> <div class="plain_layout" id='magicparlabel-4492'><span class='float-caption-Standard float-caption float-caption-standard'>Figure 6: Timing tests for <math xmlns="http://www.w3.org/1998/Math/MathML"><mstyle mathvariant='sans-serif-italic' mathsize='85%'> diff --git a/doc/binary_c2.lyx b/doc/binary_c2.lyx index fca59f7d589bc8b2cf1e0a1f30d59d7df71395e5..2079d0c04e7d477251a20b524691ed7bba69f8e3 100644 --- a/doc/binary_c2.lyx +++ b/doc/binary_c2.lyx @@ -4916,10 +4916,10 @@ src \end_inset the locations -\begin_inset Formula $\binarygrid2$ +\begin_inset Formula $\binarygrid$ \end_inset - expects. +2 expects. \end_layout \begin_layout Standard